Sync with master Makefile changes.

6 files changed, 622 insertions, 213 deletions

diff --git a/blfs/Extras.Makefile b/blfs/Extras.Makefile
new file mode 100644
index 0000000..08dcd28
--- /dev/null
+++ b/blfs/Extras.Makefile
@@ -0,0 +1,84 @@
+extratargets = Cups-Extras Cups-filters Cyrus-SASL-Extras GTK3-Extras \
+			   Gutenprint ImageMagick-Extras Kuserfeedback-Extras \
+			   OpenLDAP-Extras PHP Pixman-Extras Subversion-Extras
+
+all : $(extratargets)
+
+Cups-Extras :
+	@echo $@
+
+Cups-filters : ghostscript mupdf PHP Cups GLib LCMS2 Poppler Qpdf \
+	dejavu-fonts libjpeg-turbo libpng libtiff Avahi OpenLDAP
+	@echo $@
+
+Cyrus-SASL-Extras : Linux-PAM MariaDB MIT_Kerberos-keyutils OpenLDAP \
+	PostgreSQL
+	@echo $@
+
+GTK3-Extras : adwaita-icon-theme colord Cups rest # PyAtSpi2
+	@echo $@
+
+ImageMagick-Extras : Enscript Gimp Inkscape
+	@echo $@
+
+Kuserfeedback-Extras : PHP # PhpUnit "http://phpunit.de"
+	@echo $@
+
+OpenLDAP-Extras : GnuTLS MariaDB PostgreSQL unixODBC # Pth
+	@echo $@
+
+Pixman-Extras : GTK2 libpng # both for tests and demos
+	@echo $@
+
+# libsoup graphviz cups cups-filters can use PHP
+PHP :
+	@echo $@ "- WIP: Many dependencies"
+
+Subversion-Extras : Apache apache-ant Boost Cyrus-SASL Doxygen \
+	java Ruby Serf SWIG # gnome-keyring libsecret LZ4 UTF8proc dbus
+	@echo $@
+
+adwaita-icon-theme : Inkscape git GTK2 GTK3 librsvg
+	@echo $@
+
+Apache : Apr-Util PCRE Brotli Berkeley_DB Doxygen libxml2 Lua54 Lynx Links \
+	nghttp2 OpenLDAP rsync
+	@echo $@
+
+Enscript :
+	@echo $@
+
+GDL : # GTK3
+	@echo $@
+
+ghostscript :
+	@echo $@
+
+Gimp : Python2-libxml2 ghostscript \
+	# gegl gexiv2 glib-networking GTK2 HarfBuzz libjpeg-turbo libmypaint \
+	librsvg libtiff LCMS2 mypaint-brushes oppler Xorg-Libs dbus-glib \
+	ISO-Codes libgudev PyGTK xdg-utils AAlib alsa-lib libmng libwebp OpenJPEG \
+	GTK-Doc OpenEXR Gvfs
+	@echo $@
+
+gtkmm3 : # atkmm GTK3 pangomm Doxygen
+	@echo $@
+
+Gutenprint : Gimp # Cups
+	@echo $@
+
+Inkscape : GDL gtkmm3 Scour # Boost Double-conversion GC Gsl libsoup libxslt \
+	Poppler popt wget ImageMagick6 LCMS2 libcanberra Potrace lxml
+	@echo $@
+
+mupdf : # GLU Xorg-Libs HarfBuzz libjpeg-turbo OpenJPEG cURL xdg-utils
+	@echo $@
+
+Python2-libxml2 : # libxml2 Python2
+	@echo $@
+
+rest : make-ca libsoup gobject-introspection GTK-Doc
+	@echo $@
+
+Scour : # six
+	@echo $@
diff --git a/blfs/KDE.Makefile b/blfs/KDE.Makefile
index 7d00b65..4b36d32 100644
--- a/blfs/KDE.Makefile
+++ b/blfs/KDE.Makefile
@@ -16,7 +16,7 @@ kde = extra-cmake-modules ffmpeg phonon-backend-gstreamer \
 	  kdepim-addons kwave Kate Dolphin KCalc \
 	  # Other apps to install may be viewed at https://apps.kde.org/
 
-all: $(kde)
+all: Systemd-Extras $(kde)
 
 akonadi : kaccounts-integration kf5
 	@echo $@
@@ -39,13 +39,13 @@ akonadi-notes : kf5 kmime
 akonadi-search : kf5
 	@echo $@
 
-Ark : cpio p7zip UnRar kf5 # libarchive UnZip Zip
+Ark : cpio p7zip UnRar kf5 libarchive unzip Zip
 	@echo $@
 
-Aspell : # which
+Aspell : which
 	@echo $@
 
-atkmm : glibmm # ATK
+atkmm : glibmm ATK
 	@echo $@
 
 AudioFile :
@@ -54,19 +54,22 @@ AudioFile :
 baloo-widgets : kf5
 	@echo $@
 
-breeze-icons : extra-cmake-modules kf5 # qt-everywhere libxml2 lxml
+breeze-icons : extra-cmake-modules kf5 libxml2 lxml
 	@echo $@
 
-c-ares : # CMake
+c-ares : CMake
 	@echo $@
 
 calendarsupport : akonadi-notes
 	@echo $@
 
-Cdrdao : gtkmm libao libmad # libvorbis LAME
+Cdrdao : gtkmm libao libmad libvorbis LAME
 	@echo $@
 
-Cdrtools : # alsa-lib
+Cdrtools : alsa-lib
+	@echo $@
+
+clisp :
 	@echo $@
 
 cpio :
@@ -90,10 +93,10 @@ dosfstools :
 eventviews : akonadi-calendar kmime calendarsupport
 	@echo $@
 
-extra-cmake-modules : # CMake
+extra-cmake-modules : CMake
 	@echo $@
 
-Exiv2 : # CMake cURL Doxygen Graphviz libxslt
+Exiv2 : CMake cURL Doxygen Graphviz libxslt
 	@echo $@
 
 FAAC :
@@ -109,7 +112,7 @@ fdk-aac :
 	@echo $@
 
 ffmpeg : libass fdk-aac x264 x265 frei0r-plugins libcdio opencv OpenJPEG \
-	Samba XviD # FreeType2 LAME libtheora libvorbis libvpx Opus NASM \
+	Samba XviD FreeType LAME libtheora libvorbis libvpx Opus NASM \
 	yasm alsa-lib libva libvdpau SDL2 Doxygen Fontconfig FriBidi libdrm \
 	libwebp GnuTLS PulseAudio Speex v4l-utils Xorg-Libs
 	@echo $@ "(opencv4 not supported)"
@@ -117,35 +120,35 @@ ffmpeg : libass fdk-aac x264 x265 frei0r-plugins libcdio opencv OpenJPEG \
 ffmpeg-min :
 	@echo $@
 
-frei0r-plugins : gavl # Doxygen opencv(currenty broken)
+frei0r-plugins : gavl Doxygen # opencv(currenty broken)
 	@echo $@
 
-Fuse : # Doxygen
+Fuse : Doxygen
 	@echo $@
 
-gavl : # libpng Doxygen
+gavl : libpng Doxygen
 	@echo $@
 
-glibmm : libsigc # GLib Doxygen glib-networking GnuTLS libxslt
+glibmm : libsigc GLib Doxygen glib-networking GnuTLS libxslt
 	@echo $@
 
 GnuPG2 : Fuse ImageMagick libassuan libksba npth pinentry
 	@echo $@
 
-GPGME : GnuPG2 libassuan libsigsegv SWIG
+GPGME : clisp GnuPG2 libassuan libsigsegv SWIG
 	@echo $@
 
-gptfdisk : # popt ICU
+gptfdisk : popt ICU
 	@echo $@
 
-grantlee : # CMake qt-everywhere
+grantlee : CMake qt-everywhere
 	@echo $@
 
 grantleetheme : grantlee
 	@echo $@
 
 gst-plugins-bad : FAAC FAAD2 fdk-aac libass libexif libdvdread libdvdnav \
-	libmpeg2 neon opencv OpenJPEG SoundTouch x265 # BlueZ cURL \
+	libmpeg2 neon opencv OpenJPEG SoundTouch x265 BlueZ cURL \
 	gst-plugins-base GTK3 LCMS2 libgcrypt libgudev librsvg libsndfile \
 	libssh2 libwebp libxkbcommon Nettle Opus SBC Valgrind Wayland \
 	Xorg-Libs
@@ -154,10 +157,10 @@ gst-plugins-bad : FAAC FAAD2 fdk-aac libass libexif libdvdread libdvdnav \
 gst-plugins-ugly : liba52 libcdio libdvdread libmpeg2 x264
 	@echo $@
 
-gtkmm : atkmm pangomm # GTK2
+gtkmm : atkmm pangomm GTK2
 	@echo $@
 
-Gwenview : Exiv2 kf5 kf5kipi libkdcraw # LCMS2
+Gwenview : Exiv2 kf5 kf5kipi libkdcraw LCMS2
 	@echo $@
 
 Hspell :
@@ -169,10 +172,10 @@ Hunspell :
 hyphen :
 	@echo $@
 
-id3lib : # alsa-lib FLAC asciidoc Valgrind
+id3lib : alsa-lib FLAC asciidoc Valgrind
 	@echo $@
 
-ImageMagick : libgxps libraw OpenEXR OpenJPEG # -ffmpeg
+ImageMagick : libgxps libraw OpenEXR OpenJPEG
 	@echo $@
 
 incidenceeditor : kdiagram eventviews
@@ -184,9 +187,9 @@ jansson :
 Jinja2 : # MarkupSafe
 	@echo $@
 
-K3b : kf5 libkcddb UDisks ffmpeg libburn libdvdread Cdrtools \
-	dvd-rw-tools Cdrdao libmad libmusicbrainz2 # libsamplerate \
-	shared-mime-info taglib FLAC LAME libsndfile libvorbis Qt5WebKitWidgets
+K3b : kf5 libkcddb ffmpeg libburn libdvdread Cdrtools \
+	dvd-rw-tools Cdrdao libmad libmusicbrainz2 libsamplerate \
+	qt-everywhere shared-mime-info taglib UDisks FLAC LAME libsndfile libvorbis
 	@echo $@
 
 K3b-qt5webkit : qt5webkit
@@ -213,14 +216,14 @@ KCalc : kf5
 kcalutils : kf5
 	@echo $@
 
-Kdenlive : kf5 mlt breeze-icons # v4l-utils
+Kdenlive : kf5 mlt breeze-icons v4l-utils
 	@echo $@
 
 kdepim-addons : akonadi-import-wizard Discount incidenceeditor kaddressbook \
 	kitinerary kpkpass
 	@echo $@
 
-kdepim-runtime : akonadi-notes akonadi-calendar kalarmcal Kmail \
+kdepim-runtimes : akonadi-notes akonadi-calendar kalarmcal Kmail \
 	# libkolabxml etebase
 	@echo $@
 
@@ -238,13 +241,13 @@ kf5-pre-install-config :
 kf5kipi : kf5
 	@echo $@
 
-kdiagram : # qt-everywhere
+kdiagram : qt-everywhere
 	@echo $@
 
-kgpg : kf5 # GPGME
+kgpg : kf5 GPGME
 	@echo $@
 
-Khelpcenter : grantlee kf5 xapian # libxml2
+Khelpcenter : grantlee kf5 xapian libxml2
 	@echo $@
 
 kidentitymanagement : kpimtextedit
@@ -253,15 +256,15 @@ kidentitymanagement : kpimtextedit
 kimap : kf5
 	@echo $@
 
-kitinerary : kpkpass # libxml2 Poppler shared-mime-info \
-	ZXing PhoneNumber OsmTools
+kitinerary : kpkpass libxml2 Poppler shared-mime-info \
+	# ZXing PhoneNumber OsmTools
 	@echo $@
 
 kldap : qtkeychain
 	@echo $@
 
 Kmail : libksieve kdewebkit kontactinterface ktnef \
-	mailcommon messagelib # kuserfeedback
+	mailcommon messagelib kuserfeedback
 	@echo $@
 
 kmail-account-wizard : Kmail
@@ -276,13 +279,13 @@ kmbox : kf5
 kmime : kf5
 	@echo $@
 
-KMix : kf5 libcanberra # alsa-lib PulseAudio
+KMix : kf5 libcanberra alsa-lib PulseAudio
 	@echo $@
 
 kontactinterface : kf5
 	@echo $@
 
-Konversation : kf5 Phonon # CMake qt-everywhere
+Konversation : kf5 Phonon CMake
 	@echo $@
 
 Konsole : kf5
@@ -291,53 +294,57 @@ Konsole : kf5
 kpimtextedit : kf5
 	@echo $@
 
-kpkpass : kf5 # shared-mime-info
+kpkpass : kf5 shared-mime-info
 	@echo $@
 
-ksmtp : kf5 # Cyrus-SASL
+ksmtp : kf5 Cyrus-SASL
 	@echo $@
 
 ktnef : kcalutils kf5
 	@echo $@
 
-kwave : AudioFile id3lib # fftw kf5 alsa-lib FLAC libogg PulseAudio Doxygen
+kuserfeedback : qt-everywhere \
+	# php phpunit (recommended deps)
+	@echo $@ "https://github.com/KDE/kuserfeedback.git"
+
+kwave : AudioFile id3lib fftw kf5 alsa-lib FLAC libogg PulseAudio Doxygen
 	@echo $@
 
 liba52 : # djbfft optional
 	@echo $@
 
-libaccounts-glib : # GLib gobjecct-introspection
-	@echo $@
+libaccounts-glib : GLib gobject-introspection
+	@echo $@ "https://gitlab.com/accounts-sso/libaccounts-glib.git"
 
-libaccounts-qt5 : libaccounts-glib # qt-everywhere
-	@echo $@
+libaccounts-qt5 : libaccounts-glib qt-everywhere
+	@echo $@ "https://gitlab.com/accounts-sso/libaccounts-qt.git"
 
-libao : # Xorg-Libs Alsa PulseAudio
+libao : Xorg-Libs Alsa PulseAudio
 	@echo $@
 
-libass : # FreeType2 FriBidi NASM Fontconfig Harfbuzz
+libass : FreeType FriBidi NASM Fontconfig HarfBuzz
 	@echo $@
 
-libassuan : # libgpg-error
+libassuan : libgpg-error
 	@echo $@
 
 libatasmart :
 	@echo $@
 
-libblockdev : libbytesize parted volume-key # gobject-introspection \
+libblockdev : libbytesize parted volume-key gobject-introspection \
 	libyaml btrfs-progs GTK-Doc mdadm
 	@echo $@
 
-libbytesize : # PCRE2 GTK-Doc six
+libbytesize : PCRE2 GTK-Doc six
 	@echo $@
 
-libburn : # Doxygen
+libburn : Doxygen
 	@echo $@
 
-libcairomm : libsigc # Cairo Boost Doxygen
+libcairomm : libsigc Cairo Boost Doxygen
 	@echo $@
 
-libcanberra : # libvorbis alsa-lib gstreamer GTK3 GTK2 PulseAudio
+libcanberra : libvorbis alsa-lib gstreamer GTK3 GTK2 PulseAudio
 	@echo $@
 
 libcddb :
@@ -346,10 +353,10 @@ libcddb :
 libcdio : libcddb
 	@echo $@
 
-libdbusmenu-qt : # Doxygen qt-everywhere
+libdbusmenu-qt : Doxygen qt-everywhere
 	@echo $@
 
-libdvdcss : # Doxygen
+libdvdcss : Doxygen
 	@echo $@
 
 libdvdnav : libdvdread
@@ -358,13 +365,13 @@ libdvdnav : libdvdread
 libdvdread :
 	@echo $@
 
-libexif : # Doxygen Graphviz
+libexif : Doxygen Graphviz
 	@echo $@
 
 libgravatar : pimcommon
 	@echo $@
 
-libgxps : # GTK3 LCMS2 libarchive libjpeg-turbo libtiff libxslt git \
+libgxps : GTK3 LCMS2 libarchive libjpeg-turbo libtiff libxslt git \
 	GTK-Doc
 	@echo $@
 
@@ -383,49 +390,49 @@ libkdepim : kf5
 libkexiv2 : kf5 Exiv2
 	@echo $@
 
-libkgapi : kf5 # Cyrus-SASL
+libkgapi : kf5 Cyrus-SASL
 	@echo $@
 
-libkleo : GPGME kpimtextedit # Boost
+libkleo : GPGME kpimtextedit Boost
 	@echo $@
 
 libksba :
 	@echo $@
 
-libksieve : kf5 kmime kimap kpimtextedit # Cyrus-SASL
+libksieve : kf5 kmime kimap kpimtextedit Cyrus-SASL
 	@echo $@
 
 libmad :
 	@echo $@
 
-libmbim : # libgudev gobject-introspection GTK-Doc
+libmbim : libgudev gobject-introspection GTK-Doc
 	@echo $@
 
 libmpeg2 :
 	@echo $@
 
-libmusicbrainz2 : # Python2
+libmusicbrainz2 : Python2
 	@echo $@
 
-libmusicbrainz5 : neon # CMake libxml2 Doxygen
+libmusicbrainz5 : neon CMake libxml2 Doxygen
 	@echo $@
 
 libndp :
 	@echo $@
 
-libqmi : libmbim # GLib gobject-introspection GTK-Doc
+libqmi : libmbim GLib gobject-introspection GTK-Doc
 	@echo $@
 
-libraw : # libjpeg-turbo JasPer LCMS2
+libraw : libjpeg-turbo JasPer LCMS2
 	@echo $@
 
-libsigc : # Boost libxslt DocBook-utils Doxygen
+libsigc : Boost libxslt DocBook-Utils Doxygen
 	@echo $@
 
 libsigsegv :
 	@echo $@
 
-lm-sensors : # which
+lm-sensors : which
 	@echo $@
 
 lmdb :
@@ -447,30 +454,30 @@ messagelib : akonadi-contact akonadi-mime kgpg kidentitymanagement \
 	kmailtransport kmbox libgravatar
 	@echo $@
 
-mlt : frei0r-plugins libexif # qt-everywhere Doxygen fftw SDL2
+mlt : frei0r-plugins libexif qt-everywhere Doxygen fftw SDL2
 	@echo $@
 
 mobile-broadband-provider-info :
 	@echo $@
 
-ModemManager : libmbim libqmi # libgudev gobject-introspection \
+ModemManager : libmbim libqmi libgudev gobject-introspection \
 	Polkit Vala GTK-Doc
 	@echo $@
 
-neon : # GnuTLS libxml2 MIT_Kerberos
+neon : GnuTLS libxml2 MIT_Kerberos
 	@echo $@
 
 NetworkManager : dhcp jansson libndp mobile-broadband-provider-info \
 	ModemManager newt UPower \
-	# cuRL gobject-introspection iptables NSS Polkit PyGObject Vala \
+	cURL gobject-introspection iptables nss Polkit PyGObject Vala \
 	wpa_supplicant BlueZ DBus-Python GnuTLS GTK-Doc libpsl \
 	qt-everywhere Valgrind
 	@echo $@
 
-newt : # popt slang GPM
+newt : popt slang GPM
 	@echo $@
 
-nodejs : c-ares # ICU libuv nghttp2
+nodejs : c-ares ICU libuv nghttp2
 	@echo $@
 
 Noto-fonts :
@@ -482,10 +489,10 @@ npth :
 ntfs-3g : # fuse 2.x optional (this disables user mounts)
 	@echo $@
 
-Okular : kf5 libkexiv2 Poppler qca # libtiff
+Okular : kf5 libkexiv2 Poppler qca libtiff
 	@echo $@
 
-opencv : libexif xine-lib # CMake UnZip gst-plugins-base GTK3 \
+opencv : libexif xine-lib CMake unzip gst-plugins-base GTK3 \
 	JasPer libpng libtiff libwebp v4l-utils apache-ant Doxygen \
 	java Python2
 	@echo $@
@@ -493,32 +500,32 @@ opencv : libexif xine-lib # CMake UnZip gst-plugins-base GTK3 \
 OpenEXR :
 	@echo $@
 
-OpenJPEG : # CMake LCMS2 libpng libtiff Doxygen
+OpenJPEG : CMake LCMS2 libpng libtiff Doxygen
 	@echo $@
 
 Oxygen-fonts :
 	@echo $@
 
-oxygen-icons : # extra-cmake-modules qt-everywhere
+oxygen-icons : extra-cmake-modules qt-everywhere
 	@echo $@
 
 p7zip : # wxWidgets optional
 	@echo $@
 
-pangomm : libcairomm glibmm # Pango
+pangomm : libcairomm glibmm Pango
 	@echo $@
 
 Parse-Yapp :
 	@echo $@
 
-parted : dosfstools # LVM2 dosfstools
+parted : dosfstools LVM2 dosfstools
 	@echo $@
 
-Phonon : extra-cmake-modules # CMake GLib qt-everywhere
+Phonon : extra-cmake-modules CMake GLib qt-everywhere
 	@echo $@
 
 phonon-backend-gstreamer : gst-plugins-bad gst-plugins-ugly Phonon \
-	# gstreamer libxml2 gst-plugins-base gst-plugins-good
+	gstreamer libxml2 gst-plugins-base gst-plugins-good
 	@echo $@
 
 phonon-backend-vlc : Phonon VLC
@@ -530,7 +537,7 @@ pimcommon : akonadi akonadi-search kimap kldap libkdepim
 pinentry : libassuan
 	@echo $@
 
-pipewire : # BlueZ ffmpeg gstreamer gst-plugins-base libva PulseAudio sbc \
+pipewire : BlueZ ffmpeg gstreamer gst-plugins-base libva PulseAudio SBC \
 	SDL2 v4l-utils Valgrind Doxygen Graphviz
 	@echo $@
 
@@ -538,58 +545,58 @@ plasma-wayland-protocols : extra-cmake-modules
 	@echo $@
 
 plasma5 : pipewire lm-sensors oxygen-icons smartmontools Xorg_Synaptics_Driver \
-	# GConf GTK2 GTK3 kf5 libpwquality libxkbcommon Mesa Wayland \
-	NetworkManager PulseAudio qca sassc taglib xcb-util-cursor ffts \
+	GConf GTK2 GTK3 kf5 libpwquality libxkbcommon Mesa Wayland \
+	NetworkManager PulseAudio qca sassc taglib xcb-util-cursor fftw \
 	gsettings-desktop-schemas libdbusmenu-qt libcanberra libinput \
-	Linux-PAM GLU, ibus
+	Linux-PAM GLU ibus
 	@echo $@
 
-polkit-qt : # CMake Polkit qt-everywhere
+polkit-qt : CMake Polkit qt-everywhere
 	@echo $@
 
-Poppler : OpenJPEG # CMake Fontconfig Cairo LCMS2 libjpeg-turbo \
-	libpng NSS Boost cURL gdk-pixbuf git gobject-introspection \
+Poppler : OpenJPEG CMake Fontconfig Cairo LCMS2 libjpeg-turbo \
+	libpng nss Boost cURL gdk-pixbuf git gobject-introspection \
 	GTK-Doc Pygments GTK3 libtiff qt-everywhere
 	@echo $@
 
-qca : GnuPG2 # make-ca CMake qt-everywhere which Cyrus-SASL libgcrypt \
-	libgpg-error NSS NSPR p11-kit Doxygen which
+qca : GnuPG2 make-ca CMake qt-everywhere which Cyrus-SASL libgcrypt \
+	libgpg-error nss nspr p11-kit Doxygen which
 	@echo $@
 
 qt5webkit : hyphen
 	@echo $@
 
-qtkeychain : kf5 # Cyrus-SASL
-	@echo $@
+qtkeychain : kf5 Cyrus-SASL
+	@echo $@ "https://github.com/frankosterfeld/qtkeychain"
 
-qtwebengine : nodejs # NSS Python2 qt-everywhere alsa-lib PulseAudio \
+qtwebengine : nodejs nss Python2 qt-everywhere alsa-lib PulseAudio \
 	ffmpeg ICU libwebp libxslt Opus libevent Poppler
 	@echo $@
 
 Samba : jansson lmdb Fuse GPGME Parse-Yapp GnuPG2
 	@echo $@
 
-signond : # qt-everywhere
-	@echo $@
+signond : qt-everywhere
+	@echo $@ "https://gitlab.com/accounts-sso/signond.git"
 
-smartmontools : # cURL Lynx wget GnuPG2
+smartmontools : cURL Lynx wget GnuPG2
 	@echo $@
 
 SoundTouch :
 	@echo $@
 
-SWIG : # PCRE Boost
+SWIG : PCRE Boost
 	@echo $@
 
 UDisks : libatasmart libblockdev dosfstools gptfdisk ntfs-3g \
-	# libgudev libxslt Polkit btrfs-progs mdadm xfsprogs \
+	libgudev libxslt Polkit btrfs-progs mdadm xfsprogs \
 	gobject-introspection DBus-Python GTK-Doc LVM2 PyGObject
 	@echo $@
 
 UnRar :
 	@echo $@
 
-UPower : # libgudev libusb Polkit gobject-introspection GTK-Doc \
+UPower : libgudev libusb Polkit gobject-introspection GTK-Doc \
 	PyGObject
 	@echo $@
 
@@ -597,23 +604,23 @@ VLC : FAAD2 libass libmpeg2 liba52 libcddb libdvdcss libdvdread \
 	libdvdnav libidn libmad Lua ffmpeg Samba x264
 	@echo $@
 
-volume-key : GPGME SWIG # cryptsetup GLib NSS
+volume-key : GPGME SWIG cryptsetup GLib nss
 	@echo $@
 
-x264 : # NASM
+x264 : NASM
 	@echo $@
 
-x265 : # CMake NASM
+x265 : CMake NASM
 	@echo $@
 
-xapian : # Valgrind
+xapian : Valgrind
 	@echo $@
 
 xine-lib : FAAD2 ImageMagick liba52 libdvdcss libdvdnav libmad Samba ffmpeg-min
 	@echo $@
 
-Xorg_Synaptics_Driver : # libevdev Xorg-Server
+Xorg_Synaptics_Driver : libevdev Xorg-Server
 	@echo $@
 
-XviD : # yasm or NASM
+XviD : yasm NASM
 	@echo $@
diff --git a/blfs/Makefile b/blfs/Makefile
index 7057155..02275e8 100644
--- a/blfs/Makefile
+++ b/blfs/Makefile
@@ -1,7 +1,7 @@
 targets = wpa_supplicant wget desktop-file-utils \
 		  libpwquality OpenSSH shared-mime-info Systemd-Extras
 
-all   : $(targets) $(xorg) $(qt5) $(kde) $(utils)
+all   : $(targets) $(xorg) $(qt5) $(kde) $(utils) $(extratargets)
 
 apache-ant : GLib java
 	@echo $@
@@ -57,9 +57,6 @@ cURL-extra : Brotli c-ares GnuTLS libidn2 libpsl libssh2 Samba
 Cyrus-SASL : Berkeley_DB java sqlite3
 	@echo $@
 
-Cyrus-SASL-Extras : Linux-PAM MariaDB MIT_Kerberos-keyutils OpenLDAP PostgreSQL
-	@echo $@
-
 dbus-xorglibs : Xorg-Libs
 	@echo $@
 
@@ -366,9 +363,6 @@ OpenJade : OpenSP SGMLSpm Lynx
 OpenLDAP : Berkeley_DB Cyrus-SASL
 	@echo $@
 
-OpenLDAP-Extras : GnuTLS MariaDB PostgreSQL Pth unixODBC
-	@echo $@
-
 OpenSP : sgml-common xmlto
 	@echo $@
 
@@ -414,9 +408,6 @@ rustc : CMake cURL libssh2 LLVM
 SCons : docbook-xsl libxslt
 	@echo $@
 
-Serf : Apr-Util SCons MIT_Kerberos
-	@echo $@
-
 sgml-common :
 	@echo $@
 
@@ -441,10 +432,6 @@ sqlite3 : libedit unzip
 Subversion : Apr-Util sqlite3
 	@echo $@
 
-Subversion-Extras : Apache apache-ant Boost Cyrus-SASL dbus-xorglib Doxygen \
-	gnome-keyring java libsecret Ruby SWIG LZ4 UTF8proc
-	@echo $@
-
 sudo : bind-utils Linux-PAM MIT_Kerberos-keyutils OpenLDAP
 	@echo $@
 
@@ -527,3 +514,5 @@ zsh : libcap-pam PCRE Valgrind
 include Xorg.Makefile
 include QT5.Makefile
 include KDE.Makefile
+include Utils.Makefile
+include Extras.Makefile
diff --git a/blfs/QT5.Makefile b/blfs/QT5.Makefile
index e0794ec..51df39a 100644
--- a/blfs/QT5.Makefile
+++ b/blfs/QT5.Makefile
@@ -11,22 +11,22 @@ qt5 = qt-everywhere Avahi-qt CMake-qt gst-plugins-base-qt \
 	  gst-plugins-good-qt v4l-utils-qt wpa_supplicant-qt
 
 
-all: $(qt5)
+all: Systemd-Extras $(qt5)
 
 qt-everywhere : Alsa Cups gst-plugins-good JasPer libmng libtiff-libwebp \
 	ibus MariaDB pciutils PostgreSQL Python2 PulseAudio SDL2 unixODBC \
-	#Xorg-Libs make-ca GLib HarfBuzz ICU libjpeg-turbo libpng libtiff \
-	libxkbcommon Mesa MIT_Kerberos mtdev PCRE2 SQLite Wayland xcb-util-image \
+	Xorg-Libs make-ca GLib HarfBuzz ICU libjpeg-turbo libpng libtiff \
+	libxkbcommon Mesa MIT_Kerberos mtdev PCRE2 sqlite3 Wayland xcb-util-image \
 	xcb-util-keysyms xcb-util-renderutil xcb-util-wm BlueZ libinput
 	@echo $@
 
-AAlib : GPM slang # Xorg-Libs
+AAlib : GPM slang Xorg-Libs
 	@echo $@
 
 Alsa : alsa-lib alsa-plugins alsa-utils alsa-oss
 	@echo $@
 
-alsa-lib : Python2 #Doxygen
+alsa-lib : Python2 Doxygen
 	@echo $@
 
 alsa-oss : alsa-lib
@@ -35,11 +35,11 @@ alsa-oss : alsa-lib
 alsa-plugins : alsa-lib libsamplerate PulseAudio Speex
 	@echo $@
 
-alsa-utils : alsa-lib fftw libsamplerate # docutils xmlto
+alsa-utils : alsa-lib fftw libsamplerate docutils xmlto
 	@echo $@
 
 Avahi : libdaemon libglade DBus-Python PyGTK \
-	# GLib gobject-retrospection GTK2 GTK3 libevent Doxygen
+	GLib gobject-introspection GTK2 GTK3 libevent Doxygen
 	@echo $@
 
 Avahi-qt : qt-everywhere
@@ -48,7 +48,7 @@ Avahi-qt : qt-everywhere
 bash-completion :
 	@echo $@ "https://github.com/scop/bash-completion"
 
-Boost : # which ICU
+Boost : which ICU
 	@echo $@
 
 CDParanoia-III :
@@ -57,41 +57,40 @@ CDParanoia-III :
 CMake-qt : qt-everywhere
 	@echo $@
 
-colord: LCMS2 libgusb SANE #Polkit SQLite gobject-introspection libgudev Vala
+colord: LCMS2 libgusb SANE Polkit sqlite3 gobject-introspection libgudev Vala
 	@echo $@
 
-Cups : Avahi colord libpaper Python2 xdg-utils #dbus libusb Linux-PAM \
-	java
+Cups : Avahi colord libpaper Python2 xdg-utils libusb Linux-PAM java # dbus
 	@echo $@
 
-dbus-glib : # dbus GLib GTK-Doc
+dbus-glib : GLib GTK-Doc # dbus
 	@echo $@
 
-DBus-Python : Python2 PyGObject # dbus docutils GLib
+DBus-Python : Python2 PyGObject docutils GLib # dbus
 	@echo $@
 
-DConf : bash-completion # dbus GLib GTK3 libxml2 libxslt Vala GTK-Doc
+DConf : bash-completion GLib GTK3 libxml2 libxslt Vala GTK-Doc # dbus
 	@echo $@
 
 fftw :
 	@echo $@
 
-FLAC : libogg # NASM Docbook-utils Doxygen Valgrind
+FLAC : libogg NASM DocBook-Utils Doxygen Valgrind
 	@echo $@
 
-GConf : dbus-glib # libxml2 gobject-introspection GTK3 Polkit OpenLDAP
+GConf : dbus-glib libxml2 gobject-introspection GTK3 Polkit OpenLDAP
 	@echo $@
 
 giflib : # xmlto
 	@echo $@
 
-glib-networking : gsettings-desktop-schemas # GLib GnuTLS make-ca
+glib-networking : gsettings-desktop-schemas GLib GnuTLS make-ca
 	@echo $@
 
 GPM :
 	@echo $@
 
-gsettings-desktop-schemas : # GLib gobject-introspection
+gsettings-desktop-schemas : GLib gobject-introspection
 	@echo $@
 
 Gsl :
@@ -101,8 +100,8 @@ graphene :
 	@echo $@
 
 gst-plugins-base : alsa-lib CDParanoia-III graphene gstreamer libogg libtheora \
-	libvorbis Opus SDL2 #Valgrind gobject-introspection ISO-Codes \
-	libgudev Mesa wayland-protocols Xorg-Libs
+	libvorbis Opus SDL2 Valgrind gobject-introspection ISO-Codes \
+	libgudev Mesa Wayland-Protocols Xorg-Libs
 	@echo $@
 
 gst-plugins-base-qt : qt-everywhere
@@ -110,58 +109,58 @@ gst-plugins-base-qt : qt-everywhere
 
 gst-plugins-good : AAlib alsa-oss FLAC gst-plugins-base LAME libcaca \
 	libdv libsoup libvpx mpg123 PulseAudio Speex taglib v4l-utils \
-	# Cairo GTK3 libgudev libjpeg-turbo libpng Mesa Wayland Valgrind \
+	Cairo GTK3 libgudev libjpeg-turbo libpng Mesa Wayland Valgrind \
 	NASM Xorg-Libs
 	@echo $@
 
 gst-plugins-good-qt : qt-everywhere
 	@echo $@
 
-gstreamer : Gsl # GLib gobject introspection GTK3 Valgrind
+gstreamer : Gsl GLib gobject-introspection GTK3 Valgrind
 	@echo $@
 
 ibus : DConf libnotify DBus-Python PyGObject PyXDG \
-	# ISO-Codes Vala gobject-introspection GTK2 GTK-Doc libxkbcommon \
+	ISO-Codes Vala gobject-introspection GTK2 GTK-Doc libxkbcommon \
 	Wayland
 	@echo $@
 
-Imlib2 : giflib libid3tag # Xorg-Libs libpng libjpeg-turbo libtiff-webp
+Imlib2 : giflib libid3tag Xorg-Libs libpng libjpeg-turbo libtiff-webp
 	@echo $@
 
-JasPer : # CMake libjpeg-turbo freeglut
+JasPer : CMake libjpeg-turbo freeglut
 	@echo $@
 
-LAME : libsndfile # NASM
+LAME : libsndfile NASM
 	@echo $@
 
-LCMS2 : # libjpeg-turbo libtiff
+LCMS2 : libjpeg-turbo libtiff
 	@echo $@
 
-libcaca : Imlib2 slang # Xorg-Libs
+libcaca : Imlib2 slang Xorg-Libs
 	@echo $@
 
-libdaemon : # Doxygen Lynx
+libdaemon : Doxygen Lynx
 	@echo $@
 
-libdazzle : # GTK3 Vala
+libdazzle : GTK3 Vala
 	@echo $@
 
-libdv : # popt Xorg-Libs
+libdv : popt Xorg-Libs
 	@echo $@
 
-libglade : Python2 #libxml2 GTK2 GTK-Doc
+libglade : Python2 libxml2 GTK2 GTK-Doc
 	@echo $@
 
-libgusb : usbutils # libusb #GTK-Doc gobject-introspection Vala
+libgusb : usbutils libusb GTK-Doc gobject-introspection Vala
 	@echo $@
 
 libid3tag :
 	@echo $@
 
-libmng : LCMS2 # libjpeg-turbo
+libmng : LCMS2 libjpeg-turbo
 	@echo $@
 
-libnotify : # GTK3 gobject-introspection GTK-Doc xmlto
+libnotify : GTK3 gobject-introspection GTK-Doc xmlto
 	@echo $@
 
 libogg :
@@ -170,16 +169,16 @@ libogg :
 libpaper :
 	@echo $@
 
-libpsl : # libidn2 GTK-Doc Valgrind
+libpsl : libidn2 GTK-Doc Valgrind
 	@echo $@
 
 libsamplerate : alsa-lib libsndfile fftw
 	@echo $@
 
-libsndfile : alsa-lib FLAC libvorbis Opus Speex # SQLite
+libsndfile : alsa-lib FLAC libvorbis Opus Speex sqlite3
 	@echo $@
 
-libsoup : glib-networking libpsl sysprof # libxml2 SQLite \
+libsoup : glib-networking libpsl sysprof libxml2 sqlite3 \
 	gobject-introspection Vala
 	@echo $@
 
@@ -192,17 +191,17 @@ libtheora-qt : qt-everywhere
 libvorbis : libogg
 	@echo $@
 
-libvpx : # yasm NASM which cURL Doxygen
+libvpx : yasm NASM which cURL Doxygen
 	@echo $@
 
-libwebp : giflib # libjpeg-turbo libpng libtiff
+libwebp : giflib libjpeg-turbo libpng libtiff
 	@echo $@
 
 libtiff-libwebp : libwebp
 	@echo $@
 
 MariaDB : Boost Ruby unixODBC \
-	# CMake libevent libaio libxml2 Linux-PAM MIT_Kerberos PCRE Valgrind
+	CMake libevent libaio libxml2 Linux-PAM MIT_Kerberos PCRE Valgrind
 	@echo $@
 
 mpg123 : alsa-lib Boost PulseAudio
@@ -211,36 +210,33 @@ mpg123 : alsa-lib Boost PulseAudio
 Opus :
 	@echo $@
 
-pciutils : # cURL Wget Lynx
+pciutils : cURL wget Lynx
 	@echo $@
 
-PHP-Extras : # a whole bunch of deps here. Build in a future target
-	@echo $@
-
-PostgreSQL : Python2 # ICU libxml2 OpenLDAP Linux-PAM MIT_Kerberos \
-	fop docbook-dtd docbook-dsssl DocBook-utils OpenJade SGSMLSpm
+PostgreSQL : Python2 ICU libxml2 OpenLDAP Linux-PAM MIT_Kerberos \
+	fop docbook-dtd docbook-dsssl DocBook-Utils OpenJade SGMLSpm
 	@echo $@
 
 PulseAudio : libsndfile alsa-lib Speex Avahi fftw GConf libsamplerate SBC \
-	# dbus GLib libcap-pam Xorg-Libs BlueZ Doxygen GTK3 Valgrind
+	GLib libcap-pam Xorg-Libs BlueZ Doxygen GTK3 Valgrind # dbus
 	@echo $@
 
-PyCairo : Python2 # Cairo
+PyCairo : Python2 Cairo
 	@echo $@
 
 PyGObject : PyCairo Python2
 	@echo $@
 
-PyGTK : libglade PyCairo PyGObject Python2 # ATK GTK2 libxslt Pango
+PyGTK : libglade PyCairo PyGObject Python2 ATK GTK2 libxslt Pango
 	@echo $@
 
-Python2 : # BlueZ Valgrind SQLite Tk
+Python2 : BlueZ Valgrind sqlite3 Tk
 	@echo $@
 
 PyXDG : Python2
 	@echo $@
 
-Ruby : # Berkeley_DB Doxygen Graphviz Tk Valgrind
+Ruby : Berkeley_DB Doxygen Graphviz Tk Valgrind
 	@echo $@
 
 SANE : Avahi v4l-utils
@@ -249,23 +245,23 @@ SANE : Avahi v4l-utils
 SBC : libsndfile
 	@echo $@
 
-SDL2 : Alsa ibus PulseAudio libsamplerate # libxkbcommon \
-	wayland-protocols Xorg-Libs Doxygen NASM
+SDL2 : Alsa ibus PulseAudio libsamplerate \
+   	libxkbcommon Wayland-Protocols Xorg-Libs Doxygen NASM
 	@echo $@
 
-slang : # libpng PCRE
+slang : libpng PCRE
 	@echo $@
 
-Speex : libogg # Valgrind
+Speex : libogg Valgrind
 	@echo $@
 
-sysprof : libdazzle # GTK3 Polkit
+sysprof : libdazzle GTK3 Polkit
 	@echo $@
 
-taglib : # CMake
+taglib : CMake
 	@echo $@
 
-v4l-utils : alsa-lib SDL2 # Doxygen GLU libjpeg-turbo
+v4l-utils : alsa-lib SDL2 Doxygen GLU libjpeg-turbo
 	@echo $@
 
 v4l-utils-qt : qt-everywhere
@@ -274,10 +270,10 @@ v4l-utils-qt : qt-everywhere
 unixODBC :
 	@echo $@
 
-usbutils : # libusb Wget
+usbutils : libusb wget
 	@echo $@
 
-xdg-utils : # xmlto Lynx Xorg-Apps dbus
+xdg-utils : xmlto Lynx Xorg-Apps # dbus
 	@echo $@
 
 wpa_supplicant-qt : qt-everywhere
diff --git a/blfs/Utils.Makefile b/blfs/Utils.Makefile
index f4c2650..dec08ad 100644
--- a/blfs/Utils.Makefile
+++ b/blfs/Utils.Makefile
@@ -1,6 +1,344 @@
 # Most deps like GLib, Xorg, gobject-introspection brought in from
 # Systemd-Extras and Xorg in main and Xorg Makefiles and not listed 
 # here or commented in targets
-utiltargets = 
+#
+# These are utils or libraries or other apps. Maybe rename this.
+# These may depend on QT/KF5 or other
+
+utiltargets = $(security) $(filesystems) $(genlibs) $(uefiboot) $(editors) \
+			  $(shells) $(virtualization) $(graphfontlibs) $(genutils) \
+			  $(sysutils) $(programming) $(netprogs) $(netutils) $(netlibs) \
+			  $(textbrowsers) $(mail_newsclients) $(servers)
+
+all : Systemd-Extras $(utiltargets)
+
+editors = Bluefish Ed Emacs Joe Nano Vim # Gedit Mousepad
+
+filesystems = jfsutils sshfs
+
+genlibs = Double-conversion enchant liblinear Talloc telepathy-glib \
+		  # CLucene Exempi GMime gspell libgrss libgsf \
+		  libiodbc libportal libsigc3 libstatgrab \
+		  libuninameslist libunique Pth Uchardet Umockdev wv
+
+genutils = Bogofilter Compface Hd2u Highlight lsof Rarian Rep-gtk Screen \
+		   telepathy-logger telepathy-mission-control tidy-html5 Time \
+		   tree Xdg-user-dirs
+
+#gnomeapps = Gucharmap
+
+graphfontlibs = babl gegl GLM libmypaint libspiro mypaint-brushes Potrace \
+				Qpdf woff2
+
+mail_newsclients = Fetchmail mailx Mutt Procmail
+
+netlibs = # GeoClue ldns libnma uhttpmock
+
+netprogs = bridge-utils cifs-utils iw NcFTP Wireless_tools
+
+netutils = Nmap Traceroute Whois Wireshark \
+		   # Avahi bind-utils NetworkManager network-manager-applet
+
+programming = librep Lua54 Mercurial # Cbindgen 
+
+security = haveged liboauth ssh-askpass \
+		   # firewall polkit-gnome stunnel Tripwire
+
+servers = # Apache BIND ProTPD vsftpd Dovecot Exim Postfix sendmail unbound
+
+shells = Dash Tcsh
+
+sysutils = acpid at autofs cups-pk-helper \
+		   Fcron Hdparm LSB-Tools Logrotate MC \
+		   Pax pm-utils  sg3_utils Sysstat \
+		   # AccountsService Bubblewrap notification-daemon \
+		   Raptor Rasqal Redland
+
+textbrowsers = Links # Lynx
+
+uefiboot = # efivar efibootmgr GRUB
+
+#virtualization = qemu
 
 all: $(utiltargets)
+
+### Security ###
+
+haveged :
+	@echo $@
+
+liboauth : cURL nss Doxygen
+	@echo $@
+
+ssh-askpass : GTK2 sudo Xorg-Libs
+	@echo $@
+
+### Filesystems ###
+
+jfsutils :
+	@echo $@
+
+sshfs : Fuse GLib docutils
+	@echo $@
+
+### UEFI Boot ###
+
+
+
+### Editors ###
+
+Bluefish : enchant Gucharmap # Jing
+	@echo $@
+
+Ed : libarchive
+	@echo $@
+
+Emacs : HarfBuzz giflib GnuTLS jansson libtiff Xorg-Libs \
+	alsa-lib Cairo GConf gobject-introspection gsettings-desktop-schemas \
+	GPM GTK2 GTK3 ImageMagick LCMS2 libjpeg-turbo libpng librsvg libxml2 \
+	MIT_Kerberos Valgrind # dbus
+	@echo $@
+
+Joe :
+	@echo $@
+
+Nano :
+	@echo $@
+
+Vim : Lua54 Xorg-Libs GTK3 GPM rsync Ruby
+	@echo $@
+
+### General Libraries ###
+
+Double-conversion : CMake
+	@echo $@
+
+enchant : GLib Aspell dbus-glib Doxygen Hspell Hunspell 
+	@echo $@
+
+liblinear :
+	@echo $@
+
+Talloc : docbook-xml docbook-xsl libxslt GDB git libnsl libtirpc Valgrind \
+	xfsprogs
+	@echo $@
+
+telepathy-glib : dbus-glib GTK-Doc libxslt gobject-introspection Vala # dbus
+	@echo $@
+
+### Graphics and Font Libraries ###
+
+babl : gobject-introspection librsvg LCMS2 Vala
+	@echo $@
+
+gegl : babl gexiv2 libspiro JSON-GLib libjpeg-turbo libpng \
+	gobject-introspection Graphviz Pygments PyGObject asciidoc Cairo \
+	Exiv2 ffmpeg gdk-pixbuf GTK-Doc JasPer LCMS2 librsvg libtiff \
+	libwebp Pango Ruby SDL2 v4l-utils Vala OpenEXR
+	@echo $@
+
+GLM :
+	@echo $@
+
+libmypaint : json-c GLib gobject-introspection Doxygen
+	@echo $@
+
+libspiro :
+	@echo $@
+
+mypaint-brushes : libmypaint
+	@echo $@
+
+Potrace : LLVM
+	@echo $@
+
+Qpdf : libjpeg-turbo fop GnuTLS libxslt
+	@echo $@
+
+woff2 : Brotli CMake
+	@echo $@
+
+### General Utilities ###
+
+Bogofilter : Berkeley_DB Gsl libxml2 lmdb sqlite3 xmlto
+	@echo $@
+
+Compface :
+	@echo $@
+
+Hd2u : popt
+	@echo $@
+
+Highlight : Lua54 Boost qt-everywhere
+	@echo $@
+
+lsof : libtirpc
+	@echo $@
+
+Rarian : libxslt docbook-xml
+	@echo $@
+
+Rep-gtk : librep GTK2
+	@echo $@
+
+Screen : Linux-PAM
+	@echo $@
+
+telepathy-logger : telepathy-glib Python2 sqlite3
+	@echo $@
+
+telepathy-mission-control : telepathy-glib DBus-Python NetworkManager \
+	GTK-Doc UPower
+	@echo $@
+
+tidy-html5 : CMake libxslt
+	@echo $@
+
+Time :
+	@echo $@
+
+tree :
+	@echo $@
+
+Xdg-user-dirs :
+	@echo $@
+
+### System Utilities ###
+
+acpid :
+	@echo $@
+
+at :
+	@echo $@
+
+autofs : nfs-utils libtirpc rpcsvc-proto libnsl libxml2 MIT_Kerberos \
+	OpenLDAP Cyrus-SASL
+	@echo $@
+
+cups-pk-helper :
+	@echo $@
+
+Fcron : Vim Linux-PAM DocBook-Utils
+	@echo $@
+
+Hdparm :
+	@echo $@
+
+LSB-Tools :
+	@echo $@
+
+Logrotate : popt
+	@echo $@
+
+MC : GLib PCRE slang Doxygen GPM libssh2 Ruby Samba unzip Xorg-Libs Zip
+	@echo $@
+
+Pax :
+	@echo $@
+
+pm-utils : xmlto Hdparm
+	@echo $@
+
+sg3_utils :
+	@echo $@
+
+Sysstat :
+	@echo $@
+
+### Gnome Libraries and Desktop ###
+
+gexiv2 : Exiv2 Vala GTK-Doc Python2
+	@echo $@
+
+### Gnome Apps ###
+
+Gucharmap : desktop-file-utils GTK3 itstool unzip wget \
+	gobject-introspection Vala GTK-Doc
+	@echo $@
+
+### Shells ###
+
+Dash :
+	@echo $@
+
+Tcsh :
+	@echo $@
+
+### Virtualization ###
+
+
+### Programming ###
+
+librep :
+	@echo $@
+
+Lua54 :
+	@echo $@
+
+Mercurial : docutils git GnuPG2 OpenSSH Pygments rustc Subversion
+	@echo $@
+
+### Networking Programs ###
+
+bridge-utils :
+	@echo $@
+
+cifs-utils : Talloc keyutils Linux-PAM MIT_Kerberos Samba libcap-pam
+	@echo $@
+
+iw : libnl
+	@echo $@
+
+NcFTP : LLVM
+	@echo $@
+
+nfs-utils : rpcbind libtirpc rpcsvc-proto Cyrus-SASL LVM2 libnsl OpenLDAP \
+	sqlite3 MIT_Kerberos libcap-pam
+	@echo $@
+
+rpcbind : libtirpc
+	@echo $@
+
+Wireless_tools :
+	@echo $@
+
+### Networking Utilities ###
+
+Nmap : liblinear Lua54 libpcap PCRE PyGTK Python2 libssh2
+	@echo $@
+
+Traceroute :
+	@echo $@
+
+Whois : libidn2
+	@echo $@
+
+Wireshark : CMake GLib libgcrypt qt-everywhere libpcap Brotli c-ares \
+	Doxygen git GnuTLS libnl libxslt libxml2 Lua MIT_Kerberos nghttp2 \
+	SBC Speex
+	@echo $@
+
+### Networking Libraries ###
+
+Serf : Apr-Util SCons MIT_Kerberos
+	@echo $@
+
+### Text Web Browsers ###
+
+Links : libevent GPM Xorg-Libs libpng libjpeg-turbo librsvg libtiff
+	@echo $@
+
+### Mail / News Clients ###
+
+Fetchmail : Procmail MIT_Kerberos
+	@echo $@
+
+mailx : nss MIT_Kerberos
+	@echo $@
+
+Mutt : Links Lynx Aspell Cyrus-SASL GDB GnuPG2 GPGME libidn MIT_Kerberos \
+	slang sqlite3
+	@echo $@
+
+Procmail : libnsl
+	@echo $@
diff --git a/blfs/Xorg.Makefile b/blfs/Xorg.Makefile
index 13ec6e2..55f28f5 100644
--- a/blfs/Xorg.Makefile
+++ b/blfs/Xorg.Makefile
@@ -1,6 +1,7 @@
 # Most deps like GLib, Xorg-Libs, gobject-introspection brought in from
 # Systemd-Extras in main Makefile and not listed here or commented in targets
-xorg = xcb-util xcb-util-image xcb-util-keysyms xcb-util-renderutil \
+xorg = Systemd-Extras \
+	   xcb-util xcb-util-image xcb-util-keysyms xcb-util-renderutil \
 	   xcb-util-wm xcb-util-cursor libva Mesa libva-Mesa xbitmaps Xorg-Apps \
 	   xcursor-themes Xorg-Fonts librsvg Xorg-Server Xorg-Drivers \
 	   twm xterm xclock xinit
@@ -10,13 +11,13 @@ all: $(xorg)
 at-spi2-atk : at-spi2-core ATK
 	@echo $@
 
-at-spi2-core : # dbus GLib Xorg-Libs gobject-introspection GTK-Doc
+at-spi2-core : GLib Xorg-Libs gobject-introspection GTK-Doc # dbus
 	@echo $@
 
-ATK : # GLib gobject-introspection GTK-Doc
+ATK : GLib gobject-introspection GTK-Doc
 	@echo $@
 
-Cairo : Pixman libdrm # Fontconfig GLib GTK-Doc libpng libxml2 LZO Valgrind \
+Cairo : Pixman libdrm Fontconfig GLib GTK-Doc libpng libxml2 LZO Valgrind \
 	Xorg-Libs
 	@echo $@
 
@@ -29,15 +30,15 @@ dejavu-fonts :
 docutils :
 	@echo $@
 
-freeglut : GLU #CMake
+freeglut : GLU CMake
 	@echo $@
 
 FriBidi :
 	@echo $@
 
 gdk-pixbuf : libjpeg-turbo libtiff \
-	# librsvg runtime \
-	 GLib libpng shared-mime-info gobject-introspection GTK-Doc
+	GLib libpng shared-mime-info gobject-introspection GTK-Doc \
+	# librsvg-runtime	
 	@echo $@
 
 GLU : Mesa
@@ -48,10 +49,7 @@ GTK2 : ATK gdk-pixbuf Pango hicolor-icon-theme
 
 GTK3 : at-spi2-atk gdk-pixbuf hicolor-icon-theme ISO-Codes \
 	JSON-GLib libepoxy Pango sassc \
-	# libxkbcommon Wayland wayland-protocols DocBook-utils GTK-Doc
-	@echo $@
-
-GTK3-Extras : adwaita-icon-theme colord Cups PyAtSpi2 rest \
+	libxkbcommon Wayland Wayland-Protocols DocBook-Utils GTK-Doc
 	@echo $@
 
 HarfBuzz-Cairo : Cairo
@@ -66,7 +64,7 @@ ISO-Codes :
 JBIG-KIT :
 	@echo $@
 
-JSON-GLib : # GLib gobject-introspection GTK-Doc
+JSON-GLib : GLib gobject-introspection GTK-Doc
 	@echo $@
 
 libdrm : docutils
@@ -78,19 +76,19 @@ libepoxy : Mesa
 libevdev :
 	@echo $@
 
-libgudev : # GLib gobject-introspection GTK-Doc
+libgudev : GLib gobject-introspection GTK-Doc
 	@echo $@
 
 libinput : GTK3 libevdev libwacom mtdev
 	@echo $@
 
-libjpeg-turbo : NASM # CMake yasm
+libjpeg-turbo : NASM CMake yasm
 	@echo $@
 
-librsvg : gdk-pixbuf Cairo Pango #rustc gobject-introspection Vala GTK-Doc
+librsvg : gdk-pixbuf Cairo Pango rustc gobject-introspection Vala GTK-Doc
 	@echo $@
 
-libtiff : Mesa freeglut JBIG-KIT # CMake
+libtiff : Mesa freeglut JBIG-KIT CMake
 	@echo $@
 
 libtiff-webp :
@@ -102,23 +100,23 @@ libva : libdrm
 libva-Mesa : Mesa
 	@echo $@
 
-libvdpau : # Xorg-Libs Graphviz
+libvdpau : Xorg-Libs Graphviz
 	@echo $@
 
 libwacom : libgudev
 	@echo $@
 
-Mesa : libdrm libva libvdpau # LLVM libgcrypt Nettle Valgrind
+Mesa : libdrm libva libvdpau LLVM libgcrypt Nettle Valgrind
 	@echo $@ https://gitlab.freedesktop.org/mesa/mesa.git
 
 mtdev :
 	@echo $@
 
-NASM : # asciidoc xmlto
+NASM : asciidoc xmlto
 	@echo $@
 
 Pango : HarfBuzz-Cairo FriBidi \
-	# Fontconfig GLib gobject-introspection Xorg-Libs GTK-Doc
+	Fontconfig GLib gobject-introspection Xorg-Libs GTK-Doc
 	@echo $@
 
 Pixman :
@@ -127,19 +125,16 @@ Pixman :
 Pixman-GTK2 : GTK2
 	@echo $@
 
-Pixman-Extras : # GTK2 and libpng for tests and demos
-	@echo $@
-
 sassc :
 	@echo $@
 
 twm : Xorg-Legacy-Fonts Xorg-Server
 	@echo $@
 
-xbitmaps : # util-macros
+xbitmaps : util-macros
 	@echo $@
 
-xcb-util : # libxcb
+xcb-util : libxcb
 	@echo $@
 
 xcb-util-cursor : xcb-util
@@ -148,25 +143,25 @@ xcb-util-cursor : xcb-util
 xcb-util-image : xcb-util
 	@echo $@
 
-xcb-util-keysyms : # libxcb
+xcb-util-keysyms : libxcb
 	@echo $@
 
-xcb-util-renderutil : # libxcb
+xcb-util-renderutil : libxcb
 	@echo $@
 
-xcb-util-wm : # libxcb
+xcb-util-wm : libxcb
 	@echo $@
 
-xclock : # Xorg-Libs
+xclock : Xorg-Libs
 	@echo $@
 
 xcursor-themes : Xorg-Apps
 	@echo $@
 
-xinit : # Xorg-Libs
+xinit : Xorg-Libs
 	@echo $@
 
-Xorg-Apps : Mesa xbitmaps xcb-util # libpng Linux-PAM
+Xorg-Apps : Mesa xbitmaps xcb-util libpng Linux-PAM
 	@echo $@
 
 Xorg-Drivers : libevdev libinput mtdev Xorg-Server
@@ -179,9 +174,9 @@ Xorg-Legacy-Fonts : xcursor-themes
 	@echo $@
 
 Xorg-Server : libepoxy Pixman-GTK2 xcb-util-keysyms xcb-util-image \
-	xcb-util-renderutil xcb-util-wm Xorg-Fonts # xkeyboard-config Wayland \
-	wayland-protocols Nettle libgcrypt fop
+	xcb-util-renderutil xcb-util-wm Xorg-Fonts xkeyboard-config Wayland \
+	Wayland-Protocols Nettle libgcrypt fop
 	@echo $@
 
-xterm : dejavu-fonts Xorg-Apps # PCRE2 Valgrind
+xterm : dejavu-fonts Xorg-Apps PCRE2 Valgrind
 	@echo $@