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

6 files changed, 15 insertions, 19 deletions

diff --git a/package/monit/Makefile b/package/monit/Makefile
index 7a6f2dfd9..68ef0e683 100644
--- a/package/monit/Makefile
+++ b/package/monit/Makefile
@@ -6,19 +6,24 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		monit
-PKG_VERSION:=		4.10.1
+PKG_VERSION:=		5.0.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d3143b0bbd79b53f1b019d2fc1dae656
-MASTER_SITES:=		http://www.tildeslash.com/monit/dist/
+PKG_MD5SUM:=		dae7859ec10551fc941daeae60dee9d3
+PKG_DESCR:=		An utility for system services monitoring
+PKG_SECTION:=		admin
+PKG_DEPENDS:=		libpthread
+PKG_URL:=		http://mmonit.com/monit
+PKG_SITES:=		http://www.tildeslash.com/monit/dist/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,MONIT,monit,${PKG_VERSION}-${PKG_RELEASE}))
+ifeq ($(ADK_COMPILE_MONIT_WITH_SSL),y)
+PKG_DEPENDS+=		libopenssl
+endif
 
-PKG_DEPENDS:=		libpthread,
+$(eval $(call PKG_template,MONIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(ADK_COMPILE_MONIT_WITH_SSL),y)
-PKG_DEPENDS+=		libopenssl
 CONFIGURE_ARGS+=	--with-ssl --with-ssl-dir="${STAGING_DIR}/usr"
 else
 CONFIGURE_ARGS+=	--without-ssl
@@ -31,10 +36,7 @@ INSTALL_STYLE:=		auto
 post-install:
 	${INSTALL_DIR} ${IDIR_MONIT}/etc
 	install -m0600 ${WRKBUILD}/monitrc ${IDIR_MONIT}/etc/
-	${INSTALL_DIR} ${IDIR_MONIT}/etc/init.d
-	${INSTALL_BIN} ./files/monit.init ${IDIR_MONIT}/etc/init.d/monit
 	${INSTALL_DIR} ${IDIR_MONIT}/usr/sbin
 	${INSTALL_BIN} ${WRKBUILD}/monit ${IDIR_MONIT}/usr/sbin/monit
-	echo 'Depends: ${PKG_DEPENDS}' >>${IDIR_MONIT}/CONTROL/control
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/monit/ipkg/monit-nossl.conffiles b/package/monit/files/monit-nossl.conffiles
index 365679c6e..365679c6e 100644
--- a/package/monit/ipkg/monit-nossl.conffiles
+++ b/package/monit/files/monit-nossl.conffiles
diff --git a/package/monit/ipkg/monit.conffiles b/package/monit/files/monit.conffiles
index 365679c6e..365679c6e 100644
--- a/package/monit/ipkg/monit.conffiles
+++ b/package/monit/files/monit.conffiles
diff --git a/package/monit/files/monit.init b/package/monit/files/monit.init
index fd552b95e..91a7aca4b 100644
--- a/package/monit/files/monit.init
+++ b/package/monit/files/monit.init
@@ -1,5 +1,8 @@
 #!/bin/sh
-#FWINIT 10
+#PKG monit
+#INIT 10
+
+. /etc/rc.conf
 
 case $1 in
 autostop) ;;
diff --git a/package/monit/ipkg/monit-nossl.control b/package/monit/ipkg/monit-nossl.control
deleted file mode 100644
index d10b711da..000000000
--- a/package/monit/ipkg/monit-nossl.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: monit-nossl
-Priority: optional
-Section: admin
-Description: An utility for system services monitoring, without SSL support.
-Depends: libpthread
diff --git a/package/monit/ipkg/monit.control b/package/monit/ipkg/monit.control
deleted file mode 100644
index 0c564a675..000000000
--- a/package/monit/ipkg/monit.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: monit
-Priority: optional
-Section: admin
-Description: An utility for system services monitoring.