Upgrade to 2.0.10.

PR:		ports/130430
Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp>
Announcement:	https://lists.gnupg.org/pipermail/gnupg-announce/2009q1/000284.html

3 files changed, 73 insertions, 44 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 2976167df398..761e404abb61 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	2.0.9
-PORTREVISION=	3
+PORTVERSION=	2.0.10
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
@@ -31,12 +30,13 @@ USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 USE_ICONV=	YES
 USE_LDCONFIG=	YES
+CONFIGURE_ARGS+=	--enable-symcryptrun
 .if defined(NOPORTDOCS)
 CONFIGURE_ARGS+=	--disable-doc
 .else
 MAN1=		gpg2.1 gpgsm.1 gpgv2.1 gpg-agent.1 scdaemon.1 watchgnupg.1 \
 		gpgconf.1 gpg-preset-passphrase.1 gpg-connect-agent.1 \
-		gpgparsemail.1 symcryptrun.1 gpgsm-gencert.sh.1
+		gpgparsemail.1 symcryptrun.1 gpgsm-gencert.sh.1 gpg-zip.1
 MAN8=		addgnupghome.8 applygnupgdefaults.8
 INFO=		gnupg
 .endif
@@ -45,6 +45,8 @@ OPTIONS=	LDAP "LDAP keyserver interface" off \
 		SCDAEMON "Enable Smartcard daemon (with libusb)" off \
 		CURL "Use the real curl library (worked around if no)" on \
 		GPGSM "Enable GPGSM (require LDAP)" off \
+		CAMELLIA "Enable Camellia algorithm" on \
+		KDNS "Use DNS CERT helper" off \
 		NLS "National Language Support" off
 
 .include <bsd.port.pre.mk>
@@ -68,6 +70,18 @@ CONFIGURE_ARGS+=--disable-ldap
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
+.if defined(WITH_CAMELLIA) && !defined(WITHOUT_CAMELLIA)
+CONFIGURE_ARGS+=--enable-camellia
+.endif
+
+.if defined(WITH_KDNS) && !defined(WITHOUT_KDNS)
+LIB_DEPENDS+=	adns:${PORTSDIR}/dns/adns
+PLIST_SUB+=	ADNS=""
+.else
+CONFIGURE_SUB=	-e '/GPGKEYS_KDNS=/s/".*"/""/'
+PLIST_SUB+=	ADNS="@comment "
+.endif
+
 .if defined(WITH_NLS) && !defined(WITHOUT_NLS)
 USE_GETTEXT=	YES
 CONFIGURE_ARGS+=--enable-nls
@@ -97,7 +111,7 @@ verify:	checksum
 	gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
 
 pre-configure:
-	${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" \
+	${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" ${CONFIGURE_SUB} \
 		${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure
 
 post-install:
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index 0df21573f24e..3c00e837f882 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnupg-2.0.9.tar.bz2) = b41f3f6716a74c46a609a71853e85c7b
-SHA256 (gnupg-2.0.9.tar.bz2) = 2dc124908a1dfa3b79d2b0a82aa1a31817128feb14e84a26226beaab13179686
-SIZE (gnupg-2.0.9.tar.bz2) = 3718925
-MD5 (gnupg-2.0.9.tar.bz2.sig) = 29a90f2bdd27d79b7e9a0885f119832a
-SHA256 (gnupg-2.0.9.tar.bz2.sig) = 75487ff94c980c0f6a0290f12290a1373f0b5f36971ed9910407490370340296
-SIZE (gnupg-2.0.9.tar.bz2.sig) = 158
+MD5 (gnupg-2.0.10.tar.bz2) = 1cb778dd555f87685a8fde2f7113725e
+SHA256 (gnupg-2.0.10.tar.bz2) = d488b7bcb9a67a8416cdd49e74d3f95912f31aa98b60580bad125ecbde14df23
+SIZE (gnupg-2.0.10.tar.bz2) = 3825638
+MD5 (gnupg-2.0.10.tar.bz2.sig) = bf002a27b578b229adae914769272b27
+SHA256 (gnupg-2.0.10.tar.bz2.sig) = d5c63ce520690014ae3ab9645502fcbba39d310aa0b44928792d89fd5ec3e7be
+SIZE (gnupg-2.0.10.tar.bz2.sig) = 158
diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist
index bf679b780453..f10db805eb39 100644
--- a/security/gnupg/pkg-plist
+++ b/security/gnupg/pkg-plist
@@ -9,8 +9,10 @@ bin/gpgsm-gencert.sh
 bin/gpgv2
 %%GPGSM%%bin/kbxutil
 %%SCDAEMON%%bin/scdaemon
+bin/symcryptrun
 bin/watchgnupg
 libexec/gpg-check-pattern
+%%ADNS%%libexec/gpg2keys_kdns
 %%SCDAEMON%%libexec/gnupg-pcsc-wrapper
 libexec/gpg-preset-passphrase
 libexec/gpg-protect-tool
@@ -20,39 +22,50 @@ libexec/gpg2keys_hkp
 %%LDAP%%libexec/gpg2keys_ldap
 sbin/addgnupghome
 sbin/applygnupgdefaults
-%%PORTDOCS%%share/gnupg/FAQ
-%%PORTDOCS%%share/gnupg/com-certs.pem
-%%PORTDOCS%%share/gnupg/faq.html
-share/gnupg/gpg-conf.skel
-%%PORTDOCS%%share/gnupg/help.be.txt
-%%PORTDOCS%%share/gnupg/help.ca.txt
-%%PORTDOCS%%share/gnupg/help.cs.txt
-%%PORTDOCS%%share/gnupg/help.da.txt
-%%PORTDOCS%%share/gnupg/help.de.txt
-%%PORTDOCS%%share/gnupg/help.el.txt
-%%PORTDOCS%%share/gnupg/help.eo.txt
-%%PORTDOCS%%share/gnupg/help.es.txt
-%%PORTDOCS%%share/gnupg/help.et.txt
-%%PORTDOCS%%share/gnupg/help.fi.txt
-%%PORTDOCS%%share/gnupg/help.fr.txt
-%%PORTDOCS%%share/gnupg/help.gl.txt
-%%PORTDOCS%%share/gnupg/help.hu.txt
-%%PORTDOCS%%share/gnupg/help.id.txt
-%%PORTDOCS%%share/gnupg/help.it.txt
-%%PORTDOCS%%share/gnupg/help.ja.txt
-%%PORTDOCS%%share/gnupg/help.nb.txt
-%%PORTDOCS%%share/gnupg/help.pl.txt
-%%PORTDOCS%%share/gnupg/help.pt.txt
-%%PORTDOCS%%share/gnupg/help.pt_BR.txt
-%%PORTDOCS%%share/gnupg/help.ro.txt
-%%PORTDOCS%%share/gnupg/help.ru.txt
-%%PORTDOCS%%share/gnupg/help.sk.txt
-%%PORTDOCS%%share/gnupg/help.sv.txt
-%%PORTDOCS%%share/gnupg/help.tr.txt
-%%PORTDOCS%%share/gnupg/help.txt
-%%PORTDOCS%%share/gnupg/help.zh_CN.txt
-%%PORTDOCS%%share/gnupg/help.zh_TW.txt
-%%PORTDOCS%%share/gnupg/qualified.txt
+%%PORTDOCS%%%%DOCSDIR%%/DETAILS
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/KEYSERVER
+%%PORTDOCS%%%%DOCSDIR%%/OpenPGP
+%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TRANSLATE
+%%PORTDOCS%%%%DOCSDIR%%/examples/README
+%%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf
+%%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list
+%%PORTDOCS%%%%DOCSDIR%%/examples/scd-event
+%%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DATADIR%%/com-certs.pem
+%%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
+%%PORTDOCS%%%%DATADIR%%/qualified.txt
 %%NLS%%share/locale/da/LC_MESSAGES/gnupg2.mo
 %%NLS%%share/locale/de/LC_MESSAGES/gnupg2.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/gnupg2.mo
@@ -82,5 +95,7 @@ share/gnupg/gpg-conf.skel
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg2.mo
 %%NLS%%share/locale/en@quot/LC_MESSAGES/gnupg2.mo
 %%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo
-@dirrmtry share/gnupg
+@dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/examples
+@dirrmtry %%DOCSDIR%%
 @unexec [ -L %D/bin/gpg ] && rm -f %D/bin/gpg || true