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/gmediaserver/Makefile                    | 11 ++++++-----
 package/gmediaserver/files/gmediaserver.init     |  3 ++-
 package/gmediaserver/files/gmediaserver.postinst |  4 ++++
 package/gmediaserver/ipkg/gmediaserver.control   |  5 -----
 package/gmediaserver/ipkg/gmediaserver.postinst  |  4 ----
 5 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 package/gmediaserver/files/gmediaserver.postinst
 delete mode 100644 package/gmediaserver/ipkg/gmediaserver.control
 delete mode 100644 package/gmediaserver/ipkg/gmediaserver.postinst

(limited to 'package/gmediaserver')

diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile
index 5ca8b48ce..1da2723f0 100644
--- a/package/gmediaserver/Makefile
+++ b/package/gmediaserver/Makefile
@@ -9,11 +9,15 @@ PKG_NAME:=		gmediaserver
 PKG_VERSION:=		0.13.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c422de386331e2a1a859d45f6fa270a3
-MASTER_SITES:=		http://savannah.nongnu.org/download/gmediaserver/
+PKG_DESCR:=		An UPnP music media server
+PKG_SECTION:=		net
+PKG_DEPENDS:=		id3lib libupnp
+PKG_URL:=		http://www.gnu.org/software/gmediaserver
+PKG_SITES:=		http://savannah.nongnu.org/download/gmediaserver/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		LIBS=" -lixml -lthreadutil -lupnp -lz" \
@@ -28,9 +32,6 @@ CONFIGURE_ENV+=		LIBS=" -lixml -lthreadutil -lupnp -luClibc++ -lz"
 endif
 
 post-install:
-	${INSTALL_DIR} ${IDIR_GMEDIASERVER}/etc/init.d
-	${INSTALL_BIN} ./files/gmediaserver.init \
-		${IDIR_GMEDIASERVER}/etc/init.d/gmediaserver
 	${INSTALL_DIR} ${IDIR_GMEDIASERVER}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/gmediaserver ${IDIR_GMEDIASERVER}/usr/sbin/
 
diff --git a/package/gmediaserver/files/gmediaserver.init b/package/gmediaserver/files/gmediaserver.init
index 3ce0ac09d..81deeb899 100644
--- a/package/gmediaserver/files/gmediaserver.init
+++ b/package/gmediaserver/files/gmediaserver.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG gmediaserver
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/gmediaserver/files/gmediaserver.postinst b/package/gmediaserver/files/gmediaserver.postinst
new file mode 100644
index 000000000..1d2338cb0
--- /dev/null
+++ b/package/gmediaserver/files/gmediaserver.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf gmediaserver gmediaserver NO
+add_rcconf gmediaserver_flags gmediaserver_flags "--background --interface=eth0.0"
diff --git a/package/gmediaserver/ipkg/gmediaserver.control b/package/gmediaserver/ipkg/gmediaserver.control
deleted file mode 100644
index 6ba003f5a..000000000
--- a/package/gmediaserver/ipkg/gmediaserver.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: gmediaserver
-Priority: optional
-Section: net
-Depends: id3lib, libupnp
-Description: An UPnP music media server.
diff --git a/package/gmediaserver/ipkg/gmediaserver.postinst b/package/gmediaserver/ipkg/gmediaserver.postinst
deleted file mode 100644
index 1d2338cb0..000000000
--- a/package/gmediaserver/ipkg/gmediaserver.postinst
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf gmediaserver gmediaserver NO
-add_rcconf gmediaserver_flags gmediaserver_flags "--background --interface=eth0.0"
-- 
cgit v1.2.3