Browse Source

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
Waldemar Brodkorb 14 years ago
parent
commit
537a2c4eaa
100 changed files with 246 additions and 1878 deletions
  1. 3 0
      .gitignore
  2. 5 1
      BSDmakefile
  3. 2 0
      GNUmakefile
  4. 12 8
      Makefile
  5. 4 0
      Makefile.inc
  6. 3 1
      config/Makefile
  7. 37 19
      mk/build.mk
  8. 13 0
      mk/package.mk
  9. 1 1
      mk/split-cfg.mk
  10. 5 0
      package/.gitignore
  11. 0 12
      package/6tunnel/Config.in
  12. 1 0
      package/6tunnel/Makefile
  13. 34 21
      package/Config.in
  14. 0 425
      package/Depends.mk
  15. 0 430
      package/Makefile
  16. 0 11
      package/aiccu/Config.in
  17. 0 16
      package/aircrack-ng/Config.in
  18. 1 0
      package/aircrack-ng/Makefile
  19. 0 7
      package/alsa-lib/Config.in
  20. 0 8
      package/alsa-utils/Config.in
  21. 2 0
      package/alsa-utils/Makefile
  22. 0 12
      package/apr-util/Config.in
  23. 1 0
      package/apr-util/Makefile
  24. 0 16
      package/apr/Config.in
  25. 7 0
      package/apr/Makefile
  26. 0 11
      package/arpd/Config.in
  27. 1 0
      package/arpd/Makefile
  28. 0 7
      package/arpwatch/Config.in
  29. 1 0
      package/arpwatch/Makefile
  30. 0 97
      package/asterisk/Config.in
  31. 19 4
      package/asterisk/Makefile
  32. 0 25
      package/atftp/Config.in
  33. 1 0
      package/atftp/Makefile
  34. 0 5
      package/atk/Config.in
  35. 1 0
      package/atk/Makefile
  36. 0 9
      package/aufs2-util/Config.in
  37. 0 6
      package/autoconf/Config.in
  38. 0 6
      package/automake/Config.in
  39. 0 9
      package/autossh/Config.in
  40. 0 45
      package/avahi/Config.in
  41. 0 18
      package/avahi/Config.in.lib
  42. 2 0
      package/avahi/Makefile
  43. 0 17
      package/axtls/Config.in
  44. 0 11
      package/axtls/Config.in.lib
  45. 0 16
      package/base-files/Config.in
  46. 4 8
      package/base-files/Makefile
  47. 0 8
      package/bash/Config.in
  48. 1 1
      package/bash/Makefile
  49. 0 22
      package/bc/Config.in
  50. 0 6
      package/bigreqsproto/Config.in
  51. 0 97
      package/bind/Config.in
  52. 1 0
      package/bind/Makefile
  53. 0 8
      package/binutils/Config.in
  54. 0 6
      package/bison/Config.in
  55. 0 15
      package/bitlbee/Config.in
  56. 1 0
      package/bitlbee/Makefile
  57. 0 10
      package/bluez-firmware/Config.in
  58. 0 13
      package/bluez/Config.in
  59. 2 1
      package/bluez/Makefile
  60. 0 25
      package/bogofilter/Config.in
  61. 5 10
      package/bogofilter/Makefile
  62. 0 10
      package/bridge-utils/Config.in
  63. 5 4
      package/bridge-utils/Makefile
  64. 0 13
      package/busybox/Config.in
  65. 19 0
      package/busybox/Config.in.manual
  66. 0 8
      package/bwm/Config.in
  67. 0 6
      package/bzip2/Config.in
  68. 0 17
      package/ca-certificates/Config.in
  69. 9 6
      package/ca-certificates/Makefile
  70. 0 10
      package/cairo/Config.in
  71. 2 1
      package/cairo/Makefile
  72. 0 16
      package/cbtt/Config.in
  73. 4 0
      package/cbtt/Makefile
  74. 0 20
      package/cfgfs/Config.in
  75. 6 1
      package/cfgfs/Makefile
  76. 0 13
      package/cfinstall/Config.in
  77. 3 0
      package/cfinstall/Makefile
  78. 0 10
      package/cgilib/Config.in
  79. 0 15
      package/chillispot/Config.in
  80. 0 36
      package/collectd/Config.in
  81. 9 3
      package/collectd/Makefile
  82. 0 11
      package/comgt/Config.in
  83. 0 6
      package/compositeproto/Config.in
  84. 0 6
      package/cpio/Config.in
  85. 0 6
      package/cryptinit/Config.in
  86. 1 0
      package/cryptinit/Makefile
  87. 0 16
      package/cryptsetup/Config.in
  88. 2 1
      package/cryptsetup/Makefile
  89. 0 29
      package/ctorrent/Config.in
  90. 2 6
      package/ctorrent/Makefile
  91. 0 10
      package/cups/Config.in
  92. 1 0
      package/cups/Makefile
  93. 0 12
      package/curl/Config.in
  94. 0 20
      package/curl/Config.in.lib
  95. 10 6
      package/curl/Makefile
  96. 0 10
      package/cutter/Config.in
  97. 0 26
      package/cxxtools/Config.in
  98. 2 6
      package/cxxtools/Makefile
  99. 0 14
      package/cyrus-sasl/Config.in
  100. 1 0
      package/cyrus-sasl/Makefile

+ 3 - 0
.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

+ 5 - 1
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"

+ 2 - 0
GNUmakefile

@@ -4,6 +4,8 @@
 TOPDIR:=	$(shell pwd)
 PWD:=		${TOPDIR}
 
+include Makefile.inc
+
 ADKVERSION=	0.1.0
 export ADKVERSION
 

+ 12 - 8
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; \

+ 4 - 0
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

+ 3 - 1
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

+ 37 - 19
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

+ 13 - 0
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},)

+ 1 - 1
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}'

+ 5 - 0
package/.gitignore

@@ -0,0 +1,5 @@
+*/Config.in
+*/Config.in.lib
+Depends.mk
+pkglist.d
+pkgopts.d

+ 0 - 12
package/6tunnel/Config.in

@@ -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/
-

+ 1 - 0
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

+ 34 - 21
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"

+ 0 - 425
package/Depends.mk

@@ -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
-

+ 0 - 430
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))

+ 0 - 11
package/aiccu/Config.in

@@ -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/
-

+ 0 - 16
package/aircrack-ng/Config.in

@@ -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

+ 1 - 0
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

+ 0 - 7
package/alsa-lib/Config.in

@@ -1,7 +0,0 @@
-config ADK_PACKAGE_ALSA_LIB
-	prompt "alsa-lib.......................... alsa library"
-	tristate
-	default n
-	help
-	  
-	  http://www.alsa-project.org/

+ 0 - 8
package/alsa-utils/Config.in

@@ -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/

+ 2 - 0
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/ \

+ 0 - 12
package/apr-util/Config.in

@@ -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
-
-

+ 1 - 0
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

+ 0 - 16
package/apr/Config.in

@@ -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.

+ 7 - 0
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)

+ 0 - 11
package/arpd/Config.in

@@ -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

+ 1 - 0
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

+ 0 - 7
package/arpwatch/Config.in

@@ -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
-

+ 1 - 0
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

+ 0 - 97
package/asterisk/Config.in

@@ -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

+ 19 - 4
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}))

+ 0 - 25
package/atftp/Config.in

@@ -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

+ 1 - 0
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

+ 0 - 5
package/atk/Config.in

@@ -1,5 +0,0 @@
-config ADK_PACKAGE_ATK
-	prompt "atk............................... ATK library"
-	tristate
-	default n
-	help

+ 1 - 0
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

+ 0 - 9
package/aufs2-util/Config.in

@@ -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

+ 0 - 6
package/autoconf/Config.in

@@ -1,6 +0,0 @@
-config ADK_PACKAGE_AUTOCONF
-	prompt "autoconf.......................... Autoconf"
-	tristate
-	default n
-	help
-	  http://www.gnu.org/software/autoconf/

+ 0 - 6
package/automake/Config.in

@@ -1,6 +0,0 @@
-config ADK_PACKAGE_AUTOMAKE
-	prompt "automake.......................... Automake"
-	tristate
-	default n
-	help
-	  http://www.gnu.org/software/automake/

+ 0 - 9
package/autossh/Config.in

@@ -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/

+ 0 - 45
package/avahi/Config.in

@@ -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.
-

+ 0 - 18
package/avahi/Config.in.lib

@@ -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.
-
-

+ 2 - 0
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

+ 0 - 17
package/axtls/Config.in

@@ -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/
-	  
-

+ 0 - 11
package/axtls/Config.in.lib

@@ -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/
-	  
-

+ 0 - 16
package/base-files/Config.in

@@ -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.

+ 4 - 8
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)

+ 0 - 8
package/bash/Config.in

@@ -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/

+ 1 - 1
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

+ 0 - 22
package/bc/Config.in

@@ -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.

+ 0 - 6
package/bigreqsproto/Config.in

@@ -1,6 +0,0 @@
-config ADK_PACKAGE_BIGREQSPROTO
-	prompt "bigreqsproto.......................... X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org

+ 0 - 97
package/bind/Config.in

@@ -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/

+ 1 - 0
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

+ 0 - 8
package/binutils/Config.in

@@ -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

+ 0 - 6
package/bison/Config.in

@@ -1,6 +0,0 @@
-config ADK_PACKAGE_BISON
-	prompt "bison............................. GNU parser generator"
-	tristate
-	default n
-	help
-	  http://www.gnu.org/software/bison/

+ 0 - 15
package/bitlbee/Config.in

@@ -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/

+ 1 - 0
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

+ 0 - 10
package/bluez-firmware/Config.in

@@ -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
-

+ 0 - 13
package/bluez/Config.in

@@ -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
-

+ 2 - 1
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/}
 

+ 0 - 25
package/bogofilter/Config.in

@@ -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
-
-

+ 5 - 10
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

+ 0 - 10
package/bridge-utils/Config.in

@@ -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/

+ 5 - 4
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

+ 0 - 13
package/busybox/Config.in

@@ -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

+ 19 - 0
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
+

+ 0 - 8
package/bwm/Config.in

@@ -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.

+ 0 - 6
package/bzip2/Config.in

@@ -1,6 +0,0 @@
-config ADK_PACKAGE_BZIP2
-	prompt "bzip2.............................. bzip2 compression utility"
-	tristate
-	default n
-	help
- 	  http://www.bzip.org

+ 0 - 17
package/ca-certificates/Config.in

@@ -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
-

+ 9 - 6
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/

+ 0 - 10
package/cairo/Config.in

@@ -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

+ 2 - 1
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/
 

+ 0 - 16
package/cbtt/Config.in

@@ -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

+ 4 - 0
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

+ 0 - 20
package/cfgfs/Config.in

@@ -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)

+ 6 - 1
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:

+ 0 - 13
package/cfinstall/Config.in

@@ -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.

+ 3 - 0
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

+ 0 - 10
package/cgilib/Config.in

@@ -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/

+ 0 - 15
package/chillispot/Config.in

@@ -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/

+ 0 - 36
package/collectd/Config.in

@@ -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

+ 9 - 3
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

+ 0 - 11
package/comgt/Config.in

@@ -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/

+ 0 - 6
package/compositeproto/Config.in

@@ -1,6 +0,0 @@
-config ADK_PACKAGE_XPROTO
-	prompt "xproto................................. X protocol library"
-	tristate
-	default n
-	help
-         http://www.x.org

+ 0 - 6
package/cpio/Config.in

@@ -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/

+ 0 - 6
package/cryptinit/Config.in

@@ -1,6 +0,0 @@
-config ADK_PACKAGE_CRYPTINIT
-	prompt "cryptinit............................ crypt initramfs application"
-	tristate
-	default n
-	help
-	  For encrypted root filesystems and fast bootup.

+ 1 - 0
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
 

+ 0 - 16
package/cryptsetup/Config.in

@@ -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).

+ 2 - 1
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/
 

+ 0 - 29
package/ctorrent/Config.in

@@ -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

+ 2 - 6
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}))

+ 0 - 10
package/cups/Config.in

@@ -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/

+ 1 - 0
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

+ 0 - 12
package/curl/Config.in

@@ -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/

+ 0 - 20
package/curl/Config.in.lib

@@ -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/
-

+ 10 - 6
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

+ 0 - 10
package/cutter/Config.in

@@ -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/

+ 0 - 26
package/cxxtools/Config.in

@@ -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

+ 2 - 6
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)

+ 0 - 14
package/cyrus-sasl/Config.in

@@ -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/

+ 1 - 0
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

Some files were not shown because too many files changed in this diff