4 files changed, 16 insertions, 62 deletions
diff --git a/package/rp-pppoe/Config.in b/package/rp-pppoe/Config.in
deleted file mode 100644
index 6d27ecb4b..000000000
--- a/package/rp-pppoe/Config.in
+++ /dev/null
@@ -1,50 +0,0 @@
-#menu "rp-pppoe.......................... Roaring Penguin PPPoE (PPP over Ethernet) implementation"
-
-config ADK_COMPILE_RP_PPPOE
-	tristate
-	default n
-	depends on ADK_PACKAGE_PPPOE_CLIENT || ADK_PACKAGE_PPPOE_RELAY || ADK_PACKAGE_PPPOE_SERVER || ADK_PACKAGE_PPPOE_SNIFF
-
-config ADK_PACKAGE_PPPOE_CLIENT
-	prompt "pppoe-client...................... PPPoE (PPP over Ethernet) client"
-	tristate
-	default n
-	select ADK_COMPILE_RP_PPPOE
-	select ADK_PACKAGE_PPP
-	help
-	  PPPoE (PPP over Ethernet) client
-	  
-	  http://roaringpenguin.com/penguin/open_source_rp-pppoe.php
-
-config ADK_PACKAGE_PPPOE_RELAY
-	prompt "pppoe-relay....................... PPPoE (PPP over Ethernet) relay"
-	tristate
-	default n
-	select ADK_COMPILE_RP_PPPOE
-	help
-	  PPPoE (PPP over Ethernet) relay
-	  
-	  http://roaringpenguin.com/penguin/open_source_rp-pppoe.php
-
-config ADK_PACKAGE_PPPOE_SERVER
-	prompt "pppoe-server...................... PPPoE (PPP over Ethernet) server"
-	tristate
-	default n
-	select ADK_COMPILE_RP_PPPOE
-	select ADK_PACKAGE_PPP
-	help
-	  PPPoE (PPP over Ethernet) server
-	  
-	  http://roaringpenguin.com/penguin/open_source_rp-pppoe.php
-
-config ADK_PACKAGE_PPPOE_SNIFF
-	prompt "pppoe-sniff....................... PPPoE (PPP over Ethernet) frame sniffer"
-	tristate
-	default n
-	select ADK_COMPILE_RP_PPPOE
-	help
-	  PPPoE (PPP over Ethernet) frame sniffer
-	  
-	  http://roaringpenguin.com/penguin/open_source_rp-pppoe.php
-
-#endmenu
diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile
index c79f76869..a507e4a39 100644
--- a/package/rp-pppoe/Makefile
+++ b/package/rp-pppoe/Makefile
@@ -22,19 +22,18 @@ $(eval $(call PKG_template,PPPOE_RELAY,pppoe-relay,${PKG_VERSION}-${PKG_RELEASE}
 $(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 \
 			ac_cv_sizeof_unsigned_short=2 \
 			ac_cv_sizeof_unsigned_int=4 \
 			ac_cv_sizeof_unsigned_long=4 \
 			ac_cv_linux_kernel_pppoe=yes \
 			ac_cv_pack_bitfields_reversed=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_PPPOE_CLIENT}/etc/ppp ${IDIR_PPPOE_CLIENT}/usr/sbin
-	${INSTALL_DATA} ${WRKINST}/etc/ppp/pppoe.conf ${IDIR_PPPOE_CLIENT}/etc/ppp
+	${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/
 	${CP} ${WRKINST}/usr/sbin/pppoe-start ${IDIR_PPPOE_CLIENT}/usr/sbin/
@@ -42,11 +41,16 @@ post-install:
 	${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}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-relay ${IDIR_PPPOE_RELAY}/usr/sbin/
-	${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_BIN} ${WRKINST}/usr/sbin/pppoe-relay \
+		${IDIR_PPPOE_RELAY}/usr/sbin/
+	${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
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-sniff ${IDIR_PPPOE_SNIFF}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-sniff \
+		${IDIR_PPPOE_SNIFF}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rp-pppoe/files/pppoe-relay.init b/package/rp-pppoe/files/pppoe-relay.init
index 5998b5291..458a47eaf 100644
--- a/package/rp-pppoe/files/pppoe-relay.init
+++ b/package/rp-pppoe/files/pppoe-relay.init
@@ -14,7 +14,7 @@ start)
 	pppoe-relay $pppoe_relay_flags
 	;;
 stop)
-	killall pppoe-relay
+	pkill pppoe-relay
 	;;
 restart)
 	sh $0 stop
diff --git a/package/rp-pppoe/files/pppoe-server.init b/package/rp-pppoe/files/pppoe-server.init
index f8c7c7fd5..b078110a0 100644
--- a/package/rp-pppoe/files/pppoe-server.init
+++ b/package/rp-pppoe/files/pppoe-server.init
@@ -14,7 +14,7 @@ start)
 	pppoe-server
 	;;
 stop)
-	killall pppoe-server
+	pkill pppoe-server
 	;;
 restart)
 	sh $0 stop