From 4a15dd5f072338bfc1768a2db8410f2e9959945f Mon Sep 17 00:00:00 2001
From: shannonjr <shannonjr@pkgsrc.org>
Date: Thu, 23 Dec 2004 11:44:49 +0000
Subject: Upgrade to 1.9.14. This is mainly a bug fix release with a few new
 things:

 * [gpg-agent] New option --use-standard-socket to allow the use of a
   fixed socket.  gpgsm falls back to this socket if GPG_AGENT_INFO
   has not been set.

 * New tool gpg-preset-passphrase.
---
 security/gnupg-devel/Makefile         |  5 +++--
 security/gnupg-devel/distinfo         |  8 ++++----
 security/gnupg-devel/patches/patch-aa | 16 ++++++++--------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index c663797f3ea..6435d475126 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/12/03 22:01:29 shannonjr Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/23 11:44:49 shannonjr Exp $
 #
 
-DISTNAME=		gnupg-1.9.13
+DISTNAME=		gnupg-1.9.14
 PKGNAME=		${DISTNAME:S/gnupg/gnupg-devel/}
 #PKGREVISION=		1
 CATEGORIES=		security
@@ -14,6 +14,7 @@ COMMENT=		Utility programs that come with GnuPG 1.9 (experimental branch)
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/security/gnupg-devel/distinfo b/security/gnupg-devel/distinfo
index ab1e67154e3..2cc177b2b85 100644
--- a/security/gnupg-devel/distinfo
+++ b/security/gnupg-devel/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2004/12/03 22:01:29 shannonjr Exp $
+$NetBSD: distinfo,v 1.4 2004/12/23 11:44:50 shannonjr Exp $
 
-SHA1 (gnupg-1.9.13.tar.gz) = 991ebf4c50f5fd50b600a6a2a67c72e25e482c72
-Size (gnupg-1.9.13.tar.gz) = 1455959 bytes
-SHA1 (patch-aa) = 0be8895faf55e862420cc9400736e0cd7b569193
+SHA1 (gnupg-1.9.14.tar.gz) = 6e5a3b27a4eb6a781bc8d8ad9458ea3e99449b48
+Size (gnupg-1.9.14.tar.gz) = 1925582 bytes
+SHA1 (patch-aa) = 4fdedc1f98dbe717fd5a1229944703f19c3c10e5
diff --git a/security/gnupg-devel/patches/patch-aa b/security/gnupg-devel/patches/patch-aa
index bc3b0b4f1a7..0b3d530a9c7 100644
--- a/security/gnupg-devel/patches/patch-aa
+++ b/security/gnupg-devel/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1 2004/10/23 14:46:16 shannonjr Exp $
+$NetBSD: patch-aa,v 1.2 2004/12/23 11:44:50 shannonjr Exp $
 
---- agent/call-scd.c.orig	2004-04-26 12:21:25.000000000 -0600
+--- agent/call-scd.c.orig	2004-12-20 01:18:49.000000000 -0700
 +++ agent/call-scd.c
-@@ -35,6 +35,7 @@
+@@ -32,6 +32,7 @@
+ #include <ctype.h>
+ #include <assert.h>
+ #include <unistd.h>
++#include <sys/signal.h>
  #include <sys/stat.h>
  #include <sys/types.h>
- #include <sys/wait.h>
-+#include <sys/signal.h>
- #ifdef USE_GNU_PTH
- # include <pth.h>
- #endif
+ #ifndef HAVE_W32_SYSTEM
-- 
cgit v1.2.3