X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fpptp%2FMakefile;h=76e0f6e644cfcb9638755424fdd00f91987257a0;hb=5dff535f6621f15a6014cc363b13cb5354e09fb5;hp=776a668640083817d165d7e3ab1dbb8f9186daa8;hpb=44ba04efe200178dd52943b2c1edd8418fbac0ba;p=openwrt.git

diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 776a668640..76e0f6e644 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -1,34 +1,41 @@
-# $Id$
+# 
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptp
 PKG_VERSION:=1.6.0
-PKG_RELEASE:=3
+PKG_RELEASE:=6
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/pptpclient
 PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631
-PKG_CAT:=zcat
 
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/pptp
-SECTION:=base
-# CATEGORY:=FIXME
-TITLE:=PPTP (Point-to-Point Tunneling Protocol) client
-DESCRIPTION:=A Point-to-Point Tunneling Protocol Client
-URL:=http://pptpclient.sourceforge.net/
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=PPTP client
+  URL:=http://pptpclient.sourceforge.net/
+  DEPENDS:=+ppp +kmod-gre
+endef
+
+define Package/pptp/daemon
+ This package contains a PPTP (Point-to-Point Tunneling Protocol) client.
 endef
 
 define Package/pptp/install
-	install -d -m0755 $(1)/sbin
-	install -d -m0755 $(1)/etc/ppp
-	install -d -m0755 $(1)/usr/sbin
-	install -m0755 ./files/ifup.pptp $(1)/sbin/ifup.pptp
-	install -m0644 ./files/options.pptp $(1)/etc/ppp/
-	install -m0755 $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/ppp
+	$(INSTALL_DATA) ./files/options.pptp $(1)/etc/ppp/
+	$(INSTALL_DIR) $(1)/lib/network
+	$(INSTALL_BIN) ./files/pptp.sh $(1)/lib/network/
 endef
 
 $(eval $(call BuildPackage,pptp))