sync pptp with trunk, remove Config.in and ipkg not needed anymore.

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3828 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/pptp/Config.in b/package/pptp/Config.in
deleted file mode 100644 (file)
index 425473a..0000000
--- a/package/pptp/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config PACKAGE_PPTP
-       prompt "pptp.............................. PPTP (Point-to-Point Tunneling Protocol) client"
-       tristate
-       default m if DEVEL
-       select PACKAGE_KMOD_GRE
-       select PACKAGE_PPP
-       help
-         A Point-to-Point Tunneling Protocol Client 
-         
-         http://pptpclient.sourceforge.net/
-

diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp
index a9bc579..f401a36 100644 (file)
--- a/package/pptp/files/ifup.pptp
+++ b/package/pptp/files/ifup.pptp
@@ -9,7 +9,7 @@ eval "proto=\"\${${type}_proto}\""
        exit
 }
 
-[ -d "/var/lock" ] || mkdir -p /var/lock || exit 1
+mkdir -p /var/lock
 
 for module in slhc ppp_generic ppp_async ip_gre; do
        /sbin/insmod $module 2>&- >&-

diff --git a/package/pptp/ipkg/pptp.conffiles b/package/pptp/ipkg/pptp.conffiles
deleted file mode 100644 (file)
index 136db31..0000000
--- a/package/pptp/ipkg/pptp.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/ppp/options.pptp
\ No newline at end of file

diff --git a/package/pptp/ipkg/pptp.control b/package/pptp/ipkg/pptp.control
deleted file mode 100644 (file)
index e582c62..0000000
--- a/package/pptp/ipkg/pptp.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: pptp
-Priority: optional
-Section: net
-Description: a Point-to-Point Tunneling Protocol (PPTP) client
-Depends: ppp, kmod-gre