From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 7 Feb 2010 20:03:20 +0100
Subject: change defaults for CONFIG/BUILD/INSTALL styles

All packages need an update, so here is a very huge commit.
Most of the 460 source packages use automatic style for configuration,
building and installing. Make these styles default to "auto".
If you have a package, which does not conform to this, just use
manual style and add a do-$task make target.

I added a new style named AUTOTOOL style, which is needed for some
broken packages, which needs to be updated via autoconf or automake.

I renamed CONFIGURE_STYLE to CONFIG_STYLE.

Updates for some packages, which have newer upstream versions.

Renaming of all package/*/extra directories. Use the directory
src/ to provide overwrites of source files or to add the code, when
no upstream package is available or used. src directory will be automatically
used.
---
 package/openvpn/Makefile | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

(limited to 'package/openvpn')

diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index e4fbce369..e8af513fe 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -6,29 +6,23 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		openvpn
 PKG_VERSION:=		2.1.0
 PKG_RELEASE:=		1
-ifeq ($(ADK_PACKAGE_LIBOPENSSL),y)
-PKG_BUILDDEP+=		openssl
-endif
-ifeq ($(ADK_PACKAGE_OPENVPN_LZO),y)
-PKG_BUILDDEP+=		liblzo
-endif
 PKG_MD5SUM:=		452a83326ae198cf961e9ae02539c8fb
 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
-
 ifeq ($(ADK_COMPILE_OPENVPN_WITH_OPENSSL),y)
 PKG_DEPENDS+=		libopenssl
+PKG_BUILDDEP+=		openssl
 endif
-
 ifneq ($(ADK_COMPILE_OPENVPN_WITH_LZO),y)
 PKG_DEPENDS+=		liblzo
+PKG_BUILDDEP+=		liblzo
 endif
+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,${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}))
@@ -44,7 +38,6 @@ 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
@@ -55,7 +48,6 @@ ifeq ($(ADK_COMPILE_OPENVPN_WITH_SMALL),y)
 ENABLE_SMALL:=--enable-small
 endif
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-pthread \
 			--disable-plugins \
 			--disable-management \
@@ -70,8 +62,6 @@ CONFIGURE_ARGS+=	--disable-pthread \
 			$(DISABLE_HTTP) \
 			$(ENABLE_PASSWORD_SAVE) \
 			$(ENABLE_SMALL)
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	# main package
@@ -79,12 +69,15 @@ post-install:
 	${INSTALL_BIN} $(WRKINST)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/
 	$(CP) ./files/openvpn.conf $(IDIR_OPENVPN)/etc/openvpn/
 	# subpackage easy-rsa
-	${INSTALL_DIR} $(IDIR_OPENVPN_EASY_RSA)/usr/sbin $(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_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
+	${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
-- 
cgit v1.2.3