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, 10 insertions, 13 deletions

diff --git a/package/tor/Makefile b/package/tor/Makefile
index 1918577ff..62d13315e 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -9,14 +9,17 @@ PKG_NAME:=		tor
 PKG_VERSION:=		0.1.1.26
 PKG_RELEASE:=		9
 PKG_MD5SUM:=		0667df7a1f670bee5163b607aea172ba
-
-MASTER_SITES:=		http://tor.eff.org/dist/ \
+PKG_DESCR:=		An anonymous Internet communication system
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libevent libopenssl libpthread zlib
+PKG_URL:=		http://tor.eff.org
+PKG_SITES:=		http://tor.eff.org/dist/ \
 			http://ftp.se.linux.org/crypto/tor/ \
 			http://tor.meulie.net/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,TOR,tor,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,TOR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_libevent_normal=yes \
@@ -31,11 +34,8 @@ BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_TOR}/etc/init.d
-	${INSTALL_BIN} ./files/tor.init ${IDIR_TOR}/etc/init.d/tor
-	${INSTALL_DIR} ${IDIR_TOR}/etc/tor
+	${INSTALL_DIR} ${IDIR_TOR}/usr/bin ${IDIR_TOR}/etc/tor
 	${INSTALL_DATA} ./files/torrc ${IDIR_TOR}/etc/tor/
-	${INSTALL_DIR} ${IDIR_TOR}/usr/bin
 	${CP} ${WRKINST}/usr/bin/tor ${IDIR_TOR}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tor/ipkg/tor.conffiles b/package/tor/files/tor.conffiles
index 2954287e6..2954287e6 100644
--- a/package/tor/ipkg/tor.conffiles
+++ b/package/tor/files/tor.conffiles
diff --git a/package/tor/files/tor.init b/package/tor/files/tor.init
index e8804bb64..dd3759252 100644
--- a/package/tor/files/tor.init
+++ b/package/tor/files/tor.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 80
+#PKG tor
+#INIT 80
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/tor/ipkg/tor.postinst b/package/tor/files/tor.postinst
index 9ca10117b..9ca10117b 100644
--- a/package/tor/ipkg/tor.postinst
+++ b/package/tor/files/tor.postinst
diff --git a/package/tor/ipkg/tor.control b/package/tor/ipkg/tor.control
deleted file mode 100644
index bd1f79cbe..000000000
--- a/package/tor/ipkg/tor.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: tor
-Priority: optional
-Section: net
-Description: An anonymous Internet communication system
-Depends: libevent, libopenssl, libpthread, zlib