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/rp-pppoe/Makefile | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

(limited to 'package/rp-pppoe/Makefile')

diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile
index ec8d5ce80..679b4d1b7 100644
--- a/package/rp-pppoe/Makefile
+++ b/package/rp-pppoe/Makefile
@@ -9,14 +9,20 @@ PKG_NAME:=		rp-pppoe
 PKG_VERSION:=		3.10
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d58a13cc4185bca6121a606ff456dec0
-MASTER_SITES:=		http://www.roaringpenguin.com/files/download/
+PKG_DESCR:=		PPPoE (PPP over Ethernet) tools
+PKG_SECTION:=		net
+PKG_DEPENDS:=		ppp
+PKG_URL:=		http://www.roaringpenguin.com
+PKG_SITES:=		http://www.roaringpenguin.com/files/download/
+
+WRKSRC:=		${WRKDIST}/src
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,PPPOE_CLIENT,pppoe-client,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,PPPOE_RELAY,pppoe-relay,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,PPPOE_SERVER,pppoe-server,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,PPPOE_SNIFF,pppoe-sniff,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PPPOE_CLIENT,pppoe-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPPOE_RELAY,pppoe-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPPOE_SERVER,pppoe-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPPOE_SNIFF,pppoe-sniff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_func_setvbuf_reversed=no \
@@ -27,14 +33,9 @@ CONFIGURE_ENV+=		ac_cv_func_setvbuf_reversed=no \
 			ac_cv_pack_bitfields_reversed=yes
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
-WRKSRC:=		${WRKDIST}/src
 
 post-install:
-	${INSTALL_DIR} ${IDIR_PPPOE_CLIENT}/etc/init.d
-	${INSTALL_DIR} ${IDIR_PPPOE_CLIENT}/etc/ppp
-	${INSTALL_DIR} ${IDIR_PPPOE_CLIENT}/usr/sbin
-	${INSTALL_BIN} ./files/pppoe-client.init \
-		${IDIR_PPPOE_CLIENT}/etc/init.d/pppoe-client
+	${INSTALL_DIR} ${IDIR_PPPOE_CLIENT}/etc/ppp ${IDIR_PPPOE_CLIENT}/usr/sbin
 	${INSTALL_DATA} ${WRKINST}/etc/ppp/pppoe.conf ${IDIR_PPPOE_CLIENT}/etc/ppp
 	${CP} ${WRKINST}/usr/sbin/pppoe ${IDIR_PPPOE_CLIENT}/usr/sbin/
 	${CP} ${WRKINST}/usr/sbin/pppoe-connect ${IDIR_PPPOE_CLIENT}/usr/sbin/
@@ -42,16 +43,9 @@ post-install:
 	${CP} ${WRKINST}/usr/sbin/pppoe-stop ${IDIR_PPPOE_CLIENT}/usr/sbin/
 	${CP} ${WRKINST}/usr/sbin/pppoe-status ${IDIR_PPPOE_CLIENT}/usr/sbin/
 	${CP} ${WRKINST}/usr/sbin/pppoe-setup ${IDIR_PPPOE_CLIENT}/usr/sbin/
-	${INSTALL_DIR} ${IDIR_PPPOE_RELAY}/etc/init.d
 	${INSTALL_DIR} ${IDIR_PPPOE_RELAY}/usr/sbin
-	${INSTALL_BIN} ./files/pppoe-relay.init \
-		${IDIR_PPPOE_RELAY}/etc/init.d/pppoe-relay
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-relay ${IDIR_PPPOE_RELAY}/usr/sbin/
-	${INSTALL_DIR} ${IDIR_PPPOE_SERVER}/etc/init.d
-	${INSTALL_DIR} ${IDIR_PPPOE_SERVER}/etc/ppp
-	${INSTALL_DIR} ${IDIR_PPPOE_SERVER}/usr/sbin
-	${INSTALL_BIN} ./files/pppoe-server.init \
-		${IDIR_PPPOE_SERVER}/etc/init.d/pppoe-server
+	${INSTALL_DIR} ${IDIR_PPPOE_SERVER}/etc/ppp ${IDIR_PPPOE_SERVER}/usr/sbin
 	${INSTALL_DATA} ${WRKINST}/etc/ppp/pppoe-server-options ${IDIR_PPPOE_SERVER}/etc/ppp/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-server ${IDIR_PPPOE_SERVER}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_PPPOE_SNIFF}/usr/sbin
-- 
cgit v1.2.3