From owner-svn-ports-head@freebsd.org  Mon Sep 12 16:50:01 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 2C13BBD8268;
 Mon, 12 Sep 2016 16:50:01 +0000 (UTC)
 (envelope-from marino@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 E76ABDE9;
 Mon, 12 Sep 2016 16:50:00 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8CGo0Od005016;
 Mon, 12 Sep 2016 16:50:00 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8CGo0N4005015;
 Mon, 12 Sep 2016 16:50:00 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201609121650.u8CGo0N4005015@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Mon, 12 Sep 2016 16:50:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421937 - head/net/vtun
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Sep 2016 16:50:01 -0000

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