Date: Mon, 12 Sep 2016 16:50:00 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421937 - head/net/vtun Message-ID: <201609121650.u8CGo0N4005015@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Sep 12 16:49:59 2016 New Revision: 421937 URL: https://svnweb.freebsd.org/changeset/ports/421937 Log: net/vtun: Fix SSL configuration for non-base SSL libraries While here, couple OSVERSION with OPSYS for extra patches. Approved by: SSL blanket Modified: head/net/vtun/Makefile Modified: head/net/vtun/Makefile ============================================================================== --- head/net/vtun/Makefile Mon Sep 12 16:46:15 2016 (r421936) +++ head/net/vtun/Makefile Mon Sep 12 16:49:59 2016 (r421937) @@ -16,8 +16,8 @@ CFLAGS+= -ansi -Wno-pointer-sign -I${LOC USE_OPENSSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ - --with-ssl-headers=${OPENSSLBASE}/include/openssl \ - --with-ssl-lib=${OPENSSLBASE}/lib \ + --with-ssl-headers=${OPENSSLINC} \ + --with-ssl-lib=${OPENSSLLIB} \ --with-lzo-headers=${LOCALBASE}/include/lzo \ --with-lzo-lib=${LOCALBASE}/lib CONFIGURE_ENV= YACC=${YACC} @@ -32,7 +32,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.if ${CC} == "clang" || ${CXX} == "clang++" || ${OSVERSION} >= 1000026 +.if ${CC} == "clang" || ${CXX} == "clang++" || (${OPSYS} == FreeBSD && ${OSVERSION} >= 1000026) EXTRA_PATCHES+= ${FILESDIR}/extra-cfg_file.y .endif @@ -41,6 +41,12 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-cfg_fi EXTRA_PATCHES+= ${FILESDIR}/extra-tun_dev.c .endif +post-patch: + ${REINPLACE_CMD} \ + -e 's|$$\(SSL_HDR_DIR\)|$$\1 $$\1/openssl|g' \ + -e 's|$$\(BLOWFISH_HDR_DIR\)|$$\1 $$SSL_HDR_DIR/openssl|g' \ + ${WRKSRC}/configure + post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/vtund @${INSTALL_DATA} ${WRKSRC}/vtund.conf ${STAGEDIR}${PREFIX}/etc/vtund.conf.sample
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609121650.u8CGo0N4005015>