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/esound/Makefile              | 19 ++++++++++---------
 package/esound/files/esd.init        |  3 ++-
 package/esound/files/esound.postinst |  3 +++
 package/esound/ipkg/esound.control   |  6 ------
 package/esound/ipkg/esound.postinst  |  3 ---
 5 files changed, 15 insertions(+), 19 deletions(-)
 create mode 100644 package/esound/files/esound.postinst
 delete mode 100644 package/esound/ipkg/esound.control
 delete mode 100644 package/esound/ipkg/esound.postinst

(limited to 'package/esound')

diff --git a/package/esound/Makefile b/package/esound/Makefile
index 119532e97..6da76d2a6 100644
--- a/package/esound/Makefile
+++ b/package/esound/Makefile
@@ -6,25 +6,26 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		esound
-PKG_VERSION:=		0.2.38
-PKG_RELEASE:=		5
-PKG_MD5SUM:=		77c4e9805a017fba06552487df3c6662
-MASTER_SITES:=		ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/
+PKG_VERSION:=		0.2.41
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		3d8973ed87053d7acc1f4d44af2c4688
+PKG_DESCR:=		Enlightened Sound Daemon
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libaudiofile
+PKG_URL:=		http://www.tux.org/~ricdude/EsounD.html
+PKG_SITES:=		ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,ESOUND,esound,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,ESOUND,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_ESOUND}/etc/init.d
-	${INSTALL_DIR} ${IDIR_ESOUND}/usr/bin
-	${INSTALL_DIR} ${IDIR_ESOUND}/usr/lib
+	${INSTALL_DIR} ${IDIR_ESOUND}/usr/bin ${IDIR_ESOUND}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/bin/esd ${IDIR_ESOUND}/usr/bin/
 	$(CP) $(WRKINST)/usr/lib/libesd.so.* $(IDIR_ESOUND)/usr/lib/
-	$(INSTALL_DATA) ./files/esd.init $(IDIR_ESOUND)/etc/init.d/esd
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/esound/files/esd.init b/package/esound/files/esd.init
index b6acdb5f3..0f60c59e5 100644
--- a/package/esound/files/esd.init
+++ b/package/esound/files/esd.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 75
+#PKG esound
+#INIT 75
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/esound/files/esound.postinst b/package/esound/files/esound.postinst
new file mode 100644
index 000000000..866b0f83e
--- /dev/null
+++ b/package/esound/files/esound.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf esd
diff --git a/package/esound/ipkg/esound.control b/package/esound/ipkg/esound.control
deleted file mode 100644
index aa1a8f34d..000000000
--- a/package/esound/ipkg/esound.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: esound
-Version: 0.2.8
-Section: net
-Priority: optional
-Depends: libaudiofile
-Description: Enlightened Sound Daemon
diff --git a/package/esound/ipkg/esound.postinst b/package/esound/ipkg/esound.postinst
deleted file mode 100644
index 866b0f83e..000000000
--- a/package/esound/ipkg/esound.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf esd
-- 
cgit v1.2.3