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/srelay/Makefile               | 11 +++++------
 package/srelay/files/srelay.conffiles |  1 +
 package/srelay/files/srelay.init      |  4 +++-
 package/srelay/files/srelay.postinst  |  4 ++++
 package/srelay/ipkg/srelay.conffiles  |  1 -
 package/srelay/ipkg/srelay.control    |  4 ----
 package/srelay/ipkg/srelay.postinst   |  4 ----
 7 files changed, 13 insertions(+), 16 deletions(-)
 create mode 100644 package/srelay/files/srelay.conffiles
 create mode 100644 package/srelay/files/srelay.postinst
 delete mode 100644 package/srelay/ipkg/srelay.conffiles
 delete mode 100644 package/srelay/ipkg/srelay.control
 delete mode 100644 package/srelay/ipkg/srelay.postinst

(limited to 'package/srelay')

diff --git a/package/srelay/Makefile b/package/srelay/Makefile
index db3d0134c..6106efb1f 100644
--- a/package/srelay/Makefile
+++ b/package/srelay/Makefile
@@ -9,22 +9,21 @@ PKG_NAME:=		srelay
 PKG_VERSION:=		0.4.6
 PKG_RELEASE:=		9
 PKG_MD5SUM:=		4a9f3298b38d8588f0ffde31b946a47f
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=socks-relay/}
+PKG_DESCR:=		A socks 4/5 proxy server
+PKG_SECTION:=		net
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=socks-relay/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,SRELAY,srelay,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SRELAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-thread
 BUILD_STYLE:=		auto
 
 do-install:
-	${INSTALL_DIR} ${IDIR_SRELAY}/usr/bin
-	${INSTALL_DIR} ${IDIR_SRELAY}/etc/init.d
+	${INSTALL_DIR} ${IDIR_SRELAY}/usr/bin ${IDIR_SRELAY}/etc
 	${INSTALL_BIN} ${WRKBUILD}/srelay ${IDIR_SRELAY}/usr/bin/
-	${INSTALL_BIN} ./files/srelay.init \
-		${IDIR_SRELAY}/etc/init.d/${PKG_NAME}
 	${INSTALL_DATA} ./files/srelay.conf ${IDIR_SRELAY}/etc
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/srelay/files/srelay.conffiles b/package/srelay/files/srelay.conffiles
new file mode 100644
index 000000000..d821cfd26
--- /dev/null
+++ b/package/srelay/files/srelay.conffiles
@@ -0,0 +1 @@
+/etc/srelay.conf
diff --git a/package/srelay/files/srelay.init b/package/srelay/files/srelay.init
index e12024cf3..5cae3c161 100644
--- a/package/srelay/files/srelay.init
+++ b/package/srelay/files/srelay.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG srelay
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/srelay/files/srelay.postinst b/package/srelay/files/srelay.postinst
new file mode 100644
index 000000000..a3322a763
--- /dev/null
+++ b/package/srelay/files/srelay.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf srelay srelay NO
+add_rcconf srelay_flags srelay_flags "-c /etc/srelay.conf -r -s"
diff --git a/package/srelay/ipkg/srelay.conffiles b/package/srelay/ipkg/srelay.conffiles
deleted file mode 100644
index d821cfd26..000000000
--- a/package/srelay/ipkg/srelay.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/srelay.conf
diff --git a/package/srelay/ipkg/srelay.control b/package/srelay/ipkg/srelay.control
deleted file mode 100644
index fdc21c864..000000000
--- a/package/srelay/ipkg/srelay.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: srelay
-Priority: optional
-Section: net
-Description: A socks 4/5 proxy server
diff --git a/package/srelay/ipkg/srelay.postinst b/package/srelay/ipkg/srelay.postinst
deleted file mode 100644
index a3322a763..000000000
--- a/package/srelay/ipkg/srelay.postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf srelay srelay NO
-add_rcconf srelay_flags srelay_flags "-c /etc/srelay.conf -r -s"
-- 
cgit v1.2.3