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, 17 insertions, 60 deletions

diff --git a/package/netperf/Makefile b/package/netperf/Makefile
index 9a741ea64..4bf5c123c 100644
--- a/package/netperf/Makefile
+++ b/package/netperf/Makefile
@@ -6,29 +6,27 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		netperf
-PKG_VERSION:=		2.3pl1
-PKG_RELEASE:=		8
-PKG_MD5SUM:=		b74314d78af31cb13516fb9a372d2e86
-MASTER_SITES:=		ftp://ftp.netperf.org/netperf/archive/ \
+PKG_VERSION:=		2.4.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		391a0d98954c72a6ad7f08b8a115e1ce
+PKG_DESCR:=		Program and service to do network performance measurement.
+PKG_SECTION:=		net
+PKG_URL:=		http://www.netperf.org/netperf/		
+PKG_SITES:=		ftp://ftp.netperf.org/netperf/archive/ \
 			ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,NETPERF,netperf,${PKG_VERSION}${PKG_RELEASE}))
+$(eval $(call PKG_template,NETPERF,${PKG_NAME},${PKG_VERSION}${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=no
+CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
-MAKE_FLAGS+=		TARGET_NETPERF_HOME="/etc/netperf.conf" \
-			TARGET_CC=${TARGET_CROSS}gcc \
-			TARGET_CFLAGS="${TCFLAGS}" \
-			TARGET_LIBS=""
-MAKE_FILE:=		makefile
+INSTALL_STYLE:=		auto
 
-do-install:
-	${INSTALL_DIR} ${IDIR_NETPERF}/etc/init.d
+post-install:
 	${INSTALL_DIR} ${IDIR_NETPERF}/usr/bin
-	${INSTALL_BIN} ./files/netserver.init \
-		${IDIR_NETPERF}/etc/init.d/netserver
-	${INSTALL_BIN} ${WRKBUILD}/netperf ${IDIR_NETPERF}/usr/bin/
-	${INSTALL_BIN} ${WRKBUILD}/netserver ${IDIR_NETPERF}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/netperf ${IDIR_NETPERF}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/netserver ${IDIR_NETPERF}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/netperf/ipkg/netperf.postinst b/package/netperf/files/netperf.postinst
index 36ef9c140..36ef9c140 100644
--- a/package/netperf/ipkg/netperf.postinst
+++ b/package/netperf/files/netperf.postinst
diff --git a/package/netperf/files/netserver.init b/package/netperf/files/netserver.init
index 36a18de81..e5fe31a51 100644
--- a/package/netperf/files/netserver.init
+++ b/package/netperf/files/netserver.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 70
+#PKG netperf
+#INIT 70
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/netperf/ipkg/netperf.control b/package/netperf/ipkg/netperf.control
deleted file mode 100644
index 254f28a66..000000000
--- a/package/netperf/ipkg/netperf.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: netperf
-Priority: optional
-Section: net
-Description: Program and service to do network performance measurement.
diff --git a/package/netperf/patches/01-netperf-2.3pl1-openwrt.patch b/package/netperf/patches/01-netperf-2.3pl1-openwrt.patch
deleted file mode 100644
index b83ca1167..000000000
--- a/package/netperf/patches/01-netperf-2.3pl1-openwrt.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- netperf-2.3pl1.orig/makefile	2004-09-21 23:33:40.000000000 +0200
-+++ netperf-2.3pl1/makefile	2005-12-30 15:35:08.924238576 +0100
-@@ -15,8 +15,7 @@
- # for the rest of the world, it is probably better to put the binaries
- # in /usr/local/netperf or /opt/netperf
- #
--#NETPERF_HOME = /usr/local/netperf
--NETPERF_HOME = /opt/netperf
-+NETPERF_HOME = $(TARGET_NETPERF_HOME)
- 
- # The compiler on your system might be somewhere else, and/or have
- # a different name.
-@@ -40,7 +39,7 @@
- # You may safely ignore that warning.
- #
- 
--CC = cc
-+CC = $(TARGET_CC)
- 
- # Adding flags to CFLAGS enables some non-mainline features. For
- # more information, please consult the source code.
-@@ -113,7 +112,7 @@
- #                   netserver via the netperf command line with -T
- 
- LOG_FILE=DEBUG_LOG_FILE="\"/tmp/netperf.debug\""
--CFLAGS = -O -D$(LOG_FILE) -DNEED_MAKEFILE_EDIT
-+CFLAGS = -D$(LOG_FILE) $(TARGET_CFLAGS)
- 
- # Some platforms, and some options, require additional libraries.
- # you can add to the "LIBS =" line to accomplish this. if you find
-@@ -136,7 +135,7 @@
- # -lresolv              - required for -DDO_DNS on RedHat 7.1
- # -lsocket -lbind       - required for Zeta OS
- 
--LIBS= -lm
-+LIBS= -lm $(TARGET_LIBS)
- 
- # ---------------------------------------------------------------
- # it should not be the case that anything below this line needs to