Index: security/gnupg/Makefile
===================================================================
--- security/gnupg/Makefile	(revision 375679)
+++ security/gnupg/Makefile	(working copy)
@@ -1,11 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	gnupg
-PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTVERSION=	2.1.1
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR=	gnupg
+MASTER_SITES=	GNUPG/gnupg
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -25,52 +23,36 @@ BUILD_DEPENDS=	libgpg-error>=1.11:${PORT
 RUN_DEPENDS=	pinentry>0:${PORTSDIR}/security/pinentry
 
 GNU_CONFIGURE=	YES
-USES=		gmake iconv tar:bzip2
+USES=		gmake iconv pkgconfig tar:bzip2
 USE_LDCONFIG=	YES
-CONFIGURE_ARGS+=	--enable-symcryptrun --enable-gpgsm
+CONFIGURE_ARGS=	--disable-ntbtls --enable-symcryptrun
 CONFLICTS=	gnupg-2.0.*
 
-OPTIONS_DEFINE=		LDAP SCDAEMON KDNS NLS DOCS SUID_GPG
+OPTIONS_DEFINE=		GNUTLS LDAP SCDAEMON KDNS NLS DOCS SUID_GPG
 LDAP_DESC=		LDAP keyserver interface
 SCDAEMON_DESC=		Enable Smartcard daemon (with libusb)
 KDNS_DESC=		Use DNS CERT helper
 SUID_GPG_DESC=		Install GPG with suid
-OPTIONS_DEFAULT=	#
+OPTIONS_DEFAULT=	GNUTLS
 NO_OPTIONS_SORT=	YES
 OPTIONS_SUB=		YES
 # In jail, SUID is required to avoid warning (security.bsd.unprivileged_mlock sysctl is not used in jail).
 
 DOCS_CONFIGURE_ENABLE=	doc
+DOCS_INFO=		gnupg
+GNUTLS_CONFIGURE_ENABLE=gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
 KDNS_LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns
 KDNS_CONFIGURE_ON=	--with-adns=${LOCALBASE}
+LDAP_CONFIGURE_ENABLE=	ldap
+LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
+LDAP_LIBS=		-L${LOCALBASE}/lib
+LDAP_USE=		OPENLDAP=yes
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 SCDAEMON_CONFIGURE_ENABLE=	scdaemon
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-INFO=		gnupg
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	YES
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--disable-ldap
-.endif
-
-.if ! ${PORT_OPTIONS:MKDNS}
-CONFIGURE_SUB=	-e '/GPGKEYS_KDNS=/s/".*"/""/'
-.endif
-
 verify:	checksum
 	gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
 
-post-patch:
-	@${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" ${CONFIGURE_SUB} \
-		${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e "/#include <utmp.h>/d" \
-		${WRKSRC}/tools/symcryptrun.c
-
 .include <bsd.port.mk>
Index: security/gnupg/distinfo
===================================================================
--- security/gnupg/distinfo	(revision 375679)
+++ security/gnupg/distinfo	(working copy)
@@ -1,4 +1,4 @@
-SHA256 (gnupg-2.1.0.tar.bz2) = 16a8c3f50a15bf37d2dfb1c5e4bb3ec533e1d0b6a4043ff3680a376a3ad4058b
-SIZE (gnupg-2.1.0.tar.bz2) = 3111585
-SHA256 (gnupg-2.1.0.tar.bz2.sig) = 3a8e970340febb1cf27c1a0b4424088a61b1c9dec0a9bdb1ec8e493973a5f6a9
-SIZE (gnupg-2.1.0.tar.bz2.sig) = 861
+SHA256 (gnupg-2.1.1.tar.bz2) = 70ecd01d2875db62624c911c2fd815742f50aef5492698eb3bfc09a08690ce49
+SIZE (gnupg-2.1.1.tar.bz2) = 4801472
+SHA256 (gnupg-2.1.1.tar.bz2.sig) = b7442981adee5eee70b89556b6e0926b57f886188cbd419060aaaf822ba380da
+SIZE (gnupg-2.1.1.tar.bz2.sig) = 574