From f378817648fd81ba58e92a6a6b813d01bb04a0a8 Mon Sep 17 00:00:00 2001
From: Jun Kuriyama <kuriyama@FreeBSD.org>
Date: Tue, 20 Jul 2010 14:01:50 +0000
Subject: [PATCH] - Upgrade to 2.0.16. - Add license info.

PR:		ports/148756
Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp>
---
 security/gnupg/Makefile    | 10 +++++++++-
 security/gnupg/distinfo    | 12 ++++++------
 security/gnupg/pkg-message |  6 ------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 8ea65c3a2545..cd89b897c257 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	2.0.15
+PORTVERSION=	2.0.16
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
@@ -23,6 +23,9 @@ LIB_DEPENDS=	assuan.0:${PORTSDIR}/security/libassuan \
 		ksba.17:${PORTSDIR}/security/libksba \
 		pth.20:${PORTSDIR}/devel/pth
 
+LICENSE=	GPLv3 LGPL3
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB
 USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
@@ -45,6 +48,7 @@ OPTIONS=	LDAP "LDAP keyserver interface" off \
 		GPGSM "Enable GPGSM (require LDAP)" off \
 		CAMELLIA "Enable Camellia algorithm" on \
 		KDNS "Use DNS CERT helper" off \
+		STD_SOCKET "Use standard socket for agent" off \
 		NLS "National Language Support" off
 
 .include <bsd.port.pre.mk>
@@ -80,6 +84,10 @@ CONFIGURE_SUB=	-e '/GPGKEYS_KDNS=/s/".*"/""/'
 PLIST_SUB+=	ADNS="@comment "
 .endif
 
+.if defined(WITH_STD_SOCKET) && !defined(WITHOUT_STD_SOCKET)
+CONFIGURE_ARGS+=--enable-standard-socket
+.endif
+
 .if defined(WITH_NLS) && !defined(WITHOUT_NLS)
 USE_GETTEXT=	YES
 CONFIGURE_ARGS+=--enable-nls
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index 642fb4c19741..b316739cc2d7 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnupg-2.0.15.tar.bz2) = c1286e85b66349879dc4b760dd83e2f1
-SHA256 (gnupg-2.0.15.tar.bz2) = 5881882f4da120ce1c71da64468392704b391ca7652ddc512bc4f1d8968f0d1c
-SIZE (gnupg-2.0.15.tar.bz2) = 3976879
-MD5 (gnupg-2.0.15.tar.bz2.sig) = 4287193cc032b12a890ce6925a7d5211
-SHA256 (gnupg-2.0.15.tar.bz2.sig) = f43a16e0291c3c10f18a4754687f8571fa753d0b37a71fc325f9a68afc407bcc
-SIZE (gnupg-2.0.15.tar.bz2.sig) = 158
+MD5 (gnupg-2.0.16.tar.bz2) = 88a4d46deca63d2eca29b2b611304afb
+SHA256 (gnupg-2.0.16.tar.bz2) = 0d5abb977c02ebb0f6ce25a5ba71c8df90835aa666a85acd73a9b7f9df35a80b
+SIZE (gnupg-2.0.16.tar.bz2) = 4004033
+MD5 (gnupg-2.0.16.tar.bz2.sig) = 1c6b0b9b04c06deb5ec4bd8c959e25b0
+SHA256 (gnupg-2.0.16.tar.bz2.sig) = a72156a1a231e4380225aa4c81f515ce66b787a19996f7f7d84315631be8df43
+SIZE (gnupg-2.0.16.tar.bz2.sig) = 158
diff --git a/security/gnupg/pkg-message b/security/gnupg/pkg-message
index 7c4456edd066..41e1aeb745de 100644
--- a/security/gnupg/pkg-message
+++ b/security/gnupg/pkg-message
@@ -1,6 +1,3 @@
-
-
-
 ###############################################################################
 				A T T E N T I O N
 
@@ -15,6 +12,3 @@ security/pinentry-qt		(QT3 based dialog)
 security/pinentry-q4		(QT4 based dialog)
 
 ###############################################################################
-
-
-