8 files changed, 23 insertions, 63 deletions

diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index a7541934f21f..1c73688c0d1a 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	1.9.3
-PORTREVISION=	1
+PORTVERSION=	1.9.10
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	alpha/gnupg
@@ -18,14 +17,13 @@ COMMENT=	Prerelease package of GnuPG extensions for GnuPG 2.0
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libassuan.a:${PORTSDIR}/security/libassuan
 LIB_DEPENDS=	gcrypt.12:${PORTSDIR}/security/libgcrypt \
-		ksba.11:${PORTSDIR}/security/libksba \
+		ksba.13:${PORTSDIR}/security/libksba \
 		pth.20:${PORTSDIR}/devel/pth
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
 		dirmngr:${PORTSDIR}/security/dirmngr
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=# empty
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 INSTALLS_SHLIB=	yes
@@ -46,6 +44,14 @@ CONFIGURE_ARGS+=	--disable-scdaemon
 PLIST_SUB+=	WITH_OPENSC="@comment "
 .endif
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 pre-configure:
 	${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \
 		${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure
diff --git a/security/gnupg-devel/distinfo b/security/gnupg-devel/distinfo
index 3dbdd40244a1..9c6f3c6033dd 100644
--- a/security/gnupg-devel/distinfo
+++ b/security/gnupg-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnupg-1.9.3.tar.gz) = a03e0370613dabb5722ab51761895b84
-SIZE (gnupg-1.9.3.tar.gz) = 1237592
+MD5 (gnupg-1.9.10.tar.gz) = d923cfe0921898fbeb66374a0e32ddc6
+SIZE (gnupg-1.9.10.tar.gz) = 1385472
diff --git a/security/gnupg-devel/files/patch-agent_gpg-agent.c b/security/gnupg-devel/files/patch-agent_gpg-agent.c
deleted file mode 100644
index 6c248d1b3ca6..000000000000
--- a/security/gnupg-devel/files/patch-agent_gpg-agent.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- agent/gpg-agent.c.orig	Mon May  3 18:38:33 2004
-+++ agent/gpg-agent.c	Mon May  3 18:39:16 2004
-@@ -37,6 +37,9 @@
- # include <pth.h>
- #endif
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+
- #define JNLIB_NEED_LOG_LOGV
- #include "agent.h"
- #include <assuan.h> /* malloc hooks */
diff --git a/security/gnupg-devel/files/patch-common_fopencookie.c b/security/gnupg-devel/files/patch-common_fopencookie.c
deleted file mode 100644
index 057149a83784..000000000000
--- a/security/gnupg-devel/files/patch-common_fopencookie.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- common/fopencookie.c.orig	Mon May  3 18:14:56 2004
-+++ common/fopencookie.c	Mon May  3 18:15:24 2004
-@@ -26,6 +26,15 @@
- 
- #include "util.h"
- 
-+typedef struct
-+{
-+  ssize_t (*read)(void*,char*,size_t);
-+  ssize_t (*write)(void*,const char*,size_t);
-+  int (*seek)(void*,off_t*,int);
-+  int (*close)(void*);
-+} _IO_cookie_io_functions_t;
-+typedef _IO_cookie_io_functions_t cookie_io_functions_t;
-+
- FILE * 
- fopencookie (void *cookie, const char *opentype,
-              cookie_io_functions_t funclist)
diff --git a/security/gnupg-devel/files/patch-configure b/security/gnupg-devel/files/patch-configure
index fafd8692c94c..f62db098bd87 100644
--- a/security/gnupg-devel/files/patch-configure
+++ b/security/gnupg-devel/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Mon May  3 18:34:49 2004
-+++ configure	Mon May  3 18:35:25 2004
-@@ -15887,7 +15887,7 @@
+--- configure.orig	Wed Aug  4 17:06:25 2004
++++ configure	Wed Aug  4 17:07:15 2004
+@@ -17232,7 +17232,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -eval "$as_ac_var=no"
 +eval "$as_ac_var=yes"
  fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
diff --git a/security/gnupg-devel/files/patch-kbx_keybox-blob.c b/security/gnupg-devel/files/patch-kbx_keybox-blob.c
deleted file mode 100644
index ab27ccb07fb7..000000000000
--- a/security/gnupg-devel/files/patch-kbx_keybox-blob.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- kbx/keybox-blob.c.orig	Mon May  3 18:37:26 2004
-+++ kbx/keybox-blob.c	Mon May  3 18:37:51 2004
-@@ -112,6 +112,7 @@
- #include <assert.h>
- #include <time.h>
- 
-+#include "../jnlib/types.h"
- #include "keybox-defs.h"
- #include <gcrypt.h>
- 
diff --git a/security/gnupg-devel/files/patch-kbx_keybox-dump.c b/security/gnupg-devel/files/patch-kbx_keybox-dump.c
deleted file mode 100644
index 7c761cf479ba..000000000000
--- a/security/gnupg-devel/files/patch-kbx_keybox-dump.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- kbx/keybox-dump.c.orig	Mon May  3 18:38:00 2004
-+++ kbx/keybox-dump.c	Mon May  3 18:38:21 2004
-@@ -24,6 +24,7 @@
- #include <string.h>
- #include <errno.h>
- 
-+#include "../jnlib/types.h"
- #include "keybox-defs.h"
- 
- static ulong
diff --git a/security/gnupg-devel/pkg-plist b/security/gnupg-devel/pkg-plist
index 9ffeaefab9ed..f202c07a2191 100644
--- a/security/gnupg-devel/pkg-plist
+++ b/security/gnupg-devel/pkg-plist
@@ -1,10 +1,14 @@
 bin/gpg-agent
 bin/gpg2
+bin/gpgconf
 bin/gpgsm
 bin/gpgv2
 bin/kbxutil
 %%WITH_OPENSC%%bin/scdaemon
-lib/gnupg/gpg-protect-tool
+bin/watchgnupg
+libexec/gpg-protect-tool
+sbin/addgnupghome
 share/gnupg/options.skel
+%%NLS%%share/locale/de/LC_MESSAGES/gnupg2.mo
+%%NLS%%@dirrm share/locale/de/LC_MESSAGES
 @dirrm share/gnupg
-@dirrm lib/gnupg