fix dependencies; note libfuse are broken

• xx is the script used to validate them
  (will be folded into pkgmaker soon)
• davfs2 (two of three flavours) and wdfs (once), as well as
  fuse (or fuse-utils?) depend on libfuse, but there is no
  libfuse (the working builddep on the fuse directory was kept
  intact, though)

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>

package/apr-util/Makefile

@@ -10,7 +10,7 @@ PKG_BUILDDEP+=		expat apr
 PKG_MD5SUM:=            dc772ae295f49ddb8ee8e69a9716c53b
 PKG_DESCR:=		Apache Portable Runtime utility library
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libexpat apr
+PKG_DEPENDS:=		expat apr
 PKG_URL:=		http://apr.apache.org
 PKG_SITES:=		http://apache.mirror.clusters.cc/apr/
 

package/avahi/Makefile

@@ -10,7 +10,7 @@ PKG_BUILDDEP+=		libdaemon expat gdbm glib
 PKG_MD5SUM:=		a83155a6e29e3988f07e5eea3287b21e
 PKG_DESCR:=		mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) daemon
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libavahi libdaemon libexpat
+PKG_DEPENDS:=		libavahi libdaemon expat
 PKG_URL:=		http://avahi.org
 PKG_SITES:=		http://avahi.org/download/
 

package/cairo/Makefile

@@ -10,7 +10,7 @@ PKG_BUILDDEP+=		libpng pixman freetype fontconfig libX11
 PKG_MD5SUM:=		d3e1a1035ae563812d4dd44a74fb0dd0
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		fontconfig freetype libpng libX11 pixman
+PKG_DEPENDS:=		fontconfig libfreetype libpng libx11 pixman
 PKG_URL:=		http://cairographics.org/
 PKG_SITES:=		http://cairographics.org/releases/
 

package/dansguardian/Makefile

@@ -13,7 +13,7 @@ endif
 PKG_MD5SUM:=		0987a1c9bfbdf398118386f10279611a
 PKG_DESCR:=		web content filter proxy
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libpcre zlib
+PKG_DEPENDS:=		pcre zlib
 PKG_URL:=		http://dansguardian.org
 PKG_SITES:=		http://dansguardian.org/downloads/2/Stable/
 

package/davfs2/Makefile

@@ -19,11 +19,11 @@ PKG_SITES=		${MASTER_SITE_SOURCEFORGE:=dav/}
 include ${TOPDIR}/mk/package.mk
 
 ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y)
-PKG_DEPENDS:=			fuse-utils kmod-fuse libfuse libiconv neon
+PKG_DEPENDS:=			fuse-utils kmod-fuse libiconv neon
 else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y)
 PKG_DEPENDS:=			kmod-fs-coda libiconv neon
 else
-PKG_DEPENDS:=			kmod-fs-coda fuse-utils kmod-fuse libfuse libiconv neon
+PKG_DEPENDS:=			kmod-fs-coda fuse-utils kmod-fuse libiconv neon
 endif
 
 $(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/dbus/Makefile

@@ -10,7 +10,7 @@ PKG_BUILDDEP+=		expat
 PKG_MD5SUM:=		c7a47b851ebe02f6726b65b78d1b730b
 PKG_DESCR:=		DBUS library
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libexpat
+PKG_DEPENDS:=		expat
 PKG_URL:=		http://dbus.freedesktop.org
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus/
 ifeq ($(ADK_STATIC),y)

package/fuse/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		4879f06570d2225667534c37fea04213
 PKG_DESCR:=		Filesystem in Userspace (utilities)
 PKG_SECTION:=		admin
-PKG_DEPENDS:=		kmod-fuse libfuse
+PKG_DEPENDS:=		kmod-fuse
 PKG_URL:=		http://fuse.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
 

package/gdb/Makefile

@@ -6,7 +6,7 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc
 
 PKG_DESCR:=		GNU debugger
 PKG_SECTION:=		comp
-PKG_DEPENDS:=		libthread_db libncurses
+PKG_DEPENDS:=		libthread-db libncurses
 PKG_BUILDDEP+=		ncurses readline
 
 include ${TOPDIR}/mk/package.mk

package/git/Makefile

@@ -10,7 +10,7 @@ PKG_BUILDDEP+=		openssl curl expat
 PKG_MD5SUM:=		50fb736021ef89916af622cb4772bbea
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		misc
-PKG_DEPENDS:=		openssl curl
+PKG_DEPENDS:=		libopenssl curl
 PKG_URL:=		http://git-scm.com
 PKG_SITES:=		http://kernel.org/pub/software/scm/git/
 

package/heimdal/Makefile

@@ -16,7 +16,7 @@ endif
 PKG_MD5SUM:=		6e5028077e2a6b101a4a72801ba71b9e
 PKG_DESCR:=		Kerberos 5 server
 PKG_SECTION:=		net
-PKG_DEPENDS:=		heimdal-libs heimdal-client-libs libncurses libcom_err
+PKG_DEPENDS:=		heimdal-libs heimdal-client-libs libncurses libcom-err
 PKG_URL:=		http://www.h5l.org
 PKG_SITES:=		http://www.h5l.org/dist/src/
 

package/krb5/Makefile

@@ -10,7 +10,7 @@ PKG_BUILDDEP+=		ncurses e2fsprogs
 PKG_MD5SUM:=		9f7b3402b4731a7fa543db193bf1b564
 PKG_DESCR:=		MIT kerberos server
 PKG_SECTION:=		net
-PKG_DEPENDS:=		krb5-libs libncurses libss libcom_err
+PKG_DEPENDS:=		krb5-libs libncurses libss libcom-err
 PKG_URL:=		http://web.mit.edu/kerberos
 PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/1.7/
 

package/lighttpd/Makefile

@@ -13,7 +13,7 @@ endif
 PKG_MD5SUM:=		87e936ec272ddaba8a2fdfecd8c6b704
 PKG_DESCR:=		a flexible and lightweight web server
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libxml2 libsqlite libpcre
+PKG_DEPENDS:=		libxml2 libsqlite pcre
 PKG_URL:=		http://www.lighttpd.net
 PKG_SITES:=		http://download.lighttpd.net/lighttpd/releases-1.4.x/
 

package/miax/Makefile

@@ -10,7 +10,7 @@ PKG_BUILDDEP+=		bluez
 PKG_MD5SUM:=		44f0d2ef46ee2697d890b7b96846adc7
 PKG_DESCR:=		A console iax (asterisk) client
 PKG_SECTION:=		bluetooth
-PKG_DEPENDS:=		kmod-bluetooth bluez-libs libpthread
+PKG_DEPENDS:=		kmod-bluetooth bluez libpthread
 PKG_URL:=		http://sourceforge.net/projects/miax
 PKG_SITES:=		http://mesh.dl.sourceforge.net/sourceforge/miax/
 

package/nmap/Makefile

@@ -13,7 +13,7 @@ endif
 PKG_MD5SUM:=		32d27de32166c02d670bb4a086185886
 PKG_DESCR:=		utility for network exploration or security auditing
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libdnet libpcap libpcre
+PKG_DEPENDS:=		libdnet libpcap pcre
 PKG_URL:=		http://nmap.org
 PKG_SITES:=		http://download.insecure.org/nmap/dist/
 

package/pkgmaker

@@ -6,7 +6,7 @@ else
 	export GMAKE=make
 fi
 
-for subdir in alsa-lib bash bc mksh; do
+for subdir in alsa-lib bash bc expat mksh; do
 	cd $subdir
 	pn=$($GMAKE show=PKG_NAME)		# pn: package name
 	pa=$($GMAKE show=ALL_PKGOPTS)		# pa: all subpackage options

package/snort-wireless/Makefile

@@ -10,7 +10,7 @@ PKG_BUILDDEP+=		libnet libpcap pcre
 PKG_MD5SUM:=		1aa699ae279bf7a1140cf6cca02f9999
 PKG_DESCR:=		a flexible Wireless Network Intrusion Detection System (NIDS)
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libnet libpcap libpcre
+PKG_DEPENDS:=		libnet libpcap pcre
 PKG_URL:=		http://www.snort-wireless.org
 PKG_SITES:=		http://www.snort-wireless.org/files/
 

package/snort/Makefile

@@ -10,7 +10,7 @@ PKG_BUILDDEP+=		libnet libpcap pcre
 PKG_MD5SUM:=		22c448e25538cdf74c62abe586aeac0a
 PKG_DESCR:=		a flexible Network Intrusion Detection System (NIDS)
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libnet libpcap libpcre
+PKG_DEPENDS:=		libnet libpcap pcre
 PKG_SITES:=		http://www.snort.org/dl/current/
 
 include ${TOPDIR}/mk/package.mk

package/subversion/Makefile

@@ -13,7 +13,7 @@ endif
 PKG_MD5SUM:=		0ab0f26f6eb056add1b9d3059a3f4247
 PKG_DESCR:=		revision control program
 PKG_SECTION:=		net
-PKG_DEPENDS:=		zlib apr apr-util libiconv libexpat
+PKG_DEPENDS:=		zlib apr apr-util libiconv expat
 PKG_SITES:=		http://subversion.tigris.org/downloads/
 
 include ${TOPDIR}/mk/package.mk

package/wdfs/Makefile

@@ -10,7 +10,7 @@ PKG_BUILDDEP+=		openssl fuse neon glib
 PKG_MD5SUM=		628bb44194d04c1cf8aacc446ed0a230
 PKG_DESCR:=		WebDAV filesystem
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libopenssl fuse-utils kmod-fuse libfuse neon glib
+PKG_DEPENDS:=		libopenssl fuse-utils kmod-fuse neon glib
 PKG_SITES=		http://noedler.de/projekte/wdfs/
 
 include ${TOPDIR}/mk/package.mk

package/xx

@@ -0,0 +1,35 @@
+cd "$(dirname "$0")"
+export TOPDIR=$(realpath ..)
+if gmake --help >/dev/null 2>&1; then
+	export GMAKE=gmake
+else
+	export GMAKE=make
+fi
+
+rm -rf pkglist.d
+mkdir pkglist.d
+for a in */Makefile; do
+	sd=${a%/*}
+	cd $sd
+	pa=$($GMAKE show=ALL_PKGOPTS)		# pa: all subpackage options
+	for xu in $pa; do			# xu: package option uppercase
+		x=$($GMAKE show=PKGNAME_$xu)	# x: subpackage name
+		print -nr -- "$xu" >../pkglist.d/"$x"
+	done
+	cd ..
+done
+
+rm -f kdeps kaputt
+for a in */Makefile; do
+	sd=${a%/*}
+	cd $sd
+	deps=$($GMAKE show=PKG_DEPENDS)
+	cd ..
+	for dep in $deps; do
+		if [[ $dep = kmod-* ]]; then
+			print $sd $dep >>kdeps
+			continue
+		fi
+		[[ -e pkglist.d/$dep ]] || print $sd $dep >>kaputt
+	done
+done