Update security/libassuan to version 2.0.0, which is required by gnupg 2.0.15

Unfortunately version 2.0.0 is largely incompatible with version 1.x, so it
is necessary to have a stopgap measure while ports that depend on libassuan
can be updated. In conversation with the maintainers of the dependent ports
it was originally considered ideal to prepare updates for the ports first,
then upgrade everything to libassuan 2.x en masse. Since no action has
arisen on that front, go with plan B:

Copy security/libassuan to security/libassuan-1, and update the dependent
ports accordingly. Because this is (intended to be) a _temporary_ measure,
and because no updates for libassuan 1.x are anticipated, and because the
hope is that it can be removed sooner rather than later, it's a copy instead
of a repocopy.

14 files changed, 100 insertions, 25 deletions

diff --git a/UPDATING b/UPDATING
index dddc907888d0..6070d0032292 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,29 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20100613:
+  AFFECTS: users of deskutils/kdepim4, and  security/{dirmngr|gnupg|gpa|opensc}
+  AUTHOR: dougb@FreeBSD.org
+
+  The security/libassuan port has been updated to version 2.0.0, however
+  the applications listed above are not yet compatible with it.  Therefore
+  security/libassuan-1 has been created until they can be updated, and the
+  ports listed above have been updated to depend on it.  You must first
+  replace your existing libassuan with version 1 in the new location, then
+  you can update the ports listed above normally.
+
+  If you use portupgrade:
+
+	portupgrade -f -o security/libassuan-1 security/libassuan
+
+  If you use portmaster:
+
+	portmaster -o security/libassuan-1 libassuan
+
+  If you use neither:
+
+	pkg_delete -f libassuan*
+
 20100609:
   AFFECTS: users of audio/libogg and audio/libao
   AUTHOR: naddy@FreeBSD.org
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index b63e1965d550..08d88407158d 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -15,7 +15,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications
 
-BUILD_DEPENDS=	libassuan>=1.0.4:${PORTSDIR}/security/libassuan
+BUILD_DEPENDS=	libassuan>=1.0.4:${PORTSDIR}/security/libassuan-1
 LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		boost_thread:${PORTSDIR}/devel/boost-libs \
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index b63e1965d550..08d88407158d 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -15,7 +15,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications
 
-BUILD_DEPENDS=	libassuan>=1.0.4:${PORTSDIR}/security/libassuan
+BUILD_DEPENDS=	libassuan>=1.0.4:${PORTSDIR}/security/libassuan-1
 LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		boost_thread:${PORTSDIR}/devel/boost-libs \
diff --git a/security/Makefile b/security/Makefile
index a08134203472..bb083c7b9d3f 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -243,6 +243,7 @@
     SUBDIR += lasso
     SUBDIR += lep
     SUBDIR += libassuan
+    SUBDIR += libassuan-1
     SUBDIR += libbf
     SUBDIR += libecc
     SUBDIR += libfprint
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 42fdda0462a3..22bd4ff8cc1e 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dirmngr
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	dirmngr
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	dirmngr
 MAINTAINER=	umq@ueo.co.jp
 COMMENT=	A client for managing and downloading certificate revocation lists
 
-BUILD_DEPENDS=	libassuan>=1.0.4:${PORTSDIR}/security/libassuan
+BUILD_DEPENDS=	libassuan>=1.0.4:${PORTSDIR}/security/libassuan-1
 LIB_DEPENDS=	gcrypt.16:${PORTSDIR}/security/libgcrypt \
 		gpg-error.0:${PORTSDIR}/security/libgpg-error \
 		ksba.17:${PORTSDIR}/security/libksba \
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 3dabeacfbc6a..7de89ee97a0c 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	2.0.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	The GNU Privacy Guard
 
-BUILD_DEPENDS=	libassuan>=1.0.4:${PORTSDIR}/security/libassuan \
+BUILD_DEPENDS=	libassuan>=1.0.4:${PORTSDIR}/security/libassuan-1 \
 		libksba>=1.0.2:${PORTSDIR}/security/libksba
 LIB_DEPENDS=	gcrypt.16:${PORTSDIR}/security/libgcrypt \
 		gpg-error:${PORTSDIR}/security/libgpg-error \
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index 64c32c410445..951aba9fb04e 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpa
 PORTVERSION=	0.9.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security
 MASTER_SITES=	http://wald.intevation.org/frs/download.php/603/
 
@@ -16,7 +16,7 @@ COMMENT=	A graphical frontend for the GNU Privacy Guard
 
 LIB_DEPENDS=	gpgme.18:${PORTSDIR}/security/gpgme
 BUILD_DEPENDS=	gpgv2:${PORTSDIR}/security/gnupg \
-		libassuan>=1.0.4:${PORTSDIR}/security/libassuan
+		libassuan>=1.0.4:${PORTSDIR}/security/libassuan-1
 RUN_DEPENDS=	gpgv2:${PORTSDIR}/security/gnupg
 
 USE_BZIP2=	yes
diff --git a/security/libassuan-1/Makefile b/security/libassuan-1/Makefile
new file mode 100644
index 000000000000..5b399dc6a9e9
--- /dev/null
+++ b/security/libassuan-1/Makefile
@@ -0,0 +1,41 @@
+# New ports collection makefile for:	libassuan
+# Date created:				2004-04-19
+# Whom:					Michael Nottebrock <lofi@freebsd.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	libassuan
+PORTVERSION=	1.0.5
+CATEGORIES=	security devel
+MASTER_SITES=	${MASTER_SITE_GNUPG}
+MASTER_SITE_SUBDIR=${PORTNAME}
+PKGNAMESUFFIX=	-1
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
+MAINTAINER=	dougb@FreeBSD.org
+COMMENT=	IPC library used by GnuPG and gpgme
+
+LIB_DEPENDS+=	pth.20:${PORTSDIR}/devel/pth
+
+CONFLICTS=	libassuan-2*
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+INFO=		assuan
+PLIST_FILES=	bin/libassuan-config include/assuan.h lib/libassuan-pth.a \
+		lib/libassuan.a share/aclocal/libassuan.m4
+
+CFLAGS+=	-I${LOCALBASE}/include/pth
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+CFLAGS+=	-fPIC
+.endif
+
+verify: checksum
+	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
+
+.include <bsd.port.post.mk>
diff --git a/security/libassuan-1/distinfo b/security/libassuan-1/distinfo
new file mode 100644
index 000000000000..49384344cef4
--- /dev/null
+++ b/security/libassuan-1/distinfo
@@ -0,0 +1,6 @@
+MD5 (libassuan-1.0.5.tar.bz2) = c2db0974fcce4401f48f3fa41c4edc5a
+SHA256 (libassuan-1.0.5.tar.bz2) = c58b2408d81aa6d76e9d699a2bdaafd6acc2e63e9df89a142f07aa2a4b4459f5
+SIZE (libassuan-1.0.5.tar.bz2) = 297786
+MD5 (libassuan-1.0.5.tar.bz2.sig) = 167c1838f56f3b85083422668b369f17
+SHA256 (libassuan-1.0.5.tar.bz2.sig) = b9c47946261c264a1e162517fbf13184266e656a79b97be736d481484e9e7819
+SIZE (libassuan-1.0.5.tar.bz2.sig) = 158
diff --git a/security/libassuan-1/pkg-descr b/security/libassuan-1/pkg-descr
new file mode 100644
index 000000000000..19338e6fdd37
--- /dev/null
+++ b/security/libassuan-1/pkg-descr
@@ -0,0 +1,2 @@
+This is the IPC library used by GnuPG 1.9, gpgme and the old newpg
+package.
diff --git a/security/libassuan/Makefile b/security/libassuan/Makefile
index 27e04e7b68c0..4bebf5231bb9 100644
--- a/security/libassuan/Makefile
+++ b/security/libassuan/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libassuan
-PORTVERSION=	1.0.5
+PORTVERSION=	2.0.0
 CATEGORIES=	security devel
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=${PORTNAME}
@@ -16,15 +16,17 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	dougb@FreeBSD.org
 COMMENT=	IPC library used by GnuPG and gpgme
 
-LIB_DEPENDS+=	pth.20:${PORTSDIR}/devel/pth
+LIB_DEPENDS+=	pth.20:${PORTSDIR}/devel/pth \
+		gpg-error:${PORTSDIR}/security/libgpg-error
+
+CONFLICTS=	libassuan-1-1*
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
 INFO=		assuan
-PLIST_FILES=	bin/libassuan-config include/assuan.h lib/libassuan-pth.a \
-		lib/libassuan.a share/aclocal/libassuan.m4
-
-CFLAGS+=	-I${LOCALBASE}/include/pth
+PLIST_FILES=	bin/libassuan-config include/assuan.h lib/libassuan.la \
+		lib/libassuan.so.0 lib/libassuan.so share/aclocal/libassuan.m4
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/libassuan/distinfo b/security/libassuan/distinfo
index 49384344cef4..8e3f5bd165a4 100644
--- a/security/libassuan/distinfo
+++ b/security/libassuan/distinfo
@@ -1,6 +1,6 @@
-MD5 (libassuan-1.0.5.tar.bz2) = c2db0974fcce4401f48f3fa41c4edc5a
-SHA256 (libassuan-1.0.5.tar.bz2) = c58b2408d81aa6d76e9d699a2bdaafd6acc2e63e9df89a142f07aa2a4b4459f5
-SIZE (libassuan-1.0.5.tar.bz2) = 297786
-MD5 (libassuan-1.0.5.tar.bz2.sig) = 167c1838f56f3b85083422668b369f17
-SHA256 (libassuan-1.0.5.tar.bz2.sig) = b9c47946261c264a1e162517fbf13184266e656a79b97be736d481484e9e7819
-SIZE (libassuan-1.0.5.tar.bz2.sig) = 158
+MD5 (libassuan-2.0.0.tar.bz2) = 59bc0ae7194c412d7a522029005684b2
+SHA256 (libassuan-2.0.0.tar.bz2) = fd2a04b0d14b1097248a2b97c33087c095e52cc7978ff6f9d4d432dd25d17f8f
+SIZE (libassuan-2.0.0.tar.bz2) = 449563
+MD5 (libassuan-2.0.0.tar.bz2.sig) = bb73e093d65d5b165d20b7377fee72a5
+SHA256 (libassuan-2.0.0.tar.bz2.sig) = 02545575e0dc1504bcf133f0c52eeff68de22931281053a391839460708d2dca
+SIZE (libassuan-2.0.0.tar.bz2.sig) = 323
diff --git a/security/libassuan/pkg-descr b/security/libassuan/pkg-descr
index 19338e6fdd37..1f90ab0f2cef 100644
--- a/security/libassuan/pkg-descr
+++ b/security/libassuan/pkg-descr
@@ -1,2 +1 @@
-This is the IPC library used by GnuPG 1.9, gpgme and the old newpg
-package.
+This is the IPC library used by GnuPG 2 and gpgme
diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index 6457300cce29..f46e63a2d4bc 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opensc
 PORTVERSION=	0.11.13
+PORTREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.opensc-project.org/files/${PORTNAME}/ \
 		http://www.opensc-project.org/files/${PORTNAME}/testing/
@@ -75,7 +76,7 @@ CONFIGURE_ARGS+=--enable-pcsc
 .endif
 
 .if defined(WITH_SIGNER)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libassuan.a:${PORTSDIR}/security/libassuan
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libassuan.a:${PORTSDIR}/security/libassuan-1
 PINENTRY?=	${LOCALBASE}/bin/pinentry
 PINENTRY_PORT?=	security/pinentry
 RUN_DEPENDS+=	pinentry:${PORTSDIR}/${PINENTRY_PORT}