fix jffs2 and mini_fo mount in failsafe (patch from #7134)

[openwrt.git] / package / pptp / Makefile

diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 3334f23..76e0f6e 100644 (file)
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -1,38 +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:=2
-PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631
+PKG_RELEASE:=6
 
-PKG_SOURCE_URL:=@SF/pptpclient
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(TOPDIR)/package/rules.mk
-
-$(eval $(call PKG_template,PPTP,pptp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured:
-       touch $@
-
-$(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC=$(TARGET_CC) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               all
-       touch $@
+PKG_SOURCE_URL:=@SF/pptpclient
+PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631
 
-$(IPKG_PPTP):
-       install -d -m0755 $(IDIR_PPTP)/sbin
-       install -m0755 ./files/ifup.pptp $(IDIR_PPTP)/sbin/ifup.pptp
-       install -d -m0755 $(IDIR_PPTP)/etc/ppp
-       install -m0644 ./files/options.pptp $(IDIR_PPTP)/etc/ppp/
-       install -d -m0755 $(IDIR_PPTP)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/pptp $(IDIR_PPTP)/usr/sbin/
-       $(RSTRIP) $(IDIR_PPTP)
-       $(IPKG_BUILD) $(IDIR_PPTP) $(PACKAGE_DIR)
+include $(INCLUDE_DIR)/package.mk
+
+define Package/pptp
+  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_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))