optimize ipkg package management

- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
  set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)

more cleanups needed after allmodconfig

TODO

@@ -1,9 +1,16 @@
+- rename radiusclient-ng -> freeradius-client
+- squid package update
+- check mips -mno-abicalls
+- check ac_cv_func_setpgrp_void=no
+- remove glib1
+- rename glib2, gdbm, lib?
+- update mt-daapd / rename
+- remove $Id$ lines
+- CONFIGURE_FILTER for unusual configure scripts, mplayer f.e.
 - eglibc support
-- glibc 2.10 support
 - rescue initramfs image (more archs, generic kernel config )
   - replace ibm x40
   - usb boot via stick
-- kernel 2.6.29.3
+- kernel 2.6.30
 - bind isc 9.6.1
 - asterisk 1.6
-- gcc 4.4.0

mk/buildhlp.mk

@@ -3,7 +3,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-ifneq ($(strip ${MASTER_SITES}),)
+ifneq ($(strip ${PKG_SITES}),)
 ifeq ($(strip ${DISTFILES}),)
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif

mk/fetch.mk

@@ -69,7 +69,7 @@ $(1):
 	fi; \
 	mkdir -p "$$$${fullname%%/$$$$filename}"; \
 	cd "$$$${fullname%%/$$$$filename}"; \
-	for site in $${MASTER_SITES} $${MASTER_SITE_BACKUP}; do \
+	for site in $${PKG_SITES} $${MASTER_SITE_BACKUP}; do \
 		: echo "$${FETCH_CMD} $$$$site$$$$filename"; \
 		rm -f "$$$$filename"; \
 		if $${FETCH_CMD} $$$$site$$$$filename; then \

mk/linux.mk

@@ -7,5 +7,5 @@ PKG_NAME:=	linux
 PKG_VERSION:=	$(KERNEL_VERSION)
 PKG_RELEASE:=	$(KERNEL_RELEASE)
 PKG_MD5SUM=	$(KERNEL_MD5SUM)
+PKG_SITES=  	${MASTER_SITE_KERNEL:=kernel/v2.6/}
 DISTFILES=	$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-MASTER_SITES=  	${MASTER_SITE_KERNEL:=kernel/v2.6/}

mk/package.mk

@@ -106,9 +106,11 @@ build-all-ipkgs: ${_IPKGS_COOKIE}
 # there are some parameters to the PKG_template function
 # 1.) Config.in identifier ADK_PACKAGE_$(1)
 # 2.) name of the package, for single package mostly $(PKG_NAME)
-# 3.) package version (upstream version) and package revision (adk revision),
-#     always $(PKG_VERSION)-$(PKG_REVISION)
+# 3.) package version (upstream version) and package release (adk version),
+#     always $(PKG_VERSION)-$(PKG_RELEASE)
 # 4.) dependencies to other packages, $(PKG_DEPENDS)
+# 5.) description for the package, $(PKG_DESCR)
+# 6.) section of the package, $(PKG_SECTION)  
 #    
 # should be package format independent and modular in the future
 define PKG_template
@@ -127,8 +129,11 @@ endif
 IDEPEND_$(1):=	$$(strip $(4))
 
 _ALL_CONTROLS+=	$$(IDIR_$(1))/CONTROL/control
-ICONTROL_$(1)?=	ipkg/$(2).control
+ICONTROL_$(1)?=	$(WRKDIR)/.$(2).control
 $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
+	@echo "Package: $(2)" > $(WRKDIR)/.$(2).control
+	@echo "Section: $(6)" >> $(WRKDIR)/.$(2).control
+	@echo "Description: $(5)" >> $(WRKDIR)/.$(2).control
 	${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) ${CPU_ARCH}
 	@adeps='$$(strip $${IDEPEND_$(1)})'; if [[ -n $$$$adeps ]]; then \
 		comma=; \
@@ -146,7 +151,7 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
 		echo "Depends: $$$$deps" >>$${IDIR_$(1)}/CONTROL/control; \
 	fi
 	@for file in conffiles preinst postinst prerm postrm; do \
-		[ ! -f ./ipkg/$(2).$$$$file ] || cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
+		[ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
 	done
 # FIXME: special case for device dependent base-files package
 ifneq ($(strip $${ICONTROL_ADDON_$(1)}),)
@@ -157,6 +162,13 @@ $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $${_FAKE_COOKIE}
 ifeq ($(ADK_DEBUG),)
 	$${RSTRIP} $${IDIR_$(1)} $(MAKE_TRACE)
 endif
+	@for file in $$$$(ls ./files/*.init 2>/dev/null); do \
+		fname=$$$$(echo $$$$file| sed -e "s#.*/##" -e "s#.init##"); \
+		check=$$$$(grep PKG $$$$file|cut -d ' '  -f 2); \
+		if [ "$$$$check" == $(2) ];then \
+			mkdir -p $$(IDIR_$(1))/etc/init.d && cp $$$$file $$(IDIR_$(1))/etc/init.d/$$$$fname; \
+		fi; \
+	done
 	@cd $${IDIR_$(1)}; for script in etc/init.d/*; do \
 		[[ -e $$$$script ]] || continue; \
 		chmod 0755 "$$$$script"; \

mk/pkg-bottom.mk

@@ -116,7 +116,7 @@ else
 	@exit 1
 endif
 ifneq ($(filter confprog,${INSTALL_STYLE}),)
-	for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \
+	@for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \
 		[[ -e $$a ]] || continue; \
 		$(SED) "s,^prefix=.*,prefix=${STAGING_DIR}/usr," $$a; \
 	done

package/6tunnel/Makefile

@@ -9,12 +9,15 @@ PKG_NAME:=		6tunnel
 PKG_VERSION:=		0.11rc1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		b325fa9d238e32195fbb3fc3646b0d28
-MASTER_SITES:=		http://toxygen.net/6tunnel/
+PKG_DESCR:=		IPv4/IPv6 tunnel proxy
+PKG_SECTION:=		net
+PKG_SITES:=		http://toxygen.net/6tunnel/
+
 WRKDIST=		${WRKDIR}/$(PKG_NAME)-0.11
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,6TUNNEL,6tunnel,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,6TUNNEL,6tunnel,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		ac_cv_path_STRIP=$(STRIP) \

package/6tunnel/ipkg/6tunnel.control

@@ -1,4 +0,0 @@
-Package: 6tunnel
-Priority: optional
-Section: net
-Description: An IPv4/IPv6 tunnel proxy

package/Config.in

@@ -206,7 +206,8 @@ menu "IPv6"
 depends ADK_IPV6
 source "package/6tunnel/Config.in"
 source "package/aiccu/Config.in"
-source "package/dhcp6/Config.in"
+# timeb.h / dn_comp issues
+#source "package/dhcpv6/Config.in"
 source "package/miredo/Config.in"
 source "package/mrd6/Config.in"
 source "package/ndisc/Config.in"
@@ -231,7 +232,6 @@ source "package/ether-wake/Config.in"
 source "package/iproute2/Config.in"
 source "package/ipset/Config.in"
 source "package/iptables/Config.in"
-source "package/iptables-snmp/Config.in"
 source "package/knock/Config.in"
 source "package/linux-atm/Config.in"
 source "package/macchanger/Config.in"
@@ -339,7 +339,6 @@ source "package/chillispot/Config.in"
 source "package/hostapd/Config.in"
 source "package/iw/Config.in"
 #source "package/kismet/Config.in"
-source "package/nocatsplash/Config.in"
 source "package/olsrd/Config.in"
 source "package/snort-wireless/Config.in"
 source "package/wifidog/Config.in"

package/Depends.mk

@@ -36,7 +36,7 @@ endif
 davfs2-compile: libiconv-compile neon-compile
 dbus-compile: expat-compile
 deco-compile: ncurses-compile
-dhcp6-compile: ncurses-compile
+dhcpv6-compile: libnl-compile ncurses-compile
 digitemp-compile: libusb-compile
 dsniff-compile: libnids-compile openssl-compile libgdbm-compile
 elinks-compile: openssl-compile
@@ -76,7 +76,6 @@ ifeq (${ADK_COMPILE_IPERF_WITH_UCLIBCXX},y)
 iperf-compile: uclibc++-compile
 endif
 ipsec-tools-compile: openssl-compile
-iptables-snmp-compile: net-snmp-compile
 iptraf-compile: ncurses-compile
 irssi-compile: glib2-compile ncurses-compile
 iw-compile: libnl-compile
@@ -151,7 +150,6 @@ ifeq (${ADK_COMPILE_NMAP_WITH_UCLIBCXX},y)
 nmap-compile: uclibc++-compile
 endif
 nmap-compile: pcre-compile libpcap-compile
-nocatsplash-compile: glib-compile
 obexftp-compile: openobex-compile libiconv-compile
 opencdk-compile: libgcrypt-compile libgpg-error-compile zlib-compile
 openct-compile: libtool-compile libusb-compile

package/Makefile

@@ -66,7 +66,7 @@ package-$(ADK_PACKAGE_DECO) += deco
 package-$(ADK_PACKAGE_DEVICE_MAPPER) += device-mapper
 package-$(ADK_COMPILE_DHCP) += dhcp
 package-$(ADK_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
-package-$(ADK_PACKAGE_DHCP6) += dhcp6
+package-$(ADK_COMPILE_DHCPV6) += dhcpv6
 package-$(ADK_PACKAGE_DIGITEMP) += digitemp
 package-$(ADK_PACKAGE_DNSMASQ) += dnsmasq
 package-$(ADK_PACKAGE_DOSFSTOOLS) += dosfstools
@@ -140,7 +140,6 @@ 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
@@ -259,7 +258,6 @@ 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_NOCATSPLASH) += nocatsplash
 package-$(ADK_PACKAGE_NTPCLIENT) += ntpclient
 package-$(ADK_PACKAGE_OBEXFTP) += obexftp
 package-$(ADK_PACKAGE_OLSRD) += olsrd
@@ -346,7 +344,6 @@ package-$(ADK_PACKAGE_SSLTUNNEL) += ssltunnel
 package-$(ADK_PACKAGE_SSMTP) += ssmtp
 package-$(ADK_PACKAGE_STRACE) += strace
 package-$(ADK_PACKAGE_STRESS) += stress
-package-$(ADK_PACKAGE_STRONGSWAN) += strongswan
 package-$(ADK_PACKAGE_SUBVERSION) += subversion
 package-$(ADK_PACKAGE_SWCONFIG) += swconfig
 package-$(ADK_PACKAGE_SYSLOG_NG) += syslog-ng
@@ -412,7 +409,7 @@ package-$(ADK_PACKAGE_ZSH) += zsh
 # kernel addon packages
 package-$(ADK_PACKAGE_KMOD_EM28XX) += em28xx
 package-$(ADK_PACKAGE_KMOD_MAC80211) += mac80211
-package-$(ADK_PACKAGE_KMOD_FS_NTFS_3G) += ntfs-3g
+package-$(ADK_PACKAGE_NTFS_3G) += ntfs-3g
 
 DOWNLOAD:=$(patsubst %,%-download,$(package-y) $(package-m))
 COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))

package/aiccu/Makefile

@@ -9,15 +9,18 @@ PKG_NAME:=		aiccu
 PKG_VERSION:=		20070115
 PKG_RELEASE:=		7
 PKG_MD5SUM:=		c9bcc83644ed788e22a7c3f3d4021350
+PKG_DESCR:=		SixXS Automatic IPv6 Connectivity Client Utility
+PKG_SECTION:=		net
+PKG_DEPENDS:=		kmod-ipv6 libpthread
+PKG_URL:=		http://www.sixxs.net
+PKG_SITES:=		http://www.sixxs.net/archive/sixxs/aiccu/unix/
 
-MASTER_SITES:=		http://www.sixxs.net/archive/sixxs/aiccu/unix/
 DISTFILES:=		$(PKG_NAME)_$(PKG_VERSION).tar.gz
-
 WRKDIST=		${WRKDIR}/$(PKG_NAME)
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,AICCU,aiccu,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,AICCU,aiccu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TCFLAGS+=	-D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \
 		-D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\"

package/aiccu/files/aiccu.init

@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG aiccu
+#INIT 60
 . /etc/rc.conf
 
 case $1 in

package/aiccu/ipkg/aiccu.control

@@ -1,5 +0,0 @@
-Package: aiccu
-Priority: optional
-Section: net
-Depends: kmod-ipv6, libpthread
-Description: SixXS Automatic IPv6 Connectivity Client Utility

package/aircrack-ng/Makefile

@@ -9,11 +9,15 @@ PKG_NAME:=		aircrack-ng
 PKG_VERSION:=		1.0-rc3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		37884de939af82eab60d3e7d165b40ad
-MASTER_SITES:=		http://download.aircrack-ng.org/
+PKG_DESCR:=		set of tools for auditing wireless networks
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libpthread libopenssl libpcap
+PKG_URL:=		http://www.aircrack-ng.org
+PKG_SITES:=		http://download.aircrack-ng.org/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,AIRCRACK_NG,aircrack-ng,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,AIRCRACK_NG,aircrack-ng,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE=	auto
 INSTALL_STYLE=	auto

package/aircrack-ng/ipkg/aircrack-ng.control

@@ -1,5 +0,0 @@
-Package: aircrack-ng
-Priority: optional
-Section: net
-Depends: libpthread, libopenssl, libpcap
-Description: A set of tools for auditing wireless networks

package/alsa-lib/Makefile

@@ -9,13 +9,17 @@ PKG_NAME:=		alsa-lib
 PKG_VERSION:=		1.0.19
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		73db3666c211e5fb023bb77450cf430d
-MASTER_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/lib/ \
+PKG_DESCR:=		ALSA sound library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.alsa-project.org
+PKG_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/lib/ \
 			ftp://ftp.alsa-project.org/pub/lib/
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-python
@@ -23,8 +27,7 @@ BUILD_STYLE=		auto
 INSTALL_STYLE=		auto confprog
 
 post-install:
-	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib
-	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/share/alsa
+	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa
 	${CP} ${WRKINST}/usr/lib/libasound.so.* ${IDIR_ALSA_LIB}/usr/lib/
 	${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa/
 

package/alsa-lib/ipkg/alsa-lib.control

@@ -1,4 +0,0 @@
-Package: alsa-lib
-Priority: optional
-Section: libs
-Description: ALSA sound library

package/alsa-utils/Makefile

@@ -9,13 +9,17 @@ PKG_NAME:=		alsa-utils
 PKG_VERSION:=		1.0.19
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		5ff0379c707c1a29083233edc9ab4e06
-MASTER_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \
+PKG_DESCR:=		ALSA mixer utility
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.alsa-project.org
+PKG_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \
 			ftp://ftp.alsa-project.org/pub/utils/
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-alsamixer
@@ -23,9 +27,7 @@ BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/etc/init.d
-	${INSTALL_BIN} ./files/amixer.init ${IDIR_ALSA_UTILS}/etc/init.d/amixer
-	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin
+	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin 
 	${CP} ${WRKINST}/usr/bin/amixer ${IDIR_ALSA_UTILS}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/alsa-utils/files/amixer.init

@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG alsa-utils
+#INIT 60
 . /etc/rc.conf
 
 case $1 in

package/alsa-utils/ipkg/alsa-utils.control

@@ -1,4 +0,0 @@
-Package: alsa-utils
-Priority: optional
-Section: libs
-Description: ALSA utilities

package/apr-util/Makefile

@@ -9,11 +9,15 @@ PKG_NAME:=              apr-util
 PKG_VERSION:=           0.9.15
 PKG_RELEASE:=           1
 PKG_MD5SUM:=            dc772ae295f49ddb8ee8e69a9716c53b
-MASTER_SITES:=		http://apache.mirror.clusters.cc/apr/
+PKG_DESCR:=		Apache Portable Runtime utility library
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libexpat apr
+PKG_URL:=		http://apr.apache.org
+PKG_SITES:=		http://apache.mirror.clusters.cc/apr/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,APR_UTIL,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,APR_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=       gnu
 CONFIGURE_ARGS+=	--without-berkeley-db

package/apr-util/ipkg/apr-util.control

@@ -1,5 +0,0 @@
-Package: apr-util
-Priority: optional
-Section: lib
-Description: Apache Portable Runtime
-Depends: libexpat, apr

package/apr/Makefile

@@ -9,11 +9,18 @@ PKG_NAME:=		apr
 PKG_VERSION:=		0.9.17
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		ca1e22d98081a03a33c2a0b8684eb192
-MASTER_SITES:=		http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/
+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}/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE}))
+ifeq (${ADK_PACKAGE_APR_THREADING},y)
+PKG_DEPENDS:=		libpthread
+endif
+
+$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=no
@@ -35,20 +42,13 @@ INSTALL_STYLE:=		auto
 post-install:
 	${INSTALL_DIR} ${IDIR_APR}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libapr-0.so* ${IDIR_APR}/usr/lib/
-
 	${INSTALL_DIR} ${STAGING_DIR}/usr/share/build
 	${CP} ${WRKINST}/usr/share/build/* ${STAGING_DIR}/usr/share/build/
-
 	# we need to patch paths to get apr-util compiling
-	printf '%s\n%s\n%s\n%s\n%s\nwq\n' \
-	    '/^installbuilddir="/s##&${STAGING_DIR}/#' \
-	    '/^libdir="/s##&${STAGING_DIR}/#' \
-	    '/^datadir="/s##&${STAGING_DIR}/#' \
-	    '/^includedir="/s##&${STAGING_DIR}/#' \
-	    '/^bindir="/s##&${STAGING_DIR}/#' | \
-	    ed -s ${WRKINST}/usr/bin/apr-config
-ifeq (${ADK_PACKAGE_APR_THREADING},y)
-	echo 'Depends: libpthread' >> ${IDIR_APR}/CONTROL/control
-endif
+	$(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
+	$(SED) "s,\(^libdir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
+	$(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
+	$(SED) "s,\(^includedir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
+	$(SED) "s,\(^bindir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/apr/ipkg/apr.control

@@ -1,4 +0,0 @@
-Package: apr
-Priority: optional
-Section: lib
-Description: Apache Portable Runtime

package/arpd/Makefile

@@ -9,12 +9,17 @@ PKG_NAME:=		arpd
 PKG_VERSION:=		0.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		e2911fa9de1b92ef50deda1489ae944d
-MASTER_SITES:=		http://niels.xtdnet.nl/honeyd/
+PKG_DESCR:=		Generates ARP responses for IP address ranges
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libpcap libdnet libevent
+PKG_URL:=		http://niels.xtdnet.nl/honeyd/
+PKG_SITES:=		http://niels.xtdnet.nl/honeyd/
+
 WRKDIST=		${WRKDIR}/${PKG_NAME}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ARPD,arpd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,ARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-libdnet=${STAGING_DIR}/usr \

package/arpd/ipkg/arpd.control

@@ -1,5 +0,0 @@
-Package: arpd
-Priority: optional
-Section: net
-Depends: libpcap, libdnet, libevent
-Description: Generates ARP responses for IP address ranges

package/arpwatch/Makefile

@@ -9,11 +9,15 @@ PKG_NAME:=		arpwatch
 PKG_VERSION:=		2.1a15
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		cebfeb99c4a7c2a6cee2564770415fe7
-MASTER_SITES:=		ftp://ftp.ee.lbl.gov/
+PKG_DESCR:=		Ethernet monitor program for keeping track of ethernet/ip address pairings
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libpcap
+PKG_URL:=		http://www-nrg.ee.lbl.gov
+PKG_SITES:=		ftp://ftp.ee.lbl.gov/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,ARPWATCH,arpwatch,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ARPWATCH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 BUILD_STYLE=		auto
@@ -23,8 +27,7 @@ MAKE_FLAGS+=		ARPDIR=/etc/arpwatch \
 			LIBS="-L$(STAGING_DIR)/usr/lib -lpcap"
 
 do-install:
-	$(INSTALL_DIR) $(IDIR_ARPWATCH)/usr/sbin
-	$(INSTALL_DIR) $(IDIR_ARPWATCH)/etc/arpwatch
+	$(INSTALL_DIR) $(IDIR_ARPWATCH)/usr/sbin $(IDIR_ARPWATCH)/etc/arpwatch
 	$(INSTALL_BIN) $(WRKBUILD)/arpwatch $(IDIR_ARPWATCH)/usr/sbin/
 	$(INSTALL_BIN) $(WRKBUILD)/arpsnmp $(IDIR_ARPWATCH)/usr/sbin/
 	$(INSTALL_DATA) $(WRKBUILD)/arp.dat $(IDIR_ARPWATCH)/etc/arpwatch/

package/arpwatch/ipkg/arpwatch.control

@@ -1,5 +0,0 @@
-Package: arpwatch
-Priority: optional
-Section: net
-Description: Ethernet monitor program for keeping track of ethernet/ip address pairings
-Depends: libpcap

package/asterisk/Makefile

@@ -9,21 +9,25 @@ PKG_NAME:=		asterisk
 PKG_VERSION:=		1.4.24.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		2b74744350f420b3a94d5323c489426f
-MASTER_SITES:=		http://downloads.digium.com/pub/telephony/asterisk/releases/
+PKG_DESCR:=		Open Source PBX
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libncurses libpthread
+PKG_URL:=		http://www.asterisk.org
+PKG_SITES:=		http://downloads.digium.com/pub/telephony/asterisk/releases/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,ASTERISK,asterisk,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(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_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}))
 
 SUB_INSTALLS-y:=
 SUB_INSTALLS-m:=
@@ -166,8 +170,6 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	)
 	${INSTALL_DATA} ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/
 	$(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(WRKINST)/etc/asterisk/musiconhold.conf
-	${INSTALL_DIR} $(IDIR_ASTERISK)/etc/init.d
-	${INSTALL_BIN}  ./files/asterisk.init $(IDIR_ASTERISK)/etc/init.d/asterisk
 
 asterisk-pgsql-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/etc/asterisk
@@ -187,7 +189,7 @@ asterisk-voicemail-install:
 	${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf
 	${CP} $(WRKBUILD)/apps/*voicemail.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
 	${INSTALL_BIN} $(WRKBUILD)/res/res_adsi.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
-	install -d -m0755 $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds
+	${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds
 	$(CP) $(WRKBUILD)/sounds/vm-*.gsm $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/
 
 asterisk-chan-mgcp-install:
@@ -211,7 +213,7 @@ asterisk-chan-iax2-install:
 
 asterisk-codec-speex-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules
-	install -m0755 $(WRKBUILD)/codecs/codec_speex.so $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
+	${INSTALL_BIN} $(WRKBUILD)/codecs/codec_speex.so $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
 
 asterisk-codec-gsm-install:
 	${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/

package/asterisk/files/asterisk.init

@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG asterisk
+#INIT 60
 . /etc/rc.conf
 
 case $1 in

package/asterisk/ipkg/asterisk-chan-bluetooth.control

@@ -1,5 +0,0 @@
-Package: asterisk-chan-bluetooth
-Priority: optional
-Section: net
-Description: Bluetooth HandsFreeProfile support for Asterisk
-Depends: asterisk, bluez-libs

package/asterisk/ipkg/asterisk-chan-h323.control

@@ -1,5 +0,0 @@
-Package: asterisk-chan-h323
-Priority: optional
-Section: net
-Description: H.323 support for Asterisk
-Depends: asterisk, libpthread, uclibc++

package/asterisk/ipkg/asterisk-chan-iax2.control

@@ -1,5 +0,0 @@
-Package: asterisk-chan-iax2
-Priority: optional
-Section: net
-Description: Asterisk Channel for the Inter Asterisk Protocol
-Depends: asterisk

package/asterisk/ipkg/asterisk-chan-mgcp.control

@@ -1,5 +0,0 @@
-Package: asterisk-chan-mgcp
-Priority: optional
-Section: net
-Description: a Media Gateway Control Protocol implementation for Asterisk
-Depends: asterisk

package/asterisk/ipkg/asterisk-chan-misdn.control

@@ -1,5 +0,0 @@
-Package: asterisk-chan-misdn
-Priority: optional
-Section: net
-Depends: asterisk
-Description: Asterisk Channel for the mISDN ISDN systems

package/asterisk/ipkg/asterisk-chan-skinny.control

@@ -1,5 +0,0 @@
-Package: asterisk-chan-skinny
-Priority: optional
-Section: net
-Description: a Skinny Client Control Protocol implementation for Asterisk
-Depends: asterisk

package/asterisk/ipkg/asterisk-codec-gsm.control

@@ -1,5 +0,0 @@
-Package: asterisk-codec-gsm
-Priority: optional
-Section: net
-Description: a GSM Codec Translator for Asterisk
-Depends: asterisk

package/asterisk/ipkg/asterisk-codec-speex.control

@@ -1,5 +0,0 @@
-Package: asterisk-codec-speex
-Priority: optional
-Section: net
-Description: a Speex/PCM16 Codec Translator for Asterisk
-Depends: asterisk, libspeex

package/asterisk/ipkg/asterisk-meetme.control

@@ -1,5 +0,0 @@
-Package: asterisk-meetme
-Priority: optional
-Section: net
-Description: MeetMe support files for asterisk
-Depends: asterisk

package/asterisk/ipkg/asterisk-pbx-dundi.control

@@ -1,5 +0,0 @@
-Package: asterisk-pbx-dundi
-Priority: optional
-Section: net
-Description: Distributed Universal Number Discovery (DUNDi) support for Asterisk
-Depends: asterisk

package/asterisk/ipkg/asterisk-pgsql.control

@@ -1,5 +0,0 @@
-Package: asterisk-pgsql
-Priority: optional
-Section: net
-Description: PostgreSQL modules for Asterisk
-Depends: asterisk, libpq, zlib

package/asterisk/ipkg/asterisk-res-agi.control

@@ -1,5 +0,0 @@
-Package: asterisk-res-agi
-Priority: optional
-Section: net
-Description: Asterisk Gateway Interface module
-Depends: asterisk

package/asterisk/ipkg/asterisk-sounds.control

@@ -1,5 +0,0 @@
-Package: asterisk-sounds
-Priority: optional
-Section: net
-Description: a sounds collection for Asterisk
-Depends: asterisk

package/asterisk/ipkg/asterisk-sqlite.control

@@ -1,5 +0,0 @@
-Package: asterisk-sqlite
-Priority: optional
-Section: net
-Description: SQLite modules for Asterisk
-Depends: asterisk, libsqlite

package/asterisk/ipkg/asterisk-voicemail.control

@@ -1,5 +0,0 @@
-Package: asterisk-voicemail
-Priority: optional
-Section: net
-Description: VoiceMail related modules for Asterisk
-Depends: asterisk

package/asterisk/ipkg/asterisk.control

@@ -1,5 +0,0 @@
-Package: asterisk
-Priority: optional
-Section: net
-Depends: libncurses, libpthread
-Description: An open source PBX

package/atftp/Makefile

@@ -9,12 +9,17 @@ PKG_NAME:=		atftp
 PKG_VERSION:=		0.7
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		3b27365772d918050b2251d98a9c7c82
-MASTER_SITES:=		ftp://ftp.mamalinux.com/pub/atftp/
+PKG_DESCR:=		TFTP client
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libreadline libncurses
+PKG_URL:=		http://freshmeat.net/projects/atftp
+PKG_SITES:=		ftp://ftp.mamalinux.com/pub/atftp/
+PKG_DESCR_1:=		TFTP server
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,ATFTP,atftp,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,ATFTPD,atftpd,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,ATFTP,atftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 
 MAKE_FLAGS+=		CFLAGS="${TCFLAGS} -Wall -D_REENTRANT -fno-inline"
 CONFIGURE_STYLE=	gnu

package/atftp/ipkg/atftp.control

@@ -1,5 +0,0 @@
-Package: atftp
-Priority: optional
-Section: net
-Description: tftp client
-Depends: libreadline, libncurses

package/atftp/ipkg/atftpd.control

@@ -1,5 +0,0 @@
-Package: atftpd
-Priority: optional
-Section: net
-Description: tftp server
-Depends: libreadline, libpcre

package/autossh/Makefile

@@ -6,26 +6,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		autossh
-PKG_VERSION:=		1.3
+PKG_VERSION:=		1.4b
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0e7ec62eeca5d1b197f3ef2d0f0d417f
-MASTER_SITES:=		http://www.harding.motd.ca/autossh/
+PKG_MD5SUM:=		8f9aa006f6f69e912d3c2f504622d6f7
+PKG_DESCR:=		Automatically restart SSH sessions and tunnels
+PKG_SECTION:=		net
+PKG_DEPENDS:=		openssh-client
+PKG_URL:=		http://www.harding.motd.ca/autossh
+PKG_SITES:=		http://www.harding.motd.ca/autossh/
+
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tgz
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,AUTOSSH,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE)))
-
-TCFLAGS+=		-Wall -DSSH_PATH=\\\"/usr/bin/ssh\\\"\ \
-			-DVER=\\\"$(PKG_VERSION)\\\"\"
-MAKE_FLAGS+=		CC="$(TARGET_CC)" BINDIR=/usr/bin MANDIR=/usr/man
-BUILD_STYLE=		auto
+$(eval $(call PKG_template,AUTOSSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-do-configure:
-	cp $(WRKBUILD)/Makefile.linux $(WRKBUILD)/Makefile
+CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		auto
 
 do-install:
-	echo $(CC)
 	$(INSTALL_DIR) $(IDIR_AUTOSSH)/usr/bin
 	$(INSTALL_BIN) $(WRKBUILD)/autossh $(IDIR_AUTOSSH)/usr/bin/
 

package/autossh/ipkg/autossh.control

@@ -1,5 +0,0 @@
-Package: autossh
-Priority: optional
-Section: net
-Depends: openssh-client
-Description: Autossh client

package/avahi/Makefile

@@ -6,22 +6,26 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		avahi
-PKG_VERSION:=		0.6.16
-PKG_RELEASE:=		6
-PKG_MD5SUM:=		3cbc460bbd55bae35f7b57443c063640
-MASTER_SITES:=		http://avahi.org/download/
+PKG_VERSION:=		0.6.25
+PKG_RELEASE:=		1
+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
+PKG_SECTION_2:=		libs
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
 
-TCFLAGS+=		-DNDEBUG
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+=		ac_cv_func_malloc_0_nonnull=yes \
-			ac_cv_func_realloc_0_nonnull=yes \
-			ac_cv_func_memcmp_working=yes
 CONFIGURE_ARGS+=	--disable-glib \
 			--disable-qt3 \
 			--disable-qt4 \
@@ -50,8 +54,6 @@ CONFIGURE_ARGS+=	--disable-glib \
 			--with-avahi-group=avahi
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
-#XXX maybe unneeded?
-#XAKE_FLAGS+=		PKG_CONFIG_PATH=${STAGING_DIR}/usr/lib/pkgconfig
 
 post-install:
 	# avahi daemon
@@ -62,9 +64,6 @@ post-install:
 		${IDIR_AVAHI_DAEMON}/etc/avahi/services/http.service
 	${INSTALL_DATA} ./files/service-ssh \
 		${IDIR_AVAHI_DAEMON}/etc/avahi/services/ssh.service
-	${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/etc/init.d
-	${INSTALL_BIN} ./files/avahi-daemon.init \
-		${IDIR_AVAHI_DAEMON}/etc/init.d/avahi-daemon
 	${INSTALL_DIR} ${IDIR_AVAHI_DAEMON}/usr/sbin
 	${CP} ${WRKINST}/usr/sbin/avahi-daemon ${IDIR_AVAHI_DAEMON}/usr/sbin/
 	# avahi dnsconfd

package/avahi/files/avahi-daemon.init

@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 75
+#PKG avahi-daemon
+#INIT 75
 . /etc/rc.conf
 
 case $1 in

package/avahi/ipkg/avahi-daemon.control

@@ -1,5 +0,0 @@
-Package: avahi-daemon
-Priority: optional
-Section: net
-Depends: libavahi, libdaemon, libexpat
-Description: an mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (daemon)

package/avahi/ipkg/avahi-dnsconfd.control

@@ -1,5 +0,0 @@
-Package: avahi-dnsconfd
-Priority: optional
-Section: net
-Depends: libavahi, libdaemon, avahi-daemon
-Description: an Unicast DNS server from mDNS/DNS-SD configuration daemon

package/avahi/ipkg/libavahi.control

@@ -1,4 +0,0 @@
-Package: libavahi
-Priority: optional
-Section: libs
-Description: an DNS-SD over mDNS (aka RendezVous/Bonjour/ZeroConf) implementation (library)

package/axtls/Makefile

@@ -6,17 +6,25 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		axtls
-PKG_VERSION:=		1.1.0
-PKG_RELEASE:=		8
-PKG_MD5SUM:=		4a834edc93f46fdca4f9c93ec665376e
+PKG_VERSION:=		1.2.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		03471b5a5874e2ce86025f24b3fa0958
+PKG_DESCR:=		small embedded webserver
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libaxtls
+PKG_URL:=		http://axtls.sourceforge.net
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=axtls/}
+
+PKG_DESCR_1:=		small tls library
+PKG_SECTION_1:=		libs
+
 DISTFILES:=		axTLS-${PKG_VERSION}.tar.gz
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=axtls/}
 WRKDIST=		${WRKDIR}/axTLS
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,AXHTTPD,axhttpd,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,AXHTTPD,axhttpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1}))
 
 BUILD_STYLE=		auto
 XAKE_FLAGS+=		STRIP='' \
@@ -33,11 +41,8 @@ do-install:
 	${INSTALL_DIR} ${IDIR_LIBAXTLS}/usr/lib
 	$(CP) $(WRKBUILD)/_stage/libaxtls.so.* $(IDIR_LIBAXTLS)/usr/lib/
 	# awhttpd server
-	${INSTALL_DIR} ${IDIR_AXHTTPD}/etc/init.d
 	${INSTALL_DIR} ${IDIR_AXHTTPD}/www
 	${INSTALL_DIR} ${IDIR_AXHTTPD}/usr/sbin
 	${INSTALL_BIN} $(WRKBUILD)/_stage/axhttpd $(IDIR_AXHTTPD)/usr/sbin/
-	$(INSTALL_BIN) ./files/axhttpd.init \
-	    $(IDIR_AXHTTPD)/etc/init.d/axhttpd
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/axtls/files/axhttpd.init

@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 80
+#PKG axhttpd
+#INIT 80
 . /etc/rc.conf
 
 case $1 in

package/axtls/files/config

@@ -4,7 +4,6 @@
 HAVE_DOT_CONFIG=y
 CONFIG_PLATFORM_LINUX=y
 # CONFIG_PLATFORM_CYGWIN is not set
-# CONFIG_PLATFORM_SOLARIS is not set
 # CONFIG_PLATFORM_WIN32 is not set
 
 #
@@ -12,10 +11,9 @@ CONFIG_PLATFORM_LINUX=y
 #
 PREFIX="/usr"
 CONFIG_DEBUG=y
-# CONFIG_VISUAL_STUDIO_6_0 is not set
+# CONFIG_STRIP_UNWANTED_SECTIONS is not set
 # CONFIG_VISUAL_STUDIO_7_0 is not set
 # CONFIG_VISUAL_STUDIO_8_0 is not set
-CONFIG_VISUAL_STUDIO_6_0_BASE=""
 CONFIG_VISUAL_STUDIO_7_0_BASE=""
 CONFIG_VISUAL_STUDIO_8_0_BASE=""
 CONFIG_EXTRA_CFLAGS_OPTIONS=""
@@ -33,15 +31,23 @@ CONFIG_SSL_ENABLE_CLIENT=y
 CONFIG_SSL_PROT_MEDIUM=y
 # CONFIG_SSL_PROT_HIGH is not set
 CONFIG_SSL_USE_DEFAULT_KEY=y
+CONFIG_SSL_PRIVATE_KEY_LOCATION=""
+CONFIG_SSL_PRIVATE_KEY_PASSWORD=""
+CONFIG_SSL_X509_CERT_LOCATION=""
+# CONFIG_SSL_GENERATE_X509_CERT is not set
+CONFIG_SSL_X509_COMMON_NAME=""
+CONFIG_SSL_X509_ORGANIZATION_NAME=""
+CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME=""
 CONFIG_SSL_ENABLE_V23_HANDSHAKE=y
 CONFIG_SSL_HAS_PEM=y
 CONFIG_SSL_USE_PKCS12=y
 CONFIG_SSL_EXPIRY_TIME=24
 CONFIG_X509_MAX_CA_CERTS=4
 CONFIG_SSL_MAX_CERTS=2
-# CONFIG_SSLCTX_MUTEXING is not set
+# CONFIG_SSL_CTX_MUTEXING is not set
 CONFIG_USE_DEV_URANDOM=y
 # CONFIG_WIN32_USE_CRYPTO_LIB is not set
+# CONFIG_OPENSSL_COMPATIBLE is not set
 # CONFIG_PERFORMANCE_TESTING is not set
 # CONFIG_SSL_TEST is not set
 CONFIG_AXHTTPD=y
@@ -50,17 +56,26 @@ CONFIG_AXHTTPD=y
 # Axhttpd Configuration
 #
 # CONFIG_HTTP_STATIC_BUILD is not set
+CONFIG_HTTP_PORT=80
 CONFIG_HTTP_HTTPS_PORT=443
 CONFIG_HTTP_SESSION_CACHE_SIZE=5
 CONFIG_HTTP_WEBROOT="/www"
-CONFIG_HTTP_PORT=80
 CONFIG_HTTP_TIMEOUT=0
+
+#
+# CGI
+#
 CONFIG_HTTP_HAS_CGI=y
-CONFIG_HTTP_CGI_EXTENSION=".cgi"
+CONFIG_HTTP_CGI_EXTENSIONS=".lua,.lp"
+# CONFIG_HTTP_ENABLE_LUA is not set
+CONFIG_HTTP_LUA_PREFIX=""
+CONFIG_HTTP_LUA_CGI_LAUNCHER=""
+# CONFIG_HTTP_BUILD_LUA is not set
 CONFIG_HTTP_DIRECTORIES=y
-# CONFIG_HTTP_PERM_CHECK is not set
+CONFIG_HTTP_HAS_AUTHORIZATION=y
 # CONFIG_HTTP_HAS_IPV6 is not set
-CONFIG_HTTP_ALL_MIME_TYPES=y
+CONFIG_HTTP_ENABLE_DIFFERENT_USER=y
+CONFIG_HTTP_USER="axhttp"
 CONFIG_HTTP_VERBOSE=y
 CONFIG_HTTP_IS_DAEMON=y
 
@@ -76,6 +91,8 @@ CONFIG_JAVA_HOME=""
 # CONFIG_PERL_BINDINGS is not set
 CONFIG_PERL_CORE=""
 CONFIG_PERL_LIB=""
+# CONFIG_LUA_BINDINGS is not set
+CONFIG_LUA_CORE=""
 
 #
 # Samples
@@ -86,6 +103,7 @@ CONFIG_PERL_LIB=""
 # CONFIG_VBNET_SAMPLES is not set
 # CONFIG_JAVA_SAMPLES is not set
 # CONFIG_PERL_SAMPLES is not set
+# CONFIG_LUA_SAMPLES is not set
 
 #
 # BigInt Options

package/axtls/ipkg/axhttpd.control

@@ -1,5 +0,0 @@
-Package: axhttpd
-Priority: optional
-Section: net
-Depends: libaxtls
-Description: small embedded webserver

package/axtls/ipkg/libaxtls.control

@@ -1,5 +0,0 @@
-Package: libaxtls
-Priority: optional
-Section: libs
-Description: an embedded client/server TLSv1 SSL implementation
-Depends:

package/axtls/patches/patch-httpd_main_c

@@ -1,21 +0,0 @@
-$Id$
---- axTLS.orig/httpd/main.c	2007-01-31 22:35:53.000000000 +0100
-+++ axTLS/httpd/main.c	2007-02-10 12:15:20.000000000 +0100
-@@ -98,11 +98,12 @@ int main(int argc, char *argv[]) 
-     WSADATA wsaData;
-     WSAStartup(wVersionRequested,&wsaData);
- #else
--    if (getuid() == 0)  /* change our uid if we are root */
--    {
--        setgid(32767);
--        setuid(32767);
--    }
-+    /* we can't bind to port 80/443 if we are nobody ?! */
-+    //if (getuid() == 0)  /* change our uid if we are root */
-+    //{
-+    //   setgid(32767);
-+    //    setuid(32767);
-+    //}
- 
-     signal(SIGQUIT, die);
-     signal(SIGPIPE, SIG_IGN);

package/base-files/Makefile

@@ -9,6 +9,9 @@ include $(TOPDIR)/mk/rootfs.mk
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		5
+PKG_DESCR:=		basic filesystem structure and scripts
+PKG_SECTION:=		base
+
 WRKDIST=		${WRKDIR}/base-files
 NO_DISTFILES:=		1
 ifeq ($(CPU_ARCH),x86_64)
@@ -22,18 +25,11 @@ ICONTROL_ADDON_BASE_FILES=	"Package: base-files-${PKG_ID}"
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 do-install:
 	$(CP) ./files/* $(IDIR_BASE_FILES)
 	$(CP) $(TOPDIR)/target/$(DEVICE)/files/* $(IDIR_BASE_FILES)
-	typeset -i REV; \
-	if fgrep xml .svn/entries >/dev/null 2>&1; then \
-		let REV="$$(sed -n '/revision=/s/^.*"\([0-9]*\)".*$$/\1/p' \
-		    .svn/entries)"; \
-	else \
-		let REV="$$(head -n 4 .svn/entries | tail -1)"; \
-	fi; ${SED} 's,$$R,'$$REV,g $(IDIR_BASE_FILES)/etc/banner
 	$(SED) 's,@TARGET@,$(DEVICE),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
 	$(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf
 	echo /bin/sh >${IDIR_BASE_FILES}/etc/shells

package/base-files/files/etc/init.d/boot

@@ -1,5 +1,5 @@
 #!/bin/sh
-#FWINIT 10
+#INIT 10
 [[ $1 = autostart ]] || exit 0
 
 . /etc/functions.sh

package/base-files/files/etc/init.d/done

@@ -1,4 +1,4 @@
 #!/bin/sh
-#FWINIT 98
+#INIT 98
 [[ $1 = autostart ]] && sysctl -p >&-
 exit 0

package/base-files/files/etc/init.d/rcK

@@ -4,7 +4,7 @@ busybox reboot -d 60 -f &		# just in case…
 {
 	[[ -f /proc/diag/led/power ]] && echo f >/proc/diag/led/power
 	test -e /etc/rc.shutdown && (/bin/sh /etc/rc.shutdown) 2>&1
-	grep '^#FWINIT ' /etc/init.d/* | \
+	grep '^#INIT ' /etc/init.d/* | \
 	    sort -rnk2 | \
 	    while read line; do
 		shebang=$(sed -n '1s/^#![	 ]*//p' ${line%%:*})

package/base-files/files/etc/init.d/rcS

@@ -1,7 +1,7 @@
 #!/bin/sh
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 {
-	grep '^#FWINIT ' /etc/init.d/* | \
+	grep '^#INIT ' /etc/init.d/* | \
 	    sort -nk2 | \
 	    while read line; do
 		/bin/sh ${line%%:*} autostart 2>&1

package/base-files/ipkg/base-files.control

@@ -1,3 +0,0 @@
-Priority: base
-Section: base
-Description: basic filesystem structure and scripts

package/bash/Makefile

@@ -9,11 +9,14 @@ PKG_NAME:=		bash
 PKG_VERSION:=		4.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a90a1b5a6db4838483f05438e05e8eb9
-MASTER_SITES:=		http://ftp.gnu.org/gnu/bash/
+PKG_DESCR:=		Bourne-Again SHell
+PKG_SECTION:=		shells
+PKG_URL:=		http://www.gnu.org/software/bash
+PKG_SITES:=		http://ftp.gnu.org/gnu/bash/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,BASH,bash,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,BASH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_FLAGS+=		LIBS_FOR_BUILD=''
 CONFIGURE_STYLE=	gnu

package/bash/ipkg/bash.control

@@ -1,4 +0,0 @@
-Package: bash
-Priority: optional
-Section: shells
-Description: bash shell

package/bc/Makefile

@@ -9,12 +9,15 @@ PKG_NAME:=		bc
 PKG_VERSION:=		1.06
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d44b5dddebd8a7a7309aea6c36fda117
-MASTER_SITES:=		http://ftp.gnu.org/pub/gnu/bc/
+PKG_DESCR:=		An arbitrary precision calculator language
+PKG_SECTION:=		util
+PKG_URL:=		http://www.gnu.org/software/bc
+PKG_SITES:=		http://ftp.gnu.org/pub/gnu/bc/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 BUILD_STYLE=		auto

package/bc/ipkg/bc.control

@@ -1,4 +0,0 @@
-Package: bc
-Priority: optional
-Section: util
-Description: An arbitrary precision calculator language

package/bc/ipkg/dc.control

@@ -1,4 +0,0 @@
-Package: dc
-Priority: optional
-Section: util
-Description: An arbitrary precision calculator

package/bigreqsproto/Makefile

@@ -9,7 +9,7 @@ PKG_NAME:=		bigreqsproto
 PKG_VERSION:=		1.0.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d43f7faa2aac2f0206ea19f031494af1
-MASTER_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 

package/bigreqsproto/ipkg/bigreqsproto.control

@@ -1,4 +0,0 @@
-Package: bigreqsproto
-Priority: optional
-Section: x11
-Description: Xproto headers

package/bind/Config.in

@@ -8,21 +8,6 @@ config ADK_DUMMY_BIND
 	tristate
 	default n
 
-config ADK_PACKAGE_BIND_TOOLS
-	prompt "bind-tools........................ Bind administration tools"
-	tristate
-	default n
-	depends ADK_DUMMY_BIND
-	select ADK_COMPILE_BIND
-	select ADK_PACKAGE_LIBBIND
-	help
-	  dig, host,  nsupdate, dnssec-keygen, dnssec-signzone, named-checkconf,
-	  named-checkzone, rndc, rndc-confgen
-
-	  http://www.isc.org/sw/bind/
-
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_RNDC
 	prompt "bind-rndc......................... Bind administration tools (rndc & rndc-confgen only)"
 	tristate
@@ -32,11 +17,8 @@ config ADK_PACKAGE_BIND_RNDC
 	select ADK_PACKAGE_LIBBIND
 	help
 	  rndc, rndc-confgen
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_CHECK
 	prompt "bind-check........................ Bind administration tools (named-checkconf & named-checkzone only)"
 	tristate
@@ -46,11 +28,8 @@ config ADK_PACKAGE_BIND_CHECK
 	select ADK_PACKAGE_LIBBIND
 	help
 	  named-checkconf, named-checkzone
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_DNSSEC
 	prompt "bind-dnssec....................... Bind administration tools (dnssec-keygen & dnssec-signzone only)"
 	tristate
@@ -60,11 +39,8 @@ config ADK_PACKAGE_BIND_DNSSEC
 	select ADK_PACKAGE_LIBBIND
 	help
 	  dnssec-keygen, dnssec-signzone
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_HOST
 	prompt "bind-host......................... A simple DNS client"
 	tristate
@@ -73,11 +49,9 @@ config ADK_PACKAGE_BIND_HOST
 	select ADK_COMPILE_BIND
 	select ADK_PACKAGE_LIBBIND
 	help
-	  host
-
+	  host utility.
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
 
 config ADK_PACKAGE_BIND_DIG
 	prompt "bind-dig.......................... A DNS client"
@@ -87,12 +61,9 @@ config ADK_PACKAGE_BIND_DIG
 	select ADK_COMPILE_BIND
 	select ADK_PACKAGE_LIBBIND
 	help
-	  dig
-
+	  dig utility.
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 
 config ADK_PACKAGE_BIND_CLIENT
 	prompt "bind-client....................... A dynamic DNS client"
@@ -103,11 +74,8 @@ config ADK_PACKAGE_BIND_CLIENT
 	select ADK_PACKAGE_LIBBIND
 	help
 	  A DNS dynamic client (nsupdate)
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_SERVER
 	prompt "bind-server....................... A DNS server"
 	tristate
@@ -117,12 +85,8 @@ config ADK_PACKAGE_BIND_SERVER
 	select ADK_PACKAGE_LIBBIND
 	help
 	  A DNS server (named)
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
-
 config ADK_PACKAGE_LIBBIND
         prompt "libbind........................... Support library for the bind tools and dns server/client."
         tristate
@@ -131,6 +95,3 @@ config ADK_PACKAGE_LIBBIND
         select ADK_COMPILE_BIND
         help
           http://www.isc.org/sw/bind/
-
-          Depends: libopenssl
-

package/bind/Makefile

@@ -9,19 +9,32 @@ PKG_NAME:=		bind
 PKG_VERSION:=		9.4.1
 PKG_RELEASE:=		4
 PKG_MD5SUM:=		09b54d35036cb0423b2e618f21766285
-MASTER_SITES:=		ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
+PKG_DESCR:=		popular DNS server
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libopenssl libbind
+PKG_URL:=		https://www.isc.org/software/bind
+PKG_SITES:=		ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
+
+PKG_DESCR_1:=		dynamic dns client (nsupdate utility)
+PKG_DESCR_2:=		Support library for the bind tools and dns server/client
+PKG_DESCR_3:=		rndc & rndc-confgen utilities
+PKG_DESCR_4:=		named-checkconf & named-checkzone utilities
+PKG_DESCR_5:=		dnssec-keygen & dnssec-signzone utilities
+PKG_DESCR_6:=		host utility
+PKG_DESCR_7:=		dig utility
+
+PKG_SECTION_2:=		libs
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_TOOLS,bind-tools,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_4},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_5},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_6},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_7},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=         BUILD_CC="${TARGET_CC}"
@@ -42,26 +55,12 @@ pre-build:
 post-install:
 	# bind server
 	${INSTALL_DIR} ${IDIR_BIND_SERVER}/usr/sbin
-	${INSTALL_DIR} ${IDIR_BIND_SERVER}/etc/init.d
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/named ${IDIR_BIND_SERVER}/usr/sbin/
 	${CP} ./files/bind ${IDIR_BIND_SERVER}/etc
-	${INSTALL_BIN} ./files/named.init \
-		${IDIR_BIND_SERVER}/etc/init.d/named
 	find ${IDIR_BIND_SERVER}/etc/bind -name ".svn" | xargs rm -rf
 	# nsupdate
 	${INSTALL_DIR} ${IDIR_BIND_CLIENT}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/nsupdate ${IDIR_BIND_CLIENT}/usr/bin/
-	# bind all tools
-	${INSTALL_DIR} ${IDIR_BIND_TOOLS}/usr/bin
-	${INSTALL_DIR} ${IDIR_BIND_TOOLS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/dig ${IDIR_BIND_TOOLS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/host ${IDIR_BIND_TOOLS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc-confgen ${IDIR_BIND_TOOLS}/usr/sbin/
 	# rndc
 	${INSTALL_DIR} ${IDIR_BIND_RNDC}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc ${IDIR_BIND_RNDC}/usr/sbin/
@@ -82,11 +81,11 @@ post-install:
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dig ${IDIR_BIND_DIG}/usr/bin/
 	# bind lib
 	${INSTALL_DIR} ${IDIR_LIBBIND}/usr/lib
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libbind9.so.30 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libdns.so.32 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libisccc.so.30 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libisccfg.so.30 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libisc.so.32 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/liblwres.so.30 ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libbind9.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libdns.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libisccc.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libisccfg.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libisc.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/liblwres.so.* ${IDIR_LIBBIND}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk