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

(limited to 'package/syslog-ng')

diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile
index f7dee9f29..92f52814d 100644
--- a/package/syslog-ng/Makefile
+++ b/package/syslog-ng/Makefile
@@ -9,11 +9,15 @@ PKG_NAME:=		syslog-ng
 PKG_VERSION:=		1.6.12
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a3cbfdb6e1e5beea181a7349749719f3
-MASTER_SITES:=		http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/
+PKG_DESCR:=		A powerful syslog daemon
+PKG_SECTION:=		admin
+PKG_DEPENDS:=		libol libwrap
+PKG_URL:=		http://www.balabit.com
+PKG_SITES:=		http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,SYSLOG_NG,syslog-ng,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SYSLOG_NG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-full-dynamic \
@@ -23,12 +27,8 @@ BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_SYSLOG_NG}/usr/sbin
+	${INSTALL_DIR} ${IDIR_SYSLOG_NG}/usr/sbin ${IDIR_SYSLOG_NG}/etc/syslog-ng
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/syslog-ng ${IDIR_SYSLOG_NG}/usr/sbin/
-	${INSTALL_DIR} ${IDIR_SYSLOG_NG}/etc/init.d
-	${INSTALL_BIN} ./files/syslog-ng.init \
-		${IDIR_SYSLOG_NG}/etc/init.d/${PKG_NAME}
-	${INSTALL_DIR} ${IDIR_SYSLOG_NG}/etc/syslog-ng
 	${INSTALL_DATA} ./files/syslog-ng.conf ${IDIR_SYSLOG_NG}/etc/syslog-ng/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/syslog-ng/files/syslog-ng.conffiles b/package/syslog-ng/files/syslog-ng.conffiles
new file mode 100644
index 000000000..453ebbe66
--- /dev/null
+++ b/package/syslog-ng/files/syslog-ng.conffiles
@@ -0,0 +1 @@
+/etc/syslog-ng/syslog-ng.conf
diff --git a/package/syslog-ng/files/syslog-ng.init b/package/syslog-ng/files/syslog-ng.init
index bdfa0c96e..a613e8e9b 100644
--- a/package/syslog-ng/files/syslog-ng.init
+++ b/package/syslog-ng/files/syslog-ng.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 05
+#PKG syslog-ng
+#INIT 05
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/syslog-ng/files/syslog-ng.postinst b/package/syslog-ng/files/syslog-ng.postinst
new file mode 100644
index 000000000..254f67872
--- /dev/null
+++ b/package/syslog-ng/files/syslog-ng.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf syslog_ng syslog_ng NO
diff --git a/package/syslog-ng/ipkg/syslog-ng.conffiles b/package/syslog-ng/ipkg/syslog-ng.conffiles
deleted file mode 100644
index 453ebbe66..000000000
--- a/package/syslog-ng/ipkg/syslog-ng.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/syslog-ng/syslog-ng.conf
diff --git a/package/syslog-ng/ipkg/syslog-ng.control b/package/syslog-ng/ipkg/syslog-ng.control
deleted file mode 100644
index 93f193d6c..000000000
--- a/package/syslog-ng/ipkg/syslog-ng.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: syslog-ng
-Priority: optional
-Section: admin
-Depends: libol libwrap
-Description: A powerful syslog daemon
diff --git a/package/syslog-ng/ipkg/syslog-ng.postinst b/package/syslog-ng/ipkg/syslog-ng.postinst
deleted file mode 100644
index 254f67872..000000000
--- a/package/syslog-ng/ipkg/syslog-ng.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf syslog_ng syslog_ng NO
-- 
cgit v1.2.3