- Update to version 3.11.3

- Pass maintaineship to submitter

PR:		144518
Submitted by:	Jason E. Hale <bsdkaffee AT gmail DOT com>

6 files changed, 26 insertions, 101 deletions

diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index 6d777757ce8c..ba437f7535ad 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	gwenhywfar
-PORTVERSION=	3.9.0
-PORTREVISION=	2
+PORTVERSION=	3.11.3
 CATEGORIES=	devel net security
 MASTER_SITES=	http://www2.aquamaniac.de/sites/download/
-DISTFILES=	download.php\?package=01\&release=25\&file=01\&dummy=gwenhywfar-${PORTVERSION}.tar.gz
+DISTFILES=	download.php\?package=01\&release=31\&file=01\&dummy=${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	Multi-platform helper library for networking and security applications
 
 LIB_DEPENDS=	gnutls.40:${PORTSDIR}/security/gnutls
@@ -32,6 +31,7 @@ USE_LDCONFIG=	${PREFIX}/lib \
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+MAKE_JOBS_SAFE=	yes
 
 .if !defined(NOPORTEXAMPLES)
 # Examples to be installed from ${WRKSRC}/doc
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+=	--enable-memtrace
 .if defined(WITH_PORTDOCS)
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 CONFIGURE_ARGS+=	--enable-full-doc
-PORTDOCS=	*
+PORTDOCS=	apidoc
 .endif
 
 post-build:
@@ -65,10 +65,10 @@ post-build:
 post-install:
 .if !defined(NOPORTDOCS) && defined(WITH_PORTDOCS)
 	@${ECHO_CMD} Installing documentation...
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}/apidoc
 	@cd ${WRKSRC} && ${FIND} apidoc -mindepth 1 \! -type d \
 		-exec ${ECHO_CMD} "{} -> ${DOCSDIR}/{}" \; \
-		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${DOCSDIR} \;
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${DOCSDIR}/apidoc \;
 .endif
 .if !defined(NOPORTEXAMPLES)
 	@${ECHO_CMD} Installing examples...
diff --git a/devel/gwenhywfar/distinfo b/devel/gwenhywfar/distinfo
index 0f3cb0e0f452..12231da4cfd2 100644
--- a/devel/gwenhywfar/distinfo
+++ b/devel/gwenhywfar/distinfo
@@ -1,3 +1,3 @@
-MD5 (download.php?package=01&release=25&file=01&dummy=gwenhywfar-3.9.0.tar.gz) = 3cb73bb2d08f247bf9481b444d823050
-SHA256 (download.php?package=01&release=25&file=01&dummy=gwenhywfar-3.9.0.tar.gz) = 4f0d3abcc3bb668df5fb03a775ce8b87328fc247bd235806967d9b496b7c53ad
-SIZE (download.php?package=01&release=25&file=01&dummy=gwenhywfar-3.9.0.tar.gz) = 1420183
+MD5 (download.php?package=01&release=31&file=01&dummy=gwenhywfar-3.11.3.tar.gz) = 9ab62d881a0f39d4b07ea0badff7201f
+SHA256 (download.php?package=01&release=31&file=01&dummy=gwenhywfar-3.11.3.tar.gz) = eeaa9671c589b2c756edc90c96c0d7d78da06e2421d71ed29b127b192e23d26d
+SIZE (download.php?package=01&release=31&file=01&dummy=gwenhywfar-3.11.3.tar.gz) = 1504655
diff --git a/devel/gwenhywfar/files/patch-src-gui-cgui.c b/devel/gwenhywfar/files/patch-src-gui-cgui.c
deleted file mode 100644
index ffe7238cf3a1..000000000000
--- a/devel/gwenhywfar/files/patch-src-gui-cgui.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/gui/cgui.c.orig	2008-07-31 10:56:06.000000000 -0700
-+++ src/gui/cgui.c	2008-12-08 14:04:59.000000000 -0800
-@@ -32,6 +32,10 @@
- # define ICONV_CONST
- #endif
- 
-+#ifndef ICONV_CONST
-+#define ICONV_CONST const
-+#endif
-+
- 
- #include "cgui_p.h"
- #include "i18n_l.h"
diff --git a/devel/gwenhywfar/files/patch-src::iolayer::io_tls.c b/devel/gwenhywfar/files/patch-src::iolayer::io_tls.c
deleted file mode 100644
index af0211f437c4..000000000000
--- a/devel/gwenhywfar/files/patch-src::iolayer::io_tls.c
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
---- src/iolayer/io_tls.c.orig	2009-06-18 13:56:27.000000000 -0700
-+++ src/iolayer/io_tls.c	2009-07-12 09:56:45.000000000 -0700
-@@ -310,6 +310,7 @@
-   if (lflags & GWEN_IO_LAYER_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);
-     if (rv) {
-       DBG_ERROR(GWEN_LOGDOMAIN, "gnutls_protocol_set_priority: %d (%s)", rv, gnutls_strerror(rv));
-@@ -840,7 +841,7 @@
- 
-   rv=GWEN_Io_LayerCodec_CheckWriteOut(io);
-   if (rv) {
--    if (rv==GWEN_ERROR_TRY_AGAIN) {
-+    if (rv==GWEN_ERROR_TRY_AGAIN || rv==GWEN_ERROR_IN_PROGRESS) {
-       DBG_INFO(GWEN_LOGDOMAIN, "here (%d)", rv);
- #ifdef HAVE_GNUTLS_TRANSPORT_SET_ERRNO
-       gnutls_transport_set_errno(xio->session, EAGAIN);
diff --git a/devel/gwenhywfar/files/patch-src::os::posix::inetsocket.c b/devel/gwenhywfar/files/patch-src::os::posix::inetsocket.c
deleted file mode 100644
index a7e795fc1998..000000000000
--- a/devel/gwenhywfar/files/patch-src::os::posix::inetsocket.c
+++ /dev/null
@@ -1,56 +0,0 @@
-# $FreeBSD$
---- src/os/posix/inetsocket.c.orig	2008-07-31 10:56:06.000000000 -0700
-+++ src/os/posix/inetsocket.c	2009-07-12 09:59:23.000000000 -0700
-@@ -74,6 +74,7 @@
- int GWEN_Socket_NetError2GwenError(int rv) {
-   switch(rv) {
-   case EINTR:        return GWEN_ERROR_INTERRUPTED;
-+  case ENOTCONN:
-   case EWOULDBLOCK:  return GWEN_ERROR_TIMEOUT;
-   case EACCES:
-   case EPERM:        return GWEN_ERROR_PERMISSIONS;
-@@ -348,7 +349,7 @@
-   if (localSocket->socket==-1) {
-     GWEN_InetAddr_free(localAddr);
-     GWEN_Socket_free(localSocket);
--    if (errno==EAGAIN)
-+    if (errno==EAGAIN || errno==ENOTCONN)
-       return GWEN_ERROR_TIMEOUT;
-     else {
-       DBG_INFO(GWEN_LOGDOMAIN, "accept(): %s", strerror(errno));
-@@ -498,7 +499,7 @@
-   assert(bsize);
-   i=recv(sp->socket,buffer, *bsize,0);
-   if (i<0) {
--    if (errno==EAGAIN)
-+    if (errno==EAGAIN || errno==ENOTCONN)
-       return GWEN_ERROR_TIMEOUT;
-     else if (errno==EINTR)
-       return GWEN_ERROR_INTERRUPTED;
-@@ -542,7 +543,7 @@
- 	);
- 
-   if (i<0) {
--    if (errno==EAGAIN)
-+    if (errno==EAGAIN || errno==ENOTCONN)
-       return GWEN_ERROR_TIMEOUT;
-     else if (errno==EINTR)
-       return GWEN_ERROR_INTERRUPTED;
-@@ -594,7 +595,7 @@
-              &addrlen);
-   if (i<0) {
-     GWEN_InetAddr_free(localAddr);
--    if (errno==EAGAIN)
-+    if (errno==EAGAIN || errno==ENOTCONN)
-       return GWEN_ERROR_TIMEOUT;
-     else if (errno==EINTR)
-       return GWEN_ERROR_INTERRUPTED;
-@@ -632,7 +633,7 @@
-            addr->address,
-            addr->size);
-   if (i<0) {
--    if (errno==EAGAIN)
-+    if (errno==EAGAIN || errno==ENOTCONN)
-       return GWEN_ERROR_TIMEOUT;
-     else if (errno==EINTR)
-       return GWEN_ERROR_INTERRUPTED;
diff --git a/devel/gwenhywfar/pkg-plist b/devel/gwenhywfar/pkg-plist
index 6471d4901758..90f0513b07f3 100644
--- a/devel/gwenhywfar/pkg-plist
+++ b/devel/gwenhywfar/pkg-plist
@@ -2,6 +2,7 @@ bin/gct-tool
 bin/gwenhywfar-config
 bin/mklistdoc
 bin/typemaker
+bin/typemaker2
 bin/xmlmerge
 include/gwenhywfar3/gwenhywfar/args.h
 include/gwenhywfar3/gwenhywfar/base64.h
@@ -42,7 +43,7 @@ include/gwenhywfar3/gwenhywfar/filter.h
 include/gwenhywfar3/gwenhywfar/fslock.h
 include/gwenhywfar3/gwenhywfar/gui.h
 include/gwenhywfar3/gwenhywfar/gui_be.h
-include/gwenhywfar3/gwenhywfar/gwen_plugins.h
+include/gwenhywfar3/gwenhywfar/gwendate.h
 include/gwenhywfar3/gwenhywfar/gwenhywfar.h
 include/gwenhywfar3/gwenhywfar/gwenhywfarapi.h
 include/gwenhywfar3/gwenhywfar/gwensemaphore.h
@@ -141,11 +142,24 @@ lib/gwenhywfar/plugins/47/dbio/xmldb.xml
 lib/libgwenhywfar.a
 lib/libgwenhywfar.la
 lib/libgwenhywfar.so
-lib/libgwenhywfar.so.56
+lib/libgwenhywfar.so.58
 libdata/pkgconfig/gwenhywfar.pc
 share/aclocal/gwenhywfar.m4
 share/gwenhywfar/ca-bundle.crt
+share/gwenhywfar/typemaker2/c/char.tm2
+share/gwenhywfar/typemaker2/c/char_array.tm2
+share/gwenhywfar/typemaker2/c/char_ptr.tm2
+share/gwenhywfar/typemaker2/c/gwen_date.tm2
+share/gwenhywfar/typemaker2/c/gwen_time.tm2
+share/gwenhywfar/typemaker2/c/int.tm2
+share/gwenhywfar/typemaker2/c/int_base.tm2
+share/gwenhywfar/typemaker2/c/list1_base.tm2
+share/gwenhywfar/typemaker2/c/list2_base.tm2
+share/gwenhywfar/typemaker2/c/struct_base.tm2
+share/gwenhywfar/typemaker2/c/uint32_t.tm2
 share/locale/de/LC_MESSAGES/gwenhywfar.mo
+@dirrm share/gwenhywfar/typemaker2/c
+@dirrm share/gwenhywfar/typemaker2
 @dirrm share/gwenhywfar
 @dirrm lib/gwenhywfar/plugins/47/dbio
 @dirrm lib/gwenhywfar/plugins/47/ct