fixes for common config functions

[openwrt.git] / package / pptp / Makefile

diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index b54b9d3..0478b4c 100644 (file)
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -4,35 +4,31 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptp
 PKG_VERSION:=1.6.0
 
 PKG_NAME:=pptp
 PKG_VERSION:=1.6.0

-PKG_RELEASE:=1
-PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631
+PKG_RELEASE:=3

 
 

-PKG_SOURCE_URL:=@SF/pptpclient
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

+PKG_SOURCE_URL:=@SF/pptpclient
+PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631

 PKG_CAT:=zcat
 
 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)/.configured
-
-$(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC=$(TARGET_CC) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               all
-       touch $(PKG_BUILD_DIR)/.built
-
-$(IPKG_PPTP):
-       install -d -m0755 $(IDIR_PPTP)/etc/init.d
-       install -m0755 ./files/pptp.init $(IDIR_PPTP)/etc/init.d/S50pptp
-       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:=base
+# CATEGORY:=FIXME
+TITLE:=PPTP (Point-to-Point Tunneling Protocol) client
+DESCRIPTION:=A Point-to-Point Tunneling Protocol Client
+URL:=http://pptpclient.sourceforge.net/
+endef
+
+define Package/pptp/install
+       install -d -m0755 $(1)/etc/ppp
+       install -m0644 ./files/options.pptp $(1)/etc/ppp/
+       install -d -m0755 $(1)/sbin
+       install -m0755 ./files/ifup.pptp $(1)/sbin/
+       install -d -m0755 $(1)/usr/sbin
+       install -m0755 $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,pptp))