svn commit: r360952 - head/security/openconnect

[Tijl Coosemans]

Author: tijl
Date: Sun Jul  6 18:28:16 2014
New Revision: 360952
URL: http://svnweb.freebsd.org/changeset/ports/360952
QAT: https://qat.redports.org/buildarchive/r360952/

Log:
  - Add --without-liboath and --without-stoken to CONFIGURE_ARGS to prevent
    auto detection
  - Remove USE_AUTOTOOLS
  - Add USES=libtool and remove USES=pathfix
  - Use option helpers and only define USE_OPENSSL when GNUTLS option is off

Modified:
  head/security/openconnect/Makefile
  head/security/openconnect/pkg-plist

Modified: head/security/openconnect/Makefile
==============================================================================
--- head/security/openconnect/Makefile	Sun Jul  6 18:23:03 2014	(r360951)
+++ head/security/openconnect/Makefile	Sun Jul  6 18:28:16 2014	(r360952)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openconnect
 PORTVERSION=	5.03
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.infradead.org/pub/openconnect/ \
 		http://mirrors.rit.edu/zi/
@@ -20,40 +20,27 @@ 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 \
-		--without-openssl-version-check
-USE_AUTOTOOLS=	aclocal autoconf automake libtool
-USES=		gmake pathfix pkgconfig
-USE_OPENSSL=	yes
-ACLOCAL_ARGS=	-I .
-AUTOMAKE_ARGS=	--add-missing
+		--without-liboath --without-openssl-version-check \
+		--without-stoken
+USES=		gmake libtool pkgconfig
 USE_LDCONFIG=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	PROXY GNUTLS
 
-PROXY_DESC=	Enable automatic proxy configuratio via libproxy
-GNUTLS_DESC=	Use GnuTLS instead of OpenSSL(EXPERIMENTAL)
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/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>
-
-.if ${PORT_OPTIONS:MPROXY}
-LIB_DEPENDS+=	proxy:${PORTSDIR}/net/libproxy
-.endif
+PROXY_DESC=		Enable automatic proxy configuratio via libproxy
+PROXY_LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy
+PROXY_CONFIGURE_WITH=	libproxy
+
+GNUTLS_DESC=		Use GnuTLS instead of OpenSSL(EXPERIMENTAL)
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+GNUTLS_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+GNUTLS_CONFIGURE_WITH=	gnutls system-cafile=${LOCALBASE}/share/certs/ca-root-nss.crt
+GNUTLS_USE_OFF=		OPENSSL=yes
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}
-.endif
+	${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/security/openconnect/pkg-plist
==============================================================================
--- head/security/openconnect/pkg-plist	Sun Jul  6 18:23:03 2014	(r360951)
+++ head/security/openconnect/pkg-plist	Sun Jul  6 18:28:16 2014	(r360952)
@@ -1,8 +1,7 @@
 sbin/openconnect
 include/openconnect.h
-lib/libopenconnect.a
-lib/libopenconnect.la
 lib/libopenconnect.so
 lib/libopenconnect.so.2
+lib/libopenconnect.so.2.2.0
 libdata/pkgconfig/openconnect.pc
 man/man8/openconnect.8.gz