From 05ae28286c534ac8840e0ca61962cc78ab1f45c3 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 14 Dec 2005 19:09:22 +0000
Subject: [PATCH] fix download url, add target optimization cflags,
 ipkg/conffiles, add Id tag to the Makefile.

SVN-Revision: 2671
---
 openwrt/package/l2tpns/Makefile              | 23 +++++++++++++++-----
 openwrt/package/l2tpns/ipkg/l2tpns.conffiles |  3 +++
 openwrt/package/l2tpns/ipkg/l2tpns.control   |  3 +--
 3 files changed, 22 insertions(+), 7 deletions(-)
 mode change 100755 => 100644 openwrt/package/l2tpns/Makefile
 create mode 100644 openwrt/package/l2tpns/ipkg/l2tpns.conffiles
 mode change 100755 => 100644 openwrt/package/l2tpns/ipkg/l2tpns.control

diff --git a/openwrt/package/l2tpns/Makefile b/openwrt/package/l2tpns/Makefile
old mode 100755
new mode 100644
index 6f2406eecc..e138f51a9a
--- a/openwrt/package/l2tpns/Makefile
+++ b/openwrt/package/l2tpns/Makefile
@@ -1,14 +1,17 @@
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=l2tpns
 PKG_VERSION:=2.1.14
 PKG_RELEASE:=1
 PKG_MD5SUM:=2a0ee2a3678160c335f1d68c17c4f871
-PKG_SOURCE_URL:=@SF/L2TPNS
+
+PKG_SOURCE_URL:=@SF/l2tpns
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
@@ -19,11 +22,21 @@ $(PKG_BUILD_DIR)/.configured:
 	touch $@
 
 $(PKG_BUILD_DIR)/.built:
-	$(MAKE) CC=$(TARGET_CC) LD=$(TARGET_CC) DESTDIR=$(PKG_INSTALL_DIR) STAGING_DIR=$(STAGING_DIR) -C $(PKG_BUILD_DIR) install
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC=$(TARGET_CC) \
+		LD=$(TARGET_CC) \
+		OPTIM="$(TARGET_CFLAGS)" \
+		DESTDIR=$(PKG_INSTALL_DIR) \
+		STAGING_DIR=$(STAGING_DIR) \
+		all install
 	touch $@
 
 $(IPKG_L2TPNS):
-	mkdir -p $(IDIR_L2TPNS)
-	cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_L2TPNS)/
+	install -d -m0755 $(IDIR_L2TPNS)/etc/l2tpns
+	cp -fpR $(PKG_INSTALL_DIR)/etc/l2tpns/* $(IDIR_L2TPNS)/etc/l2tpns/
+	install -d -m0755 $(IDIR_L2TPNS)/usr/lib/l2tpns
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/l2tpns/* $(IDIR_L2TPNS)/usr/lib/l2tpns/
+	install -d -m0755 $(IDIR_L2TPNS)/usr/sbin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_L2TPNS)/usr/sbin/
 	$(RSTRIP) $(IDIR_L2TPNS)
 	$(IPKG_BUILD) $(IDIR_L2TPNS) $(PACKAGE_DIR)
diff --git a/openwrt/package/l2tpns/ipkg/l2tpns.conffiles b/openwrt/package/l2tpns/ipkg/l2tpns.conffiles
new file mode 100644
index 0000000000..eaf3a50954
--- /dev/null
+++ b/openwrt/package/l2tpns/ipkg/l2tpns.conffiles
@@ -0,0 +1,3 @@
+/etc/l2tpns/ip_pool
+/etc/l2tpns/startup-config
+/etc/l2tpns/users
diff --git a/openwrt/package/l2tpns/ipkg/l2tpns.control b/openwrt/package/l2tpns/ipkg/l2tpns.control
old mode 100755
new mode 100644
index 6928c2ee37..1946f88880
--- a/openwrt/package/l2tpns/ipkg/l2tpns.control
+++ b/openwrt/package/l2tpns/ipkg/l2tpns.control
@@ -1,5 +1,4 @@
 Package: l2tpns
 Section: net
-Architecture: mipsel
 Priority: optional
-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.
\ No newline at end of file
+Description: A layer 2 tunneling protocol network server (LNS).
-- 
2.34.1