Apply the patch from PR pkg/21493. This is now submitted to gnupg.org as

bug gnupg/293, so grant has blessed it for inclusion in pkgsrc.

No more GNU sed build dependency, but the binaries do not change; thus
PKGREVISION untouched.

4 files changed, 48 insertions, 6 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 1f6ede4e427..50e3333fdee 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2004/03/30 09:05:56 grant Exp $
+# $NetBSD: Makefile,v 1.63 2004/03/30 15:13:12 tv Exp $
 
 DISTNAME=	gnupg-1.2.4
 PKGREVISION=	1
@@ -21,7 +21,7 @@ CRYPTO=			yes
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GNU_TOOLS+=		make sed
+USE_GNU_TOOLS+=		make
 CONFIGURE_ARGS+=	--enable-tiger --with-static-rnd=auto
 TEST_TARGET=		check
 
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index 4f39de532d0..64393100f45 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2004/03/01 19:12:25 wiz Exp $
+$NetBSD: distinfo,v 1.27 2004/03/30 15:13:12 tv Exp $
 
 SHA1 (gnupg-1.2.4.tar.bz2) = 10972d11aeb9f88369557f351f0e9d95542e778b
 Size (gnupg-1.2.4.tar.bz2) = 2377277 bytes
@@ -9,5 +9,6 @@ SHA1 (patch-ab) = 074bdc631b1558d11b4b640ea3aa6a9be04a9368
 SHA1 (patch-ac) = bf663caa3d7f9b9bb8c4b3f698038efc0683f9cd
 SHA1 (patch-ad) = fc9e85c88e53738faa47f55b769e98dce2c190dc
 SHA1 (patch-ae) = 287a24a881d6886e8a6be5f2826ffa2ea85aadbf
-SHA1 (patch-af) = 5207b2ce4abb59729b9c6b75693b1e4013764280
+SHA1 (patch-af) = f794a577f42f80cf1b7d0149bdc7d932f6607f24
+SHA1 (patch-ag) = 1553d3919211a1a43ea2afe56a046580208fb096
 SHA1 (patch-ak) = bf0d2648382f8737bdda4eac486f23ee76f43b4f
diff --git a/security/gnupg/patches/patch-af b/security/gnupg/patches/patch-af
index 805fc8d8bd9..674d92b612c 100644
--- a/security/gnupg/patches/patch-af
+++ b/security/gnupg/patches/patch-af
@@ -1,9 +1,28 @@
-$NetBSD: patch-af,v 1.4 2003/12/25 14:05:02 wiz Exp $
+$NetBSD: patch-af,v 1.5 2004/03/30 15:13:12 tv Exp $
 
+Parts from:
 ftp://ftp.kame.net/pub/kame/misc/gnupg-1.2.2-IPv6.diff.gz
 
---- configure.orig	Tue Dec 23 20:28:22 2003
+--- configure.orig	Tue Dec 23 14:28:22 2003
 +++ configure
+@@ -4601,7 +4601,7 @@ extern "C" {
+ 
+ EOF
+         # Now generate the symbol file.
+-        sed 's/^.* _\?\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
++        sed 's/^.* _\{0,1\}\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+ 
+         cat <<EOF >> conftest.c
+ #if defined (__STDC__) && __STDC__
+@@ -4621,7 +4621,7 @@ struct {
+ dld_preloaded_symbols[] =
+ {
+ EOF
+-        sed 's/^_\?\(.*\) _\?\(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
++        sed 's/^_\{0,1\}/\(.*\) _\{0,1\}\(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
+         cat <<\EOF >> conftest.c
+   {0, (__ptr_t) 0}
+ };
 @@ -13579,7 +13579,7 @@ done
  
  
diff --git a/security/gnupg/patches/patch-ag b/security/gnupg/patches/patch-ag
new file mode 100644
index 00000000000..748002eb618
--- /dev/null
+++ b/security/gnupg/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1 2004/03/30 15:13:12 tv Exp $
+
+--- acinclude.m4.orig	Tue Apr 15 08:16:18 2003
++++ acinclude.m4
+@@ -588,7 +588,7 @@ extern "C" {
+ 
+ EOF
+         # Now generate the symbol file.
+-        sed 's/^.* _\?\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
++        sed 's/^.* _\{0,1\}\(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+ 
+         cat <<EOF >> conftest.c
+ #if defined (__STDC__) && __STDC__
+@@ -610,7 +610,7 @@ dld_preloaded_symbols[] =
+ changequote([,])dnl
+ {
+ EOF
+-        sed 's/^_\?\(.*\) _\?\(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
++        sed 's/^_\{0,1\}/\(.*\) _\{0,1\}\(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
+         cat <<\EOF >> conftest.c
+   {0, (__ptr_t) 0}
+ };