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/bitlbee/Makefile                | 14 +++++++-------
 package/bitlbee/files/bitlbee.conffiles |  2 ++
 package/bitlbee/files/bitlbee.init      |  3 ++-
 package/bitlbee/files/bitlbee.postinst  |  3 +++
 package/bitlbee/ipkg/bitlbee.conffiles  |  2 --
 package/bitlbee/ipkg/bitlbee.control    |  5 -----
 package/bitlbee/ipkg/bitlbee.postinst   |  3 ---
 7 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 package/bitlbee/files/bitlbee.conffiles
 create mode 100644 package/bitlbee/files/bitlbee.postinst
 delete mode 100644 package/bitlbee/ipkg/bitlbee.conffiles
 delete mode 100644 package/bitlbee/ipkg/bitlbee.control
 delete mode 100644 package/bitlbee/ipkg/bitlbee.postinst

(limited to 'package/bitlbee')

diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index 364c084f2..ea158d197 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -9,14 +9,18 @@ PKG_NAME:=		bitlbee
 PKG_VERSION:=		1.2.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		2b1674d98804970809de3da3edf0bed2
-MASTER_SITES:=		http://get.bitlbee.org/src/ \
+PKG_DESCR:=		IRC gateway to IM chat networks
+PKG_SECTION:=		net
+PKG_DEPENDS:=		glib2 libopenssl libiconv
+PKG_URL:=		http://www.bitlbee.org
+PKG_SITES:=		http://get.bitlbee.org/src/ \
 			http://get.bitlbee.be/src/ \
 			http://get.us.bitlbee.org/src/ \
 			http://ftp.snt.utwente.nl/pub/software/bitlbee/src/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BITLBEE,bitlbee,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 ifeq ($(ADK_IPV6),y)
 IPV6+=	--ipv6=1
 else
@@ -57,12 +61,8 @@ post-configure:
 		${WRKBUILD}/Makefile.settings
 
 post-install:
-	${INSTALL_DIR} ${IDIR_BITLBEE}/etc/bitlbee
-	${INSTALL_DIR} ${IDIR_BITLBEE}/etc/init.d
-	${INSTALL_DIR} ${IDIR_BITLBEE}/usr/sbin
+	${INSTALL_DIR} ${IDIR_BITLBEE}/etc/bitlbee ${IDIR_BITLBEE}/usr/sbin
 	${INSTALL_DATA} ${WRKINST}/etc/bitlbee/* ${IDIR_BITLBEE}/etc/bitlbee
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/bitlbee ${IDIR_BITLBEE}/usr/sbin
-	${INSTALL_BIN} ./files/bitlbee.init \
-		${IDIR_BITLBEE}/etc/init.d/bitlbee
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bitlbee/files/bitlbee.conffiles b/package/bitlbee/files/bitlbee.conffiles
new file mode 100644
index 000000000..2ccc958d5
--- /dev/null
+++ b/package/bitlbee/files/bitlbee.conffiles
@@ -0,0 +1,2 @@
+/etc/bitlbee/motd.txt
+/etc/bitlbee/bitlbee.conf
diff --git a/package/bitlbee/files/bitlbee.init b/package/bitlbee/files/bitlbee.init
index 3ff950a9c..1ff40c754 100644
--- a/package/bitlbee/files/bitlbee.init
+++ b/package/bitlbee/files/bitlbee.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 80
+#PKG bitlbee
+#INIT 80
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/bitlbee/files/bitlbee.postinst b/package/bitlbee/files/bitlbee.postinst
new file mode 100644
index 000000000..a8e3b2ec4
--- /dev/null
+++ b/package/bitlbee/files/bitlbee.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf bitlbee
diff --git a/package/bitlbee/ipkg/bitlbee.conffiles b/package/bitlbee/ipkg/bitlbee.conffiles
deleted file mode 100644
index 2ccc958d5..000000000
--- a/package/bitlbee/ipkg/bitlbee.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/bitlbee/motd.txt
-/etc/bitlbee/bitlbee.conf
diff --git a/package/bitlbee/ipkg/bitlbee.control b/package/bitlbee/ipkg/bitlbee.control
deleted file mode 100644
index 37ca895c8..000000000
--- a/package/bitlbee/ipkg/bitlbee.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bitlbee
-Priority: optional
-Section: net
-Depends: glib2, libopenssl, libiconv
-Description: IRC gateway to IM chat networks
diff --git a/package/bitlbee/ipkg/bitlbee.postinst b/package/bitlbee/ipkg/bitlbee.postinst
deleted file mode 100644
index a8e3b2ec4..000000000
--- a/package/bitlbee/ipkg/bitlbee.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf bitlbee
-- 
cgit v1.2.3