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

5 files changed, 19 insertions, 27 deletions

diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 529e8cf68..2f9529bf5 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -6,14 +6,18 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		collectd
-PKG_VERSION:=		4.6.2
+PKG_VERSION:=		4.7.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9eee46a6330780d6e6b41155b159f4f9
-MASTER_SITES:=		http://verplant.org/collectd/files/
+PKG_MD5SUM:=		b077e3398bd6fac0e53e9df4794db264
+PKG_DESCR:=		System statistics collection daemon
+PKG_SECTION:=		console
+PKG_DEPENDS:=		libpthread
+PKG_URL:=		http://collectd.org
+PKG_SITES:=		http://collectd.org/files/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,COLLECTD,collectd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,COLLECTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifneq (${ADK_PACKAGE_COLLECTD_CPU},y)
 DISABLE_CPU:=--disable-cpu
@@ -43,9 +47,12 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-email \
 			--disable-entropy \
 			--disable-exec \
+			--disable-filecount \
+			--disable-fscache \
 			--disable-hddtemp \
 			--disable-interface \
 			--disable-iptables \
+			--disable-ipvs \
 			--disable-irq \
 			${DISABLE_LOAD} \
 			--disable-mbmon \
@@ -53,6 +60,7 @@ CONFIGURE_ARGS+=	--disable-apache \
 			${DISABLE_MEMORY} \
 			--disable-multimeter \
 			--disable-mysql \
+			--disable-openvpn \
 			--disable-postgresql \
 			--disable-powerdns \
 			--disable-network \
@@ -69,7 +77,11 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-swap \
 			--disable-syslog \
 			--disable-tape \
+			--disable-target_notification \
+			--disable-target_replace \
+			--disable-target_set \
 			--disable-teamspeak2 \
+			--disable-ted \
 			--disable-thermal \
 			--disable-unixsock \
 			--disable-users \
@@ -83,11 +95,7 @@ BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_COLLECTD}/etc/init.d
-	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/sbin
-	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd
-	${INSTALL_BIN} ./files/collectd.init \
-		${IDIR_COLLECTD}/etc/init.d/collectd
+	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/usr/lib/collectd
 	${CP} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin/
 	${CP} ${WRKINST}/usr/lib/collectd/*.so ${IDIR_COLLECTD}/usr/lib/collectd/
 
diff --git a/package/collectd/files/collectd.init b/package/collectd/files/collectd.init
index 7d4f70b59..601dd53d4 100644
--- a/package/collectd/files/collectd.init
+++ b/package/collectd/files/collectd.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 75
+#PKG collectd
+#INIT 75
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/collectd/ipkg/collectd.postinst b/package/collectd/files/collectd.postinst
index 7e4416125..7e4416125 100644
--- a/package/collectd/ipkg/collectd.postinst
+++ b/package/collectd/files/collectd.postinst
diff --git a/package/collectd/ipkg/collectd.control b/package/collectd/ipkg/collectd.control
deleted file mode 100644
index 790e0fdfb..000000000
--- a/package/collectd/ipkg/collectd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: collectd
-Priority: optional
-Section: console
-Description: System statistics collection daemon
-Depends: libpthread
diff --git a/package/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in
deleted file mode 100644
index d563de441..000000000
--- a/package/collectd/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- collectd-4.6.2.orig/src/Makefile.in	2009-03-18 11:56:40.000000000 +0100
-+++ collectd-4.6.2/src/Makefile.in	2009-05-09 16:28:02.000000000 +0200
-@@ -1340,7 +1340,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = libcollectdclient $(am__append_1) $(am__append_2) \
- 	$(am__append_3)
--@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror
-+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall
- AM_CPPFLAGS = -DPREFIX='"${prefix}"' \
- 	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
- 	-DLOCALSTATEDIR='"${localstatedir}"' \