Update libgcrypt to the new stable version 1.2.0

Retire libgcrypt-devel

Switch back to security/libgcrypt and bump PORTREVISION for
- gnutls
- gnutls-devel
- gsasl
- opencdk
- vpnc

libggz:
- Remove dependency on libgcrypt, because the port does not yet
work with the new libgcrypt

libksba:
- Update to 0.9.5
- Pass maintainership to lofi, who already maintains the other
aegypten ports.

Approved by:	lofi

wmbiff:
Switch to security/libgcrypt but no PORTREVISION bump, because the
dependency is optional and the port does not work with the new
libgcrypt and needs to be updated.

No action, because ports don't work with the new libgcrypt and need
to be updated, maintainers informed:
security/newpg
security/pinentry
security/dirmngr
emulators/fuse
emulators/libspectrum

18 files changed, 29 insertions, 142 deletions

diff --git a/security/Makefile b/security/Makefile
index 453331cfd2a5..4de19c07646d 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -154,7 +154,6 @@
     SUBDIR += libecc
     SUBDIR += libfwbuilder
     SUBDIR += libgcrypt
-    SUBDIR += libgcrypt-devel
     SUBDIR += libgpg-error
     SUBDIR += libgringotts
     SUBDIR += libidea
diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile
index 350ef03f01e3..b48efb6a794f 100644
--- a/security/gnutls-devel/Makefile
+++ b/security/gnutls-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnutls
 PORTVERSION=	1.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_GNUPG} \
 	http://www.mirrors.wiretapped.net/security/network-security/gnutls/devel/ \
@@ -19,7 +19,7 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	GNU Transport Layer Security library (development version)
 
-LIB_DEPENDS=	gcrypt.10:${PORTSDIR}/security/libgcrypt-devel \
+LIB_DEPENDS=	gcrypt.12:${PORTSDIR}/security/libgcrypt \
 		gpg-error.1:${PORTSDIR}/security/libgpg-error \
 		tasn1.2:${PORTSDIR}/security/libtasn1 \
 		opencdk.8:${PORTSDIR}/security/opencdk
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index a9f0e8e3735b..3e6d118a51aa 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnutls
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_GNUPG} \
 	http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
@@ -17,7 +18,7 @@ MASTER_SITE_SUBDIR=	alpha/gnutls
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	GNU Transport Layer Security library
 
-LIB_DEPENDS=	gcrypt.10:${PORTSDIR}/security/libgcrypt-devel \
+LIB_DEPENDS=	gcrypt.12:${PORTSDIR}/security/libgcrypt \
 		gpg-error.1:${PORTSDIR}/security/libgpg-error \
 		opencdk.8:${PORTSDIR}/security/opencdk \
 		tasn1.2:${PORTSDIR}/security/libtasn1
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 94b4d5df519d..0e6c99d2e226 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gsasl
 PORTVERSION=	0.1.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://josefsson.org/${PORTNAME}/releases/ \
 		${MASTER_SITE_GNU_ALPHA}
@@ -17,7 +18,7 @@ MAINTAINER=	krion@FreeBSD.org
 COMMENT=	GNU SASL Library
 
 LIB_DEPENDS=	idn.13:${PORTSDIR}/devel/libidn \
-		gcrypt.10:${PORTSDIR}/security/libgcrypt-devel \
+		gcrypt.12:${PORTSDIR}/security/libgcrypt \
 		ntlm.0:${PORTSDIR}/security/libntlm
 
 USE_GNOME=	gnomehack gnometarget pkgconfig
diff --git a/security/libgcrypt-devel/Makefile b/security/libgcrypt-devel/Makefile
deleted file mode 100644
index 2cd35ab7d447..000000000000
--- a/security/libgcrypt-devel/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# New ports collection Makefile for:	libgcrypt
-# Date created:				July 17 2002
-# Whom:					Tilman Linneweh <arved@FreeBSD.org>
-#
-# $FreeBSD$
-
-PORTNAME=	libgcrypt
-PORTVERSION=	1.1.91
-PORTREVISION=	1
-CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR=	alpha/libgcrypt
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}.sig
-
-MAINTAINER=	arved@FreeBSD.org
-COMMENT=	"General purpose crypto library based on code used in GnuPG"
-
-LIB_DEPENDS=	gpg-error.1:${PORTSDIR}/security/libgpg-error
-
-CONFLICTS=	libgcrypt-1.1*
-USE_REINPLACE=	yes
-USE_PERL5=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=		--with-pth=no
-INSTALLS_SHLIB=	yes
-
-INFO=	gcrypt
-
-.include <bsd.port.pre.mk>
-
-pre-extract:
-.if exists(${PREFIX}/bin/gpg)
-	@${MKDIR} ${WRKDIR}
-	@${ECHO_CMD} "===> Verifying GnuPG Signature."
-	-${PREFIX}/bin/gpg --no-default-keyring --keyring ${WRKDIR}/keyring \
-		--keyserver pgp.mit.edu --recv-key 57548DCD
-	cd ${DISTDIR}; ${PREFIX}/bin/gpg --keyring ${WRKDIR}/keyring --verify \
-		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}.sig \
-		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-.else
-	@${ECHO_CMD} "===> GnuPG not installed. Signature can not be verified"
-.endif
-
-post-patch:
-	@${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|-lpthread|${PTHREAD_LIBS}|g'
-	@${REINPLACE_CMD} -e s'|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/src/Makefile.in
-
-pre-configure:
-	@${RM} -f ${WRKSRC}/doc/gcrypt.info*
-
-.include <bsd.port.post.mk>
diff --git a/security/libgcrypt-devel/distinfo b/security/libgcrypt-devel/distinfo
deleted file mode 100644
index 203110b5aeca..000000000000
--- a/security/libgcrypt-devel/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (libgcrypt-1.1.91.tar.gz) = 8f3581d2d2a66c8f42b16f6ce13dedc3
-SIZE (libgcrypt-1.1.91.tar.gz) = 876347
-MD5 (libgcrypt-1.1.91.tar.gz.sig) = 6c97d0902b4053a72841ca7a62bfe9d6
-SIZE (libgcrypt-1.1.91.tar.gz.sig) = 64
diff --git a/security/libgcrypt-devel/files/patch-ltmain.sh b/security/libgcrypt-devel/files/patch-ltmain.sh
deleted file mode 100644
index 642e3d0bdb06..000000000000
--- a/security/libgcrypt-devel/files/patch-ltmain.sh
+++ /dev/null
@@ -1,41 +0,0 @@
---- ltmain.sh.orig	Thu May 22 16:42:22 2003
-+++ ltmain.sh	Tue May 27 12:12:52 2003
-@@ -1072,7 +1072,7 @@
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -1082,8 +1082,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -4325,10 +4336,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/security/libgcrypt-devel/pkg-descr b/security/libgcrypt-devel/pkg-descr
deleted file mode 100644
index a5d0b3a305f4..000000000000
--- a/security/libgcrypt-devel/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Libgcrypt is a general purpose crypto library based on the code used in GnuPG.
- 
-Author:	wk@g10code.com
-WWW: http://www.gnupg.org/
diff --git a/security/libgcrypt-devel/pkg-plist b/security/libgcrypt-devel/pkg-plist
deleted file mode 100644
index 20d2dc8234f9..000000000000
--- a/security/libgcrypt-devel/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/libgcrypt-config
-include/gcrypt.h
-include/gcrypt-module.h
-lib/libgcrypt.a
-lib/libgcrypt.so
-lib/libgcrypt.so.10
-lib/libgcrypt-pthread.a
-lib/libgcrypt-pthread.so.10
-lib/libgcrypt-pthread.so
-share/aclocal/libgcrypt.m4
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index ccb001a68ff0..6af1e0a0e066 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -5,24 +5,22 @@
 # $FreeBSD$
 
 PORTNAME=	libgcrypt
-PORTVERSION=	1.1.12
+PORTVERSION=	1.2.0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR=	alpha/libgcrypt
+MASTER_SITE_SUBDIR=	libgcrypt
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}.sig
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	"General purpose crypto library based on code used in GnuPG"
 
-CONFLICTS=	libgcrypt-1.1.9*
 USE_REINPLACE=	yes
 USE_PERL5=	yes
 USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
-NO_LATEST_LINK=yes
 
 INFO=	gcrypt
 
@@ -43,7 +41,7 @@ pre-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|" \
-		${WRKSRC}/scripts/ltmain.sh
+		${WRKSRC}/ltmain.sh
 
 pre-configure:
 	@${RM} -f ${WRKSRC}/doc/gcrypt.info*
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo
index b393370e46c5..012fd84f677e 100644
--- a/security/libgcrypt/distinfo
+++ b/security/libgcrypt/distinfo
@@ -1,4 +1,4 @@
-MD5 (libgcrypt-1.1.12.tar.gz) = c245f62bf8da9a83c5dae26d9fa3559d
-SIZE (libgcrypt-1.1.12.tar.gz) = 741606
-MD5 (libgcrypt-1.1.12.tar.gz.sig) = a00de178c9f44b9a30f5f04f6260538c
-SIZE (libgcrypt-1.1.12.tar.gz.sig) = 65
+MD5 (libgcrypt-1.2.0.tar.gz) = 5c508072d8387ce17d1ab05075c2be40
+SIZE (libgcrypt-1.2.0.tar.gz) = 949159
+MD5 (libgcrypt-1.2.0.tar.gz.sig) = 2b3af043c5ab3b7d6aa8cb1f852dc67b
+SIZE (libgcrypt-1.2.0.tar.gz.sig) = 65
diff --git a/security/libgcrypt/files/patch-ltmain.sh b/security/libgcrypt/files/patch-ltmain.sh
index e99e2de7af48..250b983f2f3a 100644
--- a/security/libgcrypt/files/patch-ltmain.sh
+++ b/security/libgcrypt/files/patch-ltmain.sh
@@ -1,5 +1,5 @@
 --- scripts/ltmain.sh.orig	Wed Jul 17 15:42:41 2002
-+++ scripts/ltmain.sh	Wed Jul 17 15:47:36 2002
++++ ltmain.sh	Wed Jul 17 15:47:36 2002
 @@ -1062,8 +1062,16 @@
  	continue
  	;;
diff --git a/security/libgcrypt/pkg-plist b/security/libgcrypt/pkg-plist
index e92679f25058..a613f2b2dd9a 100644
--- a/security/libgcrypt/pkg-plist
+++ b/security/libgcrypt/pkg-plist
@@ -2,5 +2,5 @@ bin/libgcrypt-config
 include/gcrypt.h
 lib/libgcrypt.a
 lib/libgcrypt.so
-lib/libgcrypt.so.6
+lib/libgcrypt.so.12
 share/aclocal/libgcrypt.m4
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index d25f69d6d61b..64107590d3ca 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -5,21 +5,23 @@
 # $FreeBSD$
 
 PORTNAME=	libksba
-PORTVERSION=	0.4.7
+PORTVERSION=	0.9.5
 CATEGORIES=	security
 MASTER_SITES= 	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	alpha/${PORTNAME}
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}.sig
 
-MAINTAINER=	arved@FreeBSD.org
+MAINTAINER=	lofi@FreeBSD.org
 COMMENT=	"KSBA is an X.509 Library"
 
+LIB_DEPENDS=	gpg-error.1:${PORTSDIR}/security/libgpg-error
+
+GNU_CONFIGURE=	yes
 USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOCONF_VER=	253
 USE_PERL5_BUILD=	yes
 
 INFO=	ksba
diff --git a/security/libksba/distinfo b/security/libksba/distinfo
index 986e1b774388..c0868bcd3a29 100644
--- a/security/libksba/distinfo
+++ b/security/libksba/distinfo
@@ -1,4 +1,4 @@
-MD5 (libksba-0.4.7.tar.gz) = 65ab8dad1f7fb379f72e1d096657a3d7
-SIZE (libksba-0.4.7.tar.gz) = 445328
-MD5 (libksba-0.4.7.tar.gz.sig) = e11f7627929155b03b7f7a5a4f593aa5
-SIZE (libksba-0.4.7.tar.gz.sig) = 65
+MD5 (libksba-0.9.5.tar.gz) = d43941ded9b099d6bd123e0d9281b1a4
+SIZE (libksba-0.9.5.tar.gz) = 579637
+MD5 (libksba-0.9.5.tar.gz.sig) = abf9c7d83a6d68e7bb0a554ee1e917fd
+SIZE (libksba-0.9.5.tar.gz.sig) = 65
diff --git a/security/libksba/pkg-plist b/security/libksba/pkg-plist
index 79bbc1dbf968..53e3ccd908d2 100644
--- a/security/libksba/pkg-plist
+++ b/security/libksba/pkg-plist
@@ -1,6 +1,6 @@
 bin/ksba-config
 include/ksba.h
-lib/libksba.so.7
+lib/libksba.so.11
 lib/libksba.so
 lib/libksba.a
 share/aclocal/ksba.m4
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 64f00a34ffe1..56ee18f73404 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opencdk
 PORTVERSION=	0.5.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG} \
@@ -18,7 +19,7 @@ MASTER_SITE_SUBDIR=	alpha/gnutls/opencdk
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Open Crypto Development Kit
 
-LIB_DEPENDS=	gcrypt.10:${PORTSDIR}/security/libgcrypt-devel
+LIB_DEPENDS=	gcrypt.12:${PORTSDIR}/security/libgcrypt
 
 USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile
index c316506196ec..806aed911cff 100644
--- a/security/vpnc/Makefile
+++ b/security/vpnc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vpnc
 PORTVERSION=	0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security
 MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/ \
 	http://dragon.roe.ch/mirrors/distfiles/vpnc/
@@ -18,7 +18,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	delta@lackas.net
 COMMENT=	Client for Cisco 3000 VPN Concentrator
 
-LIB_DEPENDS=	gcrypt.10:${PORTSDIR}/security/libgcrypt-devel
+LIB_DEPENDS=	gcrypt.12:${PORTSDIR}/security/libgcrypt
 
 STARTSCRIPT=    vpnc-wrapper-1.9
 USE_GMAKE=	yes