Index: branches/2017Q3/security/gnupg1/Makefile
===================================================================
--- branches/2017Q3/security/gnupg1/Makefile	(revision 446403)
+++ branches/2017Q3/security/gnupg1/Makefile	(revision 446404)
@@ -1,68 +1,67 @@
 # $FreeBSD$
 
 PORTNAME=	gnupg
-PORTVERSION=	1.4.21
-PORTREVISION=	4
+PORTVERSION=	1.4.22
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 PKGNAMESUFFIX=	1
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	The GNU Privacy Guard (minimalist "classic" version)
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CPE_VENDOR=	gnupg
 
 USES=		charsetfix compiler cpe gmake readline tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-camellia \
 		--enable-noexecstack
 
 INFO=		gnupg1
 DOCSDIR=	${PREFIX}/share/doc/gnupg1
 PORTDOCS=	*
 
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	CURL DOCS LDAP ICONV LIBUSB NLS SUID_GPG
 OPTIONS_DEFAULT=CURL
 OPTIONS_SUB=	yes
 
 CURL_DESC=	Use libcurl for the keyserver interface
 LDAP_DESC=	LDAP keyserver interface
 LIBUSB_DESC=	Support for USB smart cards
 SUID_GPG_DESC=	Install GPG setuid
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	libcurl=${LOCALBASE}
 # Work around a GnuPG configure buglet
 CURL_CONFIGURE_ENV=	_libcurl_config=${LOCALBASE}/bin/curl-config
 
 ICONV_USES=		iconv
 ICONV_CONFIGURE_ENABLE=	gnupg-iconv
 
 LIBUSB_CONFIGURE_WITH=	libusb=${LOCALBASE}
 
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_WITH=	ldap=${LOCALBASE}
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386" && ${COMPILER_TYPE} == "clang"
 CFLAGS+=	-fheinous-gnu-extensions
 .endif
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in doc/DETAILS doc/FAQ doc/HACKING doc/OpenPGP \
 	ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS \
 	README THANKS TODO VERSION
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
Index: branches/2017Q3/security/gnupg1/distinfo
===================================================================
--- branches/2017Q3/security/gnupg1/distinfo	(revision 446403)
+++ branches/2017Q3/security/gnupg1/distinfo	(revision 446404)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484016284
-SHA256 (gnupg-1.4.21.tar.bz2) = 6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276
-SIZE (gnupg-1.4.21.tar.bz2) = 3689305
+TIMESTAMP = 1500553130
+SHA256 (gnupg-1.4.22.tar.bz2) = 9594a24bec63a21568424242e3f198b9d9828dea5ff0c335e47b06f835f930b4
+SIZE (gnupg-1.4.22.tar.bz2) = 3746546
Index: branches/2017Q3
===================================================================
--- branches/2017Q3	(revision 446403)
+++ branches/2017Q3	(revision 446404)

Property changes on: branches/2017Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r446260