5 files changed, 82 insertions, 108 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index b7e8727bbf63..df64a8d8a17c 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -2,11 +2,9 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	2.1.16
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	The GNU Privacy Guard
@@ -23,45 +21,45 @@ LIB_DEPENDS=	libassuan.so:security/libassuan \
 		libnpth.so:devel/npth
 BUILD_DEPENDS=	libassuan>=2.4.3:security/libassuan \
 		libgpg-error>=1.16:security/libgpg-error
-RUN_DEPENDS=	pinentry>0:security/pinentry
+RUN_DEPENDS=	pinentry:security/pinentry
 
-GNU_CONFIGURE=	YES
-USES=		compiler:c11 cpe gmake iconv pkgconfig sqlite tar:bzip2
-USE_LDCONFIG=	YES
-# libreadline.so.8 is placed in /lib, but --with-readline argument
-# will be treated as $value/lib, so try using /usr instead.
-# Otherwise, $PREFIX/lib/libreadline.so.6 will be linked when
-# devel/readline is installed.
-CONFIGURE_ARGS+=	--disable-ntbtls --enable-symcryptrun --with-readline=/usr \
-			--disable-wks-tools
-CONFLICTS=	gnupg-2.0.* dirmngr-*
+CONFLICTS=	gnupg-2.0.* dirmngr-[0-9]*
 CPE_VENDOR=	gnupg
 
-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=	GNUTLS
-NO_OPTIONS_SORT=	YES
-OPTIONS_SUB=		YES
+USES=		compiler:c11 cpe gmake iconv pkgconfig readline sqlite tar:bzip2
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-ntbtls --enable-symcryptrun --disable-wks-tools
+INFO=		gnupg
+
+OPTIONS_DEFINE=	GNUTLS LDAP SCDAEMON KDNS NLS DOCS SUID_GPG
+OPTIONS_DEFAULT=GNUTLS
+NO_OPTIONS_SORT=yes
+OPTIONS_SUB=	yes
+
+KDNS_DESC=	Use DNS CERT helper
+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).
 
-DOCS_CONFIGURE_ENABLE=	doc
-DOCS_INFO=		gnupg
 GNUTLS_CONFIGURE_ENABLE=gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+
 KDNS_LIB_DEPENDS=	libadns.so:dns/adns
-KDNS_CONFIGURE_ON=	--with-adns=${LOCALBASE}
-LDAP_CONFIGURE_ENABLE=	ldap
-LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
+KDNS_CONFIGURE_WITH=	adns=${LOCALBASE}
+
+LDAP_CONFIGURE_WITH=	ldap=${LOCALBASE}
 LDAP_LIBS=		-L${LOCALBASE}/lib
 LDAP_USE=		OPENLDAP=yes
-NLS_USES=		gettext
+LDAP_USES=		readline
+
 NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
+
 SCDAEMON_CONFIGURE_ENABLE=	scdaemon
 
-verify:	checksum
-	gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
+post-install:
+	@${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/gnupg/pkg-descr b/security/gnupg/pkg-descr
index 6ec531356045..a8d8303a289e 100644
--- a/security/gnupg/pkg-descr
+++ b/security/gnupg/pkg-descr
@@ -1,7 +1,9 @@
-GnuPG is a complete and free replacement for PGP.
+GnuPG is a complete and free replacement for PGP. This is the "modern"
+version.
 
-Because it does not use the patented IDEA algorithm, it can be used
-without any restrictions.  GnuPG is an RFC2440 (OpenPGP) compliant
-application.
+GnuPG allows encrypting and signing your data and communication, and features a
+versatile key management system as well as access modules for many public key
+directories. GnuPG, also known as GPG, is a command line tool with features for
+easy integration with other applications.
 
-WWW: http://www.gnupg.org/
+WWW: https://www.gnupg.org/
diff --git a/security/gnupg/pkg-install b/security/gnupg/pkg-install
deleted file mode 100644
index b2e9e655aa3a..000000000000
--- a/security/gnupg/pkg-install
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-if [ "$2" != "POST-INSTALL" ]; then
-    exit 0
-fi
-
-if [ -r ${PKG_PREFIX}/bin/gpg ] || [ -L ${PKG_PREFIX}/bin/gpg ]; then
-	# Skip.
-else
-	ln -s gpg2 ${PKG_PREFIX}/bin/gpg
-fi
diff --git a/security/gnupg/pkg-message b/security/gnupg/pkg-message
deleted file mode 100644
index a6bdbe611fa0..000000000000
--- a/security/gnupg/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-				A T T E N T I O N
-
-In order to use gpg-agent, you need to install a pinentry dialog.
-
-The following ports of pinentry dialogs are available:
-
-security/pinentry-curses	(ncurses based dialog)
-security/pinentry-gtk2		(GTK 2.x based dialog)
-security/pinentry-qt4		(QT4 based dialog)
-security/pinentry-tty		(console based dialog)
-
-###############################################################################
diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist
index 7ae5cbbd7123..90a979ff1287 100644
--- a/security/gnupg/pkg-plist
+++ b/security/gnupg/pkg-plist
@@ -20,22 +20,22 @@ libexec/gpg-preset-passphrase
 libexec/gpg-protect-tool
 libexec/gpg-wks-client
 %%SCDAEMON%%libexec/scdaemon
-%%PORTDOCS%%man/man1/dirmngr-client.1.gz
-%%PORTDOCS%%man/man1/gpg-agent.1.gz
-%%PORTDOCS%%man/man1/gpg-connect-agent.1.gz
-%%PORTDOCS%%man/man1/gpg-preset-passphrase.1.gz
-%%PORTDOCS%%man/man1/gpg2.1.gz
-%%PORTDOCS%%man/man1/gpgconf.1.gz
-%%PORTDOCS%%man/man1/gpgparsemail.1.gz
-%%PORTDOCS%%man/man1/gpgsm.1.gz
-%%PORTDOCS%%man/man1/gpgv2.1.gz
-%%PORTDOCS%%man/man1/scdaemon.1.gz
-%%PORTDOCS%%man/man1/symcryptrun.1.gz
-%%PORTDOCS%%man/man1/watchgnupg.1.gz
-%%PORTDOCS%%man/man7/gnupg.7.gz
-%%PORTDOCS%%man/man8/addgnupghome.8.gz
-%%PORTDOCS%%man/man8/applygnupgdefaults.8.gz
-%%PORTDOCS%%man/man8/dirmngr.8.gz
+man/man1/dirmngr-client.1.gz
+man/man1/gpg-agent.1.gz
+man/man1/gpg-connect-agent.1.gz
+man/man1/gpg-preset-passphrase.1.gz
+man/man1/gpg2.1.gz
+man/man1/gpgconf.1.gz
+man/man1/gpgparsemail.1.gz
+man/man1/gpgsm.1.gz
+man/man1/gpgv2.1.gz
+man/man1/scdaemon.1.gz
+man/man1/symcryptrun.1.gz
+man/man1/watchgnupg.1.gz
+man/man7/gnupg.7.gz
+man/man8/addgnupghome.8.gz
+man/man8/applygnupgdefaults.8.gz
+man/man8/dirmngr.8.gz
 sbin/addgnupghome
 sbin/applygnupgdefaults
 %%PORTDOCS%%%%DOCSDIR%%/DCO
@@ -44,7 +44,7 @@ sbin/applygnupgdefaults
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
 %%PORTDOCS%%%%DOCSDIR%%/KEYSERVER
 %%PORTDOCS%%%%DOCSDIR%%/OpenPGP
-%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TRANSLATE
 %%PORTDOCS%%%%DOCSDIR%%/examples/README
 %%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf
@@ -58,37 +58,37 @@ sbin/applygnupgdefaults
 %%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent.service
 %%PORTDOCS%%%%DOCSDIR%%/examples/systemd-user/gpg-agent.socket
 %%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.be.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.ca.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.cs.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.da.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.de.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.el.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.eo.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.es.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.et.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.fi.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.fr.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.gl.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.hu.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.id.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.it.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.ja.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.nb.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.pl.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.pt.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.pt_BR.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.ro.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.ru.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.sk.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.sv.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.tr.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.zh_CN.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.zh_TW.txt
 %%DATADIR%%/dirmngr-conf.skel
 %%DATADIR%%/distsigkey.gpg
 %%DATADIR%%/gpg-conf.skel
-%%PORTDOCS%%%%DATADIR%%/help.be.txt
-%%PORTDOCS%%%%DATADIR%%/help.ca.txt
-%%PORTDOCS%%%%DATADIR%%/help.cs.txt
-%%PORTDOCS%%%%DATADIR%%/help.da.txt
-%%PORTDOCS%%%%DATADIR%%/help.de.txt
-%%PORTDOCS%%%%DATADIR%%/help.el.txt
-%%PORTDOCS%%%%DATADIR%%/help.eo.txt
-%%PORTDOCS%%%%DATADIR%%/help.es.txt
-%%PORTDOCS%%%%DATADIR%%/help.et.txt
-%%PORTDOCS%%%%DATADIR%%/help.fi.txt
-%%PORTDOCS%%%%DATADIR%%/help.fr.txt
-%%PORTDOCS%%%%DATADIR%%/help.gl.txt
-%%PORTDOCS%%%%DATADIR%%/help.hu.txt
-%%PORTDOCS%%%%DATADIR%%/help.id.txt
-%%PORTDOCS%%%%DATADIR%%/help.it.txt
-%%PORTDOCS%%%%DATADIR%%/help.ja.txt
-%%PORTDOCS%%%%DATADIR%%/help.nb.txt
-%%PORTDOCS%%%%DATADIR%%/help.pl.txt
-%%PORTDOCS%%%%DATADIR%%/help.pt.txt
-%%PORTDOCS%%%%DATADIR%%/help.pt_BR.txt
-%%PORTDOCS%%%%DATADIR%%/help.ro.txt
-%%PORTDOCS%%%%DATADIR%%/help.ru.txt
-%%PORTDOCS%%%%DATADIR%%/help.sk.txt
-%%PORTDOCS%%%%DATADIR%%/help.sv.txt
-%%PORTDOCS%%%%DATADIR%%/help.tr.txt
-%%PORTDOCS%%%%DATADIR%%/help.txt
-%%PORTDOCS%%%%DATADIR%%/help.zh_CN.txt
-%%PORTDOCS%%%%DATADIR%%/help.zh_TW.txt
 %%DATADIR%%/sks-keyservers.netCA.pem
 %%NLS%%share/locale/ca/LC_MESSAGES/gnupg2.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gnupg2.mo
@@ -118,4 +118,5 @@ sbin/applygnupgdefaults
 %%NLS%%share/locale/uk/LC_MESSAGES/gnupg2.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg2.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg2.mo
-@unexec [ -L %D/bin/gpg ] && rm -f %D/bin/gpg || true
+@postexec [ -e %D/bin/gpg ] || ln -s gpg2 %D/bin/gpg
+@postunexec [ "$(readlink %D/bin/gpg)" = "gpg2" ] && rm -f %D/bin/gpg || true