5 files changed, 25 insertions, 30 deletions
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index 879882a0b..b18303d75 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -9,32 +9,38 @@ PKG_NAME:=		openvpn
 PKG_VERSION:=		2.0.9
 PKG_RELEASE:=		7
 PKG_MD5SUM:=		60745008b90b7dbe25fe8337c550fec6
-
-MASTER_SITES:=		http://openvpn.net/release/ \
+PKG_DESCR:=		Open Source VPN solution using SSL
+PKG_SECTION:=		net
+PKG_DEPENDS:=		kmod-tun
+PKG_URL:=		http://openvpn.net
+PKG_SITES:=		http://openvpn.net/release/ \
 			${MASTER_SITE_SOURCEFORGE:=openvpn/}
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,OPENVPN_EASY_RSA,openvpn-easy-rsa,$(PKG_VERSION)-$(PKG_RELEASE)))
+ifeq ($(ADK_COMPILE_OPENVPN_WITH_OPENSSL),y)
+PKG_DEPENDS+=		libopenssl
+endif
+
+ifneq ($(ADK_COMPILE_OPENVPN_WITH_LZO),y)
+PKG_DEPENDS+=		liblzo
+endif
 
-PKG_DEPEND:="kmod-tun"
+$(eval $(call PKG_template,OPENVPN,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,OPENVPN_EASY_RSA,openvpn-easy-rsa,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifneq ($(ADK_COMPILE_OPENVPN_WITH_OPENSSL),y)
 DISABLE_OPENSSL:=--disable-ssl --disable-crypto
-else
-PKG_DEPEND+=", libopenssl"
 endif
 
 ifneq ($(ADK_COMPILE_OPENVPN_WITH_LZO),y)
 DISABLE_LZO:=--disable-lzo
-else
-PKG_DEPEND+=", liblzo"
 endif
 
 ifneq ($(ADK_COMPILE_OPENVPN_WITH_SERVER),y)
 DISABLE_SERVER:=--disable-server
 endif
+
 ifneq ($(ADK_COMPILE_OPENVPN_WITH_HTTP),y)
 DISABLE_HTTP:=--disable-http
 endif
@@ -67,20 +73,16 @@ INSTALL_STYLE=		auto
 
 post-install:
 	# main package
-	install -d -m0755 $(IDIR_OPENVPN)/usr/sbin
-	$(CP) $(WRKINST)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/
-	install -d -m0755 $(IDIR_OPENVPN)/etc/init.d
-	$(CP) ./files/openvpn.init $(IDIR_OPENVPN)/etc/init.d/openvpn
-	install -d -m0755 $(IDIR_OPENVPN)/etc/openvpn
+	${INSTALL_DIR} $(IDIR_OPENVPN)/usr/sbin $(IDIR_OPENVPN)/etc/openvpn
+	${INSTALL_BIN} $(WRKINST)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/
 	$(CP) ./files/openvpn.conf $(IDIR_OPENVPN)/etc/openvpn/
-	echo "Depends: $(PKG_DEPEND)" >> $(IDIR_OPENVPN)/CONTROL/control
 	# subpackage easy-rsa
-	install -d -m0755 $(IDIR_OPENVPN_EASY_RSA)/usr/sbin
-	install -d -m0755 $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/keys
+	${INSTALL_DIR} $(IDIR_OPENVPN_EASY_RSA)/usr/sbin $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/keys
 	touch $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/keys/index.txt
 	$(CP) ./files/serial $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/keys
-	$(CP) $(WRKBUILD)/easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,pkitool,revoke-full,sign-req,whichopensslcnf} $(IDIR_OPENVPN_EASY_RSA)/usr/sbin
-	install -m 0644 $(WRKBUILD)/easy-rsa/2.0/openssl.cnf $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/openssl.cnf
-	install -m 0644 $(WRKBUILD)/easy-rsa/2.0/vars $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/vars
+	$(CP) $(WRKBUILD)/easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,pkitool,revoke-full,sign-req,whichopensslcnf} \
+		$(IDIR_OPENVPN_EASY_RSA)/usr/sbin
+	${INSTALL_DATA} $(WRKBUILD)/easy-rsa/2.0/openssl.cnf $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/openssl.cnf
+	${INSTALL_DATA} $(WRKBUILD)/easy-rsa/2.0/vars $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/vars
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openvpn/files/openvpn.init b/package/openvpn/files/openvpn.init
index 5fe02af59..4c147b4bd 100644
--- a/package/openvpn/files/openvpn.init
+++ b/package/openvpn/files/openvpn.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG openvpn
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/openvpn/ipkg/openvpn.postinst b/package/openvpn/files/openvpn.postinst
index 576ddd9f5..576ddd9f5 100644
--- a/package/openvpn/ipkg/openvpn.postinst
+++ b/package/openvpn/files/openvpn.postinst
diff --git a/package/openvpn/ipkg/openvpn-easy-rsa.control b/package/openvpn/ipkg/openvpn-easy-rsa.control
deleted file mode 100644
index 6ce25a46a..000000000
--- a/package/openvpn/ipkg/openvpn-easy-rsa.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: openvpn-easy-rsa
-Priority: optional
-Section: net
-Description: collection of shell scripts to manage a simple CA infrastructure
-Depends: openssl-util
diff --git a/package/openvpn/ipkg/openvpn.control b/package/openvpn/ipkg/openvpn.control
deleted file mode 100644
index 50f06bacb..000000000
--- a/package/openvpn/ipkg/openvpn.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: openvpn
-Priority: optional
-Section: net
-Description: Open Source VPN solution using SSL