Index: security/gnupg/Makefile
===================================================================
--- security/gnupg/Makefile
+++ security/gnupg/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	2.2.17
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
@@ -20,8 +20,7 @@
 		libksba.so:security/libksba \
 		libnpth.so:devel/npth
 BUILD_DEPENDS=	libassuan>=2.5.1:security/libassuan \
-		libgpg-error>=1.16:security/libgpg-error \
-		makeinfo:print/texinfo
+		libgpg-error>=1.16:security/libgpg-error
 RUN_DEPENDS=	pinentry:security/pinentry
 
 USES=		compiler:c11 cpe gmake iconv pkgconfig readline sqlite tar:bzip2
@@ -46,6 +45,9 @@
 SUID_GPG_DESC=	Install GPG with suid
 WKS_SERVER_DESC=Install the Web Key Service server
 
+DOCS_BUILD_DEPENDS=	makeinfo:print/texinfo
+DOCS_CONFIGURE_OFF=	--disable-doc
+
 GNUTLS_CONFIGURE_ENABLE=gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
@@ -62,12 +64,16 @@
 
 WKS_SERVER_CONFIGURE_ENABLE=	wks-tools
 
+.include <bsd.port.options.mk>
+
 # Touch the texinfo files to force makeinfo to run.  This fixes Linuxisms in
 # the paths in the man pages.
 pre-build:
 	@${TOUCH} ${WRKSRC}/doc/*.texi
 
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	@${MV} ${STAGEDIR}${DATADIR}/help*.txt ${STAGEDIR}${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
Index: security/gnupg/pkg-plist
===================================================================
--- security/gnupg/pkg-plist
+++ security/gnupg/pkg-plist
@@ -20,25 +20,25 @@
 libexec/gpg-protect-tool
 libexec/gpg-wks-client
 %%SCDAEMON%%libexec/scdaemon
-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/gpg-wks-client.1.gz
-%%WKS_SERVER%%man/man1/gpg-wks-server.1.gz
-man/man1/gpg2.1.gz
-man/man1/gpgconf.1.gz
-man/man1/gpgparsemail.1.gz
-man/man1/gpgsm.1.gz
-man/man1/gpgtar.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
+%%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/gpg-wks-client.1.gz
+%%PORTDOCS%%%%WKS_SERVER%%man/man1/gpg-wks-server.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/gpgtar.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
 sbin/addgnupghome
 sbin/applygnupgdefaults
 %%PORTDOCS%%%%DOCSDIR%%/DCO