- Update to 3.6.0

PR:		ports/129598
Submitted by:	G. Paul Ziemba <p-fbsd-bugs@ziemba.us>

6 files changed, 180 insertions, 155 deletions

diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index a8add5f54d5c..9d3b63a2719d 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -6,26 +6,31 @@
 #
 
 PORTNAME=	gwenhywfar
-PORTVERSION=	2.6.2
-PORTREVISION=	2
+PORTVERSION=	3.6.0
 CATEGORIES=	devel net security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://www2.aquamaniac.de/sites/download/
+DISTFILES=	download.php\?package=01\&release=17\&file=01\&dummy=gwenhywfar-3.6.0.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-platform helper library for networking and security applications
 
+LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls
+
 OPTIONS=	MEMDEBUG "Enable memory debugger statistic" off \
 		PORTDOCS "Install documentation (requires doxygen)" off
 
 USE_AUTOTOOLS=	libtool:15
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_OPENSSL=	yes
 USE_LDCONFIG=	${PREFIX}/lib \
-		${PREFIX}/lib/gwenhywfar/plugins/38/crypttoken \
-		${PREFIX}/lib/gwenhywfar/plugins/38/dbio \
-		${PREFIX}/lib/gwenhywfar/plugins/38/storage
+		${PREFIX}/lib/gwenhywfar/plugins/47/ct \
+		${PREFIX}/lib/gwenhywfar/plugins/47/dbio \
+		${PREFIX}/lib/gwenhywfar/plugins/47/configmgr
+CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(NOPORTEXAMPLES)
 # Examples to be installed from ${WRKSRC}/doc
diff --git a/devel/gwenhywfar/distinfo b/devel/gwenhywfar/distinfo
index e1d09a6e8765..2375feee2d6c 100644
--- a/devel/gwenhywfar/distinfo
+++ b/devel/gwenhywfar/distinfo
@@ -1,3 +1,3 @@
-MD5 (gwenhywfar-2.6.2.tar.gz) = fec3bc3653b7809cc44526b6fed52ab2
-SHA256 (gwenhywfar-2.6.2.tar.gz) = 610b4d7ba6803d40b0324f2efeac862f915feb20feb36b91649328f9ad051705
-SIZE (gwenhywfar-2.6.2.tar.gz) = 1201995
+MD5 (download.php?package=01&release=17&file=01&dummy=gwenhywfar-3.6.0.tar.gz) = ec8745c8ebe6e365996217b4126e5396
+SHA256 (download.php?package=01&release=17&file=01&dummy=gwenhywfar-3.6.0.tar.gz) = 96051758b9d7d663302b3a9f38c9aa94b8641411601ccf1f0f59589cf4a5809f
+SIZE (download.php?package=01&release=17&file=01&dummy=gwenhywfar-3.6.0.tar.gz) = 1410713
diff --git a/devel/gwenhywfar/files/patch-Makefile.in b/devel/gwenhywfar/files/patch-Makefile.in
index 400de67646ce..5ac4592a7825 100644
--- a/devel/gwenhywfar/files/patch-Makefile.in
+++ b/devel/gwenhywfar/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Mon Oct 15 21:42:31 2007
-+++ Makefile.in	Fri Jan 18 06:10:00 2008
-@@ -293,7 +293,7 @@
+--- Makefile.in.orig	2008-11-08 02:02:08.000000000 -0800
++++ Makefile.in	2008-12-08 11:54:41.000000000 -0800
+@@ -319,7 +319,7 @@
  dist_M4_DATA = gwenhywfar.m4
  ACLOCAL_AMFLAGS = -I m4
- BUILT_SOURCES = gwenhywfar/version.h gwenhywfar/types.h gwenhywfar/system.h
+ BUILT_SOURCES = gwenhywfar3/gwenhywfar/version.h gwenhywfar3/gwenhywfar/types.h gwenhywfar3/gwenhywfar/system.h
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(libdir)/../libdata/pkgconfig
  pkgconfig_DATA = gwenhywfar.pc
diff --git a/devel/gwenhywfar/files/patch-src-gui-cgui.c b/devel/gwenhywfar/files/patch-src-gui-cgui.c
new file mode 100644
index 000000000000..ffe7238cf3a1
--- /dev/null
+++ b/devel/gwenhywfar/files/patch-src-gui-cgui.c
@@ -0,0 +1,13 @@
+--- 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/pkg-descr b/devel/gwenhywfar/pkg-descr
index e1a3ceb325a0..425cb5753b86 100644
--- a/devel/gwenhywfar/pkg-descr
+++ b/devel/gwenhywfar/pkg-descr
@@ -14,4 +14,4 @@ Gwenhywfar includes the following features, among several others:
   (src/crypt/)
 
 Author:	Martin Preuss <martin@libchipcard.de>
-WWW:	http://gwenhywfar.sourceforge.net/
+WWW:	http://www.aquamaniac.de/
diff --git a/devel/gwenhywfar/pkg-plist b/devel/gwenhywfar/pkg-plist
index ff99a4cd095e..05ec73da0cb0 100644
--- a/devel/gwenhywfar/pkg-plist
+++ b/devel/gwenhywfar/pkg-plist
@@ -1,149 +1,156 @@
-@comment $FreeBSD$
-bin/mklistdoc
-bin/xmlmerge
 bin/gct-tool
-bin/typemaker
 bin/gwenhywfar-config
-include/gwenhywfar/args.h
-include/gwenhywfar/buffer.h
-include/gwenhywfar/debug.h
-include/gwenhywfar/error.h
-include/gwenhywfar/i18n.h
-include/gwenhywfar/idlist.h
-include/gwenhywfar/idmap.h
-include/gwenhywfar/inherit.h
-include/gwenhywfar/list.h
-include/gwenhywfar/list1.h
-include/gwenhywfar/list1.tmpl
-include/gwenhywfar/list2.h
-include/gwenhywfar/list2.tmpl
-include/gwenhywfar/logger.h
-include/gwenhywfar/memory.h
-include/gwenhywfar/misc.h
-include/gwenhywfar/misc2.h
-include/gwenhywfar/plugin.h
-include/gwenhywfar/plugindescr.h
-include/gwenhywfar/refptr.h
-include/gwenhywfar/ringbuffer.h
-include/gwenhywfar/smp_storage_be.h
-include/gwenhywfar/smp_type_be.h
-include/gwenhywfar/ssl_cert_descr.h
-include/gwenhywfar/ssl_cipher.h
-include/gwenhywfar/st_client.h
-include/gwenhywfar/st_client_be.h
-include/gwenhywfar/st_find.h
-include/gwenhywfar/st_find_be.h
-include/gwenhywfar/st_log.h
-include/gwenhywfar/st_object.h
-include/gwenhywfar/st_object_be.h
-include/gwenhywfar/st_plugin.h
-include/gwenhywfar/st_plugin_be.h
-include/gwenhywfar/st_storage.h
-include/gwenhywfar/st_storage_be.h
-include/gwenhywfar/st_type.h
-include/gwenhywfar/st_type_be.h
-include/gwenhywfar/st_vardef.h
-include/gwenhywfar/stringlist.h
-include/gwenhywfar/stringlist2.h
-include/gwenhywfar/waitcallback.h
-include/gwenhywfar/crypt.h
-include/gwenhywfar/keymanager.h
-include/gwenhywfar/keyspec.h
-include/gwenhywfar/md.h
-include/gwenhywfar/padd.h
-include/gwenhywfar/bio_buffer.h
-include/gwenhywfar/bio_file.h
-include/gwenhywfar/bio_socket.h
-include/gwenhywfar/bufferedio.h
-include/gwenhywfar/filter.h
-include/gwenhywfar/ipc.h
-include/gwenhywfar/system.h
-include/gwenhywfar/directory.h
-include/gwenhywfar/fslock.h
-include/gwenhywfar/gwensignal.h
-include/gwenhywfar/gwentime.h
-include/gwenhywfar/inetaddr.h
-include/gwenhywfar/inetsocket.h
-include/gwenhywfar/libloader.h
-include/gwenhywfar/process.h
-include/gwenhywfar/base64.h
-include/gwenhywfar/csv.h
-include/gwenhywfar/ct_file.h
-include/gwenhywfar/db.h
-include/gwenhywfar/dbio.h
-include/gwenhywfar/msgengine.h
-include/gwenhywfar/path.h
-include/gwenhywfar/pathmanager.h
-include/gwenhywfar/request.h
-include/gwenhywfar/requestmgr.h
-include/gwenhywfar/text.h
-include/gwenhywfar/tlv.h
-include/gwenhywfar/url.h
-include/gwenhywfar/urlfns.h
-include/gwenhywfar/xml.h
-include/gwenhywfar/xsd.h
-include/gwenhywfar/net2.h
-include/gwenhywfar/netlayer.h
-include/gwenhywfar/nl_file.h
-include/gwenhywfar/nl_hbci.h
-include/gwenhywfar/nl_http.h
-include/gwenhywfar/nl_log.h
-include/gwenhywfar/nl_packets.h
-include/gwenhywfar/nl_socket.h
-include/gwenhywfar/nl_ssl.h
-include/gwenhywfar/nl_stdio.h
-include/gwenhywfar/crypttoken.h
-include/gwenhywfar/crypttoken_context.h
-include/gwenhywfar/crypttoken_cryptinfo.h
-include/gwenhywfar/crypttoken_keyinfo.h
-include/gwenhywfar/crypttoken_plugin.h
-include/gwenhywfar/crypttoken_signinfo.h
-include/gwenhywfar/crypttoken_user.h
-include/gwenhywfar/gwenhywfar.h
-include/gwenhywfar/gwenhywfarapi.h
-include/gwenhywfar/types.h
-include/gwenhywfar/version.h
-etc/gwen-public-ca.crt
+bin/mklistdoc
+bin/typemaker
+bin/xmlmerge
+include/gwenhywfar3/gwenhywfar/args.h
+include/gwenhywfar3/gwenhywfar/base64.h
+include/gwenhywfar3/gwenhywfar/bio_buffer.h
+include/gwenhywfar3/gwenhywfar/bio_file.h
+include/gwenhywfar3/gwenhywfar/bio_socket.h
+include/gwenhywfar3/gwenhywfar/buffer.h
+include/gwenhywfar3/gwenhywfar/bufferedio.h
+include/gwenhywfar3/gwenhywfar/cgui.h
+include/gwenhywfar3/gwenhywfar/configmgr.h
+include/gwenhywfar3/gwenhywfar/configmgr_be.h
+include/gwenhywfar3/gwenhywfar/cryptalgo.h
+include/gwenhywfar3/gwenhywfar/cryptdefs.h
+include/gwenhywfar3/gwenhywfar/crypthead.h
+include/gwenhywfar3/gwenhywfar/cryptkey.h
+include/gwenhywfar3/gwenhywfar/cryptkey_be.h
+include/gwenhywfar3/gwenhywfar/cryptkeyrsa.h
+include/gwenhywfar3/gwenhywfar/cryptkeysym.h
+include/gwenhywfar3/gwenhywfar/cryptmgr.h
+include/gwenhywfar3/gwenhywfar/cryptmgr_be.h
+include/gwenhywfar3/gwenhywfar/cryptmgrkeys.h
+include/gwenhywfar3/gwenhywfar/ct.h
+include/gwenhywfar3/gwenhywfar/ct_be.h
+include/gwenhywfar3/gwenhywfar/ct_context.h
+include/gwenhywfar3/gwenhywfar/ct_keyinfo.h
+include/gwenhywfar3/gwenhywfar/ctf_context_be.h
+include/gwenhywfar3/gwenhywfar/ctfile_be.h
+include/gwenhywfar3/gwenhywfar/ctplugin.h
+include/gwenhywfar3/gwenhywfar/ctplugin_be.h
+include/gwenhywfar3/gwenhywfar/db.h
+include/gwenhywfar3/gwenhywfar/dbio.h
+include/gwenhywfar3/gwenhywfar/dbio_be.h
+include/gwenhywfar3/gwenhywfar/debug.h
+include/gwenhywfar3/gwenhywfar/directory.h
+include/gwenhywfar3/gwenhywfar/error.h
+include/gwenhywfar3/gwenhywfar/fastbuffer.h
+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/gwenhywfar.h
+include/gwenhywfar3/gwenhywfar/gwenhywfarapi.h
+include/gwenhywfar3/gwenhywfar/gwensemaphore.h
+include/gwenhywfar3/gwenhywfar/gwensignal.h
+include/gwenhywfar3/gwenhywfar/gwentime.h
+include/gwenhywfar3/gwenhywfar/hashalgo.h
+include/gwenhywfar3/gwenhywfar/httpsession.h
+include/gwenhywfar3/gwenhywfar/i18n.h
+include/gwenhywfar3/gwenhywfar/idlist.h
+include/gwenhywfar3/gwenhywfar/idlist64.h
+include/gwenhywfar3/gwenhywfar/idmap.h
+include/gwenhywfar3/gwenhywfar/inetaddr.h
+include/gwenhywfar3/gwenhywfar/inetsocket.h
+include/gwenhywfar3/gwenhywfar/inherit.h
+include/gwenhywfar3/gwenhywfar/io_buffered.h
+include/gwenhywfar3/gwenhywfar/io_codec_be.h
+include/gwenhywfar3/gwenhywfar/io_file.h
+include/gwenhywfar3/gwenhywfar/io_http.h
+include/gwenhywfar3/gwenhywfar/io_memory.h
+include/gwenhywfar3/gwenhywfar/io_packets.h
+include/gwenhywfar3/gwenhywfar/io_socket.h
+include/gwenhywfar3/gwenhywfar/io_tls.h
+include/gwenhywfar3/gwenhywfar/iolayer.h
+include/gwenhywfar3/gwenhywfar/iolayer_be.h
+include/gwenhywfar3/gwenhywfar/iomanager.h
+include/gwenhywfar3/gwenhywfar/iorequest.h
+include/gwenhywfar3/gwenhywfar/iorequest_be.h
+include/gwenhywfar3/gwenhywfar/ipc.h
+include/gwenhywfar3/gwenhywfar/libloader.h
+include/gwenhywfar3/gwenhywfar/list.h
+include/gwenhywfar3/gwenhywfar/list1.h
+include/gwenhywfar3/gwenhywfar/list1.tmpl
+include/gwenhywfar3/gwenhywfar/list2.h
+include/gwenhywfar3/gwenhywfar/list2.tmpl
+include/gwenhywfar3/gwenhywfar/logger.h
+include/gwenhywfar3/gwenhywfar/mdigest.h
+include/gwenhywfar3/gwenhywfar/mdigest_be.h
+include/gwenhywfar3/gwenhywfar/memcache.h
+include/gwenhywfar3/gwenhywfar/memory.h
+include/gwenhywfar3/gwenhywfar/misc.h
+include/gwenhywfar3/gwenhywfar/misc2.h
+include/gwenhywfar3/gwenhywfar/msgengine.h
+include/gwenhywfar3/gwenhywfar/mutex.h
+include/gwenhywfar3/gwenhywfar/padd.h
+include/gwenhywfar3/gwenhywfar/paddalgo.h
+include/gwenhywfar3/gwenhywfar/path.h
+include/gwenhywfar3/gwenhywfar/pathmanager.h
+include/gwenhywfar3/gwenhywfar/plugin.h
+include/gwenhywfar3/gwenhywfar/plugindescr.h
+include/gwenhywfar3/gwenhywfar/process.h
+include/gwenhywfar3/gwenhywfar/refptr.h
+include/gwenhywfar3/gwenhywfar/request.h
+include/gwenhywfar3/gwenhywfar/requestmgr.h
+include/gwenhywfar3/gwenhywfar/ringbuffer.h
+include/gwenhywfar3/gwenhywfar/sighead.h
+include/gwenhywfar3/gwenhywfar/sigtail.h
+include/gwenhywfar3/gwenhywfar/ssl_cert_descr.h
+include/gwenhywfar3/gwenhywfar/ssl_cert_flags.h
+include/gwenhywfar3/gwenhywfar/stringlist.h
+include/gwenhywfar3/gwenhywfar/stringlist2.h
+include/gwenhywfar3/gwenhywfar/system.h
+include/gwenhywfar3/gwenhywfar/tag16.h
+include/gwenhywfar3/gwenhywfar/text.h
+include/gwenhywfar3/gwenhywfar/tlv.h
+include/gwenhywfar3/gwenhywfar/types.h
+include/gwenhywfar3/gwenhywfar/url.h
+include/gwenhywfar3/gwenhywfar/urlfns.h
+include/gwenhywfar3/gwenhywfar/version.h
+include/gwenhywfar3/gwenhywfar/xml.h
+include/gwenhywfar3/gwenhywfar/xmlctx.h
+include/gwenhywfar3/gwenhywfar/xsdnode.h
+lib/gwenhywfar/plugins/47/configmgr/dir.a
+lib/gwenhywfar/plugins/47/configmgr/dir.la
+lib/gwenhywfar/plugins/47/configmgr/dir.so
+lib/gwenhywfar/plugins/47/configmgr/dir.xml
+lib/gwenhywfar/plugins/47/ct/ohbci.a
+lib/gwenhywfar/plugins/47/ct/ohbci.la
+lib/gwenhywfar/plugins/47/ct/ohbci.so
+lib/gwenhywfar/plugins/47/ct/ohbci.xml
+lib/gwenhywfar/plugins/47/dbio/csv.a
+lib/gwenhywfar/plugins/47/dbio/csv.la
+lib/gwenhywfar/plugins/47/dbio/csv.so
+lib/gwenhywfar/plugins/47/dbio/csv.so.0
+lib/gwenhywfar/plugins/47/dbio/csv.xml
+lib/gwenhywfar/plugins/47/dbio/olddb.a
+lib/gwenhywfar/plugins/47/dbio/olddb.la
+lib/gwenhywfar/plugins/47/dbio/olddb.so
+lib/gwenhywfar/plugins/47/dbio/olddb.so.0
+lib/gwenhywfar/plugins/47/dbio/olddb.xml
+lib/gwenhywfar/plugins/47/dbio/xmldb.a
+lib/gwenhywfar/plugins/47/dbio/xmldb.la
+lib/gwenhywfar/plugins/47/dbio/xmldb.so
+lib/gwenhywfar/plugins/47/dbio/xmldb.so.0
+lib/gwenhywfar/plugins/47/dbio/xmldb.xml
 lib/libgwenhywfar.a
 lib/libgwenhywfar.la
 lib/libgwenhywfar.so
-lib/libgwenhywfar.so.48
+lib/libgwenhywfar.so.53
 libdata/pkgconfig/gwenhywfar.pc
-lib/gwenhywfar/plugins/38/crypttoken/ohbci.a
-lib/gwenhywfar/plugins/38/crypttoken/ohbci.la
-lib/gwenhywfar/plugins/38/crypttoken/ohbci.so
-lib/gwenhywfar/plugins/38/crypttoken/ohbci.so.0
-lib/gwenhywfar/plugins/38/crypttoken/ohbci.xml
-lib/gwenhywfar/plugins/38/dbio/csv.a
-lib/gwenhywfar/plugins/38/dbio/csv.la
-lib/gwenhywfar/plugins/38/dbio/csv.so
-lib/gwenhywfar/plugins/38/dbio/csv.so.0
-lib/gwenhywfar/plugins/38/dbio/csv.xml
-lib/gwenhywfar/plugins/38/dbio/olddb.a
-lib/gwenhywfar/plugins/38/dbio/olddb.la
-lib/gwenhywfar/plugins/38/dbio/olddb.so
-lib/gwenhywfar/plugins/38/dbio/olddb.so.0
-lib/gwenhywfar/plugins/38/dbio/olddb.xml
-lib/gwenhywfar/plugins/38/dbio/rfc822.a
-lib/gwenhywfar/plugins/38/dbio/rfc822.la
-lib/gwenhywfar/plugins/38/dbio/rfc822.so
-lib/gwenhywfar/plugins/38/dbio/rfc822.so.0
-lib/gwenhywfar/plugins/38/dbio/rfc822.xml
-lib/gwenhywfar/plugins/38/dbio/xmldb.a
-lib/gwenhywfar/plugins/38/dbio/xmldb.la
-lib/gwenhywfar/plugins/38/dbio/xmldb.so
-lib/gwenhywfar/plugins/38/dbio/xmldb.so.0
-lib/gwenhywfar/plugins/38/dbio/xmldb.xml
-lib/gwenhywfar/plugins/38/storage/localfiles.a
-lib/gwenhywfar/plugins/38/storage/localfiles.la
-lib/gwenhywfar/plugins/38/storage/localfiles.so
-lib/gwenhywfar/plugins/38/storage/localfiles.so.0
-lib/gwenhywfar/plugins/38/storage/localfiles.xml
 share/aclocal/gwenhywfar.m4
-@dirrm include/gwenhywfar
-@dirrm lib/gwenhywfar/plugins/38/crypttoken
-@dirrm lib/gwenhywfar/plugins/38/dbio
-@dirrm lib/gwenhywfar/plugins/38/storage
-@dirrm lib/gwenhywfar/plugins/38
+share/gwenhywfar/ca-bundle.crt
+share/locale/de/LC_MESSAGES/gwenhywfar.mo
+@dirrm share/gwenhywfar
+@dirrm lib/gwenhywfar/plugins/47/dbio
+@dirrm lib/gwenhywfar/plugins/47/ct
+@dirrm lib/gwenhywfar/plugins/47/configmgr
+@dirrm lib/gwenhywfar/plugins/47
 @dirrm lib/gwenhywfar/plugins
 @dirrm lib/gwenhywfar
+@dirrm include/gwenhywfar3/gwenhywfar
+@dirrm include/gwenhywfar3