Update to 4.15.3

5 files changed, 23 insertions, 39 deletions

diff --git a/devel/gwenhywfar-qt4/pkg-plist b/devel/gwenhywfar-qt4/pkg-plist
index 77a51b97a711..245d6ab6e728 100644
--- a/devel/gwenhywfar-qt4/pkg-plist
+++ b/devel/gwenhywfar-qt4/pkg-plist
@@ -1,6 +1,6 @@
 include/gwenhywfar4/gwen-gui-qt4/qt4_gui.hpp
-lib/cmake/gwengui-qt4-4.14/gwengui-qt4-config-version.cmake
-lib/cmake/gwengui-qt4-4.14/gwengui-qt4-config.cmake
+lib/cmake/gwengui-qt4-4.15/gwengui-qt4-config-version.cmake
+lib/cmake/gwengui-qt4-4.15/gwengui-qt4-config.cmake
 lib/libgwengui-qt4.so
 lib/libgwengui-qt4.so.0
 lib/libgwengui-qt4.so.0.0.0
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index 509f9b8f805a..28a044c789b7 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	gwenhywfar
-PORTVERSION=	4.14.0
-PORTREVISION?=	1
+PORTVERSION=	4.15.3
+PORTREVISION?=	0
 CATEGORIES=	devel net security
-MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=01&release=01&file=01&dummy=/
+MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=01&release=201&file=01&dummy=/
 
 MAINTAINER?=	jhale@FreeBSD.org
 COMMENT?=	Multi-platform helper library for networking and security applications
@@ -13,15 +13,15 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
-		libgnutls.so:security/gnutls
+		libgnutls.so:security/gnutls \
+		libgpg-error.so:security/libgpg-error
 
-USES=		gettext gmake iconv libtool pathfix pkgconfig
-USE_OPENSSL=	yes
+USES=		gettext gmake iconv libtool pathfix pkgconfig ssl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-release="yes" \
 		--with-guis="${SLAVEPORT}"
-CPPFLAGS+=	-DGCRYPT_NO_DEPRECATED -I${LOCALBASE}/include
+CPPFLAGS+=	-isystem ${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
@@ -54,11 +54,13 @@ CONFIGURE_ARGS+=--with-fox-includes=${LOCALBASE}/include/fox-1.6 \
 .  endif
 
 .  if ${SLAVEPORT}=="gtk2"
-USE_GNOME+=	gtk20
+LIB_DEPENDS+=	libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
+USE_GNOME+=	cairo gdkpixbuf2 gtk20
 .  endif
 
 .  if ${SLAVEPORT}=="qt4"
-USE_QT4=	gui moc_build uic_build
+USE_QT4=	corelib gui moc_build uic_build
 QT_NONSTANDARD=	yes
 CONFIGURE_ARGS+=--with-qt4-includes=${QT_INCDIR} \
 		--with-qt4-libs=${QT_LIBDIR} \
@@ -76,18 +78,14 @@ post-patch:
 			-e '/^SUBDIRS/s|cpp ||g'
 .endif
 
-post-build:
-.if ${PORT_OPTIONS:MDOXYGEN}
+post-build-DOXYGEN-on:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} srcdoc
-.endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOXYGEN}
+post-install-DOXYGEN-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/apidoc
 	cd ${WRKSRC}/apidoc && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/apidoc
 	@${FIND} -P ${STAGEDIR}${DOCSDIR} -type f 2>/dev/null | \
 		${SED} -ne 's|^${STAGEDIR}${PREFIX}/||p' >> ${TMPPLIST}
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/gwenhywfar/distinfo b/devel/gwenhywfar/distinfo
index 3ba2e0f6119e..c637d12c38d5 100644
--- a/devel/gwenhywfar/distinfo
+++ b/devel/gwenhywfar/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gwenhywfar-4.14.0.tar.gz) = 7e0ec2f1cab7d22a5ae0066e0ef827d4affec59470b1bdbc42132b58a903dd03
-SIZE (gwenhywfar-4.14.0.tar.gz) = 2517862
+TIMESTAMP = 1474457855
+SHA256 (gwenhywfar-4.15.3.tar.gz) = 6a0e8787c99620414da6140e567c616b55856c5edf8825a9ebc67431923ee63a
+SIZE (gwenhywfar-4.15.3.tar.gz) = 2249350
diff --git a/devel/gwenhywfar/files/patch-src-sio-syncio_tls.c b/devel/gwenhywfar/files/patch-src-sio-syncio_tls.c
deleted file mode 100644
index a1445e2ae15a..000000000000
--- a/devel/gwenhywfar/files/patch-src-sio-syncio_tls.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/sio/syncio_tls.c.orig	2014-10-12 13:12:22 UTC
-+++ src/sio/syncio_tls.c
-@@ -361,12 +361,10 @@ int GWEN_SyncIo_Tls_Prepare(GWEN_SYNCIO 
- 
-   /* possibly force protocol priority */
-   if (lflags & GWEN_SYNCIO_TLS_FLAGS_FORCE_SSL_V3) {
--    const int proto_prio[2] = { GNUTLS_SSL3, 0 };
--
-     DBG_INFO(GWEN_LOGDOMAIN, "Forcing SSL v3");
--    rv=gnutls_protocol_set_priority(xio->session, proto_prio);
-+    rv=gnutls_priority_set_direct(xio->session, "NORMAL:-VERS-TLS-ALL:+VERS-SSL3.0", NULL);
-     if (rv) {
--      DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_protocol_set_priority: %d (%s)", rv, gnutls_strerror(rv));
-+      DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_priority_set_direct: %d (%s)", rv, gnutls_strerror(rv));
-       gnutls_deinit(xio->session);
-       return GWEN_ERROR_GENERIC;
-     }
diff --git a/devel/gwenhywfar/pkg-plist b/devel/gwenhywfar/pkg-plist
index 2ed2ee166d63..ccf94cc0d2fa 100644
--- a/devel/gwenhywfar/pkg-plist
+++ b/devel/gwenhywfar/pkg-plist
@@ -125,8 +125,10 @@ include/gwenhywfar4/gwenhywfar/widget_be.h
 include/gwenhywfar4/gwenhywfar/xml.h
 include/gwenhywfar4/gwenhywfar/xmlctx.h
 include/gwenhywfar4/gwenhywfar/xsdnode.h
-lib/cmake/gwenhywfar-4.14/gwenhywfar-config-version.cmake
-lib/cmake/gwenhywfar-4.14/gwenhywfar-config.cmake
+lib/cmake/gwengui-cpp-4.15/gwengui-cpp-config-version.cmake
+lib/cmake/gwengui-cpp-4.15/gwengui-cpp-config.cmake
+lib/cmake/gwenhywfar-4.15/gwenhywfar-config-version.cmake
+lib/cmake/gwenhywfar-4.15/gwenhywfar-config.cmake
 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/configmgr/dir.so
 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/configmgr/dir.xml
 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/ct/ohbci.so
@@ -148,7 +150,7 @@ lib/libgwengui-cpp.so.0
 lib/libgwengui-cpp.so.0.0.0
 lib/libgwenhywfar.so
 lib/libgwenhywfar.so.%%GWEN_SHLIB_VER%%
-lib/libgwenhywfar.so.%%GWEN_SHLIB_VER%%.14.0
+lib/libgwenhywfar.so.%%GWEN_SHLIB_VER%%.15.3
 libdata/pkgconfig/gwenhywfar.pc
 share/aclocal/gwenhywfar.m4
 %%DATADIR%%/ca-bundle.crt