- Update to 3.11.

Approved by:	maintainer timeout (52 days)

4 files changed, 23 insertions, 28 deletions

diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile
index 0d99a580a425..3fbd3b617786 100644
--- a/security/openconnect/Makefile
+++ b/security/openconnect/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	openconnect
-PORTVERSION=	2.26
-PORTREVISION=	1
+PORTVERSION=	3.11
+PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.infradead.org/pub/openconnect/ \
 		CRITICAL
@@ -17,40 +17,28 @@ COMMENT=	A client for Cisco\'s AnyConnect SSL VPN
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig
 MAKE_JOBS_SAFE=	yes
 USE_OPENSSL=	yes
-OPENSSL=	${OPENSSLBASE}
+USE_OPENSSL_PORT=	yes # Requires modern OpenSSL version
 
 MAN8=		openconnect.8
-PORTDOCS=	README.*
 
-.include <bsd.port.options.mk>
+OPTIONS=	PROXY "Enable automatic proxy configuratio via libproxy"   off
 
-OPTIONS=	GUI      "Enable the OpenConnect configuration GUI"   off
+.include <bsd.port.pre.mk>
 
-.if defined(WITH_GUI)
-LIB_DEPENDS+=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
-LIB_DEPENDS+=	gconf-2.4:${PORTSDIR}/devel/gconf2
-PLIST_SUB+=	WITH_GUI=""
-.else
-PLIST_SUB+=	WITH_GUI="@comment "
+.if defined(WITH_PROXY)
+LIB_DEPENDS+=	proxy.1:${PORTSDIR}/net/libproxy
 .endif
 
-do-install:
-	${INSTALL_PROGRAM} -m 751 ${WRKSRC}/openconnect \
-	${PREFIX}/bin/openconnect
-.if defined(WITH_GUI)
-	${INSTALL_PROGRAM} ${WRKSRC}/nm-openconnect-auth-dialog \
-	${PREFIX}/libexec
-.endif
-	${INSTALL_MAN} ${WRKSRC}/${MAN8} ${MANPREFIX}/man/man8
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README.DTLS ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README.SecurID ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/openconnect.html ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/TODO ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/openconnect/distinfo b/security/openconnect/distinfo
index b44e74f2b742..a75694780928 100644
--- a/security/openconnect/distinfo
+++ b/security/openconnect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openconnect-2.26.tar.gz) = cbd8c1fb49fe9ba30806edfa225220db5b181e6a11466309a7a399c9896ab052
-SIZE (openconnect-2.26.tar.gz) = 77773
+SHA256 (openconnect-3.11.tar.gz) = 936b3e4e83cec75e65d2d2a23184b0dba02c1e96c6caea4039a4870bc598275d
+SIZE (openconnect-3.11.tar.gz) = 354616
diff --git a/security/openconnect/pkg-message b/security/openconnect/pkg-message
index 1a9edab74256..c2f831047d5b 100644
--- a/security/openconnect/pkg-message
+++ b/security/openconnect/pkg-message
@@ -6,4 +6,4 @@ transmitted via an HTTPS connection.  This means that any packet
 loss on your link will result in a significant detriment to the
 speed of your VPN connection.
 
-More information is included in README.DTLS.
+More information is included in openconnect.html.
diff --git a/security/openconnect/pkg-plist b/security/openconnect/pkg-plist
index 1e5a8b2ba220..ff17d34e1698 100644
--- a/security/openconnect/pkg-plist
+++ b/security/openconnect/pkg-plist
@@ -1,2 +1,9 @@
 bin/openconnect
-%%WITH_GUI%%libexec/nm-openconnect-auth-dialog
+include/openconnect.h
+lib/libopenconnect.la
+lib/libopenconnect.so
+lib/libopenconnect.so.1
+libdata/pkgconfig/openconnect.pc
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/openconnect.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%