Update glib2 to 2.16.5 and some package cleanups.

[openwrt/svn-archive/archive.git] / net / l2tpns / Makefile

diff --git a/net/l2tpns/Makefile b/net/l2tpns/Makefile
index fd44dab90b5a921d109c1f2e4d0642f10464e67e..00f946c3a0fa99d32785dd6d9adeef8a19c6f494 100644 (file)
--- a/net/l2tpns/Makefile
+++ b/net/l2tpns/Makefile
@@ -9,16 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=l2tpns
-PKG_VERSION:=2.1.14
+PKG_VERSION:=2.1.21
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/l2tpns
-PKG_MD5SUM:=2a0ee2a3678160c335f1d68c17c4f871
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=385c58055723ebc6c38062acd2db9c2c
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,12 +23,15 @@ define Package/l2tpns
   CATEGORY:=Network
   DEPENDS:=+libcli
   TITLE:=An L2TP enhanced server
-  DESCRIPTION:=\
-       l2tpns is a layer 2 tunneling protocol network server (LNS).\\\
-       it supports up to 65535 concurrent sessions per server/cluster \\\
-       plus ISP features such as rate limiting, walled garden, usage \\\
-       accounting, and more.
   URL:=http://sourceforge.net/projects/l2tpns
+  SUBMENU:=VPN
+endef
+
+define Package/l2tpns/description
+       l2tpns is a layer 2 tunneling protocol network server (LNS).
+       it supports up to 65535 concurrent sessions per server/cluster
+       plus ISP features such as rate limiting, walled garden, usage
+       accounting, and more.
 endef
 
 define Package/l2tpns/conffiles
@@ -52,12 +51,12 @@ define Build/Compile
 endef
 
 define Package/l2tpns/install  
-       install -d -m0755 $(1)/etc/l2tpns
+       $(INSTALL_DIR) $(1)/etc/l2tpns
        $(CP) $(PKG_INSTALL_DIR)/etc/l2tpns/* $(1)/etc/l2tpns/
-       install -d -m0755 $(1)/usr/lib/l2tpns
+       $(INSTALL_DIR) $(1)/usr/lib/l2tpns
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/l2tpns/* $(1)/usr/lib/l2tpns/
-       install -d -m0755 $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,l2tpns))