From owner-svn-ports-all@FreeBSD.ORG  Thu Aug  8 23:58:13 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 446EAFE8;
 Thu,  8 Aug 2013 23:58:13 +0000 (UTC) (envelope-from zi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 31A472C55;
 Thu,  8 Aug 2013 23:58:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r78NwDqE019666;
 Thu, 8 Aug 2013 23:58:13 GMT (envelope-from zi@svn.freebsd.org)
Received: (from zi@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r78NwDC7019665;
 Thu, 8 Aug 2013 23:58:13 GMT (envelope-from zi@svn.freebsd.org)
Message-Id: <201308082358.r78NwDC7019665@svn.freebsd.org>
From: Ryan Steinmetz <zi@FreeBSD.org>
Date: Thu, 8 Aug 2013 23:58:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r324412 - head/security/openconnect
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Aug 2013 23:58:13 -0000

Author: zi
Date: Thu Aug  8 23:58:12 2013
New Revision: 324412
URL: http://svnweb.freebsd.org/changeset/ports/324412

Log:
  - Fix build under 10-CURRENT when using OpenSSL, chasing r254107 (OpenSSL bugfix for RT #2984)
  - Add security/ca_root_nss as a dependency to fix GnuTLS build
  - Do not bump PORTREVISION
  
  Reported by:	gnn@

Modified:
  head/security/openconnect/Makefile

Modified: head/security/openconnect/Makefile
==============================================================================
--- head/security/openconnect/Makefile	Thu Aug  8 23:24:39 2013	(r324411)
+++ head/security/openconnect/Makefile	Thu Aug  8 23:58:12 2013	(r324412)
@@ -18,14 +18,15 @@ RUN_DEPENDS=	vpnc-script:${PORTSDIR}/sys
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls --with-vpnc-script=${LOCALBASE}/sbin/vpnc-script \
-		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
-USE_AUTOTOOLS=	aclocal autoconf libtool
-AUTOMAKE_ARGS=	--add-missing
-USES=	pathfix pkgconfig
+		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
+		--without-openssl-version-check
+USE_AUTOTOOLS=	aclocal autoconf automake libtool
+USES=		pathfix pkgconfig
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 MAKE_JOBS_SAFE=	yes
 ACLOCAL_ARGS=	-I .
+AUTOMAKE_ARGS=	--add-missing
 USE_LDCONFIG=	yes
 PORTDOCS=	*
 
@@ -40,7 +41,10 @@ GNUTLS_DESC=	Use GnuTLS instead of OpenS
 
 .if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=--with-gnutls
+CONFIGURE_ARGS+=--with-gnutls \
+		--with-system-cafile=${LOCALBASE}/share/certs/ca-root-nss.crt
+RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+BUILD_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 .endif
 
 .include <bsd.port.pre.mk>