From owner-svn-ports-all@freebsd.org Tue Oct 20 15:03:45 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id CFD11A1A75C;
Tue, 20 Oct 2015 15:03:45 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 79D34A02;
Tue, 20 Oct 2015 15:03:45 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9KF3iqA063895;
Tue, 20 Oct 2015 15:03:44 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9KF3icJ063894;
Tue, 20 Oct 2015 15:03:44 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201510201503.t9KF3icJ063894@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Tue, 20 Oct 2015 15:03:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r399858 - head/security/openvpn
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Oct 2015 15:03:45 -0000
Author: mat
Date: Tue Oct 20 15:03:44 2015
New Revision: 399858
URL: https://svnweb.freebsd.org/changeset/ports/399858
Log:
Use options helpers.
Sponsored by: Absolight
Modified:
head/security/openvpn/Makefile
Modified: head/security/openvpn/Makefile
==============================================================================
--- head/security/openvpn/Makefile Tue Oct 20 14:47:46 2015 (r399857)
+++ head/security/openvpn/Makefile Tue Oct 20 15:03:44 2015 (r399858)
@@ -46,27 +46,19 @@ PW_SAVE_CONFIGURE_ENABLE= password-save
X509ALTUSERNAME_CONFIGURE_ENABLE= x509-alt-username
-.include <bsd.port.options.mk>
+X509ALTUSERNAME_PREVENTS= POLARSSL
+X509ALTUSERNAME_PREVENTS_MSG= OpenVPN ${DISTVERSION} cannot use --x509-username-field with PolarSSL. Disable X509ALTUSERNAME, or use OpenSSL instead
-.if ${PORT_OPTIONS:MPOLARSSL}
-. if ${PORT_OPTIONS:MX509ALTUSERNAME}
-BROKEN= OpenVPN ${DISTVERSION} cannot use --x509-username-field with PolarSSL. Disable X509ALTUSERNAME, or use OpenSSL instead
-. else
-LIB_DEPENDS+= libpolarssl.so:${PORTSDIR}/security/polarssl
-CONFIGURE_ARGS+= --with-crypto-library=polarssl
-. endif
-.else
-USE_OPENSSL= yes
-CONFIGURE_ARGS+= --with-crypto-library=openssl
-.endif
+POLARSSL_LIB_DEPENDS= libpolarssl.so:${PORTSDIR}/security/polarssl
+POLARSSL_CONFIGURE_ON= --with-crypto-library=polarssl
+POLARSSL_USE= openssl=yes
+POLARSSL_CONFIGURE_OFF= --with-crypto-library=openssl
USE_RC_SUBR= openvpn
USE_LDCONFIG= ${PREFIX}/lib
SUB_FILES= pkg-message openvpn-client
-.include <bsd.port.pre.mk>
-
.ifdef (LOG_OPENVPN)
CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN}
.endif
@@ -93,9 +85,9 @@ post-configure:
${WRKSRC}/src/plugins/auth-pam/Makefile \
${WRKSRC}/src/plugins/down-root/Makefile
+.if !defined(WITHOUT_CHECK)
post-build:
@# self-tests here
-.if !defined(WITHOUT_CHECK)
@${ECHO} ; ${ECHO} "### Note that you can skip these lengthy selftests with WITHOUT_CHECK=yes ###" ; ${ECHO}
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} check
.endif
@@ -108,15 +100,15 @@ post-install:
@${REINPLACE_CMD} 's|resolvconf -p -a|resolvconf -a|' ${STAGEDIR}${PREFIX}/libexec/openvpn-client.up
${INSTALL_SCRIPT} ${WRKDIR}/openvpn-client ${STAGEDIR}${PREFIX}/sbin/openvpn-client
${MKDIR} ${STAGEDIR}${PREFIX}/include
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/
.for i in AUTHORS ChangeLog PORTS
${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
.endfor
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+
+post-install-EXAMPLES-on:
(cd ${WRKSRC}/sample && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/)
${CHMOD} ${BINMODE} ${STAGEDIR}${EXAMPLESDIR}/sample-scripts/*
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>