Update libksba to version 0.9.11.

Update gnupg-devel to 1.9.16.
Update dirmngr to 0.9.2.
Bump PORTREVISION for pinentry (for libksba shared library bump).

11 files changed, 20 insertions, 33 deletions

diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 64aafe33b3ca..c949b04ade15 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dirmngr
-PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTVERSION=	0.9.2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	alpha/dirmngr
@@ -18,9 +17,10 @@ COMMENT=	A client for managing and downloading certificate revocation lists
 BUILD_DEPENDS=	${LOCALBASE}/lib/libassuan.a:${PORTSDIR}/security/libassuan
 LIB_DEPENDS=	gcrypt.13:${PORTSDIR}/security/libgcrypt \
 		gpg-error:${PORTSDIR}/security/libgpg-error \
-		ksba.13:${PORTSDIR}/security/libksba \
+		ksba.14:${PORTSDIR}/security/libksba \
 		pth:${PORTSDIR}/devel/pth
 
+USE_BZIP2=	yes
 USE_OPENLDAP=	yes
 USE_GETOPT_LONG=yes
 USE_LIBTOOL_VER=13
diff --git a/security/dirmngr/distinfo b/security/dirmngr/distinfo
index 932e8ff34163..9f94382e2b8f 100644
--- a/security/dirmngr/distinfo
+++ b/security/dirmngr/distinfo
@@ -1,2 +1,2 @@
-MD5 (dirmngr-0.9.0.tar.gz) = a7f3afb1eff082538d85e1079322f41d
-SIZE (dirmngr-0.9.0.tar.gz) = 568366
+MD5 (dirmngr-0.9.2.tar.bz2) = d29eaca5a9f9556552519ab907e77126
+SIZE (dirmngr-0.9.2.tar.bz2) = 474824
diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index 68c705be54a6..115c8536f952 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	1.9.15
+PORTVERSION=	1.9.16
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	alpha/gnupg
@@ -17,11 +17,12 @@ COMMENT=	Prerelease package of GnuPG extensions for GnuPG 2.0
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libassuan.a:${PORTSDIR}/security/libassuan
 LIB_DEPENDS=	gcrypt.13:${PORTSDIR}/security/libgcrypt \
-		ksba.13:${PORTSDIR}/security/libksba \
+		ksba.14:${PORTSDIR}/security/libksba \
 		pth.20:${PORTSDIR}/devel/pth
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
 		dirmngr:${PORTSDIR}/security/dirmngr
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=# empty
 USE_GMAKE=	yes
diff --git a/security/gnupg-devel/distinfo b/security/gnupg-devel/distinfo
index bce68939b985..3c44aef68493 100644
--- a/security/gnupg-devel/distinfo
+++ b/security/gnupg-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnupg-1.9.15.tar.gz) = c1955d88280ff6e847f82f37b9a9a008
-SIZE (gnupg-1.9.15.tar.gz) = 1928702
+MD5 (gnupg-1.9.16.tar.bz2) = 1282755dce9cf4a84e904ca0191017a3
+SIZE (gnupg-1.9.16.tar.bz2) = 1707356
diff --git a/security/gnupg-devel/files/patch-configure b/security/gnupg-devel/files/patch-configure
index 912029bfd4c5..38045589f146 100644
--- a/security/gnupg-devel/files/patch-configure
+++ b/security/gnupg-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Jan 13 18:59:36 2005
-+++ configure	Sat Apr 16 01:28:40 2005
-@@ -19918,7 +19918,7 @@
+--- configure.orig	Thu Apr 21 20:28:05 2005
++++ configure	Thu Apr 21 20:28:28 2005
+@@ -20141,7 +20141,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
diff --git a/security/gnupg-devel/files/patch-sm-Makefile.in b/security/gnupg-devel/files/patch-sm-Makefile.in
deleted file mode 100644
index 5c0fb970d334..000000000000
--- a/security/gnupg-devel/files/patch-sm-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- sm/Makefile.in.orig	Thu Dec 23 00:06:57 2004
-+++ sm/Makefile.in	Thu Dec 23 00:07:42 2004
-@@ -366,7 +366,7 @@
- gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a	\
-               ../common/libcommon.a \
-               $(LIBGCRYPT_LIBS)  $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error \
--	      $(LIBINTL)
-+	      $(LIBINTL) $(PTH_LIBS)
- 
- all: all-am
- 
diff --git a/security/gnupg-devel/pkg-plist b/security/gnupg-devel/pkg-plist
index a82cf62d3639..9f0b2091a31b 100644
--- a/security/gnupg-devel/pkg-plist
+++ b/security/gnupg-devel/pkg-plist
@@ -1,16 +1,14 @@
 bin/gpg-agent
-bin/gpg2
+bin/gpg-connect-agent
 bin/gpgconf
 bin/gpgsm
 bin/gpgsm-gencert.sh
-bin/gpgv2
 bin/kbxutil
 %%WITH_OPENSC%%bin/scdaemon
 bin/watchgnupg
 libexec/gpg-preset-passphrase
 libexec/gpg-protect-tool
 sbin/addgnupghome
-share/gnupg/gpg-conf.skel
 %%NLS%%share/locale/de/LC_MESSAGES/gnupg2.mo
 %%NLS%%@dirrm share/locale/de/LC_MESSAGES
 @dirrm share/gnupg
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index 6c3708e344bc..6a4f6fdd2da7 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	libksba
-PORTVERSION=	0.9.10
-PORTREVISION=	1
+PORTVERSION=	0.9.11
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	alpha/${PORTNAME}
diff --git a/security/libksba/distinfo b/security/libksba/distinfo
index 86009db3571e..34554b270ee8 100644
--- a/security/libksba/distinfo
+++ b/security/libksba/distinfo
@@ -1,2 +1,2 @@
-MD5 (libksba-0.9.10.tar.gz) = 1504bac7386e027499c6db85d26fa7e4
-SIZE (libksba-0.9.10.tar.gz) = 584419
+MD5 (libksba-0.9.11.tar.gz) = f21912398467e0c93ae1abeb8f6b3a3d
+SIZE (libksba-0.9.11.tar.gz) = 602298
diff --git a/security/libksba/pkg-plist b/security/libksba/pkg-plist
index a86eeced2042..f992b06bb9a1 100644
--- a/security/libksba/pkg-plist
+++ b/security/libksba/pkg-plist
@@ -2,5 +2,5 @@ bin/ksba-config
 include/ksba.h
 lib/libksba.a
 lib/libksba.so
-lib/libksba.so.13
+lib/libksba.so.14
 share/aclocal/ksba.m4
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 5116d775e04b..5e02c60b138e 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pinentry
 PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	pinentry
@@ -16,7 +16,7 @@ MAINTAINER=	lofi@freebsd.org
 COMMENT?=	A collection of simple PIN or passphrase entry dialogs
 
 LIB_DEPENDS=	gcrypt.13:${PORTSDIR}/security/libgcrypt \
-		ksba.13:${PORTSDIR}/security/libksba
+		ksba.14:${PORTSDIR}/security/libksba
 
 CONFLICTS?=	pinentry-[a-z]*-[0.9]*