2 files changed, 33 insertions, 38 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index c5f6aee64519..582a8d71a57b 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	gnupg
-# Date created:		Sep 30, 1998
-# Whom:			kuriyama@FreeBSD.org
-#
 # $FreeBSD$
-#
 
 PORTNAME=	gnupg
 PORTVERSION=	2.0.19
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
@@ -112,10 +107,10 @@ PLIST_SUB+=	SCDAEMON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
-CONFIGURE_ARGS+=--without-libcurl
-.else
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--without-libcurl
 .endif
 
 verify:	checksum
diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist
index 7180aa6b5041..d9502604e677 100644
--- a/security/gnupg/pkg-plist
+++ b/security/gnupg/pkg-plist
@@ -34,37 +34,37 @@ sbin/applygnupgdefaults
 %%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list
 %%PORTDOCS%%%%DOCSDIR%%/examples/scd-event
 %%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt
-%%PORTDATA%%%%DATADIR%%/com-certs.pem
+%%PORTDOCS%%%%DATADIR%%/com-certs.pem
 %%DATADIR%%/gpg-conf.skel
-%%PORTDATA%%%%DATADIR%%/help.be.txt
-%%PORTDATA%%%%DATADIR%%/help.ca.txt
-%%PORTDATA%%%%DATADIR%%/help.cs.txt
-%%PORTDATA%%%%DATADIR%%/help.da.txt
-%%PORTDATA%%%%DATADIR%%/help.de.txt
-%%PORTDATA%%%%DATADIR%%/help.el.txt
-%%PORTDATA%%%%DATADIR%%/help.eo.txt
-%%PORTDATA%%%%DATADIR%%/help.es.txt
-%%PORTDATA%%%%DATADIR%%/help.et.txt
-%%PORTDATA%%%%DATADIR%%/help.fi.txt
-%%PORTDATA%%%%DATADIR%%/help.fr.txt
-%%PORTDATA%%%%DATADIR%%/help.gl.txt
-%%PORTDATA%%%%DATADIR%%/help.hu.txt
-%%PORTDATA%%%%DATADIR%%/help.id.txt
-%%PORTDATA%%%%DATADIR%%/help.it.txt
-%%PORTDATA%%%%DATADIR%%/help.ja.txt
-%%PORTDATA%%%%DATADIR%%/help.nb.txt
-%%PORTDATA%%%%DATADIR%%/help.pl.txt
-%%PORTDATA%%%%DATADIR%%/help.pt.txt
-%%PORTDATA%%%%DATADIR%%/help.pt_BR.txt
-%%PORTDATA%%%%DATADIR%%/help.ro.txt
-%%PORTDATA%%%%DATADIR%%/help.ru.txt
-%%PORTDATA%%%%DATADIR%%/help.sk.txt
-%%PORTDATA%%%%DATADIR%%/help.sv.txt
-%%PORTDATA%%%%DATADIR%%/help.tr.txt
-%%PORTDATA%%%%DATADIR%%/help.txt
-%%PORTDATA%%%%DATADIR%%/help.zh_CN.txt
-%%PORTDATA%%%%DATADIR%%/help.zh_TW.txt
-%%PORTDATA%%%%DATADIR%%/qualified.txt
+%%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
+%%PORTDOCS%%%%DATADIR%%/qualified.txt
 %%NLS%%share/locale/be/LC_MESSAGES/gnupg2.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/gnupg2.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gnupg2.mo