Merge commit 'origin/confgen'

finally autogenerate menu Config.in files and Depends.mk
for packages. thx mirabilos

Conflicts:

	.gitignore
	Makefile
	mk/build.mk
	package/eglibc/Config.in
	package/glibc/Config.in
	package/uclibc++/Config.in
	package/uclibc/Config.in
	rules.mk

678 files changed, 1226 insertions, 9656 deletions

diff --git a/.gitignore b/.gitignore
index 46c2fdb03..aa2ea3d93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,9 @@ config/lxdialog/*.o
 make.log
 dl/
 package/*/info.mk
+package/*/Config.in
+package/*/Config.in.lib
 tools_build/
 extra/
 bulkdir/
+.menu
diff --git a/BSDmakefile b/BSDmakefile
index 843c4146a..86b674100 100644
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -5,6 +5,10 @@ ADKVERSION=	0.1.0
 TOPDIR=		${.CURDIR}
 PWD=		${.CURDIR}
 
+.include "${.CURDIR}/Makefile.inc"
+
+GMAKE_ENV+=	ADKVERSION=${ADKVERSION:Q}
+
 .if defined(package) && !empty(package)
 subdir:=	package/${package}
 .  if !make(clean)
@@ -22,7 +26,7 @@ _subdir: ${_subdir_dep}
 		exit 1; \
 	fi
 	cd ${.CURDIR}/${subdir} && TOPDIR=${.CURDIR} DEVELOPER=1 \
-	    gmake VERBOSE=1 ${.MFLAGS} ${_subdir}
+	    ${GMAKE} VERBOSE=1 ${.MFLAGS} ${_subdir}
 
 .  include "${.CURDIR}/prereq.mk"
 .  include "${.CURDIR}/mk/split-cfg.mk"
diff --git a/GNUmakefile b/GNUmakefile
index 5d2279a17..83d4f4386 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -4,6 +4,8 @@
 TOPDIR:=	$(shell pwd)
 PWD:=		${TOPDIR}
 
+include Makefile.inc
+
 ADKVERSION=	0.1.0
 export ADKVERSION
 
diff --git a/Makefile b/Makefile
index ed3ce08c4..8c66e020e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,6 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-CC?=		gcc
-GMAKE?=		$(PWD)/scripts/make
-GMAKE_FMK=	${GMAKE} -f $(PWD)/mk/build.mk
-GMAKE_INV=	${GMAKE_FMK} --no-print-directory
-
 _UNLIMIT=	ulimit -dS $$(ulimit -dH 2>/dev/null ) 2>/dev/null;
 
 all: .prereq_done
@@ -66,11 +61,13 @@ pkg-help:
 	@echo 'This does not automatically resolve package dependencies!'
 
 dev-help:
+	@echo 'Regenerate menu information via "make menu"'
+	@echo
 	@echo 'Fast way of updating package patches:'
 	@echo '  run "make package=<pkgname> clean" to start with a good base'
 	@echo '  run "make package=<pkgname> patch" to fetch, unpack and patch the source'
 	@echo '  edit the package sources at build_dir/w-<pkgname>-*/<pkgname>-<version>'
-	@echo '  run "make package=<pkgname> update-patches to regenerate patch files'
+	@echo '  run "make package=<pkgname> update-patches" to regenerate patch files'
 	@echo ''
 	@echo 'All changed patches will be opened with your $$EDITOR,'
 	@echo 'so you can add a description and verify the modifications.'
@@ -140,16 +137,19 @@ package_index: .prereq_done
 bulk: .prereq_done
 	@${GMAKE_INV} bulk
 
+menu: .prereq_done
+	@${GMAKE_INV} menu
+
 world: .prereq_done
 	@${GMAKE_INV} world
 
 prereq:
 	@rm -f .prereq_done
-	@${MAKE} .prereq_done --no-print-directory
+	@${GMAKE} .prereq_done
 
 prereq-noerror:
 	@rm -f .prereq_done
-	@${MAKE} .prereq_done NO_ERROR=1
+	@${GMAKE} .prereq_done NO_ERROR=1
 
 NO_ERROR=0
 .prereq_done:
@@ -158,6 +158,10 @@ NO_ERROR=0
 		echo "GNU bash needs to be installed."; \
 		exit 1; \
 	fi
+	@if ! mksh -c 'echo $$KSH_VERSION' 2>&1 | fgrep 'MIRBSD' >/dev/null 2>&1; then \
+		echo "MirBSD ksh (mksh) needs to be installed."; \
+		exit 1; \
+	fi
 	@if test x"$$(umask 2>/dev/null | sed 's/00*22/OK/')" != x"OK"; then \
 		echo >&2 Error: you must build with umask 022, sorry.; \
 		exit 1; \
diff --git a/Makefile.inc b/Makefile.inc
new file mode 100644
index 000000000..4cc06dfad
--- /dev/null
+++ b/Makefile.inc
@@ -0,0 +1,4 @@
+CC?=		gcc
+GMAKE?=		env ${GMAKE_ENV} $(PWD)/scripts/make
+GMAKE_FMK=	${GMAKE} -f $(PWD)/mk/build.mk
+GMAKE_INV=	${GMAKE_FMK} --no-print-directory
diff --git a/config/Makefile b/config/Makefile
index f2e20cbf8..97a8f3a3a 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -1,7 +1,9 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+ifneq ($(filter-out clean,${MAKECMDGOALS}),)
 include ${TOPDIR}/rules.mk
+endif
 
 CP=cp -fpR
 HOSTCFLAGS+=-DKBUILD_NO_NLS
@@ -124,5 +126,5 @@ ncurses:
 	fi
 
 clean:
-	rm -f *.o *~ core $(TARGETS) $(MCONF_OBJS) $(CONF_OBJS) \
+	@rm -f *.o *~ core $(TARGETS) $(MCONF_OBJS) $(CONF_OBJS) zconf.hash.c \
 		conf mconf zconf.tab.c zconf.tab.h lex.zconf.c lkc_defs.h
diff --git a/mk/build.mk b/mk/build.mk
index 08e2b8125..2fb5bb3bf 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -40,6 +40,7 @@ DEFCONFIG= 		ADK_DEVELSYSTEM=n \
 noconfig_targets:=	menuconfig \
 			_config \
 			_mconfig \
+			distclean \
 			tags
 
 MAKECLEAN_SYMBOLS=	ADK_TARGET_LIB_UCLIBC \
@@ -82,6 +83,9 @@ all: world
 allcopy: all
 	$(CP) $(BIN_DIR) $(TOPDIR)/bulkdir/${d}/
 
+${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config
+	mksh ${TOPDIR}/package/depmaker
+
 .NOTPARALLEL:
 .PHONY: all world clean cleantarget cleandir distclean image_clean
 
@@ -123,7 +127,7 @@ ${STAGING_DIR}/etc/ipkg.conf: ${STAGING_DIR}/etc
 	echo "dest root /" >${STAGING_DIR}/etc/ipkg.conf
 	echo "option offline_root ${TARGET_DIR}" >>$(STAGING_DIR)/etc/ipkg.conf
 
-package/%: ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG ${STAGING_DIR}/etc/ipkg.conf
+package/%: ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk
 	$(MAKE) -C package $(patsubst package/%,%,$@)
 
 target/%: ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG
@@ -177,8 +181,9 @@ clean:
 			rm $$f ; \
 		done \
 	done
-	rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) ${TOPDIR}/.cfg
-	rm -f ${TOPDIR}/package/*/info.mk
+	rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) ${TOPDIR}/.cfg \
+	    ${TOPDIR}/package/pkglist.d
+	rm -f ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk
 
 cleankernel:
 	@$(TRACE) cleankernel
@@ -188,9 +193,11 @@ cleandir:
 	@$(TRACE) cleandir
 	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
 	rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) \
-		${TOPDIR}/.cfg*
-	rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR)
-	rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk
+	    ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d
+	rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) \
+	    $(TOOLS_BUILD_DIR)
+	rm -f .menu .tmpconfig.h ${TOPDIR}/package/*/info.mk \
+	    ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk
 
 cleantarget:
 	@$(TRACE) cleantarget
@@ -202,15 +209,20 @@ cleantarget:
 distclean:
 	@$(TRACE) distclean
 	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
-	rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
-		${TOPDIR}/.cfg* $(TOPDIR)/bulkdir
-	rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR)
-	rm -f .config* .defconfig .tmpconfig.h all.config \
-		${TOPDIR}/package/*/info.mk
+	@rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \
+	    ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d $(TOPDIR)/bulkdir
+	@rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR)
+	@rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \
+	    .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk
 
-else # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
+else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
+ifeq ($(filter-out distclean,${MAKECMDGOALS}),)
+include ${TOPDIR}/mk/vars.mk
+else
 include $(TOPDIR)/prereq.mk
+export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH
+endif
 
 all: menuconfig
 	@echo "Start the build with \"make\" or with \"make v\" to be verbose"
@@ -227,7 +239,7 @@ $(CONFIG)/conf:
 $(CONFIG)/mconf:
 	@$(MAKE) -C $(CONFIG)
 
-defconfig: $(CONFIG)/conf
+defconfig: .menu $(CONFIG)/conf
 ifeq (${OStype},Linux)
 	@echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig
 endif
@@ -321,30 +333,30 @@ ifneq (,$(filter rb%,${TARGET}))
 	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/all.config
 endif
 
-menuconfig: $(CONFIG)/mconf defconfig
+menuconfig: $(CONFIG)/mconf defconfig .menu
 	@if [ ! -f .config ];then \
 		$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
 	fi
 	@$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
 	${POSTCONFIG}
 
-_config: $(CONFIG)/conf
+_config: $(CONFIG)/conf .menu
 	-@touch .config
 	@$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) >/dev/null
 	${POSTCONFIG}
 
 .NOTPARALLEL: _mconfig
 _mconfig: ${CONFIG}/conf _mconfig2 _config
-_mconfig2: ${CONFIG}/conf modconfig
+_mconfig2: ${CONFIG}/conf modconfig .menu
 	@${CONFIG}/conf -m ${RCONFIG} >/dev/null
 
 distclean:
 	@$(MAKE) -C $(CONFIG) clean
 	@rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) \
-		${TOPDIR}/.cfg* $(TOPDIR)/bulkdir
+	    ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d
 	@rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) $(TARGET_DIR)
-	@rm -f .config* .defconfig all.config .tmpconfig.h \
-		${TOPDIR}/package/*/info.mk
+	@rm -f .config* .defconfig all.config .tmpconfig.h ${TOPDIR}/prereq.mk \
+	    .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk
 
 endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
@@ -368,3 +380,9 @@ bulk:
 		rm .*config; \
 	    ) 2>&1 | tee $(TOPDIR)/bulkdir/$$target-$$libc-$$fs/log; \
 	done <${TOPDIR}/target/bulk.lst
+
+.menu menu:
+	mksh $(TOPDIR)/package/pkgmaker
+	@:>.menu
+
+.PHONY: menu
diff --git a/mk/package.mk b/mk/package.mk
index cd57a2005..f5a48dba8 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -3,6 +3,15 @@
 
 all: build-all-pkgs
 
+ifneq (${PKG_CXX},)
+ifeq (${ADK_COMPILE_${PKG_CXX}_WITH_UCLIBCXX},y)
+PKG_BUILDDEP+=		uclibc++
+PKG_DEPENDS+=		uclibc++
+else
+PKG_DEPENDS+=		libstdcxx
+endif
+endif
+
 TCFLAGS:=		${TARGET_CFLAGS}
 TCXXFLAGS:=		${TARGET_CFLAGS}
 TCPPFLAGS:=		${TARGET_CPPFLAGS}
@@ -137,6 +146,10 @@ build-all-pkgs: ${_IPKGS_COOKIE}
 #                 cleaning (needed for toolchain packages like glibc/eglibc)
 # should be package format independent and modular in the future
 define PKG_template
+ALL_PKGOPTS+=	$(1)
+PKGNAME_$(1)=	$(2)
+PKGDEPS_$(1)=	$(4)
+PKGDESC_$(1)=	$(5)
 IPKG_$(1)=	$(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX}
 IDIR_$(1)=	$(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)
 ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},)
diff --git a/mk/split-cfg.mk b/mk/split-cfg.mk
index 6b1091e89..9f4bff8e7 100644
--- a/mk/split-cfg.mk
+++ b/mk/split-cfg.mk
@@ -4,4 +4,4 @@
 
 ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG: ${TOPDIR}/.config \
     ${TOPDIR}/mk/split-cfg.mk ${TOPDIR}/scripts/split-cfg.sh
-	${BASH} ${TOPDIR}/scripts/split-cfg.sh '${TOPDIR}'
+	mksh ${TOPDIR}/scripts/split-cfg.sh '${TOPDIR}'
diff --git a/package/.gitignore b/package/.gitignore
new file mode 100644
index 000000000..78ecf6bfd
--- /dev/null
+++ b/package/.gitignore
@@ -0,0 +1,5 @@
+*/Config.in
+*/Config.in.lib
+Depends.mk
+pkglist.d
+pkgopts.d
diff --git a/package/6tunnel/Config.in b/package/6tunnel/Config.in
deleted file mode 100644
index c3cdb3cbe..000000000
--- a/package/6tunnel/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_6TUNNEL
-	prompt "6tunnel........................... IPv4 / IPv6 tunnel proxy"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_IPV6
-	help
-	  6tunnel allows you to use services provided by IPv6 hosts with IPv4-only 
-	  applications and vice-versa. It can bind to any of your IPv4 (default) 
-	  or IPv6 addresses and forward all data to IPv4 or IPv6 (default) host.
-	  
-	  http://toxygen.net/6tunnel/
-
diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile
index b67753a9a..a621af7b8 100644
--- a/package/6tunnel/Makefile
+++ b/package/6tunnel/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		b325fa9d238e32195fbb3fc3646b0d28
 PKG_DESCR:=		IPv4/IPv6 tunnel proxy
 PKG_SECTION:=		net
+PKG_DEPENDS:=		kmod-ipv6
 PKG_SITES:=		http://toxygen.net/6tunnel/
 
 WRKDIST=		${WRKDIR}/$(PKG_NAME)-0.11
diff --git a/package/Config.in b/package/Config.in
index c6f714d74..f982e342d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -7,14 +7,14 @@ menu "Applications"
 
 menu "Basesystem"
 source "package/base-files/Config.in"
-source "package/busybox/Config.in"
+source "package/busybox/Config.in.manual"
 source "package/cfgfs/Config.in"
 source "package/cfinstall/Config.in"
 source "package/cryptinit/Config.in"
-source "package/uclibc/Config.in"
-source "package/glibc/Config.in"
-source "package/eglibc/Config.in"
-source "package/libc/Config.in"
+source "package/uclibc/Config.in.manual"
+source "package/glibc/Config.in.manual"
+source "package/eglibc/Config.in.manual"
+source "package/libc/Config.in.manual"
 source "package/rpm/Config.in"
 source "package/grub/Config.in"
 source "package/grub-bin/Config.in"
@@ -287,7 +287,9 @@ endmenu
 
 menu "Network Filesystems"
 source "package/davfs2/Config.in"
+source "package/davfs2/Config.in.kernel"
 source "package/nfs-utils/Config.in"
+source "package/nfs-utils/Config.in.kerberos"
 source "package/samba/Config.in"
 endmenu
 
@@ -338,6 +340,7 @@ source "package/httptunnel/Config.in"
 source "package/ipsec-tools/Config.in"
 source "package/l2tpns/Config.in"
 source "package/openssh/Config.in"
+source "package/openssh/Config.in.kerberos"
 source "package/openswan/Config.in"
 source "package/openvpn/Config.in"
 source "package/portsentry/Config.in"
@@ -395,8 +398,10 @@ source "package/apr-util/Config.in"
 source "package/atk/Config.in"
 source "package/avahi/Config.in.lib"
 source "package/axtls/Config.in.lib"
+source "package/bind/Config.in.lib"
 source "package/cairo/Config.in"
 source "package/cgilib/Config.in"
+source "package/curl/Config.in.lib"
 source "package/cxxtools/Config.in"
 source "package/dbus/Config.in"
 source "package/e2fsprogs/Config.in.lib"
@@ -410,29 +415,37 @@ source "package/libaudiofile/Config.in"
 source "package/libart/Config.in"
 source "package/linux-atm/Config.in.lib"
 source "package/libcli/Config.in"
-source "package/curl/Config.in.lib"
 source "package/libdaemon/Config.in"
 source "package/libdb/Config.in"
 source "package/libdnet/Config.in"
 source "package/libelf/Config.in"
 source "package/libevent/Config.in"
 source "package/libffi/Config.in"
-source "package/expat/Config.in" # libexpat
-source "package/faad2/Config.in"  # libfaad2
-source "package/flac/Config.in"  # libflac
-source "package/freetype/Config.in"  # libfreetype
+source "package/freeradius-client/Config.in.lib"
+source "package/expat/Config.in"
+source "package/expat/Config.in.lib"
+source "package/faad2/Config.in" 
+source "package/faad2/Config.in.lib" 
+source "package/flac/Config.in"
+source "package/flac/Config.in.lib"
+source "package/freetype/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgd/Config.in"
 source "package/gdbm/Config.in"
+source "package/gdbm/Config.in.lib"
 source "package/libgssglue/Config.in"
-source "package/gmp/Config.in"  # libgmp
-source "package/gnutls/Config.in" ## libgnutls
+source "package/gmp/Config.in" 
+source "package/gmp/Config.in.lib" 
+source "package/gnutls/Config.in"
+source "package/gnutls/Config.in.lib"
 source "package/libgpg-error/Config.in"
-source "package/gsm/Config.in" # libgsm
+source "package/gsm/Config.in"
+source "package/gsm/Config.in.lib"
 source "package/libiconv/Config.in"
 source "package/libid3tag/Config.in"
-source "package/jpeg/Config.in"  # libjpeg
-source "package/lame/Config.in.lib"  # libltdl
+source "package/jpeg/Config.in"
+source "package/jpeg/Config.in.lib"
+source "package/lame/Config.in.lib"
 source "package/mpfr/Config.in"
 source "package/nspr/Config.in"
 source "package/nss/Config.in"
@@ -458,15 +471,15 @@ source "package/libp11/Config.in"
 source "package/libpcap/Config.in"
 source "package/libpri/Config.in"
 source "package/pango/Config.in"
-source "package/pcre/Config.in"  # libpcre
+source "package/pcre/Config.in"
 source "package/libpng/Config.in"
-source "package/popt/Config.in"  # libpopt
-source "package/postgresql/Config.in"  # libpq
+source "package/popt/Config.in"
+source "package/postgresql/Config.in"
 source "package/libpthread/Config.in"
 source "package/libthread_db/Config.in"
-source "package/readline/Config.in"  # libreadline
-source "package/cyrus-sasl/Config.in"  # libsasl2
-source "package/speex/Config.in" # libspeex
+source "package/readline/Config.in"
+source "package/cyrus-sasl/Config.in.lib"
+source "package/speex/Config.in"
 source "package/sqlite/Config.in.lib"
 source "package/librpcsecgss/Config.in"
 source "package/libshout/Config.in"
diff --git a/package/Depends.mk b/package/Depends.mk
deleted file mode 100644
index bf77d2106..000000000
--- a/package/Depends.mk
+++ /dev/null
@@ -1,425 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-aircrack-ng-compile: openssl-compile libpcap-compile
-alsa-utils-compile: alsa-lib-compile
-apr-util-compile: expat-compile apr-compile
-arpd-compile: libpcap-compile libdnet-compile libevent-compile
-arpwatch-compile: libpcap-compile
-atftp-compile: readline-compile ncurses-compile
-atk-compile: glib-compile
-avahi-compile: libdaemon-compile expat-compile gdbm-compile glib-compile
-
-bind-compile: openssl-compile
-bitlbee-compile: libiconv-compile openssl-compile glib-compile
-bluez-compile: libusb-compile dbus-compile glib-compile
-bogofilter-compile: libiconv-compile libdb-compile
-
-cairo-compile: libpng-compile pixman-compile freetype-compile fontconfig-compile libX11-compile
-ifeq (${ADK_COMPILE_CBTT_WITH_UCLIBCXX},y)
-cbtt-compile: uclibc++-compile
-endif
-cbtt-compile: mysql-compile zlib-compile
-collectd-compile: libpthread-compile
-cryptinit-compile: cryptsetup-compile
-cryptsetup-compile: libgcrypt-compile popt-compile e2fsprogs-compile lvm-compile
-ifeq (${ADK_COMPILE_CTORRENT_WITH_UCLIBCXX},y)
-ctorrent-compile: uclibc++-compile
-endif
-ctorrent-compile: openssl-compile
-cups-compile: zlib-compile
-curl-compile: openssl-compile zlib-compile
-ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
-cxxtools-compile: uclibc++-compile
-endif
-cxxtools-compile: libiconv-compile
-cyrus-sasl-compile: openssl-compile
-
-ifeq (${ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX},y)
-dansguardian-compile: uclibc++-compile
-endif
-dansguardian-compile: pcre-compile zlib-compile
-ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},)
-davfs2-compile: fuse-compile
-endif
-davfs2-compile: libiconv-compile neon-compile
-
-dbus-compile: expat-compile
-deco-compile: ncurses-compile
-dhcpv6-compile: libnl-compile ncurses-compile
-digitemp-compile: libusb-compile libusb-compat-compile
-dsniff-compile: libnids-compile openssl-compile gdbm-compile
-elinks-compile: openssl-compile
-esound-compile: libaudiofile-compile
-ettercap-compile: pcap-compile libnet-compile
-exmap-compile: glib-compile readline-compile
-fprobe-compile: libpcap-compile
-freetype-compile: zlib-compile
-gatling-compile: libowfat-compile libiconv-compile
-gcc-compile: gmp-compile mpfr-compile
-gdb-compile: ncurses-compile readline-compile
-gettext-compile: libiconv-compile libpthread-compile
-git-compile: openssl-compile curl-compile expat-compile
-gkrellmd-compile: glib-compile
-glib-compile: gettext-compile libiconv-compile
-gmediaserver-compile: id3lib-compile libupnp-compile
-gnutls-compile: libgcrypt-compile liblzo-compile libtasn1-compile opencdk-compile zlib-compile ncurses-compile
-
-ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y)
-gpsd-compile: uclibc++-compile
-endif
-gpsd-compile: ncurses-compile
-
-gtk+-compile: cairo-compile atk-compile pango-compile libXext-compile renderproto-compile libXrender-compile
-
-ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_BDB},y)
-heimdal-compile: libdb-compile
-endif
-ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y)
-heimdal-compile: openldap-compile
-endif
-heimdal-compile: openssl-compile ncurses-compile e2fsprogs-compile
-
-httping-compile: openssl-compile
-icecast-compile: curl-compile libvorbis-compile libxml2-compile libxslt-compile
-ifeq (${ADK_COMPILE_ID3LIB_WITH_UCLIBCXX},y)
-id3lib-compile: uclibc++-compile 
-endif
-id3lib-compile: zlib-compile libiconv-compile
-iftop-compile: libpcap-compile libpthread-compile ncurses-compile
-ipcad-compile: libpcap-compile
-ifeq (${ADK_COMPILE_IPERF_WITH_UCLIBCXX},y)
-iperf-compile: uclibc++-compile
-endif
-ifneq ($(strip ${ADK_PACKAGE_TC_ATM}),)
-iproute2-compile: linux-atm-compile
-endif
-ipsec-tools-compile: openssl-compile
-iptables-snmp-compile: net-snmp-compile
-iptraf-compile: ncurses-compile
-irssi-compile: glib-compile ncurses-compile
-iw-compile: libnl-compile
-jamvm-compile: libffi-compile zlib-compile
-ifeq (${ADK_COMPILE_KISMET_WITH_UCLIBCXX},y)
-kismet-compile: uclibc++-compile 
-endif
-kismet-compile: libpcap-compile ncurses-compile
-knock-compile: libpcap-compile
-krb5-compile: ncurses-compile e2fsprogs-compile
-l2tpns-compile: libcli-compile
-less-compile: ncurses-compile
-libgcrypt-compile: libgpg-error-compile
-libgd-compile: libpng-compile jpeg-compile
-libid3tag-compile: zlib-compile
-libnet-compile: libpcap-compile
-libnids-compile: libnet-compile libpcap-compile
-libp11-compile: openssl-compile libtool-compile
-libpng-compile: zlib-compile
-libshout-compile: libvorbis-compile
-libusb-compat-compile: libusb-compile
-libtirpc-compile: libgssglue-compile
-libtorrent-compile: openssl-compile libsigc++-compile
-libvorbis-compile: libogg-compile
-libvirt-compile: libxml2-compile gnutls-compile python-compile
-libfontenc-compile: xproto-compile zlib-compile
-libICE-compile: xtrans-compile
-libSM-compile: libICE-compile
-libXt-compile: libSM-compile
-libXv-compile: libX11-compile videoproto-compile
-libXmu-compile: libXt-compile
-libXext-compile: libX11-compile
-libXaw-compile: libXext-compile libXmu-compile libXpm-compile
-libX11-compile: xproto-compile xextproto-compile xtrans-compile libXdmcp-compile \
-	libXau-compile xcmiscproto-compile bigreqsproto-compile kbproto-compile \
-	inputproto-compile
-libXfont-compile: freetype-compile fontcacheproto-compile fontsproto-compile libfontenc-compile
-libxml2-compile: zlib-compile
-libxslt-compile: libxml2-compile
-ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y)
-lighttpd-compile: openssl-compile
-endif
-lighttpd-compile: pcre-compile libxml2-compile sqlite-compile
-links-compile: openssl-compile libpng-compile jpeg-compile gpm-compile
-logrotate-compile: popt-compile
-lynx-compile: ncurses-compile openssl-compile zlib-compile
-madplay-compile: libid3tag-compile libmad-compile
-maradns-compile: libpthread-compile
-mc-compile: glib-compile ncurses-compile
-miax-compile: bluez-compile
-ifeq (${ADK_COMPILE_MIREDO_WITH_UCLIBCXX},y)
-miredo-compile: uclibc++-compile
-endif
-moc-compile: libvorbis-compile curl-compile libmad-compile flac-compile ffmpeg-compile
-monit-compile: openssl-compile
-ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
-mrd6-compile: uclibc++-compile
-endif
-mt-daapd-compile: gdbm-compile libid3tag-compile
-mtr-compile: ncurses-compile
-mutt-compile: ncurses-compile openssl-compile
-mysql-compile: ncurses-compile zlib-compile readline-compile
-nano-compile: ncurses-compile
-neon-compile: libpthread-compile libxml2-compile openssl-compile zlib-compile
-net-snmp-compile: libelf-compile
-ifeq (${ADK_COMPILE_NFS_UTILS_WITH_KRB5},y)
-nfs-utils-compile: libnfsidmap-compile krb5-compile libevent-compile libgssglue-compile librpcsecgss-compile
-endif
-ifeq (${ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL},y)
-nfs-utils-compile: libnfsidmap-compile heimdal-compile libevent-compile librpcsecgss-compile
-endif
-nfs-utils-compile: libtirpc-compile
-ifeq (${ADK_COMPILE_NMAP_WITH_UCLIBCXX},y)
-nmap-compile: uclibc++-compile
-endif
-nmap-compile: pcre-compile libpcap-compile
-obexftp-compile: openobex-compile libiconv-compile
-opencdk-compile: libgcrypt-compile libgpg-error-compile zlib-compile
-openct-compile: libtool-compile libusb-compile
-openldap-compile: cyrus-sasl-compile openssl-compile libdb-compile
-openobex-compile: bluez-compile
-opensips-compile: openssl-compile
-ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y)
-openssh-compile: krb5-compile
-endif
-ifeq (${ADK_COMPILE_OPENSSH_WITH_HEIMDAL},y)
-openssh-compile: heimdal-compile
-endif
-openssh-compile: zlib-compile openssl-compile
-openssl-compile: zlib-compile
-openssl-pkcs11-compile: libp11-compile
-openswan-compile: gmp-compile
-oprofile-compile: popt-compile
-osiris-compile: openssl-compile
-palantir-compile: jpeg-compile
-parted-compile: e2fsprogs-compile lvm-compile readline-compile
-pciutils-compile: zlib-compile
-popt-compile: libiconv-compile
-ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),)
-portmap-compile: tcp_wrappers-compile
-endif
-postgresql-compile: zlib-compile
-privoxy-compile: pcre-compile
-procps-compile: ncurses-compile
-ptunnel-compile: libpcap-compile
-quagga-compile: readline-compile ncurses-compile
-raddump-compile: openssl-compile libpcap-compile
-radiusclient-ng-compile: openssl-compile
-rarpd-compile: libnet-compile
-readline-compile: ncurses-compile
-nss-compile: nspr-compile zlib-compile
-rpm-compile: nss-compile libdb-compile
-rrdcollect-compile: rrdtool-compile
-rrdtool-compile: libxml2-compile cgilib-compile freetype-compile libart-compile libpng-compile
-rsync-compile: popt-compile
-rtorrent-compile: ncurses-compile libtorrent-compile curl-compile
-sane-backends-compile: libpthread-compile libusb-compile
-scanlogd-compile: libpcap-compile libnids-compile libnet-compile
-screen-compile: ncurses-compile
-serdisplib-compile: libgd-compile libusb-compile
-siproxd-compile: libosip2-compile
-sipsak-compile: openssl-compile
-sispmctl-compile: libusb-compile
-snort-compile: libnet-compile libpcap-compile pcre-compile
-snort-wireless-compile: libnet-compile libpcap-compile pcre-compile
-socat-compile: openssl-compile
-sqlite-compile: ncurses-compile readline-compile
-squid-compile: openssl-compile
-ssltunnel-compile: openssl-compile ppp-compile
-subversion-compile: apr-util-compile expat-compile apr-compile zlib-compile libiconv-compile
-swconfig-compile: libnl-compile
-syslog-ng-compile: libol-compile tcp_wrappers-compile
-tcpdump-compile: libpcap-compile
-tinc-compile: zlib-compile openssl-compile liblzo-compile
-tntnet-compile: cxxtools-compile zlib-compile
-ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},)
-tntnet-compile: openssl-compile
-else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},)
-tntnet-compile: gnutls-compile
-endif
-tor-compile: libevent-compile openssl-compile zlib-compile
-trafshow: ncurses-compile libpcap-compile
-usbutils-compile: libusb-compile
-ussp-push-compile: openobex-compile
-util-linux-ng-compile: e2fsprogs-compile ncurses-compile
-vilistextum-compile: libiconv-compile
-vim-compile: ncurses-compile
-vnc-reflector-compile: jpeg-compile zlib-compile
-vpnc-compile: libgcrypt-compile libgpg-error-compile
-vtun-compile: zlib-compile openssl-compile liblzo-compile
-wdfs-compile: openssl-compile fuse-compile neon-compile glib-compile
-weechat-compile: ncurses-compile gnutls-compile lua-compile libiconv-compile
-wknock-compile: libpcap-compile
-ifeq (${ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL},y)
-wpa_supplicant-compile: openssl-compile 
-endif
-wx200d-compile: postgresql-compile
-xfsprogs-compile: e2fsprogs-compile
-libXxf86dga-compile: xf86dgaproto-compile libXext-compile libXaw-compile
-xkeyboard-config-compile: xkbcomp-compile
-xf86-video-geode-compile: xorg-server-compile
-xf86-video-cirrus-compile: xorg-server-compile
-xf86dga-compile: libXxf86dga-compile 
-xorg-server-compile: libX11-compile randrproto-compile renderproto-compile fixesproto-compile \
-	damageproto-compile scrnsaverproto-compile resourceproto-compile \
-	fontsproto-compile videoproto-compile compositeproto-compile \
-	evieext-compile libxkbfile-compile libXfont-compile pixman-compile \
-	libpciaccess-compile openssl-compile 
-
-ifeq ($(ADK_PACKAGE_APR_THREADING),y)
-apr-compile: libpthread-compile
-endif
-
-asterisk-compile: ncurses-compile openssl-compile zlib-compile curl-compile popt-compile
-ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),)
-asterisk-compile: speex-compile
-endif
-ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),)
-asterisk-compile: postgresql-compile
-endif
-
-freeradius-client-compile: openssl-compile
-freeradius-server-compile: libtool-compile openssl-compile
-ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_LDAP),)
-freeradius-server-compile: openldap-compile
-endif
-ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),)
-freeradius-server-compile: mysql-compile
-endif
-ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL),)
-freeradius-server-compile: postgresql-compile
-endif
-
-hostapd-compile: libnl-compile openssl-compile
-
-ifneq ($(ADK_PACKAGE_MINI_HTTPD_OPENSSL),)
-mini_httpd-compile: openssl-compile
-endif
-
-ifneq ($(ADK_PACKAGE_MOTION),)
-motion-compile: jpeg-compile
-endif
-
-mplayer-compile: alsa-lib-compile libmad-compile libvorbis-compile faad2-compile ncurses-compile zlib-compile
-
-mpd-compile: alsa-lib-compile glib-compile
-
-ifneq ($(ADK_COMPILE_MPD_WITH_MP3),)
-mpd-compile: libid3tag-compile libmad-compile
-endif
-ifneq ($(ADK_COMPILE_MPD_WITH_MP4),)
-mpd-compile: faad2-compile
-endif
-ifneq ($(ADK_COMPILE_MPD_WITH_OGG),)
-mpd-compile: libvorbis-compile
-endif
-ifneq ($(ADK_COMPILE_MPD_WITH_TREMOR),)
-mpd-compile: libvorbisidec-compile
-endif
-ifneq ($(ADK_COMPILE_MPD_WITH_FLAC),)
-mpd-compile: flac-compile
-endif
-ifneq ($(ADK_COMPILE_MPD_WITH_WAV),)
-mpd-compile: libaudiofile-compile
-endif
-ifneq ($(ADK_COMPILE_MPD_WITH_SHOUT),)
-mpd-compile: lame-compile
-endif
-ifneq ($(ADK_COMPILE_MPD_WITH_CURL),)
-mpd-compile: curl-compile
-endif
-ifneq ($(ADK_COMPILE_MPD_WITH_MMS),)
-mpd-compile: libmms-compile
-endif
-ifneq ($(ADK_COMPILE_MPD_WITH_FFMPEG),)
-mpd-compile: ffmpeg-compile
-endif
-
-ifneq (${ADK_PACKAGE_NUT_SSL},)
-nut-compile: openssl-compile
-endif
-ifneq (${ADK_PACKAGE_NUT_USB},)
-nut-compile: libusb-compile
-endif
-ifneq (${ADK_PACKAGE_NUT_SNMP},)
-nut-compile: net-snmp-compile
-endif
-
-ifeq ($(ADK_PACKAGE_LIBOPENSSL),y)
-openvpn-compile: openssl-compile
-endif
-ifeq ($(ADK_PACKAGE_OPENVPN_LZO),y)
-openvpn-compile: liblzo-compile
-endif
-
-php-compile: openssl-compile zlib-compile
-ifneq ($(ADK_PACKAGE_PHP_MOD_CURL),)
-php-compile: curl-compile
-endif
-ifneq ($(ADK_PACKAGE_PHP_MOD_GD),)
-php-compile: libgd-compile libpng-compile
-endif
-ifneq ($(ADK_PACKAGE_PHP_MOD_GMP),)
-php-compile: gmp-compile
-endif
-ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),)
-php-compile: openldap-compile
-endif
-ifneq ($(ADK_PACKAGE_PHP_MOD_MYSQL),)
-php-compile: mysql-compile
-endif
-ifneq ($(ADK_PACKAGE_PHP_MOD_PCRE),)
-php-compile: pcre-compile
-endif
-ifneq ($(ADK_PACKAGE_PHP_MOD_PGSQL),)
-php-compile: postgresql-compile
-endif
-ifneq ($(ADK_PACKAGE_PHP_MOD_SQLITE),)
-php-compile: sqlite-compile
-endif
-ifneq ($(ADK_PACKAGE_PHP_MOD_XML),)
-php-compile: expat-compile
-endif
-
-pmacct-compile: libpcap-compile
-ifneq ($(ADK_COMPILE_PMACCT_MYSQL),)
-pmacct-compile: mysql-compile
-endif
-ifneq ($(ADK_COMPILE_PMACCT_PGSQL),)
-pmacct-compile: postgresql-compile
-endif
-ifneq ($(ADK_COMPILE_PMACCT_SQLITE),)
-pmacct-compile: sqlite-compile
-endif
-
-ifeq (${ADK_COMPILE_RRS_WITH_UCLIBCXX},y)
-rrs-compile: uclibc++-compile 
-endif
-rrs-compile: zlib-compile
-ifneq ($(ADK_PACKAGE_RRS),)
-rrs-compile: openssl-compile
-endif
-
-ifneq ($(ADK_PACKAGE_SUBVERSION_NEON),)
-subversion-compile: neon-compile
-endif
-
-ulogd-compile: iptables-compile
-ifneq ($(ADK_PACKAGE_ULOGD_MOD_MYSQL),)
-ulogd-compile: mysql-compile
-endif
-ifneq ($(ADK_PACKAGE_ULOGD_MOD_PCAP),)
-ulogd-compile: libpcap-compile
-endif
-ifneq ($(ADK_PACKAGE_ULOGD_MOD_PGSQL),)
-ulogd-compile: postgresql-compile
-endif
-ifneq ($(ADK_PACKAGE_ULOGD_MOD_SQLITE),)
-ulogd-compile: sqlite-compile
-endif
-ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y)
-fetchmail-compile: openssl-compile
-endif
-ifeq (${ADK_PACKAGE_IRSSI_SSL},y)
-irssi-compile: openssl-compile
-endif
-
diff --git a/package/Makefile b/package/Makefile
index ce92c1cb0..1b3943f36 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -6,124 +6,6 @@
 include $(TOPDIR)/rules.mk
 include $(TOPDIR)/package/Depends.mk
 
-ifneq (${ADK_PACKAGE_CGILIB},)
-ADK_COMPILE_CGILIB=${ADK_PACKAGE_CGILIB}
-else
-ifneq (${ADK_COMPILE_RRDTOOL},)
-ADK_COMPILE_CGILIB=m
-else
-ADK_COMPILE_CGILIB=
-endif
-endif
-
-package-$(ADK_PACKAGE_6TUNNEL) += 6tunnel
-package-$(ADK_PACKAGE_AICCU) += aiccu
-package-$(ADK_PACKAGE_AIRCRACK_NG) += aircrack-ng
-package-$(ADK_PACKAGE_ALSA_LIB) += alsa-lib
-package-$(ADK_PACKAGE_ALSA_UTILS) += alsa-utils
-package-$(ADK_PACKAGE_APR) += apr
-package-$(ADK_PACKAGE_APR_UTIL) += apr-util
-package-$(ADK_PACKAGE_ARPD) += arpd
-package-$(ADK_PACKAGE_ARPWATCH) += arpwatch
-package-$(ADK_PACKAGE_ASTERISK) += asterisk
-package-$(ADK_COMPILE_ATFTP) += atftp
-package-$(ADK_PACKAGE_ATK) += atk
-package-$(ADK_PACKAGE_AUFS_UTIL) += aufs2-util
-package-$(ADK_PACKAGE_AUTOCONF) += autoconf
-package-$(ADK_PACKAGE_AUTOMAKE) += automake
-package-$(ADK_PACKAGE_AUTOSSH) += autossh
-package-$(ADK_COMPILE_AVAHI) += avahi
-package-$(ADK_COMPILE_AXTLS) += axtls
-package-$(ADK_PACKAGE_BASH) += bash
-package-$(ADK_COMPILE_BC) += bc
-package-$(ADK_PACKAGE_BISON) += bison
-package-$(ADK_PACKAGE_BZIP2) += bzip2
-package-$(ADK_PACKAGE_CA_CERTS) += ca-certificates
-package-$(ADK_PACKAGE_CAIRO) += cairo
-package-$(ADK_PACKAGE_CFGFS) += cfgfs
-package-$(ADK_PACKAGE_CFINSTALL) += cfinstall
-package-$(ADK_PACKAGE_CPIO) += cpio
-package-$(ADK_PACKAGE_CRYPTINIT) += cryptinit
-package-$(ADK_PACKAGE_BIGREQSPROTO) += bigreqsproto
-package-$(ADK_COMPILE_BIND) += bind
-package-$(ADK_PACKAGE_BINUTILS) += binutils
-package-$(ADK_PACKAGE_BITLBEE) += bitlbee
-package-$(ADK_PACKAGE_BOGOFILTER) += bogofilter
-package-$(ADK_PACKAGE_BLUEZ_FIRMWARE) += bluez-firmware
-package-$(ADK_PACKAGE_BLUEZ) += bluez
-package-$(ADK_PACKAGE_BRIDGE_UTILS) += bridge-utils
-package-$(ADK_PACKAGE_BUSYBOX) += busybox
-package-$(ADK_PACKAGE_BWM) += bwm
-package-$(ADK_PACKAGE_CBTT) += cbtt
-package-$(ADK_COMPILE_CGILIB) += cgilib
-package-$(ADK_PACKAGE_CHILLISPOT) += chillispot
-package-$(ADK_PACKAGE_CLICK) += click
-package-$(ADK_PACKAGE_COLLECTD) += collectd
-package-$(ADK_PACKAGE_COMGT) += comgt
-package-$(ADK_PACKAGE_COMPOSITEPROTO) += compositeproto
-package-$(ADK_PACKAGE_CTORRENT) += ctorrent
-package-$(ADK_PACKAGE_CUPS) += cups
-package-$(ADK_COMPILE_CURL) += curl
-package-$(ADK_PACKAGE_CUTTER) += cutter
-package-$(ADK_PACKAGE_CRYPTSETUP) += cryptsetup
-package-$(ADK_COMPILE_CYRUS_SASL) += cyrus-sasl
-package-$(ADK_PACKAGE_CXXTOOLS) += cxxtools
-package-$(ADK_PACKAGE_DAMAGEPROTO) += damageproto
-package-$(ADK_PACKAGE_DANSGUARDIAN) += dansguardian
-package-$(ADK_PACKAGE_DAVFS2) += davfs2
-package-$(ADK_PACKAGE_DBUS) += dbus
-package-$(ADK_PACKAGE_DECO) += deco
-package-$(ADK_COMPILE_DHCP) += dhcp
-package-$(ADK_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
-package-$(ADK_PACKAGE_DIFFUTILS) += diffutils
-package-$(ADK_PACKAGE_DIGITEMP) += digitemp
-package-$(ADK_PACKAGE_DNSMASQ) += dnsmasq
-package-$(ADK_PACKAGE_DOSFSTOOLS) += dosfstools
-package-$(ADK_PACKAGE_DOVECOT) += dovecot
-package-$(ADK_PACKAGE_DROPBEAR) += dropbear
-package-$(ADK_PACKAGE_DSNIFF) += dsniff
-package-$(ADK_PACKAGE_E2FSPROGS) += e2fsprogs
-package-$(ADK_PACKAGE_LIBUUID) += e2fsprogs
-package-$(ADK_PACKAGE_LIBBLKID) += e2fsprogs
-package-$(ADK_PACKAGE_EBTABLES) += ebtables
-package-$(ADK_PACKAGE_ELINKS) += elinks
-package-$(ADK_PACKAGE_ESOUND) += esound
-package-$(ADK_PACKAGE_ETHER_WAKE) += ether-wake
-package-$(ADK_PACKAGE_ETHTOOL) += ethtool
-package-$(ADK_PACKAGE_EVIEEXT) += evieext
-package-$(ADK_COMPILE_EXPAT) += expat
-package-$(ADK_COMPILE_EXMAP) += exmap
-package-$(ADK_PACKAGE_EZIPUPDATE) += ez-ipupdate
-package-$(ADK_COMPILE_FAAD2) += faad2
-package-$(ADK_PACKAGE_FAKEIDENTD) += fakeidentd
-package-$(ADK_PACKAGE_FBSET) += fbset
-package-$(ADK_PACKAGE_FETCHMAIL) += fetchmail
-package-$(ADK_PACKAGE_FFMPEG) += ffmpeg
-package-$(ADK_PACKAGE_FILE) += file
-package-$(ADK_PACKAGE_FIXESPROTO) += fixesproto
-package-$(ADK_COMPILE_FLAC) += flac
-package-$(ADK_PACKAGE_FLEX) += flex
-package-$(ADK_PACKAGE_FONTCONFIG) += fontconfig
-package-$(ADK_PACKAGE_FONTSPROTO) += fontsproto
-package-$(ADK_PACKAGE_FONTCACHEPROTO) += fontcacheproto
-package-$(ADK_PACKAGE_FPING) += fping
-package-$(ADK_PACKAGE_FPROBE) += fprobe
-package-$(ADK_PACKAGE_FPROBE_ULOG) += fprobe-ulog
-package-$(ADK_COMPILE_FREERADIUS_CLIENT) += freeradius-client
-package-$(ADK_PACKAGE_FREERADIUS_SERVER) += freeradius-server
-package-$(ADK_COMPILE_FREETYPE) += freetype
-package-$(ADK_PACKAGE_FRICKIN) += frickin
-package-$(ADK_COMPILE_FUSE) += fuse
-package-$(ADK_PACKAGE_GATLING) += gatling
-package-$(ADK_PACKAGE_GAWK) += gawk
-package-$(ADK_PACKAGE_GCC) += gcc
-package-$(ADK_PACKAGE_GDB) += gdb
-package-$(ADK_PACKAGE_GDBSERVER) += gdbserver
-package-$(ADK_PACKAGE_GETTEXT) += gettext
-package-$(ADK_PACKAGE_GIT) += git
-package-$(ADK_PACKAGE_GKRELLMD) += gkrellmd
-package-$(ADK_PACKAGE_GLIB) += glib
-package-$(ADK_PACKAGE_GTK) += gtk+
 ifeq (${ADK_TARGET_LIB_GLIBC},y)
 package-$(ADK_PACKAGE_GLIBC) += glibc
 endif
@@ -133,327 +15,15 @@ endif
 ifeq (${ADK_NATIVE},y)
 package-$(ADK_PACKAGE_LIBC) += libc
 endif
-package-$(ADK_PACKAGE_GMEDIASERVER) += gmediaserver
-package-$(ADK_COMPILE_GMP) += gmp
-package-$(ADK_COMPILE_GNUTLS) += gnutls
-package-$(ADK_PACKAGE_GPERF) += gperf
-package-$(ADK_PACKAGE_GPG) += gpg
-package-$(ADK_PACKAGE_GPM) += gpm
-package-$(ADK_PACKAGE_GPSD) += gpsd
-package-$(ADK_PACKAGE_GRUB) += grub
-package-$(ADK_PACKAGE_GRUB_BIN) += grub-bin
-package-$(ADK_COMPILE_GSM) += gsm
-package-$(ADK_PACKAGE_HASERL) += haserl
-package-$(ADK_PACKAGE_HDPARM) += hdparm
-package-$(ADK_COMPILE_HEIMDAL) += heimdal
-package-$(ADK_PACKAGE_HEYU) += heyu
-package-$(ADK_COMPILE_HOSTAPD) += hostapd
-package-$(ADK_PACKAGE_HTPDATE) += htpdate
-package-$(ADK_PACKAGE_HTTPING) += httping
-package-$(ADK_PACKAGE_HTTPTUNNEL) += httptunnel
-package-$(ADK_PACKAGE_ICECAST) += icecast
-package-$(ADK_PACKAGE_ID3LIB) += id3lib
-package-$(ADK_PACKAGE_IFTOP) += iftop
-package-$(ADK_PACKAGE_IGMPPROXY) += igmpproxy
-package-$(ADK_PACKAGE_INPUTPROTO) += inputproto
-package-$(ADK_PACKAGE_IPCAD) += ipcad
-package-$(ADK_PACKAGE_IPERF) += iperf
-package-$(ADK_COMPILE_IPROUTE2) += iproute2
-package-$(ADK_PACKAGE_IPSEC_TOOLS) += ipsec-tools
-package-$(ADK_PACKAGE_IPSET) += ipset
-package-$(ADK_COMPILE_IPTABLES) += iptables
-package-$(ADK_PACKAGE_IPTABLES_SNMP) += iptables-snmp
-package-$(ADK_PACKAGE_IPTRAF) += iptraf
-package-$(ADK_PACKAGE_IRSSI) += irssi
-package-$(ADK_PACKAGE_IW) += iw
-package-$(ADK_PACKAGE_JAMVM) += jamvm
-package-$(ADK_COMPILE_JPEG) += jpeg
-package-$(ADK_PACKAGE_KBPROTO) += kbproto
-package-$(ADK_COMPILE_KISMET) += kismet
-package-$(ADK_COMPILE_KNOCK) += knock
-package-$(ADK_COMPILE_KRB5) += krb5
-package-$(ADK_PACKAGE_L2TPNS) += l2tpns
-package-$(ADK_COMPILE_LAME) += lame
-package-$(ADK_PACKAGE_LESS) += less
-package-$(ADK_PACKAGE_LIBAO) += libao
-package-$(ADK_PACKAGE_LIBART) += libart
-package-$(ADK_PACKAGE_LIBAUDIOFILE) += libaudiofile
-package-$(ADK_PACKAGE_LIBCLI) += libcli
-package-$(ADK_PACKAGE_LIBDAEMON) += libdaemon
-package-$(ADK_COMPILE_DB) += libdb
-package-$(ADK_PACKAGE_LIBDNET) += libdnet
-package-$(ADK_PACKAGE_LIBELF) += libelf
-package-$(ADK_PACKAGE_LIBEVENT) += libevent
-package-$(ADK_PACKAGE_LIBFFI) += libffi
-package-$(ADK_PACKAGE_LIBFONTENC) += libfontenc
-package-$(ADK_PACKAGE_LIBGCRYPT) += libgcrypt
-package-$(ADK_PACKAGE_LIBGD) += libgd
-package-$(ADK_PACKAGE_LIBGDBM) += gdbm
-package-$(ADK_PACKAGE_LIBGPG_ERROR) += libgpg-error
-package-$(ADK_PACKAGE_LIBGSSGLUE) += libgssglue
-package-$(ADK_PACKAGE_LIBICONV) += libiconv
-package-$(ADK_PACKAGE_LIBID3TAG) += libid3tag
-package-$(ADK_PACKAGE_LIBLZO) += liblzo
-package-$(ADK_PACKAGE_LIBMAD) += libmad
-package-$(ADK_PACKAGE_LIBMMS) += libmms
-package-$(ADK_PACKAGE_LIBNET) += libnet
-package-$(ADK_PACKAGE_LIBNFSIDMAP) += libnfsidmap
-package-$(ADK_PACKAGE_LIBNIDS) += libnids
-package-$(ADK_PACKAGE_LIBNL) += libnl
-package-$(ADK_PACKAGE_LIBOGG) += libogg
-package-$(ADK_PACAKGE_LIBOL) += libol
-package-$(ADK_PACKAGE_LIBOSIP2) += libosip2
-package-$(ADK_COMPILE_LIBOWFAT) += libowfat
-package-$(ADK_PACKAGE_LIBP11) += libp11
-package-$(ADK_PACKAGE_LIBPCAP) += libpcap
-package-$(ADK_PACKAGE_LIBPCIACCESS) += libpciaccess
-package-$(ADK_PACKAGE_LIBPNG) += libpng
-package-$(ADK_PACKAGE_LIBPRI) += libpri
 ifneq (${ADK_NATIVE},y)
 package-$(ADK_PACKAGE_LIBPTHREAD) += libpthread
 endif
-package-$(ADK_COMPILE_LIBSHOUT) += libshout
-package-$(ADK_PACKAGE_LIBSIGCXX) += libsigc++
-package-$(ADK_PACKAGE_LIBSTDCXX) += libstdcxx
-package-$(ADK_PACKAGE_LIBRPCSECGSS) += librpcsecgss
-package-$(ADK_PACKAGE_LIBTASN1) += libtasn1
-package-$(ADK_PACKAGE_LIBTHREAD_DB) += libthread_db
-package-$(ADK_PACKAGE_LIBTIFF) += libtiff
-package-$(ADK_PACKAGE_LIBTIRPC) += libtirpc
-package-$(ADK_PACKAGE_LIBTORRENT) += libtorrent
-package-$(ADK_COMPILE_LIBTOOL) += libtool
-package-$(ADK_PACKAGE_LIBUPNP) += libupnp
-package-$(ADK_PACKAGE_LIBUSB) += libusb
-package-$(ADK_PACKAGE_LIBUSB_COMPAT) += libusb-compat
-package-$(ADK_PACKAGE_LIBVIRT) += libvirt
-package-$(ADK_PACKAGE_LIBVORBIS) += libvorbis
-package-$(ADK_PACKAGE_LIBVORBISIDEC) += libvorbisidec
-package-$(ADK_PACKAGE_LIBICE) += libICE
-package-$(ADK_PACKAGE_LIBSM) += libSM
-package-$(ADK_PACKAGE_LIBX11) += libX11
-package-$(ADK_PACKAGE_LIBXAU) += libXau
-package-$(ADK_PACKAGE_LIBXAW) += libXaw
-package-$(ADK_PACKAGE_LIBXPM) += libXpm
-package-$(ADK_PACKAGE_LIBXRENDER) += libXrender
-package-$(ADK_PACKAGE_LIBXV) += libXv
-package-$(ADK_PACKAGE_LIBXDMCP) += libXdmcp
-package-$(ADK_PACKAGE_LIBXEXT) += libXext
-package-$(ADK_PACKAGE_LIBXFONT) += libXfont
-package-$(ADK_PACKAGE_LIBXKBFILE) += libxkbfile
-package-$(ADK_PACKAGE_LIBXXF86DGA) += libXxf86dga
-package-$(ADK_PACKAGE_LIBXML2) += libxml2
-package-$(ADK_PACKAGE_LIBXMU) += libXmu
-package-$(ADK_PACKAGE_LIBXSLT) += libxslt
-package-$(ADK_PACKAGE_LIBXT) += libXt
-package-$(ADK_PACKAGE_LIGHTTPD) += lighttpd
-package-$(ADK_PACKAGE_LINKS) += links
-package-$(ADK_COMPILE_LINUX_ATM) += linux-atm
-package-$(ADK_PACKAGE_LOGROTATE) += logrotate
-package-$(ADK_PACKAGE_LRZSZ) += lrzsz
-package-${ADK_PACKAGE_LYNX} += lynx
-package-$(ADK_COMPILE_LUA) += lua
-package-$(ADK_COMPILE_LVM) += lvm
-package-$(ADK_PACKAGE_MACCHANGER) += macchanger
-package-$(ADK_PACKAGE_MADPLAY) += madplay
-package-$(ADK_PACKAGE_M4) += m4
-package-$(ADK_PACKAGE_MAKE) += make
-package-$(ADK_PACKAGE_MARADNS) += maradns
-package-$(ADK_PACKAGE_MGETTY) += mgetty
-package-$(ADK_PACKAGE_MC) += mc
-package-$(ADK_PACKAGE_MDADM) += mdadm
-package-$(ADK_PACKAGE_MIAU) += miau
-package-$(ADK_PACKAGE_MIAX) += miax
-package-$(ADK_PACKAGE_MICROPERL) += microperl
-package-$(ADK_COMPILE_MINI_HTTPD) += mini_httpd
-package-$(ADK_PACKAGE_MINI_SENDMAIL) += mini_sendmail
-package-$(ADK_COMPILE_MIREDO) += miredo
-package-$(ADK_PACKAGE_MKSH) += mksh
-package-$(ADK_PACKAGE_MOC) += moc
-package-$(ADK_PACKAGE_MONIT) += monit
-package-$(ADK_PACKAGE_MOTION) += motion
-package-$(ADK_PACKAGE_MPD) += mpd
-package-$(ADK_PACKAGE_MPFR) += mpfr
-package-$(ADK_PACKAGE_MPLAYER) += mplayer
-package-$(ADK_PACKAGE_MRD6) += mrd6
-package-$(ADK_PACKAGE_MT_DAAPD) += mt-daapd
-package-$(ADK_PACKAGE_MTD) += mtd
-package-$(ADK_PACKAGE_MTR) += mtr
-package-$(ADK_PACKAGE_MUTT) += mutt
-package-$(ADK_COMPILE_MYSQL) += mysql
-package-$(ADK_PACKAGE_NANO) += nano
-package-$(ADK_COMPILE_NCURSES) += ncurses
-package-$(ADK_PACKAGE_NUT) += nut
-package-$(ADK_PACKAGE_LIBNCURSES) += ncurses
-package-$(ADK_COMPILE_NDISC6) += ndisc
-package-$(ADK_PACKAGE_NEON) += neon
-package-$(ADK_COMPILE_NET_SNMP) += net-snmp
-package-$(ADK_PACKAGE_NETPERF) += netperf
-package-$(ADK_PACKAGE_NETSTAT_NAT) += netstat-nat
-package-$(ADK_PACKAGE_NFS_UTILS) += nfs-utils
-package-$(ADK_PACKAGE_NFS_KERNEL_NFSD) += nfs-utils
-package-$(ADK_PACKAGE_NMAP) += nmap
-package-$(ADK_PACKAGE_NTPCLIENT) += ntpclient
-package-$(ADK_PACKAGE_NSS) += nss
-package-$(ADK_COMPILE_OBEXFTP) += obexftp
-package-$(ADK_PACKAGE_OLSRD) += olsrd
-package-$(ADK_COMPILE_OPENCDK) += opencdk
-package-$(ADK_PACKAGE_OPENCT) += openct
-package-$(ADK_PACKAGE_OPENOBEX) += openobex
-package-$(ADK_COMPILE_OPENLDAP) += openldap
-package-$(ADK_PACKAGE_OPENNTPD) += openntpd
-package-$(ADK_PACKAGE_OPENSC) += opensc
-package-$(ADK_PACKAGE_OPENSIPS) += opensips
-package-$(ADK_COMPILE_OPENSSH) += openssh
-package-$(ADK_COMPILE_OPENSSL) += openssl
-package-$(ADK_PACKAGE_OPENSSL_PKCS11) += openssl-pkcs11
-package-$(ADK_PACKAGE_OPENSWAN) += openswan
-package-$(ADK_PACKAGE_OPENVPN) += openvpn
-package-$(ADK_PACKAGE_OPROFILE) += oprofile
-package-$(ADK_COMPILE_OSIRIS) += osiris
-package-$(ADK_PACKAGE_OWFS) += owfs
-package-$(ADK_PACKAGE_P910ND) += p910nd
-package-$(ADK_PACKAGE_PALANTIR) += palantir
-package-$(ADK_PACKAGE_PANGO) += pango
-package-$(ADK_PACKAGE_PARPROUTED) += parprouted
-package-$(ADK_PACKAGE_PARTED) += parted
-package-$(ADK_PACKAGE_PATCH) += patch
-package-$(ADK_PACKAGE_PCIUTILS) += pciutils
-package-$(ADK_COMPILE_PCRE) += pcre
-package-$(ADK_PACKAGE_PERL) += perl
-package-$(ADK_COMPILE_PHP) += php
-package-$(ADK_PACKAGE_PICOCOM) += picocom
-package-$(ADK_PACKAGE_PIPACS) += pipacs
-package-$(ADK_PACKAGE_PIXMAN) += pixman
-package-$(ADK_COMPILE_PMACCT) += pmacct
-package-$(ADK_COMPILE_POPT) += popt
-package-$(ADK_PACKAGE_PORTMAP) += portmap
-package-$(ADK_PACKAGE_PORTSENTRY) += portsentry
-package-$(ADK_COMPILE_POSTGRESQL) += postgresql
-package-$(ADK_PACKAGE_PPP) += ppp
-package-$(ADK_PACKAGE_PPTP) += pptp
-package-$(ADK_PACKAGE_PPTPD) += pptpd
-package-$(ADK_PACKAGE_PRIVOXY) += privoxy
-package-$(ADK_PACKAGE_PROCMAIL) += procmail
-package-$(ADK_PACKAGE_PROCPS) += procps
-package-$(ADK_PACKAGE_PTUNNEL) += ptunnel
-package-$(ADK_PACKAGE_PYTHON) += python
-package-$(ADK_PACKAGE_QUAGGA) += quagga
-package-$(ADK_PACKAGE_RADDUMP) += raddump
-package-$(ADK_PACKAGE_RADVD) += radvd
-package-$(ADK_PACKAGE_RANDRPROTO) += randrproto
-package-$(ADK_PACKAGE_RARPD) += rarpd
-package-$(ADK_PACKAGE_RDATE) += rdate
-package-$(ADK_COMPILE_READLINE) += readline
-package-$(ADK_PACKAGE_REAIM) += reaim
-package-$(ADK_PACKAGE_RENDERPROTO) += renderproto
-package-$(ADK_PACKAGE_RESOURCEPROTO) += resourceproto
-package-$(ADK_COMPILE_RP_PPPOE) += rp-pppoe
-package-$(ADK_PACKAGE_RPM) += rpm
-package-$(ADK_PACKAGE_RRDCOLLECT) += rrdcollect
-package-$(ADK_COMPILE_RRDTOOL) += rrdtool
-package-$(ADK_PACKAGE_RUBY) += ruby
-package-$(ADK_COMPILE_RRS) += rrs
-package-$(ADK_PACKAGE_RSYNC) += rsync
-package-$(ADK_PACKAGE_RTORRENT) += rtorrent
-package-$(ADK_COMPILE_SAMBA) += samba
-package-$(ADK_PACKAGE_SANE_BACKENDS) += sane-backends
-package-$(ADK_PACKAGE_SCANLOGD) += scanlogd
-package-$(ADK_PACKAGE_SCREEN) += screen
-package-$(ADK_PACKAGE_SCRNSAVERPROTO) += scrnsaverproto
-package-$(ADK_PACKAGE_SCSI_SPIN) += scsi-spin
-package-$(ADK_PACKAGE_SER2NET) += ser2net
-package-$(ADK_PACKAGE_SERDISPLIB) += serdisplib
-package-$(ADK_PACKAGE_SETPWC) += setpwc
-package-$(ADK_PACKAGE_SETSERIAL) += setserial
-package-$(ADK_PACKAGE_SHAT) += shat
-package-$(ADK_PACKAGE_SHOREWALL) += shorewall-common
-package-${ADK_PACKAGE_SHOREWALL_SHELL} += shorewall-shell
-package-$(ADK_PACKAGE_SIPROXD) += siproxd
-package-$(ADK_PACKAGE_SIPSAK) += sipsak
-package-$(ADK_PACKAGE_SISPMCTL) += sispmctl
-package-$(ADK_COMPILE_SNORT) += snort
-package-$(ADK_COMPILE_SNORT_WIRELESS) += snort-wireless
-package-$(ADK_PACKAGE_SOCAT) += socat
-package-$(ADK_COMPILE_SPEEX) += speex
-package-$(ADK_COMPILE_SQLITE) += sqlite
-package-$(ADK_PACKAGE_SQUID) += squid
-package-$(ADK_PACKAGE_SRELAY) += srelay
-package-$(ADK_PACKAGE_SSLTUNNEL) += ssltunnel
-package-$(ADK_PACKAGE_SSMTP) += ssmtp
-package-$(ADK_PACKAGE_STRACE) += strace
-package-$(ADK_PACKAGE_STRESS) += stress
-package-$(ADK_PACKAGE_SUBVERSION) += subversion
-package-$(ADK_PACKAGE_SWCONFIG) += swconfig
-package-$(ADK_PACKAGE_SYSLOG_NG) += syslog-ng
-package-$(ADK_PACKAGE_SYSSTAT) += sysstat
-package-${ADK_PACKAGE_TCL} += tcl
-package-$(ADK_PACKAGE_LIBWRAP) += tcp_wrappers
-package-$(ADK_PACKAGE_TAR) += tar
-package-$(ADK_PACKAGE_TCPDUMP) += tcpdump
-package-$(ADK_PACKAGE_TINC) += tinc
-package-$(ADK_PACKAGE_TINYPROXY) += tinyproxy
-package-$(ADK_PACKAGE_TMSNC) += tmsnc
-package-$(ADK_PACKAGE_TNTNET) += tntnet
-package-$(ADK_PACKAGE_TOR) += tor
-package-$(ADK_PACKAGE_TRAFSHOW) += trafshow
-package-$(ADK_PACKAGE_TTCP) += ttcp
 ifneq (${ADK_TARGET_LIB_GLIBC},y)
 ifneq (${ADK_NATIVE},y)
 package-$(ADK_PACKAGE_UCLIBC) += uclibc
 endif
 package-$(ADK_PACKAGE_UCLIBCXX) += uclibc++
 endif
-package-$(ADK_PACKAGE_UDEV) += udev
-package-$(ADK_PACKAGE_UDP_BROADCAST_RELAY) += udp-broadcast-relay
-package-$(ADK_PACKAGE_ULOGD) += ulogd
-package-$(ADK_PACKAGE_UPDATEDD) += updatedd
-package-$(ADK_COMPILE_USBUTILS) += usbutils
-package-$(ADK_PACKAGE_USSP_PUSH) += ussp-push
-package-$(ADK_PACKAGE_USTL) += ustl
-package-$(ADK_COMPILE_UTIL_LINUX_NG) += util-linux-ng
-package-$(ADK_PACKAGE_VALGRIND) += valgrind
-package-$(ADK_PACKAGE_VGP) += vgp
-package-$(ADK_PACKAGE_VIDEOPROTO) += videoproto
-package-$(ADK_PACKAGE_VILISTEXTUM) += vilistextum
-package-$(ADK_PACKAGE_VIM) += vim
-package-$(ADK_PACKAGE_VNC_REFLECTOR) += vnc-reflector
-package-$(ADK_PACKAGE_VNSTAT) += vnstat
-package-$(ADK_PACKAGE_VPNC) += vpnc
-package-$(ADK_PACKAGE_VRRPD) += vrrpd
-package-$(ADK_PACKAGE_VSFTPD) += vsftpd
-package-$(ADK_PACKAGE_VTUN) += vtun
-package-$(ADK_PACKAGE_WATCHDOG) += watchdog
-package-$(ADK_PACKAGE_WCCPD) += wccpd
-package-$(ADK_PACKAGE_WDFS) += wdfs
-package-$(ADK_PACKAGE_WEECHAT) += weechat
-package-$(ADK_PACKAGE_WGET) += wget
-package-$(ADK_PACKAGE_WIFIDOG) += wifidog
-package-$(ADK_DOWNLOAD_WIRELESS_FIRMWARE) += wireless-firmware
-package-$(ADK_PACKAGE_WOL) += wol
-package-$(ADK_PACKAGE_WONDERSHAPER) += wondershaper
-package-$(ADK_PACKAGE_WPA_SUPPLICANT) += wpa_supplicant
-package-$(ADK_PACKAGE_WPUT) += wput
-package-$(ADK_PACKAGE_XFSPROGS) += xfsprogs
-package-$(ADK_PACKAGE_XINETD) += xinetd
-package-$(ADK_PACKAGE_XCMISCPROTO) += xcmiscproto
-package-$(ADK_PACKAGE_XEXTPROTO) += xextproto
-package-$(ADK_PACKAGE_XKBCOMP) += xkbcomp
-package-$(ADK_PACKAGE_XKEYBOARD_CONFIG) += xkeyboard-config
-package-$(ADK_PACKAGE_XF86_VIDEO_CIRRUS) += xf86-video-cirrus
-package-$(ADK_PACKAGE_XF86_VIDEO_GEODE) += xf86-video-geode
-package-$(ADK_PACKAGE_XF86DGA) += xf86dga
-package-$(ADK_PACKAGE_XF86DGAPROTO) += xf86dgaproto
-package-$(ADK_PACKAGE_XPROTO) += xproto
-package-$(ADK_PACKAGE_XORG_SERVER) += xorg-server
-package-$(ADK_PACKAGE_XTRANS) += xtrans
-package-$(ADK_PACKAGE_XZ) += xz
-package-$(ADK_PACKAGE_ZLIB) += zlib
-package-$(ADK_PACKAGE_ZLIB_DEV) += zlib
-package-$(ADK_PACKAGE_ZSH) += zsh
-# kernel addon packages
-package-$(ADK_PACKAGE_KMOD_EM28XX) += em28xx
-package-$(ADK_PACKAGE_NTFS_3G) += ntfs-3g
-package-$(ADK_PACKAGE_KMOD_SANGAM_ATM) += sangam-atm
 
 DOWNLOAD:=$(patsubst %,%-download,$(package-y) $(package-m))
 COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
diff --git a/package/aiccu/Config.in b/package/aiccu/Config.in
deleted file mode 100644
index 1dbda660b..000000000
--- a/package/aiccu/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_AICCU
-	prompt "aiccu............................. SixXS Automatic IPv6 Connectivity Client Utility"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_IPV6
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  SixXS Automatic IPv6 Connectivity Client Utility
-	  
-	  For more information about SixXS check http://www.sixxs.net/
-
diff --git a/package/aircrack-ng/Config.in b/package/aircrack-ng/Config.in
deleted file mode 100644
index 81c8425f3..000000000
--- a/package/aircrack-ng/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config ADK_PACKAGE_AIRCRACK_NG
-	prompt "aircrack-ng....................... A set of tools for auditing wireless networks"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_LIBPCAP
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-	  aircrack-ng is a set of tools for auditing wireless networks:
-	  
-	  * aircrack-ng: a program that cracks WEP and WPA (bruteforce) keys
-	  * airdecap-ng: decrypts WEP or WPA encrypted capture files with known key
-	  * airmon-ng: responsible for placing different cards in monitor mode
-	  * aireplay-ng: responsible for packet injection
-	  * airodump-ng: places all air traffic into .cap file and shows information on networks
-	  http://www.aircrack-ng.org
diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile
index bbfc8e498..c03c57915 100644
--- a/package/aircrack-ng/Makefile
+++ b/package/aircrack-ng/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		aircrack-ng
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl libpcap
 PKG_MD5SUM:=		dafbfaf944ca9d523fde4bae86f0c067
 PKG_DESCR:=		set of tools for auditing wireless networks
 PKG_SECTION:=		net
diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in
deleted file mode 100644
index fcefe3c5f..000000000
--- a/package/alsa-lib/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_ALSA_LIB
-	prompt "alsa-lib.......................... alsa library"
-	tristate
-	default n
-	help
-	  
-	  http://www.alsa-project.org/
diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in
deleted file mode 100644
index 0c5982c40..000000000
--- a/package/alsa-utils/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_ALSA_UTILS
-	prompt "alsa-utils........................ ALSA utilities / mixer"
-	tristate
-	default n
-	select ADK_PACKAGE_ALSA_LIB
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  http://www.alsa-project.org/
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 6cbc92509..e2261ff1c 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -6,8 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		alsa-utils
 PKG_VERSION:=		1.0.21
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		alsa-lib
 PKG_MD5SUM:=		3672287c2608040d111ce45495ba7602
 PKG_DESCR:=		ALSA mixer utility
+PKG_DEPENDS:=		alsa-lib libpthread
 PKG_SECTION:=		utils
 PKG_URL:=		http://www.alsa-project.org
 PKG_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \
diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in
deleted file mode 100644
index c691fe035..000000000
--- a/package/apr-util/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_APR_UTIL
-	prompt "apr-util.......................... Apache Portable Runtime (utils)"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBEXPAT
-	select ADK_PACKAGE_APR
-	help
-	  Apache Portable Runtime
-
-	  http://apr.apache.org
-
-
diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index ecc96942f..6b4142600 100644
--- a/package/apr-util/Makefile
+++ b/package/apr-util/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=              apr-util
 PKG_VERSION:=           0.9.15
 PKG_RELEASE:=           1
+PKG_BUILDDEP+=		expat apr
 PKG_MD5SUM:=            dc772ae295f49ddb8ee8e69a9716c53b
 PKG_DESCR:=		Apache Portable Runtime utility library
 PKG_SECTION:=		libs
diff --git a/package/apr/Config.in b/package/apr/Config.in
deleted file mode 100644
index 5a875e10e..000000000
--- a/package/apr/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config ADK_PACKAGE_APR
-	prompt "apr............................... Apache Portable Runtime"
-	tristate
-	default n
-	help
-	  Apache Portable Runtime
-
-	  http://apr.apache.org
-
-config ADK_PACKAGE_APR_THREADING
-        prompt "Enable threading support"
-        bool
-        default n
-        depends on ADK_PACKAGE_APR
-        help
-	  Enable threading support in APR.
diff --git a/package/apr/Makefile b/package/apr/Makefile
index bf326d316..5a481234f 100644
--- a/package/apr/Makefile
+++ b/package/apr/Makefile
@@ -6,12 +6,19 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		apr
 PKG_VERSION:=		0.9.17
 PKG_RELEASE:=		1
+ifeq ($(ADK_PACKAGE_APR_THREADING),y)
+PKG_BUILDDEP+=		libpthread
+endif
 PKG_MD5SUM:=		ca1e22d98081a03a33c2a0b8684eb192
 PKG_DESCR:=		Apache Portable Runtime library
 PKG_SECTION:=		libs
 PKG_URL:=		http://apr.apache.org
 PKG_SITES:=		http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/
 
+PKG_FLAVOURS=		THREADING
+PKGFD_FULL=		Enable threading support
+
+
 include ${TOPDIR}/mk/package.mk
 
 ifeq (${ADK_PACKAGE_APR_THREADING},y)
diff --git a/package/arpd/Config.in b/package/arpd/Config.in
deleted file mode 100644
index 3f1068ca3..000000000
--- a/package/arpd/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_ARPD
-	prompt "arpd.............................. A daemon to fake ARP replies"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPCAP
-	select ADK_PACKAGE_LIBDNET
-	select ADK_PACKAGE_LIBEVENT
-	help
-	  Generates ARP responses for (locally unused) IP addresses
-	  
-	  http://www.honeyd.org/tools.php
diff --git a/package/arpd/Makefile b/package/arpd/Makefile
index 065d46951..2dc9cfed8 100644
--- a/package/arpd/Makefile
+++ b/package/arpd/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		arpd
 PKG_VERSION:=		0.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libpcap libdnet libevent
 PKG_MD5SUM:=		e2911fa9de1b92ef50deda1489ae944d
 PKG_DESCR:=		Generates ARP responses for IP address ranges
 PKG_SECTION:=		net
diff --git a/package/arpwatch/Config.in b/package/arpwatch/Config.in
deleted file mode 100644
index 96cd0b3e4..000000000
--- a/package/arpwatch/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_ARPWATCH
-	prompt "arpwatch.......................... Ethernet station activity monitor"
-	tristate
-	default n
-	help
-	  Ethernet monitor program for keeping track of ethernet/ip address pairings
-
diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile
index 1b3c0d7aa..7f181cb31 100644
--- a/package/arpwatch/Makefile
+++ b/package/arpwatch/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		arpwatch
 PKG_VERSION:=		2.1a15
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libpcap
 PKG_MD5SUM:=		cebfeb99c4a7c2a6cee2564770415fe7
 PKG_DESCR:=		Ethernet monitor program for keeping track of ethernet/ip address pairings
 PKG_SECTION:=		net
diff --git a/package/asterisk/Config.in b/package/asterisk/Config.in
deleted file mode 100644
index 3cac88628..000000000
--- a/package/asterisk/Config.in
+++ /dev/null
@@ -1,97 +0,0 @@
-config ADK_PACKAGE_ASTERISK
-	bool "asterisk................... Telephony server"
-	depends on !ADK_LINUX_CRIS_FOXBOARD
-        select ADK_PACKAGE_LIBCURL
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBPTHREAD
-	default n
-
-menu "asterisk-modules.................. Additional modules for Asterisk"
-depends on ADK_PACKAGE_ASTERISK
-
-config ADK_PACKAGE_ASTERISK_CHAN_MGCP
-	prompt   "asterisk-chan-mgcp.............. Media Gateway Control Protocol implementation"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Media Gateway Control Protocol implementation for Asterisk
-
-config ADK_PACKAGE_ASTERISK_CHAN_SKINNY
-	prompt   "asterisk-chan-skinny............ Skinny Client Control Protocol implementation"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Skinny Client Control Protocol implementation for Asterisk
-
-config ADK_PACKAGE_ASTERISK_CHAN_IAX2
-	prompt   "asterisk-chan-iax2.............. Support for the Inter Asterisk Protocol"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  IAX2 allows trunking communication channels together.
-
-	  Contains:
-	  * chan_iax2.so
-
-config ADK_PACKAGE_ASTERISK_CODEC_SPEEX
-	prompt   "asterisk-codec-speex............ Speex/PCM16 Codec Translator"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	select ADK_PACKAGE_LIBSPEEX
-	help
-	  The Speex speech compression codec for Asterisk
-
-config ADK_PACKAGE_ASTERISK_CODEC_GSM
-	prompt   "asterisk-codec-gsm.............. GSM Codec"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  The GSM codec for Asterisk
-
-config ADK_PACKAGE_ASTERISK_PBX_DUNDI
-	prompt   "asterisk-pbx-dundi.............. Distributed Universal Number Discovery (DUNDi) support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Distributed Universal Number Discovery (DUNDi) support for Asterisk
-
-config ADK_PACKAGE_ASTERISK_RES_AGI
-	prompt   "asterisk-res-agi................ Asterisk Gateway Interface module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Asterisk Gateway Interface module
-
-config ADK_PACKAGE_ASTERISK_PGSQL
-	prompt   "asterisk-pgsql.................. PostgreSQL modules"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	select ADK_PACKAGE_LIBPQ
-	help
-	  PostgreSQL modules for Asterisk
-
-config ADK_PACKAGE_ASTERISK_SOUNDS
-	prompt   "asterisk-sounds................. Sound files"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Sound files for Asterisk
-
-config ADK_PACKAGE_ASTERISK_VOICEMAIL
-	prompt   "asterisk-voicemail.............. Voicemail support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ASTERISK
-	help
-	  Voicemail related modules for Asterisk
-
-endmenu
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index ecb33b52d..7dd463cac 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -6,6 +6,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		asterisk
 PKG_VERSION:=		1.4.27.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		ncurses openssl zlib curl popt
+ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),)
+PKG_BUILDDEP+=		speex
+endif
+ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),)
+PKG_BUILDDEP+=		postgresql
+endif
 PKG_MD5SUM:=		e09ca163a6e90018c92c65a50b9ec398
 PKG_DESCR:=		Open Source PBX
 PKG_SECTION:=		net
@@ -14,16 +21,24 @@ PKG_NOPARALLEL:=	1
 PKG_URL:=		http://www.asterisk.org
 PKG_SITES:=		http://downloads.asterisk.org/pub/telephony/asterisk/releases/
 
+PKG_TARGET_DEPENDS:=	!foxboard
+
+PKG_DEPENDS_MAIN:=		asterisk
+PKG_DESCR_CHAN_MGCP:=		Media Gateway Control Protocol implementation
+PKG_DESCR_CHAN_SKINNY:=		Skinny Client Control Protocol implementation
+PKG_DESCR_CHAN_IAX2:=		Support for the Inter Asterisk Protocol
+PKG_DESCR_CODEC_SPEEX:=		Speex/PCM16 Codec Translator
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_MGCP},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_SKINNY},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_IAX2},${PKG_SECTION}))
+$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_SPEEX},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/atftp/Config.in b/package/atftp/Config.in
deleted file mode 100644
index 8d48e2094..000000000
--- a/package/atftp/Config.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#menu "atftp............................. TFTP implementation"
-
-config ADK_COMPILE_ATFTP
-	tristate
-	default n
-	depends on ADK_PACKAGE_ATFTP || ADK_PACKAGE_ATFTPD
-	select ADK_PACKAGE_LIBREADLINE
-	
-config ADK_PACKAGE_ATFTP
-	prompt "atftp............................. TFTP client"
-	tristate
-	default n
-	select ADK_COMPILE_ATFTP
-	help
-	  TFTP client
-
-config ADK_PACKAGE_ATFTPD
-	prompt "atftpd............................ TFTP server"
-	tristate
-	default n
-	select ADK_COMPILE_ATFTP
-	help
-	  TFTP server 
-
-#endmenu
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index 086e741ce..7cea94e68 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		atftp
 PKG_VERSION:=		0.7
 PKG_RELEASE:=		2
+PKG_BUILDDEP+=		readline ncurses
 PKG_MD5SUM:=		3b27365772d918050b2251d98a9c7c82
 PKG_DESCR:=		TFTP client
 PKG_SECTION:=		net
diff --git a/package/atk/Config.in b/package/atk/Config.in
deleted file mode 100644
index bd1193fa7..000000000
--- a/package/atk/Config.in
+++ /dev/null
@@ -1,5 +0,0 @@
-config ADK_PACKAGE_ATK
-	prompt "atk............................... ATK library"
-	tristate
-	default n
-	help
diff --git a/package/atk/Makefile b/package/atk/Makefile
index 3f42dc2ea..f7172b76b 100644
--- a/package/atk/Makefile
+++ b/package/atk/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		atk
 PKG_VERSION:=		1.29.3
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		glib
 PKG_MD5SUM:=		f587d9285b2d0ac35ea95acef673517c
 PKG_DESCR:=		atk library
 PKG_SECTION:=		libs
diff --git a/package/aufs2-util/Config.in b/package/aufs2-util/Config.in
deleted file mode 100644
index f6de6a8b9..000000000
--- a/package/aufs2-util/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_AUFS_UTIL
-	prompt "aufs2-util........................ aufs2 utilities"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_AUFS_FS
-	depends on !ADK_HOST_FREEBSD
-	help
-	  Utilities for use with aufs2.
-	  http://aufs.sf.net
diff --git a/package/autoconf/Config.in b/package/autoconf/Config.in
deleted file mode 100644
index 85ce44c79..000000000
--- a/package/autoconf/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_AUTOCONF
-	prompt "autoconf.......................... Autoconf"
-	tristate
-	default n
-	help
-	  http://www.gnu.org/software/autoconf/
diff --git a/package/automake/Config.in b/package/automake/Config.in
deleted file mode 100644
index 9ded7338f..000000000
--- a/package/automake/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_AUTOMAKE
-	prompt "automake.......................... Automake"
-	tristate
-	default n
-	help
-	  http://www.gnu.org/software/automake/
diff --git a/package/autossh/Config.in b/package/autossh/Config.in
deleted file mode 100644
index 5f72059f0..000000000
--- a/package/autossh/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_AUTOSSH
-	prompt "autossh........................... Auto handle ssh tunnels"
-	tristate
-	default n
-	help
-	      autossh is a program to start a copy of ssh and monitor it,
-	      restarting it as necessary should it die or stop passing traffic.
-
-	      http://www.harding.motd.ca/autossh/
diff --git a/package/avahi/Config.in b/package/avahi/Config.in
deleted file mode 100644
index 53d0e1ff8..000000000
--- a/package/avahi/Config.in
+++ /dev/null
@@ -1,45 +0,0 @@
-config ADK_COMPILE_AVAHI
-	tristate
-	default n
-	depends on ADK_PACKAGE_AVAHI_DAEMON || ADK_PACKAGE_AVAHI_DNSCONFD || ADK_PACKAGE_LIBAVAHI
-
-config ADK_PACKAGE_AVAHI_DAEMON
-	prompt   "avahi-daemon...................... An mDNS/DNS-SD (ZeroConf) implementation (daemon)"
-	tristate
-	default n
-	select ADK_COMPILE_AVAHI
-	select ADK_PACKAGE_LIBAVAHI
-	select ADK_PACKAGE_LIBDAEMON
-	select ADK_PACKAGE_GLIB
-	help
-	  Avahi is a system which facilitates service discovery on a local network --
-	  this means that you can plug your laptop or computer into a network and
-	  instantly be able to view other people who you can chat with, find printers
-	  to print to or find files being shared. This kind of technology is already
-	  found in MacOS X (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf')
-	  and is very convenient.
-
-	  http://www.freedesktop.org/Software/Avahi
-
-	  This package contains an mDNS/DNS-SD daemon.
-
-config ADK_PACKAGE_AVAHI_DNSCONFD
-	prompt     "avahi-dnsconfd.................. Unicast DNS server from mDNS/DNS-SD config daemon"
-	tristate
-	default n
-	select ADK_COMPILE_AVAHI
-	depends on ADK_PACKAGE_AVAHI_DAEMON
-	help
-	  Avahi is a system which facilitates service discovery on a local network --
-	  this means that you can plug your laptop or computer into a network and
-	  instantly be able to view other people who you can chat with, find printers
-	  to print to or find files being shared. This kind of technology is already
-	  found in MacOS X (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf')
-	  and is very convenient.
-
-	  http://www.freedesktop.org/Software/Avahi
-
-	  This package contains an Unicast DNS server from mDNS/DNS-SD configuration
-	  daemon, which may be used to configure conventional DNS servers using mDNS
-	  in a DHCP-like fashion. Especially useful on IPv6.
-
diff --git a/package/avahi/Config.in.lib b/package/avahi/Config.in.lib
deleted file mode 100644
index abfbdc426..000000000
--- a/package/avahi/Config.in.lib
+++ /dev/null
@@ -1,18 +0,0 @@
-config ADK_PACKAGE_LIBAVAHI
-	prompt   "libavahi.......................... An mDNS/DNS-SD (ZeroConf) implementation (library)"
-	tristate
-	default n
-	select ADK_COMPILE_AVAHI
-	help
-	  Avahi is a system which facilitates service discovery on a local network --
-	  this means that you can plug your laptop or computer into a network and
-	  instantly be able to view other people who you can chat with, find printers
-	  to print to or find files being shared. This kind of technology is already
-	  found in MacOS X (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf')
-	  and is very convenient.
-
-	  http://www.freedesktop.org/Software/Avahi
-
-	  This package contains the mDNS/DNS-SD shared libraries, used by other programs.
-
-
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index 7ba87d368..a85b4dcd1 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -6,12 +6,14 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		avahi
 PKG_VERSION:=		0.6.25
 PKG_RELEASE:=		1
+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_URL:=		http://avahi.org
 PKG_SITES:=		http://avahi.org/download/
+
 PKG_DEPENDS_1:=		libavahi libdaemon avahi-daemon
 PKG_DESCR_1:=		Unicast DNS server from mDNS/DNS-SD configuration daemon
 PKG_DESCR_2:=		DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) library
diff --git a/package/axtls/Config.in b/package/axtls/Config.in
deleted file mode 100644
index 7c99a9617..000000000
--- a/package/axtls/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config ADK_COMPILE_AXTLS
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBAXTLS || ADK_PACKAGE_AXHTTPD
-
-config ADK_PACKAGE_AXHTTPD
-	prompt   "axhttpd........................... small embedded webserver"
-	tristate
-	default n
-	select ADK_COMPILE_AXTLS
-	select ADK_PACKAGE_LIBAXTLS
-	help
-	  axhttpd is a small embedded web server using the axTLS library.
-
-	  http://www.axtls.co.nr/
-	  
-
diff --git a/package/axtls/Config.in.lib b/package/axtls/Config.in.lib
deleted file mode 100644
index d7b64aa44..000000000
--- a/package/axtls/Config.in.lib
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_LIBAXTLS
-	prompt "libaxtls.......................... Embedded client/server TLSv1 SSL library"
-	tristate
-	default n
-	select ADK_COMPILE_AXTLS
-	help
-	  Embedded client/server TLSv1 SSL library
-	  
-	  http://www.axtls.co.nr/
-	  
-
diff --git a/package/base-files/Config.in b/package/base-files/Config.in
deleted file mode 100644
index f58cbd63c..000000000
--- a/package/base-files/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config ADK_PACKAGE_BASE_FILES
-	prompt "base-files........................... basic filesystem layout"
-	bool
-	default y if !ADK_TOOLCHAIN_ONLY
-	help
-	  Basic filesystem layout.
-
-config ADK_PACKAGE_CONFIG_IN_ETC
-	prompt ".config in /etc...................... include gzipped version of .config in image"
-	bool
-	default y if !ADK_TOOLCHAIN_ONLY
-	help
-	  Copy the configuration file (.config) to the image.  The
-	  file will be found in /etc/adkconfig.gz. This takes about
-	  7kBytes of file system space. From this file you can always rebuild
-	  the image from source.
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 922bdb47e..bff93bd38 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,22 +6,18 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		8
+PKG_RELEASE:=		9
 PKG_DESCR:=		basic filesystem structure and scripts
 PKG_SECTION:=		base
 
 WRKDIST=		${WRKDIR}/base-files
 NO_DISTFILES:=		1
-ifeq ($(CPU_ARCH),x86_64)
-PKG_ID=			x86-64-${FS}
-else
-PKG_ID=			${ADK_TARGET}-${FS}
-endif
-WRKDIR=			${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-${PKG_ID}
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BASE_FILES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+PKGDFLT_BASE_FILES=	y if !ADK_TOOLCHAIN_ONLY
 
 do-install:
 	$(CP) ./extra/* $(IDIR_BASE_FILES)
diff --git a/package/bash/Config.in b/package/bash/Config.in
deleted file mode 100644
index db966be01..000000000
--- a/package/bash/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_BASH
-	prompt "bash.............................. GNU Bourne-Again SHell"
-	tristate
-	default n
-	help
-	  GNU Bourne-Again SHell
-	  
-	  http://www.gnu.org/software/bash/
diff --git a/package/bash/Makefile b/package/bash/Makefile
index 838bb92e4..531ff7f82 100644
--- a/package/bash/Makefile
+++ b/package/bash/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		a90a1b5a6db4838483f05438e05e8eb9
 PKG_DESCR:=		Bourne-Again SHell
 PKG_SECTION:=		shells
-PKG_URL:=		http://www.gnu.org/software/bash
+PKG_URL:=		http://www.gnu.org/software/bash/
 PKG_SITES:=		http://ftp.gnu.org/gnu/bash/
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/bc/Config.in b/package/bc/Config.in
deleted file mode 100644
index 20a7d15c4..000000000
--- a/package/bc/Config.in
+++ /dev/null
@@ -1,22 +0,0 @@
-config ADK_COMPILE_BC
-	tristate
-	depends on ADK_PACKAGE_BC || ADK_PACKAGE_DC
-	default n
-
-config ADK_PACKAGE_BC
-	prompt "bc................................ Arbitrary precision calculator language"
-	tristate
-	default n
-	select ADK_COMPILE_BC
-	help
-      bc is a language that supports arbitrary precision numbers with
-	  interactive execution of statements.
-
-config ADK_PACKAGE_DC
-	prompt "dc................................ Arbitrary precision calculator"
-	tristate
-	default n
-	select ADK_COMPILE_BC
-	help
-	  dc is a reverse-polish desk calculator which supports unlimited
-	  precision arithmetic.
diff --git a/package/bigreqsproto/Config.in b/package/bigreqsproto/Config.in
deleted file mode 100644
index 2c061f882..000000000
--- a/package/bigreqsproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_BIGREQSPROTO
-	prompt "bigreqsproto.......................... X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/bind/Config.in b/package/bind/Config.in
deleted file mode 100644
index b561312fc..000000000
--- a/package/bind/Config.in
+++ /dev/null
@@ -1,97 +0,0 @@
-config ADK_COMPILE_BIND
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-
-config ADK_DUMMY_BIND
-	prompt "bind.............................. A DNS server implementation"
-	tristate
-	default n
-
-config ADK_PACKAGE_BIND_RNDC
-	prompt "bind-rndc......................... Bind administration tools (rndc & rndc-confgen only)"
-	tristate
-	default n
-	depends on ADK_DUMMY_BIND
-	select ADK_COMPILE_BIND
-	select ADK_PACKAGE_LIBBIND
-	help
-	  rndc, rndc-confgen
-	  http://www.isc.org/sw/bind/
-
-config ADK_PACKAGE_BIND_CHECK
-	prompt "bind-check........................ Bind administration tools (named-checkconf & named-checkzone only)"
-	tristate
-	default n
-	depends on ADK_DUMMY_BIND
-	select ADK_COMPILE_BIND
-	select ADK_PACKAGE_LIBBIND
-	help
-	  named-checkconf, named-checkzone
-	  http://www.isc.org/sw/bind/
-
-config ADK_PACKAGE_BIND_DNSSEC
-	prompt "bind-dnssec....................... Bind administration tools (dnssec-keygen & dnssec-signzone only)"
-	tristate
-	default n
-	depends on ADK_DUMMY_BIND
-	select ADK_COMPILE_BIND
-	select ADK_PACKAGE_LIBBIND
-	help
-	  dnssec-keygen, dnssec-signzone
-	  http://www.isc.org/sw/bind/
-
-config ADK_PACKAGE_BIND_HOST
-	prompt "bind-host......................... A simple DNS client"
-	tristate
-	default n
-	depends on ADK_DUMMY_BIND
-	select ADK_COMPILE_BIND
-	select ADK_PACKAGE_LIBBIND
-	help
-	  host utility.
-	  http://www.isc.org/sw/bind/
-
-
-config ADK_PACKAGE_BIND_DIG
-	prompt "bind-dig.......................... A DNS client"
-	tristate
-	default n
-	depends on ADK_DUMMY_BIND
-	select ADK_COMPILE_BIND
-	select ADK_PACKAGE_LIBBIND
-	help
-	  dig utility.
-	  http://www.isc.org/sw/bind/
-
-
-config ADK_PACKAGE_BIND_CLIENT
-	prompt "bind-client....................... A dynamic DNS client"
-	tristate
-	default n
-	depends on ADK_DUMMY_BIND
-	select ADK_COMPILE_BIND
-	select ADK_PACKAGE_LIBBIND
-	help
-	  A DNS dynamic client (nsupdate)
-	  http://www.isc.org/sw/bind/
-
-config ADK_PACKAGE_BIND_SERVER
-	prompt "bind-server....................... A DNS server"
-	tristate
-	default n
-	depends on ADK_DUMMY_BIND
-	select ADK_COMPILE_BIND
-	select ADK_PACKAGE_LIBBIND
-	help
-	  A DNS server (named)
-	  http://www.isc.org/sw/bind/
-
-config ADK_PACKAGE_LIBBIND
-        prompt "libbind........................... Support library for the bind tools and dns server/client."
-        tristate
-        default n
-        depends on ADK_DUMMY_BIND
-        select ADK_COMPILE_BIND
-        help
-          http://www.isc.org/sw/bind/
diff --git a/package/bind/Makefile b/package/bind/Makefile
index a4e783e03..e1adae348 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		bind
 PKG_VERSION:=		9.4.1
 PKG_RELEASE:=		4
+PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		09b54d35036cb0423b2e618f21766285
 PKG_DESCR:=		popular DNS server
 PKG_SECTION:=		net
diff --git a/package/binutils/Config.in b/package/binutils/Config.in
deleted file mode 100644
index a6f9fbf43..000000000
--- a/package/binutils/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_BINUTILS
-	prompt "binutils.......................... binary utilities (assembler,strip,nm,..)"
-	tristate
-	default n
-	help
-	  binary utilities
-
-	  http://www.gnu.org/binutils
diff --git a/package/bison/Config.in b/package/bison/Config.in
deleted file mode 100644
index 870ce4b8f..000000000
--- a/package/bison/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_BISON
-	prompt "bison............................. GNU parser generator"
-	tristate
-	default n
-	help
-	  http://www.gnu.org/software/bison/
diff --git a/package/bitlbee/Config.in b/package/bitlbee/Config.in
deleted file mode 100644
index a3c61c439..000000000
--- a/package/bitlbee/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_PACKAGE_BITLBEE
-	prompt "bitlbee........................... IRC gateway to IM chat networks"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_GLIB
-	select ADK_PACKAGE_LIBICONV
-	help
-
-	  BitlBee is an IRC daemon that can talk to instant messaging
-	  networks and acts as a gateway. Users can connect to the
-	  server with any normal IRC client and see their 'buddy list'
-	  in #bitlbee.
-
-	  http://www.bitlbee.org/
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index ccfea817f..8efc3c104 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		bitlbee
 PKG_VERSION:=		1.2.3
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libiconv openssl glib
 PKG_MD5SUM:=		2b1674d98804970809de3da3edf0bed2
 PKG_DESCR:=		IRC gateway to IM chat networks
 PKG_SECTION:=		net
diff --git a/package/bluez-firmware/Config.in b/package/bluez-firmware/Config.in
deleted file mode 100644
index 15aed3102..000000000
--- a/package/bluez-firmware/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_BLUEZ_FIRMWARE
-	prompt "bluez-firmware.................... Bluetooth firmware files"
-	tristate
-	default n
-	select ADK_PACKAGE_BLUEZ
-	help
-	  Bluez firmware files for BCM2033 USB adapters. 
-	  
-	  http://www.bluez.org
-
diff --git a/package/bluez/Config.in b/package/bluez/Config.in
deleted file mode 100644
index 10b5f87e1..000000000
--- a/package/bluez/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_BLUEZ
-	prompt "bluez............................. Bluetooth library and tools"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_BT
-	select ADK_PACKAGE_GLIB
-	select ADK_PACKAGE_DBUS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  Bluez libs and apps. 
-	  
-	  http://bluez.org
-
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index 8ba8f00ca..2d8c14735 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -9,7 +9,8 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		dc29e54f1204ac4215caeeee062b26f6
 PKG_DESCR:=		bluetooth libraries and applications
 PKG_SECTION:=		bluetooth
-PKG_DEPENDS:=		kmod-bluetooth
+PKG_DEPENDS:=		kmod-bluetooth libusb glib dbus
+PKG_BUILDDEP+=		libusb dbus glib
 PKG_URL:=		http://www.bluez.org
 PKG_SITES:=		${MASTER_SITE_KERNEL:=bluetooth/}
 
diff --git a/package/bogofilter/Config.in b/package/bogofilter/Config.in
deleted file mode 100644
index 982cb9828..000000000
--- a/package/bogofilter/Config.in
+++ /dev/null
@@ -1,25 +0,0 @@
-config ADK_PACKAGE_BOGOFILTER
-	prompt "bogofilter........................ Mail (spam) filter utility"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBDB
-	select ADK_PACKAGE_LIBICONV
-	help
-		Filters mail, must be trained.
-
-		http://bogofilter.sourceforge.net
-
-
-config ADK_PACKAGE_BOGOFILTER_BOGOUTIL
-	prompt "include bogoutil in firmware image and package file"
-	bool
-	default n
-	depends on ADK_PACKAGE_BOGOFILTER
-
-config ADK_PACKAGE_BOGOFILTER_BOGOTUNE
-	prompt "include bogotune in firmware image and package file"
-	bool
-	default n
-	depends on ADK_PACKAGE_BOGOFILTER
-
-
diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile
index dc7bb574c..c4458cb31 100644
--- a/package/bogofilter/Makefile
+++ b/package/bogofilter/Makefile
@@ -9,7 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		4bbc9adc30d4f8e3a547f9be18a1cb74
 PKG_DESCR:=		mail filter
 PKG_SECTION:=		mail
-PKG_DEPENDS:=		libdb libiconv
+PKG_DEPENDS:=		libiconv libdb
+PKG_BUILDDEP+=		libiconv libdb
 PKG_URL:=		http://bogofilter.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bogofilter/}
 
@@ -17,24 +18,18 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BOGOFILTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	autotool gnu
+CONFIGURE_STYLE:=	autotool gnu
 CONFIGURE_ENV+=		LIBS="-liconv"
 CONFIGURE_ARGS+=	--without-libsqlite3-prefix \
 			--without-libqdbm-prefix \
 			--with-included-gsl \
 			--with-libdb-prefix=${STAGING_DIR}/usr \
 			--disable-transactions
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_BOGOFILTER}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/${PKG_NAME} ${IDIR_BOGOFILTER}/usr/bin/
-ifeq (${ADK_PACKAGE_BOGOFILTER_BOGOUTIL},y)
-	${INSTALL_BIN} ${WRKINST}/usr/bin/bogoutil ${IDIR_BOGOFILTER}/usr/bin/
-endif
-ifeq (${ADK_PACKAGE_BOGOFILTER_BOGOTUNE},y)
-	${INSTALL_BIN} ${WRKINST}/usr/bin/bogotune ${IDIR_BOGOFILTER}/usr/bin/
-endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bridge-utils/Config.in b/package/bridge-utils/Config.in
deleted file mode 100644
index c09f338bd..000000000
--- a/package/bridge-utils/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_BRIDGE_UTILS
-	prompt "bridge-utils...................... Ethernet bridging configuration utility"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_BRIDGE
-	help
-	  Manage ethernet bridging; a way to connect networks together to 
-	  form a larger network.
-	  
-	  http://bridge.sourceforge.net/
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index aa352ad69..cdd6c2439 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -9,17 +9,18 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		0182fcac3a2b307113bbec34e5f1c673
 PKG_DESCR:=		Ethernet bridging tools
 PKG_SECTION:=		net
+PKG_DEPENDS:=		kmod-bridge
 PKG_URL:=		http://www.linuxfoundation.org/en/Net:Bridge
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bridge/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BRIDGE_UTILS,bridge-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BRIDGE_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	autoconf gnu
+CONFIGURE_STYLE:=	autoconf gnu
 CONFIGURE_ARGS+=	--with-linux-headers=${LINUX_DIR}
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_BRIDGE_UTILS}/usr/sbin
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
deleted file mode 100644
index cfe20190e..000000000
--- a/package/busybox/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_BUSYBOX
-	prompt "busybox.............................. The Swiss Army Knife"
-	bool
-	default y if !ADK_TOOLCHAIN_ONLY
-	help
-	  The Swiss Army Knife of embedded Linux.  It slices, it dices, it
-	  makes Julian Fries.
-	  http://busybox.net/
-	  
-
-menu "Busybox Configuration"
-source "package/busybox/config/Config.in"
-endmenu
diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual
new file mode 100644
index 000000000..84c1bde40
--- /dev/null
+++ b/package/busybox/Config.in.manual
@@ -0,0 +1,19 @@
+config ADK_COMPILE_BUSYBOX
+	tristate
+	depends on ADK_PACKAGE_BUSYBOX
+	default n
+
+config ADK_PACKAGE_BUSYBOX
+	prompt "busybox........................... Core utilities for embedded Linux systems"
+	boolean
+	select ADK_COMPILE_BUSYBOX
+	default y if !ADK_TOOLCHAIN_ONLY
+	help
+	  Core utilities for embedded Linux systems
+	  
+	  WWW: http://www.busybox.net
+
+menu "Busybox Configuration"
+source "package/busybox/config/Config.in"
+endmenu
+
diff --git a/package/bwm/Config.in b/package/bwm/Config.in
deleted file mode 100644
index be25ed48a..000000000
--- a/package/bwm/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_BWM
-	prompt "bwm............................... A very tiny BandWidth Monitor"
-	tristate
-	default n
-	help
-	 Continually displays data transfer rates (received, transmitted, and
-	 total) for each interface, measured in KiB/sec. Works by sampling
-	 values from /proc/net/dev and calculating deltas.
diff --git a/package/bzip2/Config.in b/package/bzip2/Config.in
deleted file mode 100644
index 713b79569..000000000
--- a/package/bzip2/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_BZIP2
-	prompt "bzip2.............................. bzip2 compression utility"
-	tristate
-	default n
-	help
- 	  http://www.bzip.org
diff --git a/package/ca-certificates/Config.in b/package/ca-certificates/Config.in
deleted file mode 100644
index bb9c6d3fe..000000000
--- a/package/ca-certificates/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config ADK_PACKAGE_CA_CERTS
-	prompt "ca-certificates................... Collection of common CA certificates"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBOPENSSL_UTIL
-	help
-	  Collection of CA certificates to validate internet certificates against.
-	  
-	  http://packages.debian.org/sid/ca-certificates
-
-config ADK_DO_MINIMAL_CA_CERTS
-	prompt "save space........................ Install only a very minimal version"
-	boolean
-	default n
-	depends on ADK_PACKAGE_CA_CERTS
-
diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile
index 020e0dfc7..8a9bf04e4 100644
--- a/package/ca-certificates/Makefile
+++ b/package/ca-certificates/Makefile
@@ -5,32 +5,35 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		ca-certificates
 PKG_VERSION:=		20090814
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		307052c985bec7f9a00eb84293eef779
 PKG_DESCR:=		Collection of common CA certificates
 PKG_SECTION:=		shells
+PKG_DEPENDS:=		openssl-util libopenssl
 PKG_URL:=		http://packages.debian.org/sid/ca-certificates
 PKG_SITES:=		http://ftp.debian.org/debian/pool/main/c/ca-certificates/
 
 DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.tar.gz
 
+PKG_FLAVOURS:=		SMALL
+PKGFD_SMALL:=		Minimal set of CA certificates
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CA_CERTS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
-ifeq (${ADK_DO_MINIMAL_CA_CERTS},n)
+ifeq (${ADK_PACKAGE_CA_CERTS_SMALL},n)
 	$(INSTALL_DIR) $(IDIR_CA_CERTS)/{etc/ssl/certs,usr/share,usr/sbin}
 	$(CP) $(WRKINST)/usr/share/ca-certificates $(IDIR_CA_CERTS)/usr/share/
 	( cd ${IDIR_CA_CERTS}/usr/share/ca-certificates && \
 		ls */*.crt >${IDIR_CA_CERTS}/etc/ca-certificates.conf \
 	)
 	${INSTALL_BIN} ./extra/update-ca-certificates ${IDIR_CA_CERTS}/usr/sbin/
-	-DESTDIR=${IDIR_CA_CERTS} sh ./extra/update-ca-certificates
+	-DESTDIR=${IDIR_CA_CERTS} ${BASH} ./extra/update-ca-certificates
 else
 	${INSTALL_DIR} ${IDIR_CA_CERTS}/etc/ssl
 	${INSTALL_DATA} ./cert.pem ${IDIR_CA_CERTS}/etc/ssl/
diff --git a/package/cairo/Config.in b/package/cairo/Config.in
deleted file mode 100644
index 60bc1bd4f..000000000
--- a/package/cairo/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_CAIRO
-	prompt "cairo............................. Cairo library"
-	tristate
-	select ADK_PACKAGE_LIBPNG
-	select ADK_PACKAGE_LIBX11
-	select ADK_PACKAGE_PIXMAN
-	select ADK_PACKAGE_LIBFREETYPE
-	select ADK_PACKAGE_FONTCONFIG
-	default n
-	help
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 7dd034a18..ec6f2dd54 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -9,7 +9,8 @@ PKG_RELEASE:=		1
 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_BUILDDEP+=		libpng pixman freetype fontconfig libX11
 PKG_URL:=		http://cairographics.org/
 PKG_SITES:=		http://cairographics.org/releases/
 
diff --git a/package/cbtt/Config.in b/package/cbtt/Config.in
deleted file mode 100644
index 789f613dd..000000000
--- a/package/cbtt/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config ADK_PACKAGE_CBTT
-	prompt "cbtt.............................. a C BitTorrent Tracker"
-	tristate
-	default n
-	select ADK_PACKAGE_ZLIB
-	help
-	 A C BitTorrent Tracker
-
-config ADK_PACKAGE_CBTT_MYSQL
-	prompt "cbtt-mysql........................ a C BitTorrent Tracker (mysql)"
-	tristate
-	default n
-	select ADK_PACKAGE_ZLIB
-	select ADK_PACKAGE_LIBMYSQLCLIENT
-	help
-	 A C BitTorrent Tracker
diff --git a/package/cbtt/Makefile b/package/cbtt/Makefile
index 913b2d8e6..569fd9916 100644
--- a/package/cbtt/Makefile
+++ b/package/cbtt/Makefile
@@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		cbtt
 PKG_VERSION:=		20060211
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		mysql zlib
+ifeq (${ADK_COMPILE_CBTT_WITH_UCLIBCXX},y)
+PKG_BUILDDEP+=		uclibc++
+endif
 PKG_MD5SUM:=		19abea2817c49ccc9438e9671c402984
 PKG_DESCR:=		Bittorrent tracker
 PKG_SECTION:=		net
diff --git a/package/cfgfs/Config.in b/package/cfgfs/Config.in
deleted file mode 100644
index 911027433..000000000
--- a/package/cfgfs/Config.in
+++ /dev/null
@@ -1,20 +0,0 @@
-config ADK_PACKAGE_CFGFS
-	prompt "cfgfs................................ compressed config filesystem"
-	tristate
-	select BUSYBOX_COMM
-	select BUSYBOX_MD5SUM
-	select BUSYBOX_XARGS
-	select BUSYBOX_FEATURE_SORT_BIG
-	select ADK_PACKAGE_MTD
-	depends on \
-		ADK_LINUX_X86_ALIX1C || \
-		ADK_LINUX_X86_ALIX2D || \
-		ADK_LINUX_X86_WRAP || \
-		ADK_LINUX_CRIS_FOXBOARD || \
-		ADK_LINUX_MIPS_AG241 || \
-		ADK_LINUX_MIPS_RB532
-	default y
-	help
-	  Compressed config filesystem for /etc.
-	  This makes smooth updates of your embedded device possible.
-	  (Adopted from FreeWRT fwcf)
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 17ab5e6a7..e99c7e244 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -5,17 +5,22 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cfgfs
 PKG_VERSION:=		1.0.6
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_DESCR:=		compressed config filesystem
 PKG_SECTION:=		base
+PKG_TARGET_DEPENDS:=	alix1c alix2d wrap foxboard ag241 rb532
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
 
+CFLINE_CFGFS:= 		select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+PKGDFLT_CFGFS=		y
+
 BUILD_STYLE:=		auto
 
 do-configure:
diff --git a/package/cfinstall/Config.in b/package/cfinstall/Config.in
deleted file mode 100644
index 4914a51a2..000000000
--- a/package/cfinstall/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_CFINSTALL
-	prompt "cfinstall............................ compact flash installer"
-	tristate
-	select ADK_PACKAGE_SFDISK
-	select ADK_PACKAGE_PARTED
-	depends on \
-		ADK_LINUX_X86_ALIX1C || \
-		ADK_LINUX_X86_ALIX2D || \
-		ADK_LINUX_X86_WRAP || \
-		ADK_LINUX_MIPS_RB532
-	default n
-	help
-	  Installs a rootfs tar archive onto a Compact Flash disk.
diff --git a/package/cfinstall/Makefile b/package/cfinstall/Makefile
index b48120005..1197fd15a 100644
--- a/package/cfinstall/Makefile
+++ b/package/cfinstall/Makefile
@@ -8,6 +8,9 @@ PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
 PKG_DESCR:=		compact flash installer
 PKG_SECTION:=		base
+PKG_DEPENDS:=		parted sfdisk
+
+PKG_TARGET_DEPENDS:=	alix1c alix2d wrap rb532
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
diff --git a/package/cgilib/Config.in b/package/cgilib/Config.in
deleted file mode 100644
index 40da2fc47..000000000
--- a/package/cgilib/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_CGILIB
-	prompt "cgilib............................ Simple CGI Library"
-	tristate
-	default n
-	help
-	  This library provides a simple programming API to the Common Gateway
-	  Interface (CGI).  It features HTTP Redirect, provides read access to
-	  FORM variables, sets HTTP Cookies and reads them.
-
-	  http://www.infodrom.org/projects/cgilib/
diff --git a/package/chillispot/Config.in b/package/chillispot/Config.in
deleted file mode 100644
index 902ffb1db..000000000
--- a/package/chillispot/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_PACKAGE_CHILLISPOT
-	prompt "chillispot........................ Wireless LAN access point controller"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_TUN
-	help
-	  ChilliSpot is an open source captive portal or wireless LAN
-	  access point controller. It is used for authenticating users
-	  of a wireless LAN. It supports web based login which is today's
-	  standard for public HotSpots and it supports Wireless Protected
-	  Access (WPA) which is the standard of the future. Authentication,
-	  authorization and accounting (AAA) is handled by your favorite
-	  radius server.
-
-	  http://www.chillispot.org/
diff --git a/package/collectd/Config.in b/package/collectd/Config.in
deleted file mode 100644
index d040e581c..000000000
--- a/package/collectd/Config.in
+++ /dev/null
@@ -1,36 +0,0 @@
-
-config ADK_PACKAGE_COLLECTD
-	prompt "collectd.......................... Lightweight system statistics collection daemon"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-		collectd is a small daemon which collects system information
-		every 10 seconds. The values are then sent to a multicast group
-		to be stored in RRD files by a server process.
-
-		http://verplant.org/collectd/
-
-config ADK_PACKAGE_COLLECTD_CPU
-        prompt "Enable cpu support"
-	bool
-	default y
-	depends on ADK_PACKAGE_COLLECTD
-
-config ADK_PACKAGE_COLLECTD_LOAD
-        prompt "Enable load support"
-	bool
-	default y
-	depends on ADK_PACKAGE_COLLECTD
-
-config ADK_PACKAGE_COLLECTD_MEMORY
-	prompt "Enable memory support"
-	bool
-	default y
-	depends on ADK_PACKAGE_COLLECTD
-
-config ADK_PACKAGE_COLLECTD_PING
-	prompt "Enable ping support"
-	bool
-	default y
-	depends on ADK_PACKAGE_COLLECTD
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 84de63ccb..222f46ab3 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -13,6 +13,12 @@ PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://collectd.org
 PKG_SITES:=		http://collectd.org/files/
 
+PKG_FLAVOURS:=		CPU LOAD MEMORY PING
+PKGFD_CPU:=		collect CPU statistics
+PKGFD_LOAD:=		collect system load statistics
+PKGFD_MEMORY:=		collect memory usage statistics
+PKGFD_PING:=		enable ping statistic plugin
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,COLLECTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -30,7 +36,7 @@ ifneq (${ADK_PACKAGE_COLLECTD_PING},y)
 DISABLE_PING:=--disable-ping
 endif
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-apache \
 			--disable-apcups \
 			--disable-apple_sensors \
@@ -90,8 +96,8 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--with-nan-emulation
 
 XAKE_FLAGS+=		LIBS='-lm'
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/usr/lib/collectd
diff --git a/package/comgt/Config.in b/package/comgt/Config.in
deleted file mode 100644
index 4711c2195..000000000
--- a/package/comgt/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_COMGT
-	prompt "comgt............................. Option/Vodafone 3G/GPRS control tool"
-	tristate
-	default n
-	help
-	  Option GlobeTrotter GPRS/EDGE/3G/HSDPA and Vodafone 3G/GPRS datacard control tool
-	  
-	  comgt is a scripting language interpreter useful for establishing communications
-	  on serial lines and through PCMCIA modems as well as GPRS and 3G datacards.
-	  
-	  http://www.pharscape.org/content/view/46/70/
diff --git a/package/compositeproto/Config.in b/package/compositeproto/Config.in
deleted file mode 100644
index 88d73d6b3..000000000
--- a/package/compositeproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XPROTO
-	prompt "xproto................................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/cpio/Config.in b/package/cpio/Config.in
deleted file mode 100644
index d4fbbeb79..000000000
--- a/package/cpio/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_CPIO
-	prompt "cpio............................... copies files into or out of a cpio archive"
-	tristate
-	default n
-	help
-	  http://www.gnu.org/software/cpio/
diff --git a/package/cryptinit/Config.in b/package/cryptinit/Config.in
deleted file mode 100644
index f17ef17a0..000000000
--- a/package/cryptinit/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_CRYPTINIT
-	prompt "cryptinit............................ crypt initramfs application"
-	tristate
-	default n
-	help
-	  For encrypted root filesystems and fast bootup.
diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile
index f186247f7..5f1d250bf 100644
--- a/package/cryptinit/Makefile
+++ b/package/cryptinit/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		cryptinit
 PKG_VERSION:=		1.0.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		cryptsetup
 PKG_DESCR:=		init for encrypted rootfilesystem
 PKG_SECTION:=		base
 
diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in
deleted file mode 100644
index db5d8a9ca..000000000
--- a/package/cryptsetup/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config ADK_PACKAGE_CRYPTSETUP
-	prompt "cryptsetup........................ LUKS cryptsetup tools"
-	tristate
-	select ADK_PACKAGE_LIBPOPT
-	select ADK_PACKAGE_LIBUUID
-	select ADK_PACKAGE_LIBGCRYPT
-	select ADK_PACKAGE_DEVICE_MAPPER
-	select ADK_KPACKAGE_KMOD_BLK_DEV_DM
-	select ADK_KPACKAGE_KMOD_DM_CRYPT
-	select ADK_KPACKAGE_KMOD_CRYPTO_SHA256
-	select ADK_KPACKAGE_KMOD_CRYPTO_AES
-	select ADK_KPACKAGE_KMOD_CRYPTO_CBC
-	default n
-	help
-	 LUKS cryptsetup tools. You need to enable crypto kernel
-	 modules to get a working setup (f.e. aes and sha256).
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index c9970fe7a..ea81a3630 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -9,7 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		5eea2a77391a8a1a651b31cbaef59e22
 PKG_DESCR:=		LUKS cryptsetup tools
 PKG_SECTION:=		crypto
-PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt
+PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc kmod-crypto-sha256 kmod-dm-mod
+PKG_BUILDDEP+=		libgcrypt popt e2fsprogs lvm
 PKG_URL:=		http://cryptsetup.googlecode.com
 PKG_SITES:=		http://cryptsetup.googlecode.com/files/
 
diff --git a/package/ctorrent/Config.in b/package/ctorrent/Config.in
deleted file mode 100644
index 8a6562061..000000000
--- a/package/ctorrent/Config.in
+++ /dev/null
@@ -1,29 +0,0 @@
-config ADK_PACKAGE_CTORRENT
-	prompt "ctorrent.......................... console-based BitTorrent client"
-	tristate
-	default n
-	help
-	  CTorrent is a BitTorrent client written in the C programming language, known to
-	  be a very robust and mature programming language, which produces fast and
-	  optimized application.
-
-	  http://www.rahul.net/dholmes/ctorrent/
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_CTORRENT
-default ADK_COMPILE_CTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_CTORRENT_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_CTORRENT_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_CTORRENT_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	depends on ADK_BROKEN
-	help
-
-endchoice
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index a73cef591..fb51b1090 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -6,18 +6,14 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ctorrent
 PKG_VERSION:=		dnh3.3.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl
+PKG_CXX:=		CTORRENT
 PKG_MD5SUM:=		59b23dd05ff70791cd6449effa7fc3b6
 PKG_DESCR:=		console-based BitTorrent client
 PKG_SECTION:=		net
 PKG_URL:=		http://www.rahul.net/dholmes/ctorrent
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=dtorrent/}
 
-ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
-PKG_DEPENDS:=            uclibc++
-else
-PKG_DEPENDS:=            libstdcxx
-endif
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/cups/Config.in b/package/cups/Config.in
deleted file mode 100644
index 662ff5a84..000000000
--- a/package/cups/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_CUPS
-	prompt "cups.............................. Common UNIX Printing System"
-	tristate
-	select ADK_PACKAGE_ZLIB	
-	select ADK_PACKAGE_LIBPTHREAD
-	default n
-	help
-	  A printer spooling system for devices with USB or LP support
-	  
-	  http://www.cups.org/
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 608b043b7..fc9db155b 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		cups
 PKG_VERSION:=		1.4.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		zlib
 PKG_MD5SUM:=		d95e2d588e3d36e563027a963b117b1b
 PKG_DESCR:=		Common Unix Printing System
 PKG_SECTION:=		net
diff --git a/package/curl/Config.in b/package/curl/Config.in
deleted file mode 100644
index f8b8da8e6..000000000
--- a/package/curl/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_COMPILE_CURL
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBCURL
-
-config ADK_PACKAGE_CURL
-	prompt   "curl.............................. A client-side URL transfer tool"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBCURL
-	help
-	  http://curl.haxx.se/
diff --git a/package/curl/Config.in.lib b/package/curl/Config.in.lib
deleted file mode 100644
index 1e49d8521..000000000
--- a/package/curl/Config.in.lib
+++ /dev/null
@@ -1,20 +0,0 @@
-config ADK_PACKAGE_LIBCURL
-	prompt "libcurl........................... A client-side URL transfer library"
-	tristate
-	default n
-	select ADK_COMPILE_CURL
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	help
-	  http://curl.haxx.se/
-
-config ADK_PACKAGE_LIBCURL_DEV
-	prompt "libcurl-dev....................... development files for libcurl"
-	tristate
-	default n
-	select ADK_COMPILE_CURL
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	help
-	  http://curl.haxx.se/
-
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 69768dc63..26037200c 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		ecb2e37e45c9933e2a963cabe03670ab
 PKG_DESCR:=		a client-side URL transfer tool
 PKG_SECTION:=		net
+PKG_DEPENDS:=		libcurl
+PKG_BUILDDEP+=		openssl zlib
 PKG_URL:=		http://curl.haxx.se
 PKG_SITES:=		http://curl.haxx.se/download/ \
 			http://www.mirrorspace.org/curl/ \
@@ -18,15 +20,17 @@ PKG_SITES:=		http://curl.haxx.se/download/ \
 			http://www.mirrormonster.com/curl/download/ \
 			http://curl.mirrors.cyberservers.net/download/
 
-PKG_DESCR_1:=		a client-side URL transfer library
-PKG_SECTION_1:=		libs
-PKG_DEPENDS_1:=		libopenssl zlib
+PKG_DESCR_LIB:=		a client-side URL transfer library
+PKG_SECTION_LIB:=	libs
+PKG_DEPENDS_LIB:=	libopenssl zlib
+PKG_DESCR_LIB_DEV:=	development files for libcurl
+PKG_SECTION_LIB_DEV:=	devel
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
-$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
+$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LIB},${PKG_DESCR_LIB},${PKG_SECTION_LIB}))
+$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		curl_typeof_curl_socklen_t=socklen_t
@@ -55,9 +59,9 @@ INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${IDIR_LIBCURL}/usr/lib
-	${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
 	${CP} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/
 	${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/
+	${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
 	${CP} ${WRKINST}/usr/include/curl/*.h ${IDIR_LIBCURL_DEV}/usr/include/curl/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cutter/Config.in b/package/cutter/Config.in
deleted file mode 100644
index 5d027b689..000000000
--- a/package/cutter/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_CUTTER
-	prompt "cutter............................ allows an user to abort TCP/IP connections"
-	tristate
-	default n
-	help
-		"Cutter" is an open source program that allows Linux firewall
-		administrators to abort TCP/IP connections routed over the
-		firewall or router on which it is run.
-
-		http://www.lowth.com/cutter/
diff --git a/package/cxxtools/Config.in b/package/cxxtools/Config.in
deleted file mode 100644
index d7dcdb87d..000000000
--- a/package/cxxtools/Config.in
+++ /dev/null
@@ -1,26 +0,0 @@
-config ADK_PACKAGE_CXXTOOLS
-	prompt "cxxtools.......................... cxxtools"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBICONV
-	help
-	  http://www.tntnet.org
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_CXXTOOLS
-default ADK_COMPILE_CXXTOOLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_CXXTOOLS_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	depends on ADK_BROKEN
-	help
-
-endchoice
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 36e91f35c..0de136708 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -6,6 +6,8 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		cxxtools
 PKG_VERSION:=		1.4.8
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libiconv
+PKG_CXX:=		CXXTOOLS
 PKG_MD5SUM:=		16ce92a83beb925fa5138fc9a52d55af
 PKG_DESCR:=		a collection of general-purpose C++ classes
 PKG_SECTION:=		net
@@ -15,12 +17,6 @@ PKG_SITES:=		http://www.tntnet.org/download/
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
-PKG_DEPENDS+=		uclibc++
-else
-PKG_DEPENDS+=		libstdcxx
-endif
-
 $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
diff --git a/package/cyrus-sasl/Config.in b/package/cyrus-sasl/Config.in
deleted file mode 100644
index 2b4657e5a..000000000
--- a/package/cyrus-sasl/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_COMPILE_CYRUS_SASL
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBSASL2
-
-config ADK_PACKAGE_LIBSASL2
-	prompt "libsasl2.......................... General purpose authentication library"
-	tristate
-	default n
-	select ADK_COMPILE_CYRUS_SASL
-	help
-	  A general purpose authentication library.
-
-	  http://asg.web.cmu.edu/sasl/
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index 4b8dabba2..60bb943ef 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		cyrus-sasl
 PKG_VERSION:=		2.1.22
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		45dde9d19193ae9dd388eb68b2027bc9
 PKG_DESCR:=		a general purpose authentication library
 PKG_SECTION:=		libs
diff --git a/package/damageproto/Config.in b/package/damageproto/Config.in
deleted file mode 100644
index 93fdbbffe..000000000
--- a/package/damageproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_DAMAGEPROTO
-	prompt "damageproto............................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/dansguardian/Config.in b/package/dansguardian/Config.in
deleted file mode 100644
index 2bffe7da6..000000000
--- a/package/dansguardian/Config.in
+++ /dev/null
@@ -1,27 +0,0 @@
-config ADK_PACKAGE_DANSGUARDIAN
-	prompt "dansguardian...................... web content filter proxy"
-	tristate
-	select ADK_PACKAGE_LIBPCRE
-	select ADK_PACKAGE_ZLIB
-	default n
-	help
-		http://dansguardian.org
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_DANSGUARDIAN
-default ADK_COMPILE_DANSGUARDIAN_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_DANSGUARDIAN_WITH_STDCXX
-        bool "Standard C++ library"
-        select ADK_PACKAGE_LIBSTDCXX
-        help
-
-config ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX
-        bool "Embedded uClibc++ library"
-        select ADK_PACKAGE_UCLIBCXX
-        help
-
-endchoice
-
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index 2a21584c5..7a96bda40 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -6,19 +6,15 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		dansguardian
 PKG_VERSION:=		2.10.1.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		pcre zlib
+PKG_CXX:=		DANSGUARDIAN
 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/
 
-ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y)
-PKG_DEPENDS+=		uclibc++
-else
-PKG_DEPENDS+=		libstdcxx
-endif
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DANSGUARDIAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/davfs2/Config.in b/package/davfs2/Config.in
deleted file mode 100644
index d1f1c2a6d..000000000
--- a/package/davfs2/Config.in
+++ /dev/null
@@ -1,43 +0,0 @@
-config ADK_PACKAGE_DAVFS2
-	prompt "davfs2............................ WebDAV filesystem"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBICONV
-	select ADK_PACKAGE_NEON
-	help
-	  WebDAV is an extension to HTTP that allows remote collaborative
-	  authoring of Web resources, defined in RFC 2518.
-	  
-	  davfs2 is a Linux file system driver that allows you to mount a
-	  WebDAV server as a local file system, like a disk drive. This
-	  way applications can access resources on a Web server without
-	  knowing anything about HTTP or WebDAV.
-	  
-	  davfs2 runs as a daemon in userspace. It uses the kernel file
-	  system coda or fuse. To connect to the WebDAV
-	  server it makes use of the neon library. Neon supports TLS/SSL
-	  (using OpenSSL or GnuTLS) and access via proxy server.
-	  
-	  davfs2 allows you to e.g.
-	  * use a WebDAV server as workspace for a geographically
-	    distributed work group.
-	  * save documents on a WebDAV server and access and edit them
-	    via internet from wherever you want.
-	  * edit a web site in place, using your preferred development
-	    tools.
-
-choice
-prompt "kernel filesystem interface"
-depends on ADK_PACKAGE_DAVFS2
-
-config ADK_PACKAGE_DAVFS2_FUSE
-	bool "use the FUSE filesystem interface"
-	select ADK_PACKAGE_FUSE_UTILS
-config ADK_PACKAGE_DAVFS2_CODA
-	bool "use the CODA filesystem interface"
-	select ADK_KPACKAGE_KMOD_CODA_FS
-config ADK_PACKAGE_DAVFS2_BOTH
-	bool "use both filesystem interfaces"
-	select ADK_PACKAGE_FUSE_UTILS
-	select ADK_KPACKAGE_KMOD_CODA_FS
-endchoice
diff --git a/package/davfs2/Config.in.kernel b/package/davfs2/Config.in.kernel
new file mode 100644
index 000000000..3ef8e77d7
--- /dev/null
+++ b/package/davfs2/Config.in.kernel
@@ -0,0 +1,16 @@
+choice
+prompt "kernel filesystem interface"
+depends on ADK_PACKAGE_DAVFS2
+
+config ADK_PACKAGE_DAVFS2_FUSE
+       bool "use the FUSE filesystem interface"
+       select ADK_PACKAGE_FUSE_UTILS
+config ADK_PACKAGE_DAVFS2_CODA
+       bool "use the CODA filesystem interface"
+       select ADK_KPACKAGE_KMOD_CODA_FS
+config ADK_PACKAGE_DAVFS2_BOTH
+       bool "use both filesystem interfaces"
+       select ADK_PACKAGE_FUSE_UTILS
+       select ADK_KPACKAGE_KMOD_CODA_FS
+endchoice
+
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index ffd292acd..55bd4eddc 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		davfs2
 PKG_VERSION=		1.3.3
 PKG_RELEASE=		1
+PKG_BUILDDEP+=		libiconv neon
+ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},)
+PKG_BUILDDEP+=		fuse
+endif
 PKG_MD5SUM=		57def26e4d6d63527e01612d10fd0515
 PKG_DESCR:=		WebDAV filesystem
 PKG_SECTION:=		admin
@@ -15,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
+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/Config.in b/package/dbus/Config.in
deleted file mode 100644
index 8e8ca33fc..000000000
--- a/package/dbus/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_DBUS
-	prompt "dbus.............................. DBUS library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBEXPAT
-	help
-	  DBUS library. 
-	  
-	  http://www.freedesktop.org/wiki/Software/dbus
-
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 46739bfa2..6bb63c302 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		dbus
 PKG_VERSION:=		1.2.16
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		expat
 PKG_MD5SUM:=		c7a47b851ebe02f6726b65b78d1b730b
 PKG_DESCR:=		DBUS library
 PKG_SECTION:=		net
diff --git a/package/deco/Config.in b/package/deco/Config.in
deleted file mode 100644
index 3bdde9a21..000000000
--- a/package/deco/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_DECO
-	prompt "deco.............................. Text-based full featured file manager"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNCURSES
-	help
-	  A clone of Norton Commander for Unix. Text-based, full featured
-	  file manager.
-
-	  http://deco.sourceforge.net/
diff --git a/package/deco/Makefile b/package/deco/Makefile
index 0a0fe35dd..d0cab8dba 100644
--- a/package/deco/Makefile
+++ b/package/deco/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		deco
 PKG_VERSION:=		39
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		f77f60e8be0cae1f814cba1ef61bf4d0
 PKG_DESCR:=		Text-based, full featured file manager
 PKG_SECTION:=		misc
diff --git a/package/depmaker b/package/depmaker
new file mode 100644
index 000000000..da3923554
--- /dev/null
+++ b/package/depmaker
@@ -0,0 +1,38 @@
+unset MAKEFLAGS
+export MAKEFLAGS=s
+cd "$(dirname "$0")"
+export TOPDIR=$(realpath ..)
+if gmake --help >/dev/null 2>&1; then
+	export GMAKE=gmake
+else
+	export GMAKE=make
+fi
+GMAKE="$GMAKE --no-print-directory"
+(( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 ))
+typeset -L$x_cols pbar
+
+for dn in */Makefile; do
+	dn=${dn%/*}
+	pbar="$dn ..."
+	print -nu2 "$pbar\r"
+	case $dn {
+	(@(?(e)g|uc|)libc|libpthread|uclibc++) ;;
+	(*)
+		# dnu: directory name, uppercase, y/-+/_X/
+		typeset -u dnu=${dn//-/_}
+		dnu=${dnu//+/X}
+		print "package-\$(ADK_COMPILE_${dnu}) += $dn"
+		;;
+	}
+	cd $dn
+	deps=$($GMAKE show=PKG_BUILDDEP)
+	cd ..
+	[[ -n $deps ]] || continue
+	x="${dn}-compile:"
+	for dep in $deps; do
+		x="$x ${dep}-compile"
+	done
+	print -r -- $x
+done >Depends.mk
+pbar=done
+print -u2 "$pbar"
diff --git a/package/dhcp-forwarder/Config.in b/package/dhcp-forwarder/Config.in
deleted file mode 100644
index cfe8f7d36..000000000
--- a/package/dhcp-forwarder/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_DHCP_FORWARDER
-	prompt "dhcp-forwarder.................... DHCP relay agent"
-	tristate
-	default n
-	help
-	  A DHCP relay agent
-
-	  http://www.nongnu.org/dhcp-fwd/
diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in
deleted file mode 100644
index f58191e64..000000000
--- a/package/dhcp/Config.in
+++ /dev/null
@@ -1,24 +0,0 @@
-config ADK_COMPILE_DHCP
-	tristate
-	default n
-	depends on ADK_PACKAGE_DHCP_RELAY || ADK_PACKAGE_DHCP_SERVER
-
-config ADK_PACKAGE_DHCP_RELAY
-	prompt "dhcp-relay........................ ISC DHCP relay"
-	tristate
-	default n
-	select ADK_COMPILE_DHCP
-	help
-	  ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration
-	  Protocol) relay daemon.
-	  http://www.isc.org/
-
-config ADK_PACKAGE_DHCP_SERVER
-	prompt "dhcp-server....................... ISC DHCP server"
-	tristate
-	default n
-	select ADK_COMPILE_DHCP
-	help
-	  ISC (Internet Software Consortium) DHCP (Dynamic Host Configuration
-	  Protocol) server daemon.
-	  http://www.isc.org/
diff --git a/package/diffutils/Config.in b/package/diffutils/Config.in
deleted file mode 100644
index 493c10d33..000000000
--- a/package/diffutils/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_DIFFUTILS
-	prompt "diffutils......................... show differences between two files"
-	tristate
-	default n
-	help
-	  http://www.gnu.org/software/diffutils/
diff --git a/package/digitemp/Config.in b/package/digitemp/Config.in
deleted file mode 100644
index 2c1152661..000000000
--- a/package/digitemp/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config ADK_PACKAGE_DIGITEMP
-	prompt "digitemp.......................... Simple Tool to read 1-wire temperature sensors"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBUSB
-	help
-	  DigiTemp is a simple to use program for reading values from
-	  1-wire devices.  Its main use is for reading temperature
-	  sensors, but it also reads counters, and understands the
-	  1-wire hubs with devices on different branches of the
-	  network.  DigiTemp now supports the following 1-wire
-	  temperature sensors: DS18S20 (and DS1820), DS18B20, DS1822,
-	  the DS2438 Smart Battery Monitor, DS2422 and DS2423
-	  Counters, DS2409 MicroLAN Coupler (used in 1-wire hubs), and
-	  the AAG TAI-8540 humidity sensor.
-
-	  http://www.digitemp.com/
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index 13cc6bedc..a03d7e1f1 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		digitemp
 PKG_VERSION:=		3.6.0
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libusb libusb-compat
 PKG_MD5SUM:=		9be2e48db37920f21925ae6e88f83b84
 PKG_DESCR:=		simple to use program for reading values from 1-wire devices
 PKG_SECTION:=		misc
diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
deleted file mode 100644
index 0fd2a5ce0..000000000
--- a/package/dnsmasq/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_DNSMASQ
-	prompt "dnsmasq........................... Lightweight DNS and DHCP server"
-	tristate
-	default n
-	help
-	  A lightweight DNS and DHCP server. It is intended to
-	  provide coupled DNS and DHCP service to a LAN. Dnsmasq
-	  supports static and dynamic DHCP leases and BOOTP/TFTP for
-	  network booting of diskless machines.
-
-	  http://www.thekelleys.org.uk/dnsmasq/
diff --git a/package/dosfstools/Config.in b/package/dosfstools/Config.in
deleted file mode 100644
index af9ea7902..000000000
--- a/package/dosfstools/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_DOSFSTOOLS
-	prompt "dosfstools........................ Utilities to create and check MS-DOS FAT filesystems"
-	tristate
-	default n
-	help
-	  Utilities to create and check MS-DOS FAT filesystems.
diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in
deleted file mode 100644
index 0baade464..000000000
--- a/package/dovecot/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_DOVECOT
-	prompt "dovecot........................... an imap server"
-	tristate
-	default n
-	help
-	 Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like
-	 systems, written with security primarily in mind. Dovecot is an 
-	 excellent choice for both small and large installations. It's fast,
-	 simple to set up, requires no special administration and it uses 
-	 very little memory.
diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
deleted file mode 100644
index e12ca80f3..000000000
--- a/package/dropbear/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_PACKAGE_DROPBEAR
-	prompt "dropbear.......................... Small SSH 2 client/server"
-	tristate
-	default y if !ADK_TOOLCHAIN_ONLY
-	help
-	  A small SSH 2 server/client designed for small memory environments.
-	  
-	  http://matt.ucc.asn.au/dropbear/
-
-config ADK_PACKAGE_DBCONVERT
-	prompt   "dropbearconvert................. Utility for converting SSH keys"
-	tristate
-	default n
-	depends on ADK_PACKAGE_DROPBEAR
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 22a5680ac..43a157700 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -20,6 +20,8 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 
+PKGDFLT_DROPBEAR:=	y if !ADK_TOOLCHAIN_ONLY
+
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-pam \
 			--enable-openpty \
diff --git a/package/dsniff/Config.in b/package/dsniff/Config.in
deleted file mode 100644
index 3358c3608..000000000
--- a/package/dsniff/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_DSNIFF
-	prompt "dsniff............................ A collection of tools for betwork auditing and penetration testing"
-	tristate
-	select ADK_PACKAGE_LIBPCAP
-	select ADK_PACKAGE_LIBNIDS
-	select ADK_PACKAGE_LIBNET
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBGDBM
-	default n
-	help
-	  A collection of tools for network auditing and penetration testing
-
-	  http://www.monkey.org/~dugsong/dsniff/
diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile
index bd54813c5..3e7925e41 100644
--- a/package/dsniff/Makefile
+++ b/package/dsniff/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		dsniff
 PKG_VERSION:=		2.4b1
 PKG_RELEASE:=		2
+PKG_BUILDDEP+=		libnids openssl gdbm
 PKG_MD5SUM:=		2f761fa3475682a7512b0b43568ee7d6
 PKG_DESCR:=		tools for network auditing and penetration testing
 PKG_SECTION:=		net
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
deleted file mode 100644
index 2c0b4da90..000000000
--- a/package/e2fsprogs/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_PACKAGE_E2FSPROGS
-	prompt "e2fsprogs......................... Ext2/3/4 filesystem utilities"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBUUID
-	select ADK_PACKAGE_LIBCOM_ERR
-	select ADK_PACKAGE_LIBSS
-	select ADK_PACKAGE_LIBBLKID
-	help
-	  This package contains essential ext2 filesystem utilities which consists of
-	  e2fsck, mke2fs, debugfs, dumpe2fs, tune2fs, and most of the other core ext2
-	  filesystem utilities.
-
-	  http://e2fsprogs.sourceforge.net/
-
diff --git a/package/e2fsprogs/Config.in.lib b/package/e2fsprogs/Config.in.lib
deleted file mode 100644
index 23630894f..000000000
--- a/package/e2fsprogs/Config.in.lib
+++ /dev/null
@@ -1,28 +0,0 @@
-config ADK_PACKAGE_LIBUUID
-	prompt "libuuid......................... UUID library"
-	depends on ADK_PACKAGE_E2FSPROGS
-	tristate
-	default n
-	help
-
-config ADK_PACKAGE_LIBBLKID
-	prompt "libblkid........................ BlockID library"
-	depends on ADK_PACKAGE_E2FSPROGS
-	tristate
-	default n
-	help
-
-config ADK_PACKAGE_LIBCOM_ERR
-	prompt "libcom_err...................... Common error library"
-	depends on ADK_PACKAGE_E2FSPROGS
-	tristate
-	default n
-	help
-
-config ADK_PACKAGE_LIBSS
-	prompt "libss........................... Subsystem command parsing library"
-	depends on ADK_PACKAGE_E2FSPROGS
-	tristate
-	default n
-	help
-
diff --git a/package/ebtables/Config.in b/package/ebtables/Config.in
deleted file mode 100644
index 7e78aeedd..000000000
--- a/package/ebtables/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_EBTABLES
-	prompt "ebtables.......................... Ethernet bridging firewall tool"
-	tristate
-	default n
-	help
-	  http://ebtables.sourceforge.net/
diff --git a/package/eglibc/Config.in b/package/eglibc/Config.in
index 6e1daf463..e69de29bb 100644
--- a/package/eglibc/Config.in
+++ b/package/eglibc/Config.in
@@ -1,17 +0,0 @@
-config ADK_PACKAGE_EGLIBC
-	prompt "eglibc............................... embedded GNU C library"
-	bool
-	default y if ADK_TARGET_LIB_EGLIBC && !ADK_TOOLCHAIN_ONLY
-	default n
-	depends on ADK_TARGET_LIB_EGLIBC
-	help
-	  embedded GNU C library.
-
-config ADK_PACKAGE_EGLIBC_DEV
-	prompt "eglibc-dev........................... development files"
-	tristate
-	default n
-	depends on ADK_TARGET_LIB_EGLIBC
-	help
-	  embedded GNU C library header files.
-
diff --git a/package/eglibc/Config.in.manual b/package/eglibc/Config.in.manual
new file mode 100644
index 000000000..6e1daf463
--- /dev/null
+++ b/package/eglibc/Config.in.manual
@@ -0,0 +1,17 @@
+config ADK_PACKAGE_EGLIBC
+	prompt "eglibc............................... embedded GNU C library"
+	bool
+	default y if ADK_TARGET_LIB_EGLIBC && !ADK_TOOLCHAIN_ONLY
+	default n
+	depends on ADK_TARGET_LIB_EGLIBC
+	help
+	  embedded GNU C library.
+
+config ADK_PACKAGE_EGLIBC_DEV
+	prompt "eglibc-dev........................... development files"
+	tristate
+	default n
+	depends on ADK_TARGET_LIB_EGLIBC
+	help
+	  embedded GNU C library header files.
+
diff --git a/package/elinks/Config.in b/package/elinks/Config.in
deleted file mode 100644
index d44e69e8f..000000000
--- a/package/elinks/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_ELINKS
-	prompt "elinks............................ A text based web browser"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-	  An advanced text based web browser
-	  
-	  http://elinks.or.cz/
diff --git a/package/elinks/Makefile b/package/elinks/Makefile
index d4f3d8641..cb810d76f 100644
--- a/package/elinks/Makefile
+++ b/package/elinks/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		elinks
 PKG_VERSION:=		0.11.7
 PKG_RELEASE:=		2
+PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		145c510cae41c204d0f23dce4bdd23ab
 PKG_DESCR:=		advanced text web browser
 PKG_SECTION:=		text
diff --git a/package/em28xx/Config.in b/package/em28xx/Config.in
deleted file mode 100644
index da85f5211..000000000
--- a/package/em28xx/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_KMOD_EM28XX
-	prompt "kmod-em28xx...................... EM28xx driver"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_VIDEO_DEV
-	select ADK_KPACKAGE_KMOD_VIDEO_V4L1
-	help
-	  Driver for EM28xx based TV cards
-	  
diff --git a/package/em28xx/Makefile b/package/em28xx/Makefile
deleted file mode 100644
index bd2ba0315..000000000
--- a/package/em28xx/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:=		em28xx
-PKG_VERSION:=		20081206
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		8467a1b1d495fa712c8beb617ef5f5dd
-PKG_SITES:=		http://www.openadk.org/distfiles/
-
-WRKDIST=		${WRKDIR}/${PKG_NAME}
-
-include ${TOPDIR}/mk/package.mk
-
-
-$(eval $(call PKG_template,KMOD_EM28XX,kmod-em28xx,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${TARGET}-${KERNEL_RELEASE})))
-
-CONFIGURE_STYLE:=	manual
-BUILD_STYLE:=		manual
-
-EM28XX_MAKEOPTS=	-C ${WRKBUILD} \
-			ARCH="${ARCH}" \
-			CROSS_COMPILE="${TARGET_CROSS}" \
-			TOOLPREFIX="${TARGET_CROSS}" \
-			TOOLPATH="${TARGET_CROSS}" \
-			KERNELPATH="${LINUX_DIR}" \
-			V=1
-
-
-do-build:
-	${MAKE} ${EM28XX_MAKEOPTS} all
-
-post-install:
-	${INSTALL_DIR} ${IDIR_KMOD_EM28XX}/etc/modules.d/
-	${INSTALL_DIR} ${IDIR_KMOD_EM28XX}/lib/modules/${KERNEL_VERSION}/
-	${CP} ${WRKBUILD}/*.ko \
-		${IDIR_KMOD_EM28XX}/lib/modules/${KERNEL_VERSION}/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/esound/Config.in b/package/esound/Config.in
deleted file mode 100644
index 42f9f77e4..000000000
--- a/package/esound/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_ESOUND
-	prompt "esound............................ Enlightened Sound Daemon"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBAUDIOFILE
-	help
-	 Sound daemon can be used to play music via the network. For example
-	 with Amarok. You need to connect a sound card to your embedded device.
-
-	 http://www.tux.org/~ricdude/download.html
diff --git a/package/esound/Makefile b/package/esound/Makefile
index 123ade95c..b6ceecc2c 100644
--- a/package/esound/Makefile
+++ b/package/esound/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		esound
 PKG_VERSION:=		0.2.41
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libaudiofile
 PKG_MD5SUM:=		3d8973ed87053d7acc1f4d44af2c4688
 PKG_DESCR:=		Enlightened Sound Daemon
 PKG_SECTION:=		net
diff --git a/package/ether-wake/Config.in b/package/ether-wake/Config.in
deleted file mode 100644
index 5ed105a55..000000000
--- a/package/ether-wake/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_ETHER_WAKE
-	prompt "ether-wake........................ A Wake-On-LAN (WOL) client"
-	tristate
-	default n
-	help
-	  A Wake-On-LAN (WOL) client,
-	  This program sends a magic packet to wake up sleeping networked machines.
-
-	  http://www.scyld.com/wakeonlan.html
diff --git a/package/ethtool/Config.in b/package/ethtool/Config.in
deleted file mode 100644
index 8ba4b4c59..000000000
--- a/package/ethtool/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_ETHTOOL
-	prompt "ethtool........................... Display or change ethernet card settings"
-	tristate
-	default n
-	help
-	  ethtool is used for querying settings of an ethernet device and changing them
-
-	  http://sourceforge.net/projects/gkernel/
diff --git a/package/evieext/Config.in b/package/evieext/Config.in
deleted file mode 100644
index 88d73d6b3..000000000
--- a/package/evieext/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XPROTO
-	prompt "xproto................................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/exmap/Config.in b/package/exmap/Config.in
deleted file mode 100644
index bc7e23a92..000000000
--- a/package/exmap/Config.in
+++ /dev/null
@@ -1,41 +0,0 @@
-config ADK_COMPILE_EXMAP
-	tristate
-	default n
-
-config ADK_PACKAGE_EXMAP
-	prompt "exmap............................. exmap-console utility"
-	tristate
-	select ADK_COMPILE_EXMAP
-	select ADK_PACKAGE_GLIB
-	select ADK_PACKAGE_LIBREADLINE
-	select ADK_PACKAGE_KMOD_EXMAP
-	default n
-	help
-	  http://labs.o-hand.com/exmap-console/
-
-config ADK_PACKAGE_EXMAPD
-	prompt "exmapd............................ exmap daemon"
-	tristate
-	select ADK_COMPILE_EXMAP
-	select ADK_PACKAGE_GLIB
-	select ADK_PACKAGE_LIBREADLINE
-	select ADK_PACKAGE_KMOD_EXMAP
-	default n
-	help
-	  http://labs.o-hand.com/exmap-console/
-
-config ADK_PACKAGE_EXMAPSERVER
-	prompt "exmapserver....................... exmap server"
-	tristate
-	select ADK_COMPILE_EXMAP
-	select ADK_PACKAGE_GLIB
-	select ADK_PACKAGE_LIBREADLINE
-	select ADK_PACKAGE_KMOD_EXMAP
-	default n
-	help
-	  http://labs.o-hand.com/exmap-console/
-
-config ADK_PACKAGE_KMOD_EXMAP
-	tristate
-	default n
-	help
diff --git a/package/exmap/Makefile b/package/exmap/Makefile
index 092ba4a34..22acc5997 100644
--- a/package/exmap/Makefile
+++ b/package/exmap/Makefile
@@ -7,19 +7,25 @@ PKG_NAME:=		exmap
 PKG_VERSION:=		0.4.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		55aec784e214037e61400287a55b5426
-PKG_DESCR:=		memory analysing tool
+PKG_DESCR:=		memory analysing client tool
 PKG_SECTION:=		utils
+PKG_DEPENDS:=		kmod-exmap libreadline glib
+PKG_BUILDDEP+=		glib readline
 PKG_SITES:=		http://labs.o-hand.com/sources/exmap-console/
 
 DISTFILES:=		${PKG_NAME}-console-${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION}
 
+PKG_DESCR_EXMAPD:=	memory analysing daemon
+PKG_DESCR_EXMAPSERVER:=	memory analysing server
+PKG_DESCR_KMOD_EXMAP:=	memory analysing kernel module
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_EXMAPD},${PKG_SECTION}))
+$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_EXMAPSERVER},${PKG_SECTION}))
+$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR_KMOD_EXMAP},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-doc
diff --git a/package/expat/Config.in b/package/expat/Config.in
deleted file mode 100644
index 209d357b7..000000000
--- a/package/expat/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_COMPILE_EXPAT
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBEXPAT
-
-config ADK_PACKAGE_LIBEXPAT
-	prompt "libexpat.......................... A fast, non-validating, stream-oriented XML parsing library"
-	tristate
-	default n
-	select ADK_COMPILE_EXPAT
-	help
-	  A fast, non-validating, stream-oriented XML parsing library
-
-	  http://expat.sourceforge.net/
diff --git a/package/expat/Makefile b/package/expat/Makefile
index 0a3a93a3a..51ce68858 100644
--- a/package/expat/Makefile
+++ b/package/expat/Makefile
@@ -17,7 +17,7 @@ endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBEXPAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
diff --git a/package/ez-ipupdate/Config.in b/package/ez-ipupdate/Config.in
deleted file mode 100644
index 94ad32420..000000000
--- a/package/ez-ipupdate/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_EZIPUPDATE
-	prompt "ez-ipupdate....................... Client for most dynamic DNS services"
-	tristate
-	default n
-	help
-	  A client for many Dynamic DNS services.
-
-	  http://ez-ipupdate.com/
diff --git a/package/faad2/Config.in b/package/faad2/Config.in
deleted file mode 100644
index 8d554727d..000000000
--- a/package/faad2/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config ADK_COMPILE_FAAD2
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBFAAD2
-
-config ADK_PACKAGE_LIBFAAD2
-	prompt "libfaad2.......................... MP4 decoding library"
-	tristate
-	select ADK_COMPILE_FAAD2
-	default n
-	help
-          FAAD2 is the fastest ISO AAC audio decoder available.
-          FAAD2 correctly decodes all MPEG-4 and MPEG-2 MAIN,
-          LOW, LTP, LD and ER object type AAC files.
-	  http://www.audiocoding.com/faad2.html
-
diff --git a/package/fakeidentd/Config.in b/package/fakeidentd/Config.in
deleted file mode 100644
index 68a8d33ff..000000000
--- a/package/fakeidentd/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_FAKEIDENTD
-	prompt "fakeidentd........................ A static, secure identd."
-	tristate
-	default n
-	help
-	  A static secure identd, only one source file.
-
-	  http://www.guru-group.fi/~too/sw/releases/
diff --git a/package/fbset/Config.in b/package/fbset/Config.in
deleted file mode 100644
index 9356fcd8d..000000000
--- a/package/fbset/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_FBSET
-	prompt "fbset............................. framebuffer utility"
-	tristate
-	default n
-	help
-	  http://users.telenet.be/geertu/Linux/fbdev/
diff --git a/package/fetchmail/Config.in b/package/fetchmail/Config.in
deleted file mode 100644
index 5319a963f..000000000
--- a/package/fetchmail/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config ADK_PACKAGE_FETCHMAIL
-	prompt "fetchmail......................... Remote mail retriever"
-	tristate
-	default n
-	help
-		Retrieves remote mail via POP/IMAP
-
-		Very useful in conjunction with mutt or pine.
-		Known to be full of security holes, beware.
-
-config ADK_PACKAGE_FETCHMAIL_SSL
-	bool "Enable SSL/TLS support"
-	depends on ADK_PACKAGE_FETCHMAIL
-	select ADK_PACKAGE_LIBOPENSSL
-	default n
-	help
-	  Enable this to be able to retrieve mails more securely.
diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile
index c35add42e..ea569df1d 100644
--- a/package/fetchmail/Makefile
+++ b/package/fetchmail/Makefile
@@ -9,23 +9,26 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		72c20ad2b9629f1a109668b05a84d823
 PKG_DESCR:=		fetch mail from a POP, IMAP, ETRN, or ODMR-capable server
 PKG_SECTION:=		text
+ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y)
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP+=		openssl
+endif
 PKG_URL:=		http://fetchmail.berlios.de/
 PKG_SITES:=		http://download.berlios.de/fetchmail/
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-include ${TOPDIR}/mk/package.mk
+PKG_FLAVOURS:=		SSL
+PKGFD_SSL:=		enable SSL support
 
-ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y)
-PKG_DEPENDS:=		libopenssl
-endif
+include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FETCHMAIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-hesiod
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y)
 CONFIGURE_ARGS+=	--with-ssl='${STAGING_DIR}/usr'
diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
deleted file mode 100644
index 9eebed177..000000000
--- a/package/ffmpeg/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_FFMPEG
-	tristate "ffmpeg............................ audio/video multimedia library"
-	default n
-	help
-	  cross-platform solution to record, convert and stream audio and video.
-	  http://www.ffmpeg.org
diff --git a/package/file/Config.in b/package/file/Config.in
deleted file mode 100644
index 7ff23c16f..000000000
--- a/package/file/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_PACKAGE_FILE
-	prompt "file.............................. a file type guesser"
-	tristate
-	default n
-	help
-
-	 The file command is "a file type guesser", that is, a command-line
-	 tool that tells you in words what kind of data a file contains. Unlike
-	 most GUI systems, command-line UNIX systems - with this program
-	 leading the charge - don't rely on filename extentions to tell you the
-	 type of a file, but look at the file's actual contents. This is, of
-	 course, more reliable, but requires a bit of I/O.
-
-	 http://www.darwinsys.com/file/
diff --git a/package/fixesproto/Config.in b/package/fixesproto/Config.in
deleted file mode 100644
index c463a557e..000000000
--- a/package/fixesproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_FIXESPROTO
-	prompt "fixesproto............................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/flac/Config.in b/package/flac/Config.in
deleted file mode 100644
index 346e70e75..000000000
--- a/package/flac/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_COMPILE_FLAC
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBFLAC
-
-config ADK_PACKAGE_LIBFLAC
-	prompt "libflac........................... Free Lossless Audio Codec library"
-	tristate
-	default n
-	select ADK_COMPILE_FLAC
-	help
-	  Free Lossless Audio Codec library
-
-	  http://flac.sourceforge.net/
diff --git a/package/flex/Config.in b/package/flex/Config.in
deleted file mode 100644
index 6be8e22ea..000000000
--- a/package/flex/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_FLEX
-	prompt "flex.............................. Fast lexical analyzer"
-	tristate
-	default n
-	help
-	  http://www.gnu.org/software/flex/
diff --git a/package/fontcacheproto/Config.in b/package/fontcacheproto/Config.in
deleted file mode 100644
index 88d73d6b3..000000000
--- a/package/fontcacheproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XPROTO
-	prompt "xproto................................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/fontconfig/Config.in b/package/fontconfig/Config.in
deleted file mode 100644
index f18bea634..000000000
--- a/package/fontconfig/Config.in
+++ /dev/null
@@ -1,5 +0,0 @@
-config ADK_PACKAGE_FONTCONFIG
-	prompt "fontconfig........................ fontconfig library"
-	tristate
-	default n
-	help
diff --git a/package/fontsproto/Config.in b/package/fontsproto/Config.in
deleted file mode 100644
index 6f267ea8a..000000000
--- a/package/fontsproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_FONTSPROTO
-	prompt "fontsproto.............................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/fping/Config.in b/package/fping/Config.in
deleted file mode 100644
index 3fb258d1b..000000000
--- a/package/fping/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_PACKAGE_FPING
-	prompt "fping............................. A program to ping multiple hosts in parallel"
-	tristate
-	default n
-	help
-	  fping is a ping(1) like program which uses the Internet Control Message Protocol
-	  (ICMP) echo request to determine if a host is up. fping is different from ping in
-	  that you can specify any number of hosts on the command line, or specify a file
-	  containing the lists of hosts to ping. Instead of trying one host until it timeouts
-	  or replies, fping will send out a ping packet and move on to the next host in a
-	  round-robin fashion. If a host replies, it is noted and removed from the list of
-	  hosts to check. If a host does not respond within a certain time limit and/or retry
-	  limit it will be considered unreachable.
-
-	  http://www.fping.com/
diff --git a/package/fprobe-ulog/Config.in b/package/fprobe-ulog/Config.in
deleted file mode 100644
index 990bf17bd..000000000
--- a/package/fprobe-ulog/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_FPROBE_ULOG
-	prompt "fprobe-ulog....................... NetFlow probe (ulog-based)"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  A NetFlow probe obtaining packets through linux netfilter code
-	  (iptables ULOG target).
-
-	  http://fprobe.sourceforge.net/
diff --git a/package/fprobe/Config.in b/package/fprobe/Config.in
deleted file mode 100644
index 708f66d51..000000000
--- a/package/fprobe/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_FPROBE
-	prompt "fprobe............................ NetFlow probe (libpcap-based)"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPCAP
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  A NetFlow probe using libpcap
-
-	  http://fprobe.sourceforge.net/
diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile
index 66d2b4abf..6e4edf980 100644
--- a/package/fprobe/Makefile
+++ b/package/fprobe/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		fprobe
 PKG_VERSION:=		1.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libpcap
 PKG_MD5SUM:=		65850d0470078269b33eee58cba77ac2
 PKG_DESCR:=		NetFlow probe
 PKG_SECTION:=		net
diff --git a/package/freeradius-client/Config.in b/package/freeradius-client/Config.in
deleted file mode 100644
index 987c52c0a..000000000
--- a/package/freeradius-client/Config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-config ADK_COMPILE_FREERADIUS_CLIENT
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBFREERADIUS_CLIENT
-
-config ADK_PACKAGE_FREERADIUS_CLIENT
-	prompt "freeradius-client................. RADIUS client"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBFREERADIUS_CLIENT
-	help
-	  http://freeradius.org/freeradius-client/	
-
-config ADK_PACKAGE_LIBFREERADIUS_CLIENT
-	prompt "libfreeradius-client.............. RADIUS client library"
-	tristate
-	default n
-	select ADK_COMPILE_FREERADIUS_CLIENT
-	help
-	  http://freeradius.org/freeradius-client/
diff --git a/package/freeradius-client/Makefile b/package/freeradius-client/Makefile
index 19f6a236c..6eaa74e8a 100644
--- a/package/freeradius-client/Makefile
+++ b/package/freeradius-client/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		freeradius-client
 PKG_VERSION:=		1.1.6
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		edd4d904e802ff66d35532be1475cfa7
 PKG_DESCR:=		RADIUS client
 PKG_SECTION:=		net
diff --git a/package/freeradius-server/Config.in b/package/freeradius-server/Config.in
deleted file mode 100644
index fe119c0a3..000000000
--- a/package/freeradius-server/Config.in
+++ /dev/null
@@ -1,97 +0,0 @@
-config ADK_PACKAGE_FREERADIUS_SERVER
-	prompt "freeradius-server................. Flexible RADIUS server"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBLTDL
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  A flexible RADIUS server
-	  http://www.freeradius.org/
-
-config ADK_PACKAGE_FREERADIUS_DEMOCERTS
-	prompt   "freeradius-democerts.......... Demo certificates to test the server"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_CHAP
-	prompt   "freeradius-mod-chap........... CHAP module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_DETAIL
-	prompt   "freeradius-mod-detail......... Detailed accounting module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_DIGEST
-	prompt   "freeradius-mod-digest......... Digest authentication"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_FILES
-	prompt   "freeradius-mod-files.......... Module using local files for authorization"
-	tristate
-	default y
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_LDAP
-	prompt   "freeradius-mod-ldap........... LDAP module"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENLDAP
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_MSCHAP
-	prompt   "freeradius-mod-mschap......... MS-CHAP and MS-CHAPv2 module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_PAP
-	prompt   "freeradius-mod-pap............ PAP module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_PREPROCESS
-	prompt   "freeradius-mod-preprocess..... Request pre-processing module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_REALM
-	prompt   "freeradius-mod-realm.......... Realms handling module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_SQL
-	prompt   "freeradius-mod-sql............ Base SQL module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
-
-config ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL
-	prompt     "freeradius-mod-sql-mysql.... MySQL module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_MOD_SQL
-	select ADK_PACKAGE_LIBMYSQLCLIENT
-
-config ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL
-	prompt     "freeradius-mod-sql-pgsql.... PostgreSQL module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_MOD_SQL
-	select ADK_PACKAGE_LIBPQ
-
-config ADK_PACKAGE_FREERADIUS_UTILS
-	prompt   "freeradius-utils.............. Misc. client utilities"
-	tristate
-	default n
-	depends on ADK_PACKAGE_FREERADIUS_SERVER
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 1e5304103..f8f769da5 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -10,11 +10,39 @@ PKG_MD5SUM:=		b1f77c5e3116bcb0ac0aa9080a06ebf1
 PKG_DESCR:=		a flexible RADIUS server
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libltdl libopenssl libpthread
+PKG_BUILDDEP+=		libtool openssl
+ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_LDAP),)
+PKG_BUILDDEP+=		openldap
+PKG_DEPENDS_LDAP:=	libopenldap
+endif
+ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),)
+PKG_BUILDDEP+=		mysql
+PKG_DEPENDS_MYSQL:=	libmysqlclient
+endif
+ifneq ($(ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL),)
+PKG_BUILDDEP+=		postgresql
+PKG_DEPENDS_PGSQL:=	libpq
+endif
 PKG_URL:=		http://www.freeradius.org
 PKG_SITES:=		ftp://ftp.freeradius.org/pub/radius/ \
 			http://freeradius.portal-to-web.de/ \
 			ftp://ftp.uk.freeradius.org/pub/radius/
 
+PKG_DESCR_DEMOCERTS:=	Demo certificates to test the server
+PKG_DESCR_CHAP:=	CHAP authentication module
+PKG_DESCR_DETAIL:=	Detailed accounting module
+PKG_DESCR_DIGEST:=	Digest authentication module
+PKG_DESCR_FILES:=	Module using local files for authorization
+PKG_DESCR_LDAP:=	LDAP module
+PKG_DESCR_MSCHAP:=	MS-CHAP and MS-CHAPv2 module
+PKG_DESCR_PAP:=		PAP authentication module
+PKG_DESCR_PREPROCESS:=	Request pre-processing module
+PKG_DESCR_REALM:=	Realms handling module
+PKG_DESCR_SQL:=		Base SQL module
+PKG_DESCR_MYSQL:=	MySQL module
+PKG_DESCR_PGSQL:=	PostgreSQL module
+PKG_DESCR_UTILS:=	Misc. client utilities
+
 PKG_CONFIGURE_OPTIONS:=
 
 ifneq (${ADK_PACKAGE_FREERADIUS_MOD_LDAP},)
@@ -65,20 +93,20 @@ ${2}-install:
 endef
 
 $(eval $(call PKG_template,FREERADIUS_SERVER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_DIGEST,freeradius-mod-digest,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_PAP,freeradius-mod-pap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_PREPROCESS,freeradius-mod-preprocess,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_REALM,freeradius-mod-realm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_SQL,freeradius-mod-sql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_SQL_MYSQL,freeradius-mod-sql-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_MOD_SQL_PGSQL,freeradius-mod-sql-pgsql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_DEMOCERTS,freeradius-democerts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_DEMOCERTS},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_CHAP},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_DETAIL},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_DIGEST,freeradius-mod-digest,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_DIGEST},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_FILES},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LDAP},${PKG_DESCR_LDAP},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_MSCHAP},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_PAP,freeradius-mod-pap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_PAP},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_PREPROCESS,freeradius-mod-preprocess,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_PREPROCESS},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_REALM,freeradius-mod-realm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_REALM},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_SQL,freeradius-mod-sql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SQL},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_SQL_MYSQL,freeradius-mod-sql-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_MYSQL},${PKG_DESCR_MYSQL},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_MOD_SQL_PGSQL,freeradius-mod-sql-pgsql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_PGSQL},${PKG_DESCR_PGSQL},${PKG_SECTION}))
+$(eval $(call PKG_template,FREERADIUS_UTILS,freeradius-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_UTILS},${PKG_SECTION}))
 
 $(eval $(call PKG_mod_template,FREERADIUS_MOD_CHAP,rlm_chap,))
 $(eval $(call PKG_mod_template,FREERADIUS_MOD_DETAIL,rlm_detail,))
@@ -93,7 +121,7 @@ $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL,rlm_sql,sql.conf))
 $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_MYSQL,rlm_sql_mysql,))
 $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_PGSQL,rlm_sql_postgresql,))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_lib_nsl_inet_ntoa=no
 CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTIONS} \
 			--with-openssl-includes=${STAGING_DIR}/usr/include \
@@ -137,8 +165,8 @@ CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTIONS} \
 			--without-rlm_sql_sqlite \
 			--libdir=/usr/lib/freeradius \
 			--libexecdir=/usr/lib/freeradius
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 FAKE_FLAGS+=		R="${WRKINST}" \
 			INSTALLSTRIP=""
 
diff --git a/package/freetype/Config.in b/package/freetype/Config.in
deleted file mode 100644
index 408998aa8..000000000
--- a/package/freetype/Config.in
+++ /dev/null
@@ -1,24 +0,0 @@
-config ADK_COMPILE_FREETYPE
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBFREETYPE
-
-config ADK_PACKAGE_LIBFREETYPE
-	tristate "libfreetype....................... A free, high-quality and portable font engine"
-	default n
-	select ADK_COMPILE_FREETYPE
-	select ADK_PACKAGE_ZLIB
-	help
-	  The FreeType project is a team of volunteers who develop free,
-	  portable and high-quality software solutions for digital typography.
-	  They specifically target embedded systems and focus on bringing small,
-	  efficient and ubiquitous products.
-
-	  The FreeType 2 library is their new software font engine.  It has been
-	  designed to provide the following important features:
-	   * A universal and simple API to manage font files
-	   * Support for several font formats through loadable modules
-	   * High-quality anti-aliasing
-	   * High portability & performance
-
-	  http://www.freetype.org/
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index 63700c539..e902954c7 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -3,9 +3,10 @@
 
 include ${TOPDIR}/rules.mk
 
-PKG_NAME:=		libfreetype
+PKG_NAME:=		freetype
 PKG_VERSION:=		2.3.11
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
+PKG_BUILDDEP+=		zlib
 PKG_MD5SUM:=		519c7cbf5cbd72ffa822c66844d3114c
 PKG_DESCR:=		A free, high-quality and portable font engine
 PKG_SECTION:=		libs
@@ -13,16 +14,13 @@ PKG_DEPENDS:=		zlib
 PKG_URL:=		http://www.freetype.org
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freetype/}
 
-DISTFILES:=		freetype-${PKG_VERSION}.tar.bz2
-WRKDIST=		${WRKDIR}/freetype-${PKG_VERSION}
-
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBFREETYPE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
diff --git a/package/frickin/Config.in b/package/frickin/Config.in
deleted file mode 100644
index 599703234..000000000
--- a/package/frickin/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_FRICKIN
-	prompt "frickin........................... PPTP (Point-to-Point Tunneling Protocol) proxy"
-	tristate
-	default n
-	help
-	  Frickin PPTP Proxy allows a Point-to-Point Tunneling Protocol (PPTP)
-	  client to connect to a PPTP server through Network Address
-	  Translation (NAT).
-
-	  http://frickin.sourceforge.net/
diff --git a/package/fuse/Config.in b/package/fuse/Config.in
deleted file mode 100644
index 4841086d3..000000000
--- a/package/fuse/Config.in
+++ /dev/null
@@ -1,27 +0,0 @@
-config ADK_COMPILE_FUSE
-	tristate
-	default n
-
-config ADK_PACKAGE_FUSE_UTILS
-	prompt   "fuse-utils........................ FUSE utilities"
-	tristate
-	default n
-	select ADK_COMPILE_FUSE
-	select ADK_KPACKAGE_KMOD_FUSE_FS
-	help
-	  With FUSE it is possible to implement a fully functional 
-	  filesystem in a userspace program.
-	  
-	  Features include:
-	  
-	   * Simple library API
-	   * Simple installation (no need to patch or recompile the kernel)
-	   * Secure implementation
-	   * Userspace - kernel interface is very efficient
-	   * Usable by non privileged users
-	   * Runs on Linux kernels 2.4.X and 2.6.X
-	   * Has proven very stable over time
-	  
-	  http://fuse.sourceforge.net/
-	  
-	  This package contains the fusermount userland utility.
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/gatling/Config.in b/package/gatling/Config.in
deleted file mode 100644
index 715887855..000000000
--- a/package/gatling/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_GATLING
-	prompt "gatling........................... non-forking FAST webserver"
-	tristate
-	default n
-	select ADK_COMPILE_LIBOWFAT
-	select ADK_PACKAGE_LIBICONV
-	help
-	  gatling is a high-performance non-forking small webserver.
-	  
-	  http://www.fefe.de/gatling/
diff --git a/package/gatling/Makefile b/package/gatling/Makefile
index 623008b31..88aa5a1e9 100644
--- a/package/gatling/Makefile
+++ b/package/gatling/Makefile
@@ -3,15 +3,16 @@
 
 include ${TOPDIR}/rules.mk
 
-PKG_NAME=		gatling
-PKG_VERSION=		0.10
-PKG_RELEASE=		1
-PKG_MD5SUM=		04e8434156d91657c77a8a038c5b27cf
+PKG_NAME:=		gatling
+PKG_VERSION:=		0.10
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		04e8434156d91657c77a8a038c5b27cf
 PKG_DESCR:=		small non-forking webserver
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libiconv
+PKG_DEPENDS:=		libowfat libiconv
+PKG_BUILDDEP+=		libowfat libiconv
 PKG_URL:=		http://www.fefe.de/gatling
-PKG_SITES=		http://dl.fefe.de/
+PKG_SITES:=		http://dl.fefe.de/
 
 DISTFILES=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
@@ -19,9 +20,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GATLING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE=		auto
-MAKE_FILE=		GNUmakefile
-ALL_TARGET=		gatling
+BUILD_STYLE:=		auto
+MAKE_FILE:=		GNUmakefile
+ALL_TARGET:=		gatling
 TCPPFLAGS+=		-I${STAGING_DIR}/usr/include/owfat
 XAKE_FLAGS+=		CC='${TARGET_CC}' \
 			CFLAGS='${TCPPFLAGS} ${TCFLAGS}' \
diff --git a/package/gawk/Config.in b/package/gawk/Config.in
deleted file mode 100644
index 2ef88947b..000000000
--- a/package/gawk/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_GAWK
-	prompt "gawk.............................. GNU awk"
-	tristate
-	default n
-	help
-	  http://www.gnu.org/software/gawk/
diff --git a/package/gcc/Config.in b/package/gcc/Config.in
deleted file mode 100644
index 5cc23e6ca..000000000
--- a/package/gcc/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_GCC
-	prompt "gcc............................... GNU Compiler Collection"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBGMP
-	select ADK_PACKAGE_MPFR
-	depends on !ADK_HOST_FREEBSD
-	help
-	  GCC
-	  http://www.gnu.org/gcc
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 0e6384a5b..f2820d144 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -6,8 +6,11 @@ include ${TOPDIR}/toolchain/gcc/Makefile.inc
 
 PKG_DESCR:=		GNU compiler collection
 PKG_SECTION:=		comp
-PKG_DEPENDS:=		mpfr
 PKG_OPTS:=		noremove
+PKG_DEPENDS:=		libgmp mpfr
+PKG_BUILDDEP+=		gmp mpfr
+
+PKG_HOST_DEPENDS:=	!freebsd
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/gdb/Config.in b/package/gdb/Config.in
deleted file mode 100644
index 8ca2081f9..000000000
--- a/package/gdb/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_GDB
-	prompt "gdb............................... GNU debugger"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBTHREAD_DB
-	depends on !ADK_LINUX_CRIS_FOXBOARD
-	help
-	 GDB is a program for debugging applications.
-
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index bd3c14cfb..139d6b54b 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -6,7 +6,9 @@ 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
+PKG_TARGET_DEPENDS:=	!foxboard
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/gdbm/Config.in b/package/gdbm/Config.in
deleted file mode 100644
index f644ae473..000000000
--- a/package/gdbm/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_LIBGDBM
-	prompt "libgdbm........................... The GNU database manager"
-	tristate
-	default n
-	help
-	  disk file format database which stores key/data-pairs in single files.  
-	  
-	  http://www.gnu.org
-
diff --git a/package/gdbserver/Config.in b/package/gdbserver/Config.in
deleted file mode 100644
index a53d523d6..000000000
--- a/package/gdbserver/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_GDBSERVER
-	prompt "gdbserver......................... Remote Server for the GNU Debugger"
-	tristate
-	select ADK_PACKAGE_LIBTHREAD_DB
-	default n
-	help
-	  GDBSERVER is a program that allows you to run GDB on a different machine
-	  than the one which is running the program being debugged.
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 383f040f6..8b6034b43 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -6,16 +6,17 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc
 
 PKG_DESCR:=		GNU debugger (small server)
 PKG_SECTION:=		comp
+PKG_DEPENDS:=		libthread-db
 
 include ${TOPDIR}/mk/package.mk
 
 WRKSRC=                 ${WRKDIST}/gdb/gdbserver
 
-$(eval $(call PKG_template,GDBSERVER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GDBSERVER,gdbserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GDBSERVER}/usr/bin
diff --git a/package/gettext/Config.in b/package/gettext/Config.in
deleted file mode 100644
index 86fd858bb..000000000
--- a/package/gettext/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_GETTEXT
-	prompt "gettext........................... internationalisation library"
-	tristate
-	default n
-	help 
-	  GNU gettext
diff --git a/package/gettext/Makefile b/package/gettext/Makefile
index 6d1349a0c..248eea1ea 100644
--- a/package/gettext/Makefile
+++ b/package/gettext/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		gettext
 PKG_VERSION=		0.16.1
 PKG_RELEASE=		1
+PKG_BUILDDEP+=		libiconv libpthread
 PKG_MD5SUM=		3d9ad24301c6d6b17ec30704a13fe127
 PKG_DESCR:=		internationalisation library
 PKG_SECTION:=		libs
diff --git a/package/git/Config.in b/package/git/Config.in
deleted file mode 100644
index c897385a7..000000000
--- a/package/git/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_GIT
-	prompt "git............................... fast version control system"
-	tristate
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBCURL
-	select ADK_PACKAGE_LIBEXPAT
-	select ADK_PACKAGE_LIBPTHREAD
-	default n
-	help
-	  Fast version control system.
diff --git a/package/git/Makefile b/package/git/Makefile
index d8a3ca22e..da9896e51 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -9,7 +9,8 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		50fb736021ef89916af622cb4772bbea
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		misc
-PKG_DEPENDS:=		openssl curl
+PKG_DEPENDS:=		libopenssl libcurl libexpat
+PKG_BUILDDEP+=		openssl curl expat
 PKG_URL:=		http://git-scm.com
 PKG_SITES:=		http://kernel.org/pub/software/scm/git/
 
diff --git a/package/gkrellmd/Config.in b/package/gkrellmd/Config.in
deleted file mode 100644
index 8510be728..000000000
--- a/package/gkrellmd/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_GKRELLMD
-	prompt "gkrellmd.......................... The GNU Krell Monitors Server"
-	tristate
-	default n
-	select ADK_PACKAGE_GLIB
-	help
-	  Gkrellmd Listens for connections from gkrellm clients. When a gkrellm
-	  client connects to a gkrellmd server all builtin monitors collect
-	  their data from the server.
diff --git a/package/gkrellmd/Makefile b/package/gkrellmd/Makefile
index dba286e4b..51daec7b3 100644
--- a/package/gkrellmd/Makefile
+++ b/package/gkrellmd/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		gkrellmd
 PKG_VERSION:=		2.3.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		glib
 PKG_MD5SUM:=		db8a983a60577a6b4886db96d6def011
 PKG_DESCR:=		The GNU Krell Monitors Server
 PKG_SECTION:=		net
diff --git a/package/glib/Config.in b/package/glib/Config.in
deleted file mode 100644
index e23dde160..000000000
--- a/package/glib/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_GLIB
-	prompt "glib.............................. low-level core library that forms the basis of GTK+"
-	tristate
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_LIBICONV
-	select ADK_PACKAGE_GETTEXT
-	default n
-	help
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 4d555f7bf..a2e5a3fc2 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		glib
 PKG_VERSION:=		2.22.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		gettext libiconv
 PKG_MD5SUM:=		00eb873975e2ef9361b8177131c7c943
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
diff --git a/package/glibc/Config.in b/package/glibc/Config.in
index 6e7db32c9..e69de29bb 100644
--- a/package/glibc/Config.in
+++ b/package/glibc/Config.in
@@ -1,18 +0,0 @@
-config ADK_PACKAGE_GLIBC
-	prompt "glibc............................... GNU C library"
-	bool
-	default y if ADK_TARGET_LIB_GLIBC && !ADK_TOOLCHAIN_ONLY
-	default n
-	depends on ADK_TARGET_LIB_GLIBC
-	help
-	  GNU C library.
-
-config ADK_PACKAGE_GLIBC_DEV
-	prompt "glibc-dev........................... development files"
-	tristate
-	default n
-	depends on ADK_TARGET_LIB_GLIBC
-	help
-	  GNU C library header files.
-
-
diff --git a/package/glibc/Config.in.manual b/package/glibc/Config.in.manual
new file mode 100644
index 000000000..6e7db32c9
--- /dev/null
+++ b/package/glibc/Config.in.manual
@@ -0,0 +1,18 @@
+config ADK_PACKAGE_GLIBC
+	prompt "glibc............................... GNU C library"
+	bool
+	default y if ADK_TARGET_LIB_GLIBC && !ADK_TOOLCHAIN_ONLY
+	default n
+	depends on ADK_TARGET_LIB_GLIBC
+	help
+	  GNU C library.
+
+config ADK_PACKAGE_GLIBC_DEV
+	prompt "glibc-dev........................... development files"
+	tristate
+	default n
+	depends on ADK_TARGET_LIB_GLIBC
+	help
+	  GNU C library header files.
+
+
diff --git a/package/gmediaserver/Config.in b/package/gmediaserver/Config.in
deleted file mode 100644
index ade3b4a1c..000000000
--- a/package/gmediaserver/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_GMEDIASERVER
-	prompt "gmediaserver...................... An UPnP music media server"
-	tristate
-	default n
-	select ADK_PACKAGE_ID3LIB
-	select ADK_PACKAGE_LIBUPNP
-	help
-	  An UPnP music media server.
-	  http://www.nongnu.org/gmediaserver/
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile
index bfc0f135c..eb38904cd 100644
--- a/package/gmediaserver/Makefile
+++ b/package/gmediaserver/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		gmediaserver
 PKG_VERSION:=		0.13.0
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		id3lib libupnp
 PKG_MD5SUM:=		c422de386331e2a1a859d45f6fa270a3
 PKG_DESCR:=		An UPnP music media server
 PKG_SECTION:=		net
diff --git a/package/gmp/Config.in b/package/gmp/Config.in
deleted file mode 100644
index 9ef3f1e4a..000000000
--- a/package/gmp/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_COMPILE_GMP
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBGMP
-
-config ADK_PACKAGE_LIBGMP
-	prompt "libgmp............................ GNU multiprecision arithmetic library"
-	tristate
-	default n
-	select ADK_COMPILE_GMP
-	help
-	  GNU multiprecision arithmetic library
-
-	  http://www.swox.com/gmp/
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
deleted file mode 100644
index 71b4eac29..000000000
--- a/package/gnutls/Config.in
+++ /dev/null
@@ -1,83 +0,0 @@
-config ADK_COMPILE_GNUTLS
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBGNUTLS
-
-config ADK_PACKAGE_LIBGNUTLS
-	prompt "libgnutls......................... The GNU TLS library"
-	tristate
-	default n
-	select ADK_COMPILE_GNUTLS
-	select ADK_PACKAGE_LIBGCRYPT
-	select ADK_PACKAGE_LIBTASN1
-	select ADK_PACKAGE_ZLIB
-	help
-	  GnuTLS is a project that aims to develop a library which provides a
-	  secure layer, over a reliable transport layer. Currently the GnuTLS
-	  library implements the proposed standards by the IETF's TLS working
-	  group.
-
-	  Quoting from RFC2246 - the TLS 1.0 protocol specification:
-
-	  "The TLS protocol provides communications privacy over the Internet.
-	   The protocol allows client/server applications to communicate in a
-	   way that is designed to prevent eavesdropping, tampering, or message
-	   forgery."
-
-	  Features
-	    * Support for TLS 1.1 and SSL 3.0 protocols
-	    * Support for TLS extensions
-	    * Support for authentication using the SRP protocol
-	    * Support for authentication using both X.509 certificates
-	    * and OpenPGP keys Support for X.509 and OpenPGP certificate handling.
-	    * Supports all the strong encryption algorithms
-
-	  http://www.gnu.org/software/gnutls/
-
-	  This packages contains the core GnuTLS shared library,
-	  needed by other programs.
-
-config ADK_PACKAGE_LIBGNUTLS_EXTRA
-	prompt "libgnutls-extra................... The GNU TLS extra library"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBGNUTLS
-	select ADK_PACKAGE_LIBOPENCDK
-	select ADK_PACKAGE_LIBLZO
-	help
-	  GnuTLS is a project that aims to develop a library which provides a
-	  secure layer, over a reliable transport layer. Currently the GnuTLS
-	  library implements the proposed standards by the IETF's TLS working
-	  group.
-
-	  This packages contains the optional "extra" GnuTLS shared
-	  library, needed by other programs, which contains OpenPGP,
-	  TLS/IA and LZO2 compression.
-
-config ADK_PACKAGE_LIBGNUTLS_OPENSSL
-	prompt "libgnutls-openssl................. The GNU TLS OpenSSL compatibility layer library"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBGNUTLS
-	help
-	  GnuTLS is a project that aims to develop a library which provides a
-	  secure layer, over a reliable transport layer. Currently the GnuTLS
-	  library implements the proposed standards by the IETF's TLS working
-	  group.
-
-	  This packages contains the GnuTLS OpenSSL compatibility
-	  layer shared library.
-
-config ADK_PACKAGE_GNUTLS_UTILS
-	prompt "gnutls-utils...................... The GNU TLS utilities"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBGNUTLS
-	select ADK_PACKAGE_LIBGNUTLS_EXTRA
-	help
-	  GnuTLS is a project that aims to develop a library which provides a
-	  secure layer, over a reliable transport layer. Currently the GnuTLS
-	  library implements the proposed standards by the IETF's TLS working
-	  group.
-
-	  This packages contains some GnuTLS command line utilities.
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 235be1de4..0d9a58a14 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -10,6 +10,7 @@ PKG_MD5SUM:=		e3b2788b79bfc82acbe717e3c54d4e92
 PKG_DESCR:=		GNU TLS library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libgcrypt libtasn1 zlib
+PKG_BUILDDEP+=		libgcrypt liblzo libtasn1 opencdk zlib ncurses
 PKG_URL:=		http://www.gnu.org/software/gnutls
 PKG_SITES:=		${MASTER_SITE_GNU:=gnutls/}
 
diff --git a/package/gperf/Config.in b/package/gperf/Config.in
deleted file mode 100644
index d19d3ca18..000000000
--- a/package/gperf/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_GPERF
-	prompt "gperf............................. perfect hash function generator"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-	  http://www.gnu.org/software/gperf/
diff --git a/package/gpg/Config.in b/package/gpg/Config.in
deleted file mode 100644
index 037529c5b..000000000
--- a/package/gpg/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_GPG
-	prompt "gpg .............................. Gnu Privacy Guard"
-	tristate
-	default n
-        select ADK_PACKAGE_LIBREADLINE
-	help
-	  GPG is an encryption program
-
-	  http://www.gnupg.org
diff --git a/package/gpm/Config.in b/package/gpm/Config.in
deleted file mode 100644
index 9afe47f6c..000000000
--- a/package/gpm/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_GPM
-	prompt "gpm .............................. GPM"
-	tristate
-	default n
-	help
-	  http://unix.schottelius.org/gpm/
diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
deleted file mode 100644
index 9687145a5..000000000
--- a/package/gpsd/Config.in
+++ /dev/null
@@ -1,43 +0,0 @@
-config ADK_PACKAGE_GPSD
-	prompt "gpsd.............................. An interface daemon for GPS receivers"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  gpsd is a monitor daemon that watches a TCP/IP port (2947 by default),
-	  waiting for applications to request information from GPSes or
-	  differential-GPS radios attached to the host machine. Each GPS or
-	  radio is expected to be direct-connected to the host via a USB or
-	  RS232C serial port. The port may be specified to gpsd at startup, or
-	  it may be set via a command shipped down a local control socket (e.g.
-	  by a USB hotplug script). Given a GPS device by either means, gpsd
-	  discovers the correct port speed and protocol for it.
-
-	  http://gpsd.berlios.de/
-
-config ADK_PACKAGE_GPSD_CLIENTS
-	prompt   "gpsd-clients.................... cgps and gpxlogger"
-	tristate
-	default y
-	depends on ADK_PACKAGE_GPSD
-	help
-	  This enables the command-line GPS client "cgps" and
-	  the "gpxlogger" tool for outputting standard GPX files.
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_GPSD
-default ADK_COMPILE_GPSD_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_GPSD_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_GPSD_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_GPSD_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	help
-
-endchoice
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index ced495739..845bf06b6 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -6,6 +6,8 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		gpsd
 PKG_VERSION:=		2.39
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		ncurses
+PKG_CXX:=		GPSD
 PKG_MD5SUM:=		3db437196a6840c252fca99b6c19d4d0
 PKG_DESCR:=		An interface daemon for GPS receivers
 PKG_SECTION:=		net
@@ -16,12 +18,6 @@ PKG_DESCR_1:=		GPS client utilities
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y)
-PKG_DEPENDS+=		uclibc++
-else
-PKG_DEPENDS+=		libstdcxx
-endif
-
 $(eval $(call PKG_template,GPSD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 
diff --git a/package/grub-bin/Config.in b/package/grub-bin/Config.in
deleted file mode 100644
index 75ddaaf14..000000000
--- a/package/grub-bin/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_PACKAGE_GRUB_BIN
-	prompt "grub-bin............................. GRUB 2 bootloader (binary)"
-	tristate
-	depends on \
-		ADK_LINUX_X86_64_SHUTTLE || \
-		ADK_LINUX_X86_WRAP || \
-		ADK_LINUX_X86_ALIX1C || \
-		ADK_LINUX_X86_ALIX2D
-	select BUSYBOX_FEATURE_STAT_FORMAT
-	default y if ADK_LINUX_X86_64_SHUTTLE
-	default y if ADK_LINUX_X86_ALIX1C
-	default y if ADK_LINUX_X86_ALIX2D
-	default y if ADK_LINUX_X86_WRAP
-	help
-
diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile
index d440ce2cc..30a956818 100644
--- a/package/grub-bin/Makefile
+++ b/package/grub-bin/Makefile
@@ -13,10 +13,14 @@ PKG_DESCR:=		GRUB bootloader
 PKG_SECTION:=		sys
 PKG_SITES:=		http://openadk.org/distfiles/
 
+PKG_TARGET_DEPENDS:=	shuttle wrap alix1c alix2d
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GRUB_BIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+PKGDFLT_GRUB_BIN=	y
+
 INSTALL_STYLE:=		manual
 
 do-install:
diff --git a/package/grub/Config.in b/package/grub/Config.in
deleted file mode 100644
index 8045310ef..000000000
--- a/package/grub/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_GRUB
-	prompt "grub................................. GRUB"
-	tristate
-	default n
-	help
-	  http://www.grub.org
diff --git a/package/gsm/Config.in b/package/gsm/Config.in
deleted file mode 100644
index 9af1d7dda..000000000
--- a/package/gsm/Config.in
+++ /dev/null
@@ -1,30 +0,0 @@
-config ADK_COMPILE_GSM
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBGSM
-
-config ADK_PACKAGE_LIBGSM
-	prompt "libgsm............................ A GSM 06.10 full-rate speech transcoding implementation (library)"
-	tristate
-	default n
-	select ADK_COMPILE_GSM
-	help
-	  An implementation of the European GSM 06.10 provisional standard
-	  for full-rate speech transcoding, prI-ETS 300 036, which uses
-	  RPE/LTP (residual pulse excitation/long term prediction) coding
-	  at 13 kbit/s.
-
-	  ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/
-
-config ADK_PACKAGE_GSM_UTILS
-	prompt   "gsm-utils....................... A GSM 06.10 full-rate speech transcoding implementation (utilities)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBGSM
-	help
-	  An implementation of the European GSM 06.10 provisional standard
-	  for full-rate speech transcoding, prI-ETS 300 036, which uses
-	  RPE/LTP (residual pulse excitation/long term prediction) coding
-	  at 13 kbit/s.
-
-	  ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/
diff --git a/package/gtk+/Config.in b/package/gtk+/Config.in
deleted file mode 100644
index 360ac70db..000000000
--- a/package/gtk+/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_GTK
-	prompt "gtk+.............................. GTK+ library"
-	tristate
-	select ADK_PACKAGE_GLIB
-	default n
-	help
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index d4e3b19e9..45e00ca4a 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		gtk+
 PKG_VERSION:=		2.18.3
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		cairo atk pango libXext renderproto libXrender
 PKG_MD5SUM:=		8b34f75642ff6cc783dfa7e3af0ba443
 PKG_DESCR:=		GTK+ library
 PKG_SECTION:=		libs
diff --git a/package/haserl/Config.in b/package/haserl/Config.in
deleted file mode 100644
index bab5680c9..000000000
--- a/package/haserl/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_HASERL
-	prompt "haserl............................ A CGI wrapper to embed shell scripts in HTML documents"
-	tristate
-	default n
-	help
-	  A CGI wrapper to embed shell scripts in HTML documents.
-	  
-	  http://haserl.sourceforge.net/
-
diff --git a/package/hdparm/Config.in b/package/hdparm/Config.in
deleted file mode 100644
index 494c2b9a6..000000000
--- a/package/hdparm/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_HDPARM
-	prompt "hdparm............................ get/set ATA drive parameters"
-	tristate
-	default n
-	help
-
-	  tune hard disk parameters for high performance
-	  Get/set hard disk parameters for Linux IDE drives.
-	  Primary use is for enabling irq-unmasking and IDE multiplemode.
-
-	  The original website:
-	  http://sourceforge.net/projects/hdparm/
diff --git a/package/heimdal/Config.in b/package/heimdal/Config.in
deleted file mode 100644
index edb4ea30d..000000000
--- a/package/heimdal/Config.in
+++ /dev/null
@@ -1,64 +0,0 @@
-config ADK_COMPILE_HEIMDAL
-	prompt "heimdal........................... Heimdal kerberos software"
-	bool
-	default n
-
-config ADK_COMPILE_HEIMDAL_WITH_PKINIT
-	prompt "Enable PK-INIT"
-	bool
-	depends on ADK_COMPILE_HEIMDAL
-	default n
-
-config ADK_PACKAGE_HEIMDAL_SERVER
-	prompt "heimdal-server.................... heimdal kerberos server"
-	tristate
-	depends on ADK_COMPILE_HEIMDAL
-	select ADK_PACKAGE_LIBCOM_ERR
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_HEIMDAL_LIBS
-	select ADK_PACKAGE_HEIMDAL_CLIENT_LIBS
-	default n
-	help
-	  http://www.h5l.org
-
-choice
-prompt "Database backend"
-depends on ADK_PACKAGE_HEIMDAL_SERVER
-default ADK_COMPILE_HEIMDAL_WITH_DB_BDB
-
-config ADK_COMPILE_HEIMDAL_WITH_DB_BDB
-	bool "Berkeley DB backend"
-	select ADK_PACKAGE_LIBDB
-	help
-	  Use Oracle Berkeley DB as kerberos database backend.
-
-config ADK_COMPILE_HEIMDAL_WITH_DB_LDAP
-	bool "LDAP backend"
-	select ADK_PACKAGE_LIBOPENLDAP
-	help
-	  Use OpenLDAP as kerberos database backend.
-	  (Useful for SSO setup)
-
-endchoice
-
-config ADK_PACKAGE_HEIMDAL_LIBS
-	prompt "heimdal-libs...................... heimdal kerberos libraries"
-	tristate
-	depends on ADK_COMPILE_HEIMDAL
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_LIBOPENSSL
-	default n
-	help
-	  http://www.h5l.org
-
-config ADK_PACKAGE_HEIMDAL_CLIENT_LIBS
-	prompt "heimdal-client-libs............... heimdal kerberos client libraries"
-	tristate
-	depends on ADK_COMPILE_HEIMDAL
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_LIBOPENSSL
-	default n
-	help
-	  http://www.h5l.org
diff --git a/package/heimdal/Config.in.backend b/package/heimdal/Config.in.backend
new file mode 100644
index 000000000..f606c15c2
--- /dev/null
+++ b/package/heimdal/Config.in.backend
@@ -0,0 +1,23 @@
+choice
+prompt "Database backend"
+depends on ADK_PACKAGE_HEIMDAL_SERVER
+default ADK_COMPILE_HEIMDAL_WITH_DB_BDB
+
+config ADK_COMPILE_HEIMDAL_WITH_DB_BDB
+       bool "Berkeley DB backend"
+       select ADK_PACKAGE_LIBDB
+       help
+         Use Oracle Berkeley DB as kerberos database backend.
+
+config ADK_COMPILE_HEIMDAL_WITH_DB_LDAP
+       bool "LDAP backend"
+       select ADK_PACKAGE_LIBOPENLDAP
+       select ADK_PACKAGE_LIBNCURSES
+       select ADK_PACKAGE_LIBCOM_ERR
+       select ADK_COMPILE_HEIMDAL
+       help
+         Use OpenLDAP as kerberos database backend.
+         (Useful for SSO setup)
+
+endchoice
+
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 4af746246..10e3a5678 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -9,7 +9,14 @@ PKG_RELEASE:=		1
 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_BUILDDEP+=		openssl ncurses e2fsprogs
+ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_BDB},y)
+PKG_BUILDDEP+=		libdb
+endif
+ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y)
+PKG_BUILDDEP+=		openldap
+endif
 PKG_URL:=		http://www.h5l.org
 PKG_SITES:=		http://www.h5l.org/dist/src/
 
@@ -19,6 +26,9 @@ PKG_SECTION_1:=		libs
 PKG_DESCR_2:=		Kerberos 5 client libraries
 PKG_SECTION_2:=		libs
 
+PKG_FLAVOURS:=		PKINIT
+PKGFD_PKINIT:=		Enable PK-INIT
+
 include $(TOPDIR)/mk/package.mk
 
 ifeq ($(ADK_COMPILE_HEIMDAL_WITH_DB_BDB),y)
@@ -55,7 +65,7 @@ else
 CONFIGURE_ARGS+=        --without-openldap
 endif
 
-ifeq ($(ADK_COMPILE_HEIMDAL_WITH_PKINIT),y)
+ifeq ($(ADK_PACKAGE_HEIMDAL_PKINIT),y)
 CONFIGURE_OPTS+=	--enable-pk-init
 else
 CONFIGURE_OPTS+=	--disable-pk-init
diff --git a/package/heyu/Config.in b/package/heyu/Config.in
deleted file mode 100644
index 4b6a548dc..000000000
--- a/package/heyu/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_HEYU
-	prompt "heyu.............................. X10 home automation control using a CM11A"
-	tristate
-	default n
-	help
-	  X10 home automation control using the CM11A serial device.
-
-          See http://heyu.tanj.com/heyu2/ for details.
diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in
deleted file mode 100644
index bd0ec3865..000000000
--- a/package/hostapd/Config.in
+++ /dev/null
@@ -1,41 +0,0 @@
-config ADK_COMPILE_HOSTAPD
-	tristate
-	default n
-	depends on ADK_PACKAGE_HOSTAPD || ADK_PACKAGE_HOSTAPD_UTILS
-
-config ADK_PACKAGE_HOSTAPD
-	prompt "hostapd........................... An IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator"
-	tristate
-	default n
-	select ADK_COMPILE_HOSTAPD
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBNL
-	help
-
-	  hostapd is a user space daemon for access point and
-	  authentication servers. It implements IEEE 802.11 access point
-	  management, IEEE 802.1X/WPA/WPA2/EAP Authenticators, RADIUS
-	  client, EAP server, and RADIUS authentication server.
-
-	  http://hostap.epitest.fi/hostapd/
-
-	  Includes:
-	   - hostapd
-
-config ADK_PACKAGE_HOSTAPD_UTILS
-	prompt "hostapd-utils..................... An IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator (CLI utility)"
-	tristate
-	default n
-	select ADK_COMPILE_HOSTAPD
-	depends on ADK_PACKAGE_HOSTAPD
-	help
-
-	  hostapd is a user space daemon for access point and
-	  authentication servers. It implements IEEE 802.11 access point
-	  management, IEEE 802.1X/WPA/WPA2/EAP Authenticators, RADIUS
-	  client, EAP server, and RADIUS authentication server.
-
-	  http://hostap.epitest.fi/hostapd/
-
-	  Includes:
-	   - hostapd_cli
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index cf6b8c73c..29827f7c9 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -9,7 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		83630d11fa66ade9091f1b304fccd74c
 PKG_DESCR:=		an IEEE 802.11 AP, IEEE 802.1x/WPA/WPA2/EAP/RADIUS Authenticator
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libopenssl
+PKG_DEPENDS:=		libnl libopenssl
+PKG_BUILDDEP+=		libnl openssl
 PKG_URL:=		http://hostap.epitest.fi
 PKG_SITES:=		http://hostap.epitest.fi/releases/
 
@@ -20,7 +21,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,HOSTAPD,hostapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE=		auto
+BUILD_STYLE:=		auto
 
 do-configure:
 	${CP} ./files/hostapd.config ${WRKBUILD}/.config
diff --git a/package/htpdate/Config.in b/package/htpdate/Config.in
deleted file mode 100644
index b3801ed03..000000000
--- a/package/htpdate/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_HTPDATE
-	prompt "htpdate........................... HTP (Hypertext Time Protocol) implementation"
-	tristate
-	default n
-	help
-	  An HTP (Hypertext Time Protocol) implementation
-
-	  http://www.clevervest.com/htp/
diff --git a/package/httping/Config.in b/package/httping/Config.in
deleted file mode 100644
index f7166e253..000000000
--- a/package/httping/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_HTTPING
-	prompt "httping........................... Httping is like 'ping' but for http-requests."
-	tristate
-	default n
-	help
-		Httping is like 'ping' but for http-requests.
-		Give it an url, and it'll show you how long it takes to connect, send a
-		request and retrieve the reply (only the headers). Be aware that the
-		transmission across the network also takes time!
-
-		http://www.vanheusden.com/httping/
diff --git a/package/httping/Makefile b/package/httping/Makefile
index e494d9bd2..7d4e0b754 100644
--- a/package/httping/Makefile
+++ b/package/httping/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		httping
 PKG_VERSION:=		1.3.0
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		41c912a9ecc904e51d7260053fc2195c
 PKG_DESCR:=		Httping is like 'ping' but for http-requests
 PKG_SECTION:=		net
diff --git a/package/httptunnel/Config.in b/package/httptunnel/Config.in
deleted file mode 100644
index cb5b0b83a..000000000
--- a/package/httptunnel/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_HTTPTUNNEL
-	prompt "httptunnel........................ http tunneling software"
-	tristate
-	default n
-	help
-	  httptunnel creates a bidirectional virtual data connection tunnelled 
-	  in HTTP requests.
-	  
-	  http://www.nocrew.org/software/httptunnel.html
diff --git a/package/icecast/Config.in b/package/icecast/Config.in
deleted file mode 100644
index ea007003e..000000000
--- a/package/icecast/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config ADK_PACKAGE_ICECAST
-	prompt "icecast........................... A streaming media server for Ogg/Vorbis and MP3 audio streams"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBCURL
-	select ADK_PACKAGE_LIBVORBIS
-	select ADK_PACKAGE_LIBXML2
-	select ADK_PACKAGE_LIBXSLT
-	help
-	  Icecast is a streaming media server which currently supports Ogg
-	  Vorbis and MP3 audio streams. It can be used to create an Internet
-	  radio station or a privately running jukebox and many things in
-	  between. It is very versatile in that new formats can be added
-	  relatively easily and supports open standards for commuincation and
-	  interaction.
-
-	  http://www.icecast.org/
diff --git a/package/icecast/Makefile b/package/icecast/Makefile
index 55ac16f1e..fe9d193ca 100644
--- a/package/icecast/Makefile
+++ b/package/icecast/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		icecast
 PKG_VERSION:=		2.3.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		curl libvorbis libxml2 libxslt
 PKG_MD5SUM:=		ff516b3ccd2bcc31e68f460cd316093f
 PKG_DESCR:=		A streaming media server
 PKG_SECTION:=		net
diff --git a/package/id3lib/Config.in b/package/id3lib/Config.in
deleted file mode 100644
index dde87347c..000000000
--- a/package/id3lib/Config.in
+++ /dev/null
@@ -1,27 +0,0 @@
-config ADK_PACKAGE_ID3LIB
-	prompt "id3lib............................ An ID3v1/ID3v2 tagging library"
-	tristate
-	default n
-	select ADK_PACKAGE_ZLIB
-	select ADK_PACKAGE_LIBICONV
-	help
-	  An ID3v1/ID3v2 tagging library.
-	  http://www.id3lib.org/
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_ID3LIB
-default ADK_COMPILE_ID3LIB_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_ID3LIB_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_ID3LIB_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_ID3LIB_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	help
-
-endchoice
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index f7c7976a4..5df274613 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -6,6 +6,8 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		id3lib
 PKG_VERSION:=		3.8.3
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		zlib libiconv
+PKG_CXX:=		ID3LIB
 PKG_MD5SUM:=		19f27ddd2dda4b2d26a559a4f0f402a7
 PKG_DESCR:=		An ID3v1/ID3v2 tagging library
 PKG_SECTION:=		libs
@@ -13,12 +15,6 @@ PKG_DEPENDS:=		zlib libiconv
 PKG_URL:=		http://id3lib.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=id3lib/}
 
-ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y)
-PKG_DEPENDS+=		uclibc++
-else
-PKG_DEPENDS+=		libstdcxx
-endif
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/iftop/Config.in b/package/iftop/Config.in
deleted file mode 100644
index 226032d4c..000000000
--- a/package/iftop/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_PACKAGE_IFTOP
-	prompt "iftop............................. display bandwith usage on an interface"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPCAP
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  iftop does for network usage what top(1) does for CPU usage. It
-	  listens to network traffic on a named interface and displays a
-	  table of current bandwidth usage by pairs of hosts. Handy for
-	  answering the question "why is our ADSL link so slow?".
-
-	  http://www.ex-parrot.com/~pdw/iftop/
diff --git a/package/iftop/Makefile b/package/iftop/Makefile
index 0a83c3b8e..a5bd4e555 100644
--- a/package/iftop/Makefile
+++ b/package/iftop/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		iftop
 PKG_VERSION:=		0.17
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libpcap libpthread ncurses
 PKG_MD5SUM:=		062bc8fb3856580319857326e0b8752d
 PKG_DESCR:=		display bandwith usage on an interface
 PKG_SECTION:=		net
diff --git a/package/igmpproxy/Config.in b/package/igmpproxy/Config.in
deleted file mode 100644
index 59f8ae187..000000000
--- a/package/igmpproxy/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_IGMPPROXY
-	prompt "igmpproxy......................... Multicast Routing Daemon"
-	tristate
-	default n
-	help
-	  IGMPproxy is a simple dynamic Multicast Routing Daemon using 
-	  only IGMP signalling (Internet Group Management Protocol).
-
-	  http://sourceforge.net/projects/igmpproxy
diff --git a/package/inputproto/Config.in b/package/inputproto/Config.in
deleted file mode 100644
index da7749134..000000000
--- a/package/inputproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_INPUTPROTO
-	prompt "inputproto............................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/ipcad/Config.in b/package/ipcad/Config.in
deleted file mode 100644
index e9c3f3278..000000000
--- a/package/ipcad/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_IPCAD
-	prompt "ipcad............................. listens for traffic on the specified interfaces"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPCAP
-	help
-	  This daemon listens for traffic on the specified interfaces.
-	  It has the built-in RSH and NetFlow engines to allow exporting
-	  the accounting data the same way as Cisco routers do.
-	  
-	  http://lionet.info/ipcad/
-
diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile
index 2c96da8b7..d238b86ab 100644
--- a/package/ipcad/Makefile
+++ b/package/ipcad/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ipcad
 PKG_VERSION:=		3.7.3
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libpcap
 PKG_MD5SUM:=		125605249958894148ec26d3c88189f5
 PKG_DESCR:=		IP Cisco Accounting Daemon
 PKG_SECTION:=		net
diff --git a/package/iperf/Config.in b/package/iperf/Config.in
deleted file mode 100644
index 3f5c8d323..000000000
--- a/package/iperf/Config.in
+++ /dev/null
@@ -1,28 +0,0 @@
-config ADK_PACKAGE_IPERF
-	prompt "iperf............................. Internet Protocol bandwidth measuring tool"
-	tristate
-	select ADK_PACKAGE_LIBPTHREAD
-	default n
-	help
-	  Iperf is a modern alternative for measuring TCP and UDP bandwidth 
-	  performance, allowing the tuning of various parameters and 
-	  characteristics.
-	  http://dast.nlanr.net/Projects/Iperf/
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_IPERF
-default ADK_COMPILE_IPERF_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_IPERF_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_IPERF_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_IPERF_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	help
-
-endchoice
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index dfc9b4732..23231a8d6 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		iperf
 PKG_VERSION:=		2.0.4
 PKG_RELEASE:=		1
+PKG_CXX:=		IPERF
 PKG_MD5SUM:=		8c5bc14cc2ea55f18f22afe3c23e3dcb
 PKG_DESCR:=		Internet Protocol bandwidth measuring tool
 PKG_SECTION:=		net
@@ -15,12 +16,6 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=iperf/}
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq ($(ADK_COMPILE_IPERF_WITH_UCLIBCXX),y)
-PKG_DEPENDS+=		uclibc++
-else
-PKG_DEPENDS+=		libstdcxx
-endif
-
 $(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
diff --git a/package/iproute2/Config.in b/package/iproute2/Config.in
deleted file mode 100644
index 19c08e371..000000000
--- a/package/iproute2/Config.in
+++ /dev/null
@@ -1,79 +0,0 @@
-config ADK_COMPILE_IPROUTE2
-	prompt   "iproute2.......................... iproute2 suite of networking utilities"
-	tristate
-	default n
-
-config ADK_PACKAGE_IP
-	prompt   "ip................................ ip utility"
-	tristate
-	default ADK_COMPILE_IPROUTE2
-	depends on ADK_COMPILE_IPROUTE2
-	help
-	  IP routing control utility, well-known replacement for ifconfig and route.
-
-config ADK_PACKAGE_TC
-	prompt   "tc................................ tc utility"
-	tristate
-	default m
-	depends on ADK_COMPILE_IPROUTE2
-	help
-	 Traffic shaping control utility. Please choose the kmod-sched-* modules
-	 you need.
-
-config ADK_PACKAGE_TC_ATM
-	prompt   "atm support....................... atm support for tc"
-	tristate
-	default n
-	depends on ADK_PACKAGE_TC && !ADK_HOST_FREEBSD
-	select ADK_PACKAGE_LIBATM
-	help
-	  ATM traffic control support library.
-
-# FIXME: WTF is this "genl" used for??
-# "ifcfg" is lame, just a simple 'ip addr {add|del}' frontend
-
-config ADK_PACKAGE_IFSTAT
-	prompt   "ifstat............................ ifstat utility"
-	tristate
-	default m
-	depends on ADK_COMPILE_IPROUTE2
-	help
-	  Interface statistics utility.
-
-config ADK_PACKAGE_LNSTAT
-	prompt   "lnstat............................ lnstat, ctstat, rtstat, nstat and rtacct utilities"
-	tristate
-	default m
-	depends on ADK_COMPILE_IPROUTE2
-	help
-	  Unified linux networking statistics. Lnstat is a replacement for the
-	  old rstat program, nstat and rtacct are simple tools to monitor
-	  kernel snmp counters and network interface statistics.
-
-
-config ADK_PACKAGE_ROUTEL
-	prompt   "routel............................ routel/routef utilities"
-	tristate
-	default m
-	depends on ADK_COMPILE_IPROUTE2
-	help
-	  List and flush routes.
-
-config ADK_PACKAGE_RTMON
-	prompt   "rtmon............................. RTnetlink monitor"
-	tristate
-	default m
-	depends on ADK_COMPILE_IPROUTE2
-	help
-	  Listen to and monitor RTnetlink.
-
-# "rtpr" converts back the output of 'ip -o' (quite useless I guess)
-
-config ADK_PACKAGE_SS
-	prompt   "ss................................ socket statistics utility"
-	tristate
-	default m
-	depends on ADK_COMPILE_IPROUTE2
-	help
-	  A utility to investigate sockets, similar to netstat.
-
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index feae51b1c..a70b675b5 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -9,13 +9,16 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		c1bc258a6c345905e79935ac7a3cc582
 PKG_DESCR:=		iproute2 routing control utility
 PKG_SECTION:=		net
+ifneq ($(strip ${ADK_PACKAGE_TC_ATM}),)
+PKG_BUILDDEP+=		linux-atm
+endif
 PKG_URL:=		http://www.linuxfoundation.org/en/Net:Iproute2
 PKG_SITES:=		http://developer.osdl.org/dev/iproute2/download/
 
 PKG_DESCR_TC:=		iproute2 traffic control utility
 PKG_DEPENDS_TC:=	kmod-sched
 PKG_DESCR_TC_ATM:=	iproute2 traffic control ATM support library
-PKG_DEPENDS_TC_ATM:=	tc
+PKG_DEPENDS_TC_ATM:=	tc libatm
 PKG_DESCR_IFSTAT:=	iproute2 interface statistics utility
 PKG_DESCR_LNSTAT:=	iproute2 network statistics utilities
 PKG_DESCR_ROUTEL:=	iproute2 route list and flush utilities
diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
deleted file mode 100644
index 7edadda2a..000000000
--- a/package/ipsec-tools/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_IPSEC_TOOLS
-	prompt "ipsec-tools....................... IPsec management tools"
-	tristate
-	select ADK_PACKAGE_LIBOPENSSL
-	default n
-	help
-	  IPsec management tools
-	  
-	  http://ipsec-tools.sourceforge.net/
-
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index f33dfca0e..f17d09f22 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ipsec-tools
 PKG_VERSION:=		0.7.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		72861f005746ee27984b2ee715ecc629
 PKG_DESCR:=		IPsec management tools
 PKG_SECTION:=		net
diff --git a/package/ipset/Config.in b/package/ipset/Config.in
deleted file mode 100644
index d6e41c5a0..000000000
--- a/package/ipset/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_IPSET
-	prompt "ipset............................. Netfilter ip sets administration utility"
-	tristate
-	default n
-	help
-	  Netfilter ip sets administration utility
-	  
-	  http://ipset.netfilter.org/
-
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 97a2b70dd..497445405 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -17,7 +17,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${ADK_TARGET}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_FLAGS+=		PREFIX=/usr
 BUILD_STYLE:=		auto
diff --git a/package/iptables-snmp/Config.in b/package/iptables-snmp/Config.in
deleted file mode 100644
index 799c1506e..000000000
--- a/package/iptables-snmp/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_IPTABLES_SNMP
-	prompt "export iptables information via snmp"
-	tristate
-	select ADK_PACKAGE_IPTABLES
-	depends on ADK_PACKAGE_SNMPD
-	help
-	  This is a library for the netkit snmp daemon, allowing it to export
-	  various iptables information.
-
-	  To use this, add the following line to snmpd.conf:
-	  dlmod iptables /root/iptables-snmp-0.1/iptables-snmp.so
diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile
index a05a07d4d..4b3bff57f 100644
--- a/package/iptables-snmp/Makefile
+++ b/package/iptables-snmp/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		iptables-snmp
 PKG_VERSION:=		0.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		net-snmp
 PKG_MD5SUM:=		8370d2f0c899461a053da491400119d1
 PKG_DESCR:=		iptables support for net-snmp
 PKG_SECTION:=		net
diff --git a/package/iptables/Config.in b/package/iptables/Config.in
deleted file mode 100644
index 56dd79cc9..000000000
--- a/package/iptables/Config.in
+++ /dev/null
@@ -1,32 +0,0 @@
-config ADK_COMPILE_IPTABLES
-	bool
-	default n
-	depends on ADK_PACKAGE_IPTABLES || ADK_PACKAGE_IP6TABLES
-
-config ADK_PACKAGE_IPTABLES
-	prompt "iptables.......................... IPv4 firewall administration tool"
-	tristate
-	default n
-	select ADK_COMPILE_IPTABLES
-	select ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
-	select ADK_KPACKAGE_KMOD_NF_CONNTRACK
-	select ADK_KPACKAGE_KMOD_IP_NF_FILTER
-	select ADK_KPACKAGE_KMOD_IP_NF_TARGET_REJECT
-	select ADK_KPACKAGE_KMOD_NF_NAT
-	select ADK_KPACKAGE_KMOD_IP_NF_TARGET_MASQUERADE
-	select ADK_KPACKAGE_KMOD_NF_CONNTRACK_IPV4
-	help
-	  IPv4 firewall, NAT, and packet mangling tools.
-	  Automatically selects needed kernel modules for NAT and filtering.
-
-	  http://www.iptables.org/
-
-config ADK_PACKAGE_IP6TABLES
-	prompt "ip6tables......................... IPv6 firewall administration tool"
-	tristate
-	default n
-	select ADK_COMPILE_IPTABLES
-	help
-	  IPv6 firewall, NAT, and packet mangling tools.
-
-	  http://www.iptables.org/
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 6be328253..ae82b7fcf 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		c67cf30e281a924def6426be0973df56
 PKG_DESCR:=		The netfilter firewalling software
 PKG_SECTION:=		net
+PKG_DEPENDS:=		kmod-nf-ip-iptables kmod-nf-conntrack kmod-nf-conntrack-ipv4 kmod-nf-nat kmod-nf-ip-target-masquerade kmod-nf-ip-target-reject kmod-nf-ip-filter
 PKG_URL:=		http://www.netfilter.org
 PKG_SITES:=		http://www.netfilter.org/projects/iptables/files/ \
 			ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
diff --git a/package/iptraf/Config.in b/package/iptraf/Config.in
deleted file mode 100644
index 8964fa68b..000000000
--- a/package/iptraf/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_IPTRAF
-	prompt "iptraf............................ A console-based network monitoring program"
-	tristate
-	select ADK_PACKAGE_LIBNCURSES
-	default n
-	help
-	  IPTraf is a console-based network statistics utility for Linux. It gathers 
-	  a variety of figures such as TCP connection packet and byte counts, 
-	  interface statistics and activity indicators, TCP/UDP traffic breakdowns, 
-	  and LAN station packet and byte counts.
-	  
-	  http://iptraf.seul.org/
-
diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile
index d8d01ef8b..ccd333219 100644
--- a/package/iptraf/Makefile
+++ b/package/iptraf/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		iptraf
 PKG_VERSION:=		3.0.0
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		377371c28ee3c21a76f7024920649ea8
 PKG_DESCR:=		A console-based network monitoring program.
 PKG_SECTION:=		net
diff --git a/package/irssi/Config.in b/package/irssi/Config.in
deleted file mode 100644
index 79047c471..000000000
--- a/package/irssi/Config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-config ADK_PACKAGE_IRSSI
-	prompt "irssi............................. console irc client"
-	tristate
-	default n
-	select ADK_PACKAGE_GLIB
-	select ADK_PACKAGE_LIBNCURSES
-	help
-	  IRC client for the text console
-	
-	  http://irssi.org
-
-config ADK_PACKAGE_IRSSI_SSL
-	bool "Enable SSL/TLS support"
-	depends on ADK_PACKAGE_IRSSI
-	select ADK_PACKAGE_LIBOPENSSL
-	default n
-	help
-	  Enable this to be able to chat more securely.
diff --git a/package/irssi/Makefile b/package/irssi/Makefile
index 35f196048..1b502cff0 100644
--- a/package/irssi/Makefile
+++ b/package/irssi/Makefile
@@ -10,16 +10,20 @@ PKG_MD5SUM:=		0d6fc2203832b514eff014fffd574664
 PKG_DESCR:=		IRC text client
 PKG_SECTION:=		text
 PKG_DEPENDS:=		glib libncurses
+PKG_BUILDDEP+=		glib ncurses
+ifeq (${ADK_PACKAGE_IRSSI_SSL},y)
+PKG_DEPENDS+=		libopenssl
+PKG_BUILDDEP+=		openssl
+endif
 PKG_URL:=		http://www.irssi.org
 PKG_SITES:=		http://www.irssi.org/files/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-include ${TOPDIR}/mk/package.mk
+PKG_FLAVOURS:=		SSL
+PKGFD_SSL:=		SSL/TLS support
 
-ifeq (${ADK_PACKAGE_IRSSI_SSL},y)
-PKG_DEPENDS+=		libopenssl
-endif
+include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IRSSI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -41,6 +45,7 @@ endif
 
 do-install:
 	${INSTALL_DIR} ${IDIR_IRSSI}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/src/fe-text/${PKG_NAME} ${IDIR_IRSSI}/usr/bin/
+	${INSTALL_BIN} ${WRKBUILD}/src/fe-text/${PKG_NAME} \
+		${IDIR_IRSSI}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/iw/Config.in b/package/iw/Config.in
deleted file mode 100644
index 16b88454d..000000000
--- a/package/iw/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_IW
-	prompt "iw................................ Tools for manipulating Linux Wireless cards"
-	tristate
-	select ADK_PACKAGE_LIBNL
-	default n
-	help
-	  Tools for configuring Wireless Adapters.
diff --git a/package/iw/Makefile b/package/iw/Makefile
index 606fbadf6..786dda0fb 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		iw
 PKG_VERSION:=		0.9.17
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libnl
 PKG_MD5SUM:=		427841093ac11c5cbc025a3e13aac139
 PKG_DESCR:=		Tools for setting up WiFi cards via netlink (nl80211)
 PKG_SECTION:=		net
diff --git a/package/jamvm/Config.in b/package/jamvm/Config.in
deleted file mode 100644
index 0a4c39451..000000000
--- a/package/jamvm/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config ADK_PACKAGE_JAMVM
-        prompt "jamvm............................. A compact Java Virtual Machine"
-	tristate
-        default n
-	select ADK_PACKAGE_ZLIB
-	select ADK_PACKAGE_LIBFFI
-        help
-	  JamVM is a new Java Virtual Machine which conforms to the JVM
-	  specification version (blue book). In comparison to most other VM's
-	  (free and commercial) it is extremely small.However, unlike other
-	  small VMs (e.g. KVM) it is designed to support the full
-	  specification, and includes support for object finalisation,
-	  Soft/Weak/Phantom References, the Java Native Interface (JNI) and the
-	  Reflection API.
-
-	  http://sourceforge.net/projects/jamvm
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 6b4c7782e..3668e5562 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		jamvm
 PKG_VERSION:=		1.5.3
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libffi zlib
 PKG_MD5SUM:=		ce886163658d748113b0570dfae12aea
 PKG_DESCR:=		A Java Virtual Machine (JVM) implementation
 PKG_SECTION:=		misc
diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in
deleted file mode 100644
index 4fe390d21..000000000
--- a/package/jpeg/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_COMPILE_JPEG
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBJPEG
-
-config ADK_PACKAGE_LIBJPEG
-	prompt "libjpeg........................... The Independent JPEG Group's JPEG runtime library"
-	tristate
-	default n
-	select ADK_COMPILE_JPEG
-	help
-	  The Independent JPEG Group's JPEG runtime library.
-	  
-	  http://www.ijg.org/
-
diff --git a/package/kbproto/Config.in b/package/kbproto/Config.in
deleted file mode 100644
index ead095b54..000000000
--- a/package/kbproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_KBPROTO
-	prompt "kbproto................................ X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/kismet/Config.in b/package/kismet/Config.in
deleted file mode 100644
index 1c29a85d7..000000000
--- a/package/kismet/Config.in
+++ /dev/null
@@ -1,64 +0,0 @@
-config ADK_COMPILE_KISMET
-	tristate
-	default n
-	depends on ADK_PACKAGE_KISMET_CLIENT || ADK_PACKAGE_KISMET_DRONE || ADK_PACKAGE_KISMET_SERVER
-
-config ADK_PACKAGE_KISMET_CLIENT
-	prompt "kismet-client..................... The Kismet client"
-	tristate
-	default n
-	select ADK_COMPILE_KISMET
-	select ADK_PACKAGE_LIBNCURSES
-	help
-	  
-	  An 802.11 layer2 wireless network detector, sniffer, and intrusion detection system.
-	  
-	  http://www.kismetwireless.net/
-	  
-	  This package contains the kismet text interface client.
-	  
-config ADK_PACKAGE_KISMET_DRONE
-	prompt "kismet-drone...................... The Kismet drone"
-	tristate
-	default n
-	select ADK_COMPILE_KISMET
-	select ADK_PACKAGE_LIBPCAP
-	help
-	  
-	  An 802.11 layer2 wireless network detector, sniffer, and intrusion detection system.
-	  
-	  http://www.kismetwireless.net/
-	  
-	  This package contains the kismet remote sniffing.and monitoring drone.
-	  
-config ADK_PACKAGE_KISMET_SERVER
-	prompt "kismet-server..................... The Kismet server"
-	tristate
-	default n
-	select ADK_COMPILE_KISMET
-	select ADK_PACKAGE_LIBPCAP
-	help
-	  
-	  An 802.11 layer2 wireless network detector, sniffer, and intrusion detection system.
-	  
-	  http://www.kismetwireless.net/
-	  
-	  This package contains the kismet server.
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_KISMET_CLIENT || ADK_PACKAGE_KISMET_DRONE || ADK_PACKAGE_KISMET_SERVER
-default ADK_COMPILE_KISMET_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_KISMET_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_KISMET_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_KISMET_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	help
-
-endchoice
diff --git a/package/kismet/Makefile b/package/kismet/Makefile
index 1cff83cd8..e6ecf710c 100644
--- a/package/kismet/Makefile
+++ b/package/kismet/Makefile
@@ -6,6 +6,8 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		kismet
 PKG_VERSION:=		2008-05-R1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libpcap ncurses
+PKG_CXX:=		KISMET
 PKG_MD5SUM:=		6ee365d36354b4dee4945e67f8149294
 PKG_SITES:=		http://www.kismetwireless.net/code/
 
diff --git a/package/knock/Config.in b/package/knock/Config.in
deleted file mode 100644
index 291ea3b0d..000000000
--- a/package/knock/Config.in
+++ /dev/null
@@ -1,41 +0,0 @@
-config ADK_COMPILE_KNOCK
-	tristate
-	default n
-	depends on ADK_PACKAGE_KNOCK || ADK_PACKAGE_KNOCKD
-
-config ADK_PACKAGE_KNOCK
-	prompt "knock............................. A port-knocking client"
-	tristate
-	default n 
-	select ADK_COMPILE_KNOCK
-	help
-	  It listens to all traffic on an ethernet (or PPP) interface, 
-	  looking for special "knock" sequences of port-hits. A client 
-	  makes these port-hits by sending a TCP (or UDP) packet to a 
-	  port on the server. This port need not be open -- since 
-	  knockd listens at the link-layer level, it sees all traffic 
-	  even if it's destined for a closed port. When the server 
-	  detects a specific sequence of port-hits, it runs a command 
-	  defined in its configuration file. This can be used to open 
-	  up holes in a firewall for quick access.
-	  
-	  http://www.zeroflux.org/cgi-bin/cvstrac/knock/wiki
-
-config ADK_PACKAGE_KNOCKD
-	prompt "knockd............................ A port-knocking server"
-	tristate
-	default n 
-	select ADK_COMPILE_KNOCK
-	help
-	  It listens to all traffic on an ethernet (or PPP) interface, 
-	  looking for special "knock" sequences of port-hits. A client 
-	  makes these port-hits by sending a TCP (or UDP) packet to a 
-	  port on the server. This port need not be open -- since 
-	  knockd listens at the link-layer level, it sees all traffic 
-	  even if it's destined for a closed port. When the server 
-	  detects a specific sequence of port-hits, it runs a command 
-	  defined in its configuration file. This can be used to open 
-	  up holes in a firewall for quick access.
-	  
-	  http://www.zeroflux.org/cgi-bin/cvstrac/knock/wiki
-
diff --git a/package/knock/Makefile b/package/knock/Makefile
index c99b9a7b5..60c0af0bb 100644
--- a/package/knock/Makefile
+++ b/package/knock/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		knock
 PKG_VERSION:=		0.5
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libpcap
 PKG_MD5SUM:=		ca09d61458974cff90a700aba6120891
 PKG_DESCR:=		A port-knocking client
 PKG_SECTION:=		net
diff --git a/package/krb5/Config.in b/package/krb5/Config.in
deleted file mode 100644
index d44a2f4cc..000000000
--- a/package/krb5/Config.in
+++ /dev/null
@@ -1,47 +0,0 @@
-config ADK_COMPILE_KRB5
-	prompt "kerberos5......................... MIT kerberos software"
-	bool
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBSS
-	select ADK_PACKAGE_LIBCOM_ERR
-	default n
-
-config ADK_PACKAGE_KRB5_SERVER
-	prompt "krb5-server....................... MIT kerberos server"
-	tristate
-	depends on ADK_COMPILE_KRB5
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_KRB5_LIBS
-	default n
-	help
-	  http://web.mit.edu/kerberos
-
-#choice
-##prompt "Database backend"
-#depends on ADK_PACKAGE_HEIMDAL_SERVER
-#default ADK_COMPILE_HEIMDAL_WITH_DB_BDB
-#
-#config ADK_COMPILE_HEIMDAL_WITH_DB_BDB
-#	bool "Berkeley DB backend"
-#	select ADK_PACKAGE_LIBDB
-#	help
-#	  Use Oracle Berkeley DB as kerberos database backend.
-#
-#config ADK_COMPILE_HEIMDAL_WITH_DB_LDAP
-#	bool "LDAP backend"
-#	select ADK_PACKAGE_LIBOPENLDAP
-#	help
-#	  Use OpenLDAP as kerberos database backend.
-#	  (Useful for SSO setup)
-#
-#endchoice
-
-config ADK_PACKAGE_KRB5_LIBS
-	prompt "krb5-libs......................... MIT kerberos libraries"
-	tristate
-	depends on ADK_COMPILE_KRB5
-	select ADK_PACKAGE_LIBPTHREAD
-	default n
-	help
-	  http://web.mit.edu/kerberos
-
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index f1261ba64..9de7e2127 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -6,10 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		krb5
 PKG_VERSION:=		1.7
 PKG_RELEASE:=		2
+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/l2tpns/Config.in b/package/l2tpns/Config.in
deleted file mode 100644
index b1e1bad72..000000000
--- a/package/l2tpns/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_L2TPNS
-	prompt "l2tpns............................ An L2TP enhanced server"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBCLI
-	help
-		l2tpns is a layer 2 tunneling protocol network server (LNS).
-		It supports up to 65535 concurrent sessions per server/cluster 
-		plus ISP features such as rate limiting, walled garden, usage 
-		accounting, and more.
-
-		http://sourceforge.net/projects/l2tpns
diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile
index b3512d9f0..5a5b95a22 100644
--- a/package/l2tpns/Makefile
+++ b/package/l2tpns/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		385c58055723ebc6c38062acd2db9c2c
 PKG_DESCR:=		A layer 2 tunneling protocol network server (LNS)
 PKG_SECTION:=		net
+PKG_DEPENDS:=		libcli
+PKG_BUILDDEP+=		libcli
 PKG_URL:=		http://l2tpns.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=l2tpns/}
 
@@ -16,8 +18,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,L2TPNS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_FLAGS=		auto
-INSTALL_STYLE=		auto
+BUILD_FLAGS:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_L2TPNS}/etc/l2tpns
diff --git a/package/lame/Config.in b/package/lame/Config.in
deleted file mode 100644
index 40d9e5b9e..000000000
--- a/package/lame/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_COMPILE_LAME
-	boolean
-	default n
-	help
-
-config ADK_PACKAGE_LAME
-	prompt "lame.............................. MP3 encoder"
-	tristate
-	default n
-	select ADK_COMPILE_LAME
-	help
-	  http://lame.sourceforge.net
diff --git a/package/lame/Config.in.lib b/package/lame/Config.in.lib
deleted file mode 100644
index 5e0cee53d..000000000
--- a/package/lame/Config.in.lib
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_LIBLAME
-	prompt "liblame........................... MP3 encoding library"
-	tristate
-	default n
-        select ADK_COMPILE_LAME
-	help
-	  http://lame.sourceforge.net
diff --git a/package/less/Config.in b/package/less/Config.in
deleted file mode 100644
index 4d3d44edb..000000000
--- a/package/less/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_LESS
-	prompt "less.............................. A text file viewer."
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNCURSES
-	help
-	  less - less is a pager. A pager usually displays text files.
-	  
-	  http://www.greenwoodsoftware.com/less/
-
diff --git a/package/less/Makefile b/package/less/Makefile
index 38e963bd3..ff82edefc 100644
--- a/package/less/Makefile
+++ b/package/less/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		less
 PKG_VERSION:=		429
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		206f2f13b9b0a35e45df660fcb6af31d
 PKG_DESCR:=		A text mode pager
 PKG_SECTION:=		text
diff --git a/package/libICE/Config.in b/package/libICE/Config.in
deleted file mode 100644
index e2ce3dc41..000000000
--- a/package/libICE/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBICE
-	prompt "libICE............................... Inter-Client Exchange library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index 75931d4f2..d779ab1db 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libICE
 PKG_VERSION:=		1.0.6
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		xtrans
 PKG_MD5SUM:=		4a8f09f15fc92196b91d61e2dc9afcea
 PKG_DESCR:=		Inter-Client Exchange library
 PKG_SECTION:=		x11
diff --git a/package/libSM/Config.in b/package/libSM/Config.in
deleted file mode 100644
index 638ab0d74..000000000
--- a/package/libSM/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_LIBSM
-	prompt "libSM................................ X11 Session Management library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBUUID
-	help
-         http://www.x.org
diff --git a/package/libSM/Makefile b/package/libSM/Makefile
index e7114af7b..d00f16fb0 100644
--- a/package/libSM/Makefile
+++ b/package/libSM/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libSM
 PKG_VERSION:=		1.1.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libICE
 PKG_MD5SUM:=		1ee90d479298e48df7bb86a7ccbe00c9
 PKG_DESCR:=		X11 Session Management library
 PKG_SECTION:=		x11
diff --git a/package/libX11/Config.in b/package/libX11/Config.in
deleted file mode 100644
index d14680a8e..000000000
--- a/package/libX11/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_LIBX11
-	prompt "libX11............................... X11 client-side library"
-	tristate
-	select ADK_PACKAGE_LIBXDMCP
-	default n
-	help
-         http://www.x.org
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 6a820cf15..3e76da9eb 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libX11
 PKG_VERSION:=		1.3.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		xproto xextproto xtrans libXdmcp libXau xcmiscproto bigreqsproto kbproto inputproto
 PKG_MD5SUM:=		b68aebbfcac1174c4c95d260e9369766
 PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11
diff --git a/package/libXau/Config.in b/package/libXau/Config.in
deleted file mode 100644
index 8d40e7992..000000000
--- a/package/libXau/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBXAU
-	prompt "libXau............................... X11 authorisation library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/libXaw/Config.in b/package/libXaw/Config.in
deleted file mode 100644
index 172b70b14..000000000
--- a/package/libXaw/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBXAW
-	prompt "libXaw............................... X11 Athena Widget library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile
index 15beb5fdb..fd707feb1 100644
--- a/package/libXaw/Makefile
+++ b/package/libXaw/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libXaw
 PKG_VERSION:=		1.0.7
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libXext libXmu libXpm
 PKG_MD5SUM:=		67662e6b2dceb2907159215c83364c5a
 PKG_DESCR:=		X11 Athena Widget library
 PKG_SECTION:=		x11
diff --git a/package/libXdmcp/Config.in b/package/libXdmcp/Config.in
deleted file mode 100644
index acfbce8b9..000000000
--- a/package/libXdmcp/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBXDMCP
-	prompt "libXdmcp............................. X11 display manager control protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/libXext/Config.in b/package/libXext/Config.in
deleted file mode 100644
index f687e82f5..000000000
--- a/package/libXext/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBXEXT
-	prompt "libXext.............................. X client interface to extensions of the X protocol"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index 7eb32914e..259a66019 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libXext
 PKG_VERSION:=		1.1.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libX11
 PKG_MD5SUM:=		6b61b3f657befded8ae66e04085c413e
 PKG_DESCR:=		X client interface to extensions of the X protocol
 PKG_SECTION:=		x11
diff --git a/package/libXfont/Config.in b/package/libXfont/Config.in
deleted file mode 100644
index 06738e361..000000000
--- a/package/libXfont/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_LIBXFONT
-	prompt "libxfont............................. X font library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBFREETYPE
-	help
-         http://www.x.org
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index 9b8243bdf..3724575b5 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -10,6 +10,7 @@ PKG_MD5SUM:=		bf134b9f79a7fc6507577bf5b6d4f412
 PKG_DESCR:=		X font Library
 PKG_SECTION:=		x11
 PKG_DEPENDS:=		libfreetype
+PKG_BUILDDEP+=		freetype fontcacheproto fontsproto libfontenc
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/libXmu/Config.in b/package/libXmu/Config.in
deleted file mode 100644
index 90a958133..000000000
--- a/package/libXmu/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBXMU
-	prompt "libXmu............................... miscellaneous utility functions for X libraries"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile
index 21d42aa38..ae021e974 100644
--- a/package/libXmu/Makefile
+++ b/package/libXmu/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libXmu
 PKG_VERSION:=		1.0.5
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libXt
 PKG_MD5SUM:=		f49e3587cdc299707da0786a681f9c05
 PKG_DESCR:=		miscellaneous utility functions for X libraries
 PKG_SECTION:=		x11
diff --git a/package/libXpm/Config.in b/package/libXpm/Config.in
deleted file mode 100644
index 7e5736d97..000000000
--- a/package/libXpm/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBXPM
-	prompt "libXpm............................... common operation for the XPM pixmap format"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/libXrender/Config.in b/package/libXrender/Config.in
deleted file mode 100644
index 8d40e7992..000000000
--- a/package/libXrender/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBXAU
-	prompt "libXau............................... X11 authorisation library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/libXt/Config.in b/package/libXt/Config.in
deleted file mode 100644
index 7e7488cea..000000000
--- a/package/libXt/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBXT
-	prompt "libXt................................ X Toolkit Intrinsics"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index e004885a3..e14d75f1a 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libXt
 PKG_VERSION:=		1.0.7
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libSM
 PKG_MD5SUM:=		28f627c7a5ca08c2413ce91d21c177d8
 PKG_DESCR:=		X Toolkit Intrinsics
 PKG_SECTION:=		x11
diff --git a/package/libXv/Config.in b/package/libXv/Config.in
deleted file mode 100644
index 53ac67a19..000000000
--- a/package/libXv/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBXV
-	prompt "libXv................................ X11 Xvideo extensions"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/libXv/Makefile b/package/libXv/Makefile
index 025f52bc1..9d51fbf1c 100644
--- a/package/libXv/Makefile
+++ b/package/libXv/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libXv
 PKG_VERSION:=		1.0.5
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libX11 videoproto
 PKG_MD5SUM:=		6ee98790de6b3cd470074e60057d5c5c
 PKG_DESCR:=		X11 Xvideo extensions
 PKG_SECTION:=		x11
diff --git a/package/libXxf86dga/Config.in b/package/libXxf86dga/Config.in
deleted file mode 100644
index c28f5e7b6..000000000
--- a/package/libXxf86dga/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBXXF86DGA
-	prompt "libXxf86dga.......................... client library for the XFree86-DGA extension"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile
index 4259e7735..c850aa81e 100644
--- a/package/libXxf86dga/Makefile
+++ b/package/libXxf86dga/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libXxf86dga
 PKG_VERSION:=		1.1.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		xf86dgaproto libXext libXaw
 PKG_MD5SUM:=		ecb81708157e1a1eeaba0e124f0ade08
 PKG_DESCR:=		client library for the XFree86-DGA extension
 PKG_SECTION:=		x11
diff --git a/package/libao/Config.in b/package/libao/Config.in
deleted file mode 100644
index 2509b6b1a..000000000
--- a/package/libao/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_LIBAO
-	prompt "libao............................. A cross platform audio library"
-	tristate
-	default n
-	help
-	  Libao is a cross-platform audio library that allows programs to 
-	  output audio using a simple API on a wide variety of platforms. 
-	  
-	  http://www.xiph.org/ao/
-
diff --git a/package/libart/Config.in b/package/libart/Config.in
deleted file mode 100644
index 477bcc63e..000000000
--- a/package/libart/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_LIBART
-	prompt "libart............................ An high-performance 2D graphics library"
-	tristate
-	default n
-	help
-	  A library of functions for 2D graphics supporting a superset of the
-	  PostScript imaging model, designed to be integrated with graphics, artwork,
-	  and illustration programs. It is written in optimized C, and is fully
-	  compatible with C++. With a small footprint of 10,000 lines of code, it is
-	  especially suitable for embedded applications.
-
-	  http://www.levien.com/libart/
diff --git a/package/libaudiofile/Config.in b/package/libaudiofile/Config.in
deleted file mode 100644
index ebe0d4b8b..000000000
--- a/package/libaudiofile/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_LIBAUDIOFILE
-	prompt "libaudiofile...................... An open-source version of SGI's audiofile library"
-	tristate
-	default n
-	help
-	  The audiofile library allows the processing of audio data to and from audio
-	  files of many common formats (currently AIFF, AIFF-C, WAVE, NeXT/Sun, BICS,
-	  and raw data).
diff --git a/package/libc/Config.in b/package/libc/Config.in
deleted file mode 100644
index d8956f1d7..000000000
--- a/package/libc/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_LIBC
-	prompt "libc............................... native C library"
-	tristate
-	default y if ADK_NATIVE
-	default n
-	depends on ADK_NATIVE
-	help
-	  C library.
-
diff --git a/package/libc/Config.in.manual b/package/libc/Config.in.manual
new file mode 100644
index 000000000..225fc5716
--- /dev/null
+++ b/package/libc/Config.in.manual
@@ -0,0 +1,6 @@
+config ADK_COMPILE_LIBC
+	boolean
+	depends on ADK_NATIVE
+	default y if ADK_NATIVE
+	help 
+	 Native C library from host system.
diff --git a/package/libcli/Config.in b/package/libcli/Config.in
deleted file mode 100644
index cfec7e4a2..000000000
--- a/package/libcli/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_LIBCLI
-	prompt "libcli............................ A Cisco-like command line interface"
-	tristate
-	default n
-	help
-		Provides a shared library for including a Cisco-like 
-		command-line interface into other software. It's a telnet 
-		interface which supports command-line editing, history, 
-		authentication and callbacks for a user-definable function tree
-
-		http://libcli.sourceforge.net/
diff --git a/package/libdaemon/Config.in b/package/libdaemon/Config.in
deleted file mode 100644
index e19d50ef9..000000000
--- a/package/libdaemon/Config.in
+++ /dev/null
@@ -1,19 +0,0 @@
-config ADK_PACKAGE_LIBDAEMON
-	prompt "libdaemon......................... A lightweight C library that eases the writing of UNIX daemons"
-	tristate
-	default n
-	help
-	  libdaemon is a lightweight C library that eases the writing of UNIX daemons. 
-	  It consists of the following parts:
-	  
-	    * A wrapper around fork() which does the correct daemonization procedure of a process
-	    * A wrapper around syslog() for simpler and compatible log output to Syslog or STDERR
-	    * An API for writing PID files
-	    * An API for serializing UNIX signals into a pipe for usage with select() or poll()
-	    * An API for running subprocesses with STDOUT and STDERR redirected to syslog.
-	  
-	  APIs like these are used in most daemon software available. It is not that 
-	  simple to get it done right and code duplication is not a goal.
-	  
-	  http://0pointer.de/lennart/projects/libdaemon/
-
diff --git a/package/libdb/Config.in b/package/libdb/Config.in
deleted file mode 100644
index 510311508..000000000
--- a/package/libdb/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_COMPILE_DB
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBDB
-
-config ADK_PACKAGE_LIBDB
-	prompt "libdb............................. Berkeley DB"
-	tristate
-	default n
-	select ADK_COMPILE_DB
-	help
-	  disk file format database which stores key/data-pairs in single files.  
-	  
-	  http://www.sleepycat.com/products/db.shtml
-
diff --git a/package/libdnet/Config.in b/package/libdnet/Config.in
deleted file mode 100644
index bef486d2d..000000000
--- a/package/libdnet/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_LIBDNET
-	prompt "libdnet........................... Low-level network library"
-	tristate
-	default n
-	help
-	  simplified, portable interface to several low-level networking routines
-	  
-	  http://sourceforge.net/projects/libdnet/
-
diff --git a/package/libelf/Config.in b/package/libelf/Config.in
deleted file mode 100644
index 3f2fa6024..000000000
--- a/package/libelf/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_LIBELF
-	prompt "libelf............................ ELF object file access library"
-	tristate
-	default n
-	help
-	  This is the public release of libelf-0.8.5, a free ELF object
-	  file access library.
-	  
-	  http://www.stud.uni-hannover.de/~michael/software/
-
diff --git a/package/libevent/Config.in b/package/libevent/Config.in
deleted file mode 100644
index d0f91a2a9..000000000
--- a/package/libevent/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config ADK_PACKAGE_LIBEVENT
-	prompt "libevent.......................... Event notification library for event-driven network servers"
-	tristate
-	default n
-	help
-	  The libevent API provides a mechanism to execute a callback function 
-	  when a specific event occurs on a file descriptor or after a timeout 
-	  has been reached. Furthermore, libevent also support callbacks due 
-	  to signals or regular timeouts.
-	  
-	  libevent is meant to replace the event loop found in event driven 
-	  network servers. An application just needs to call event_dispatch() 
-	  and then add or remove events dynamically without having to change 
-	  the event loop.
-	  
-	  http://www.monkey.org/~provos/libevent/
-
diff --git a/package/libffi/Config.in b/package/libffi/Config.in
deleted file mode 100644
index 86dbc07eb..000000000
--- a/package/libffi/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_LIBFFI
-	prompt "libffi............................ Foreign Function Interface library"
-	tristate
-	default n
-	help
-	  The libffi library provides a portable, high level programming
-	  interface to various calling conventions. This allows a programmer to
-	  call any function specified by a call interface description at run
-	  time.  
-	  
-	  http://sources.redhat.com/libffi/
-
diff --git a/package/libfontenc/Config.in b/package/libfontenc/Config.in
deleted file mode 100644
index 8aa38029e..000000000
--- a/package/libfontenc/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_LIBFONTENC
-	prompt "libfontenc........................... X font encoding library"
-	tristate
-	select ADK_PACKAGE_ZLIB
-	default n
-	help
-         http://www.x.org
diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile
index 5776c67f3..f815b6c72 100644
--- a/package/libfontenc/Makefile
+++ b/package/libfontenc/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libfontenc
 PKG_VERSION:=		1.0.5
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		xproto zlib
 PKG_MD5SUM:=		0fa1988d08021225d18ced519a30d2b1
 PKG_DESCR:=		helps to deal with different encodings of fonts
 PKG_SECTION:=		x11
diff --git a/package/libgcrypt/Config.in b/package/libgcrypt/Config.in
deleted file mode 100644
index fb8a065a6..000000000
--- a/package/libgcrypt/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_PACKAGE_LIBGCRYPT
-	prompt "libgcrypt......................... The GNU crypto library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBGPG_ERROR
-	help
-	  This is a general purpose cryptographic library based on the code from 
-	  GnuPG. It provides functions for all cryptograhic building blocks: 
-	  symmetric ciphers (AES, DES, Blowfish, CAST5, Twofish, Arcfour), hash 
-	  algorithms (MD4, MD5, RIPE-MD160, SHA-1, TIGER-192), MACs (HMAC for all 
-	  hash algorithms), public key algorithms (RSA, ElGamal, DSA), large 
-	  integer functions, random numbers and a lot of supporting functions.
-	  
-	  http://directory.fsf.org/security/libgcrypt.html
-
diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile
index 4ee013601..49b89f430 100644
--- a/package/libgcrypt/Makefile
+++ b/package/libgcrypt/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libgcrypt
 PKG_VERSION:=		1.4.4
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libgpg-error
 PKG_MD5SUM:=		9e6dcf7fef1ae96b57207a1de91fdaa4
 PKG_DESCR:=		GNU crypto library
 PKG_SECTION:=		libs
diff --git a/package/libgd/Config.in b/package/libgd/Config.in
deleted file mode 100644
index af20a95a2..000000000
--- a/package/libgd/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_LIBGD
-	prompt "libgd............................. The GD Graphics Library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBJPEG
-	select ADK_PACKAGE_LIBPNG
-	help
-	  The GD Graphics Library
-	  
-	  http://www.libgd.org/
-
diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index e84ad6066..b6eac8885 100644
--- a/package/libgd/Makefile
+++ b/package/libgd/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		gd
 PKG_VERSION:=		2.0.35
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libpng jpeg
 PKG_MD5SUM:=		982963448dc36f20cb79b6e9ba6fdede
 PKG_DESCR:=		A library for the dynamic creation of images
 PKG_SECTION:=		libs
diff --git a/package/libgpg-error/Config.in b/package/libgpg-error/Config.in
deleted file mode 100644
index 88cdd9cd6..000000000
--- a/package/libgpg-error/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_LIBGPG_ERROR
-	prompt "libgpg-error...................... An helper library for common error codes and descriptions"
-	tristate
-	default n
-	help
-	  This is a library that defines common error values for all GnuPG
-	  components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
-	  Libksba, DirMngr, Pinentry, SmartCard Daemon and possibly more in the
-	  future.
-	  
-	  http://www.gnupg.org/related_software/libgpg-error/
-
diff --git a/package/libgssglue/Config.in b/package/libgssglue/Config.in
deleted file mode 100644
index 0039e7cce..000000000
--- a/package/libgssglue/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBGSSGLUE
-	prompt "libgssglue........................ NFSv4 GSSAPI helper library"
-	tristate
-	default n
-	help
-
diff --git a/package/libiconv/Config.in b/package/libiconv/Config.in
deleted file mode 100644
index 6ed1f162c..000000000
--- a/package/libiconv/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_LIBICONV
-	prompt "libiconv.......................... character set conversion library"
-	tristate
-	default n
-	help
-	  This package contains a _very_ stripped down version of GNU Libiconv,
-	  all charsets have been removed, except ASCII, various unicode charsets
-	  and iso8896-1.
-	  
-	  The original website:
-	  http://www.gnu.org/software/libiconv/
-
diff --git a/package/libid3tag/Config.in b/package/libid3tag/Config.in
deleted file mode 100644
index e61f46e76..000000000
--- a/package/libid3tag/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_LIBID3TAG
-	prompt "libid3tag......................... An ID3 tag manipulation library"
-	tristate
-	default n
-	select ADK_PACKAGE_ZLIB
-	help
-	  libid3tag is a library for reading and (eventually) writing ID3 tags, both
-	  ID3v1 and the various versions of ID3v2.
-	  
-	  http://mad.sourceforge.net/
-	  
-	  Depends: zlib
-
diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile
index 34b2417cc..3ab98c3c2 100644
--- a/package/libid3tag/Makefile
+++ b/package/libid3tag/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libid3tag
 PKG_VERSION:=		0.15.1b
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		zlib
 PKG_MD5SUM:=		e5808ad997ba32c498803822078748c3
 PKG_DESCR:=		an ID3 tag manipulation library
 PKG_SECTION:=		libs
diff --git a/package/liblzo/Config.in b/package/liblzo/Config.in
deleted file mode 100644
index d4ba51139..000000000
--- a/package/liblzo/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_LIBLZO
-	prompt "liblzo............................ Real-time data compression library"
-	tristate
-	default n
-	help
-	  A real-time data compression library
-	  
-	  http://www.oberhumer.com/opensource/lzo/
-
diff --git a/package/libmad/Config.in b/package/libmad/Config.in
deleted file mode 100644
index 8dd618c55..000000000
--- a/package/libmad/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_LIBMAD
-	prompt "libmad............................ An high-quality MPEG audio decoding library"
-	tristate
-	default n
-	help
-	  MAD is a high-quality MPEG audio decoder. It currently supports 
-	  MPEG-1 and the MPEG-2 extension to lower sampling frequencies, 
-	  as well as the de facto MPEG 2.5 format. All three audio layers -
-	  Layer I, Layer II, and Layer III (i.e. MP3) - are fully implemented.
-	  
-	  http://www.underbit.com/products/mad/
-
diff --git a/package/libmms/Config.in b/package/libmms/Config.in
deleted file mode 100644
index b739632de..000000000
--- a/package/libmms/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBMMS
-	prompt "libmms........................... common library for parsing mms:// and mmsh:// type network streams"
-	tristate
-	default n
-	help
-          http://launchpad.net/libmms/
diff --git a/package/libnet/Config.in b/package/libnet/Config.in
deleted file mode 100644
index 6a82db9c3..000000000
--- a/package/libnet/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_LIBNET
-	prompt "libnet............................ Low-level packet creation library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPCAP
-	help
-	  A low-level packet creation library.
-	  
-	  http://www.packetfactory.net/libnet/
-	  
-	  Depends: libpcap
-
diff --git a/package/libnet/Makefile b/package/libnet/Makefile
index 26f2d23bd..e1ad7ca7b 100644
--- a/package/libnet/Makefile
+++ b/package/libnet/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libnet
 PKG_VERSION:=		1.1.4
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libpcap
 PKG_MD5SUM:=		c5e06418a89cc4209f677a776a798fd9
 PKG_DESCR:=		a low-level packet creation library
 PKG_SECTION:=		libs
diff --git a/package/libnfsidmap/Config.in b/package/libnfsidmap/Config.in
deleted file mode 100644
index cb1bf4d66..000000000
--- a/package/libnfsidmap/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBNFSIDMAP
-	prompt "libnfsidmap....................... NFSv4 library"
-	tristate
-	default n
-	help
-
diff --git a/package/libnids/Config.in b/package/libnids/Config.in
deleted file mode 100644
index aea5d4e2f..000000000
--- a/package/libnids/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_LIBNIDS
-	prompt "libnids........................... A network intrusion detection library"
-	tristate
-	select ADK_PACKAGE_LIBPCAP
-	select ADK_PACKAGE_LIBNET
-	default n
-	help
-	  An implementation of an E-component of Network Intrusion Detection System.
-	  
-	  http://www.packetfactory.net/projects/libnids/
-
diff --git a/package/libnids/Makefile b/package/libnids/Makefile
index fe439d17c..3129465d3 100644
--- a/package/libnids/Makefile
+++ b/package/libnids/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libnids
 PKG_VERSION:=		1.23
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libnet libpcap
 PKG_MD5SUM:=		af35e8ef403a0ca95df2da94db856428
 PKG_DESCR:=		Network Intrusion Detection System library
 PKG_SECTION:=		libs
diff --git a/package/libnl/Config.in b/package/libnl/Config.in
deleted file mode 100644
index e91a31824..000000000
--- a/package/libnl/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBNL
-	prompt "libnl........................... netlink library"
-	tristate
-	default n
-	help
-	  Netlink library.
diff --git a/package/libogg/Config.in b/package/libogg/Config.in
deleted file mode 100644
index 2d75d650d..000000000
--- a/package/libogg/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_LIBOGG
-	prompt "libogg............................ The Ogg bitstream handling library"
-	tristate
-	default n
-	help
-	  The Ogg bitstream handling library.
-	  
-	  http://www.vorbis.com/
-
diff --git a/package/libol/Config.in b/package/libol/Config.in
deleted file mode 100644
index 4bdc57aff..000000000
--- a/package/libol/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_LIBOL
-	prompt "libol............................. Support library for syslog-ng"
-	tristate
-	default n 
-	help
-	  Support library for syslog-ng
-
-	  http://www.balabit.com
diff --git a/package/libosip2/Config.in b/package/libosip2/Config.in
deleted file mode 100644
index 7e7bb3477..000000000
--- a/package/libosip2/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_LIBOSIP2
-	prompt "libosip2.......................... The GNU oSIP library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  GNU oSIP library, a Session Initiation Protocol (SIP) implementation
-	  
-	  http://www.gnu.org/software/osip/
diff --git a/package/libowfat/Config.in b/package/libowfat/Config.in
deleted file mode 100644
index a95b28736..000000000
--- a/package/libowfat/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config ADK_COMPILE_LIBOWFAT
-	prompt "libowfat.......................... fefe's version of libdjb"
-	tristate
-	default n
diff --git a/package/libp11/Config.in b/package/libp11/Config.in
deleted file mode 100644
index 72945d813..000000000
--- a/package/libp11/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_LIBP11
-	prompt "libp11............................ libp11"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBLTDL
-	help
-	 libp11
diff --git a/package/libp11/Makefile b/package/libp11/Makefile
index 12565f97c..92ab3a367 100644
--- a/package/libp11/Makefile
+++ b/package/libp11/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libp11
 PKG_VERSION:=		0.2.4
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl libtool
 PKG_MD5SUM:=		9e2c5cbececde245e2d2f535bd49ce35
 PKG_DESCR:=		library implementing a small layer on top of PKCS11 API
 PKG_SECTION:=		libs
diff --git a/package/libpcap/Config.in b/package/libpcap/Config.in
deleted file mode 100644
index 752bf5797..000000000
--- a/package/libpcap/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_LIBPCAP
-	prompt "libpcap........................... Low-level packet capture library"
-	tristate
-	default n
-	help
-	  A system-independent library for user-level network packet capture.
-	  
-	  http://www.tcpdump.org/
-
diff --git a/package/libpciaccess/Config.in b/package/libpciaccess/Config.in
deleted file mode 100644
index 75e979fab..000000000
--- a/package/libpciaccess/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBPCIACCESS
-	prompt "libpciaccess......................... PCI access library"
-	tristate
-	default n
-	help
-	  http://www.x.org
diff --git a/package/libpng/Config.in b/package/libpng/Config.in
deleted file mode 100644
index 9b3de9cae..000000000
--- a/package/libpng/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_LIBPNG
-	prompt "libpng............................ PNG (Portable Network Graphics) format files handling library"
-	tristate
-	default n
-	select ADK_PACKAGE_ZLIB
-	help
-	  A library for reading/writing PNG files
-	  
-	  http://www.libpng.org/pub/png/libpng.html
-
diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 9a685a1a3..d8f206b59 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libpng
 PKG_VERSION:=		1.2.36
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		zlib
 PKG_MD5SUM:=		4779cd011409ea9b591e11638781f0bf
 PKG_DESCR:=		A library for reading/writing PNG images
 PKG_SECTION:=		libs
diff --git a/package/libpri/Config.in b/package/libpri/Config.in
deleted file mode 100644
index b39ab031b..000000000
--- a/package/libpri/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_LIBPRI
-	prompt "libpri............................ Primary Rate ISDN Library"
-	tristate
-	default n
-	help
-	  libpri is a C implementation of the Primary Rate ISDN specification.  It was
-	  based on the Bellcore specification SR-NWT-002343 for National ISDN.  As of
-	  May 12, 2001, it has been tested work with NI-2, Nortel DMS-100, and
-	  Lucent 5E Custom protocols on switches from Nortel and Lucent.
-
diff --git a/package/libpthread/Config.in b/package/libpthread/Config.in
deleted file mode 100644
index dab1b0e97..000000000
--- a/package/libpthread/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_LIBPTHREAD
-	prompt "libpthread........................ POSIX threads library"
-	tristate
-	default n
-	help
-	  POSIX threads library
-
diff --git a/package/librpcsecgss/Config.in b/package/librpcsecgss/Config.in
deleted file mode 100644
index 92e049cda..000000000
--- a/package/librpcsecgss/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBRPCSECGSS
-	prompt "librpcsecgss...................... NFSv4 library"
-	tristate
-	default n
-	help
-
diff --git a/package/libshout/Config.in b/package/libshout/Config.in
deleted file mode 100644
index 2a34f2c1b..000000000
--- a/package/libshout/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config ADK_COMPILE_LIBSHOUT
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBSHOUT
-
-config ADK_PACKAGE_LIBSHOUT
-	prompt "libshout.......................... Streaming library"
-	tristate
-	default n
-	select ADK_COMPILE_LIBSHOUT
-	select ADK_PACKAGE_LIBVORBIS
-	select ADK_PACKAGE_LIBOGG
-	help
-	  Shoutcast streaming library.
-
-	  http://www.icecast.org/
diff --git a/package/libshout/Makefile b/package/libshout/Makefile
index f91cd809c..fef009845 100644
--- a/package/libshout/Makefile
+++ b/package/libshout/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libshout
 PKG_VERSION:=		2.2.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libvorbis
 PKG_MD5SUM:=		4f75fc9901c724b712c371c9a1e782d3
 PKG_DESCR:=		Library which can be used to write a source client for streaming
 PKG_SECTION:=		libs
diff --git a/package/libsigc++/Config.in b/package/libsigc++/Config.in
deleted file mode 100644
index 7d1cc5e22..000000000
--- a/package/libsigc++/Config.in
+++ /dev/null
@@ -1,25 +0,0 @@
-config ADK_PACKAGE_LIBSIGCXX
-	prompt "libsigc++......................... Callback framework for C++"
-	tristate
-	default n
-	help
-	  Callback framework for C++
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_LIBSIGCXX
-default ADK_COMPILE_LIBSIGCXX_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_LIBSIGCXX_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	depends on ADK_BROKEN
-	help
-
-endchoice
diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile
index eff341b7f..724196bfc 100644
--- a/package/libsigc++/Makefile
+++ b/package/libsigc++/Makefile
@@ -11,15 +11,10 @@ PKG_DESCR:=		Callback framework for C++
 PKG_SECTION:=		libs
 PKG_URL:=		http://libsigc.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_GNOME:=libsigc++/2.2/}
+PKG_CXX:=		LIBSIGCXX
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y)
-PKG_DEPENDS:=		uclibc++
-else
-PKG_DEPENDS:=		libstdcxx
-endif
-
 $(eval $(call PKG_template,LIBSIGCXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y)
diff --git a/package/libstdcxx/Config.in b/package/libstdcxx/Config.in
deleted file mode 100644
index 061675c5f..000000000
--- a/package/libstdcxx/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBSTDCXX
-	prompt "libstdc++......................... C++ support library"
-	tristate
-	default n
-	help
-	  C++ support library
diff --git a/package/libtasn1/Config.in b/package/libtasn1/Config.in
deleted file mode 100644
index b84efff17..000000000
--- a/package/libtasn1/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_LIBTASN1
-	prompt "libtasn1.......................... An ASN.1 and DER structures manipulation library"
-	tristate
-	default n
-	help
-	  This is a library for Abstract Syntax Notation One (ASN.1) and
-	  Distinguish Encoding Rules (DER) manipulation.
-
-	  ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
diff --git a/package/libthread_db/Config.in b/package/libthread_db/Config.in
deleted file mode 100644
index 3aef82785..000000000
--- a/package/libthread_db/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_LIBTHREAD_DB
-	prompt "libthread_db...................... POSIX threads library for Debugging"
-	tristate
-	default n
-	help
-	  POSIX threads library
-
diff --git a/package/libtiff/Config.in b/package/libtiff/Config.in
deleted file mode 100644
index 49c34ee14..000000000
--- a/package/libtiff/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_LIBTIFF
-	prompt "libtiff........................... TIFF format files handling library"
-	tristate
-	default n
-	help
-	  A library for reading/writing TIFF files
-	  
-	  http://www.libtiff.org/
diff --git a/package/libtirpc/Config.in b/package/libtirpc/Config.in
deleted file mode 100644
index 33d144dd7..000000000
--- a/package/libtirpc/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_LIBTIRPC
-	prompt "libtirpc.......................... A transport independent RPC library"
-	tristate
-	default n
-	help
-	  A transport independent RPC library
-	  
-	  http://libtirpc.sourceforge.net/
-
diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index 08031a3c8..8b48c0818 100644
--- a/package/libtirpc/Makefile
+++ b/package/libtirpc/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libtirpc
 PKG_VERSION:=		0.2.0
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libgssglue
 PKG_MD5SUM:=		b3b513a8825aa227deac63ea38c64f41
 PKG_DESCR:=		a transport independent RPC library
 PKG_SECTION:=		libs
diff --git a/package/libtool/Config.in b/package/libtool/Config.in
deleted file mode 100644
index 64ac0f3e5..000000000
--- a/package/libtool/Config.in
+++ /dev/null
@@ -1,22 +0,0 @@
-config ADK_COMPILE_LIBTOOL
-	tristate
-	depends on ADK_PACKAGE_LIBLTDL
-
-config ADK_PACKAGE_LIBLTDL
-	prompt "libltdl........................... A generic dynamic object loading library"
-	tristate
-	default n
-	select ADK_COMPILE_LIBTOOL
-	help
-	  A generic dynamic object loading library.
-	  
-	  http://www.gnu.org/software/libtool/
-
-config ADK_PACKAGE_LIBTOOL
-	prompt "libtool........................... Libtool"
-	tristate
-	default n
-	select ADK_COMPILE_LIBTOOL
-	help
-	  http://www.gnu.org/software/libtool/
-
diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in
deleted file mode 100644
index ebe757f74..000000000
--- a/package/libtorrent/Config.in
+++ /dev/null
@@ -1,27 +0,0 @@
-config ADK_PACKAGE_LIBTORRENT
-	prompt "libtorrent........................ bittorrent library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBSIGCXX
-	help
-	  http://libtorrent.rakshasa.no/
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_LIBTORRENT
-default ADK_COMPILE_LIBTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_LIBTORRENT_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	depends on ADK_BROKEN
-	help
-
-endchoice
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index 331086440..4d55aa87e 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -6,21 +6,17 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libtorrent
 PKG_VERSION:=		0.12.5
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl libsigc++
 PKG_MD5SUM:=		fe8155d364b220713074423100d4bf29
 PKG_DESCR:=		A bittorrent library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl libsigc++
 PKG_URL:=		http://libtorrent.rakshasa.no
 PKG_SITES:=		http://libtorrent.rakshasa.no/downloads/
+PKG_CXX:=		LIBTORRENT
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y)
-PKG_DEPENDS+=		uclibc++
-else
-PKG_DEPENDS+=		libstdcxx
-endif
-
 $(eval $(call PKG_template,LIBTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y)
diff --git a/package/libupnp/Config.in b/package/libupnp/Config.in
deleted file mode 100644
index ad069b154..000000000
--- a/package/libupnp/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_LIBUPNP
-	prompt "libupnp........................... Universal Plug and Play (UPnP) SDK library"
-	tristate
-	default n
-	help
-	  The Universal Plug and Play (UPnP) SDK for Linux provides support 
-	  for building UPnP-compliant control points, devices, and bridges 
-	  on Linux.
-	  
-	  http://upnp.sourceforge.net/
-	  
-	  Depends: libpthread
-
diff --git a/package/libusb-compat/Config.in b/package/libusb-compat/Config.in
deleted file mode 100644
index 37ed69949..000000000
--- a/package/libusb-compat/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_LIBUSB_COMPAT
-	prompt "libusb-compat...................... A library for accessing Linux USB devices"
-	tristate
-	default n
-	help
-	  A library for accessing Linux USB devices
-	  
-	  http://libusb.sourceforge.net/
-
diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile
index 81dcfcd49..63048e40c 100644
--- a/package/libusb-compat/Makefile
+++ b/package/libusb-compat/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libusb-compat
 PKG_VERSION:=		0.1.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libusb
 PKG_MD5SUM:=		32c775b97da7a11c6be7c487a0c9fc00
 PKG_DESCR:=		a Library for accessing Linux USB devices
 PKG_SECTION:=		libs
diff --git a/package/libusb/Config.in b/package/libusb/Config.in
deleted file mode 100644
index 526d8356e..000000000
--- a/package/libusb/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_LIBUSB
-	prompt "libusb............................ A library for accessing Linux USB devices"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBUSB_COMPAT
-	help
-	  A library for accessing Linux USB devices
-	  
-	  http://libusb.sourceforge.net/
-
diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in
deleted file mode 100644
index 58f0ce617..000000000
--- a/package/libvirt/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_LIBVIRT
-	prompt "libvirt........................... virtualization API"
-	tristate
-	select ADK_PACKAGE_PYTHON
-	select ADK_PACKAGE_LIBXML2
-	select ADK_PACKAGE_LIBGNUTLS
-	select ADK_PACKAGE_BRIDGE_UTILS
-	depends on !ADK_HOST_FREEBSD
-	default n
-	help
-	  http://www.libvirt.org
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index 06de43a1f..7d3582960 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libvirt
 PKG_VERSION:=		0.7.4
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libxml2 gnutls python
 PKG_MD5SUM:=		1645975662a326969d2f42d5c04574aa
 PKG_DESCR:=		virtualization API
 PKG_SECTION:=		utils
@@ -13,6 +14,8 @@ PKG_DEPENDS:=		libxml2 libgnutls python
 PKG_URL:=		http://www.libvirt.org
 PKG_SITES:=		ftp://libvirt.org/libvirt/
 
+PKG_HOST_DEPENDS:=	!freebsd
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBVIRT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libvorbis/Config.in b/package/libvorbis/Config.in
deleted file mode 100644
index 9990cb8c1..000000000
--- a/package/libvorbis/Config.in
+++ /dev/null
@@ -1,20 +0,0 @@
-config ADK_PACKAGE_LIBVORBIS
-	prompt "libvorbis......................... The Vorbis General Audio Compression Codec library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOGG
-	help
-	  The Vorbis General Audio Compression Codec library.
-	  
-	  http://www.vorbis.com/
-
-config ADK_PACKAGE_LIBVORBISENC
-	prompt "libvorbisenc...................... The Vorbis General Audio Compression Codec library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBVORBIS
-	help
-	  The Vorbis General Audio Compression Codec library.
-	  This is the encoding part, needed f.e. for mpd shout support. 
-	  http://www.vorbis.com/
-
diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile
index a78edf31d..3837f47f7 100644
--- a/package/libvorbis/Makefile
+++ b/package/libvorbis/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libvorbis
 PKG_VERSION:=		1.2.0
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libogg
 PKG_MD5SUM:=		478646358c49f34aedcce58948793619
 PKG_DESCR:=		The Vorbis General Audio Compression Codec library
 PKG_SECTION:=		libs
diff --git a/package/libvorbisidec/Config.in b/package/libvorbisidec/Config.in
deleted file mode 100644
index b4794f02a..000000000
--- a/package/libvorbisidec/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_LIBVORBISIDEC
-	prompt "libvorbisidec..................... A fixed-point implementation (Tremor) of libogg/libvorbis"
-	tristate
-	default n
-	help
-	  libvorbisidec is "tremor", a fixed-point implementation of libvorbis.
-	  It also has libogg built-in. It is suitable as a replacement for 
-	  libvorbis and libogg in tremor-aware applications.
-	  Tremor is a decoder only.
-	  
-	  http://http://wiki.xiph.org/index.php/Tremor
-
diff --git a/package/libxkbfile/Config.in b/package/libxkbfile/Config.in
deleted file mode 100644
index 6286ce808..000000000
--- a/package/libxkbfile/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_LIBXKBFILE
-	prompt "libxkbfile........................... X keyboard library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/libxml2/Config.in b/package/libxml2/Config.in
deleted file mode 100644
index c9a6833de..000000000
--- a/package/libxml2/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_LIBXML2
-	prompt "libxml2........................... Gnome XML library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_ZLIB
-	help
-	  A library for manipulating XML and HTML resources.
-	  
-	  http://xmlsoft.org/
-
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 2025a1a64..d2fa1fc54 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libxml2
 PKG_VERSION:=		2.7.3
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		zlib
 PKG_MD5SUM:=		8f4fda3969237c2a33bdb1583b5d06b2
 PKG_DESCR:=		XML C parser and toolkit
 PKG_SECTION:=		libs
diff --git a/package/libxslt/Config.in b/package/libxslt/Config.in
deleted file mode 100644
index ed8bfe177..000000000
--- a/package/libxslt/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_LIBXSLT
-	prompt "libxslt........................... Gnome XSLT library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBXML2
-	help
-	  A library for XML transformation using XSLT.
-	  
-	  http://xmlsoft.org/XSLT/
-
diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index 447fa5e7f..6e648c26b 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libxslt
 PKG_VERSION:=		1.1.24
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libxml2
 PKG_MD5SUM:=		e83ec5d27fc4c10c6f612879bea9a153
 PKG_DESCR:=		XSLT Library
 PKG_SECTION:=		libs
diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
deleted file mode 100644
index b56fa8bff..000000000
--- a/package/lighttpd/Config.in
+++ /dev/null
@@ -1,113 +0,0 @@
-config ADK_PACKAGE_LIGHTTPD
-	prompt "lighttpd.......................... Flexible and lightweight web server"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPCRE
-	select ADK_COMPILE_SQLITE
-	select ADK_PACKAGE_LIBXML2
-	help
-	  A flexible and lightweight web server.
-	  
-	  http://www.lighttpd.net/
-
-config ADK_COMPILE_LIGHTTPD_WITH_OPENSSL
-	bool "Use OpenSSL for https support"
-	default y
-	depends on ADK_PACKAGE_LIGHTTPD
-	select ADK_PACKAGE_LIBOPENSSL
-
-config ADK_PACKAGE_LIGHTTPD_MOD_ACCESSLOG
-	prompt   "lighttpd-mod-accesslog........ Access logging module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_ALIAS
-	prompt   "lighttpd-mod-alias............ Directory alias module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_AUTH
-	prompt   "lighttpd-mod-auth............. Authentication module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_CGI
-	prompt   "lighttpd-mod-cgi.............. CGI module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_EVASIVE
-	prompt   "lighttpd-mod-evasive.......... Evasive module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_EXPIRE
-	prompt   "lighttpd-mod-expire........... Expire module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_FASTCGI
-	prompt   "lighttpd-mod-fastcgi.......... FastCGI module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_PROXY
-	prompt   "lighttpd-mod-proxy............ Proxy module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_REDIRECT
-	prompt   "lighttpd-mod-redirect......... URL redirection module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_REWRITE
-	prompt   "lighttpd-mod-rewrite.......... URL rewriting module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_SETENV
-	prompt   "lighttpd-mod-setenv........... Environment variable setting module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_SIMPLE_VHOST
-	prompt   "lighttpd-mod-simple-vhost..... Simple virtual hosting module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_SSI
-	prompt   "lighttpd-mod-ssi.............. SSI module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_STATUS
-	prompt   "lighttpd-mod-status........... Server status display module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_USERTRACK
-	prompt   "lighttpd-mod-usertrack........ User tracking module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
-
-config ADK_PACKAGE_LIGHTTPD_MOD_WEBDAV
-	prompt   "lighttpd-mod-webdav........... webdav module"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIGHTTPD
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index b20841a24..3ed986070 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -6,10 +6,14 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		lighttpd
 PKG_VERSION:=		1.4.25
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		pcre libxml2 sqlite
+ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y)
+PKG_BUILDDEP+=		openssl
+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/links/Config.in b/package/links/Config.in
deleted file mode 100644
index 559e446f3..000000000
--- a/package/links/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_LINKS
-	prompt "links............................. web browser for console"
-	tristate
-	select ADK_PACKAGE_LIBJPEG
-	select ADK_PACKAGE_LIBPNG
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_GPM
-	default n
-	help
-	  http://links.twibright.com/
diff --git a/package/links/Makefile b/package/links/Makefile
index 5238c599f..0c69aa24d 100644
--- a/package/links/Makefile
+++ b/package/links/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		links
 PKG_VERSION:=		2.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl libpng jpeg gpm
 PKG_MD5SUM:=		c9937f9ed0061f264973182f871fb667
 PKG_DESCR:=		web browser with console graphic support
 PKG_SECTION:=		net
diff --git a/package/linux-atm/Config.in b/package/linux-atm/Config.in
deleted file mode 100644
index 06b2a9476..000000000
--- a/package/linux-atm/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config ADK_COMPILE_LINUX_ATM
-	bool
-	default n
-	help
-	  
-config ADK_PACKAGE_BR2684CTL
-	prompt "br2684ctl......................... RFC2684 bridging utility"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBATM
-	select ADK_KPACKAGE_KMOD_ATM_BR2684
-	select ADK_COMPILE_LINUX_ATM
-	depends on !ADK_HOST_FREEBSD
-	help
-	  Utility for setting up ATM RFC2684 bridging mode.
-	  (Useful for PPPoE)
diff --git a/package/linux-atm/Config.in.lib b/package/linux-atm/Config.in.lib
deleted file mode 100644
index 6c3e92d21..000000000
--- a/package/linux-atm/Config.in.lib
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_LIBATM
-	prompt "libatm............................ ATM Library for Linux"
-	tristate
-	default n
-	select ADK_COMPILE_LINUX_ATM
-	select ADK_KPACKAGE_KMOD_ATM
-	depends on !ADK_HOST_FREEBSD
-	help
-	  ATM Library for linux.
-
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index b6f06694f..3e6089d9e 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -13,6 +13,8 @@ PKG_URL:=		http://linux-atm.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=linux-atm/}
 PKG_NOPARALLEL:=	1
 
+PKG_HOST_DEPENDS:=	!freebsd
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 
 PKG_DESCR_1:=		br2684ctl
diff --git a/package/logrotate/Config.in b/package/logrotate/Config.in
deleted file mode 100644
index 08e20c4ba..000000000
--- a/package/logrotate/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_LOGROTATE
-	prompt "logrotate......................... rotates, compresses, and mails system logs"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPOPT
-	help
-		logrotate  is  designed to ease administration of systems that generate 
-		large numbers of log files.  It allows auto-matic rotation, compression, 
-		removal, and mailing of log files. Each  log  file  may  be  handled  
-		daily,  weekly,monthly, or when it grows too large.
diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile
index bd2b102ef..36b667534 100644
--- a/package/logrotate/Makefile
+++ b/package/logrotate/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		logrotate
 PKG_VERSION:=		3.7.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		popt
 PKG_MD5SUM:=		552639142e163745f6bcd4f1f3816d8a
 PKG_DESCR:=		logfile rotation utility
 PKG_SECTION:=		misc
diff --git a/package/lrzsz/Config.in b/package/lrzsz/Config.in
deleted file mode 100644
index 1d8108b6b..000000000
--- a/package/lrzsz/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_LRZSZ	
-	prompt "lrsz.............................. X,Y and Z-modem protocols"
-	tristate
-	default n
-	help
-		Transfer files in your login sessions.
-		Very leightweight ans straight forward.
-		You just need a terminal client that can do 
-		either X, Y or Z-modem file transfers.
-
-		http://www.ohse.de/uwe/software/lrzsz.html
diff --git a/package/lua/Config.in b/package/lua/Config.in
deleted file mode 100644
index 8605c3b20..000000000
--- a/package/lua/Config.in
+++ /dev/null
@@ -1,86 +0,0 @@
-menu "lua............................... LUA programming language"
-
-config ADK_COMPILE_LUA
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBLUA
-
-config ADK_PACKAGE_LUA
-	prompt "lua............................... LUA programming language interpreter"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBLUA
-	help
-	  Lua is a powerful light-weight programming language designed for extending 
-	  applications. Lua is also frequently used as a general-purpose, stand-alone 
-	  language. Lua is free software.
-	  
-	  Lua combines simple procedural syntax with powerful data description 
-	  constructs based on associative arrays and extensible semantics. Lua is 
-	  dynamically typed, interpreted from bytecodes, and has automatic memory 
-	  management with garbage collection, making it ideal for configuration, 
-	  scripting, and rapid prototyping.
-	  
-	  Lua is implemented as a small library of C functions, written in ANSI C, and 
-	  compiles unmodified in all known platforms. The implementation goals are 
-	  simplicity, efficiency, portability, and low embedding cost. The result is a 
-	  fast language engine with small footprint, making it ideal in embedded systems 
-	  too.
-	  
-	  http://www.lua.org/
-	  
-	  This package contains the LUA language interpreter.
-
-config ADK_PACKAGE_LUAC
-	prompt "luac.............................. LUA programming language compiler"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBLUA
-	help
-	  Lua is a powerful light-weight programming language designed for extending 
-	  applications. Lua is also frequently used as a general-purpose, stand-alone 
-	  language. Lua is free software.
-	  
-	  Lua combines simple procedural syntax with powerful data description 
-	  constructs based on associative arrays and extensible semantics. Lua is 
-	  dynamically typed, interpreted from bytecodes, and has automatic memory 
-	  management with garbage collection, making it ideal for configuration, 
-	  scripting, and rapid prototyping.
-	  
-	  Lua is implemented as a small library of C functions, written in ANSI C, and 
-	  compiles unmodified in all known platforms. The implementation goals are 
-	  simplicity, efficiency, portability, and low embedding cost. The result is a 
-	  fast language engine with small footprint, making it ideal in embedded systems 
-	  too.
-	  
-	  http://www.lua.org/
-	  
-	  This package contains the LUA language compiler.
-
-config ADK_PACKAGE_LUA_EXAMPLES
-	prompt "lua-examples...................... LUA programming language examples"
-	tristate
-	default n
-	select ADK_PACKAGE_LUA
-	help
-	  Lua is a powerful light-weight programming language designed for extending 
-	  applications. Lua is also frequently used as a general-purpose, stand-alone 
-	  language. Lua is free software.
-	  
-	  Lua combines simple procedural syntax with powerful data description 
-	  constructs based on associative arrays and extensible semantics. Lua is 
-	  dynamically typed, interpreted from bytecodes, and has automatic memory 
-	  management with garbage collection, making it ideal for configuration, 
-	  scripting, and rapid prototyping.
-	  
-	  Lua is implemented as a small library of C functions, written in ANSI C, and 
-	  compiles unmodified in all known platforms. The implementation goals are 
-	  simplicity, efficiency, portability, and low embedding cost. The result is a 
-	  fast language engine with small footprint, making it ideal in embedded systems 
-	  too.
-	  
-	  http://www.lua.org/
-	  
-	  This package contains LUA language examples.
-
-endmenu
diff --git a/package/lua/Config.in.lib b/package/lua/Config.in.lib
deleted file mode 100644
index 102d57d70..000000000
--- a/package/lua/Config.in.lib
+++ /dev/null
@@ -1,25 +0,0 @@
-config ADK_PACKAGE_LIBLUA
-	prompt "liblua............................ LUA programming language shared libraries"
-	tristate
-	select ADK_COMPILE_LUA
-	help
-	  Lua is a powerful light-weight programming language designed for extending 
-	  applications. Lua is also frequently used as a general-purpose, stand-alone 
-	  language. Lua is free software.
-	  
-	  Lua combines simple procedural syntax with powerful data description 
-	  constructs based on associative arrays and extensible semantics. Lua is 
-	  dynamically typed, interpreted from bytecodes, and has automatic memory 
-	  management with garbage collection, making it ideal for configuration, 
-	  scripting, and rapid prototyping.
-	  
-	  Lua is implemented as a small library of C functions, written in ANSI C, and 
-	  compiles unmodified in all known platforms. The implementation goals are 
-	  simplicity, efficiency, portability, and low embedding cost. The result is a 
-	  fast language engine with small footprint, making it ideal in embedded systems 
-	  too.
-	  
-	  http://www.lua.org/
-	  
-	  This package contains the LUA shared libraries, needed by other programs.
-
diff --git a/package/lvm/Config.in b/package/lvm/Config.in
deleted file mode 100644
index b1e4c0175..000000000
--- a/package/lvm/Config.in
+++ /dev/null
@@ -1,20 +0,0 @@
-config ADK_COMPILE_LVM
-	bool
-	default n
-	help
-
-config ADK_PACKAGE_LVM
-	prompt "lvm............................... logical volume management"
-	tristate
-	select ADK_COMPILE_LVM
-	select ADK_PACKAGE_DEVICE_MAPPER
-	select ADK_PACKAGE_LIBNCURSES
-	default n
-	help
-
-config ADK_PACKAGE_DEVICE_MAPPER
-	prompt "device-mapper..................... device-mapper"
-	tristate
-	select ADK_COMPILE_LVM
-	default n
-	help
diff --git a/package/lynx/Config.in b/package/lynx/Config.in
deleted file mode 100644
index 0565c4150..000000000
--- a/package/lynx/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_LYNX
-	prompt "lynx.............................. Standard text browser"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	select ADK_PACKAGE_CA_CERTS
-	help
-	  The standard text-based world wide web browser.
-	  
-	  http://lynx.isc.org/current/
diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index 12a04f7f1..443dd82de 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		lynx
 PKG_VERSION=		2.8.7dev.7
 PKG_RELEASE=		2
+PKG_BUILDDEP+=		ncurses openssl zlib
 PKG_MD5SUM=		83891107c873421e5ac917cc0ab53fe8
 PKG_DESCR:=		Standard text browser
 PKG_SECTION:=		text
diff --git a/package/m4/Config.in b/package/m4/Config.in
deleted file mode 100644
index d929668ef..000000000
--- a/package/m4/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_M4
-	prompt "m4................................ macro processor"
-	tristate
-	default n
-	help
-	  http://www.gnu.org/software/m4/
diff --git a/package/mac80211/Config.in b/package/mac80211/Config.in
deleted file mode 100644
index e907531b2..000000000
--- a/package/mac80211/Config.in
+++ /dev/null
@@ -1,28 +0,0 @@
-config ADK_PACKAGE_KMOD_MAC80211
-	prompt "kmod-mac80211................... mac80211 softmac (development)"
-	tristate
-	select ADK_MOD_KERNEL_MAC80211
-	depends on !ADK_KPACKAGE_KMOD_MAC80211
-	default n
-	help
-	  http://linuxwireless.org/
-
-config ADK_PACKAGE_KMOD_MAC80211_ATH5K
-	prompt "kmod-mac80211-ath5k............. Atheros 5xxx wireless driver"
-	tristate
-	depends on ADK_PACKAGE_KMOD_MAC80211
-	default n
-	help
-	  http://linuxwireless.org/
-
-config ADK_PACKAGE_KMOD_MAC80211_RT61
-	prompt "kmod-mac80211-rt61.............. Ralink rt2501/rt61 wireless driver"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_CRC_ITU_T
-	select ADK_PACKAGE_WIRELESS_FIRMWARE_RT61
-	depends on ADK_PACKAGE_KMOD_MAC80211
-	help
-	  This adds support for rt2501 wireless chipset family.
-	  Supported chips: RT2561, RT2561S & RT2661.
-
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
deleted file mode 100644
index 919b7f120..000000000
--- a/package/mac80211/Makefile
+++ /dev/null
@@ -1,117 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:=		mac80211
-PKG_VERSION:=		2009-05-01
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		abc949ec3f7cc57302cca814d9b9c6cd
-PKG_DESCR:=		Linux wireless framework (SoftMAC)
-PKG_SECTION:=		kernel
-PKG_URL:=		http://wireless.kernel.org
-PKG_SITES:=		http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/05/	\
-			http://wireless.kernel.org/download/compat-wireless-2.6/
-
-PKG_DESCR_1:=		ath5k driver
-PKG_DESCR_2:=		rt61/rt2x00 driver
-
-DISTFILES:=		compat-wireless-${PKG_VERSION}.tar.bz2
-WRKDIST=		${WRKDIR}/compat-wireless-${PKG_VERSION}
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,KMOD_MAC80211,kmod-mac80211,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_MAC80211_ATH5K,kmod-mac80211-ath5k,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION}))
-$(eval $(call PKG_template,KMOD_MAC80211_RT61,kmod-mac80211-rt61,${KERNEL_VERSION}+${PKG_VERSION}-${TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}--${KERNEL_RELEASE},${PKG_DESCR},{PKG_SECTION}))
-
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		manual
-
-# remove entry to enable driver compilation
-DISABLED_DRIVERS:=	CONFIG_AR9170_USB=n \
-			CONFIG_MAC80211_HWSIM=n \
-			CONFIG_ATH9K=n \
-			CONFIG_IWLWIFI=n \
-			CONFIG_IWLAGN=n \
-			CONFIG_IWL4965=n \
- 			CONFIG_IWL5000=n \
-			CONFIG_IWL3945=n \
-			CONFIG_B43=n \
-			CONFIG_B43LEGACY=n \
-			CONFIG_LIBIPW=n \
-			CONFIG_IPW2100=n \
-			CONFIG_IPW2200=n \
-			CONFIG_P54_PCI=n \
-			CONFIG_B44=n \
-			CONFIG_RTL8180=n \
-			CONFIG_ADM8211=n \
-			CONFIG_RT2800PCI=n \
-			CONFIG_ATMEL=n \
-			CONFIG_PCI_ATMEL=n \
-			CONFIG_ZD1211RW=n \
-			CONFIG_P54_USB=n \
-			CONFIG_RTL8187=n \
-			CONFIG_AT76C50X_USB=n \
-			CONFIG_RT2500USB=n \
-			CONFIG_RT2800USB=n \
-			CONFIG_RT2X00_LIB_USB=n \
-			CONFIG_RT73USB=n \
-			CONFIG_P54_COMMON=n \
-			CONFIG_SSB=n \
-			CONFIG_LIBERTAS_USB=n \
-			CONFIG_LIBERTAS_CS=n \
-			CONFIG_LIBERTAS=n \
-			CONFIG_MWL8K=n \
-			CONFIG_USB_NET_CDCETHER=n \
-			CONFIG_USB_NET_RNDIS_HOST=n \
-			CONFIG_USB_NET_RNDIS_WLAN=n
-
-BUILD_STYLE:=		manual
-
-do-build:
-	ARCH="${ARCH}" \
-	CROSS_COMPILE="${TARGET_CROSS}" \
-	KLIB_BUILD="$(LINUX_DIR)" \
-	KLIB="${WRKINST}/lib/modules/${KERNEL_VERSION}" \
-	MODPROBE=: \
-	LDFLAGS="" \
-	${DISABLED_DRIVERS} \
-	V=1 \
-	$(MAKE) -C ${WRKBUILD}/
-
-do-install:
-	${INSTALL_DIR} ${IDIR_KMOD_MAC80211}/etc/modules.d/
-	${INSTALL_DIR} ${IDIR_KMOD_MAC80211}/lib/modules/${KERNEL_VERSION}/
-	${CP} ${WRKBUILD}/net/wireless/{cfg80211,lib80211,lib80211*}.ko \
-		${IDIR_KMOD_MAC80211}/lib/modules/${KERNEL_VERSION}/
-	${CP} ${WRKBUILD}/net/mac80211/mac80211.ko \
-		${IDIR_KMOD_MAC80211}/lib/modules/${KERNEL_VERSION}/
-	echo "lib80211" > ${IDIR_KMOD_MAC80211}/etc/modules.d/20-mac80211
-	echo "lib80211_crypt_ccmp" >> ${IDIR_KMOD_MAC80211}/etc/modules.d/20-mac80211
-	echo "cfg80211" >> ${IDIR_KMOD_MAC80211}/etc/modules.d/20-mac80211
-	echo "mac80211" >> ${IDIR_KMOD_MAC80211}/etc/modules.d/20-mac80211
-	# driver for ath5k
-	${INSTALL_DIR} ${IDIR_KMOD_MAC80211_ATH5K}/etc/modules.d/
-	${INSTALL_DIR} ${IDIR_KMOD_MAC80211_ATH5K}/lib/modules/${KERNEL_VERSION}/
-	${CP} ${WRKBUILD}/drivers/net/wireless/ath/ath.ko \
-		${IDIR_KMOD_MAC80211_ATH5K}/lib/modules/${KERNEL_VERSION}/
-	${CP} ${WRKBUILD}/drivers/net/wireless/ath/ath5k/ath5k.ko \
-		${IDIR_KMOD_MAC80211_ATH5K}/lib/modules/${KERNEL_VERSION}/
-	echo "ath" > ${IDIR_KMOD_MAC80211_ATH5K}/etc/modules.d/30-ath5k
-	echo "ath5k" >> ${IDIR_KMOD_MAC80211_ATH5K}/etc/modules.d/30-ath5k
-	# driver for rt61
-	${INSTALL_DIR} ${IDIR_KMOD_MAC80211_RT61}/etc/modules.d/
-	${INSTALL_DIR} ${IDIR_KMOD_MAC80211_RT61}/lib/modules/${KERNEL_VERSION}/
-	${CP} ${WRKBUILD}/drivers/misc/eeprom/eeprom_93cx6.ko \
-		${IDIR_KMOD_MAC80211_RT61}/lib/modules/${KERNEL_VERSION}/
-	${CP} ${WRKBUILD}/drivers/net/wireless/rt2x00/rt2x00*.ko \
-		${IDIR_KMOD_MAC80211_RT61}/lib/modules/${KERNEL_VERSION}/
-	${CP} ${WRKBUILD}/drivers/net/wireless/rt2x00/rt61pci.ko \
-		${IDIR_KMOD_MAC80211_RT61}/lib/modules/${KERNEL_VERSION}/
-	echo "eeprom_93cx6" > ${IDIR_KMOD_MAC80211_RT61}/etc/modules.d/30-rt61
-	echo "rt2x00lib" >> ${IDIR_KMOD_MAC80211_RT61}/etc/modules.d/30-rt61
-	echo "rt2x00pci" >> ${IDIR_KMOD_MAC80211_RT61}/etc/modules.d/30-rt61
-	echo "rt61pci" >> ${IDIR_KMOD_MAC80211_RT61}/etc/modules.d/30-rt61
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/macchanger/Config.in b/package/macchanger/Config.in
deleted file mode 100644
index e9d715809..000000000
--- a/package/macchanger/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_MACCHANGER
-        tristate "macchanger........................ utility for viewing/manipulating the MAC address"
-	default n
-	help
-		This is a GNU/Linux utility for viewing/manipulating the MAC address
-		of network interfaces.
-		
-		http://www.alobbs.com/macchanger
diff --git a/package/madplay/Config.in b/package/madplay/Config.in
deleted file mode 100644
index fab328aae..000000000
--- a/package/madplay/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_MADPLAY
-       tristate "madplay........................... MPEG audio player in fixed point"
-       default n
-       select ADK_PACKAGE_LIBID3TAG 
-       select ADK_PACKAGE_LIBMAD
-       help
-         MAD is an MPEG audio decoder. It currently only supports the MPEG 1
-         standard, but fully implements all three audio layers (Layer I, Layer II,
-         and Layer III, the latter often colloquially known as MP3.).  There is also
-         full support for ID3 tags.
-
-
diff --git a/package/madplay/Makefile b/package/madplay/Makefile
index e890cc3c2..1ac596651 100644
--- a/package/madplay/Makefile
+++ b/package/madplay/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		madplay
 PKG_VERSION:=		0.15.2b
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libid3tag libmad
 PKG_MD5SUM:=		6814b47ceaa99880c754c5195aa1aac1
 PKG_DESCR:=		MPEG audio player in fixed point
 PKG_SECTION:=		sound
diff --git a/package/make/Config.in b/package/make/Config.in
deleted file mode 100644
index 6fe261e4c..000000000
--- a/package/make/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_MAKE
-	prompt "make.............................. GNU make"
-	tristate
-	default n
-	help
-	  GNU make
diff --git a/package/maradns/Config.in b/package/maradns/Config.in
deleted file mode 100644
index 18958c427..000000000
--- a/package/maradns/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_MARADNS
-	prompt "maradns........................... Small and secure DNS Server"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  A small and secure DNS server
-	  
-	  http://www.maradns.org/
-
diff --git a/package/maradns/Makefile b/package/maradns/Makefile
index 174e60ccc..dc627ffe6 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		maradns
 PKG_VERSION:=		1.3.07.09
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libpthread
 PKG_MD5SUM:=		1d221438fb4d9317263555262b9c652c
 PKG_DESCR:=		small and secure DNS server
 PKG_SECTION:=		net
diff --git a/package/mc/Config.in b/package/mc/Config.in
deleted file mode 100644
index daa4ecf9c..000000000
--- a/package/mc/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_MC
-	prompt "mc................................ The Midnight Commander (CUI filemanager)"
-	tristate
-	default n
-	select ADK_PACKAGE_GLIB
-	select ADK_PACKAGE_LIBNCURSES
-	help
-	  Clone of the widely known Norton/Volkov Commander for DOS;
-	  console-mode UI file manager with many extended functions
diff --git a/package/mc/Makefile b/package/mc/Makefile
index 056ff02b6..20b232bc1 100644
--- a/package/mc/Makefile
+++ b/package/mc/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		mc
 PKG_VERSION=		4.6.1
 PKG_RELEASE=		1
+PKG_BUILDDEP+=		glib ncurses
 PKG_MD5SUM=		18b20db6e40480a53bac2870c56fc3c4
 PKG_DESCR:=		norton commander clone
 PKG_SECTION:=		misc
diff --git a/package/mdadm/Config.in b/package/mdadm/Config.in
deleted file mode 100644
index 1863ba211..000000000
--- a/package/mdadm/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_MDADM
-	prompt "mdadm............................. tool for managing Linux Software RAID arrays"
-	tristate
-	default n
-	help
- 	  http://neil.brown.name/blog/mdadm
diff --git a/package/mgetty/Config.in b/package/mgetty/Config.in
deleted file mode 100644
index 286134c46..000000000
--- a/package/mgetty/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_MGETTY
-	prompt "mgetty+sendfax.................... the data/fax solution for your analog modem"
-	tristate
-	default n
-	help
-	 mgetty now includes sendfax (and AutoPPP)
-	 using pppd for data and doing fax/login by itself.
diff --git a/package/miau/Config.in b/package/miau/Config.in
deleted file mode 100644
index 4ab17bcad..000000000
--- a/package/miau/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_MIAU
-	prompt "miau.............................. Another IRC-bouncer/proxy"
-	tristate
-	default n
-	help
-	  In short, miau is an IRC-bouncer/proxy. 
-	  Being more verbose, miau is small but quite featured 
-	  IRC-bouncer - a service bit like HTTP-proxy, but
-	  for IRC-networks.
-	  
-	  http://sourceforge.net/projects/miau/
-	  
diff --git a/package/miax/Config.in b/package/miax/Config.in
deleted file mode 100644
index 0339f0c15..000000000
--- a/package/miax/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_MIAX
-	prompt "miax.............................. A console iax (asterisk) client"
-	tristate
-	default n
-	select ADK_PACKAGE_BLUEZ
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  miax is a console iax (asterisk) client, it can work with
-	  a soundcard as a normal voip phone, taking input/output from
-	  keyboard, analog/gsm/isdn modem or bluetooth phones.
-	  
-	  http://www.eja.it/?l=gpl&testo=miax
diff --git a/package/miax/Makefile b/package/miax/Makefile
index f028a4879..9e815a0a1 100644
--- a/package/miax/Makefile
+++ b/package/miax/Makefile
@@ -6,10 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		miax
 PKG_VERSION:=		1.4
 PKG_RELEASE:=		1
+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/microperl/Config.in b/package/microperl/Config.in
deleted file mode 100644
index ccd9c9bd9..000000000
--- a/package/microperl/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_MICROPERL
-	prompt "microperl......................... A really minimal perl"
-	tristate
-	default n
-	help
-	  Perl without operating-specific functions such as readdir.
-
diff --git a/package/mini_httpd/Config.in b/package/mini_httpd/Config.in
deleted file mode 100644
index bd83fdb09..000000000
--- a/package/mini_httpd/Config.in
+++ /dev/null
@@ -1,66 +0,0 @@
-config ADK_COMPILE_MINI_HTTPD
-	tristate
-	default n
-	depends on ADK_PACKAGE_MINI_HTTPD || ADK_PACKAGE_MINI_HTTPD_OPENSSL
-
-config ADK_PACKAGE_MINI_HTTPD
-	prompt "mini-httpd........................ A small web server"
-	tristate
-	default n
-	select ADK_COMPILE_MINI_HTTPD
-	help
-	  mini_httpd is a small HTTP server. Its performance is not great, but for
-	  low or medium traffic sites it's quite adequate. It implements all the
-	  basic features of an HTTP server, including:
-	  
-	     * GET, HEAD, and POST methods.
-	     * CGI.
-	     * Basic authentication.
-	     * Security against ".." filename snooping.
-	     * The common MIME types.
-	     * Trailing-slash redirection.
-	     * index.html, index.htm, index.cgi
-	     * Directory listings.
-	     * Multihoming / virtual hosting.
-	     * Standard logging.
-	     * Custom error pages.
-	  
-	  It can also be configured to do IPv6.
-	  
-	  http://www.acme.com/software/mini_httpd/
-
-config ADK_PACKAGE_MINI_HTTPD_HTPASSWD
-	prompt "mini-httpd-htpasswd............... Utility to generate HTTP access files"
-	tristate
-	default n
-	select ADK_PACKAGE_MINI_HTTPD
-	help
-		This file generates .htaccess/.htpasswd files to use HTTP access		authentication
-
-
-config ADK_PACKAGE_MINI_HTTPD_OPENSSL
-	prompt "mini-httpd-openssl................ A small web server, built with SSL support using OpenSSL"
-	tristate
-	default n
-	select ADK_COMPILE_MINI_HTTPD
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-	  mini_httpd is a small HTTP server. Its performance is not great, but for
-	  low or medium traffic sites it's quite adequate. It implements all the
-	  basic features of an HTTP server, including:
-	  
-	     * GET, HEAD, and POST methods.
-	     * CGI.
-	     * Basic authentication.
-	     * Security against ".." filename snooping.
-	     * The common MIME types.
-	     * Trailing-slash redirection.
-	     * index.html, index.htm, index.cgi
-	     * Directory listings.
-	     * Multihoming / virtual hosting.
-	     * Standard logging.
-	     * Custom error pages.
-	  
-	  It can also be configured to do SSL/HTTPS and IPv6.
-	  
-	  http://www.acme.com/software/mini_httpd/
diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile
index e43e7f4bf..3c86442a4 100644
--- a/package/mini_httpd/Makefile
+++ b/package/mini_httpd/Makefile
@@ -6,6 +6,9 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mini-httpd
 PKG_VERSION:=		1.19
 PKG_RELEASE:=		10
+ifneq ($(ADK_PACKAGE_MINI_HTTPD_OPENSSL),)
+PKG_BUILDDEP+=		openssl
+endif
 PKG_MD5SUM:=		7c68293ad265ecfe2edea917912f6f1f
 PKG_DESCR:=		A small HTTP server
 PKG_SECTION:=		net
diff --git a/package/mini_sendmail/Config.in b/package/mini_sendmail/Config.in
deleted file mode 100644
index 70d2218d0..000000000
--- a/package/mini_sendmail/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_MINI_SENDMAIL
-	prompt "mini-sendmail..................... A small sendmail-compatible mail forwarder"
-	tristate
-	default n
-	help
-	  mini_sendmail reads its standard input up to an end-of-file and sends a 
-	  copy of the message found there to all of the addresses listed.
-	  The message is sent by connecting to a local SMTP server. This means 
-	  mini_sendmail can be used to send email from inside a chroot(2) area. 
-	  
-	  http://www.acme.com/software/mini_sendmail/
-
diff --git a/package/miredo/Config.in b/package/miredo/Config.in
deleted file mode 100644
index 7db74de53..000000000
--- a/package/miredo/Config.in
+++ /dev/null
@@ -1,29 +0,0 @@
-config ADK_COMPILE_MIREDO
-	tristate
-	default n
-	depends on ADK_PACKAGE_MIREDO || ADK_PACKAGE_MIREDO_SERVER
-
-config ADK_PACKAGE_MIREDO
-	prompt "miredo............................ Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon"
-	tristate
-	default n
-	select ADK_COMPILE_MIREDO
-	select ADK_KPACKAGE_KMOD_IPV6
-	select ADK_KPACKAGE_KMOD_TUN
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  A Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon.
-	  http://www.simphalempin.com/dev/miredo/
-
-config ADK_PACKAGE_MIREDO_SERVER
-	prompt "miredo-server..................... Teredo (IPv6 tunneling over UDP through NAT) server daemon"
-	tristate
-	default n
-	select ADK_COMPILE_MIREDO
-	select ADK_KPACKAGE_KMOD_IPV6
-	select ADK_KPACKAGE_KMOD_TUN
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  A Teredo (IPv6 tunneling over UDP through NAT) server daemon.
-	  
-	  http://www.simphalempin.com/dev/miredo/
diff --git a/package/miredo/Makefile b/package/miredo/Makefile
index d6fa6a968..8fbe95b48 100644
--- a/package/miredo/Makefile
+++ b/package/miredo/Makefile
@@ -6,6 +6,9 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		miredo
 PKG_VERSION:=		1.1.6
 PKG_RELEASE:=		1
+ifeq (${ADK_COMPILE_MIREDO_WITH_UCLIBCXX},y)
+PKG_BUILDDEP+=		uclibc++
+endif
 PKG_MD5SUM:=		bf49c1ddc068746760787d0cf76e40de
 PKG_DESCR:=		A Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon
 PKG_SECTION:=		net
diff --git a/package/mksh/Config.in b/package/mksh/Config.in
deleted file mode 100644
index 50578b0d2..000000000
--- a/package/mksh/Config.in
+++ /dev/null
@@ -1,31 +0,0 @@
-config ADK_PACKAGE_MKSH
-	prompt "mksh................................. The MirBSD enhanced Korn Shell"
-	tristate
-	default n
-	help
-	  mksh is the MirBSD enhanced version of the Public Domain Korn
-	  shell (pdksh), a bourne-compatible shell which is largely si-
-	  milar to the original AT&T Korn shell.  It includes bug fixes
-	  and feature improvements in order to produce a modern, robust
-	  shell good for interactive and especially script use.  It has
-	  UTF-8 support in the emacs command line editing mode; corres-
-	  ponds to OpenBSD 4.4-beta ksh without GNU bash-like $PS1; the
-	  build environment requirements are autoconfigured; throughout
-	  code simplification/bugfix/enhancement has been done, and the
-	  shell has extended compatibility to other modern shells.
-
-	  This package also installs mksh as /bin/ash and /bin/sh (i.e.
-	  the default Bourne/POSIX shell) and creates a ~/.mkshrc file,
-	  which can be used to further customise the look and feel.
-
-	  http://mirbsd.de/mksh
-
-config ADK_PACKAGE_MKSH_FULL
-	bool "Include all features"
-	depends on ADK_PACKAGE_MKSH
-	default y
-	help
-	  Disable this to remove a few functions from mksh to make it smaller.
-	  Ideal for embedded systems. However, be aware you will lose some
-	  functionality you'd otherwise expect, among these is the vi command
-	  line editing mode.
diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index aeb4fe44e..1298e4cfe 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -3,18 +3,21 @@
 
 include ${TOPDIR}/rules.mk
 
-PKG_NAME=		mksh
-PKG_VERSION=		39
-PKG_RELEASE=		1
-PKG_MD5SUM=		b2eeb4fe4ccac2704e1440e53cd2672c
+PKG_NAME:=		mksh
+PKG_VERSION:=		39
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		b2eeb4fe4ccac2704e1440e53cd2672c
 PKG_DESCR:=		MirBSD Korn Shell
 PKG_SECTION:=		shells
 PKG_URL:=		http://www.mirbsd.org
-PKG_SITES=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
+PKG_SITES:=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
 
 DISTFILES=		${PKG_NAME}-R${PKG_VERSION}.cpio.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}
 
+PKG_FLAVOURS:=		FULL
+PKGFD_FULL:=		Include all features
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MKSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/moc/Config.in b/package/moc/Config.in
deleted file mode 100644
index 823cac68d..000000000
--- a/package/moc/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_MOC
-	tristate "moc............................... console audio player"
-	default n
-	select ADK_PACKAGE_LIBVORBIS
-	select ADK_PACKAGE_LIBMAD
-	select ADK_PACKAGE_LIBCURL
-	select ADK_PACKAGE_LIBFLAC
-	select ADK_PACKAGE_FFMPEG
-	help
-  	  console audio player
-	  Supports mp3, ogg, wav, mp4, flac and stream audio formats.
-	  http://moc.daper.net/   
-
diff --git a/package/moc/Makefile b/package/moc/Makefile
index 994ced6c6..18a255ae1 100644
--- a/package/moc/Makefile
+++ b/package/moc/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		moc
 PKG_VERSION:=		2.4.4
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libvorbis curl libmad flac ffmpeg
 PKG_MD5SUM:=		647c770a5542a4ae5437386807a89796
 PKG_DESCR:=		console music player
 PKG_SECTION:=		sound
diff --git a/package/monit/Config.in b/package/monit/Config.in
deleted file mode 100644
index b8d1eec59..000000000
--- a/package/monit/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config ADK_PACKAGE_MONIT
-	prompt "monit............................. System services monitoring utility"
-	tristate
-	select ADK_PACKAGE_LIBPTHREAD
-	default n
-	help
-	  An utility for monitoring services on a Unix system
-	  http://www.tildeslash.com/monit/
-
-config ADK_COMPILE_MONIT_WITH_SSL
-	prompt "Compile with SSL support"
-	tristate
-	select ADK_PACKAGE_LIBOPENSSL
-	depends on ADK_PACKAGE_MONIT
-	default n
-	help
-	  Enable SSL
diff --git a/package/monit/Makefile b/package/monit/Makefile
index 99bc8e68e..80a6caa0a 100644
--- a/package/monit/Makefile
+++ b/package/monit/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		monit
 PKG_VERSION:=		5.0.3
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		dae7859ec10551fc941daeae60dee9d3
 PKG_DESCR:=		An utility for system services monitoring
 PKG_SECTION:=		admin
diff --git a/package/motion/Config.in b/package/motion/Config.in
deleted file mode 100644
index 3b3861036..000000000
--- a/package/motion/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_MOTION
-	prompt "motion............................ webcam motion sensing and logging"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBJPEG
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  Motion is a software motion detector
-
-	  http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome
diff --git a/package/motion/Makefile b/package/motion/Makefile
index 80f70edc0..c3a49e3be 100644
--- a/package/motion/Makefile
+++ b/package/motion/Makefile
@@ -6,6 +6,9 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		motion
 PKG_VERSION:=		3.2.11
 PKG_RELEASE:=		1
+ifneq ($(ADK_PACKAGE_MOTION),)
+PKG_BUILDDEP+=		jpeg
+endif
 PKG_MD5SUM:=		3a26c00f3250eacf6fa93c7a7e0249d9
 PKG_DESCR:=		Webcam motion sensing and logging
 PKG_SECTION:=		multimedia
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
deleted file mode 100644
index aaf317a91..000000000
--- a/package/mpd/Config.in
+++ /dev/null
@@ -1,138 +0,0 @@
-menu "mpd............................... Music Player Daemon"
-
-config ADK_PACKAGE_MPD
-	prompt "mpd............................... Music Player Daemon"
-	tristate
-	default n
-	select ADK_PACKAGE_GLIB
-	help
-	  MPD is a music player supporting flac, mp3 and ogg files.
-	  It is typically controlled over a network using one of it's many
-	  clients including mpc(console), gmpc(gnome), phpmp(php) etc.
-	  http://www.musicpd.org/
-
-config ADK_COMPILE_MPD_WITH_ALSA
-	prompt   "ALSA playback support"
-	bool
-	default y
-	depends on ADK_PACKAGE_MPD
-	select ADK_PACKAGE_ALSA_LIB
-	help
-	  Enable ALSA playback support.
-
-config ADK_COMPILE_MPD_WITH_SHOUT
-	prompt   "Shoutcast playback support"
-	bool
-	default y
-	depends on ADK_PACKAGE_MPD
-	select ADK_PACKAGE_LIBSHOUT
-	select ADK_PACKAGE_LIBVORBISENC
-	select ADK_PACKAGE_LIBLAME
-	help
-	  Enable shout support (libshout).
-
-config ADK_COMPILE_MPD_WITH_MP3
-	prompt   "MP3 support"
-	bool
-	default y
-	depends on ADK_PACKAGE_MPD
-	select ADK_PACKAGE_LIBMAD
-	select ADK_PACKAGE_LIBID3TAG
-	help
-	  Enable mp3 support (libmad).
-
-config ADK_COMPILE_MPD_WITH_MP4
-	prompt   "MP4/AAC support"
-	bool
-	default y
-	depends on ADK_PACKAGE_MPD
-	select ADK_PACKAGE_LIBFAAD2
-	help
-	  Enable mp4/aac support (libfaad2).
-
-config ADK_COMPILE_MPD_OGG
-	prompt   "Ogg/Vorbis Support"
-	bool
-	depends on ADK_PACKAGE_MPD
-	select ADK_COMPILE_MPD_WITH_OGG if ADK_COMPILE_MPD_OGG_FLOAT
-	select ADK_COMPILE_MPD_WITH_TREMOR if ADK_COMPILE_MPD_OGG_FIXED
-	default y
-	help
-		Ogg/Vorbis support.
-
-choice
-prompt "Ogg type"
-depends on ADK_COMPILE_MPD_OGG
-config ADK_COMPILE_MPD_OGG_FLOAT
-	bool "Ogg/Vorbis (floating point implementation)"
-config ADK_COMPILE_MPD_OGG_FIXED
-	bool "Ogg/Vorbis (fixed point implementation)"
-endchoice
-
-config ADK_COMPILE_MPD_WITH_OGG
-	bool
-	default n
-	depends on ADK_PACKAGE_MPD
-	depends on ADK_COMPILE_MPD_OGG_FLOAT
-	select ADK_PACKAGE_LIBOGG
-	select ADK_PACKAGE_LIBVORBIS
-	help
-	  Enable ogg vorbis support.
-
-config ADK_COMPILE_MPD_WITH_TREMOR
-	bool
-	default n
-	depends on ADK_PACKAGE_MPD
-	depends on ADK_COMPILE_MPD_OGG_FIXED
-	select ADK_PACKAGE_LIBVORBISIDEC
-	help
-	  Enable ogg support (tremor).
-          Can not be used with shout plugin.
-
-config ADK_COMPILE_MPD_WITH_FLAC
-	prompt   "FLAC Support"
-	bool
-	default y
-	depends on ADK_PACKAGE_MPD
-	select ADK_PACKAGE_LIBFLAC
-	help
-	  Enable flac support (libflac).
-
-config ADK_COMPILE_MPD_WITH_WAV
-	prompt   "WAVE/AU Support"
-	bool
-	default y
-	depends on ADK_PACKAGE_MPD
-	select ADK_PACKAGE_LIBAUDIOFILE
-	help
-	  Enable wave support (libaudiofile).
-
-config ADK_COMPILE_MPD_WITH_CURL
-	prompt   "HTTP streaming support"
-	bool
-	default y
-	depends on ADK_PACKAGE_MPD
-	select ADK_PACKAGE_LIBCURL
-	help
-	  Enable http streaming support (libcurl).
-
-config ADK_COMPILE_MPD_WITH_MMS
-	prompt   "MMS streaming support"
-	bool
-	default n
-	depends on ADK_PACKAGE_MPD
-	select ADK_PACKAGE_LIBMMS
-	help
-	  Enable mms streaming support (libmms).
-
-config ADK_COMPILE_MPD_WITH_FFMPEG
-	prompt   "FFMPEG support"
-	bool
-	default n
-	depends on ADK_PACKAGE_MPD
-	select ADK_PACKAGE_FFMPEG
-	help
-	  Enable FFMPEG support (ffmpeg).
-
-
-endmenu
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index e0da5805d..150391af3 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -6,6 +6,37 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mpd
 PKG_VERSION:=		0.15.6
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		alsa-lib glib
+ifneq ($(ADK_COMPILE_MPD_WITH_MP3),)
+PKG_BUILDDEP+=		libid3tag libmad
+endif
+ifneq ($(ADK_COMPILE_MPD_WITH_MP4),)
+PKG_BUILDDEP+=		faad2
+endif
+ifneq ($(ADK_COMPILE_MPD_WITH_OGG),)
+PKG_BUILDDEP+=		libvorbis
+endif
+ifneq ($(ADK_COMPILE_MPD_WITH_TREMOR),)
+PKG_BUILDDEP+=		libvorbisidec
+endif
+ifneq ($(ADK_COMPILE_MPD_WITH_FLAC),)
+PKG_BUILDDEP+=		flac
+endif
+ifneq ($(ADK_COMPILE_MPD_WITH_WAV),)
+PKG_BUILDDEP+=		libaudiofile
+endif
+ifneq ($(ADK_COMPILE_MPD_WITH_SHOUT),)
+PKG_BUILDDEP+=		lame
+endif
+ifneq ($(ADK_COMPILE_MPD_WITH_CURL),)
+PKG_BUILDDEP+=		curl
+endif
+ifneq ($(ADK_COMPILE_MPD_WITH_MMS),)
+PKG_BUILDDEP+=		libmms
+endif
+ifneq ($(ADK_COMPILE_MPD_WITH_FFMPEG),)
+PKG_BUILDDEP+=		ffmpeg
+endif
 PKG_MD5SUM:=		c78b8933e4902c5dc407d59925f8b10e
 PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		net
diff --git a/package/mpfr/Config.in b/package/mpfr/Config.in
deleted file mode 100644
index 8a375ff6f..000000000
--- a/package/mpfr/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_MPFR
-	prompt "mpfr.............................. multiprecision floatingpoint library"
-	tristate
-	default n
-	help
-	  http://www.mpfr.org
diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in
deleted file mode 100644
index edc4f291f..000000000
--- a/package/mplayer/Config.in
+++ /dev/null
@@ -1,19 +0,0 @@
-config ADK_PACKAGE_MPLAYER
-	prompt "mplayer........................... popular movie player"
-	tristate
-	default n
-	select ADK_PACKAGE_ALSA_LIB
-	select ADK_PACKAGE_LIBJPEG
-	select ADK_PACKAGE_LIBPNG
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_LIBOGG
-	select ADK_PACKAGE_LIBMAD
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBFAAD2
-	select ADK_PACKAGE_LIBVORBIS
-	select ADK_PACKAGE_ZLIB
-	depends on ADK_LINUX_X86_ALIX1C || \
-		ADK_LINUX_X86_QEMU
-	help
-          http://www.mplayerhq.hu
-
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index fc32bf9b2..89127b715 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mplayer
 PKG_VERSION:=		1.0-29987
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		alsa-lib libmad libvorbis faad2 ncurses zlib
 PKG_MD5SUM:=		416fa6a247987305d74572d03dc6dde7
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		video
@@ -13,6 +14,8 @@ PKG_DEPENDS:=		zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthr
 PKG_URL:=		http://www.mplayerhq.hu
 PKG_SITES:=		http://openadk.org/distfiles/
 
+PKG_TARGET_DEPENDS:=	alix1c x86_qemu x86_64_qemu
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/mrd6/Config.in b/package/mrd6/Config.in
deleted file mode 100644
index 6bfc097bd..000000000
--- a/package/mrd6/Config.in
+++ /dev/null
@@ -1,32 +0,0 @@
-config ADK_PACKAGE_MRD6
-	prompt "mrd6.............................. IPv6 multicast routing daemon"
-	tristate
-	default n
-	help
-		Multicast is becoming a major component in next generation 
-		networks, used in several scenarios, from video broadcasting 
-		to multimedia conferencing. In order to be implemented, new 
-		technology needs supporting hardware and software across a set 
-		of devices and systems. MRD6 is an implementation of a modular 
-		IPv6 Multicast Routing Framework for the Linux operating system 
-		and provides MLDv2 (as well as MLDv1), PIM-SM and MBGP support.
-
-		http://artemis.av.it.pt/mrd6/
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_MRD6
-default ADK_COMPILE_MRD6_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
-default ADK_COMPILE_MRD6_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_MRD6_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_MRD6_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	help
-
-endchoice
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 6f6ffb363..bec5f0903 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mrd6
 PKG_VERSION:=		0.9.6
 PKG_RELEASE:=		1
+PKG_CXX:=		MRD6
 PKG_MD5SUM:=		93ada53bb414b9d622f80a717bc2694b
 PKG_DESCR:=		IPv6 multicast routing daemon
 PKG_SECTION:=		net
@@ -16,12 +17,6 @@ WRKBUILD=		${WRKSRC}/src
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
-PKG_DEPENDS:=		uclibc++
-else
-PKG_DEPENDS:=		libstdcxx
-endif
-
 $(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
diff --git a/package/mt-daapd/Config.in b/package/mt-daapd/Config.in
deleted file mode 100644
index 166e490cf..000000000
--- a/package/mt-daapd/Config.in
+++ /dev/null
@@ -1,31 +0,0 @@
-config ADK_PACKAGE_MT_DAAPD
-	prompt "mt-daapd.......................... A multi-threaded DAAP (Digital Audio Access Protocol) daemon"
-	tristate 
-	default n
-	select ADK_PACKAGE_LIBGDBM
-	select ADK_PACKAGE_LIBID3TAG
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  mt-daapd is a program which acts as an iTunes (DAAP) server for Linux and 
-	  other POSIX unixes. It may eventually support Win32 as well.
-	  
-	  Some random features that it supports:
-	  
-	    * Supports the Roku SoundBridge (query/browse/index support) 
-	    * Supports periodic rescans of the database 
-	    * Can advertise shoutcast streams 
-	    * Supports password-protected shares 
-	    * Is web-configurable and managable 
-	    * Support dynamic playlists, like iTunes "Smart playlists" 
-	    * Probably other things I've forgotten 
-	  
-	  All is not perfect, however. Currently, there are several drawbacks to it:
-	  
-	    * database is indexed by inode, so all music must be on one filesystem 
-	    * browse by artist is slow on Roku, times out (with large databases ~10K songs) 
-	    * Probably other things I've forgotten 
-	  
-	  http://www.mt-daapd.org/
-	  
-	  Depends: libgdbm, libid3tag, libpthread
-
diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile
index b42b26654..213dcee68 100644
--- a/package/mt-daapd/Makefile
+++ b/package/mt-daapd/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mt-daapd
 PKG_VERSION:=		0.2.4
 PKG_RELEASE:=		10
+PKG_BUILDDEP+=		gdbm libid3tag
 PKG_MD5SUM:=		2e1cdbe6b94ef153e915806f80a28dca
 PKG_DESCR:=		a multi-threaded DAAP (Digital Audio Access Protocol) daemon
 PKG_SECTION:=		net
diff --git a/package/mtd/Config.in b/package/mtd/Config.in
deleted file mode 100644
index aacc297b5..000000000
--- a/package/mtd/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_MTD
-	prompt "mtd................................ mtd utility"
-	tristate
-	depends on \
-		ADK_LINUX_CRIS_FOXBOARD || \
-		ADK_LINUX_MIPS_AG241
-	default n
-	help
-	  MTD utility.
diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index 67aa1f30c..a04bd4693 100644
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_DESCR:=		MTD utility
 PKG_SECTION:=		base
 
+PKG_TARGET_DEPENDS:=	ag241 foxboard
+
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
 
@@ -27,6 +29,6 @@ do-build:
 
 do-install:
 	${INSTALL_DIR} ${IDIR_MTD}/sbin
-	${INSTALL_BIN} ${WRKBUILD}/mtd ${IDIR_MTD}/sbin/mtd
+	${INSTALL_BIN} ${WRKBUILD}/mtd ${IDIR_MTD}/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mtr/Config.in b/package/mtr/Config.in
deleted file mode 100644
index 7de08c5c8..000000000
--- a/package/mtr/Config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-config ADK_PACKAGE_MTR
-	prompt "mtr............................... Full screen ncurses traceroute tool"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNCURSES
-	help
-	  mtr combines the functionality of the 'traceroute' and 'ping' programs
-	  in a single network diagnostic tool.
-	  .
-	  As mtr starts, it investigates the network connection between the host
-	  mtr runs on and a user-specified destination host.  After it
-	  determines the address of each network hop between the machines,
-	  it sends a sequence ICMP ECHO requests to each one to determine the
-	  quality of the link to each machine.  As it does this, it prints
-	  running statistics about each machine.
-	  .
-	  http://www.bitwizard.nl/mtr/
-
diff --git a/package/mtr/Makefile b/package/mtr/Makefile
index a53f2ee8d..3147750b2 100644
--- a/package/mtr/Makefile
+++ b/package/mtr/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mtr
 PKG_VERSION:=		0.75
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		23baca52d0922c2ecba7eba05317868c
 PKG_DESCR:=		ncurses traceroute/ping tool
 PKG_SECTION:=		net
diff --git a/package/mutt/Config.in b/package/mutt/Config.in
deleted file mode 100644
index 3be7e0768..000000000
--- a/package/mutt/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_MUTT
-	prompt "mutt.............................. console mail client"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-	  Mail client for the text console
-	  
-	  http://www.mutt.org
-
diff --git a/package/mutt/Makefile b/package/mutt/Makefile
index 4645ec40c..cf698f6d3 100644
--- a/package/mutt/Makefile
+++ b/package/mutt/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mutt
 PKG_VERSION:=		1.5.20
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		ncurses openssl
 PKG_MD5SUM:=		027cdd9959203de0c3c64149a7ee351c
 PKG_DESCR:=		Mail text client
 PKG_SECTION:=		text
diff --git a/package/mysql/Config.in b/package/mysql/Config.in
deleted file mode 100644
index d70221a1c..000000000
--- a/package/mysql/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config ADK_COMPILE_MYSQL
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBMYSQLCLIENT
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_ZLIB
-	select ADK_PACKAGE_LIBREADLINE
-
-config ADK_PACKAGE_LIBMYSQLCLIENT
-	prompt "libmysqlclient.................... MySQL client library"
-	tristate
-	default n
-	select ADK_COMPILE_MYSQL
-	help
-	  MySQL client library.
-	  http://dev.mysql.com/
-
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 7c3ffbcd2..db20a04af 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mysql
 PKG_VERSION:=		5.0.85
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		ncurses zlib readline
 PKG_MD5SUM:=		f672ec5154f8ea3db87fec5e0b227f4c
 PKG_DESCR:=		MySQL client library
 PKG_SECTION:=		libs
diff --git a/package/nano/Config.in b/package/nano/Config.in
deleted file mode 100644
index 9ba6cc157..000000000
--- a/package/nano/Config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-config ADK_PACKAGE_NANO
-	prompt "nano.............................. An enhanced clone of the Pico text editor"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNCURSES
-	help
-	  GNU nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone of the Pico text editor.
-	  
-	  http://www.nano-editor.org/
-
-config ADK_PACKAGE_NANO_TINY
-	prompt "only compile a minimal nano (using --enable-tiny)"
-	bool
-	default y
-	depends on ADK_PACKAGE_NANO
-	help
-	  If not selected, nano will support justify, line wrapping, tab completion and multiple open file buffers.
-
diff --git a/package/nano/Makefile b/package/nano/Makefile
index 455bc7972..a4dcc2290 100644
--- a/package/nano/Makefile
+++ b/package/nano/Makefile
@@ -6,12 +6,14 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		nano
 PKG_VERSION:=		2.0.9
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		2be94dc43fb60fff4626a2401a977220
 PKG_DESCR:=		An enhanced clone of the Pico text editor
 PKG_SECTION:=		admin
 PKG_DEPENDS:=		libncurses
 PKG_URL:=		http://www.nano-editor.org
 PKG_SITES:=		http://www.nano-editor.org/dist/v2.0/
+PKG_FLAVOURS:=		TINY
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/ncurses/Config.in b/package/ncurses/Config.in
deleted file mode 100644
index 63ad59b23..000000000
--- a/package/ncurses/Config.in
+++ /dev/null
@@ -1,25 +0,0 @@
-config ADK_COMPILE_NCURSES
-	tristate
-	depends on ADK_PACKAGE_LIBNCURSES
-
-config ADK_PACKAGE_LIBNCURSES
-	prompt "libncurses........................ Terminal handling library"
-	tristate
-	default n
-	select ADK_COMPILE_NCURSES
-	help
-	  A terminal handling library
-	  
-	  Comes with: libcurses libform libmenu libncurses libpanel
-	  
-	  http://www.gnu.org/software/ncurses/
-
-config ADK_PACKAGE_LIBNCURSES_DEV
-	prompt "libncurses-dev.................. Ncurses development package"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBNCURSES
-	select ADK_COMPILE_NCURSES
-	help
-	  A terminal handling library
-
diff --git a/package/ndisc/Config.in b/package/ndisc/Config.in
deleted file mode 100644
index 0fcfe06e2..000000000
--- a/package/ndisc/Config.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#menu "ndisc6............................ IPv6 discovery tools"
-
-config ADK_COMPILE_NDISC6
-	tristate
-	default n
-	depends on ADK_PACKAGE_NDISC6 || ADK_PACKAGE_RDISC6 || ADK_PACKAGE_TCPTRACEROUTE6
-
-config ADK_PACKAGE_NDISC6
-	prompt "ndisc6............................ An ICMPv6 neighbour discovery tool"
-	tristate
-	default n
-	select ADK_COMPILE_NDISC6
-	help
-	  
-	  An ICMPv6 neighbour discovery tools
-	  
-	  http://people.via.ecp.fr/~rem/ndisc6/
-
-config ADK_PACKAGE_RDISC6
-	prompt "rdisc6............................ An ICMPv6 router discovery tool"
-	tristate
-	default n
-	select ADK_COMPILE_NDISC6
-	help
-	  
-	  An ICMPv6 router discovery tool
-	  
-	  http://people.via.ecp.fr/~rem/ndisc6/
-
-config ADK_PACKAGE_TCPTRACEROUTE6
-	prompt "tcptraceroute6.................... A TCP/IPv6-based traceroute implementation"
-	tristate
-	default n
-	select ADK_COMPILE_NDISC6
-	help
-	  
-	  A TCP/IPv6-based traceroute implementation
-	  
-	  http://people.via.ecp.fr/~rem/ndisc6/
-
-#endmenu
diff --git a/package/neon/Config.in b/package/neon/Config.in
deleted file mode 100644
index 70609f89f..000000000
--- a/package/neon/Config.in
+++ /dev/null
@@ -1,31 +0,0 @@
-config ADK_PACKAGE_NEON
-	prompt "neon.............................. an HTTP and WebDAV client library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBXML2
-	select ADK_PACKAGE_ZLIB
-	help
-	  neon is an HTTP and WebDAV client library, with a C interface.
-	  
-	  Featuring:
-	  
-	  * High-level interface to HTTP and WebDAV methods (PUT, GET,
-	    HEAD etc)
-	  * Low-level interface to HTTP request handling, to allow
-	    implementing new methods easily.
-	  * persistent connections
-	  * RFC2617 basic and digest authentication (including auth-int,
-	    md5-sess)
-	  * Proxy support (including basic/digest authentication)
-	  * SSL/TLS support using OpenSSL (including client certificate
-	    support)
-	  * Generic WebDAV 207 XML response handling mechanism
-	  * XML parsing using the expat or libxml parsers
-	  * Easy generation of error messages from 207 error responses
-	  * WebDAV resource manipulation: MOVE, COPY, DELETE, MKCOL.
-	  * WebDAV metadata support: set and remove properties, query any
-	    set of properties (PROPPATCH/PROPFIND).
-	  * autoconf macros supplied for easily embedding neon directly
-	    inside an application source tree.
diff --git a/package/neon/Makefile b/package/neon/Makefile
index e0d6c88d8..b284df38b 100644
--- a/package/neon/Makefile
+++ b/package/neon/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		neon
 PKG_VERSION=		0.28.4
 PKG_RELEASE=		1
+PKG_BUILDDEP+=		libpthread libxml2 openssl zlib
 PKG_MD5SUM=		6c3b94362af743d046e198e9fcbe4a85
 PKG_DESCR:=		HTTP and WebDAV library
 PKG_SECTION:=		libs
diff --git a/package/net-snmp/Config.in b/package/net-snmp/Config.in
deleted file mode 100644
index 08c28f508..000000000
--- a/package/net-snmp/Config.in
+++ /dev/null
@@ -1,52 +0,0 @@
-config ADK_COMPILE_NET_SNMP
-	bool
-	default n
-
-config ADK_PACKAGE_LIBNETSNMP
-	prompt "net-snmp-libs..................... SNMP shared libraries"
-	tristate
-	default n
-	select ADK_COMPILE_NET_SNMP
-	select ADK_PACKAGE_LIBELF
-	help
-	  Simple Network Management Protocol (SNMP) is a widely used
-	  protocol for monitoring the health and welfare of network
-	  equipment (eg. routers), computer equipment and even devices
-	  like UPSs. Net-SNMP is a suite of applications used to implement
-	  SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6.
-	  
-	  http://www.net-snmp.org/
-	  
-	  This package contains shared libraries, needed by other programs.
-
-config ADK_PACKAGE_SNMP_UTILS
-	prompt "net-snmp-utils.................... SNMP client utilities"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNETSNMP
-	help
-	  Simple Network Management Protocol (SNMP) is a widely used
-	  protocol for monitoring the health and welfare of network
-	  equipment (eg. routers), computer equipment and even devices
-	  like UPSs. Net-SNMP is a suite of applications used to implement
-	  SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6.
-	  
-	  http://www.net-snmp.org/
-	  
-	  This package contains the SNMP client utilities.
-
-config ADK_PACKAGE_SNMPD
-	prompt "net-snmp-daemon................... SNMP agent"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNETSNMP
-	help
-	  Simple Network Management Protocol (SNMP) is a widely used
-	  protocol for monitoring the health and welfare of network
-	  equipment (eg. routers), computer equipment and even devices
-	  like UPSs. Net-SNMP is a suite of applications used to implement
-	  SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6.
-	  
-	  http://www.net-snmp.org/
-	  
-	  This package contains the SNMP agent, dynamically linked.
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index ebd3b3d41..ffa2c7950 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		net-snmp
 PKG_VERSION:=		5.5
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libelf
 PKG_MD5SUM:=		5b2551e7bd024fbbee84dca22a5f13a1
 PKG_DESCR:=		SNMP Agent
 PKG_SECTION:=		net
diff --git a/package/netperf/Config.in b/package/netperf/Config.in
deleted file mode 100644
index 54b96db58..000000000
--- a/package/netperf/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_NETPERF
-	prompt "netperf........................... network performance measurement tool"
-	tristate
-	default n
-	help
-	  Program and service to do network performance measurement.
diff --git a/package/netstat-nat/Config.in b/package/netstat-nat/Config.in
deleted file mode 100644
index b6a885693..000000000
--- a/package/netstat-nat/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_NETSTAT_NAT
-	prompt "netstat-nat....................... A netstat variant for NAT connections"
-	tristate
-	default n
-	help
-	  Netstat-nat is a small program written in C.
-	  It displays NAT connections, managed by netfilter/iptables which comes 
-	  with the > 2.4.x linux kernels.
-	  The program reads its information from '/proc/net/ip_conntrack', which 
-	  is the temporary conntrack-storage of netfilter.
-	  
-	  http://tweegy.demon.nl/projects/netstat-nat/
-
diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
deleted file mode 100644
index 7c046ad4b..000000000
--- a/package/nfs-utils/Config.in
+++ /dev/null
@@ -1,43 +0,0 @@
-config ADK_PACKAGE_NFS_UTILS
-	prompt "nfs-utils......................... NFS server utilities"
-	tristate
-	default n
-	select ADK_PACKAGE_PORTMAP
-	select ADK_KPACKAGE_KMOD_NFSD
-	select ADK_KPACKAGE_KMOD_NFS_FS
-	select ADK_PACKAGE_LIBTIRPC
-	depends on !ADK_TARGET_ROOTFS_NFSROOT
-	help
-	  NFS server utilities (namely, exportfs), and an NFS server.
-
-config ADK_COMPILE_NFS_UTILS_WITH_KERBEROS
-	prompt "Enable Kerberos and NFSv4"
-	bool
-	select ADK_PACKAGE_LIBEVENT
-	select ADK_PACKAGE_LIBNFSIDMAP
-	select ADK_PACKAGE_LIBRPCSECGSS
-	select ADK_PACKAGE_LIBCOM_ERR
-	select ADK_KERNEL_NFSD_V4
-	default n
-	depends on ADK_PACKAGE_NFS_UTILS
-
-choice
-prompt "Kerberos implementation"
-depends on ADK_COMPILE_NFS_UTILS_WITH_KERBEROS
-config ADK_COMPILE_NFS_UTILS_WITH_KRB5
-	prompt "MIT"
-	bool
-	select ADK_COMPILE_KRB5
-	select ADK_PACKAGE_KRB5_LIBS
-	select ADK_PACKAGE_LIBGSSGLUE
-	help
-	  use MIT kerberos libraries
-
-config ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL
-	prompt "Heimdal"
-	bool
-	select ADK_PACKAGE_HEIMDAL_LIBS
-	help 
-	  Use heimdal kerberos libraries (experimental)
-
-endchoice
diff --git a/package/nfs-utils/Config.in.kerberos b/package/nfs-utils/Config.in.kerberos
new file mode 100644
index 000000000..7c82d55ca
--- /dev/null
+++ b/package/nfs-utils/Config.in.kerberos
@@ -0,0 +1,31 @@
+config ADK_COMPILE_NFS_UTILS_WITH_KERBEROS
+       prompt "Enable Kerberos and NFSv4"
+       bool
+       select ADK_PACKAGE_LIBEVENT
+       select ADK_PACKAGE_LIBNFSIDMAP
+       select ADK_PACKAGE_LIBRPCSECGSS
+       select ADK_PACKAGE_LIBCOM_ERR
+       select ADK_KERNEL_NFSD_V4
+       default n
+       depends on ADK_PACKAGE_NFS_UTILS
+
+choice
+prompt "Kerberos implementation"
+depends on ADK_COMPILE_NFS_UTILS_WITH_KERBEROS
+config ADK_COMPILE_NFS_UTILS_WITH_KRB5
+       prompt "MIT"
+       bool
+       select ADK_COMPILE_KRB5
+       select ADK_PACKAGE_KRB5_LIBS
+       select ADK_PACKAGE_LIBGSSGLUE
+       help
+         use MIT kerberos libraries
+
+config ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL
+       prompt "Heimdal"
+       bool
+       select ADK_PACKAGE_HEIMDAL_LIBS
+       help 
+         Use heimdal kerberos libraries (experimental)
+
+endchoice
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 0b4090cca..c2cb0d806 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -6,6 +6,13 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		nfs-utils
 PKG_VERSION:=		1.2.0
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libtirpc
+ifeq (${ADK_COMPILE_NFS_UTILS_WITH_KRB5},y)
+PKG_BUILDDEP+=		libnfsidmap krb5 libevent libgssglue librpcsecgss
+endif
+ifeq (${ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL},y)
+PKG_BUILDDEP+=		libnfsidmap heimdal libevent librpcsecgss
+endif
 PKG_MD5SUM:=		779cf81044e92cb51ad590960e7b3671
 PKG_DESCR:= 		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net
diff --git a/package/nmap/Config.in b/package/nmap/Config.in
deleted file mode 100644
index 56a561ec7..000000000
--- a/package/nmap/Config.in
+++ /dev/null
@@ -1,29 +0,0 @@
-config ADK_PACKAGE_NMAP
-	prompt "nmap.............................. Network exploration and/or security auditing utility"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBDNET
-	select ADK_PACKAGE_LIBPCAP
-	select ADK_PACKAGE_LIBPCRE
-	help
-	  A free open source utility for network exploration or security auditing. 
-	  
-	  http://www.insecure.org/nmap/
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_NMAP
-default ADK_COMPILE_NMAP_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_NMAP_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_NMAP_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_NMAP_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	help
-
-endchoice
diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index 269a84ce3..587ad980f 100644
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -6,10 +6,12 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		nmap
 PKG_VERSION:=		5.00
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		pcre libpcap
+PKG_CXX:=		NMAP
 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/
 
@@ -17,12 +19,6 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq ($(ADK_COMPILE_NMAP_WITH_UCLIBCXX),y)
-PKG_DEPENDS+=		uclibc++
-else
-PKG_DEPENDS+=		libstdcxx
-endif
-
 $(eval $(call PKG_template,NMAP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TCPPFLAGS+=		-DNOLUA
diff --git a/package/nspr/Config.in b/package/nspr/Config.in
deleted file mode 100644
index b7afc3e24..000000000
--- a/package/nspr/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_NSPR
-	prompt "nspr.............................. Netscape Portable Runtime library"
-	tristate
-	default n
-	help
-	http://www.mozilla.org/projects/nspr/
diff --git a/package/nss/Config.in b/package/nss/Config.in
deleted file mode 100644
index 06c56929e..000000000
--- a/package/nss/Config.in
+++ /dev/null
@@ -1,5 +0,0 @@
-config ADK_PACKAGE_NSS
-	prompt "nss............................... NSS library"
-	tristate
-	default n
-	help
diff --git a/package/nss/Makefile b/package/nss/Makefile
index 48022d2f2..19f53ea3a 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		nss
 PKG_VERSION:=		3.12.4
 PKG_RELEASE:=		2
+PKG_BUILDDEP+=		nspr zlib
 PKG_MD5SUM:=		1ee3ed9c1900079319bd1de51388d856
 PKG_DESCR:=		Network Security Services (NSS) library
 PKG_SECTION:=		libs
diff --git a/package/ntfs-3g/Config.in b/package/ntfs-3g/Config.in
deleted file mode 100644
index 9d2fde2d1..000000000
--- a/package/ntfs-3g/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_NTFS_3G
-	prompt "ntfs-3g................... NTFS filesystem driver with read-write support"
-	tristate
-	select ADK_KPACKAGE_KMOD_FUSE_FS
-	default n
-	help
-	  http://www.ntfs-3g.org
diff --git a/package/ntpclient/Config.in b/package/ntpclient/Config.in
deleted file mode 100644
index daf0d46a3..000000000
--- a/package/ntpclient/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_NTPCLIENT
-	prompt "ntpclient......................... NTP (Network Time Protocol) client"
-	tristate
-	default n
-	help
-	  NTP client for setting system time from NTP servers.
-	  It is recommended to use the rdate package instead.
-	  
-	  http://doolittle.faludi.com/ntpclient/
-
diff --git a/package/nut/Config.in b/package/nut/Config.in
deleted file mode 100644
index 9539f8a03..000000000
--- a/package/nut/Config.in
+++ /dev/null
@@ -1,210 +0,0 @@
-config ADK_PACKAGE_NUT
-	prompt "nut............................... Network UPS Tools"
-	tristate
-	default n
-	help
-	  Network UPS Tools is a collection of programs which provide a common
-	  interface for monitoring and administering UPS hardware.  It uses a
-	  layered approach to connect all of the parts.
-
-	  http://www.networkupstools.org
-
-config ADK_PACKAGE_NUT_SSL
-	prompt "nut-ssl........................... Build Nut with SSL support"
-	boolean
-	default n
-	depends on ADK_PACKAGE_NUT
-	select ADK_PACKAGE_LIBOPENSSL
-
-config ADK_PACKAGE_NUT_USB
-	prompt "nut-usb........................... Build Nut with USB drivers"
-	boolean
-	default n
-	depends on ADK_PACKAGE_NUT
-	select ADK_PACKAGE_LIBUSB
-	help
-	  This option enables two drivers, namely hidups and energizerups.
-
-config ADK_PACKAGE_NUT_SNMP
-	prompt "nut-snmp.......................... Build Nut with SNMP UPS driver"
-	boolean
-	default n
-	depends on ADK_PACKAGE_NUT
-	select ADK_PACKAGE_LIBNETSNMP
-	help
-	  This option enables the snmp-ups driver.
-
-config ADK_PACKAGE_NUT_VARDESC
-	prompt "command descriptions.............. Include variable and command descriptions"
-	boolean
-	default y
-	depends on ADK_PACKAGE_NUT
-	help
-	  With this option enabled, an optional file will be added to the package
-	  containing a description of the commands and variables to clients.
-	  If you leave this out, clients will receive "Unavailable" for any description
-	  requests.
-
-menu "UPS Drivers to include"
-depends on ADK_PACKAGE_NUT
-
-config ADK_PACKAGE_NUT_DRIVER_APCSMART
-	prompt "apcsmart.......................... Driver for APC smart protocol (newapc)"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_BELKIN
-	prompt "belkin............................ Driver for Belkin Smart-UPS"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_BELKINUNV
-	prompt "belkinunv......................... Driver for Belkin Universal UPS"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_BESTUPS
-	prompt "bestups........................... Driver for Best-UPS"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_BESTFCOM
-	prompt "bestfcom.......................... Driver for Best Power F-Command UPS"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_BESTUFERRUPS
-	prompt "bestuferrups...................... Driver for Best Power Micro-Ferrups"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_CYBERPOWER
-	prompt "cyberpower........................ Driver for Cyber Power Systems"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_ETAPRO
-	prompt "etapro............................ Driver for ETA UPS"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_EVERUPS
-	prompt "everups........................... Driver for Ever UPS models"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_GAMATRONIC
-	prompt "gamatronic........................ Driver for Gamatronic UPS"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_GENERICUPS
-	prompt "genericups........................ Driver for generic contact-closure UPS models"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_ISBMEX
-	prompt "isbmex............................ Driver for SOLA/BASIC Mexico models"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_LIEBERT
-	prompt "liebert........................... Driver for Liebert UPS via MultiLink cable"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_MASTERGUARD
-	prompt "masterguard....................... Driver for Masterguard units"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_MEGATEC
-	prompt "megatec........................... Driver for Megatec protocol based UPS"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_METASYS
-	prompt "metasys........................... Driver for Meta System UPS"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_MGE_UTALK
-	prompt "mge-utalk......................... Driver for MGE UPS"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_ONEAC
-	prompt "oneac............................. Driver for UPS using the Oneac Advanced Interface"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_POWERCOM
-	prompt "powercom.......................... Driver for Powercom units (see help)"
-	boolean
-	default n
-	help
-	  This driver supports the following units:
-	  *  -Trust 425/625
-	  *  -Powercom
-	  *  -Advice Partner/King PR750
-	  *    See http://www.advice.co.il/product/inter/ups.html for its specifications.
-	  *    This model is based on PowerCom (www.powercom.com) models.
-	  *  -Socomec Sicon Egys 420
-	
-config ADK_PACKAGE_NUT_DRIVER_POWERMUST
-	prompt "powermust......................... Driver for Powermust"
-	boolean
-	default n
-
-config ADK_PACKAGE_NUT_DRIVER_POWERPANEL
-	prompt "powerpanel........................ Driver for Powerpanel units"
-	boolean
-	default n
-	help
-	
-config ADK_PACKAGE_NUT_DRIVER_RHINO
-	prompt "rhino............................. Driver for Microsol Rhino UPS"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_SAFENET
-	prompt "safenet........................... Driver for SafeNet UPS (see help)"
-	boolean
-	default n
-	help
-	  Supports the following units:
-	  * - Fairstone L525/-625/-750
-	  * - Fenton P400/-600/-800
-	  * - Gemini  UPS625/-1000
-	  * - Powerwell PM525A/-625A/-800A/-1000A/-1250A
-	  * - Repotec RPF525/-625/-800/-1000
-	  * - Soltec Winmate 525/625/800/1000
-	  * - Sweex 500/1000
-	  * - others using SafeNet software and serial interface
-
-config ADK_PACKAGE_NUT_DRIVER_SOLIS
-	prompt "solis............................. Driver for Microsol Solis UPS"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_TRIPPLITE
-	prompt "tripplite......................... Driver for Tripp Lite SmartUPS models"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_TRIPPLITESU
-	prompt "tripplitesu....................... Driver for Tripp Lite SmartOnline (SU*) models"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_UPSCODE2
-	prompt "upscode2.......................... Driver for UPS using UPScode II command set"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_VICTRONUPS
-	prompt "victronups........................ Driver for GE/IMV/Victron units"
-	boolean
-	default n
-	
-endmenu
diff --git a/package/nut/Makefile b/package/nut/Makefile
index 8c0c2c7c6..e01d4dcc0 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -6,6 +6,15 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		nut
 PKG_VERSION:=		2.4.1
 PKG_RELEASE:=		1
+ifneq (${ADK_PACKAGE_NUT_SSL},)
+PKG_BUILDDEP+=		openssl
+endif
+ifneq (${ADK_PACKAGE_NUT_USB},)
+PKG_BUILDDEP+=		libusb
+endif
+ifneq (${ADK_PACKAGE_NUT_SNMP},)
+PKG_BUILDDEP+=		net-snmp
+endif
 PKG_MD5SUM:=		609ebaf2123fc7171d25a6c742dd7d66
 PKG_DESCR:=		Network UPS Tools
 PKG_SECTION:=		sys
diff --git a/package/obexftp/Config.in b/package/obexftp/Config.in
deleted file mode 100644
index 38297b091..000000000
--- a/package/obexftp/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_COMPILE_OBEXFTP
-	tristate
-	default n
-	depends on ADK_PACKAGE_OBEXFTP
-
-config ADK_PACKAGE_OBEXFTP
-	prompt "obexftp........................... obexftp applications"
-	tristate
-	default n
-	select ADK_COMPILE_OBEXFTP
-	select ADK_PACKAGE_LIBICONV
-	select ADK_PACKAGE_OPENOBEX
-	select ADK_PACKAGE_LIBOBEXFTP
-	help
-	  http://openobex.triq.net/
diff --git a/package/obexftp/Config.in.lib b/package/obexftp/Config.in.lib
deleted file mode 100644
index 8b822f2a4..000000000
--- a/package/obexftp/Config.in.lib
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_LIBOBEXFTP
-	prompt "libobexftp........................ obexftp libraries"
-	tristate
-	default n
-	select ADK_COMPILE_OBEXFTP
-	select ADK_PACKAGE_LIBICONV
-	select ADK_PACKAGE_OPENOBEX
-	help
-	  http://openobex.triq.net/
-
diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile
index 55d108e76..c9d7c9a82 100644
--- a/package/obexftp/Makefile
+++ b/package/obexftp/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		obexftp
 PKG_VERSION:=		0.23
 PKG_RELEASE:=		2
+PKG_BUILDDEP+=		openobex libiconv
 PKG_MD5SUM:=		f20762061b68bc921e80be4aebc349eb
 PKG_DESCR:=		bluetooth ftp application
 PKG_SECTION:=		bluetooth
diff --git a/package/olsrd/Config.in b/package/olsrd/Config.in
deleted file mode 100644
index 4d8d47429..000000000
--- a/package/olsrd/Config.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#menu "olsrd............................. OLSR (Optimized Link State Routing) daemon"
-
-config ADK_PACKAGE_OLSRD
-	prompt "olsrd............................. OLSR (Optimized Link State Routing) daemon"
-	tristate
-	default n
-	help
-	  The Optimized Link State Routing daemon
-	  
-	  http://www.olsr.org/
-
-config ADK_PACKAGE_OLSRD_MOD_DYN_GW
-	prompt   "olsrd-mod-dyn-gw.............. Dynamic internet gateway plugin"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OLSRD
-
-config ADK_PACKAGE_OLSRD_MOD_HTTPINFO
-	prompt   "olsrd-mod-httpinfo............ Small informative web server plugin"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OLSRD
-
-config ADK_PACKAGE_OLSRD_MOD_NAMESERVICE
-	prompt   "olsrd-mod-nameservice......... Lightweight hostname resolver plugin"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OLSRD
-
-config ADK_PACKAGE_OLSRD_MOD_TAS
-	prompt   "olsrd-mod-tas................. Tiny Application Server (TAS) plugin for olsrd"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OLSRD
-
-#endmenu
diff --git a/package/opencdk/Config.in b/package/opencdk/Config.in
deleted file mode 100644
index ce8fdf27c..000000000
--- a/package/opencdk/Config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-config ADK_PACKAGE_OPENCDK
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBOPENCDK
-
-config ADK_PACKAGE_LIBOPENCDK
-	prompt "libopencdk........................ The Open Crypto Development Kit library"
-	tristate
-	default n
-	select ADK_PACKAGE_OPENCDK
-	select ADK_PACKAGE_LIBGCRYPT
-	select ADK_PACKAGE_LIBGPG_ERROR
-	select ADK_PACKAGE_ZLIB
-	help
-	  This library provides basic parts of the OpenPGP message format.
-	  For reference, please read the rfc2440.txt in the doc/ directory.
-	  Due to some possible security problems, the library also implements
-	  parts of draft-ietf-openpgp-rfc2440bis-08.txt. If you want to exchange
-	  messages with earlier PGP version < 7, you should use the compat mode.
-
-	  ftp://ftp.gnutls.org/pub/gnutls/opencdk/
diff --git a/package/opencdk/Makefile b/package/opencdk/Makefile
index 844f800a7..06cea155b 100644
--- a/package/opencdk/Makefile
+++ b/package/opencdk/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		opencdk
 PKG_VERSION:=		0.6.4
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libgcrypt libgpg-error zlib
 PKG_MD5SUM:=		7bfc820bcdc08f0c31f860710368071e
 PKG_DESCR:=		Open Crypto Development Kit library
 PKG_SECTION:=		libs
diff --git a/package/openct/Config.in b/package/openct/Config.in
deleted file mode 100644
index 082ae18a3..000000000
--- a/package/openct/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_OPENCT
-	prompt "openct............................ openct"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBLTDL
-	select ADK_PACKAGE_LIBUSB
-	help
-	 openct
diff --git a/package/openct/Makefile b/package/openct/Makefile
index 0a53477be..d110e5c02 100644
--- a/package/openct/Makefile
+++ b/package/openct/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		openct
 PKG_VERSION:=		0.6.16
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libtool libusb
 PKG_MD5SUM:=		d8d8c63269985303a303a218c4b953d7
 PKG_DESCR:=		drivers for several smart card readers
 PKG_SECTION:=		libs
diff --git a/package/openldap/Config.in b/package/openldap/Config.in
deleted file mode 100644
index 5a3c29c6e..000000000
--- a/package/openldap/Config.in
+++ /dev/null
@@ -1,33 +0,0 @@
-config ADK_COMPILE_OPENLDAP
-	prompt "openldap.......................... OpenSource LDAP software"
-	boolean
-	default n
-
-config ADK_PACKAGE_OPENLDAP_SLAPD
-	prompt "openldap-slapd.................. OpenLDAP server"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENLDAP
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBDB
-	select ADK_PACKAGE_LIBSASL2
-	depends on ADK_COMPILE_OPENLDAP
-	help
-	  http://www.openldap.org/
-
-config ADK_PACKAGE_OPENLDAP_UTILS
-	prompt   "openldap-utils.................. OpenLDAP client utilities"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENLDAP
-	depends on ADK_COMPILE_OPENLDAP
-	help
-	  
-	  OpenLDAP Software is an open source implementation of the 
-	  Lightweight Directory Access Protocol (LDAP).
-	  
-	  http://www.openldap.org/
-	  
-	  This package contains client programs required to access LDAP servers.
-
diff --git a/package/openldap/Config.in.lib b/package/openldap/Config.in.lib
deleted file mode 100644
index 6efae3dc3..000000000
--- a/package/openldap/Config.in.lib
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_PACKAGE_LIBOPENLDAP
-        prompt "libopenldap....................... OpenLDAP client libraries"
-        tristate
-        default n
-        depends on ADK_COMPILE_OPENLDAP
-        select ADK_PACKAGE_LIBSASL2
-	help
-	  
-	  OpenLDAP Software is an open source implementation of the 
-	  Lightweight Directory Access Protocol (LDAP).
-	  
-	  http://www.openldap.org/
-	  
-	  This package contains the shared LDAP client libraries, needed by other programs.
-
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index c2d01b253..f2a42debb 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		openldap
 PKG_VERSION:=		2.4.19
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		cyrus-sasl openssl libdb
 PKG_MD5SUM:=		4a6dab2711fcf141f19bb680bc335887
 PKG_DESCR:=		OpenLDAP client libraries
 PKG_SECTION:=		libs
diff --git a/package/openntpd/Config.in b/package/openntpd/Config.in
deleted file mode 100644
index c9d29a6fd..000000000
--- a/package/openntpd/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_OPENNTPD
-	prompt "openntpd.......................... A free and easy to use NTP (Network Time Protocol) implementation"
-	tristate
-	default n
-	help
-	  NTP server
-	  
-	  http://www.openntpd.org/
-
diff --git a/package/openobex/Config.in b/package/openobex/Config.in
deleted file mode 100644
index 233c61b24..000000000
--- a/package/openobex/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_OPENOBEX
-	prompt "openobex.......................... openobex library"
-	tristate
-	default n
-	select ADK_PACKAGE_BLUEZ
-	help
-	  Open source implementation of the Object Exchange (OBEX) protocol.  
-	  http://openobex.triq.net/
diff --git a/package/openobex/Makefile b/package/openobex/Makefile
index a1fb09a0e..96a82afa8 100644
--- a/package/openobex/Makefile
+++ b/package/openobex/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		openobex
 PKG_VERSION:=		1.5
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		bluez
 PKG_MD5SUM:=		0d83dc86445a46a1b9750107ba7ab65c
 PKG_DESCR:=		implementation of the Object Exchange (OBEX) protocol
 PKG_SECTION:=		bluetooth
diff --git a/package/opensc/Config.in b/package/opensc/Config.in
deleted file mode 100644
index 3488d464b..000000000
--- a/package/opensc/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_OPENSC
-	prompt "opensc............................ opensc"
-	tristate
-	default n
-	help
-	 opensc
diff --git a/package/opensips/Config.in b/package/opensips/Config.in
deleted file mode 100644
index 31c565218..000000000
--- a/package/opensips/Config.in
+++ /dev/null
@@ -1,196 +0,0 @@
-#menu "opensips........................... Configurable, free SIP server"
-
-config ADK_PACKAGE_OPENSIPS
-	prompt "opensips........................... Configurable, free SIP server"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-	 Open SIP Express Router (OpenSER) is a high-performance,
-	 configurable, free SIP server.
-
-config ADK_PACKAGE_OPENSIPS_MOD_ACCOUNTING
-	prompt   "opensips-mod-acc............... Accounting support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable accounting support
-
-config ADK_PACKAGE_OPENSIPS_MOD_AUTH
-	prompt   "opensips-mod-auth.............. Authentication support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable authentication support
-
-config ADK_PACKAGE_OPENSIPS_MOD_AUTH_DB
-	prompt     "opensips-mod-auth-db......... Authentication with database support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS_MOD_AUTH
-	help
-	  Enable authentication with database support
-
-config ADK_PACKAGE_OPENSIPS_MOD_AVPOPS
-	prompt   "opensips-mod-avpops............ AVP options support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable AVP options support
-
-config ADK_PACKAGE_OPENSIPS_MOD_DISPATCHER
-	prompt   "opensips-mod-dispatcher........ dispatcher support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable dispatcher options support
-
-config ADK_PACKAGE_OPENSIPS_MOD_DIVERSION
-	prompt   "opensips-mod-diversion......... diversion support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable diversion options support
-
-config ADK_PACKAGE_OPENSIPS_MOD_FLATSTORE
-	prompt   "opensips-mod-flatstore......... flatstore support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable flatstore support
-
-config ADK_PACKAGE_OPENSIPS_MOD_GFLAGS
-	prompt   "opensips-mod-gflags............ gflags support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable GFlags support
-
-config ADK_PACKAGE_OPENSIPS_MOD_GROUP
-	prompt   "opensips-mod-group............. group support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable group support
-
-config ADK_PACKAGE_OPENSIPS_MOD_MEDIAPROXY
-	prompt   "opensips-mod-mediaproxy........ Mediaproxy support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable mediaproxy support
-
-config ADK_PACKAGE_OPENSIPS_MOD_MSILO
-	prompt   "opensips-mod-msilo............. MSilo support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable msilo support
-
-config ADK_PACKAGE_OPENSIPS_MOD_NATHELPER
-	prompt   "opensips-mod-nathelper......... NAT helper support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  NAT helper support
-
-config ADK_PACKAGE_OPENSIPS_MOD_OPTIONS
-	prompt   "opensips-mod-options........... options support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable options support
-
-config ADK_PACKAGE_OPENSIPS_MOD_PDT
-	prompt   "opensips-mod-pdt............... PDT support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable pdt support
-
-config ADK_PACKAGE_OPENSIPS_MOD_PERMISSIONS
-	prompt   "opensips-mod-permissions....... Permissions support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable permissions support
-
-config ADK_PACKAGE_OPENSIPS_MOD_PIKE
-	prompt   "opensips-mod-pike.............. PIKE support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable pike support
-
-config ADK_PACKAGE_OPENSIPS_MOD_SMS
-	prompt   "opensips-mod-sms............... SMS support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  SMS support
-
-config ADK_PACKAGE_OPENSIPS_MOD_SPEEDDIAL
-	prompt   "opensips-mod-speeddial......... Speed Dial support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Speed Dial support
-
-config ADK_PACKAGE_OPENSIPS_MOD_UAC
-	prompt   "opensips-mod-uac............... UAC support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable UAC support
-
-config ADK_PACKAGE_OPENSIPS_MOD_UAC_REDIRECT
-	prompt   "opensips-mod-uac............... UAC redirect support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable UAC redirect support
-
-config ADK_PACKAGE_OPENSIPS_MOD_URI
-	prompt   "opensips-mod-uri............... URI support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable URI support
-
-config ADK_PACKAGE_OPENSIPS_MOD_URI_DB
-	prompt   "opensips-mod-uri-db............ URI database support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Enable URI database support
-
-config ADK_PACKAGE_OPENSIPS_MOD_XLOG
-	prompt   "opensips-mod-xlog.............. Logging support"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSIPS
-	help
-	  Logging support
-
-#endmenu
diff --git a/package/opensips/Makefile b/package/opensips/Makefile
index 142570f14..e49516e02 100644
--- a/package/opensips/Makefile
+++ b/package/opensips/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		opensips
 PKG_VERSION:=		1.5.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		87c6fe40c143775d6a1be1beb75c3eb2
 PKG_DESCR:=		a high-performance, configurable, free SIP server
 PKG_SECTION:=		net
diff --git a/package/openssh/Config.in b/package/openssh/Config.in
deleted file mode 100644
index 136333826..000000000
--- a/package/openssh/Config.in
+++ /dev/null
@@ -1,140 +0,0 @@
-config ADK_COMPILE_OPENSSH
-	prompt "openssh........................... OpenSSH software"
-	bool
-	default n
-
-config ADK_COMPILE_OPENSSH_WITH_KERBEROS
-	prompt "Enable Kerberos support"
-	bool
-	depends on ADK_COMPILE_OPENSSH
-
-choice
-prompt "Kerberos implementation"
-depends on ADK_COMPILE_OPENSSH_WITH_KERBEROS
-config ADK_COMPILE_OPENSSH_WITH_KRB5
-	prompt "MIT"
-	bool
-	select ADK_PACKAGE_KRB5_LIBS
-	help
-	  Use MIT kerberos libraries.
-
-config ADK_COMPILE_OPENSSH_WITH_HEIMDAL
-	prompt "Heimdal"
-	bool
-	select ADK_COMPILE_HEIMDAL
-	select ADK_PACKAGE_HEIMDAL_LIBS
-	help 
-	  Use heimdal kerberos libraries.
-
-endchoice
-
-config ADK_PACKAGE_OPENSSH_CLIENT
-	prompt "openssh-client.................... OpenSSH clients"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	depends on ADK_COMPILE_OPENSSH
-	help
-	  OpenSSH is a FREE version of the SSH protocol suite of network
-	  connectivity tools that increasing numbers of people on the Internet
-	  are coming to rely on. Many users of telnet, rlogin, ftp, and other
-	  such programs might not realize that their password is transmitted
-	  across the Internet unencrypted, but it is. OpenSSH encrypts all
-	  traffic (including passwords) to effectively eliminate eavesdropping,
-	  connection hijacking, and other network-level attacks. Additionally,
-	  OpenSSH provides a myriad of secure tunneling capabilities, as well
-	  as a variety of authentication methods.
-	  
-	  This package contains the ssh(1) client and the scp(1) client/server.
-	  
-	  http://www.openssh.com/
-
-config ADK_PACKAGE_OPENSSH_CLIENT_UTILS
-	prompt   "openssh-client-utils............ OpenSSH client utilities"
-	tristate
-	default n
-	depends on ADK_PACKAGE_OPENSSH_CLIENT
-	depends on ADK_COMPILE_OPENSSH
-	help
-	  OpenSSH is a FREE version of the SSH protocol suite of network
-	  connectivity tools that increasing numbers of people on the Internet
-	  are coming to rely on. Many users of telnet, rlogin, ftp, and other
-	  such programs might not realize that their password is transmitted
-	  across the Internet unencrypted, but it is. OpenSSH encrypts all
-	  traffic (including passwords) to effectively eliminate eavesdropping,
-	  connection hijacking, and other network-level attacks. Additionally,
-	  OpenSSH provides a myriad of secure tunneling capabilities, as well
-	  as a variety of authentication methods.
-	  
-	  This package contains ssh-agent and ssh-add as well as ssh-keyscan.
-	  
-	  http://www.openssh.com/
-
-config ADK_PACKAGE_OPENSSH_SERVER
-	prompt "openssh-server.................... OpenSSH server"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	depends on ADK_COMPILE_OPENSSH
-	help
-	  OpenSSH is a FREE version of the SSH protocol suite of network
-	  connectivity tools that increasing numbers of people on the Internet
-	  are coming to rely on. Many users of telnet, rlogin, ftp, and other
-	  such programs might not realize that their password is transmitted
-	  across the Internet unencrypted, but it is. OpenSSH encrypts all
-	  traffic (including passwords) to effectively eliminate eavesdropping,
-	  connection hijacking, and other network-level attacks. Additionally,
-	  OpenSSH provides a myriad of secure tunneling capabilities, as well
-	  as a variety of authentication methods.
-	  
-	  This package contains sshd(8) and ssh-keygen(8), but not scp(1),
-	  which is needed for SCP server support.
-	  
-	  http://www.openssh.com/
-
-
-config ADK_PACKAGE_OPENSSH_SFTP_CLIENT
-	prompt "openssh-sftp-client............... OpenSSH SFTP client"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	depends on ADK_COMPILE_OPENSSH
-	help
-	  OpenSSH is a FREE version of the SSH protocol suite of network
-	  connectivity tools that increasing numbers of people on the Internet
-	  are coming to rely on. Many users of telnet, rlogin, ftp, and other
-	  such programs might not realize that their password is transmitted
-	  across the Internet unencrypted, but it is. OpenSSH encrypts all
-	  traffic (including passwords) to effectively eliminate eavesdropping,
-	  connection hijacking, and other network-level attacks. Additionally,
-	  OpenSSH provides a myriad of secure tunneling capabilities, as well
-	  as a variety of authentication methods.
-	  
-	  This package contains the /usr/bin/sftp client utility.
-	  
-	  http://www.openssh.com/
-
-config ADK_PACKAGE_OPENSSH_SFTP_SERVER
-	prompt "openssh-sftp-server............... OpenSSH SFTP server"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	depends on ADK_COMPILE_OPENSSH
-	help
-	  OpenSSH is a FREE version of the SSH protocol suite of network
-	  connectivity tools that increasing numbers of people on the Internet
-	  are coming to rely on. Many users of telnet, rlogin, ftp, and other
-	  such programs might not realize that their password is transmitted
-	  across the Internet unencrypted, but it is. OpenSSH encrypts all
-	  traffic (including passwords) to effectively eliminate eavesdropping,
-	  connection hijacking, and other network-level attacks. Additionally,
-	  OpenSSH provides a myriad of secure tunneling capabilities, as well
-	  as a variety of authentication methods.
-	  
-	  This package contains the SFTP server helper programme.
-	  
-	  http://www.openssh.com/
diff --git a/package/openssh/Config.in.kerberos b/package/openssh/Config.in.kerberos
new file mode 100644
index 000000000..9d546b668
--- /dev/null
+++ b/package/openssh/Config.in.kerberos
@@ -0,0 +1,24 @@
+config ADK_COMPILE_OPENSSH_WITH_KERBEROS
+       prompt "Enable Kerberos support"
+       bool
+       depends on ADK_COMPILE_OPENSSH
+
+choice
+prompt "Kerberos implementation"
+depends on ADK_COMPILE_OPENSSH_WITH_KERBEROS
+config ADK_COMPILE_OPENSSH_WITH_KRB5
+       prompt "MIT"
+       bool
+       select ADK_PACKAGE_KRB5_LIBS
+       help
+         Use MIT kerberos libraries.
+
+config ADK_COMPILE_OPENSSH_WITH_HEIMDAL
+       prompt "Heimdal"
+       bool
+       select ADK_COMPILE_HEIMDAL
+       select ADK_PACKAGE_HEIMDAL_LIBS
+       help 
+         Use heimdal kerberos libraries.
+
+endchoice
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 2bf5163eb..e7fe57098 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -6,6 +6,13 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		openssh
 PKG_VERSION:=		5.3p1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		zlib openssl
+ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y)
+PKG_BUILDDEP+=		krb5
+endif
+ifeq (${ADK_COMPILE_OPENSSH_WITH_HEIMDAL},y)
+PKG_BUILDDEP+=		heimdal
+endif
 PKG_MD5SUM:=		13563dbf61f36ca9a1e4254260131041
 PKG_DESCR:=		OpenSSH server
 PKG_SECTION:=		net
diff --git a/package/openssl-pkcs11/Config.in b/package/openssl-pkcs11/Config.in
deleted file mode 100644
index 67431160d..000000000
--- a/package/openssl-pkcs11/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_OPENSSL_PKCS11
-	prompt "openssl-pkcs11.................... openssl pkcs11 engine"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBP11
-	help
-	  openssl pkcs11 engine
diff --git a/package/openssl-pkcs11/Makefile b/package/openssl-pkcs11/Makefile
index 9e3054c4a..13d869e36 100644
--- a/package/openssl-pkcs11/Makefile
+++ b/package/openssl-pkcs11/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		openssl-pkcs11
 PKG_VERSION:=		0.1.5
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libp11
 PKG_MD5SUM:=		840af6e54dc21445c54f74e15005ba4d
 PKG_DESCR:=		pkcs11 engine for openssl
 PKG_SECTION:=		crypto
diff --git a/package/openssl/Config.in b/package/openssl/Config.in
deleted file mode 100644
index 355603a4f..000000000
--- a/package/openssl/Config.in
+++ /dev/null
@@ -1,44 +0,0 @@
-config ADK_COMPILE_OPENSSL
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBOPENSSL
-	
-config ADK_PACKAGE_LIBOPENSSL
-	prompt "openssl........................... Open source SSL (Secure Socket Layer) libraries"
-	tristate
-	default n
-	select ADK_COMPILE_OPENSSL
-	select ADK_PACKAGE_ZLIB
-	help
-	  The OpenSSL Project is a collaborative effort to develop a robust, 
-	  commercial-grade, full-featured, and Open Source toolkit implementing 
-	  the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
-	  protocols as well as a full-strength general purpose cryptography library.
-	  
-	  http://www.openssl.org/
-	  
-	  This package contains the shared SSL libraries, needed by other programs.
-
-config ADK_PACKAGE_LIBOPENSSL_DEV
-	prompt "libopenssl-dev.................... SSL development files"
-	tristate
-	default n
-	select ADK_COMPILE_OPENSSL
-	depends on ADK_PACKAGE_LIBOPENSSL
-	help
-	  http://www.openssl.org/
-
-config ADK_PACKAGE_OPENSSL_UTIL
-	prompt   "openssl-util.................... OpenSSL command line tool"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBOPENSSL
-	help
-	  The OpenSSL Project is a collaborative effort to develop a robust, 
-	  commercial-grade, full-featured, and Open Source toolkit implementing 
-	  the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
-	  protocols as well as a full-strength general purpose cryptography library.
-	  
-	  http://www.openssl.org/
-	  
-	  This package contains the multi-purpose OpenSSL binary tool.
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 698f96ddf..17de862f3 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -10,6 +10,7 @@ PKG_MD5SUM:=		05a0ece1372392a2cf310ebb96333025
 PKG_DESCR:=		OpenSSL (Secure Socket Layer) libraries
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
+PKG_BUILDDEP+=		zlib
 PKG_URL:=		http://www.openssl.org
 PKG_SITES:=		http://www.openssl.org/source/ \
 			ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \
diff --git a/package/openswan/Config.in b/package/openswan/Config.in
deleted file mode 100644
index 543a80f58..000000000
--- a/package/openswan/Config.in
+++ /dev/null
@@ -1,30 +0,0 @@
-config ADK_PACKAGE_OPENSWAN
-	prompt "openswan.......................... VPN solution using IPsec"
-	tristate
-	default n
-	select ADK_PACKAGE_IP
-	select ADK_PACKAGE_LIBGMP
-	help
-	  Openswan is an implementation of IPsec for Linux.
-	  
-	  http://www.openswan.org/
-
-choice
-prompt "IPSec stack to use"
-depends on ADK_PACKAGE_OPENSWAN
-config ADK_COMPILE_OPENSWAN_WITH_NETKEY
-	prompt "NETKEY - use Linux integrated IPSec Stack"
-	select ADK_KPACKAGE_KMOD_NET_KEY
-	select ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TUNNEL
-	select ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TRANSPORT
-	select ADK_KPACKAGE_KMOD_INET_ESP
-	select ADK_KPACKAGE_KMOD_INET_AH
-	bool
-	help
-
-config ADK_COMPILE_OPENSWAN_WITH_KLIPS
-	prompt "KLIPS - use OpenS/WAN IPSec Stack"
-	bool
-	help
-
-endchoice
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 912d1abdc..0fd7c6710 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		openswan
 PKG_VERSION:=		2.6.22
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		gmp
 PKG_MD5SUM:=		9a30009bade8a1b09fba27680c87cf72
 PKG_DESCR:=		IPSec software
 PKG_SECTION:=		net
diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in
deleted file mode 100644
index 28d9696a2..000000000
--- a/package/openvpn/Config.in
+++ /dev/null
@@ -1,64 +0,0 @@
-
-config ADK_PACKAGE_OPENVPN
-	prompt "openvpn........................... Open source VPN solution using SSL"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_TUN
-	help
-	  Open Source VPN solution using SSL
-	  
-	  http://openvpn.net/
-	  
-	  Depends: kmod-tun, libpthread
-
-config ADK_COMPILE_OPENVPN_WITH_SERVER
-	prompt "server support.................. enable to use OpenVPN as server"
-	bool
-	default y
-	depends on ADK_PACKAGE_OPENVPN
-
-config ADK_COMPILE_OPENVPN_WITH_HTTP
-	prompt "enable http proxy support....... allow tunneling through http-proxy"
-	bool
-	default y
-	depends on ADK_PACKAGE_OPENVPN
-
-config ADK_COMPILE_OPENVPN_WITH_OPENSSL
-	prompt "enable openssl.................. encryption support"
-	bool
-	default y
-	depends on ADK_PACKAGE_OPENVPN
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-	  if unsure say "y" you really want that!
-
-config ADK_COMPILE_OPENVPN_WITH_LZO
-	prompt "enable lzo...................... Enable transparent compression"
-	bool
-	default y
-	depends on ADK_PACKAGE_OPENVPN
-	select ADK_PACKAGE_LIBLZO
-
-config ADK_COMPILE_OPENVPN_WITH_PASSWORD_SAVE
-	prompt "Enable password saving.......... allow to read passwords for PKCS12 from file"
-	bool
-	default y
-	depends on ADK_PACKAGE_OPENVPN
-
-config ADK_COMPILE_OPENVPN_WITH_SMALL
-	prompt "Reduce executable size.......... disable OCC, usage message, and verb 4 parm list"
-	bool
-	default n
-	depends on ADK_PACKAGE_OPENVPN
-
-config ADK_PACKAGE_OPENVPN_EASY_RSA
-	prompt "openvpn-easy-rsa................ simple shell scripts to manage a Certificate Authority"
-	tristate
-	default n
-	select ADK_PACKAGE_OPENSSL_UTIL
-	depends on ADK_PACKAGE_OPENVPN
-	help
-	  collection of shell scripts to manage a simple CA infrastructure
-
-	  Depends: openpvn, openssl-util
-
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index 40b690ed8..e4fbce369 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -6,6 +6,12 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		openvpn
 PKG_VERSION:=		2.1.0
 PKG_RELEASE:=		1
+ifeq ($(ADK_PACKAGE_LIBOPENSSL),y)
+PKG_BUILDDEP+=		openssl
+endif
+ifeq ($(ADK_PACKAGE_OPENVPN_LZO),y)
+PKG_BUILDDEP+=		liblzo
+endif
 PKG_MD5SUM:=		452a83326ae198cf961e9ae02539c8fb
 PKG_DESCR:=		Open Source VPN solution using SSL
 PKG_SECTION:=		net
diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in
deleted file mode 100644
index a00c529aa..000000000
--- a/package/oprofile/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_OPROFILE
-	prompt "oprofile.......................... a system-wide profiler"
-	tristate
-	select ADK_PACKAGE_LIBPOPT
-	default n
-	help
-	  http://oprofile.sourceforge.net
-
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index 0e680b4ea..2f19a4fc0 100644
--- a/package/oprofile/Makefile
+++ b/package/oprofile/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		oprofile
 PKG_VERSION:=		0.9.4
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		popt
 PKG_MD5SUM:=		82b059379895cf125261d7d773465915
 PKG_DESCR:=		system-wide profiles
 PKG_SECTION:=		utils
diff --git a/package/osiris/Config.in b/package/osiris/Config.in
deleted file mode 100644
index b8bfe8210..000000000
--- a/package/osiris/Config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-config ADK_COMPILE_OSIRIS
-	tristate
-	default n
-	depends on ADK_PACKAGE_OSIRISD
-
-config ADK_PACKAGE_OSIRISD
-	prompt "osirisd........................... Host integrity monitoring system (scanning agent)"
-	tristate
-	default n
-	select ADK_COMPILE_OSIRIS
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-	  An host integrity monitoring system (scanning agent)
-	  
-	  http://www.hostintegrity.com/osiris/
-	  
-	  Depends: openssl
-
diff --git a/package/osiris/Makefile b/package/osiris/Makefile
index 97f1e9d52..e7dcd3c1c 100644
--- a/package/osiris/Makefile
+++ b/package/osiris/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		osiris
 PKG_VERSION:=		4.2.3
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		1951c7dc0fe729af9ffaf58910340d12
 PKG_DESCR:=		Host Integrity Monitoring System (scanning agent)
 PKG_SECTION:=		admin
diff --git a/package/owfs/Config.in b/package/owfs/Config.in
deleted file mode 100644
index b8daf117d..000000000
--- a/package/owfs/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_OWFS
-	prompt "owfs.............................. 1-wire filesystem to map sensors to a directory"
-	tristate
-	default n
-	select ADK_PACKAGE_FUSE_UTILS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  1-Wire technology by Dallas Semiconductors is a simple bus for different kind of devices
-	  like tempereatur, humidity, pressure, voltage, etc.
-	  owfs maps the devices to a dirctory utilizing fuse.
-	  
-	  http://www.owfs.org/
-
diff --git a/package/p910nd/Config.in b/package/p910nd/Config.in
deleted file mode 100644
index dd4aab2e4..000000000
--- a/package/p910nd/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_PACKAGE_P910ND
-	prompt "p910nd............................ A small non-spooling printer server"
-	tristate
-	default n
-	help
-	  p910nd  is a small daemon that copies any data received on
-	  the port it is listening on to the  corresponding  printer
-	  port.   It  is primarily intended for diskless Linux hosts
-	  running as printer drivers but there is no reason  why  it
-	  could  not  be used on diskful hosts.  Port 9100 is copied
-	  to /dev/lp0, 9101 to /dev/lp1 and 9102 to  /dev/lp2.   The
-	  default is port 9100 to /dev/lp0.
-	  
-	  http://www.etherboot.org/p910nd/
-
diff --git a/package/palantir/Config.in b/package/palantir/Config.in
deleted file mode 100644
index 409ee0ba5..000000000
--- a/package/palantir/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_PALANTIR
-	prompt "palantir.......................... A multichannel interactive streaming solution"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBJPEG
-	help
-	  Palantir is a Linux-based streaming system designed to transmit live 
-	  video, audio and data over a TCP/IP network, as well as to control 
-	  remote devices.
-	  
-	  http://www.fastpath.it/products/palantir/
-
diff --git a/package/palantir/Makefile b/package/palantir/Makefile
index e87cb295c..e3c1e1130 100644
--- a/package/palantir/Makefile
+++ b/package/palantir/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		palantir
 PKG_VERSION:=		2.7
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		jpeg
 PKG_MD5SUM:=		3a5b1fb340857f6d8e357bf39b77583e
 PKG_DESCR:=		A multichannel interactive streaming solution
 PKG_SECTION:=		net
diff --git a/package/pango/Config.in b/package/pango/Config.in
deleted file mode 100644
index ccf5b6a2f..000000000
--- a/package/pango/Config.in
+++ /dev/null
@@ -1,5 +0,0 @@
-config ADK_PACKAGE_PANGO
-	prompt "pango............................. Pango library"
-	tristate
-	default n
-	help
diff --git a/package/parprouted/Config.in b/package/parprouted/Config.in
deleted file mode 100644
index af1474e47..000000000
--- a/package/parprouted/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_PARPROUTED
-	prompt "parprouted........................ Proxy ARP daemon"
-	tristate
-	default n
-	help
-	  parprouted is a daemon for transparent IP (Layer 3) proxy ARP bridging.
-	  This is useful for creation of transparent firewalls and bridging networks 
-	  with different MAC protocols. Also, unlike standard bridging, proxy ARP 
-	  bridging allows to bridge Ethernet networks behind wireless nodes without 
-	  using WDS or layer 2 bridging.
-	  
-	  http://www.hazard.maks.net/
-
diff --git a/package/parted/Config.in b/package/parted/Config.in
deleted file mode 100644
index 04ace5a2b..000000000
--- a/package/parted/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_PARTED
-	prompt "parted............................ GNU parted"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBUUID
-	select ADK_PACKAGE_DEVICE_MAPPER
-	select ADK_PACKAGE_LIBREADLINE
-	help
-	  GNU parted.
diff --git a/package/parted/Makefile b/package/parted/Makefile
index 63a83105d..f845eb866 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		parted
 PKG_VERSION:=		1.9.0
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		e2fsprogs lvm readline
 PKG_MD5SUM:=		055305bc7bcf472ce38f9abf69a9d94d
 PKG_DESCR:=		GNU parted
 PKG_DEPENDS:=		libuuid libreadline device-mapper
diff --git a/package/patch/Config.in b/package/patch/Config.in
deleted file mode 100644
index 651abdde9..000000000
--- a/package/patch/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_PATCH
-	prompt "patch............................. patch"
-	tristate
-	default n
-	help
-	  patch
diff --git a/package/pciutils/Config.in b/package/pciutils/Config.in
deleted file mode 100644
index e289b8bbf..000000000
--- a/package/pciutils/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_PCIUTILS
-	prompt "pciutils.......................... Linux PCI Utilities"
-	tristate
-	select ADK_PACKAGE_ZLIB
-	default n
-	help
-	  This package contains various utilities for inspecting and setting of
-	  devices connected to the PCI bus.
diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile
index d6530bc1c..23994bb29 100644
--- a/package/pciutils/Makefile
+++ b/package/pciutils/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		pciutils
 PKG_VERSION:=		3.0.3
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		zlib
 PKG_MD5SUM:=		d07da501bb11e6af40acd036536c2e9a
 PKG_DESCR:=		PCI Utilities
 PKG_SECTION:=		sys
diff --git a/package/pcre/Config.in b/package/pcre/Config.in
deleted file mode 100644
index 21a23884c..000000000
--- a/package/pcre/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_COMPILE_PCRE
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBPCRE
-
-config ADK_PACKAGE_LIBPCRE
-	prompt "libpcre........................... A Perl Compatible Regular Expression library"
-	tristate
-	default n
-	select ADK_COMPILE_PCRE
-	help
-	  A Perl Compatible Regular Expression library
-	  
-	  http://www.pcre.org/
-
diff --git a/package/perl/Config.in b/package/perl/Config.in
deleted file mode 100644
index b71422e20..000000000
--- a/package/perl/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_PERL
-	prompt "perl.............................. A full blown perl"
-	tristate
-	depends on ADK_NATIVE
-	default n
-	help
-	  Complete Perl.
-
diff --git a/package/php/Config.in b/package/php/Config.in
deleted file mode 100644
index badb9f685..000000000
--- a/package/php/Config.in
+++ /dev/null
@@ -1,115 +0,0 @@
-menu "php............................... PHP Hypertext preprocessor"
-
-config ADK_COMPILE_PHP
-	prompt "php.............................. PHP Hypertext preprocessor"
-	bool
-	default n
-	 
-choice
-prompt "PHP Mode"
-default ADK_PACKAGE_PHP_FASTCGI
-depends on ADK_COMPILE_PHP
-
-config ADK_PACKAGE_PHP_FASTCGI
-	prompt "PHP built for FastCGI"
-	bool 
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	help
-	 PHP is a widely-used general-purpose scripting language that is especially 
-	 suited for Web development and can be embedded into HTML.
-	 
-	 http://www.php.net/
-
-endchoice
-
-config ADK_PACKAGE_PHP_MOD_CURL
-	prompt "php-mod-curl..................... cURL module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBCURL
-
-config ADK_PACKAGE_PHP_MOD_FTP
-	prompt "php-mod-ftp...................... FTP module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-
-config ADK_PACKAGE_PHP_MOD_GD
-	prompt "php-mod-gd....................... GD graphics library module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBGD
-	select ADK_PACKAGE_LIBPNG
-
-config ADK_PACKAGE_PHP_MOD_GMP
-	prompt "php-mod-gmp...................... GMP module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBGMP
-
-config ADK_PACKAGE_PHP_MOD_LDAP
-	prompt "php-mod-ldap..................... LDAP module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBOPENLDAP
-
-config ADK_PACKAGE_PHP_MOD_MYSQL
-	prompt "php-mod-mysql.................... MySQL module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBMYSQLCLIENT
-
-config ADK_PACKAGE_PHP_MOD_OPENSSL
-	prompt "php-mod-openssl.................. OpenSSL module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBOPENSSL
-
-config ADK_PACKAGE_PHP_MOD_PCRE
-	prompt "php-mod-pcre..................... PCRE module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBPCRE
-
-config ADK_PACKAGE_PHP_MOD_PGSQL
-	prompt "php-mod-pgsql.................... PostgreSQL module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBPQ
-
-config ADK_PACKAGE_PHP_MOD_SESSION
-	prompt "php-mod-session.................. Sessions module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-
-config ADK_PACKAGE_PHP_MOD_SQLITE
-	prompt "php-mod-sqlite................... SQLite module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBSQLITE
-
-config ADK_PACKAGE_PHP_MOD_SOCKETS
-	prompt "php-mod-sockets.................. Sockets module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-
-config ADK_PACKAGE_PHP_MOD_XML
-	prompt "php-mod-xml...................... XML module"
-	tristate 
-	default n
-	depends on ADK_COMPILE_PHP
-	select ADK_PACKAGE_LIBEXPAT
-
-endmenu
diff --git a/package/php/Makefile b/package/php/Makefile
index 9a479fb5d..d5b00c054 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -6,6 +6,34 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		php
 PKG_VERSION:=		5.3.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl zlib
+ifneq ($(ADK_PACKAGE_PHP_MOD_CURL),)
+PKG_BUILDDEP+=		curl
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_GD),)
+PKG_BUILDDEP+=		libgd libpng
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_GMP),)
+PKG_BUILDDEP+=		gmp
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),)
+PKG_BUILDDEP+=		openldap
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_MYSQL),)
+PKG_BUILDDEP+=		mysql
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_PCRE),)
+PKG_BUILDDEP+=		pcre
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_PGSQL),)
+PKG_BUILDDEP+=		postgresql
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_SQLITE),)
+PKG_BUILDDEP+=		sqlite
+endif
+ifneq ($(ADK_PACKAGE_PHP_MOD_XML),)
+PKG_BUILDDEP+=		expat
+endif
 PKG_MD5SUM:=		41fbb368d86acb13fc3519657d277681
 PKG_DESCR:=		PHP CLI
 PKG_SECTION:=		net
diff --git a/package/picocom/Config.in b/package/picocom/Config.in
deleted file mode 100644
index be5400182..000000000
--- a/package/picocom/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_PACKAGE_PICOCOM
-	prompt "picocom........................... minimal dumb-terminal emulation program"
-	tristate
-	default n
-	help
-	  As its name suggests, picocom is a minimal dumb-terminal emulation 
-	  program. It is, in principle, very much like minicom, only it's pico 
-	  instead of mini! It was designed to serve as a simple, manual, modem 
-	  configuration, testing, and debugging tool. It has also served (quite 
-	  well) as a low-tech "terminal-window" to allow operator intervention 
-	  in PPP connection scripts. It could also prove useful in many other 
-	  similar tasks.
-	  
-	  http://efault.net/npat/hacks/picocom/
-
diff --git a/package/pipacs/Config.in b/package/pipacs/Config.in
deleted file mode 100644
index 1ab3f3aa3..000000000
--- a/package/pipacs/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_PIPACS
-	prompt "pipacs............................ UNIX socket accounting/wiewer program"
-	tristate
-	default n
-	help
-	  An UNIX socket accounting/wiewer program.
-	  This is version 2.
diff --git a/package/pixman/Config.in b/package/pixman/Config.in
deleted file mode 100644
index 266820e19..000000000
--- a/package/pixman/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_PIXMAN
-	prompt "pixman............................... pixman library"
-	tristate
-	default n
-	help
-	  http://www.cairographics.org/
diff --git a/package/pkgmaker b/package/pkgmaker
new file mode 100644
index 000000000..d9c928579
--- /dev/null
+++ b/package/pkgmaker
@@ -0,0 +1,250 @@
+unset MAKEFLAGS
+export MAKEFLAGS=s
+cd "$(dirname "$0")"
+export TOPDIR=$(realpath ..)
+if gmake --help >/dev/null 2>&1; then
+	export GMAKE=gmake
+else
+	export GMAKE=make
+fi
+GMAKE="$GMAKE --no-print-directory"
+(( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 ))
+typeset -L$x_cols pbar
+
+# build a cache of “ipkg package name” → “package conf option” for
+# use with dependency resolution
+rm -rf pkglist.d
+mkdir pkglist.d
+for dn in */Makefile; do
+	dn=${dn%/*}
+	pbar="Pass 1: $dn ..."
+	print -nu2 "$pbar\r"
+	cd $dn
+
+	# ALL_PKGOPTS: all subpackage conf options
+	# PKGNAME_*: subpackage (ipkg) package name, by subpackage option
+	eval $($GMAKE dump="ALL_PKGOPTS \
+	    \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x})")
+	cd ..
+
+	if [[ -z $ALL_PKGOPTS ]]; then
+		#print -u2 "Warning: $dn/Makefile contains no packages, skipped"
+		continue
+	fi
+
+	for spcu in $ALL_PKGOPTS; do		# spcu: package option, ucase
+		eval sppn=\$PKGNAME_$spcu	# sppn: subpackage (ipkg) name
+		# once mksh R40 is out, use its new associative arrays here!
+		print -r -- "$spcu" >pkglist.d/"$sppn"
+	done
+done
+
+# build Config.in files and resolve dependencies
+for dn in */Makefile; do
+	dn=${dn%/*}
+	# skip if we take care of this one manually
+	[[ -s $dn/Config.in.manual ]] && continue
+	pbar="Pass 2: $dn ..."
+	print -nu2 "$pbar\r"
+	cd $dn
+
+	# PKG_NAME: package name (directory, free-format)
+	# PKG_FLAVOURS: all package flavours (boolean options), uppercase
+	# PKG_DESCR: package description (directory)
+	# PKG_URL: package homepage
+	# PKG_CXX: uppercase varname part to use for CFrustFrust checks
+	# ALL_PKGOPTS: all subpackage conf options
+	# PKGNAME_*: subpackage (ipkg) package name, by subpackage option
+	# PKGDESC_*: subpackage description, by subpackage option
+	# PKGDEPS_*: subpackage depends on ipkg packages, by subpkg option
+	# PKGDFLT_*: subpackage 'default {:-n}', by subpackage option
+	# CFLINE_*: one free-format Config.in line per subpackage option
+	# PKGFD_*: flavour description, per package flavour option
+	# PKG_{HOST,TARGET}_DEPENDS: add host or target dependencies
+	eval $($GMAKE dump="PKG_NAME PKG_FLAVOURS PKG_DESCR PKG_URL PKG_CXX \
+	    ALL_PKGOPTS \$(foreach x,\${ALL_PKGOPTS},PKGNAME_\${x} \
+	    PKGDESC_\${x} PKGDEPS_\${x} PKGDFLT_\${x} CFLINE_\${x}) \
+	    \$(foreach x,\${PKG_FLAVOURS},PKGFD_\${x}) \
+	    PKG_HOST_DEPENDS PKG_TARGET_DEPENDS")
+
+	# dnu: directory name, uppercase, y/-+/_X/
+	typeset -u dnu=${dn//-/_}
+	dnu=${dnu//+/X}
+
+	(	# fd 4 = Config.in; fd 5 = Config.in.lib
+	g5=0
+
+	# Handle master package (directory)
+	print -u4 "config ADK_COMPILE_$dnu"
+	if [[ -z $ALL_PKGOPTS ]]; then
+		# pseudo package, does not produce an ipkg package
+		ppnf=$PKG_NAME			# ppnf: pseudopkg name, filled
+		if [[ -n $PKG_DESCR ]]; then
+			while (( ${#ppnf} < 34 )); do
+				ppnf=$ppnf.
+			done
+			ppnf="$ppnf $PKG_DESCR"
+		fi
+		print -u4 "\tprompt \"$ppnf\""
+	fi
+	print -u4 \\ttristate
+	if [[ -n $ALL_PKGOPTS ]]; then
+		# real (master) package, contains 1+ ipkg (sub)packages
+		print -nu4 \\tdepends on
+		sp=' '				# local sp: space (or ' || ')
+		for spcu in $ALL_PKGOPTS; do	# spcu: package option, ucase
+			print -nu4 "${sp}ADK_PACKAGE_$spcu"
+			sp=' || '
+		done
+		print -u4
+	fi
+	print -u4 \\tdefault n
+
+	# Handle NOT/ONLY_FOR_PLATFORM alikes
+	phd=					# phd: PKG_HOST_DEPENDS expand.
+	if [[ -n $PKG_HOST_DEPENDS ]]; then
+		phd='\tdepends on'
+		if [[ $PKG_HOST_DEPENDS = *\!* ]]; then
+			sp=' !'
+		else
+			sp=' '
+		fi
+		for x in $PKG_HOST_DEPENDS; do
+			typeset -u x=${x#!}
+			phd="$phd${sp}ADK_HOST_$x"
+			if [[ $PKG_HOST_DEPENDS = *\!* ]]; then
+				sp=' && !'
+			else
+				sp=' || '
+			fi
+		done
+	fi
+	ptd=					# ptd: PKG_TARGET_DEPENDS exp.
+	if [[ -n $PKG_TARGET_DEPENDS ]]; then
+		ptd='\tdepends on'
+		sp=' '				# local sp: space (or ' || ')
+		if [[ $PKG_TARGET_DEPENDS = *\!* ]]; then
+			sp=' !'
+		else
+			sp=' '
+		fi
+		for x in $PKG_TARGET_DEPENDS; do
+			x=${x#!}
+			#XXX cache this with mksh R40+
+			found=0
+			while read friendlyname sym; do
+				[[ $friendlyname = $x ]] || continue
+				found=1
+				break
+			done <../../target/target.lst
+			if (( !found )); then
+				print -u2 "$dn: Target '$x' not found!"
+				exit 1
+			fi
+			ptd="$ptd${sp}$sym"
+			if [[ $PKG_TARGET_DEPENDS = *\!* ]]; then
+				sp=' && !'
+			else
+				sp=' || '
+			fi
+		done
+	fi
+
+	# Handle subpackages / multipackages
+	for spcu in $ALL_PKGOPTS; do		# spcu: package option, ucase
+		eval sppn=\$PKGNAME_$spcu	# sppn: subpackage (ipkg) name
+		eval desc=\$PKGDESC_$spcu	# desc: subpackage description
+		: ${desc:=$PKG_DESCR}		# take from main pkg if empty
+		eval deps=\$PKGDEPS_$spcu	# deps: subpackage dependencies
+		eval dflt=\$PKGDFLT_$spcu	# dflt: config 'default' opt.
+		eval xline=\$CFLINE_$spcu	# xline: one free-format line
+
+		if [[ $spcu = LIB* ]]; then
+			h=5			# divert to Config.in.lib
+			(( g5++ )) && print -u5	# been here before
+		else
+			h=4			# divert to Config.in
+			print -u4
+		fi
+
+		print -u$h config ADK_PACKAGE_$spcu
+		spnf=$sppn			# spnf: subpackage name, filled
+		if [[ -n ${desc:-$PKG_NAME} ]]; then
+			while (( ${#spnf} < 34 )); do
+				spnf=$spnf.
+			done
+			spnf="$spnf ${desc:-$PKG_NAME}"
+		fi
+		print -u$h "\tprompt \"$spnf\""
+		print -u$h \\ttristate
+		[[ -n $phd ]] && print -u$h "$phd"
+		[[ -n $ptd ]] && print -u$h "$ptd"
+		print -u$h "\tdefault ${dflt:-n}"
+		for dep in $deps; do		# dep: ipkg name of one rundep.
+			# skip dependencies on uclibc++ and libstdcxx iff
+			# we produce these automatically
+			[[ -n $PKG_CXX && $dep = @(uclibc++|libstdcxx) ]] && \
+			    continue
+			case $dep {
+			(kmod-*)
+				# produce dependency on kernel package
+				# which have special name→sym mangling
+				typeset -u udep=${dep//-/_}
+				print -u$h "\tselect ADK_KPACKAGE_$udep"
+				;;
+			(*)
+				# produce dependency on regular package
+				# where the symbol is cached (see above)
+				print -u$h '\tselect' \
+				    ADK_PACKAGE_$(<../pkglist.d/"$dep")
+				;;
+			}
+		done
+		print -u$h \\tselect ADK_COMPILE_$dnu
+		[[ -n $xline ]] && print -u$h "\t$xline"
+		if [[ -n $desc$PKG_URL ]]; then
+			# produce (optional) help text
+			print -u$h \\thelp
+			[[ -n $desc ]] && print -u$h "\t  $desc"
+			[[ -n $desc && -n $PKG_URL ]] && print -u$h '\t  '
+			[[ -n $PKG_URL ]] && print -u$h "\t  WWW: $PKG_URL"
+		fi
+	done
+
+	# Handle CFrustFrust library selection, if necessary
+	[[ -n $PKG_CXX ]] && cat >&4 <<EOF
+
+choice
+prompt "C++ library to use"
+depends on ADK_COMPILE_$dnu
+default ADK_COMPILE_${PKG_CXX}_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+default ADK_COMPILE_${PKG_CXX}_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
+
+config ADK_COMPILE_${PKG_CXX}_WITH_STDCXX
+	bool "GNU C++ library"
+	select ADK_PACKAGE_LIBSTDCXX
+
+config ADK_COMPILE_${PKG_CXX}_WITH_UCLIBCXX
+	bool "uClibc++ library"
+	select ADK_PACKAGE_UCLIBCXX
+
+endchoice
+EOF
+
+	# Handle flavours (per directory)
+	for pfcu in $PKG_FLAVOURS; do		# pfcu: pkg flavour conf opt.
+		eval pfd=\$PKGFD_$pfcu		# pfd: pkg flavour description
+		print
+		print config ADK_PACKAGE_${dnu}_$pfcu
+		print "\tbool \"${pfd:-$PKG_NAME -> flavour $pfcu}\""
+		print \\tdefault n
+		print \\tdepends on ADK_COMPILE_$dnu
+		print \\thelp
+		print "\t  flavour ADK_PACKAGE_${dnu}_$pfcu for $PKG_NAME"
+	done >&4
+
+	) 4>Config.in 5>Config.in.lib
+	cd ..
+done
+pbar=done
+print -u2 "$pbar"
diff --git a/package/pmacct/Config.in b/package/pmacct/Config.in
deleted file mode 100644
index fe3e4d99d..000000000
--- a/package/pmacct/Config.in
+++ /dev/null
@@ -1,31 +0,0 @@
-config ADK_COMPILE_PMACCT
-	tristate
-	default n
-	depends on ADK_PACKAGE_PMACCTD || ADK_PACKAGE_PMACCT_CLIENT || ADK_PACKAGE_SFACCTD || ADK_PACKAGE_NFACCTD
-
-config ADK_PACKAGE_PMACCTD
-	prompt     "pmacctd....................... IP accounting daemon (libpcap based)"
-	tristate
-	default n
-	help
-	  An IPv4/IPv6 libpcap-based accounting and aggregation daemon
-
-config ADK_PACKAGE_NFACCTD
-	prompt     "nfacctd....................... Netflow accounting and aggregation daemon"
-	tristate
-	select ADK_PACKAGE_LIBPCAP
-	help
-	  An IPv4/IPv6 libpcap-based accounting and aggregation daemon
-
-config ADK_PACKAGE_SFACCTD
-	prompt     "sfacctd....................... sFlow accounting and aggregation daemon"
-	tristate
-	select ADK_PACKAGE_LIBPCAP
-	help
-	  An IPv4/IPv6 libpcap-based accounting and aggregation daemon
-
-config ADK_PACKAGE_PMACCT_CLIENT
-	prompt   "pmacct-client................... Command-line client to gather data from the IMT plugin"
-	tristate
-	default n
-	help
diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile
index c57e9008a..ac7aa9249 100644
--- a/package/pmacct/Makefile
+++ b/package/pmacct/Makefile
@@ -6,6 +6,16 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		pmacct
 PKG_VERSION:=		0.11.6
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libpcap
+ifneq ($(ADK_COMPILE_PMACCT_MYSQL),)
+PKG_BUILDDEP+=		mysql
+endif
+ifneq ($(ADK_COMPILE_PMACCT_PGSQL),)
+PKG_BUILDDEP+=		postgresql
+endif
+ifneq ($(ADK_COMPILE_PMACCT_SQLITE),)
+PKG_BUILDDEP+=		sqlite
+endif
 PKG_MD5SUM:=		e0f3bcba9a73b7a70bbf5a303cd22f77
 PKG_DESCR:=		IP accounting daemons
 PKG_SECTION:=		net
diff --git a/package/popt/Config.in b/package/popt/Config.in
deleted file mode 100644
index 6dbcf714e..000000000
--- a/package/popt/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_COMPILE_POPT
-	tristate
-	depends on ADK_PACKAGE_LIBPOPT
-
-config ADK_PACKAGE_LIBPOPT
-	prompt "libpopt........................... Command line option parsing library"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBICONV
-	select ADK_COMPILE_POPT
-	help
-	  A command line option parsing library
-	  
-	  ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
-
diff --git a/package/popt/Makefile b/package/popt/Makefile
index d08c20801..6645d5c0e 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		popt
 PKG_VERSION:=		1.15
 PKG_RELEASE:=		2
+PKG_BUILDDEP+=		libiconv
 PKG_MD5SUM:=		c61ef795fa450eb692602a661ec8d7f1
 PKG_DESCR:=		a command line option parsing library
 PKG_SECTION:=		libs
diff --git a/package/portmap/Config.in b/package/portmap/Config.in
deleted file mode 100644
index cc5169ce9..000000000
--- a/package/portmap/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_PACKAGE_PORTMAP
-	prompt "portmap........................... RPC Portmapper"
-	tristate
-	default n
-	help
-	  Portmap is a server that converts RPC (Remote Procedure Call) program
-	  numbers into DARPA protocol port numbers.  It must be running in order
-	  to make RPC calls.  Services that use RPC include NFS and NIS.
-
-config ADK_PACKAGE_PORTMAP_LIBWRAP
-	bool "Use tcp_wrappers"
-	default n
-	depends on ADK_PACKAGE_PORTMAP
-	select ADK_PACKAGE_LIBWRAP
diff --git a/package/portmap/Makefile b/package/portmap/Makefile
index d6ffd9404..85faa8d2f 100644
--- a/package/portmap/Makefile
+++ b/package/portmap/Makefile
@@ -6,6 +6,9 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		portmap
 PKG_VERSION:=		6.0
 PKG_RELEASE:=		1
+ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),)
+PKG_BUILDDEP+=		tcp_wrappers
+endif
 PKG_MD5SUM:=		ac108ab68bf0f34477f8317791aaf1ff
 PKG_DESCR:=		RPC portmapper
 PKG_SECTION:=		net
diff --git a/package/portsentry/Config.in b/package/portsentry/Config.in
deleted file mode 100644
index 27095069b..000000000
--- a/package/portsentry/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_PORTSENTRY
-	prompt "portsentry........................ Portscan protection utility"
-	tristate
-	default n
-	help
-	  Software for protection against port scans
-	  
-	  http://sourceforge.net/projects/sentrytools
-
diff --git a/package/postgresql/Config.in b/package/postgresql/Config.in
deleted file mode 100644
index d2e77a9c4..000000000
--- a/package/postgresql/Config.in
+++ /dev/null
@@ -1,31 +0,0 @@
-config ADK_COMPILE_POSTGRESQL
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBPQ
-
-config ADK_PACKAGE_LIBPQ
-	prompt "libpq............................. PostgreSQL client library"
-	tristate
-	default n
-	select ADK_COMPILE_POSTGRESQL
-	help
-	  PostgreSQL is an object-relational database management system (ORDBMS) 
-	  based on POSTGRES, Version 4.2, developed at the University of 
-	  California at Berkeley Computer Science Department. POSTGRES pioneered 
-	  many concepts that only became available in some commercial database 
-	  systems much later.
-
-	  PostgreSQL is an open-source descendant of this original Berkeley code. 
-	  It supports SQL92 and SQL99 and offers many modern features:
-
-	    * complex queries
-	    * foreign keys
-	    * triggers
-	    * views
-	    * transactional integrity
-	    * multiversion concurrency control
-	  
-	  http://www.postgresql.org/
-	  
-	  This package contains the shared client library, needed by other programs.
-
diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index fa676f312..d06cca865 100644
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		postgresql
 PKG_VERSION:=		8.3.7
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		zlib
 PKG_MD5SUM:=		6e36f3b4dd27ae0c352376ea9f843de2
 PKG_DESCR:=		PostgreSQL database library
 PKG_SECTION:=		libs
diff --git a/package/ppp/Config.in b/package/ppp/Config.in
deleted file mode 100644
index 68b5c4d66..000000000
--- a/package/ppp/Config.in
+++ /dev/null
@@ -1,52 +0,0 @@
-
-config ADK_PACKAGE_PPP
-	prompt "ppp............................... PPP (Point-to-Point Protocol) daemon"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_PPP
-
-config ADK_PACKAGE_PPP_MOD_PPPOA
-	prompt "ppp-mod-pppoa................... PPPoA (PPP over ATM) plugin"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_PPPOATM
-	depends on ADK_PACKAGE_PPP
-
-config ADK_PACKAGE_PPP_MOD_PPPOE
-	prompt "ppp-mod-pppoe................... PPPoE (PPP over Ethernet) plugin"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_PPPOE
-	depends on ADK_PACKAGE_PPP
-
-config ADK_PACKAGE_PPP_MOD_RADIUS
-	prompt "ppp-mod-radius.................. RADIUS (Remote Authentication Dial-In User Service) plugin"
-	tristate
-	default n
-	depends on ADK_PACKAGE_PPP
-
-config ADK_PACKAGE_PPP_MOD_CHAT
-	prompt "chat............................ Utility to establish conversation with other PPP servers (via a modem)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_PPP
-
-config ADK_PACKAGE_PPP_MOD_PPPDUMP
-	prompt "pppdump......................... Utility to read PPP record file"
-	tristate
-	default n
-	depends on ADK_PACKAGE_PPP
-
-config ADK_PACKAGE_PPP_MOD_PPPSTATS
-	prompt "pppstats........................ Utility to report PPP statistics"
-	tristate
-	default n
-	depends on ADK_PACKAGE_PPP
-
-config ADK_PACKAGE_PPP_MOD_PPPUMTS
-	prompt "GPRS/UMTS support............... Package with scripts and dependencies to run UMTS/GRPS"
-	tristate
-	default n
-	select ADK_PACKAGE_COMGT
-	select ADK_KPACKAGE_KMOD_USB_SERIAL
-	depends on ADK_PACKAGE_PPP
diff --git a/package/pptp/Config.in b/package/pptp/Config.in
deleted file mode 100644
index 3f132d202..000000000
--- a/package/pptp/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_PPTP
-	prompt "pptp.............................. PPTP (Point-to-Point Tunneling Protocol) client"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_NET_IPGRE
-	select ADK_PACKAGE_PPP
-	help
-	  A Point-to-Point Tunneling Protocol Client 
-	  
-	  http://pptpclient.sourceforge.net/
-
diff --git a/package/pptpd/Config.in b/package/pptpd/Config.in
deleted file mode 100644
index 7f1144f1b..000000000
--- a/package/pptpd/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_PPTPD
-	prompt "pptpd............................. PPTP (Point-to-Point Tunneling Protocol) server"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_NET_IPGRE
-	select ADK_PACKAGE_PPP
-	help
-	  A Point-to-Point Tunneling Protocol server
-	  
-	  http://poptop.sourceforge.net/
-
diff --git a/package/privoxy/Config.in b/package/privoxy/Config.in
deleted file mode 100644
index 68a42dfb6..000000000
--- a/package/privoxy/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_PACKAGE_PRIVOXY
-	prompt "privoxy........................... web proxy with advanced filtering capabilities"
-	tristate
-	select ADK_PACKAGE_LIBPTHREAD
-	default n
-	help
-	  Privoxy is a web proxy with advanced filtering capabilities for
-	  protecting privacy, modifying web page content, managing cookies,
-	  controlling access, and removing ads, banners, pop-ups and other
-	  obnoxious Internet junk. Privoxy has a very flexible configuration
-	  and can be customized to suit individual needs and tastes. Privoxy
-	  has application for both stand-alone systems and multi-user networks.
-	  
-	  http://www.privoxy.org/
diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile
index 0416b5e78..aa6fa2b2f 100644
--- a/package/privoxy/Makefile
+++ b/package/privoxy/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		privoxy
 PKG_VERSION:=		3.0.15
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		pcre
 PKG_VARIANT:=		beta
 PKG_MD5SUM:=		6571dc9524e945e79c2af62fefe7b107
 PKG_DESCR:=		web proxy with advanced filtering capabilities
diff --git a/package/procmail/Config.in b/package/procmail/Config.in
deleted file mode 100644
index 28e75221a..000000000
--- a/package/procmail/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_PROCMAIL
-	prompt "procmail.......................... mail processing tool"
-	tristate
-	default n
-	help
-	  Procmail is able to process and classify incoming mail into
-	  different mail boxes.
-
-	  Very useful in conjunction with mutt.
-	
-	  http://www.procmail.org
diff --git a/package/procps/Config.in b/package/procps/Config.in
deleted file mode 100644
index 475bafc08..000000000
--- a/package/procps/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config ADK_PACKAGE_PROCPS_META
-	bool
-	default n
-
-config ADK_PACKAGE_PROCPS
-	prompt "procps............................ The /proc file system utilities"
-	tristate
-	default n
-	select ADK_PACKAGE_PROCPS_META
-	select ADK_PACKAGE_LIBNCURSES
-	help
-	  procps is the package that has a bunch of small useful utilities 
-	  that give information about processes using the /proc filesystem. 
-	  The package includes the programs ps, top, vmstat, w, kill, free, 
-	  slabtop, and skill.
-	  
-	  http://procps.sourceforge.net/
diff --git a/package/procps/Makefile b/package/procps/Makefile
index 3839b3133..a917a7009 100644
--- a/package/procps/Makefile
+++ b/package/procps/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		procps
 PKG_VERSION:=		3.2.7
 PKG_RELEASE:=		4
+PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		f490bca772b16472962c7b9f23b1e97d
 PKG_DESCR:=		The /proc file system utilities
 PKG_SECTION:=		utils
diff --git a/package/ptunnel/Config.in b/package/ptunnel/Config.in
deleted file mode 100644
index 0b714af2e..000000000
--- a/package/ptunnel/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_PACKAGE_PTUNNEL
-	prompt "ptunnel........................... Tunnel TCP connections over ICMP packets"
-	tristate 
-	default n
-	select ADK_PACKAGE_LIBPCAP
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  ptunnel is an application that allows you to reliably tunnel TCP connections to
-	  a remote host using ICMP echo request and reply packets, commonly known as ping
-	  requests and replies. It acts as a proxy and can handle sockets and secured
-	  identification.
-
-	  http://www.cs.uit.no/~daniels/PingTunnel/
-
diff --git a/package/ptunnel/Makefile b/package/ptunnel/Makefile
index dab849974..9389aa5bc 100644
--- a/package/ptunnel/Makefile
+++ b/package/ptunnel/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ptunnel
 PKG_VERSION:=		0.61
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libpcap
 PKG_MD5SUM:=		b45f73875f2af48f101816672f83a5fe
 PKG_DESCR:=		Tunnel TCP connections over ICMP packets
 PKG_SECTION:=		net
diff --git a/package/python/Config.in b/package/python/Config.in
deleted file mode 100644
index ddbd30d9c..000000000
--- a/package/python/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_PYTHON
-	prompt "python............................ Python scripting language"
-	tristate
-	default n
-	help
-	  http://www.python.org
diff --git a/package/quagga/Config.in b/package/quagga/Config.in
deleted file mode 100644
index 6e1d0905e..000000000
--- a/package/quagga/Config.in
+++ /dev/null
@@ -1,66 +0,0 @@
-#menu "quagga............................ The Quagga Software Routing Suite"
-
-config ADK_PACKAGE_QUAGGA
-	prompt "quagga............................ The Quagga Software Routing Suite"
-	tristate
-	default n
-	help
-	  A routing software package that provides TCP/IP based routing services
-	  with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2, 
-	  OSPFv3, BGP-4, and BGP-4+
-	  
-	  http://www.quagga.net/
-
-config ADK_PACKAGE_QUAGGA_BGPD
-	prompt   "quagga-bgpd................... BGPv4, BGPv4+, BGPv4- routing engine"
-	tristate
-	default n
-	depends on ADK_PACKAGE_QUAGGA
-	help
-	  A BGPv4, BGPv4+, BGPv4- routing engine for use with Quagga routing
-	  software.
-
-config ADK_PACKAGE_QUAGGA_OSPFD
-	prompt   "quagga-ospfd.................. OSPFv2 routing engine"
-	tristate
-	default n
-	depends on ADK_PACKAGE_QUAGGA
-	help
-	  An OSPFv2 (IPv4) routing engine for use with Quagga routing software.
-
-config ADK_PACKAGE_QUAGGA_OSPF6D
-	prompt   "quagga-ospf6d................. OSPFv3 routing engine"
-	tristate
-	default n
-	depends on ADK_PACKAGE_QUAGGA
-	help
-	  An OSPFv3 (IPv6) routing engine for use with Quagga routing software.
-
-config ADK_PACKAGE_QUAGGA_RIPD
-	prompt   "quagga-ripd................... RIP routing engine"
-	tristate
-	default n
-	depends on ADK_PACKAGE_QUAGGA
-	help
-	  A RIP (IPv4) routing engine for use with Quagga routing software.
-
-config ADK_PACKAGE_QUAGGA_RIPNGD
-	prompt   "quagga-ripngd................. RIPNG routing engine"
-	tristate
-	default n
-	depends on ADK_PACKAGE_QUAGGA
-	help
-	  A RIPNG (IPv6) routing engine for use with Quagga routing software.
-
-config ADK_PACKAGE_QUAGGA_VTYSH
-	prompt   "quagga-vtysh.................. integrated shell for Quagga routing software"
-	tristate
-	default n
-	depends on ADK_PACKAGE_QUAGGA
-	select ADK_PACKAGE_LIBREADLINE
-	select ADK_PACKAGE_LIBNCURSES
-	help
-	  vtysh lets you interact with all the Quagga routing daemons
-	  at once in an integrated shell.
-
-#endmenu
diff --git a/package/quagga/Makefile b/package/quagga/Makefile
index 301fb2dbc..aec761417 100644
--- a/package/quagga/Makefile
+++ b/package/quagga/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		quagga
 PKG_VERSION:=		0.99.15
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		readline ncurses
 PKG_MD5SUM:=		8975414c76a295f4855a417af0b5ddce
 PKG_DESCR:=		A routing software package
 PKG_SECTION:=		net
diff --git a/package/raddump/Config.in b/package/raddump/Config.in
deleted file mode 100644
index f56795969..000000000
--- a/package/raddump/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_RADDUMP
-        prompt "raddump........................... raddump interprets captured RADIUS packets."
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBPCAP
-	help
-		raddump interprets captured RADIUS packets to print a
-		timestamp, packet length, RADIUS packet type, source and
-		destination hosts and ports, and included attribute names and
-		values for each packet.
diff --git a/package/raddump/Makefile b/package/raddump/Makefile
index 28c84e709..9a84d3bd6 100755
--- a/package/raddump/Makefile
+++ b/package/raddump/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		raddump
 PKG_VERSION:=		0.3.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl libpcap
 PKG_MD5SUM:=		f8c29c67141ea78bb6ae8b97d5149480
 PKG_DESCR:=		interprets captured RADIUS packets
 PKG_SECTION:=		net
diff --git a/package/radvd/Config.in b/package/radvd/Config.in
deleted file mode 100644
index 32586c2aa..000000000
--- a/package/radvd/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_RADVD
-	prompt "radvd............................. IPv6 Routing Advertisement Daemon"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_IPV6
-	depends on !ADK_HOST_FREEBSD # flex problem
-	help
-	  Routing Advertisement Daemon for IPv6
-	  http://v6web.litech.org/radvd/
-
diff --git a/package/radvd/Makefile b/package/radvd/Makefile
index 6c3662b71..0cfab4506 100644
--- a/package/radvd/Makefile
+++ b/package/radvd/Makefile
@@ -14,6 +14,8 @@ PKG_URL:=		http://www.litech.org/radvd
 PKG_SITES:=		http://v6web.litech.org/radvd/dist/ \
 			http://download.sourcemage.org/mirror/
 
+PKG_HOST_DEPENDS:=	!freebsd
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,RADVD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/randrproto/Config.in b/package/randrproto/Config.in
deleted file mode 100644
index 949c5caee..000000000
--- a/package/randrproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_RANDRPROTO
-	prompt "randrproto.............................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/rarpd/Config.in b/package/rarpd/Config.in
deleted file mode 100644
index 9f5c7ac65..000000000
--- a/package/rarpd/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_PACKAGE_RARPD
-	prompt "rarpd............................. Reverse ARP Daemon"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNET
-	help
-	  Rarpd  is  a  daemon  which responds to RARP requests.
-	  RARP is used by some machines at boot time to discover their
-	  IP address.  They  provide their  Ethernet address and rarpd
-	  responds with their IP address if it finds it in the ethers
-	  database.
-	  
-	  ftp://ftp.dementia.org/pub/net-tools/
-
diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile
index 5e09b743a..b7805f693 100644
--- a/package/rarpd/Makefile
+++ b/package/rarpd/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		rarpd
 PKG_VERSION:=		1.1
 PKG_RELEASE:=		11
+PKG_BUILDDEP+=		libnet
 PKG_MD5SUM:=		04e2ca849e758d0b88c8281775ec3b58
 PKG_DESCR:=		Reverse ARP Daemon
 PKG_SECTION:=		net
diff --git a/package/rdate/Config.in b/package/rdate/Config.in
deleted file mode 100644
index 76954adc9..000000000
--- a/package/rdate/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_RDATE
-	prompt "rdate............................. very small rdate and ntp client"
-	tristate
-	default n
-	help
-	  A very small but secure rdate and ntp time synchronisation
-	  client from MirBSD.
diff --git a/package/readline/Config.in b/package/readline/Config.in
deleted file mode 100644
index c46e6fe22..000000000
--- a/package/readline/Config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-config ADK_COMPILE_READLINE
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBREADLINE
-
-config ADK_PACKAGE_LIBREADLINE
-	prompt "libreadline....................... Command lines edition library"
-	tristate
-	default n
-	select ADK_COMPILE_READLINE
-	select ADK_PACKAGE_LIBNCURSES
-	help
-	  The Readline library provides a set of functions for use by applications 
-	  that allow users to edit command lines as they are typed in. Both Emacs 
-	  and vi editing modes are available. The Readline library includes 
-	  additional functions to maintain a list of previously-entered command 
-	  lines, to recall and perhaps reedit those lines, and perform csh-like 
-	  history expansion on previous commands.
-	  
-	  http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
-
diff --git a/package/readline/Makefile b/package/readline/Makefile
index a9d81fa1e..68f68cbea 100644
--- a/package/readline/Makefile
+++ b/package/readline/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		readline
 PKG_VERSION:=		5.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		e39331f32ad14009b9ff49cc10c5e751
 PKG_DESCR:=		Command line editing library
 PKG_SECTION:=		libs
diff --git a/package/reaim/Config.in b/package/reaim/Config.in
deleted file mode 100644
index baf0f2200..000000000
--- a/package/reaim/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_REAIM
-	prompt "reaim............................. A transparent AIM / MSN proxy"
-	tristate
-	default n
-	help
-	  ReAIM is a proxy for file transfers with MSN/AIM.
-	  
-	  http://reaim.sourceforge.net/
-
diff --git a/package/renderproto/Config.in b/package/renderproto/Config.in
deleted file mode 100644
index a2709ef12..000000000
--- a/package/renderproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_RENDERPROTO
-	prompt "renderproto............................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/resourceproto/Config.in b/package/resourceproto/Config.in
deleted file mode 100644
index 850b015ef..000000000
--- a/package/resourceproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_RESOURCEPROTO
-	prompt "resourceproto............................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/rp-pppoe/Config.in b/package/rp-pppoe/Config.in
deleted file mode 100644
index 6d27ecb4b..000000000
--- a/package/rp-pppoe/Config.in
+++ /dev/null
@@ -1,50 +0,0 @@
-#menu "rp-pppoe.......................... Roaring Penguin PPPoE (PPP over Ethernet) implementation"
-
-config ADK_COMPILE_RP_PPPOE
-	tristate
-	default n
-	depends on ADK_PACKAGE_PPPOE_CLIENT || ADK_PACKAGE_PPPOE_RELAY || ADK_PACKAGE_PPPOE_SERVER || ADK_PACKAGE_PPPOE_SNIFF
-
-config ADK_PACKAGE_PPPOE_CLIENT
-	prompt "pppoe-client...................... PPPoE (PPP over Ethernet) client"
-	tristate
-	default n
-	select ADK_COMPILE_RP_PPPOE
-	select ADK_PACKAGE_PPP
-	help
-	  PPPoE (PPP over Ethernet) client
-	  
-	  http://roaringpenguin.com/penguin/open_source_rp-pppoe.php
-
-config ADK_PACKAGE_PPPOE_RELAY
-	prompt "pppoe-relay....................... PPPoE (PPP over Ethernet) relay"
-	tristate
-	default n
-	select ADK_COMPILE_RP_PPPOE
-	help
-	  PPPoE (PPP over Ethernet) relay
-	  
-	  http://roaringpenguin.com/penguin/open_source_rp-pppoe.php
-
-config ADK_PACKAGE_PPPOE_SERVER
-	prompt "pppoe-server...................... PPPoE (PPP over Ethernet) server"
-	tristate
-	default n
-	select ADK_COMPILE_RP_PPPOE
-	select ADK_PACKAGE_PPP
-	help
-	  PPPoE (PPP over Ethernet) server
-	  
-	  http://roaringpenguin.com/penguin/open_source_rp-pppoe.php
-
-config ADK_PACKAGE_PPPOE_SNIFF
-	prompt "pppoe-sniff....................... PPPoE (PPP over Ethernet) frame sniffer"
-	tristate
-	default n
-	select ADK_COMPILE_RP_PPPOE
-	help
-	  PPPoE (PPP over Ethernet) frame sniffer
-	  
-	  http://roaringpenguin.com/penguin/open_source_rp-pppoe.php
-
-#endmenu
diff --git a/package/rpm/Config.in b/package/rpm/Config.in
deleted file mode 100644
index 2b2cba6e8..000000000
--- a/package/rpm/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_RPM
-	prompt "rpm.................................. Red Hat package manager"
-	tristate
-	select ADK_PACKAGE_NSS
-	select ADK_PACKAGE_NSPR
-	select ADK_PACKAGE_ZLIB
-	select ADK_PACKAGE_LIBDB
-	default n
-	help
-	  Red Hat package manager
diff --git a/package/rpm/Makefile b/package/rpm/Makefile
index 8526288be..89b50a647 100644
--- a/package/rpm/Makefile
+++ b/package/rpm/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		rpm
 PKG_VERSION:=		4.7.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		nss libdb
 PKG_MD5SUM:=		224715646325df4cd3904e3ac9e16186
 PKG_DESCR:=		Package Manager
 PKG_SECTION:=		base
diff --git a/package/rrdcollect/Config.in b/package/rrdcollect/Config.in
deleted file mode 100644
index 1c35e092a..000000000
--- a/package/rrdcollect/Config.in
+++ /dev/null
@@ -1,33 +0,0 @@
-config ADK_PACKAGE_RRDCOLLECT
-	prompt "rrdcollect...................... Round-Robin Database (RRD) collecting daemon"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBRRD || ADK_PACKAGE_LIBRRD1
-	help
-	  RRDcollect is a daemon which polls ceratin files in /proc/
-	  directory, gathering data and storing it inside RRDtool's
-	  database files.  Being written in C should be both fast
-	  and resources-friendly.  Supports both scanf(3)-style
-	  pattern matches and perl compatible regular expressions.
-	  
-	  http://rrdcollect.sourceforge.net/
-	  
-	  This package contains only the deamon program.
-
-config ADK_PACKAGE_RRDCOLLECT_EXAMPLE
-	prompt   "rrdcollect-example.......... Example setup for RRD collecting daemon above"
-	tristate
-	default n
-	depends on ADK_PACKAGE_RRDCOLLECT
-	help
-	  RRDcollect is a daemon which polls ceratin files in /proc/
-	  directory, gathering data and storing it inside RRDtool's
-	  database files.  Being written in C should be both fast
-	  and resources-friendly.  Supports both scanf(3)-style
-	  pattern matches and perl compatible regular expressions.
-	  
-	  http://rrdcollect.sourceforge.net/
-	  
-	  This packages contains programs and configuration files to 
-	  start graphing a basic set of ressources on your router.
-
diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile
index cc711c505..78c67ebab 100644
--- a/package/rrdcollect/Makefile
+++ b/package/rrdcollect/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		rrdcollect
 PKG_VERSION:=		0.2.3
 PKG_RELEASE:=		8
+PKG_BUILDDEP+=		rrdtool
 PKG_MD5SUM:=		5e4305c612bc3cccbaf802c275c81a11
 PKG_DESCR:=		Round-Robin Database (RRD) collecting daemon
 PKG_SECTION:=		admin
diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in
deleted file mode 100644
index 993044b3a..000000000
--- a/package/rrdtool/Config.in
+++ /dev/null
@@ -1,66 +0,0 @@
-config ADK_COMPILE_RRDTOOL
-	bool
-	default n
-
-config ADK_PACKAGE_LIBRRD
-	prompt   "librrd............................ Round Robin Database (RRD) management library (v1.2.x)"
-	tristate
-	default n
-	select ADK_COMPILE_RRDTOOL
-	select ADK_PACKAGE_LIBART
-	select ADK_PACKAGE_LIBFREETYPE
-	select ADK_PACKAGE_LIBPNG
-	select ADK_PACKAGE_LIBXML2
-	select ADK_PACKAGE_ZLIB
-	help
-	  RRD is the Acronym for Round Robin Database. RRD is a system to store and
-	  display time-series data (i.e. network bandwidth, machine-room temperature,
-	  server load average). It stores the data in a very compact way that will
-	  not expand over time, and it presents useful graphs by processing the data
-	  to enforce a certain data density. It can be used either via simple wrapper
-	  scripts (from shell or Perl) or via frontends that poll network devices and
-	  put friendly user interface on it.
-	  
-	  http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
-	  
-	  This package contains command line tools used to manage RRDs.
-
-config ADK_PACKAGE_RRDCGI
-	prompt   "rrdcgi............................ Round Robin Database (RRD) CGI graphing tool (v1.2.x)"
-	tristate
-	default n
-	select ADK_COMPILE_RRDTOOL
-	select ADK_PACKAGE_LIBRRD
-	select ADK_PACKAGE_CGILIB
-	help
-	  RRD is the Acronym for Round Robin Database. RRD is a system to store and
-	  display time-series data (i.e. network bandwidth, machine-room temperature,
-	  server load average). It stores the data in a very compact way that will
-	  not expand over time, and it presents useful graphs by processing the data
-	  to enforce a certain data density. It can be used either via simple wrapper
-	  scripts (from shell or Perl) or via frontends that poll network devices and
-	  put friendly user interface on it.
-	  
-	  http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
-	  
-	  This package contains the rrdcgi tool used to create web pages containing
-	  RRD graphs based on templates.
-
-config ADK_PACKAGE_RRDTOOL
-	prompt   "rrdtool........................... Round Robin Database (RRD) management tools (v1.2.x)"
-	tristate
-	default n
-	select ADK_COMPILE_RRDTOOL
-	select ADK_PACKAGE_LIBRRD
-	help
-	  RRD is the Acronym for Round Robin Database. RRD is a system to store and
-	  display time-series data (i.e. network bandwidth, machine-room temperature,
-	  server load average). It stores the data in a very compact way that will
-	  not expand over time, and it presents useful graphs by processing the data
-	  to enforce a certain data density. It can be used either via simple wrapper
-	  scripts (from shell or Perl) or via frontends that poll network devices and
-	  put friendly user interface on it.
-	  
-	  http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
-	  
-	  This package contains command line tools used to manage RRDs.
diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index e1c09b1e5..6c729367e 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		rrdtool
 PKG_VERSION:=		1.2.30
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libxml2 cgilib freetype libart libpng
 PKG_MD5SUM:=		19b24f7184a8dbf7b48c1bbb565ad9fb
 PKG_DESCR:=		Round Robin Database (RRD) management library and tools
 PKG_SECTION:=		libs
diff --git a/package/rrs/Config.in b/package/rrs/Config.in
deleted file mode 100644
index 482911e33..000000000
--- a/package/rrs/Config.in
+++ /dev/null
@@ -1,46 +0,0 @@
-config ADK_COMPILE_RRS
-	tristate
-	default n
-	depends on ADK_PACKAGE_RRS || ADK_PACKAGE_RRS_NOSSL
-
-config ADK_PACKAGE_RRS
-	prompt "rrs............................... A reverse (connecting) remote shell, with SSL support"
-	tristate
-	default n
-	select ADK_COMPILE_RRS
-	select ADK_PACKAGE_ZLIB
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-	  A reverse (connecting) remote shell, built with SSL support.
-	  
-	  http://www.cycom.se/dl/rrs/
-
-config ADK_PACKAGE_RRS_NOSSL
-	prompt "rrs-nossl......................... A reverse (connecting) remote shell, without SSL support"
-	tristate
-	default n
-	select ADK_COMPILE_RRS
-	select ADK_PACKAGE_ZLIB
-	help
-	  A reverse (connecting) remote shell, built without SSL support.
-	  
-	  http://www.cycom.se/dl/rrs/
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_RRS
-default ADK_COMPILE_RRS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_RRS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_RRS_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_RRS_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	help
-
-endchoice
-
diff --git a/package/rrs/Makefile b/package/rrs/Makefile
index fe16bdd2c..6f45be506 100644
--- a/package/rrs/Makefile
+++ b/package/rrs/Makefile
@@ -6,6 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		rrs
 PKG_VERSION:=		1.70
 PKG_RELEASE:=		2
+PKG_BUILDDEP+=		zlib
+PKG_CXX:=		RRS
+ifneq ($(ADK_PACKAGE_RRS),)
+PKG_BUILDDEP+=		openssl
+endif
 PKG_MD5SUM:=		b400d03c0e39e3e78a7327ba78f789f0
 PKG_DESCR:=		A reverse (connecting) remote shell, with SSL support.
 PKG_SECTION:=		net
@@ -16,10 +21,8 @@ PKG_DEPENDS:=		libopenssl zlib
 PKG_DEPENDS_NOSSL:=	zlib
 
 ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y)
-PKG_DEPENDS+=		uclibc++
 PKG_DEPENDS_NOSSL+=	uclibc++
 else
-PKG_DEPENDS+=		libstdcxx
 PKG_DEPENDS_NOSSL+=	libstdcxx
 endif
 
diff --git a/package/rsync/Config.in b/package/rsync/Config.in
deleted file mode 100644
index 031c93076..000000000
--- a/package/rsync/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_RSYNC
-	prompt "rsync............................. file transfer utility"
-	tristate
-	select ADK_PACKAGE_LIBPOPT
-	default n
-	help
-	  An utility that provides fast incremental file transfer
-	  
-	  http://rsync.samba.org
-
diff --git a/package/rsync/Makefile b/package/rsync/Makefile
index 013bffe81..b34584534 100644
--- a/package/rsync/Makefile
+++ b/package/rsync/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		rsync
 PKG_VERSION:=		3.0.6
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		popt
 PKG_MD5SUM:=		e9865d093a18e4668b9d31b635dc8e99
 PKG_DESCR:=		utility that provides fast incremental file transfer
 PKG_SECTION:=		net
diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in
deleted file mode 100644
index 920631f5b..000000000
--- a/package/rtorrent/Config.in
+++ /dev/null
@@ -1,28 +0,0 @@
-config ADK_PACKAGE_RTORRENT
-	prompt "rtorrent........................... console bittorrent client"
-	tristate
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBTORRENT
-	select ADK_PACKAGE_LIBCURL
-	default n
-	help
-	  http://libtorrent.rakshasa.no/
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_RTORRENT
-default ADK_COMPILE_RTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_RTORRENT_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_RTORRENT_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_RTORRENT_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	depends on ADK_BROKEN
-	help
-
-endchoice
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index c2de864ba..e38f0d838 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -6,12 +6,14 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		rtorrent
 PKG_VERSION:=		0.8.5
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		ncurses libtorrent curl
 PKG_MD5SUM:=		e701095e1824b7e512a17000f4c0a783
 PKG_DESCR:=		console torrent application
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libncurses libtorrent libcurl
 PKG_URL:=		http://libtorrent.rakshasa.no
 PKG_SITES:=		http://libtorrent.rakshasa.no/downloads/
+PKG_CXX:=		RTORRENT
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/ruby/Config.in b/package/ruby/Config.in
deleted file mode 100644
index cf85ef70f..000000000
--- a/package/ruby/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_RUBY
-	prompt "ruby.............................. Object-Oriented scripting language"
-	tristate
-	default n
-	help
-	  Ruby is the interpreter for the ruby language.
-
diff --git a/package/samba/Config.in b/package/samba/Config.in
deleted file mode 100644
index b26d2791e..000000000
--- a/package/samba/Config.in
+++ /dev/null
@@ -1,62 +0,0 @@
-config ADK_COMPILE_SAMBA
-	tristate
-	default n
-	depends on ADK_PACKAGE_SAMBA || ADK_PACKAGE_SAMBA_CLIENT || ADK_PACKAGE_SMBFS
-
-config ADK_PACKAGE_SAMBA
-	prompt "samba............................. NetBIOS/SMB file and print server"
-	tristate
-	default n
-	select ADK_COMPILE_SAMBA
-	select ADK_PACKAGE_LIBPOPT
-	help
-	 The Samba software suite is a collection of programs that implements the 
-	 SMB protocol for unix systems, allowing you to serve files and printers to 
-	 Windows, NT, OS/2 and DOS clients. This protocol is sometimes also referred 
-	 to as the LanManager or Netbios protocol.
-	 
-	 http://www.samba.org/
-	 
-	 This package contains the SMB file and print server daemons.
-
-config ADK_SAMBA_CODEPAGE
-	string "legacy codepage"
-	default "ISO8859-1"
-	depends on ADK_PACKAGE_SAMBA
-	help
-	  which codepage should be added to package
-	  choose one of:
-	  1125 1251 437 737 775 850 852 857 861 866 932 936 949 950
-	  ISO8859-1 ISO8859-13 ISO8859-15 ISO8859-2 ISO8859-5 ISO8859-7
-	  ISO8859-9 KOI8-R KOI8-U
-
-config ADK_PACKAGE_SAMBA_CLIENT
-	prompt "samba-client...................... NetBIOS/SMB simple client"
-	tristate
-	default n
-	select ADK_COMPILE_SAMBA
-	help
-	 The Samba software suite is a collection of programs that implements the 
-	 SMB protocol for unix systems, allowing you to serve files and printers to 
-	 Windows, NT, OS/2 and DOS clients. This protocol is sometimes also referred 
-	 to as the LanManager or Netbios protocol.
-	 
-	 http://www.samba.org/
-	 
-	 This package contains a simple command-line SMB client.
-
-config ADK_PACKAGE_SAMBA_PASSWD
-	prompt "samba-passwd...................... samba password utility"
-	tristate
-	default n
-	select ADK_COMPILE_SAMBA
-	help
-	 The Samba software suite is a collection of programs that implements the 
-	 SMB protocol for unix systems, allowing you to serve files and printers to 
-	 Windows, NT, OS/2 and DOS clients. This protocol is sometimes also referred 
-	 to as the LanManager or Netbios protocol.
-	 
-	 http://www.samba.org/
-	 
-	 This package contains a the samba password utility.
-
diff --git a/package/sane-backends/Config.in b/package/sane-backends/Config.in
deleted file mode 100644
index 01d575895..000000000
--- a/package/sane-backends/Config.in
+++ /dev/null
@@ -1,643 +0,0 @@
-config ADK_PACKAGE_SANE_BACKENDS
-	prompt "sane-backends..................... Scanner Access Now Easy (backends)"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_NET
-	prompt "sane-backend-net................ network access to SANE servers"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	help
-	  Install this backend to export scanners over the network.
-
-config ADK_PACKAGE_SANE_BACKEND_ABATON
-	prompt "sane-backend-abaton............. Scanner Access Now Easy (ABATON)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_AGFAFOCUS
-	prompt "sane-backend-agfafocus.......... Scanner Access Now Easy (AGFAFOCUS)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_APPLE
-	prompt "sane-backend-apple.............. Scanner Access Now Easy (APPLE)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_ARTEC_EPLUS48U
-	prompt "sane-backend-artec-eplus48u..... Scanner Access Now Easy (ARTEC_EPLUS48U)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_ARTEC
-	prompt "sane-backend-artec.............. Scanner Access Now Easy (ARTEC)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_AS6E
-	prompt "sane-backend-as6e............... Scanner Access Now Easy (AS6E)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_AVISION
-	prompt "sane-backend-avision............ Scanner Access Now Easy (AVISION)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_BH
-	prompt "sane-backend-bh................. Scanner Access Now Easy (BH)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_CANON630U
-	prompt "sane-backend-canon630u.......... Scanner Access Now Easy (CANON630U)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_CANON
-	prompt "sane-backend-canon.............. Scanner Access Now Easy (CANON)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_COOLSCAN2
-	prompt "sane-backend-coolscan2.......... Scanner Access Now Easy (COOLSCAN2)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_COOLSCAN
-	prompt "sane-backend-coolscan........... Scanner Access Now Easy (COOLSCAN)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_DC25
-	prompt "sane-backend-dc25............... Scanner Access Now Easy (DC25)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_DMC
-	prompt "sane-backend-dmc................ Scanner Access Now Easy (DMC)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_EPSON
-	prompt "sane-backend-epson.............. Scanner Access Now Easy (EPSON)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_FUJITSU
-	prompt "sane-backend-fujitsu............ Scanner Access Now Easy (FUJITSU)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_GENESYS
-	prompt "sane-backend-genesys............ Scanner Access Now Easy (GENESYS)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_GT68XX
-	prompt "sane-backend-gt68xx............. Scanner Access Now Easy (GT68XX)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_HP3500
-	prompt "sane-backend-hp3500............. Scanner Access Now Easy (HP3500)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_HP4200
-	prompt "sane-backend-hp4200............. Scanner Access Now Easy (HP4200)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_HP5400
-	prompt "sane-backend-hp5400............. Scanner Access Now Easy (HP5400)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_HP
-	prompt "sane-backend-hp................. Scanner Access Now Easy (HP)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_IBM
-	prompt "sane-backend-ibm................ Scanner Access Now Easy (IBM)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_LEO
-	prompt "sane-backend-leo................ Scanner Access Now Easy (LEO)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_LEXMARK
-	prompt "sane-backend-lexmark............ Scanner Access Now Easy (LEXMARK)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_MA1509
-	prompt "sane-backend-ma1509............. Scanner Access Now Easy (MA1509)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_MATSUSHITA
-	prompt "sane-backend-matsushita......... Scanner Access Now Easy (MATSUSHITA)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_MICROTEK2
-	prompt "sane-backend-microtek2.......... Scanner Access Now Easy (MICROTEK2)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_MICROTEK
-	prompt "sane-backend-microtek........... Scanner Access Now Easy (MICROTEK)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_MUSTEK
-	prompt "sane-backend-mustek............. Scanner Access Now Easy (MUSTEK)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_MUSTEK_USB2
-	prompt "sane-backend-mustek-usb2........ Scanner Access Now Easy (MUSTEK_USB2)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_MUSTEK_USB
-	prompt "sane-backend-mustek-usb......... Scanner Access Now Easy (MUSTEK_USB)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_NEC
-	prompt "sane-backend-nec................ Scanner Access Now Easy (NEC)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_NIASH
-	prompt "sane-backend-niash.............. Scanner Access Now Easy (NIASH)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_PIE
-	prompt "sane-backend-pie................ Scanner Access Now Easy (PIE)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_PIXMA
-	prompt "sane-backend-pixma.............. Scanner Access Now Easy (PIXMA)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_PLUSTEK_PP
-	prompt "sane-backend-plustek-pp......... Scanner Access Now Easy (PLUSTEK_PP)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_PLUSTEK
-	prompt "sane-backend-plustek............ Scanner Access Now Easy (PLUSTEK)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_RICOH
-	prompt "sane-backend-ricoh.............. Scanner Access Now Easy (RICOH)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_S9036
-	prompt "sane-backend-s9036.............. Scanner Access Now Easy (S9036)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_SCEPTRE
-	prompt "sane-backend-sceptre............ Scanner Access Now Easy (SCEPTRE)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_SHARP
-	prompt "sane-backend-sharp.............. Scanner Access Now Easy (SHARP)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_SM3600
-	prompt "sane-backend-sm3600............. Scanner Access Now Easy (SM3600)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_SM3840
-	prompt "sane-backend-sm3840............. Scanner Access Now Easy (SM3840)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_SNAPSCAN
-	prompt "sane-backend-snapscan........... Scanner Access Now Easy (SNAPSCAN)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_SP15C
-	prompt "sane-backend-sp15c.............. Scanner Access Now Easy (SP15C)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_ST400
-	prompt "sane-backend-st400.............. Scanner Access Now Easy (ST400)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_STV680
-	prompt "sane-backend-stv680............. Scanner Access Now Easy (STV680)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_TAMARACK
-	prompt "sane-backend-tamarack........... Scanner Access Now Easy (TAMARACK)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_TECO1
-	prompt "sane-backend-teco1.............. Scanner Access Now Easy (TECO1)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_TECO2
-	prompt "sane-backend-teco2.............. Scanner Access Now Easy (TECO2)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_TECO3
-	prompt "sane-backend-teco3.............. Scanner Access Now Easy (TECO3)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_TEST
-	prompt "sane-backend-test............... Scanner Access Now Easy (TEST)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_U12
-	prompt "sane-backend-u12................ Scanner Access Now Easy (U12)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_UMAX1220U
-	prompt "sane-backend-umax1220u.......... Scanner Access Now Easy (UMAX1220U)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_UMAX_PP
-	prompt "sane-backend-umax-pp............ Scanner Access Now Easy (UMAX_PP)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
-config ADK_PACKAGE_SANE_BACKEND_UMAX
-	prompt "sane-backend-umax............... Scanner Access Now Easy (UMAX)"
-	tristate
-	default n
-	depends on ADK_PACKAGE_SANE_BACKENDS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  SANE (Scanner Access Now Easy) is a universal scanner interface.
-	  
-	  http://www.sane-project.org
-
diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile
index 55785bcd9..deba7ab65 100644
--- a/package/sane-backends/Makefile
+++ b/package/sane-backends/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		sane-backends
 PKG_VERSION:=		1.0.20
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libpthread libusb
 PKG_MD5SUM:=		a0cfdfdebca2feb4f2ba5d3418b15a42
 PKG_DESCR:=		Scanner access now easy
 PKG_SECTION:=		misc
diff --git a/package/sangam-atm/Config.in b/package/sangam-atm/Config.in
deleted file mode 100644
index fb37f6431..000000000
--- a/package/sangam-atm/Config.in
+++ /dev/null
@@ -1,23 +0,0 @@
-config ADK_PACKAGE_KMOD_SANGAM_ATM
-	prompt "kmod-sangam-atm.......................... Driver for TI AR7 DSL modem"
-	tristate
-	select ADK_KPACKAGE_KMOD_FW_LOADER
-	default n
-	help
-	  ATM driver for AR7 DSL modem.
-
-choice
-prompt "Firmware type"
-depends on ADK_PACKAGE_KMOD_SANGAM_ATM
-
-config ADK_PACKAGE_SANGAM_ATM_ANNEX_A
-	prompt "Annex A, ADSL over POTS"
-	boolean
-	help
-
-config ADK_PACKAGE_SANGAM_ATM_ANNEX_B
-	prompt "Annex B, ADSL over ISDN"
-	boolean
-	help
-
-endchoice
diff --git a/package/sangam-atm/Makefile b/package/sangam-atm/Makefile
index e6c98e4c4..143d7a044 100644
--- a/package/sangam-atm/Makefile
+++ b/package/sangam-atm/Makefile
@@ -14,7 +14,7 @@ PKG_SITES:=		http://openadk.org/distfiles/
 include ${TOPDIR}/mk/package.mk
 include ${TOPDIR}/mk/kernel-vars.mk
 
-$(eval $(call PKG_template,KMOD_SANGAM_ATM,kmod-sangam-atm,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},kernel ${KERNEL_VERSION}-${KERNEL_RELEASE},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,KMOD_SANGAM_ATM,kmod-sangam-atm,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
diff --git a/package/scanlogd/Config.in b/package/scanlogd/Config.in
deleted file mode 100644
index f951672c7..000000000
--- a/package/scanlogd/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_PACKAGE_SCANLOGD
-	prompt "scanlogd.......................... a port scan detection tool"
-	tristate
-	select ADK_PACKAGE_LIBPCAP
-	select ADK_PACKAGE_LIBNET
-	select ADK_PACKAGE_LIBNIDS
-	default n
-	help
-	  Scanlogd is a TCP port scan detection tool, originally designed 
-	  to illustrate various attacks an IDS developer has to deal with.  
-	  Thus, unlike some of the other port scan detection tools out there, 
-	  scanlogd is designed to be totally safe to use.
-
-	  http://www.openwall.com/scanlogd
diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile
index f0b66541d..9d06cfc3d 100644
--- a/package/scanlogd/Makefile
+++ b/package/scanlogd/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		scanlogd
 PKG_VERSION:=		2.2.6
 PKG_RELEASE:=		8
+PKG_BUILDDEP+=		libpcap libnids libnet
 PKG_MD5SUM:=		7b8187ea718ebe47f22805b921b909ab
 PKG_DESCR:=		Portscan logger
 PKG_SECTION:=		net
diff --git a/package/screen/Config.in b/package/screen/Config.in
deleted file mode 100644
index 86b4c6584..000000000
--- a/package/screen/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_SCREEN
-	prompt "screen............................ Full-screen terminal window manager"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNCURSES
-	help
-	  Screen is a full-screen window manager that multiplexes a physical 
-	  terminal between several processes, typically interactive shells.
-	  
-	  http://www.gnu.org/software/screen/
-
diff --git a/package/screen/Makefile b/package/screen/Makefile
index 5ce7ed6e4..424c3de5f 100644
--- a/package/screen/Makefile
+++ b/package/screen/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		screen
 PKG_VERSION:=		4.0.3
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		8506fd205028a96c741e4037de6e3c42
 PKG_DESCR:=		A window manager for the terminal session
 PKG_SECTION:=		misc
diff --git a/package/scrnsaverproto/Config.in b/package/scrnsaverproto/Config.in
deleted file mode 100644
index 0a28dd127..000000000
--- a/package/scrnsaverproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_SCRNSAVERPROTO
-	prompt "scrnsaverproto............................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/scsi-spin/Config.in b/package/scsi-spin/Config.in
deleted file mode 100644
index 89489e991..000000000
--- a/package/scsi-spin/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_SCSI_SPIN
-	prompt "scsi-spin......................... Utility to spin down scsi disks"
-	tristate
-	default n
-	help
-	  Utility to spin down scsi disks
-	  
-	  This program is part of debian's scsitools package
-
diff --git a/package/ser2net/Config.in b/package/ser2net/Config.in
deleted file mode 100644
index b4ce13616..000000000
--- a/package/ser2net/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_SER2NET
-        prompt "ser2net........................... Serial port TCP/IP redirector"
-        tristate
-	default n
-        help
-	  This is ser2net, a program for allowing network connections to serial
-	  ports. See the man page for information about using the program. Note 
-          that ser2net supports RFC 2217 (remote control of serial port parameters),
-          but you must have a complient client. 
-
diff --git a/package/serdisplib/Config.in b/package/serdisplib/Config.in
deleted file mode 100644
index 2755f66d8..000000000
--- a/package/serdisplib/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_SERDISPLIB
-	prompt "serdisplib........................ a library for controlling displays"
-	tristate
-	default n
-	help
-	  serdisplib is a library to drive serial and parallel displays
-	  with built-in controllers.
-	  
-	  http://serdisplib.sourceforge.net/
-
diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile
index 9dbf0356c..e49d1e224 100644
--- a/package/serdisplib/Makefile
+++ b/package/serdisplib/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		serdisplib
 PKG_VERSION:=		1.97.8
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libgd libusb
 PKG_MD5SUM:=		2aa91c43d01d2dfc9fbc1116e3063ae1
 PKG_DESCR:=		display drivers (serial, parallel, USB)
 PKG_SECTION:=		misc
diff --git a/package/setpwc/Config.in b/package/setpwc/Config.in
deleted file mode 100644
index ac344cac3..000000000
--- a/package/setpwc/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_SETPWC
-	prompt "setpwc............................ Philips (and compatibles) WebCams (PWC) control utility"
-	tristate
-	default n
-	help
-	  Philips (and compatibles) WebCams (PWC) control utility.
-	  
-	  http://www.vanheusden.com/setpwc/
-
diff --git a/package/setserial/Config.in b/package/setserial/Config.in
deleted file mode 100644
index d243a9fee..000000000
--- a/package/setserial/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_SETSERIAL
-	prompt "setserial......................... Serial port configuration utility"
-	tristate
-	default n
-	help
-	  setserial  is a program designed to set and/or report the
-	  configuration information associated with a serial port.  This
-	  information  includes what I/O port and IRQ a particular
-	  serial port is using, and whether or not the break key should
-	  be interpreted as the Secure  Attention  Key, and so on.
-	  
-	  http://setserial.sourceforge.net/
-
diff --git a/package/shat/Config.in b/package/shat/Config.in
deleted file mode 100644
index 961d308c2..000000000
--- a/package/shat/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_SHAT
-	prompt "shat.............................. Source Hardware Address Translation"
-	tristate
-	default n
-	help
-	  A tool which allows hosts with arbitrary IP configuration
-	  to connect to the internet over a SHAT gateway.
-	  
-	  http://www.teddy-net.com/cvs/Maxina/128gw/service/arpcatch/shat/
-
diff --git a/package/shorewall-common/Config.in b/package/shorewall-common/Config.in
deleted file mode 100644
index 59296e1fe..000000000
--- a/package/shorewall-common/Config.in
+++ /dev/null
@@ -1,40 +0,0 @@
-config ADK_PACKAGE_SHOREWALL
-	prompt "shorewall......................... high-level netfilter configuration tool"
-	tristate
-	default n
-	select ADK_PACKAGE_IPTABLES
-	help
-	  The Shoreline Firewall, more commonly known as "Shorewall", is a 
-	  high-level tool for configuring Netfilter. You describe your 
-	  firewall/gateway requirements using entries in a set of configuration 
-	  files. Shorewall reads those configuration files and with the help 
-	  of the iptables utility, Shorewall configures Netfilter to match 
-	  your requirements.
-
-	  http://www.shorewall.net/
-
-config ADK_PACKAGE_SHOREWALL_STRIPCONF
-	prompt "Strip shorewall configuration files"
-	bool
-	default n
-	depends on ADK_PACKAGE_SHOREWALL
-	help
-	  To save space, all shorewall files in /etc/shorewall will get striped.
-	  This means that all comments, empty lines etc. are removed.
-
-	  By default this option is not enabled, because the comments
-	  in the configfiles helps the user a lot to configure shorewall.
-
-config ADK_PACKAGE_SHOREWALL_STRIPSHARED
-	prompt "Strip shared shorewall files (macros & actions mainly)"
-	bool
-	default y
-	depends on ADK_PACKAGE_SHOREWALL
-	help
-	  To save space, all shared shorewall files in /usr/share/shorewall
-	  will get striped. This means that all comments, empty lines etc. 
-	  are removed.
-
-	  By default this option is enabled, because for normal usage the user
-	  doesn't need to change files in /usr/share/shorewall. Comments in all
-	  shared files just would waste disk space on most embedded devices.
diff --git a/package/shorewall-shell/Config.in b/package/shorewall-shell/Config.in
deleted file mode 100644
index 03f119786..000000000
--- a/package/shorewall-shell/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_SHOREWALL_SHELL
-	prompt "shorewall-shell................. shorewall shell compiler"
-	tristate
-	depends on ADK_PACKAGE_SHOREWALL
-	default y
-	help
-	  http://www.shorewall.net/
-
diff --git a/package/siproxd/Config.in b/package/siproxd/Config.in
deleted file mode 100644
index e3e4d67e9..000000000
--- a/package/siproxd/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_SIPROXD
-	prompt "siproxd........................... SIP (Session Initiation Protocol) proxy"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOSIP2
-	help
-	  A SIP (Session Initiation Protocol) proxy
-	  
-	  http://siproxd.sourceforge.net/
-	  
-	  Depends: libosip2
-
diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile
index d04603641..8443ec888 100644
--- a/package/siproxd/Makefile
+++ b/package/siproxd/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		siproxd
 PKG_VERSION:=		0.7.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libosip2
 PKG_MD5SUM:=		45e5a44803181e2bf3361d562060c904
 PKG_DESCR:=		a SIP (Session Initiation Protocol) proxy
 PKG_SECTION:=		net
diff --git a/package/sipsak/Config.in b/package/sipsak/Config.in
deleted file mode 100644
index abf0667fd..000000000
--- a/package/sipsak/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_SIPSAK
-	prompt "sipsak............................ SIP (Session Initiation Protocol) stress and diagnostics utility"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-	  A SIP (Session Initiation Protocol) stress and diagnostics utility
-	  
-	  http://www.sipsak.org/
-	  
-	  Depends: openssl
-
diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile
index 45ba006c9..2249c2cf5 100644
--- a/package/sipsak/Makefile
+++ b/package/sipsak/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		sipsak
 PKG_VERSION:=		0.9.6
 PKG_RELEASE:=		2
+PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		c4eb8e282902e75f4f040f09ea9d99d5
 PKG_DESCR:=		a SIP stress and diagnostics utility
 PKG_SECTION:=		net
diff --git a/package/sispmctl/Config.in b/package/sispmctl/Config.in
deleted file mode 100644
index a6e13c3b8..000000000
--- a/package/sispmctl/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_SISPMCTL
-	prompt "sispmctl.......................... control application for power sockets"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBUSB
-	help
-	switch USB controlled outlets of Gembird Silver Shield PM.
-  
-	http://sispmctl.sourceforge.net/
diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile
index ad6c7ee93..86feb2d30 100644
--- a/package/sispmctl/Makefile
+++ b/package/sispmctl/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		sispmctl
 PKG_VERSION:=		2.7
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libusb
 PKG_MD5SUM:=		2457f76cd129f880634f3381be0aeb76
 PKG_DESCR:=		control application for power sockets
 PKG_SECTION:=		misc
diff --git a/package/snort-wireless/Config.in b/package/snort-wireless/Config.in
deleted file mode 100644
index d8cb07f7d..000000000
--- a/package/snort-wireless/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config ADK_PACKAGE_SNORT_WIRELESS
-	prompt "snort-wireless.................... Ligthweight Wireless Network Intrusion Detection System (NIDS)"
-	tristate
-	select ADK_PACKAGE_LIBNET
-	select ADK_PACKAGE_LIBPCAP
-	select ADK_PACKAGE_LIBPCRE
-	default n
-	help
-	  
-	  A ligthweight Wireless Network Intrusion Detection System (NIDS)
-	  
-	  http://www.snort-wireless.org/
-	  
-	  Depends: 
-	    - libnet
-	    - libpcap
-	    - libpcre
diff --git a/package/snort-wireless/Makefile b/package/snort-wireless/Makefile
index 829b9410f..1aed15e52 100644
--- a/package/snort-wireless/Makefile
+++ b/package/snort-wireless/Makefile
@@ -6,10 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		snort-wireless
 PKG_VERSION:=		2.4.3-alpha04
 PKG_RELEASE:=		9
+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/Config.in b/package/snort/Config.in
deleted file mode 100644
index cb376c2f4..000000000
--- a/package/snort/Config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-config ADK_PACKAGE_SNORT
-	prompt "snort............................. Ligthweight Network Intrusion Detection System (NIDS)"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNET
-	select ADK_PACKAGE_LIBPCAP
-	select ADK_PACKAGE_LIBPCRE
-	help
-	  
-	  A ligthweight Network Intrusion Detection System (NIDS)
-	  
-	  http://www.snort.org/
-	  
-	  Depends: 
-	    - libnet
-	    - libpcap
-	    - libpcre
-	
diff --git a/package/snort/Makefile b/package/snort/Makefile
index d57a6c555..1c9832c53 100644
--- a/package/snort/Makefile
+++ b/package/snort/Makefile
@@ -6,10 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		snort
 PKG_VERSION:=		2.6.1.2
 PKG_RELEASE:=		8
+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/socat/Config.in b/package/socat/Config.in
deleted file mode 100644
index 072bf8190..000000000
--- a/package/socat/Config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-config ADK_PACKAGE_SOCAT
-	prompt "socat............................. A multipurpose relay (SOcket CAT)"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  SoCat (for SOcket CAT) establishes two bidirectional byte streams and 
-	  transfers data between them.
-	  Data channels may be files, pipes, devices (terminal or modem, etc.), or 
-	  sockets (Unix, IPv4, IPv6, raw, UDP, TCP, SSL). It provides forking, 
-	  logging and tracing, different modes for interprocess communication and 
-	  many more options.
-	  
-	  http://www.dest-unreach.org/socat/
-	  
-	  Depends: openssl
-
diff --git a/package/socat/Makefile b/package/socat/Makefile
index ab6d5c059..5ca41edc1 100644
--- a/package/socat/Makefile
+++ b/package/socat/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		socat
 PKG_VERSION:=		1.7.0.0
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		82967132b5a8ca4d07e54370fdcb2662
 PKG_DESCR:=		A multipurpose relay (SOcket CAT)
 PKG_SECTION:=		net
diff --git a/package/speex/Config.in b/package/speex/Config.in
deleted file mode 100644
index f50e04c2c..000000000
--- a/package/speex/Config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-config ADK_COMPILE_SPEEX
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBSPEEX
-
-config ADK_PACKAGE_LIBSPEEX
-	prompt "libspeex.......................... Open source patent-free speech compression codec"
-	tristate
-	default n
-	select ADK_COMPILE_SPEEX
-	help
-	  
-	  Speex is an Open Source/Free Software patent-free audio compression 
-	  format designed for speech. The Speex Project aims to lower the 
-	  barrier of entry for voice applications by providing a free 
-	  alternative to expensive proprietary speech codecs. Moreover, Speex 
-	  is well-adapted to Internet applications and provides useful features 
-	  that are not present in most other codecs.
-	  http://www.speex.org/
-	  
-
diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
deleted file mode 100644
index d436ebb39..000000000
--- a/package/sqlite/Config.in
+++ /dev/null
@@ -1,40 +0,0 @@
-config ADK_COMPILE_SQLITE
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBSQLITE
-
-config ADK_PACKAGE_SQLITE_CLI
-	prompt   "sqlite-cli...................... Command line interface for SQLite"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBSQLITE
-	help
-	  SQLite is a small C library that implements a self-contained, embeddable, 
-	  zero-configuration SQL database engine. Features include:
-	  
-	    * Transactions are atomic, consistent, isolated, and durable (ACID) 
-	      even after system crashes and power failures.
-	    * Zero-configuration - no setup or administration needed.
-	    * Implements most of SQL92. (Features not supported)
-	    * A complete database is stored in a single disk file.
-	    * Database files can be freely shared between machines with different 
-	      byte orders.
-	    * Supports databases up to 2 terabytes (241 bytes) in size.
-	    * Sizes of strings and BLOBs limited only by available memory.
-	    * Small code footprint: less than 30K lines of C code, less than 250KB 
-	      code space (gcc on i486)
-	    * Faster than popular client/server database engines for most common 
-	      operations.
-	    * Simple, easy to use API.
-	    * TCL bindings included. Bindings for many other languages available 
-	      separately.
-	    * Well-commented source code with over 95% test coverage.
-	    * Self-contained: no external dependencies.
-	    * Sources are in the public domain. Use for any purpose.
-	  
-	  http://www.sqlite.org/
-	  
-	  This package contains a terminal-based front-end to the SQLite library 
-	  that can evaluate queries interactively and display the results in 
-	  multiple formats.
-
diff --git a/package/sqlite/Config.in.lib b/package/sqlite/Config.in.lib
deleted file mode 100644
index 98d55f421..000000000
--- a/package/sqlite/Config.in.lib
+++ /dev/null
@@ -1,35 +0,0 @@
-config ADK_PACKAGE_LIBSQLITE
-	prompt "libsqlite......................... Self-contained, embeddable, zero-configuration SQL database engine"
-	tristate
-	default n
-	select ADK_COMPILE_SQLITE
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBREADLINE
-	help
-	  SQLite is a small C library that implements a self-contained, embeddable, 
-	  zero-configuration SQL database engine. Features include:
-	  
-	    * Transactions are atomic, consistent, isolated, and durable (ACID) 
-	      even after system crashes and power failures.
-	    * Zero-configuration - no setup or administration needed.
-	    * Implements most of SQL92. (Features not supported)
-	    * A complete database is stored in a single disk file.
-	    * Database files can be freely shared between machines with different 
-	      byte orders.
-	    * Supports databases up to 2 terabytes (241 bytes) in size.
-	    * Sizes of strings and BLOBs limited only by available memory.
-	    * Small code footprint: less than 30K lines of C code, less than 250KB 
-	      code space (gcc on i486)
-	    * Faster than popular client/server database engines for most common 
-	      operations.
-	    * Simple, easy to use API.
-	    * TCL bindings included. Bindings for many other languages available 
-	      separately.
-	    * Well-commented source code with over 95% test coverage.
-	    * Self-contained: no external dependencies.
-	    * Sources are in the public domain. Use for any purpose.
-	  
-	  http://www.sqlite.org/
-	  
-	  This package contains the shared library, needed by other programs.
-
diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile
index f01b739b0..bd2825e71 100644
--- a/package/sqlite/Makefile
+++ b/package/sqlite/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		sqlite
 PKG_VERSION:=		3.6.20
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		ncurses readline
 PKG_MD5SUM:=		0faf8fc8ccff5297513c6532b2b4ce23
 PKG_DESCR:=		Self-contained, embeddable, zero-configuration SQL database
 PKG_SECTION:=		libs
diff --git a/package/squid/Config.in b/package/squid/Config.in
deleted file mode 100644
index 61eb6ac75..000000000
--- a/package/squid/Config.in
+++ /dev/null
@@ -1,94 +0,0 @@
-
-config ADK_PACKAGE_SQUID
-	prompt "squid............................. full-featured Web proxy cache"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBPTHREAD
-	help
-	  Squid is a high-performance proxy caching server for web clients, 
-	  supporting FTP, gopher, and HTTP data objects. Unlike traditional 
-	  caching software, Squid handles all requests in a single, 
-	  non-blocking, I/O-driven process.
-
-	  http://www.squid-cache.org
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_SQUID
-default ADK_COMPILE_SQUID_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_SQUID_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_SQUID_WITH_STDCXX
-        bool "Standard C++ library"
-        select ADK_PACKAGE_LIBSTDCXX
-        help
-
-config ADK_COMPILE_SQUID_WITH_UCLIBCXX
-        bool "Embedded uClibc++ library"
-        select ADK_PACKAGE_UCLIBCXX
-	depends on ADK_BROKEN
-        help
-
-endchoice
-
-menu "squid-modules...................... proxy and web cache modules"
-depends on ADK_PACKAGE_SQUID
-
-config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM
-	prompt "squid-mod-basic-auth-getpwnam....... getpwnam basic authentication helper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  Password basic authentication helper
-
-config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_NCSA
-	prompt "squid-mod-basic-auth-ncsa........... NCSA basic authentication helper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  NCSA basic authentication helper
-
-config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_SMB
-	prompt "squid-mod-basic-auth-smb............ Samba basic authentication helper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  Samba basic authentication helper
-
-config ADK_PACKAGE_SQUID_MOD_DIGEST_AUTH_PASSWORD
-	prompt "squid-mod-digest-auth-password...... Password digest authentication ehlper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  Password digest authentication helper
-
-config ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_IP_USER
-	prompt "squid-mod-external-acl-ip_user...... IP user external ACL helper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  IP user external ACL helper
-
-config ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP
-	prompt "squid-mod-external-acl-unix-group... Unix group external ACL helper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  Unix group external ACL helper
-
-config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKEAUTH
-	prompt "squid-mod-ntlm-auth-fakeauth........ Fakeauth NTLM authentication helper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  Fakeauth NTLM authentication helper
-
-config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_SMB_AUTH
-	prompt "squid-mod-ntlm-auth-smb-auth........ Samba NTLM authentication helper"
-	tristate
-	depends on ADK_PACKAGE_SQUID
-	help
-	  Samba NTLM authentication helper
-
-endmenu
diff --git a/package/squid/Makefile b/package/squid/Makefile
index cfc35061c..807e4dc08 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -6,18 +6,14 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		squid
 PKG_VERSION:=		3.0.STABLE20
 PKG_RELEASE:=		2
+PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		b69577cfc5cfb6808ec426e3a933220d
 PKG_DESCR:=		squid web and cache proxy
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libopenssl libpthread
 PKG_URL:=		http://www.squid-cache.org
 PKG_SITES:=		http://www.squid-cache.org/Versions/v3/3.0/
-
-ifeq ($(ADK_COMPILE_SQUID_WITH_UCLIBCXX),y)
-PKG_DEPENDS+=		uclibc++
-else
-PKG_DEPENDS+=		libstdcxx
-endif
+PKG_CXX:=		SQUID
 
 AUTH_MODULES:=		basic digest ntlm
 ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},)
diff --git a/package/srelay/Config.in b/package/srelay/Config.in
deleted file mode 100644
index bcaabdd6b..000000000
--- a/package/srelay/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_SRELAY
-	prompt "srelay............................ A socks 4/5 proxy server"
-	tristate
-	default n
-	help
-	  A socks 4/5 protocol proxy server
-	  
-	  http://www.c-wind.com/srelay/
-
diff --git a/package/ssltunnel/Config.in b/package/ssltunnel/Config.in
deleted file mode 100644
index 4c910c6a8..000000000
--- a/package/ssltunnel/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_SSLTUNNEL
-	prompt "ssltunnel ........................ A PPP over SSL vpn tool"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_PPP
-	help
-	  A PPP over SSL vpn tool
-	  
-	  http://www.hsc.fr/ressources/outils/ssltunnel/index.html
-	  
diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile
index 738fa125c..87f653380 100644
--- a/package/ssltunnel/Makefile
+++ b/package/ssltunnel/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ssltunnel
 PKG_VERSION:=		1.16
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl ppp
 PKG_MD5SUM:=		4039b50566a33a4077883ea974e476d5
 PKG_DESCR:=		A PPP over SSL vpn tool
 PKG_SECTION:=		net
diff --git a/package/ssmtp/Config.in b/package/ssmtp/Config.in
deleted file mode 100644
index b4bff1c34..000000000
--- a/package/ssmtp/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_SSMTP
-	prompt "ssmtp............................. A minimal and secure mail sender"
-	tristate
-	default n
-	help
-	  A secure, effective and simple way of getting mail off a system to your 
-	  mail hub. It contains no suid-binaries or other dangerous things - no 
-	  mail spool to poke around in, and no daemons running in the background. 
-	  Mail is simply forwarded to the configured mailhost. Extremely easy 
-	  configuration.
-	  
-	  http://packages.debian.org/stable/mail/ssmtp
-
diff --git a/package/strace/Config.in b/package/strace/Config.in
deleted file mode 100644
index 53e147d01..000000000
--- a/package/strace/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_STRACE
-	prompt "strace............................ System call tracer"
-	tristate
-	default n
-	help
-	  A useful diagnostic, instructional, and debugging tool.
-	  Allows you to track what system calls a program makes 
-	  while it is running.
-	  
-	  http://sourceforge.net/projects/strace/
-
diff --git a/package/stress/Config.in b/package/stress/Config.in
deleted file mode 100644
index 66c6bd446..000000000
--- a/package/stress/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_STRESS
-	prompt "stress............................ Stress your system"
-	tristate
-	default n
-	help
-	  Stress is a simple tool that imposes a configurable amount of CPU, 
-	  memory, I/O, and disk stress on POSIX-compliant operating systems. 
-	  It is written in portable ANSI C and uses the GNU Autotools to 
-	  compile on most UNIX-like operating systems. It is free software, 
-	  licensed under the GNU GPL
-	  
-	  http://weather.ou.edu/~apw/projects/stress/
diff --git a/package/subversion/Config.in b/package/subversion/Config.in
deleted file mode 100644
index a7bb57950..000000000
--- a/package/subversion/Config.in
+++ /dev/null
@@ -1,23 +0,0 @@
-config ADK_PACKAGE_SUBVERSION
-	prompt "subversion........................ revision control program"
-	tristate
-	default n
-	select ADK_PACKAGE_ZLIB
-	select ADK_PACKAGE_APR_UTIL
-	select ADK_PACKAGE_LIBICONV
-	select ADK_PACKAGE_LIBEXPAT
-	help
-	  Subversion is an open source application for revision control.
-
-	  http://subversion.tigris.org
-
-config ADK_PACKAGE_SUBVERSION_NEON
-	prompt "Enable interaction with remote repositories over WebDAV"
-	bool
-	default n
-	depends on ADK_PACKAGE_SUBVERSION
-	select ADK_PACKAGE_NEON
-	help
-	 Allows a Subversion client to interact with remote
-	 repositories over the Internet via a WebDAV based protocol.
-
diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index 8d847faa1..9203f9510 100644
--- a/package/subversion/Makefile
+++ b/package/subversion/Makefile
@@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		subversion
 PKG_VERSION:=		1.6.6
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		apr-util expat apr zlib libiconv
+ifneq ($(ADK_PACKAGE_SUBVERSION_NEON),)
+PKG_BUILDDEP+=		neon
+endif
 PKG_MD5SUM:=		0ab0f26f6eb056add1b9d3059a3f4247
 PKG_DESCR:=		revision control program
 PKG_SECTION:=		net
diff --git a/package/swconfig/Config.in b/package/swconfig/Config.in
deleted file mode 100644
index 56f945ce3..000000000
--- a/package/swconfig/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_SWCONFIG
-	prompt "swconfig........................... Switch configuration utility"
-	tristate
-	depends on ADK_LINUX_MIPS_RB433
-	select ADK_PACKAGE_LIBNL
-	default y
-	help
-	  Switch configuration utility (Adopted from OpenWrt).
diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile
index 26f96f449..f9f183b10 100644
--- a/package/swconfig/Makefile
+++ b/package/swconfig/Makefile
@@ -6,9 +6,12 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		swconfig
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libnl
 PKG_DESCR:=		switch configuration utility
 PKG_SECTION:=		misc
 
+PKG_TARGET_CONFIG:=	rb433
+
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
 
diff --git a/package/syslog-ng/Config.in b/package/syslog-ng/Config.in
deleted file mode 100644
index df21ab0fd..000000000
--- a/package/syslog-ng/Config.in
+++ /dev/null
@@ -1,32 +0,0 @@
-config ADK_PACKAGE_SYSLOG_NG
-	prompt "syslog-ng......................... A powerful syslog daemon"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOL
-	select ADK_PACKAGE_LIBWRAP
-	help
-		syslog-ng reads and logs messages to the  system  console,  log
-		files, other machines and/or users as specified by its
-		configuration file.
-
-		The  configuration  file is read at startup and is reread after
-		receipt of a hangup (HUP) signal.  When reloading the
-		configuration  file,  all destination  files  are  closed  and
-		reopened as appropriate. For more information about the
-		configuration file, see syslog-ng.conf(5).
-
-		Typically messages are sent to  syslog-ng  via  a  Unix  domain
-		socket (/dev/log) or via UDP, to port 514 or to whatever
-		syslog/udp is defined to be in /etc/services.  To receive
-		messages from the kernel, /dev/klog is opened for reading.
-
-		Messages sent to syslog-ng should be an entire line, prefixed
-		by a pri- ority code in between '<' and '>'.   Definititions
-		of  the  recognised values can be found in the include file
-		<sys/syslog.h>.
-
-		syslog-ng  can  be  configured to pass messages on to other
-		syslog-ng's and when doing so, it sends the message on with the
-		priority as a  pre- fix.
-
-		http://www.balabit.com/products/syslog_ng/	  
diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile
index 2080c51fd..5bd1daa0c 100644
--- a/package/syslog-ng/Makefile
+++ b/package/syslog-ng/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		syslog-ng
 PKG_VERSION:=		1.6.12
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libol tcp_wrappers
 PKG_MD5SUM:=		a3cbfdb6e1e5beea181a7349749719f3
 PKG_DESCR:=		A powerful syslog daemon
 PKG_SECTION:=		admin
diff --git a/package/sysstat/Config.in b/package/sysstat/Config.in
deleted file mode 100644
index 21746c145..000000000
--- a/package/sysstat/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_SYSSTAT
-	prompt "sysstat........................... System monitoring and performance analysis utilities"
-	tristate
-	default n
-	help
-	  The sysstat package contains utilities to monitor system performance and 
-	  usage activity. Sysstat contains various utilities, common to many commercial 
-	  Unixes, and tools you can schedule via cron to collect and historize 
-	  performance and activity data. 
-
-	  http://perso.wanadoo.fr/sebastien.godard/
diff --git a/package/tar/Config.in b/package/tar/Config.in
deleted file mode 100644
index 6ef861a2c..000000000
--- a/package/tar/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_TAR
-	prompt "gtar.............................. gnu tar"
-	tristate
-	default n
-	help
-	  The GNU implementation of tar.
-	  
-	  http://www.gnu.org/software/tar/
diff --git a/package/tcl/Config.in b/package/tcl/Config.in
deleted file mode 100644
index 292b447e9..000000000
--- a/package/tcl/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_TCL
-	prompt "tcl............................... TCL"
-	tristate
-	default n
-	help
-	  The TCL scripting language.
-
-	  http://www.tcl.tk/
diff --git a/package/tcp_wrappers/Config.in b/package/tcp_wrappers/Config.in
deleted file mode 100644
index 0066cad78..000000000
--- a/package/tcp_wrappers/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_COMPILE_TCP_WRAPPERS
-	bool
-	default n
-	depends on ADK_PACKAGE_LIBWRAP
-
-config ADK_PACKAGE_LIBWRAP
-	prompt "libwrap........................... Security wrapper library for TCP services"
-	tristate
-	default n
-	select ADK_COMPILE_TCP_WRAPPERS
-	help
-	  Security wrapper library for TCP services.
-	  
-	  ftp://ftp.porcupine.org/pub/security/index.html
-
diff --git a/package/tcpdump/Config.in b/package/tcpdump/Config.in
deleted file mode 100644
index 482a477fd..000000000
--- a/package/tcpdump/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_TCPDUMP
-	prompt "tcpdump........................... Network monitoring and data acquisition tool"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBPCAP
-	help
-	  A tool for network monitoring and data acquisition.
-	  
-	  http://www.tcpdump.org/
-
diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile
index cce37c8fc..7e92a9fa4 100644
--- a/package/tcpdump/Makefile
+++ b/package/tcpdump/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		tcpdump
 PKG_VERSION:=		4.0.0
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libpcap
 PKG_MD5SUM:=		b22ca72890df2301d922c9f2d17867f9
 PKG_DESCR:=		A tool for network monitoring and data acquisition.
 PKG_SECTION:=		net
diff --git a/package/tinc/Config.in b/package/tinc/Config.in
deleted file mode 100644
index 6ef68ec46..000000000
--- a/package/tinc/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_TINC
-	prompt "tinc.............................. VPN tunneling daemon"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_TUN
-	select ADK_PACKAGE_LIBLZO
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	help
-	  A VPN tunneling daemon
-	  
-	  http://www.tinc-vpn.org/
-
diff --git a/package/tinc/Makefile b/package/tinc/Makefile
index efa122a5e..0b697916e 100644
--- a/package/tinc/Makefile
+++ b/package/tinc/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		tinc
 PKG_VERSION:=		1.0.11
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		zlib openssl liblzo
 PKG_MD5SUM:=		ee0b1a3366c6e379cae34be6fa5dcb15
 PKG_DESCR:=		VPN tunnel daemon
 PKG_SECTION:=		net
diff --git a/package/tinyproxy/Config.in b/package/tinyproxy/Config.in
deleted file mode 100644
index 293d8ec69..000000000
--- a/package/tinyproxy/Config.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#menu "tinyproxy......................... Tinyproxy is a lightweight HTTP and HTTPS proxy."
-
-config ADK_PACKAGE_TINYPROXY
-	prompt "tinyproxy......................... Tinyproxy is a lightweight HTTP and HTTPS proxy"
-	tristate
-	default n
-	help
-		Tinyproxy is a lightweight HTTP and HTTPS proxy.
-
-		http://tinyproxy.sourceforge.net
-
-config ADK_COMPILE_TINYPROXY_WITH_TRANSPARENT_PROXY
-	prompt "Enable transparent proxying"
-	bool
-	default y
-	depends on ADK_PACKAGE_TINYPROXY
-
-config ADK_COMPILE_TINYPROXY_WITH_FILTER
-	prompt "Enable filtering support"
-	bool
-	default y
-	depends on ADK_PACKAGE_TINYPROXY
-
-config ADK_COMPILE_TINYPROXY_WITH_UPSTREAM
-	prompt "Enable upstream support"
-	bool
-	default y
-	depends on ADK_PACKAGE_TINYPROXY
-
-#endmenu
diff --git a/package/tmsnc/Config.in b/package/tmsnc/Config.in
deleted file mode 100644
index 7aa450160..000000000
--- a/package/tmsnc/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_TMSNC
-	tristate "tmsnc............................. text-based MSN client"
-	default n
-	help
-		TMSNC is a textbased (console) MSN client written in C.
-
-		http://tmsnc.sourceforge.net
diff --git a/package/tntnet/Config.in b/package/tntnet/Config.in
deleted file mode 100644
index 6d2ff122d..000000000
--- a/package/tntnet/Config.in
+++ /dev/null
@@ -1,55 +0,0 @@
-config ADK_PACKAGE_TNTNET
-	prompt "tntnet............................ a modular, multithreaded webapplicationserver"
-	tristate
-	default n
-	select ADK_PACKAGE_CXXTOOLS
-	select ADK_PACKAGE_LIBICONV
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_ZLIB
-	help
-	  Tntnet is a modular, multithreaded webapplicationserver
-	  written from scratch for C++.
-	  
-	  http://www.tntnet.org
-
-choice
-prompt "SSL/TLS Configuration"
-depends on ADK_PACKAGE_TNTNET
-default ADK_COMPILE_TNTNET_WITH_OPENSSL
-
-config ADK_COMPILE_TNTNET_WITHOUT_OPENSSL
-	bool "no ssl encryption support"
-	help
-
-config ADK_COMPILE_TNTNET_WITH_OPENSSL
-	bool "enable openssl encryption support"
-	depends on ADK_PACKAGE_TNTNET
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-
-config ADK_COMPILE_TNTNET_WITH_GNUTLS
-	bool "enable gnutls encryption support"
-	depends on ADK_PACKAGE_TNTNET
-	select ADK_PACKAGE_LIBGNUTLS
-	help
-
-endchoice
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_TNTNET
-default ADK_COMPILE_TNTNET_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_TNTNET_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_TNTNET_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_TNTNET_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	depends on ADK_BROKEN
-	help
-
-endchoice
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index c251da7a9..a768954c4 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -6,26 +6,25 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		tntnet
 PKG_VERSION:=		1.6.4
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		cxxtools zlib
+ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},)
+PKG_BUILDDEP+=		openssl
+else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},)
+PKG_BUILDDEP+=		gnutls
+endif
 PKG_MD5SUM:=		e2c3c5075a890711a7569730493c0996
 PKG_DESCR:=		small C++ application server
 PKG_SECTION:=		net
 PKG_DEPENDS:=		cxxtools zlib libpthread libiconv
 PKG_URL:=		http://www.tntnet.org
 PKG_SITES:=		http://www.tntnet.org/download/
+PKG_CXX:=		TNTNET
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y)
-PKG_DEPENDS+=		uclibc++
-else
-PKG_DEPENDS+=		libstdcxx
-endif
-
-ifeq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},y)
+ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},)
 PKG_DEPENDS+=		libopenssl
-endif
-
-ifeq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},y)
+else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},)
 PKG_DEPENDS+=		libgnutls
 endif
 
diff --git a/package/tor/Config.in b/package/tor/Config.in
deleted file mode 100644
index 5664da239..000000000
--- a/package/tor/Config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-config ADK_PACKAGE_TOR
-	prompt "tor............................... An anonymous Internet communication system"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBEVENT
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_ZLIB
-	help
-	  Tor is a toolset for a wide range of organizations and people that want
-	  to improve their safety and security on the Internet. Using Tor can 
-	  help you anonymize web browsing and publishing, instant messaging, 
-	  IRC, SSH, and more. Tor also provides a platform on which software 
-	  developers can build new applications with built-in anonymity, safety, 
-	  and privacy features.
-	  
-	  http://tor.eff.org/
-
diff --git a/package/tor/Makefile b/package/tor/Makefile
index 4eebf0243..f25a3f5bb 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		tor
 PKG_VERSION:=		0.2.1.20
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libevent openssl zlib
 PKG_MD5SUM:=		0d62ee2332fdd95de43debac7435df19
 PKG_DESCR:=		An anonymous Internet communication system
 PKG_SECTION:=		net
diff --git a/package/trafshow/Config.in b/package/trafshow/Config.in
deleted file mode 100644
index dc0cee659..000000000
--- a/package/trafshow/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_TRAFSHOW
-	prompt "trafshow.......................... network traffic monitor"
-	tristate
-	select ADK_PACKAGE_LIBPCAP
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBPTHREAD
-	default n
-	help
-
diff --git a/package/ttcp/Config.in b/package/ttcp/Config.in
deleted file mode 100644
index cc99d9151..000000000
--- a/package/ttcp/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_TTCP
-	prompt "ttcp.............................. A TCP connection performance tester"
-	tristate
-	default n
-	help
-	  A small utility to test TCP connection performance
-
diff --git a/package/uclibc++/Config.in b/package/uclibc++/Config.in
index 04a11d4cf..e69de29bb 100644
--- a/package/uclibc++/Config.in
+++ b/package/uclibc++/Config.in
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_UCLIBCXX
-	prompt "uClibc++.......................... C++ library for embedded systems"
-	tristate
-	depends on ADK_TARGET_LIB_UCLIBC
-	default n
-	help
-	  A standard C++ library for embedded systems
-
diff --git a/package/uclibc++/Config.in.manual b/package/uclibc++/Config.in.manual
new file mode 100644
index 000000000..04a11d4cf
--- /dev/null
+++ b/package/uclibc++/Config.in.manual
@@ -0,0 +1,8 @@
+config ADK_PACKAGE_UCLIBCXX
+	prompt "uClibc++.......................... C++ library for embedded systems"
+	tristate
+	depends on ADK_TARGET_LIB_UCLIBC
+	default n
+	help
+	  A standard C++ library for embedded systems
+
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 4100fd313..e69de29bb 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -1,17 +0,0 @@
-config ADK_PACKAGE_UCLIBC
-	prompt "uClibc............................... embedded C library"
-	bool
-	default y if ADK_TARGET_LIB_UCLIBC && !ADK_TOOLCHAIN_ONLY
-	default n
-	depends on ADK_TARGET_LIB_UCLIBC
-	help
-	  Embedded C library.
-
-config ADK_PACKAGE_UCLIBC_DEV
-	prompt "uClibc-dev........................... development files"
-	tristate
-	default n
-	depends on ADK_TARGET_LIB_UCLIBC
-	help
-	  C library header files.
-
diff --git a/package/uclibc/Config.in.manual b/package/uclibc/Config.in.manual
new file mode 100644
index 000000000..4100fd313
--- /dev/null
+++ b/package/uclibc/Config.in.manual
@@ -0,0 +1,17 @@
+config ADK_PACKAGE_UCLIBC
+	prompt "uClibc............................... embedded C library"
+	bool
+	default y if ADK_TARGET_LIB_UCLIBC && !ADK_TOOLCHAIN_ONLY
+	default n
+	depends on ADK_TARGET_LIB_UCLIBC
+	help
+	  Embedded C library.
+
+config ADK_PACKAGE_UCLIBC_DEV
+	prompt "uClibc-dev........................... development files"
+	tristate
+	default n
+	depends on ADK_TARGET_LIB_UCLIBC
+	help
+	  C library header files.
+
diff --git a/package/udev/Config.in b/package/udev/Config.in
deleted file mode 100644
index 012732efd..000000000
--- a/package/udev/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_UDEV
-	prompt "udev.............................. Dynamic device management subsystem"
-	tristate
-	default n
-	select ADK_COMPILE_UTIL_LINUX_NG
-	help
-	  udev provides a dynamic device directory containing only the files for 
-	  actually present devices. It creates or removes device node files in 
-	  the /dev directory, or it renames network interfaces.
-	  
-	  http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
diff --git a/package/udp-broadcast-relay/Config.in b/package/udp-broadcast-relay/Config.in
deleted file mode 100644
index 9a729f14f..000000000
--- a/package/udp-broadcast-relay/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_UDP_BROADCAST_RELAY
-	prompt "udp-broadcast-relay............... listens for packets on a specified UDP broadcast port."
-	tristate
-	default n
-	help
-		This program listens for packets on a specified UDP broadcast port. When a packet is received, it sends that packet to all specified interfaces but the one it came from as though it originated from the original sender.
-
-		The primary purpose of this is to allow games on machines on separated local networks (Ethernet, WLAN) that use udp broadcasts to find each other to do so.
-
-		It also works on ppp links, so you can log in from windows boxes (e.g. using pptp) and play LAN-based games together. Currently, you have to care about upcoming or downgoing interfaces yourself.
-	  
-	  	http://www.joachim-breitner.de/udp-broadcast-relay/
diff --git a/package/ulogd/Config.in b/package/ulogd/Config.in
deleted file mode 100644
index a138f4575..000000000
--- a/package/ulogd/Config.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#menu "ulogd............................. Netfilter userspace logging daemon"
-
-config ADK_PACKAGE_ULOGD
-	prompt "ulogd............................. Netfilter userspace logging daemon"
-	tristate
-	default n
-	select ADK_PACKAGE_IPTABLES
-	help
-	  The netfilter userspace logging daemon
-	  
-	  http://gnumonks.org/projects/ulogd
-
-config ADK_PACKAGE_ULOGD_MOD_MYSQL
-	prompt   "ulogd-mod-mysql............... Output plugin for logging into a MySQL database"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ULOGD
-	select ADK_PACKAGE_LIBMYSQLCLIENT
-
-config ADK_PACKAGE_ULOGD_MOD_PCAP
-        prompt  "ulogd-mod-pcap................. Output plugin for logging into pcap format"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ULOGD
-	select ADK_PACKAGE_LIBPCAP
-
-config ADK_PACKAGE_ULOGD_MOD_PGSQL
-	prompt   "ulogd-mod-pgsql............... Output plugin for logging into a PostgreSQL database"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ULOGD
-	select ADK_PACKAGE_LIBPQ
-
-config ADK_PACKAGE_ULOGD_MOD_SQLITE
-	prompt   "ulogd-mod-sqlite.............. Output plugin for logging into an SQLite database"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ULOGD
-	select ADK_PACKAGE_LIBSQLITE
-
-config ADK_PACKAGE_ULOGD_MOD_EXTRA
-	prompt   "ulogd-mod-extra............... All other plugins"
-	tristate
-	default n
-	depends on ADK_PACKAGE_ULOGD
-
-#endmenu
diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile
index bf3c56d1e..a7dcfa015 100644
--- a/package/ulogd/Makefile
+++ b/package/ulogd/Makefile
@@ -6,6 +6,19 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ulogd
 PKG_VERSION:=		1.24
 PKG_RELEASE:=		7
+PKG_BUILDDEP+=		iptables
+ifneq ($(ADK_PACKAGE_ULOGD_MOD_MYSQL),)
+PKG_BUILDDEP+=		mysql
+endif
+ifneq ($(ADK_PACKAGE_ULOGD_MOD_PCAP),)
+PKG_BUILDDEP+=		libpcap
+endif
+ifneq ($(ADK_PACKAGE_ULOGD_MOD_PGSQL),)
+PKG_BUILDDEP+=		postgresql
+endif
+ifneq ($(ADK_PACKAGE_ULOGD_MOD_SQLITE),)
+PKG_BUILDDEP+=		sqlite
+endif
 PKG_MD5SUM:=		05b4ed2926b9a22aaeaf642917bbf8ff
 PKG_DESCR:=		Netfilter userspace logging daemon
 PKG_SECTION:=		net
diff --git a/package/updatedd/Config.in b/package/updatedd/Config.in
deleted file mode 100644
index 08e800d59..000000000
--- a/package/updatedd/Config.in
+++ /dev/null
@@ -1,67 +0,0 @@
-
-config ADK_PACKAGE_UPDATEDD
-	prompt "updatedd.......................... A tool to update dynamic DNS services"
-	tristate
-	default n
-	help
-	  Updatedd is a small tool that will update one of many dynamic
-	  dns services on boot.
-	  
-	  Please look at the /etc/init.d/S50ddns script for more info.
-	  
-	  http://www.philipp-benner.de/updatedd/
-
-config ADK_PACKAGE_UPDATEDD_MOD_CHANGEIP
-	prompt "updatedd-mod-changeip........... changeip.com"
-	tristate
-	depends on ADK_PACKAGE_UPDATEDD
-	default n
-
-config ADK_PACKAGE_UPDATEDD_MOD_DYNDNS
-	prompt "updatedd-mod-dyndns............. dyndns.org"
-	tristate
-	depends on ADK_PACKAGE_UPDATEDD
-	default n
-
-config ADK_PACKAGE_UPDATEDD_MOD_EURODYNDNS
-	prompt "updatedd-mod-eurodyndns......... eurodyndns.org"
-	tristate
-	depends on ADK_PACKAGE_UPDATEDD
-	default n
-
-config ADK_PACKAGE_UPDATEDD_MOD_HN
-	prompt "updatedd-mod-hn................. hn.org"
-	tristate
-	depends on ADK_PACKAGE_UPDATEDD
-	default n
-
-config ADK_PACKAGE_UPDATEDD_MOD_NOIP
-	prompt "updatedd-mod-noip............... no-ip.com"
-	tristate
-	depends on ADK_PACKAGE_UPDATEDD
-	default n
-
-config ADK_PACKAGE_UPDATEDD_MOD_ODS
-	prompt "updatedd-mod-ods................ ods.org"
-	tristate
-	depends on ADK_PACKAGE_UPDATEDD
-	default n
-
-config ADK_PACKAGE_UPDATEDD_MOD_OVH
-	prompt "updatedd-mod-ovh................ ovh.com"
-	tristate
-	depends on ADK_PACKAGE_UPDATEDD
-	default n
-
-config ADK_PACKAGE_UPDATEDD_MOD_REGFISH
-	prompt "updatedd-mod-regfish............ regfish.com"
-	tristate
-	depends on ADK_PACKAGE_UPDATEDD
-	default n
-
-config ADK_PACKAGE_UPDATEDD_MOD_TZO
-	prompt "updatedd-mod-tzo................ tzo.com"
-	tristate
-	depends on ADK_PACKAGE_UPDATEDD
-	default n
-
diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in
deleted file mode 100644
index 8b80238ea..000000000
--- a/package/usbutils/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_COMPILE_USBUTILS
-	tristate
-	depends on ADK_PACKAGE_LSUSB
-
-config ADK_PACKAGE_LSUSB
-	prompt "lsusb............................. USB devices listing program"
-	tristate
-	default n
-	select ADK_COMPILE_USBUTILS
-	select ADK_PACKAGE_LIBUSB
-	help
-	  A program to list Linux USB devices
-	  
-	  http://linux-usb.sourceforge.net/
-
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index 8e032cc0e..43aafc6df 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		usbutils
 PKG_VERSION:=		0.73
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libusb
 PKG_MD5SUM:=		88978b4ad891f610620b1b8e5e0f43eb
 PKG_DESCR:=		A program to list USB devices
 PKG_SECTION:=		misc
diff --git a/package/ussp-push/Config.in b/package/ussp-push/Config.in
deleted file mode 100644
index 187d0a7af..000000000
--- a/package/ussp-push/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_USSP_PUSH
-	prompt "ussp-push......................... obex push application"
-	tristate
-	default n
-	help
-	  ussp-push is a OBEX object pusher for Linux, using the 
-	  BlueZ BlueTooth stack.
-
-	  http://xmailserver.org/ussp-push.html
diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile
index c62f5a885..f22f474fb 100644
--- a/package/ussp-push/Makefile
+++ b/package/ussp-push/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ussp-push
 PKG_VERSION:=		0.11
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openobex
 PKG_MD5SUM:=		5c44983ee27809867041feff6bb4423a
 PKG_DESCR:=		OBEX push command
 PKG_SECTION:=		bluetooth
diff --git a/package/ustl/Config.in b/package/ustl/Config.in
deleted file mode 100644
index b8aa55d55..000000000
--- a/package/ustl/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_USTL
-	prompt "ustl.............................. C++ Standard Template Library for embedded systems"
-	tristate
-	default n
-	help
-	  uSTL is a partial implementation of the STL (Standard Template 
-	  Library) that reduces code size by factoring memory management 
-	  code into a non-template base class and deriving containers 
-	  from it.
-	  http://ustl.sourceforge.net/
-
diff --git a/package/util-linux-ng/Config.in b/package/util-linux-ng/Config.in
deleted file mode 100644
index 8885dba87..000000000
--- a/package/util-linux-ng/Config.in
+++ /dev/null
@@ -1,41 +0,0 @@
-config ADK_COMPILE_UTIL_LINUX_NG
-	tristate
-	default n
-	depends on ADK_PACKAGE_FDISK || ADK_PACKAGE_SWAP_UTILS || ADK_PACKAGE_SFDISK || ADK_PACKAGE_LOSETUP
-
-config ADK_PACKAGE_FDISK
-	prompt "fdisk............................. Partition table manipulation utility"
-	tristate
-	default n
-	select ADK_COMPILE_UTIL_LINUX_NG
-	help
-	  A partition table manipulation utility
-
-config ADK_PACKAGE_SFDISK
-	prompt "sfdisk............................ Scriptable Partition table manipulation utility"
-	tristate
-	default n
-	select ADK_COMPILE_UTIL_LINUX_NG
-	help
-	  A scriptable partition table manipulation utility
-	  
-config ADK_PACKAGE_LOSETUP
-	prompt "losetup........................... Loop devices setup and control utility"
-	tristate
-	default n
-	select ADK_COMPILE_UTIL_LINUX_NG
-	select ADK_KPACKAGE_KMOD_BLK_DEV_LOOP
-	help
-	  A loop devices setup and control utility
-	  
-config ADK_PACKAGE_SWAP_UTILS
-	prompt "swap-utils........................ Swap space management utilities"
-	tristate
-	default n
-	select ADK_COMPILE_UTIL_LINUX_NG
-	select ADK_PACKAGE_LIBBLKID
-	help
-	  A collection of tools to manage swap space :
-	    * mkswap
-	    * swapon
-	    * swapoff
diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index f7b3d7d1e..b3343b8a7 100644
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		util-linux-ng
 PKG_VERSION:=		2.16.1
 PKG_RELEASE:=		2
+PKG_BUILDDEP+=		e2fsprogs ncurses
 PKG_MD5SUM:=		fc57e5fd5be9e569b026b5077fafe84f
 PKG_DESCR:=		Linux utilities
 PKG_SECTION:=		admin
diff --git a/package/valgrind/Config.in b/package/valgrind/Config.in
deleted file mode 100644
index dbb743a1c..000000000
--- a/package/valgrind/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_VALGRIND
-	prompt "valgrind.......................... a memory error detector and more"
-	tristate
-	default n
-	depends on ADK_LINUX_X86_ALIX1C || \
-		   ADK_LINUX_X86_QEMU
-	help
-	  http://valgrind.org/
diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile
index bb8ae3b07..bf0c1710d 100644
--- a/package/valgrind/Makefile
+++ b/package/valgrind/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:=		utils
 PKG_URL:=		http://valgrind.org
 PKG_SITES:=		http://valgrind.org/downloads/
 
+PKG_TARGET_DEPENDS:=	x86 x86_64
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/vgp/Config.in b/package/vgp/Config.in
deleted file mode 100644
index c32aeaaf5..000000000
--- a/package/vgp/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_PACKAGE_VGP
-	prompt "vgp............................... a daemon working like Cisco(c) HSRP"
-	tristate
-	default n
-	help
-		VGP (Virtual Gateway Protocol)is a very simple protocol able to
-		work in a way similar to Cisco(c) HSRP. It implements the idea
-		of Virtual Gateway to provide fault tollerance (and load
-		balancing) on your net. Each client on your net has as its
-		default gateway the virtual gateway and not the real router.
-
-		http://vgpd.freaknet.org/
diff --git a/package/videoproto/Config.in b/package/videoproto/Config.in
deleted file mode 100644
index 88d73d6b3..000000000
--- a/package/videoproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XPROTO
-	prompt "xproto................................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/vilistextum/Config.in b/package/vilistextum/Config.in
deleted file mode 100644
index e39d266a6..000000000
--- a/package/vilistextum/Config.in
+++ /dev/null
@@ -1,23 +0,0 @@
-config ADK_PACKAGE_VILISTEXTUM
-	prompt "vilistextum....................... A html to ascii-converter"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBICONV
-	help
-	  This is release 2.6.9 (22 October 2006) of Vilistextum.
-	  Vilistextum is a html to text / ascii converter specifically
-	  programmed to get the best out of incorrect html. It is released 
-	  as free software under the terms of the GNU GPL Version 2.
-	  Some features:
-	    * small and fast
-	    * understands HTML 3.2 upto 4.01 and XHTML 1.0
-	    * creates footnotes for links
-	    * can swallow multiple empty lines
-	    * removes empty ALT attributes
-	    * converts characters and entities between 128 and 159 from 
-	      the windows1252 charset to meaningful strings in ISO-8859-1. 
-	      E.g. 0x93 is converted to ".
-	    * output can be optimized for ebook reading
-	    * GUI-frontend using kaptain
-	    * supports various multibyte encodings (e.g. Unicode, Shift_JIS)
-
diff --git a/package/vilistextum/Makefile b/package/vilistextum/Makefile
index f96ca2103..95cdbaa92 100644
--- a/package/vilistextum/Makefile
+++ b/package/vilistextum/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		vilistextum
 PKG_VERSION:=		2.6.9
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libiconv
 PKG_MD5SUM:=            5ba56ffdc56758da716bb46c3e0f517e
 PKG_DESCR:=		html to ascii converter
 PKG_SECTION:=		text
diff --git a/package/vim/Config.in b/package/vim/Config.in
deleted file mode 100644
index bece93a03..000000000
--- a/package/vim/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_VIM
-	prompt "vim............................... VI Improved"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNCURSES
-	help
-	  An improved version of VI.
-	  Note that compiling this on non-Linux may break some things.
-	  The configure script is horrible.
-	  
-	  http://www.vim.org
diff --git a/package/vim/Makefile b/package/vim/Makefile
index 8aa47d59a..a831bf041 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		vim
 PKG_VERSION=		7.2
 PKG_RELEASE=		1
+PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM=		f0901284b338e448bfd79ccca0041254
 PKG_DESCR:=		The text editor
 PKG_SECTION:=		text
diff --git a/package/vnc-reflector/Config.in b/package/vnc-reflector/Config.in
deleted file mode 100644
index bd7754407..000000000
--- a/package/vnc-reflector/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_PACKAGE_VNC_REFLECTOR
-	prompt "vnc-reflector..................... VNC proxy for multiple clients"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBJPEG
-	select ADK_PACKAGE_ZLIB
-	help
-	  VNC Reflector is a specialized VNC server which acts as
-	  a proxy sitting between real VNC server (a host) and a 
-	  number of VNC clients. It was designed to work efficiently
-	  with large number of clients.
-
-	  http://sourceforge.net/projects/vnc-reflector
-
diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile
index 0e7bbd9be..b83ff00f8 100644
--- a/package/vnc-reflector/Makefile
+++ b/package/vnc-reflector/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		vnc-reflector
 PKG_VERSION:=		1.2.4
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		jpeg zlib
 PKG_MD5SUM:=		c3f88bc62f228b335c25c07f9744ab0c
 PKG_DESCR:=		specialized VNC server which acts as a proxy
 PKG_SECTION:=		net
diff --git a/package/vnstat/Config.in b/package/vnstat/Config.in
deleted file mode 100644
index e9080ee00..000000000
--- a/package/vnstat/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_VNSTAT
-	prompt "vnstat............................ Console-based network traffic monitor"
-	tristate
-	default n
-	help
-	  vnStat is a network traffic monitor for Linux that keeps a log of daily
-	  network traffic for the selected interface(s). vnStat isn't a packet
-	  sniffer. The traffic information is analyzed from the /proc -filesystem,
-	  so vnStat can be used without root permissions.
-	  .
-	  http://humdi.net/vnstat/
diff --git a/package/vpnc/Config.in b/package/vpnc/Config.in
deleted file mode 100644
index 25a0050c1..000000000
--- a/package/vpnc/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_VPNC
-	prompt "vpnc.............................. VPN client for Cisco 3000"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_TUN
-	select ADK_PACKAGE_LIBGPG_ERROR
-	select ADK_PACKAGE_LIBGCRYPT
-	help
-		Client for cisco3000 VPN Concentrator.
diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile
index f38d055df..c6129d9b2 100644
--- a/package/vpnc/Makefile
+++ b/package/vpnc/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		vpnc
 PKG_VERSION:=		0.4.0
 PKG_RELEASE:=		2
+PKG_BUILDDEP+=		libgcrypt libgpg-error
 PKG_MD5SUM:=		604807e7dd90fce00a4e2344ee29c76d
 PKG_DESCR:=		client for cisco3000 VPN Concentrator.
 PKG_SECTION:=		net
diff --git a/package/vrrpd/Config.in b/package/vrrpd/Config.in
deleted file mode 100644
index c003fd8e9..000000000
--- a/package/vrrpd/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_VRRPD
-        prompt "vrrpd............................. Virtual Router Redundancy Protocol daemon"
-	tristate
-	default n
-	help
-	  VRRPd is an implementation of Virtual Router Redundancy
-	  Protocol as specified in rfc2338.  VRRPd is interoperable with
-	  other RFC-based VRRP implementations, including Cisco and
-	  Juniper, and is included as a standard feature on ImageStream
-	  routers.
-	  
-	  http://www.sourceforge.net/projects/vrrpd
-
diff --git a/package/vsftpd/Config.in b/package/vsftpd/Config.in
deleted file mode 100644
index 1b5f6108c..000000000
--- a/package/vsftpd/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_VSFTPD
-	prompt "vsftpd............................ Fast and secure FTP server"
-	tristate
-	default n
-	help
-	  A fast and secure FTP server
-	  
-	  http://vsftpd.beasts.org/
-
diff --git a/package/vtun/Config.in b/package/vtun/Config.in
deleted file mode 100644
index 715144fd2..000000000
--- a/package/vtun/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_VTUN
-	prompt "vtun.............................. VPN tunneling daemon"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBLZO
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	depends on !ADK_HOST_FREEBSD # flex problem
-	help
-	  A VPN tunneling daemon
-	  
-	  http://vtun.sourceforge.net
-
diff --git a/package/vtun/Makefile b/package/vtun/Makefile
index 513d6ccdc..460e4c08d 100644
--- a/package/vtun/Makefile
+++ b/package/vtun/Makefile
@@ -6,12 +6,15 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		vtun
 PKG_VERSION:=		3.0.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		zlib openssl liblzo
 PKG_MD5SUM:=		c342ffe77055d4248a38f0b380f28c1b
 PKG_DESCR:=		A VPN tunnel daemon
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libopenssl zlib kmod-tun
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=vtun/}
 
+PKG_HOST_DEPENDS:=	!freebsd
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VTUN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/watchdog/Config.in b/package/watchdog/Config.in
deleted file mode 100644
index aae8b3ea8..000000000
--- a/package/watchdog/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_PACKAGE_WATCHDOG
-	prompt "watchdog.......................... configurable watchdog"
-	tristate
-	default n
-	help
-	  watchdog
-	  
diff --git a/package/wccpd/Config.in b/package/wccpd/Config.in
deleted file mode 100644
index d2efa286c..000000000
--- a/package/wccpd/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_PACKAGE_WCCPD
-	prompt "wccpd............................. a Web Cache Coordination daemon"
-	tristate
-	default n
-	help
-		wccpd is a WCCP (Web Cache Coordination Protocol) server daemon
-		It allows a router (running Linux) to redirect web traffic to a
-		group of Squid servers using WCCP as the monitoring/controling 
-		protocol.
-
-		http://wccpd.sourceforge.net/
diff --git a/package/wdfs/Config.in b/package/wdfs/Config.in
deleted file mode 100644
index ec9d63119..000000000
--- a/package/wdfs/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_PACKAGE_WDFS
-	prompt "wdfs.............................. WebDAV filesystem"
-	tristate
-	default n
-	select ADK_PACKAGE_FUSE_UTILS
-	select ADK_PACKAGE_NEON
-	select ADK_PACKAGE_GLIB
-	help
-	  WebDAV is an extension to HTTP that allows remote collaborative
-	  authoring of Web resources, defined in RFC 2518.
-	  
-	  wdfs is a FUSE userland filesystem allowing to mount WebDAV
-	  shares as local filesystems, with optional support of transparent
-	  versioning with subversion (not yet included in this package).
diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile
index 744770fa1..71951046c 100644
--- a/package/wdfs/Makefile
+++ b/package/wdfs/Makefile
@@ -6,10 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		wdfs
 PKG_VERSION=		1.4.2
 PKG_RELEASE=		2
+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/weechat/Config.in b/package/weechat/Config.in
deleted file mode 100644
index 4073c3979..000000000
--- a/package/weechat/Config.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#menu "weechat........................... Lightweight IRC client"
-
-config ADK_PACKAGE_WEECHAT
-	prompt "weechat........................... Lightweight IRC client"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBICONV
-	help
-	  Fast, light & extensible IRC client
-
-	  http://weechat.flashtux.org
-
-config ADK_COMPILE_WEECHAT_WITH_TLS
-	prompt "  Enable TLS support"
-	bool
-	select ADK_PACKAGE_LIBGNUTLS
-	depends on ADK_PACKAGE_WEECHAT
-
-config ADK_COMPILE_WEECHAT_WITH_LUA
-	prompt "  Enable LUA scripting"
-	bool
-	select ADK_PACKAGE_LIBLUA
-	depends on ADK_PACKAGE_WEECHAT
-
-#endmenu
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index 59529b51e..804657cf8 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		weechat
 PKG_VERSION:=		0.1.8
 PKG_RELEASE:=		2
+PKG_BUILDDEP+=		ncurses gnutls lua libiconv
 PKG_MD5SUM:=		73d6bc211ac32c597f0d278506480a20
 PKG_DESCR:=		Lightweight IRC client
 PKG_SECTION:=		net
diff --git a/package/wget/Config.in b/package/wget/Config.in
deleted file mode 100644
index 88c1d19e4..000000000
--- a/package/wget/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_WGET
-	prompt "wget.............................. retrieving files using HTTP, HTTPS and FTP"
-	tristate
-	default n
-	help
- 	  http://www.gnu.org/software/wget/
diff --git a/package/wifidog/Config.in b/package/wifidog/Config.in
deleted file mode 100644
index 0680cc16d..000000000
--- a/package/wifidog/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_PACKAGE_WIFIDOG
-	prompt "wifidog........................... A wireless captive portal solution"
-	tristate
-	default n
-	select ADK_PACKAGE_IPTABLES
-	help
-	  The Wifidog project is a complete and embeddable captive
-	  portal solution for wireless community groups or individuals
-	  who wish to open a free Hotspot while still preventing abuse
-	  of their Internet connection.
-	  
-	  http://www.wifidog.org/
-
diff --git a/package/wireless-firmware/Config.in b/package/wireless-firmware/Config.in
deleted file mode 100644
index 4e4ab3e7b..000000000
--- a/package/wireless-firmware/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_DOWNLOAD_WIRELESS_FIRMWARE
-	boolean
-	default n
-
-config ADK_PACKAGE_WIRELESS_FIRMWARE_RT61
-	prompt "wireless-firmware-rt61................ firmware rt61/rt2601 wireless cards"
-	tristate
-	default n
-	select ADK_DOWNLOAD_WIRELESS_FIRMWARE
-	help
-
diff --git a/package/wol/Config.in b/package/wol/Config.in
deleted file mode 100644
index 25228bf3a..000000000
--- a/package/wol/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_WOL
-	prompt "wol............................... Wake On LAN client"
-	tristate
-	default n
-	help
-	  wol implements Wake On LAN functionality in a small program. 
-	  It wakes up hardware that is Magic Packet compliant.
-	  
-	  http://ahh.sourceforge.net/wol/
-
diff --git a/package/wondershaper/Config.in b/package/wondershaper/Config.in
deleted file mode 100644
index 96a0e816d..000000000
--- a/package/wondershaper/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_PACKAGE_WONDERSHAPER
-	prompt "wondershaper...................... The Wonder Shaper"
-	tristate
-	default n
-	select ADK_PACKAGE_TC
-	help
-	  WonderShaper is a tc based traffic shaping tool.
-	  
-	  Depends: tc
-
diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in
deleted file mode 100644
index b0044856a..000000000
--- a/package/wpa_supplicant/Config.in
+++ /dev/null
@@ -1,30 +0,0 @@
-config ADK_PACKAGE_WPA_SUPPLICANT
-	prompt "wpa_supplicant.................... WPA Supplicant with support for WPA and WPA2"
-	tristate
-	default n
-	select ADK_KPACKAGE_KMOD_CRYPTO_AES
-	help
-	  WPA Supplicant with support for WPA and WPA2 (IEEE 802.11i / RSN).
-	  Supplicant is the IEEE 802.1X/WPA component that is used in the client
-	  stations. It implements key negotiation with a WPA Authenticator and it
-	  controls the roaming and IEEE 802.11 authentication/association.
-
-	  http://hostap.epitest.fi/wpa_supplicant/
-
-choice
-prompt "SSL/TLS Configuration"
-depends on ADK_PACKAGE_WPA_SUPPLICANT
-default ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL
-
-config ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL
-	bool "enable openssl encryption support"
-	depends on ADK_PACKAGE_WPA_SUPPLICANT
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-
-config ADK_COMPILE_WPA_SUPPLICANT_WITH_INCLUDED
-	bool "enable included encryption support"
-	depends on ADK_PACKAGE_WPA_SUPPLICANT
-	help
-
-endchoice
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index d1f8fd190..9e4ae77ff 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -6,6 +6,9 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		wpa_supplicant
 PKG_VERSION:=		0.6.9
 PKG_RELEASE:=		1
+ifeq (${ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL},y)
+PKG_BUILDDEP+=		openssl
+endif
 PKG_MD5SUM:=		0efb8fcedf0a8acf6f423dfdb0658fdd
 PKG_DESCR:=		WPA Supplicant with support for WPA and WPA2
 PKG_SECTION:=		net
diff --git a/package/wput/Config.in b/package/wput/Config.in
deleted file mode 100644
index 33bf66aaa..000000000
--- a/package/wput/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_WPUT
-	prompt "wput.............................. A wget-like command-line FTP client"
-	tristate
-	default n
-	help
-	  A wget-like command-line FTP client.
-	  
-	  http://itooktheredpill.dyndns.org/wput/
-
diff --git a/package/xcmiscproto/Config.in b/package/xcmiscproto/Config.in
deleted file mode 100644
index dcb5bef8d..000000000
--- a/package/xcmiscproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XCMISCPROTO
-	prompt "xcmiscproto............................ X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/xextproto/Config.in b/package/xextproto/Config.in
deleted file mode 100644
index 1a1a5c51d..000000000
--- a/package/xextproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XEXTPROTO
-	prompt "xextproto.............................. Xextproto headers"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/xf86-video-cirrus/Config.in b/package/xf86-video-cirrus/Config.in
deleted file mode 100644
index 4df3074b3..000000000
--- a/package/xf86-video-cirrus/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_XF86_VIDEO_CIRRUS
-	prompt "xf86-video-cirrus.......................... X11 driver for Cirrus chips"
-	tristate
-	default n
-	depends on ADK_LINUX_X86_QEMU || ADK_LINUX_X86_64_QEMU
-	select ADK_PACKAGE_XORG_SERVER
-	help
-         http://www.x.org
diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
index 4e40f4d0b..a86ba2730 100644
--- a/package/xf86-video-cirrus/Makefile
+++ b/package/xf86-video-cirrus/Makefile
@@ -6,12 +6,15 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		xf86-video-cirrus
 PKG_VERSION:=		1.3.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		xorg-server
 PKG_MD5SUM:=		c63a29917c48d0c317445991fc36d09a
 PKG_DESCR:=		X11 driver for Cirrus VGA chips
 PKG_SECTION:=		x11
 PKG_DEPENDS:=		xorg-server
 PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/driver/
 
+PKG_TARGET_DEPENDS:=	x86_qemu x86_64_qemu
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_VIDEO_CIRRUS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/xf86-video-geode/Config.in b/package/xf86-video-geode/Config.in
deleted file mode 100644
index d63660fc8..000000000
--- a/package/xf86-video-geode/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_XF86_VIDEO_GEODE
-	prompt "xf86-video-geode.......................... X11 driver for AMD Geode"
-	tristate
-	default n
-	depends on ADK_LINUX_X86_ALIX1C
-	select ADK_PACKAGE_XORG_SERVER
-	help
-         http://www.x.org
diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile
index 083c15703..b98613082 100644
--- a/package/xf86-video-geode/Makefile
+++ b/package/xf86-video-geode/Makefile
@@ -6,12 +6,15 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		xf86-video-geode
 PKG_VERSION:=		2.11.6
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		xorg-server
 PKG_MD5SUM:=		a673c0f88037d12fbb96d9fefc82785b
 PKG_DESCR:=		X11 driver for AMD Geode VGA chip
 PKG_SECTION:=		x11
 PKG_DEPENDS:=		xorg-server
 PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/driver/
 
+PKG_TARGET_DEPENDS:=	alix1c
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_VIDEO_GEODE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/xf86dga/Config.in b/package/xf86dga/Config.in
deleted file mode 100644
index 551ab02cc..000000000
--- a/package/xf86dga/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XF86DGA
-	prompt "xf86dga.............................. X library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/xf86dga/Makefile b/package/xf86dga/Makefile
index 70e0d5e39..1adb287ae 100644
--- a/package/xf86dga/Makefile
+++ b/package/xf86dga/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		xf86dga
 PKG_VERSION:=		1.0.2
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libXxf86dga
 PKG_MD5SUM:=		ac30b5705f487554c5de0b466e846c31
 PKG_SITES:=		${MASTER_SITE_XORG}
 
diff --git a/package/xf86dgaproto/Config.in b/package/xf86dgaproto/Config.in
deleted file mode 100644
index ce8f91492..000000000
--- a/package/xf86dgaproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XF86DGAPROTO
-	prompt "xf86dgaproto................................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in
deleted file mode 100644
index 729c249e0..000000000
--- a/package/xfsprogs/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_XFSPROGS
-	prompt "xfsprogs.......................... Utilities to create and check XFS filesystems"
-	tristate
-	select ADK_PACKAGE_LIBUUID
-	select ADK_PACKAGE_LIBPTHREAD
-	default n
-	help
-           Utilities to create and check XFS filesystems.
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index bdb09fe91..f323ef9e6 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		xfsprogs
 PKG_VERSION:=		3.0.0
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		e2fsprogs
 PKG_MD5SUM:=		ec734f935ec87ebb8be890d29380a3e6
 PKG_DESCR:=		Utilities to create and check XFS filesystems
 PKG_SECTION:=		admin
diff --git a/package/xinetd/Config.in b/package/xinetd/Config.in
deleted file mode 100644
index 49d870c3d..000000000
--- a/package/xinetd/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_XINETD
-	prompt "xinetd............................ Powerful and secure superserver"
-	tristate
-	default n
-	help
-	  A powerful and secure superserver
-	  
-	  http://www.xinetd.org/
-
diff --git a/package/xkbcomp/Config.in b/package/xkbcomp/Config.in
deleted file mode 100644
index 1f8d81a0b..000000000
--- a/package/xkbcomp/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XKBCOMP
-	prompt "xkbcomp.............................. X11 keyboard compiler"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/xkeyboard-config/Config.in b/package/xkeyboard-config/Config.in
deleted file mode 100644
index 053cbaecf..000000000
--- a/package/xkeyboard-config/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XKEYBOARD_CONFIG
-	prompt "xkeyboard-config..................... X keyboard config"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile
index 710dd1eb6..cb105a795 100644
--- a/package/xkeyboard-config/Makefile
+++ b/package/xkeyboard-config/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		xkeyboard-config
 PKG_VERSION:=		1.7
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		xkbcomp
 PKG_MD5SUM:=		c024a6e2a5b8c4ce3d9d1f1286466163
 PKG_DESCR:=		X keyboard config
 PKG_SECTION:=		x11
diff --git a/package/xorg-server/Config.in b/package/xorg-server/Config.in
deleted file mode 100644
index 23dfc56a8..000000000
--- a/package/xorg-server/Config.in
+++ /dev/null
@@ -1,26 +0,0 @@
-config ADK_PACKAGE_XORG_SERVER
-	prompt "xorg-server............................... X server"
-	tristate
-	default n
-	select ADK_PACKAGE_XKBCOMP
-	select ADK_PACKAGE_LIBXV
-	select ADK_PACKAGE_XKEYBOARD_CONFIG
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBXKBFILE
-	select ADK_PACKAGE_LIBX11
-	select ADK_PACKAGE_LIBICE
-	select ADK_PACKAGE_LIBSM
-	select ADK_PACKAGE_LIBXEXT
-	select ADK_PACKAGE_LIBXFONT
-	select ADK_PACKAGE_LIBFONTENC
-	select ADK_PACKAGE_LIBPCIACCESS
-	select ADK_PACKAGE_LIBXAU
-	select ADK_PACKAGE_LIBXAW
-	select ADK_PACKAGE_LIBXMU
-	select ADK_PACKAGE_LIBXPM
-	select ADK_PACKAGE_LIBXT
-	select ADK_PACKAGE_PIXMAN
-	select ADK_PACKAGE_XF86DGA
-	select ADK_PACKAGE_LIBXXF86DGA
-	help
-         http://www.x.org
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 34b77a158..f20811848 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -6,6 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		xorg-server
 PKG_VERSION:=		1.7.1
 PKG_RELEASE:=		1
+PKG_BUILDDEP+=		libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl
 PKG_MD5SUM:=		913a672cbd6da516de15965d594e20b9
 PKG_DESCR:=		Xorg server
 PKG_SECTION:=		x11
diff --git a/package/xproto/Config.in b/package/xproto/Config.in
deleted file mode 100644
index 88d73d6b3..000000000
--- a/package/xproto/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XPROTO
-	prompt "xproto................................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/xtrans/Config.in b/package/xtrans/Config.in
deleted file mode 100644
index dfdc4b082..000000000
--- a/package/xtrans/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XTRANS
-	prompt "xtrans.................................. X library"
-	tristate
-	default n
-	help
-         http://www.x.org
diff --git a/package/xz/Config.in b/package/xz/Config.in
deleted file mode 100644
index b35d8317d..000000000
--- a/package/xz/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XZ
-	prompt "xz............................... lzma compression utility"
-	tristate
-	default n
-	help
- 	  http://tukaani.org/xz/
diff --git a/package/zlib/Config.in b/package/zlib/Config.in
deleted file mode 100644
index 2d4be8d8d..000000000
--- a/package/zlib/Config.in
+++ /dev/null
@@ -1,19 +0,0 @@
-config ADK_PACKAGE_ZLIB
-	prompt "zlib.............................. Library implementing the deflate compression method"
-	tristate
-	default n
-	help
-	  A library implementing the 'deflate' compression method
-	  
-	  http://www.zlib.net/
-
-config ADK_PACKAGE_ZLIB_DEV
-	prompt "zlib-dev........................ Zlib development files"
-	tristate
-	depends on ADK_PACKAGE_ZLIB
-	default n
-	help
-	  A library implementing the 'deflate' compression method
-	  http://www.zlib.net/
-
-
diff --git a/package/zsh/Config.in b/package/zsh/Config.in
deleted file mode 100644
index ee1af759b..000000000
--- a/package/zsh/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_PACKAGE_ZSH
-	prompt "zsh............................... Z shell"
-	tristate
-	default n
-	help
-	 Zsh a shell designed for interactive use, although it is also a 
-	 powerful scripting language. Many of the useful features of 
-         bash, ksh, and tcsh were incorporated into zsh; many original 
-         features were added. 
diff --git a/rules.mk b/rules.mk
index bd4d47ed7..53496e223 100644
--- a/rules.mk
+++ b/rules.mk
@@ -48,4 +48,10 @@ ifneq (${show},)
 .DEFAULT_GOAL:=		show
 show:
 	@$(info ${${show}})
+else ifneq (${dump},)
+__shquote=		'$(subst ','\'',$(1))'
+__dumpvar=		echo $(call __shquote,$(1)=$(call __shquote,${$(1)}))
+.DEFAULT_GOAL:=		show
+show:
+	@$(foreach _s,${dump},$(call __dumpvar,${_s});)
 endif
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 70547394e..743f316b0 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -112,7 +112,7 @@ if ! which tar >/dev/null 2>&1; then
 	out=1
 fi
 
-if ! tar --version|grep GNU >/dev/null 2>&1;then
+if ! (tar --version | grep GNU) >/dev/null 2>&1;then
 	if ! which gtar >/dev/null 2>&1; then
 		echo You must install GNU tar to continue.
 		echo
diff --git a/scripts/split-cfg.sh b/scripts/split-cfg.sh
index 4331709a5..07cdd5838 100644
--- a/scripts/split-cfg.sh
+++ b/scripts/split-cfg.sh
@@ -4,21 +4,21 @@
 # ses the slow-down.
 
 TOPDIR=$1
-
-[[ -n $BASH_VERSION ]] && shopt -s extglob
+(( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 ))
+typeset -L$x_cols pbar
 
 grep -v '^BUSYBOX\|^# BUSYBOX' $TOPDIR/.config > $TOPDIR/.config.split
 
 mkdir -p $TOPDIR/.cfg
 cd $TOPDIR/.cfg
 
-oldfiles=$(echo *)
+oldfiles=$(print -r -- *)
 newfiles=:
 
-echo -n 'autosplitting main config...'
+print -nu2 'autosplitting main config...'
 while read line; do
 	oline=$line
-	[[ -n $line ]] && if [[ $line = @(# [A-Z])* ]]; then
+	[[ -n $line ]] && if [[ $line = @(\# [A-Z])* ]]; then
 		line=${line#? }
 		if [[ $line = *@( is not set) ]]; then
 			line=${line% is not set}
@@ -28,12 +28,12 @@ while read line; do
 		fi
 	elif [[ $line = @([A-Z])*@(=)* ]]; then
 		line=${line%%=*}
-	elif [[ $line = @(#)* ]]; then
+	elif [[ $line = \#* ]]; then
 		# valid comment
 		line=
 	else
 		# invalid non-comment
-		echo "Warning: line '$oline' invalid!" >&2
+		print -u2 "\nWarning: line '$oline' invalid!"
 		line=
 	fi
 	# if the line is a valid yes/no/whatever, write it
@@ -44,9 +44,9 @@ while read line; do
 		else
 			fline=
 		fi
-		[[ $oline = $fline ]] || echo "$oline" >$line
+		[[ $oline = $fline ]] || print -r -- "$oline" >$line
 		if [[ $newfiles = *:$line:* ]]; then
-			echo "Error: duplicate Config.in option '$line'!" >&2
+			print -u2 "\nError: duplicate Config.in option '$line'!"
 			exit 1
 		fi
 		newfiles=$newfiles$line:
@@ -54,11 +54,11 @@ while read line; do
 done <$TOPDIR/.config.split
 
 # now handle the case of removals
-echo -n ' removals...'
+print -nu2 ' removals...'
 for oldfile in $oldfiles; do
 	[[ $newfiles = *:$oldfile:* ]] || rm -f $oldfile
 done
-printf '\r%60s\r' ''
+print -nu2 '\r'
 
 # now scan for dependencies of packages; the information
 # should probably be in build_mipsel because it's generated
@@ -69,18 +69,19 @@ printf '\r%60s\r' ''
 cd $TOPDIR/.cfg
 rm -f $TOPDIR/package/*/info.mk
 for option in *; do
-	echo -n "$option ..."
-	x=$(( ${#option} + 4 ))
+	pbar="$option ..."
+	print -nu2 "$pbar\r"
 	ao=:
 	fgrep -l $option $TOPDIR/package/*/{Makefile,Config.*} 2>&- | \
 	    while read line; do
-		echo ${line%/*}/info.mk
+		print -r -- ${line%/*}/info.mk
 	done | while read fname; do
 		[[ $ao = *:$fname:* ]] && continue
 		ao=$ao$fname:
 		echo "\${_IPKGS_COOKIE}: \${TOPDIR}/.cfg/$option" >>$fname
 	done
-	printf '\r%'$x's\r' ''
 done
+pbar=done
+print -u2 "$pbar"
 
 exit 0
diff --git a/target/target.lst b/target/target.lst
new file mode 100644
index 000000000..2537feef7
--- /dev/null
+++ b/target/target.lst
@@ -0,0 +1,31 @@
+native		ADK_LINUX_NATIVE
+alix1c		ADK_LINUX_X86_ALIX1C
+alix2d		ADK_LINUX_X86_ALIX2D
+alix		ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D
+wrap		ADK_LINUX_X86_WRAP
+foxboard	ADK_LINUX_CRIS_FOXBOARD
+lemote		ADK_LINUX_MIPS64_LEMOTE
+ag241		ADK_LINUX_MIPS_AG241
+tomtom		ADK_LINUX_ARM_TOMTOM
+g1		ADK_LINUX_ARM_G1
+zaurus		ADK_LINUX_XSCALE_ZAURUS
+shuttle		ADK_LINUX_X86_64_SHUTTLE
+x86_64_rescue	ADK_LINUX_X86_64_RESCUE
+x86_rescue	ADK_LINUX_X86_RESCUE
+mipsel_rescue	ADK_LINUX_MIPSEL_RESCUE
+mips_rescue	ADK_LINUX_MIPS_RESCUE
+arm_qemu	ADK_LINUX_ARM_QEMU
+mips_qemu	ADK_LINUX_MIPS_QEMU
+mipsel_qemu	ADK_LINUX_MIPSEL_QEMU
+mips64_qemu	ADK_LINUX_MIPS64_QEMU
+mips64el_qemu	ADK_LINUX_MIPS64EL_QEMU
+cris_qemu	ADK_LINUX_CRIS_QEMU
+x86_qemu	ADK_LINUX_X86_QEMU
+x86_64_qemu	ADK_LINUX_X86_64_QEMU
+qemu		ADK_LINUX_ARM_QEMU || ADK_LINUX_MIPS_QEMU || ADK_LINUX_MIPSEL_QEMU || ADK_LINUX_MIPS64_QEMU || ADK_LINUX_MIPS64EL_QEMU || ADK_LINUX_CRIS_QEMU || ADK_LINUX_X86_QEMU || ADK_LINUX_X86_64_QEMU
+rb411		ADK_LINUX_MIPS_RB411
+rb433		ADK_LINUX_MIPS_RB433
+rb532		ADK_LINUX_MIPS_RB532
+routerboard	ADK_LINUX_MIPS_RB411 || ADK_LINUX_MIPS_RB433 || ADK_LINUX_MIPS_RB532
+x86		ADK_LINUX_X86_QEMU || ADK_LINUX_X86_RESCUE || ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D || ADK_LINUX_X86_WRAP
+x86_64		ADK_LINUX_X86_64_QEMU || ADK_LINUX_X86_64_RESCUE || ADK_LINUX_X86_64_SHUTTLE