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

(limited to 'package/xinetd')

diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile
index 349d194fd..2e92a4e7e 100644
--- a/package/xinetd/Makefile
+++ b/package/xinetd/Makefile
@@ -9,12 +9,14 @@ PKG_NAME:=		xinetd
 PKG_VERSION:=		2.3.13
 PKG_RELEASE:=		9
 PKG_MD5SUM:=		4295b5fe12350f09b5892b363348ac8b
-
-MASTER_SITES:=		http://www.xinetd.org/
+PKG_DESCR:=		a powerful and secure superserver
+PKG_SECTION:=		net
+PKG_URL:=		http://www.xinetd.org
+PKG_SITES:=		http://www.xinetd.org/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,XINETD,xinetd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,XINETD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-libwrap \
@@ -24,12 +26,8 @@ ALL_TARGET:=		build
 INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_XINETD}/etc
+	${INSTALL_DIR} ${IDIR_XINETD}/etc/xinetd.d ${IDIR_XINETD}/usr/sbin
 	${INSTALL_DATA} ./files/xinetd.conf ${IDIR_XINETD}/etc/xinetd.conf
-	${INSTALL_DIR} ${IDIR_XINETD}/etc/xinetd.d
-	${INSTALL_DIR} ${IDIR_XINETD}/etc/init.d
-	${INSTALL_BIN} ./files/xinetd.init ${IDIR_XINETD}/etc/init.d/xinetd
-	${INSTALL_DIR} ${IDIR_XINETD}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/xinetd ${IDIR_XINETD}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xinetd/files/xinetd.conffiles b/package/xinetd/files/xinetd.conffiles
new file mode 100644
index 000000000..f49d840c4
--- /dev/null
+++ b/package/xinetd/files/xinetd.conffiles
@@ -0,0 +1 @@
+/etc/xinetd.conf
diff --git a/package/xinetd/files/xinetd.init b/package/xinetd/files/xinetd.init
index 8c909d278..d0b8c0517 100644
--- a/package/xinetd/files/xinetd.init
+++ b/package/xinetd/files/xinetd.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 50
+#PKG xinetd
+#INIT 50
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/xinetd/files/xinetd.postinst b/package/xinetd/files/xinetd.postinst
new file mode 100644
index 000000000..c9869d167
--- /dev/null
+++ b/package/xinetd/files/xinetd.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf xinetd xinetd NO
diff --git a/package/xinetd/ipkg/xinetd.conffiles b/package/xinetd/ipkg/xinetd.conffiles
deleted file mode 100644
index f49d840c4..000000000
--- a/package/xinetd/ipkg/xinetd.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/xinetd.conf
diff --git a/package/xinetd/ipkg/xinetd.control b/package/xinetd/ipkg/xinetd.control
deleted file mode 100644
index 34cefb59a..000000000
--- a/package/xinetd/ipkg/xinetd.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: xinetd
-Priority: optional
-Section: net
-Description: a powerful and secure superserver
diff --git a/package/xinetd/ipkg/xinetd.postinst b/package/xinetd/ipkg/xinetd.postinst
deleted file mode 100644
index c9869d167..000000000
--- a/package/xinetd/ipkg/xinetd.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf xinetd xinetd NO
-- 
cgit v1.2.3