Index: branches/2018Q2/security/gnupg/Makefile
===================================================================
--- branches/2018Q2/security/gnupg/Makefile	(revision 472005)
+++ branches/2018Q2/security/gnupg/Makefile	(revision 472006)
@@ -1,63 +1,62 @@
 # $FreeBSD$
 
 PORTNAME=	gnupg
-PORTVERSION=	2.2.5
+PORTVERSION=	2.2.8
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Complete and free PGP implementation
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPL3
 
 LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libksba.so:security/libksba \
 		libnpth.so:devel/npth
 BUILD_DEPENDS=	libassuan>=2.5.1:security/libassuan \
 		libgpg-error>=1.16:security/libgpg-error
 RUN_DEPENDS=	pinentry:security/pinentry
 
 CONFLICTS=	gnupg-2.0.* dirmngr-[0-9]*
 CPE_VENDOR=	gnupg
 
 USES=		compiler:c11 cpe gmake iconv pkgconfig readline sqlite tar:bzip2
 CONFIGURE_ARGS=	--disable-ntbtls --disable-wks-tools \
 		--enable-gpg-is-gpg2 --enable-symcryptrun
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
 INFO=		gnupg
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	GNUTLS LDAP SCDAEMON NLS DOCS SUID_GPG
 OPTIONS_DEFAULT=GNUTLS SCDAEMON
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 
 LDAP_DESC=	LDAP keyserver interface
 SCDAEMON_DESC=	Enable Smartcard daemon (with libusb)
 SUID_GPG_DESC=	Install GPG with suid
 # In jail, SUID is required to avoid warning
 # (security.bsd.unprivileged_mlock sysctl is not used in jail).
 
 GNUTLS_CONFIGURE_ENABLE=gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 LDAP_CONFIGURE_WITH=	ldap=${LOCALBASE}
 LDAP_LIBS=		-L${LOCALBASE}/lib
 LDAP_USE=		OPENLDAP=yes
 LDAP_USES=		readline
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 SCDAEMON_CONFIGURE_ENABLE=	scdaemon
 
 post-install:
 	@${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: branches/2018Q2/security/gnupg/distinfo
===================================================================
--- branches/2018Q2/security/gnupg/distinfo	(revision 472005)
+++ branches/2018Q2/security/gnupg/distinfo	(revision 472006)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519395206
-SHA256 (gnupg-2.2.5.tar.bz2) = 3fa189a32d4fb62147874eb1389047c267d9ba088f57ab521cb0df46f08aef57
-SIZE (gnupg-2.2.5.tar.bz2) = 6584756
+TIMESTAMP = 1528466286
+SHA256 (gnupg-2.2.8.tar.bz2) = 777b4cb8ced21965a5053d4fa20fe11484f0a478f3d011cef508a1a49db50dcd
+SIZE (gnupg-2.2.8.tar.bz2) = 6632465
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 472005)
+++ branches/2018Q2	(revision 472006)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r467022,469025,472003