svn commit: r324412 - head/security/openconnect

[Ryan Steinmetz]

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>