Some fixes at update to 2.0.16.

* not using autogen.sh anymore, so remove some tools from USE_TOOLS.
* patch-ak does not effect anymore for above reason, add patch-ao for it.
  this patch is required to avoid conflict with security/gnupg.

Bump PKGREVISION.

5 files changed, 25 insertions, 9 deletions

diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index 5d8ed798bb5..163b60bb5b0 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2010/09/01 16:46:41 drochner Exp $
+# $NetBSD: Makefile,v 1.32 2010/09/02 06:58:35 obache Exp $
 #
 
 DISTNAME=		gnupg-2.0.16
 PKGNAME=		${DISTNAME:S/gnupg/gnupg2/}
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/gnupg/
 EXTRACT_SUFX=		.tar.bz2
@@ -18,9 +19,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
 USE_TOOLS+=		gmake
-USE_TOOLS+=		autoconf
-USE_TOOLS+=		automake
-USE_TOOLS+=		gettext
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
diff --git a/security/gnupg2/PLIST.gpgsm b/security/gnupg2/PLIST.gpgsm
index 3821da1b0ec..71202ba7532 100644
--- a/security/gnupg2/PLIST.gpgsm
+++ b/security/gnupg2/PLIST.gpgsm
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gpgsm,v 1.9 2010/09/01 16:46:41 drochner Exp $
+@comment $NetBSD: PLIST.gpgsm,v 1.10 2010/09/02 06:58:35 obache Exp $
 bin/gpg-connect-agent
 bin/gpg2
 bin/gpgconf
@@ -21,7 +21,6 @@ libexec/gpg-check-pattern
 man/man1/gpg-agent.1
 man/man1/gpg-connect-agent.1
 man/man1/gpg-preset-passphrase.1
-man/man1/gpg-zip.1
 man/man1/gpg2.1
 man/man1/gpgconf.1
 man/man1/gpgparsemail.1
diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo
index 78fc01d4776..2f87ba39bc2 100644
--- a/security/gnupg2/distinfo
+++ b/security/gnupg2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2010/09/01 16:46:41 drochner Exp $
+$NetBSD: distinfo,v 1.20 2010/09/02 06:58:35 obache Exp $
 
 SHA1 (gnupg-2.0.16.tar.bz2) = e7eb4f60026884bd90803b531472bc518804b95d
 RMD160 (gnupg-2.0.16.tar.bz2) = 3a0ed7a3ebb28fdb875533ff3368f6af3a0bb742
@@ -6,6 +6,7 @@ Size (gnupg-2.0.16.tar.bz2) = 4004033 bytes
 SHA1 (patch-ah) = 0c9e061611ebfe22441a161aca016436a70ccc60
 SHA1 (patch-ai) = 555b8768c30f470e98e5be62a4a4bea29eefdf78
 SHA1 (patch-aj) = 20be6b455167962ffa556979d8d0f167dd14131e
-SHA1 (patch-ak) = 74b26ce441ea99ff28a09a3f0c643456daf48f35
+SHA1 (patch-ak) = 0480f4be019de80e2683d6edb9beeecf27c26d9c
 SHA1 (patch-al) = ef7c698ed102c4e27bbf707ae5d1fce4c2b5d8d4
 SHA1 (patch-an) = 17e6f789af2853884eb6dd8488a2b91c9b06188d
+SHA1 (patch-ao) = e8433f99da5e8b8e63239389513f0e352c0020f0
diff --git a/security/gnupg2/patches/patch-ak b/security/gnupg2/patches/patch-ak
index 6ffc8e90f52..86d1ac655e5 100644
--- a/security/gnupg2/patches/patch-ak
+++ b/security/gnupg2/patches/patch-ak
@@ -1,4 +1,7 @@
-$NetBSD: patch-ak,v 1.1 2009/12/16 18:52:49 drochner Exp $
+$NetBSD: patch-ak,v 1.2 2010/09/02 06:58:35 obache Exp $
+
+gpg-zip script will not be installed, so man page also should not be installed.
+If will introduce conflict with security/gnupg.
 
 --- doc/Makefile.am.orig	2009-12-16 18:23:55.000000000 +0000
 +++ doc/Makefile.am
diff --git a/security/gnupg2/patches/patch-ao b/security/gnupg2/patches/patch-ao
new file mode 100644
index 00000000000..946df1aadd5
--- /dev/null
+++ b/security/gnupg2/patches/patch-ao
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.1 2010/09/02 06:58:35 obache Exp $
+
+from patch-ak
+
+--- doc/Makefile.in.orig	2010-07-19 07:05:40.000000000 +0000
++++ doc/Makefile.in
+@@ -353,7 +353,7 @@ myman_sources = gnupg7.texi gpg.texi gpg
+ myman_pages = gpg2.1 gpgsm.1 gpg-agent.1 scdaemon.1 gpgv2.1 \
+                 watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
+ 		gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \
+-		gpgsm-gencert.sh.1 applygnupgdefaults.8 gpg-zip.1
++		gpgsm-gencert.sh.1 applygnupgdefaults.8
+ 
+ man_MANS = $(myman_pages)
+ noinst_MANS = gnupg.7