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

(limited to 'package/maradns')

diff --git a/package/maradns/Makefile b/package/maradns/Makefile
index 631d8482a..b481106c3 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -9,14 +9,18 @@ PKG_NAME:=		maradns
 PKG_VERSION:=		1.0.41
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		9abc13da25c1103d788ee9def1c8e764
-MASTER_SITES:=		http://www.maradns.org/download/1.0/
+PKG_DESCR:=		small and secure DNS server
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libpthread
+PKG_URL:=		http://www.maradns.org
+PKG_SITES:=		http://www.maradns.org/download/1.0/
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,MARADNS,maradns,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,MARADNS,maradns,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-#CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
 MAKE_FLAGS+=		CFLAGS="${TCFLAGS}" \
 			FLAGS="${TCFLAGS}" \
@@ -31,11 +35,10 @@ pre-install:
 	mkdir -p ${WRKINST}/usr/man/man{1,5,8}
 
 post-install:
-	${INSTALL_DIR} ${IDIR_MARADNS}/etc/{init.d,maradns}
-	${INSTALL_DIR} ${IDIR_MARADNS}/usr/{s,}bin
+	${INSTALL_DIR} ${IDIR_MARADNS}/etc/maradns
+	${INSTALL_DIR} ${IDIR_MARADNS}/usr/bin ${IDIR_MARADNS}/usr/sbin
 	${INSTALL_DATA} ./files/mararc ${IDIR_MARADNS}/etc/mararc
 	${INSTALL_DATA} ./files/sample.{zone,ptr} ${IDIR_MARADNS}/etc/maradns/
-	${INSTALL_BIN} ./files/maradns.init ${IDIR_MARADNS}/etc/init.d/${PKG_NAME}
 	${CP} ${WRKINST}/usr/bin/{askmara,getzone} ${IDIR_MARADNS}/usr/bin/
 	${CP} ${WRKINST}/usr/sbin/{maradns,zoneserver} ${IDIR_MARADNS}/usr/sbin/
 
diff --git a/package/maradns/files/maradns.conffiles b/package/maradns/files/maradns.conffiles
new file mode 100644
index 000000000..6304f53f4
--- /dev/null
+++ b/package/maradns/files/maradns.conffiles
@@ -0,0 +1 @@
+/etc/mararc
diff --git a/package/maradns/files/maradns.init b/package/maradns/files/maradns.init
index 4fb5a4879..960ae15e0 100644
--- a/package/maradns/files/maradns.init
+++ b/package/maradns/files/maradns.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG maradns
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/maradns/files/maradns.postinst b/package/maradns/files/maradns.postinst
new file mode 100644
index 000000000..e0c1d7877
--- /dev/null
+++ b/package/maradns/files/maradns.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf maradns maradns NO
diff --git a/package/maradns/ipkg/maradns.conffiles b/package/maradns/ipkg/maradns.conffiles
deleted file mode 100644
index 6304f53f4..000000000
--- a/package/maradns/ipkg/maradns.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/mararc
diff --git a/package/maradns/ipkg/maradns.control b/package/maradns/ipkg/maradns.control
deleted file mode 100644
index 5db7497f4..000000000
--- a/package/maradns/ipkg/maradns.control
+++ /dev/null
@@ -1,8 +0,0 @@
-Package: maradns
-Section: net
-Priority: optional
-Depends: libpthread
-Description: MaraDNS is a small, secure DNS Server
-  MaraDNS is intended for environments where a DNS 
-  server must be secure and where the server must use
-  the absolute minimum number of resources possible.
diff --git a/package/maradns/ipkg/maradns.postinst b/package/maradns/ipkg/maradns.postinst
deleted file mode 100644
index e0c1d7877..000000000
--- a/package/maradns/ipkg/maradns.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf maradns maradns NO
-- 
cgit v1.2.3