diff options
| author | marino <marino@FreeBSD.org> | 2016-09-13 00:49:59 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2016-09-13 00:49:59 +0800 |
| commit | 756551e102a1cbbaf40d3f4eb08743f9349d2800 (patch) | |
| tree | c0bbee77b43a550e0abea8461cd94dc04cb9ada1 /net | |
| parent | 0864c02d6f99c88e10e616d9e4b0c7dd63521ca9 (diff) | |
| download | freebsd-ports-gnome-756551e102a1cbbaf40d3f4eb08743f9349d2800.tar.gz freebsd-ports-gnome-756551e102a1cbbaf40d3f4eb08743f9349d2800.tar.zst freebsd-ports-gnome-756551e102a1cbbaf40d3f4eb08743f9349d2800.zip | |
net/vtun: Fix SSL configuration for non-base SSL libraries
While here, couple OSVERSION with OPSYS for extra patches.
Approved by: SSL blanket
Diffstat (limited to 'net')
| -rw-r--r-- | net/vtun/Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/net/vtun/Makefile b/net/vtun/Makefile index cc07ce94d4de..36b045a2d299 100644 --- a/net/vtun/Makefile +++ b/net/vtun/Makefile @@ -16,8 +16,8 @@ CFLAGS+= -ansi -Wno-pointer-sign -I${LOCALBASE}/include 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_file.y 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 |