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, 22 deletions

diff --git a/package/gkrellmd/Config.in b/package/gkrellmd/Config.in
index 836a64d4c..0c649581f 100644
--- a/package/gkrellmd/Config.in
+++ b/package/gkrellmd/Config.in
@@ -2,7 +2,7 @@ config ADK_PACKAGE_GKRELLMD
 	prompt "gkrellmd.......................... The GNU Krell Monitors Server"
 	tristate
 	default n
-	select ADK_PACKAGE_GLIB1
+	select ADK_PACKAGE_GLIB2
 	help
 	  Gkrellmd Listens for connections from gkrellm clients. When a gkrellm
 	  client connects to a gkrellmd server all builtin monitors collect
diff --git a/package/gkrellmd/Makefile b/package/gkrellmd/Makefile
index 6273f63b5..5a7c5eabe 100644
--- a/package/gkrellmd/Makefile
+++ b/package/gkrellmd/Makefile
@@ -5,29 +5,28 @@
 
 include ${TOPDIR}/rules.mk
 
-PKG_NAME=		gkrellmd
-PKG_VERSION=		2.2.10
-PKG_RELEASE=		7
-PKG_MD5SUM=		518666ce4c2ef5a7db637683778fe18b
-MASTER_SITES=		http://members.dslextreme.com/users/billw/gkrellm/
-DISTFILES=		gkrellm-${PKG_VERSION}.tar.gz
-
-WRKDIST=${WRKDIR}/gkrellm-${PKG_VERSION}/server
+PKG_NAME:=		gkrellmd
+PKG_VERSION:=		2.3.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		db8a983a60577a6b4886db96d6def011
+PKG_DESCR:=		The GNU Krell Monitors Server
+PKG_SECTION:=		net
+PKG_DEPENDS:=		glib2 libpthread
+PKG_URL:=		http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html
+PKG_SITES:=		http://members.dslextreme.com/users/billw/gkrellm/
+
+DISTFILES:=		gkrellm-${PKG_VERSION}.tar.gz
+WRKDIST=		${WRKDIR}/gkrellm-${PKG_VERSION}/server
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,GKRELLMD,gkrellmd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,GKRELLMD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE=	auto
-MAKE_FLAGS+=	GLIB12_INCLUDE="-I${STAGING_DIR}/usr/include/glib-1.2 -I${STAGING_DIR}/usr/lib/glib/include" \
-		GLIB12_LIB="-L${STAGING_DIR}/usr/lib -lglib -lgmodule" \
-		glib12=1
 
 do-install:
-	${INSTALL_DIR} ${IDIR_GKRELLMD}/usr/bin
-	${INSTALL_DIR} ${IDIR_GKRELLMD}/etc/init.d
+	${INSTALL_DIR} ${IDIR_GKRELLMD}/usr/bin ${IDIR_GKRELLMD}/etc
 	${INSTALL_BIN} ${WRKBUILD}/gkrellmd ${IDIR_GKRELLMD}/usr/bin/
 	${INSTALL_DATA} ${WRKSRC}/gkrellmd.conf ${IDIR_GKRELLMD}/etc
-	${INSTALL_BIN} ./files/gkrellmd.init ${IDIR_GKRELLMD}/etc/init.d/gkrellmd
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gkrellmd/files/gkrellmd.init b/package/gkrellmd/files/gkrellmd.init
index a5f3ccf1a..dfbf7dc5f 100644
--- a/package/gkrellmd/files/gkrellmd.init
+++ b/package/gkrellmd/files/gkrellmd.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 80
+#PKG gkrellmd
+#INIT 80
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/gkrellmd/ipkg/gkrellmd.postinst b/package/gkrellmd/files/gkrellmd.postinst
index 56b7b06cc..56b7b06cc 100644
--- a/package/gkrellmd/ipkg/gkrellmd.postinst
+++ b/package/gkrellmd/files/gkrellmd.postinst
diff --git a/package/gkrellmd/ipkg/gkrellmd.control b/package/gkrellmd/ipkg/gkrellmd.control
deleted file mode 100644
index 13f70a4f1..000000000
--- a/package/gkrellmd/ipkg/gkrellmd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: gkrellmd
-Priority: optional
-Section: net
-Depends: glib1
-Description: The GNU Krell Monitors Server