Update net/openvpn to 2.1rc4. Changes from version 2.1rc2 include:

* Fixed 64-bit portability bug in time_string function
  (Thomas Habets).

* Clean up configure on FreeBSD for recent autotool versions
  that require that all .h files have to be compiled.
  Also, FreeBSD install does not support GNU long options
  which the Makefile in easy-rsa/2.0 uses (not checked the
  others as we don't install those on Gentoo) (Roy Marples).

1 files changed, 28 insertions, 26 deletions

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index d53edb41be8..2f156a19520 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2007/02/28 11:06:21 sborrill Exp $
+# $NetBSD: Makefile,v 1.21 2007/06/21 21:44:42 jlam Exp $
 #
 
-DISTNAME=	openvpn-2.1_rc2
-PKGNAME=	openvpn-2.1rc2
+DISTNAME=	openvpn-2.1_rc4
+PKGNAME=	openvpn-2.1rc4
 
 CATEGORIES=	net
 MASTER_SITES=	http://openvpn.net/release/ \
@@ -22,13 +22,18 @@ PKG_SYSCONFSUBDIR=	openvpn
 DATADIR=		${PREFIX}/share/${PKGBASE}
 DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+EASYRSADIR=		${DATADIR}/easy-rsa
 RCD_SCRIPTS=		openvpn
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--enable-pthread
 CONFIGURE_ARGS+=	--enable-password-save
 CONFIGURE_ARGS+=	--disable-dependency-tracking
 
+# Pthread support is still considered very experimental, so don't enable
+# it for the default (production) build.
+#
+#CONFIGURE_ARGS+=	--enable-pthread
+
 INSTALLATION_DIRS=	${DATADIR}/easy-rsa	${EGDIR}/config		\
 			${DOCDIR}		${EGDIR}/keys		\
 						${EGDIR}/scripts
@@ -43,35 +48,32 @@ DL_AUTO_VARS=		yes
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
-# Fix up the paths to tools in the pkitool script.
-post-build:
-	for file in ${WRKSRC}/easy-rsa/2.0/pkitool; do			\
-		${SED}	-e "s|^\\(GREP\\)=.*|\\1=\""${GREP}"\"|"		\
-			-e "s|^\\(OPENSSL\\)=.*|\\1=\""${SSLBASE}/bin/openssl"\"|" \
-			$$file > $$file.new;				\
-		${MV} -f $$file.new $$file;				\
-		${CHMOD} +x $$file;					\
-	done
+SUBST_CLASSES+=		pkitool
+SUBST_STAGE.pkitool=	post-build
+SUBST_MESSAGE.pkitool=	Fixing up default paths to grep & openssl in pkitool.
+SUBST_FILES.pkitool=	easy-rsa/2.0/pkitool
+SUBST_SED.pkitool=	\
+	-e "s|\\(GREP\\)=.*|\\1=\""${GREP:Q}"\"|"			\
+	-e "s|\\(OPENSSL\\)=.*|\\1=\""${SSLBASE:Q}/bin/openssl"\"|"
 
 post-install:
-	dir=${DATADIR:S/^${PREFIX}\///}/easy-rsa;			\
-	cd ${WRKSRC}/easy-rsa/2.0;					\
-	${GREP} "^$$dir/" ${PKGDIR}/PLIST | ${SED} "s|^$$dir/||" |	\
-	while read file; do						\
+	cd ${WRKSRC:Q}/easy-rsa/2.0; for file in [a-zR]*; do		\
 		case $$file in						\
-		[A-Z]*|*.cnf|vars)	${INSTALL_DATA} $$file ${PREFIX}/$$dir ;; \
-		*)		${INSTALL_SCRIPT} $$file ${PREFIX}/$$dir ;; \
+		*.orig)	;;						\
+		[A-Z]*|*.cnf|vars)					\
+			${INSTALL_DATA} $$file ${EASYRSADIR:Q} ;;	\
+		*)	${INSTALL_SCRIPT} $$file ${EASYRSADIR:Q} ;;	\
 		esac;							\
 	done
-	${INSTALL_DATA} ${WRKSRC}/management/management-notes.txt ${DOCDIR}
-	cd ${WRKSRC}/sample-config-files; for file in *; do		\
-		${INSTALL_DATA} $$file ${EGDIR}/config;			\
+	${INSTALL_DATA} ${WRKSRC:Q}/management/management-notes.txt ${DOCDIR:Q}
+	cd ${WRKSRC:Q}/sample-config-files; for file in *; do		\
+		${INSTALL_DATA} $$file ${EGDIR:Q}/config;		\
 	done
-	cd ${WRKSRC}/sample-scripts; for file in *; do			\
-		${INSTALL_DATA} $$file ${EGDIR}/scripts;		\
+	cd ${WRKSRC:Q}/sample-scripts; for file in *; do		\
+		${INSTALL_DATA} $$file ${EGDIR:Q}/scripts;		\
 	done
-	cd ${WRKSRC}/sample-keys; for file in *; do			\
-		${INSTALL_DATA} $$file ${EGDIR}/keys;			\
+	cd ${WRKSRC:Q}/sample-keys; for file in *; do			\
+		${INSTALL_DATA} $$file ${EGDIR:Q}/keys;			\
 	done
 
 .include "../../mk/bsd.pkg.mk"