6 files changed, 46 insertions, 34 deletions
diff --git a/pkglists/alien.lst b/pkglists/alien.lst
index 6768699..0ba6d22 100644
--- a/pkglists/alien.lst
+++ b/pkglists/alien.lst
@@ -73,7 +73,7 @@ libtorrent-rasterbar
 muparser
 netsurf
 nodejs
-nvme-cli
+#nvme-cli
 openconnect
 openjdk
 #oxygen-gtk2
diff --git a/pkglists/min.lst b/pkglists/min.lst
index d6d538b..ca0cfc3 100644
--- a/pkglists/min.lst
+++ b/pkglists/min.lst
@@ -10,7 +10,7 @@ bin
 binutils
 # Add 'bind' at the end because it does a chroot:
 #bind
-#bsd-games
+bsd-games
 bzip2
 ca-certificates
 coreutils
@@ -47,7 +47,7 @@ gnupg
 gnupg2
 gnutls
 gpgme
-#gpm
+gpm
 gptfdisk
 grep
 gzip
diff --git a/pkglists/noxbase.lst b/pkglists/noxbase.lst
index 23d81b7..e779761 100644
--- a/pkglists/noxbase.lst
+++ b/pkglists/noxbase.lst
@@ -34,6 +34,7 @@ glib
 glib2
 glibc-i18n
 ##guile
+htop
 icu4c
 ilmbase
 ##intltool
@@ -118,6 +119,8 @@ nettle
 newt
 nfs-utils
 nghttp2
+nmap
+nvme-cli
 openexr
 openjpeg
 orc
@@ -133,7 +136,7 @@ smartmontools
 speexdsp
 sqlite
 svgalib
-#tcl
+tcl
 udisks
 udisks2
 upower
diff --git a/pkglists/x_base.lst b/pkglists/x_base.lst
index 542e6fa..b889705 100644
--- a/pkglists/x_base.lst
+++ b/pkglists/x_base.lst
@@ -45,7 +45,7 @@ font-alias
 #font-bh-75dpi
 #font-bh-lucidatypewriter-100dpi
 #font-bh-lucidatypewriter-75dpi
-#font-bh-ttf
+font-bh-ttf
 #font-bitstream-75dpi
 font-bitstream-100dpi
 #font-bitstream-type1
@@ -65,8 +65,8 @@ gcr
 gd
 gegl
 gexiv2
-#ghostscript
-#ghostscript-fonts-std
+ghostscript
+ghostscript-fonts-std
 glew
 glproto
 glu
@@ -85,7 +85,7 @@ gst-plugins-good
 gst-plugins-good0
 gstreamer
 gstreamer0
-#gtk+
+gtk+
 gtk+2
 gtk+3
 gtksourceview3
@@ -152,7 +152,7 @@ libdbusmenu
 libdmx
 libdrm
 libepoxy
-#liberation-fonts-ttf
+liberation-fonts-ttf
 libevdev
 libfakekey
 libfontenc
@@ -216,7 +216,7 @@ rendercheck
 renderproto
 resourceproto
 rgb
-#sazanami-fonts-ttf
+sazanami-fonts-ttf
 sbc
 scrnsaverproto
 sdl
@@ -233,13 +233,13 @@ t1lib
 talloc
 tdb
 tevent
-#tibmachuni-font-ttf
+tibmachuni-font-ttf
 ttf-indic-fonts
 videoproto
 viewres
 vte
 wayland
-#wqy-zenhei-font-ttf
+wqy-zenhei-font-ttf
 x11-skel
 x11perf
 xauth
diff --git a/pkglists/xapbase.lst b/pkglists/xapbase.lst
index 680d7bf..145abc8 100644
--- a/pkglists/xapbase.lst
+++ b/pkglists/xapbase.lst
@@ -16,23 +16,23 @@ geeqie
 gimp
 gkrellm
 glibmm
-#gnuchess
+gnuchess
 gparted
 gtkmm3
-#gucharmap
+gucharmap
 gv
 hexchat
 imagemagick
 jansson
 libcue
 libgnt
-#libnice
+libnice
 libnma
 libsigc++
 libsigc++3
 libsodium
 libzip
-#lftp
+lftp
 mozilla-firefox
 #mozilla-thunderbird
 network-manager-applet
@@ -43,23 +43,24 @@ polkit-gnome
 python-cffi
 python-pycparser
 rdesktop
-#rxvt
-#rxvt-unicode
+rxvt
+rxvt-unicode
 sane
-seamonkey
+#seamonkey
 seamonkey-solibs
 tigervnc
 vid.stab
-#vim
-#vim-gvim
+vim
+vim-gvim
 x11-ssh-askpass
-#x3270
-#xaos
+x3270
+xaos
 #xfractint
 xgames
 xlockmore
-#xmms
+xmms
 #xpaint
+xorriso
 # Now needs qt:
 #xpdf
 # Needs gimp:
diff --git a/pkglists/z00_plasma5supp.lst b/pkglists/z00_plasma5supp.lst
index 2a5b374..cba5ad0 100644
--- a/pkglists/z00_plasma5supp.lst
+++ b/pkglists/z00_plasma5supp.lst
@@ -31,20 +31,23 @@ fcitx-table-extra
 fcitx-table-other
 fcitx-unikey
 fluxbox
-font-bh-ttf
+# x_base:
+#font-bh-ttf
 font-bitstream-type1
 font-xfree86-type1
 freerdp
 frei0r-plugins
 fuse
-ghostscript
-ghostscript-fonts-std
+# x_base:
+#ghostscript
+#ghostscript-fonts-std
 gmp
 #gpgme
 grantlee
 groff
 gtkmm2
-gucharmap
+# xapbase:
+#gucharmap
 hack-fonts-ttf
 hyphen
 ibus
@@ -63,12 +66,14 @@ libappindicator
 libburn
 libdbusmenu-qt
 libdmtx
-liberation-fonts-ttf
+# x_base:
+#liberation-fonts-ttf
 libid3tag
 libindicator
 libkkc
 libkkc-data
-libnice
+# xapbase:
+#libnice
 liboggz
 libpinyin
 libqalculate
@@ -113,17 +118,20 @@ qtkeychain
 rttr
 ruby
 rxvt
-rxvt-unicode
+# xapbase:
+#rxvt-unicode
 #sane
-sazanami-fonts-ttf
+# x_base:
+#sazanami-fonts-ttf
 sip
 skkdic
 sox
 ssr
 taglib
 taglib-extras
-vim
-vim-gvim
+# x_base:
+#vim
+#vim-gvim
 vulkan-sdk
 woff2
 xcb-util-cursor