From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 May 2009 20:39:07 +0200
Subject: 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
---
 package/wifidog/Makefile                | 16 +++++++---------
 package/wifidog/files/wifidog.conffiles |  1 +
 package/wifidog/files/wifidog.init      |  4 +++-
 package/wifidog/files/wifidog.postinst  |  3 +++
 package/wifidog/ipkg/wifidog.conffiles  |  1 -
 package/wifidog/ipkg/wifidog.control    |  8 --------
 package/wifidog/ipkg/wifidog.postinst   |  3 ---
 7 files changed, 14 insertions(+), 22 deletions(-)
 create mode 100644 package/wifidog/files/wifidog.conffiles
 create mode 100644 package/wifidog/files/wifidog.postinst
 delete mode 100644 package/wifidog/ipkg/wifidog.conffiles
 delete mode 100644 package/wifidog/ipkg/wifidog.control
 delete mode 100644 package/wifidog/ipkg/wifidog.postinst

(limited to 'package/wifidog')

diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile
index 591f71403..e12bf91e5 100644
--- a/package/wifidog/Makefile
+++ b/package/wifidog/Makefile
@@ -9,26 +9,24 @@ PKG_NAME:=		wifidog
 PKG_VERSION:=		1.1.5
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		abe5f7123179a0f08c493ce59fb3cb31
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
+PKG_DESCR:=		a complete and embeddable captive portal
+PKG_SECTION:=		net
+PKG_DEPENDS:=		iptables
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,WIFIDOG,wifidog,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,WIFIDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		ac_cv_func_malloc_0_nonnull=yes \
-			ac_cv_func_memcmp_working=yes \
+CONFIGURE_ENV+=		ac_cv_func_memcmp_working=yes \
 			ac_cv_func_setvbuf_reversed=no
 BUILD_STYLE+=		auto
 INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_WIFIDOG}/etc/init.d/
-	${INSTALL_BIN} ./files/${PKG_NAME}.init \
-		       ${IDIR_WIFIDOG}/etc/init.d/wifidog
+	${INSTALL_DIR} ${IDIR_WIFIDOG}/usr/{bin,lib} ${IDIR_WIFIDOG}/etc
 	${INSTALL_DATA} ./files/wifidog.conf ${IDIR_WIFIDOG}/etc/
-	${INSTALL_DIR} ${IDIR_WIFIDOG}/usr/bin
-	${INSTALL_DIR} ${IDIR_WIFIDOG}/usr/lib
 	${INSTALL_BIN} ${WRKBUILD}/scripts/init.d/wifidog ${IDIR_WIFIDOG}/usr/bin/wifidog-init
 	${INSTALL_BIN} ${WRKINST}/usr/bin/wifidog \
 		       ${WRKINST}/usr/bin/wdctl ${IDIR_WIFIDOG}/usr/bin/
diff --git a/package/wifidog/files/wifidog.conffiles b/package/wifidog/files/wifidog.conffiles
new file mode 100644
index 000000000..aaa3dd140
--- /dev/null
+++ b/package/wifidog/files/wifidog.conffiles
@@ -0,0 +1 @@
+/etc/wifidog.conf
diff --git a/package/wifidog/files/wifidog.init b/package/wifidog/files/wifidog.init
index 4a23a8e34..f3ee5752c 100644
--- a/package/wifidog/files/wifidog.init
+++ b/package/wifidog/files/wifidog.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 65
+#PKG wifidog
+#INIT 65
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/wifidog/files/wifidog.postinst b/package/wifidog/files/wifidog.postinst
new file mode 100644
index 000000000..e778a2300
--- /dev/null
+++ b/package/wifidog/files/wifidog.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf wifidog wifidog NO
diff --git a/package/wifidog/ipkg/wifidog.conffiles b/package/wifidog/ipkg/wifidog.conffiles
deleted file mode 100644
index aaa3dd140..000000000
--- a/package/wifidog/ipkg/wifidog.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/wifidog.conf
diff --git a/package/wifidog/ipkg/wifidog.control b/package/wifidog/ipkg/wifidog.control
deleted file mode 100644
index 18d498552..000000000
--- a/package/wifidog/ipkg/wifidog.control
+++ /dev/null
@@ -1,8 +0,0 @@
-Package: wifidog
-Priority: optional
-Section: net
-Depends: iptables, iptables-extra, kmod-iptables-extra
-Description: WiFiDog is a complete and embeddable captive portal
-        solution for wireless community groups or individuals who
-        wish to open a free Hotspot while still preventing abuse
-        of their Internet connection.
diff --git a/package/wifidog/ipkg/wifidog.postinst b/package/wifidog/ipkg/wifidog.postinst
deleted file mode 100644
index e778a2300..000000000
--- a/package/wifidog/ipkg/wifidog.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf wifidog wifidog NO
-- 
cgit v1.2.3