summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/apr-util/Makefile2
-rw-r--r--package/avahi/Makefile2
-rw-r--r--package/cairo/Makefile2
-rw-r--r--package/dansguardian/Makefile2
-rw-r--r--package/davfs2/Makefile4
-rw-r--r--package/dbus/Makefile2
-rw-r--r--package/fuse/Makefile2
-rw-r--r--package/gdb/Makefile2
-rw-r--r--package/git/Makefile2
-rw-r--r--package/heimdal/Makefile2
-rw-r--r--package/krb5/Makefile2
-rw-r--r--package/lighttpd/Makefile2
-rw-r--r--package/miax/Makefile2
-rw-r--r--package/nmap/Makefile2
-rw-r--r--package/pkgmaker2
-rw-r--r--package/snort-wireless/Makefile2
-rw-r--r--package/snort/Makefile2
-rw-r--r--package/subversion/Makefile2
-rw-r--r--package/wdfs/Makefile2
-rw-r--r--package/xx35
20 files changed, 55 insertions, 20 deletions
diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index 6b4142600..604a9c17c 100644
--- a/package/apr-util/Makefile
+++ b/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/
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index a85b4dcd1..ba7698027 100644
--- a/package/avahi/Makefile
+++ b/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/
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 39e1caf35..81bc95e4e 100644
--- a/package/cairo/Makefile
+++ b/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/
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index 6397610e6..42fcf6cb3 100644
--- a/package/dansguardian/Makefile
+++ b/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/
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index d32f750c2..55bd4eddc 100644
--- a/package/davfs2/Makefile
+++ b/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}))
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 6bb63c302..32c90dbeb 100644
--- a/package/dbus/Makefile
+++ b/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)
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index b3b3658d1..95e3580e6 100644
--- a/package/fuse/Makefile
+++ b/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}/}
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index b8cbfd502..17d37ef55 100644
--- a/package/gdb/Makefile
+++ b/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
diff --git a/package/git/Makefile b/package/git/Makefile
index 312e758ef..ea93f3a07 100644
--- a/package/git/Makefile
+++ b/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/
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index ae97de3a3..cd0c3fa9f 100644
--- a/package/heimdal/Makefile
+++ b/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/
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 41742cb64..9de7e2127 100644
--- a/package/krb5/Makefile
+++ b/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/
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index a08e4e597..3ed986070 100644
--- a/package/lighttpd/Makefile
+++ b/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/
diff --git a/package/miax/Makefile b/package/miax/Makefile
index 3f66f9cb7..9e815a0a1 100644
--- a/package/miax/Makefile
+++ b/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/
diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index 4b0ea6d5c..58b8ee8a6 100644
--- a/package/nmap/Makefile
+++ b/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/
diff --git a/package/pkgmaker b/package/pkgmaker
index b9f591a4b..c23d91673 100644
--- a/package/pkgmaker
+++ b/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
diff --git a/package/snort-wireless/Makefile b/package/snort-wireless/Makefile
index 4cb773d6f..1aed15e52 100644
--- a/package/snort-wireless/Makefile
+++ b/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/
diff --git a/package/snort/Makefile b/package/snort/Makefile
index 7ceadf1d6..1c9832c53 100644
--- a/package/snort/Makefile
+++ b/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
diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index 9203f9510..2aac583a3 100644
--- a/package/subversion/Makefile
+++ b/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
diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile
index 280e610e2..71951046c 100644
--- a/package/wdfs/Makefile
+++ b/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
diff --git a/package/xx b/package/xx
new file mode 100644
index 000000000..529a46d6f
--- /dev/null
+++ b/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