Major changes

1 files changed, 350 insertions, 0 deletions

diff --git a/blfs/Utils.Makefile b/blfs/Utils.Makefile
index 07c8e66..36db1a0 100644
--- a/blfs/Utils.Makefile
+++ b/blfs/Utils.Makefile
@@ -1,6 +1,356 @@
+<<<<<<< HEAD
 # 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 = 

 

 all: $(utiltargets)

+=======
+# 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
+#
+# 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 $@
+
+libiodbc :
+	@echo $@
+
+liblinear :
+	@echo $@
+
+Talloc : docbook-xml docbook-xsl libxslt GDB git libnsl libtirpc xfsprogs \
+	# Valgrind
+	@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 $@
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28