11 files changed, 13 insertions, 49 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index adf408a45..e24dcdd2c 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -9,18 +9,22 @@ PKG_NAME:=		ppp
 PKG_VERSION:=		2.4.4
 PKG_RELEASE:=		16
 PKG_MD5SUM:=		183800762e266132218b204dfb428d29
-MASTER_SITES:=		ftp://ftp.samba.org/pub/ppp/
+PKG_DESCR:=		a PPP (Point-to-Point Protocol) software (with MPPE/MPPC support)
+PKG_SECTION:=		net
+PKG_DEPENDS:=		kmod-ppp
+PKG_URL:=		http://ppp.samba.org
+PKG_SITES:=		ftp://ftp.samba.org/pub/ppp/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,PPP,ppp,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,PPP_MOD_PPPOA,ppp-mod-pppoa,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,PPP_MOD_RADIUS,ppp-mod-radius,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,PPP_MOD_CHAT,ppp-mod-chat,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PPP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_PPPOA,ppp-mod-pppoa,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_PPPOE,ppp-mod-pppoe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_RADIUS,ppp-mod-radius,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_CHAT,ppp-mod-chat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(ADK_IPV6),y)
 IPV6+=HAVE_INET6="1"
diff --git a/package/ppp/ipkg/ppp-mod-radius.conffiles b/package/ppp/files/ppp-mod-radius.conffiles
index 2cfa4a146..2cfa4a146 100644
--- a/package/ppp/ipkg/ppp-mod-radius.conffiles
+++ b/package/ppp/files/ppp-mod-radius.conffiles
diff --git a/package/ppp/ipkg/ppp.conffiles b/package/ppp/files/ppp.conffiles
index 8ad17eb43..8ad17eb43 100644
--- a/package/ppp/ipkg/ppp.conffiles
+++ b/package/ppp/files/ppp.conffiles
diff --git a/package/ppp/ipkg/ppp-mod-chat.control b/package/ppp/ipkg/ppp-mod-chat.control
deleted file mode 100644
index 43dbdb1e1..000000000
--- a/package/ppp/ipkg/ppp-mod-chat.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: chat
-Priority: optional
-Section: net
-Description: Utility for establishing a connection with the ISP's PPP server (e.g. via Modem)
-Depends: ppp
diff --git a/package/ppp/ipkg/ppp-mod-pppdump.control b/package/ppp/ipkg/ppp-mod-pppdump.control
deleted file mode 100644
index 4a89e152e..000000000
--- a/package/ppp/ipkg/ppp-mod-pppdump.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: pppdump
-Priority: optional
-Section: net
-Description: an utility to read PPP record file
-Depends: ppp
diff --git a/package/ppp/ipkg/ppp-mod-pppoa.control b/package/ppp/ipkg/ppp-mod-pppoa.control
deleted file mode 100644
index ce2d5d45f..000000000
--- a/package/ppp/ipkg/ppp-mod-pppoa.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ppp-mod-pppoa
-Priority: optional
-Section: net
-Description: a PPPoA (PPP over ATM) plugin for PPP
-Depends: ppp, kmod-pppoa
diff --git a/package/ppp/ipkg/ppp-mod-pppoe.control b/package/ppp/ipkg/ppp-mod-pppoe.control
deleted file mode 100644
index 7cf49636b..000000000
--- a/package/ppp/ipkg/ppp-mod-pppoe.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ppp-mod-pppoe
-Priority: optional
-Section: net
-Description: a PPPoE (PPP over Ethernet) plugin for PPP
-Depends: ppp, kmod-pppoe
diff --git a/package/ppp/ipkg/ppp-mod-pppstats.control b/package/ppp/ipkg/ppp-mod-pppstats.control
deleted file mode 100644
index 8780b2f87..000000000
--- a/package/ppp/ipkg/ppp-mod-pppstats.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: pppstats
-Priority: optional
-Section: net
-Description: an utility to report PPP statistics
-Depends: ppp
diff --git a/package/ppp/ipkg/ppp-mod-pppumts.control b/package/ppp/ipkg/ppp-mod-pppumts.control
deleted file mode 100644
index 178ae2413..000000000
--- a/package/ppp/ipkg/ppp-mod-pppumts.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: pppumts
-Priority: optional
-Section: net
-Depends: comgt, chat
-Description: Scripts and default configuration files to establish GPRS/UMTS connections
diff --git a/package/ppp/ipkg/ppp-mod-radius.control b/package/ppp/ipkg/ppp-mod-radius.control
deleted file mode 100644
index 0a858da30..000000000
--- a/package/ppp/ipkg/ppp-mod-radius.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ppp-mod-radius
-Priority: optional
-Section: net
-Description: a RADIUS plugin for PPP
-Depends: ppp
diff --git a/package/ppp/ipkg/ppp.control b/package/ppp/ipkg/ppp.control
deleted file mode 100644
index 2ebff521c..000000000
--- a/package/ppp/ipkg/ppp.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ppp
-Priority: optional
-Section: net
-Depends: kmod-ppp
-Description: a PPP (Point-to-Point Protocol) daemon (with MPPE/MPPC support)