From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 30 May 2009 20:39:07 +0200
Subject: optimize ipkg package management

- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
  set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)

more cleanups needed after allmodconfig
---
 package/vtun/Makefile             | 14 ++++++--------
 package/vtun/files/vtun.conffiles |  1 +
 package/vtun/ipkg/vtun.conffiles  |  1 -
 package/vtun/ipkg/vtun.control    |  5 -----
 4 files changed, 7 insertions(+), 14 deletions(-)
 create mode 100644 package/vtun/files/vtun.conffiles
 delete mode 100644 package/vtun/ipkg/vtun.conffiles
 delete mode 100644 package/vtun/ipkg/vtun.control

(limited to 'package/vtun')

diff --git a/package/vtun/Makefile b/package/vtun/Makefile
index a61fe61c6..215615074 100644
--- a/package/vtun/Makefile
+++ b/package/vtun/Makefile
@@ -9,26 +9,24 @@ PKG_NAME:=		vtun
 PKG_VERSION:=		3.0.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c342ffe77055d4248a38f0b380f28c1b
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=vtun/}
+PKG_DESCR:=		A VPN tunnel daemon
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libopenssl zlib kmod-tun
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=vtun/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,VTUN,vtun,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,VTUN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \
 			--disable-lzo
-#CONFIGURE_ENV+=		LIBS="${TLDFLAGS}" \
-#			BLOWFISH_HDR_DIR="${STAGING_DIR}/usr/include/openssl" \
-#			LZO_HDR_DIR="${STAGING_DIR}/usr/include/lzo" \
-#			SSL_HDR_DIR="${STAGING_DIR}/usr/include/openssl"
 BUILD_STYLE:=		auto
 ALL_TARGET:=		vtund
 
 do-install:
-	${INSTALL_DIR} ${IDIR_VTUN}/etc/
+	${INSTALL_DIR} ${IDIR_VTUN}/usr/sbin ${IDIR_VTUN}/etc
 	${INSTALL_DATA} ${WRKBUILD}/vtund.conf ${IDIR_VTUN}/etc/
-	${INSTALL_DIR} ${IDIR_VTUN}/usr/sbin/
 	${INSTALL_BIN} ${WRKBUILD}/vtund ${IDIR_VTUN}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/vtun/files/vtun.conffiles b/package/vtun/files/vtun.conffiles
new file mode 100644
index 000000000..1195041c5
--- /dev/null
+++ b/package/vtun/files/vtun.conffiles
@@ -0,0 +1 @@
+/etc/vtund.conf
diff --git a/package/vtun/ipkg/vtun.conffiles b/package/vtun/ipkg/vtun.conffiles
deleted file mode 100644
index 1195041c5..000000000
--- a/package/vtun/ipkg/vtun.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/vtund.conf
diff --git a/package/vtun/ipkg/vtun.control b/package/vtun/ipkg/vtun.control
deleted file mode 100644
index 6d823de1e..000000000
--- a/package/vtun/ipkg/vtun.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: vtun
-Priority: optional
-Section: net
-Description: A VPN tunnel daemon
-Depends: libopenssl, liblzo, zlib, kmod-tun
-- 
cgit v1.2.3