6 files changed, 11 insertions, 60 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index da82423bd53a..a6199384d6d4 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	gnupg
-PORTVERSION=	2.1.11
-PORTREVISION=	2
+PORTVERSION=	2.1.12
+#PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index b82b13b2d1e4..bd63ddbd0c61 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gnupg-2.1.11.tar.bz2) = b7b0fb2c8c5d47d7ec916d4a1097c0ddcb94a12bb1c0ac424ad86b1ee316b61a
-SIZE (gnupg-2.1.11.tar.bz2) = 5224007
-SHA256 (gnupg-2.1.11.tar.bz2.sig) = cf2ca28205a479ceac1fa5b6ac3d855c9461814c9cd231e4da2cf4f156f738f0
-SIZE (gnupg-2.1.11.tar.bz2.sig) = 574
+SHA256 (gnupg-2.1.12.tar.bz2) = ac34929d2400a58a349963865442ee6cdd75e500a8d5df083d29835e88bfc506
+SIZE (gnupg-2.1.12.tar.bz2) = 5510723
+SHA256 (gnupg-2.1.12.tar.bz2.sig) = 328280c08fc3d9414cdc7bff332e1b7ef81d5c674f23c31619b880f43575c49b
+SIZE (gnupg-2.1.12.tar.bz2.sig) = 287
diff --git a/security/gnupg/files/patch-dirmngr-dns-stuff.c b/security/gnupg/files/patch-dirmngr-dns-stuff.c
deleted file mode 100644
index 19af0b2d9b05..000000000000
--- a/security/gnupg/files/patch-dirmngr-dns-stuff.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- dirmngr/dns-stuff.c.orig	2016-01-26 18:36:37.000000000 +0900
-+++ dirmngr/dns-stuff.c	2016-02-19 11:20:58.885089458 +0900
-@@ -177,13 +177,17 @@
-     case EAI_BADFLAGS:  err = gpg_error (GPG_ERR_INV_FLAG); break;
-     case EAI_FAIL:      err = gpg_error (GPG_ERR_SERVER_FAILED); break;
-     case EAI_MEMORY:    err = gpg_error (GPG_ERR_ENOMEM); break;
-+#ifdef EAI_NODATA 
-     case EAI_NODATA:    err = gpg_error (GPG_ERR_NO_DATA); break;
-+#endif
-     case EAI_NONAME:    err = gpg_error (GPG_ERR_NO_NAME); break;
-     case EAI_SERVICE:   err = gpg_error (GPG_ERR_NOT_SUPPORTED); break;
-     case EAI_FAMILY:    err = gpg_error (GPG_ERR_EAFNOSUPPORT); break;
-     case EAI_SOCKTYPE:  err = gpg_error (GPG_ERR_ESOCKTNOSUPPORT); break;
- #ifndef HAVE_W32_SYSTEM
-+#ifdef EAI_ADDRFAMILY
-     case EAI_ADDRFAMILY:err = gpg_error (GPG_ERR_EADDRNOTAVAIL); break;
-+#endif
-     case EAI_SYSTEM:    err = gpg_error_from_syserror (); break;
- #endif
-     default:            err = gpg_error (GPG_ERR_UNKNOWN_ERRNO); break;
diff --git a/security/gnupg/files/patch-dirmngr_Makefile.am b/security/gnupg/files/patch-dirmngr_Makefile.am
deleted file mode 100644
index 5ee792302186..000000000000
--- a/security/gnupg/files/patch-dirmngr_Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
---- dirmngr/Makefile.am.orig	2016-01-26 09:36:37 UTC
-+++ dirmngr/Makefile.am
-@@ -140,10 +140,10 @@ t_ldap_parse_uri_SOURCES = \
- 	t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h \
-         http.c dns-stuff.c \
-         $(ldap_url) $(t_common_src)
--t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1
-+t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(LIBGCRYPT_FLAGS)
- t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS)
- 
--t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1
-+t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1 $(LIBGCRYPT_FLAGS)
- t_dns_stuff_SOURCES = t-dns-stuff.c dns-stuff.c
- t_dns_stuff_LDADD   = $(t_common_ldadd) $(DNSLIBS)
- 
diff --git a/security/gnupg/files/patch-dirmngr_Makefile.in b/security/gnupg/files/patch-dirmngr_Makefile.in
deleted file mode 100644
index c28df8b29e7b..000000000000
--- a/security/gnupg/files/patch-dirmngr_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- dirmngr/Makefile.in.orig	2016-01-26 12:54:48 UTC
-+++ dirmngr/Makefile.in
-@@ -650,9 +650,9 @@ t_ldap_parse_uri_SOURCES = \
-         http.c dns-stuff.c \
-         $(ldap_url) $(t_common_src)
- 
--t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1
-+t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(LIBGCRYPT_CFLAGS)
- t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS)
--t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1
-+t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1 $(LIBGCRYPT_CFLAGS)
- t_dns_stuff_SOURCES = t-dns-stuff.c dns-stuff.c
- t_dns_stuff_LDADD = $(t_common_ldadd) $(DNSLIBS)
- all: $(BUILT_SOURCES)
diff --git a/security/gnupg/files/patch-doc-Makefile.in b/security/gnupg/files/patch-doc-Makefile.in
index 68e0ba7ac74e..27ae1540c4f2 100644
--- a/security/gnupg/files/patch-doc-Makefile.in
+++ b/security/gnupg/files/patch-doc-Makefile.in
@@ -1,9 +1,9 @@
---- doc/Makefile.in.orig	2016-01-26 12:54:48.000000000 +0000
-+++ doc/Makefile.in	2016-02-19 01:59:17.000000000 +0000
-@@ -507,7 +507,7 @@
- watchgnupg_SOURCE = gnupg.texi
- CLEANFILES = yat2m mkdefsinc defs.inc
+--- doc/Makefile.in.orig	2016-05-04 23:00:20.000000000 +0900
++++ doc/Makefile.in	2016-05-06 07:36:42.183921000 +0900
+@@ -514,7 +514,7 @@
  DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \
+                  gnupg-card-architecture.eps \
+                  gnupg-module-overview.eps \
 -		 $(myman_pages) gpg-zip.1 gnupg.7
 +		 $(myman_pages) gnupg.7