Fetch and install man page, as noted by Markus Kurek

<kurek@uni-duisburg.de> in pkg/9519. Also defuzz patches.

5 files changed, 35 insertions, 28 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 91d2ad3a1dc..e6f3a835e38 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2000/02/27 04:16:55 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2000/03/02 08:21:31 wiz Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
 DISTNAME=	gnupg-1.0.1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/gnupg/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} gpg.1.gz
 
 MAINTAINER=	packages@NetBSD.ORG
 HOMEPAGE=	http://www.gnupg.org/
@@ -20,9 +21,14 @@ MIRROR_DISTFILE=no
 
 .include "../../mk/bsd.prefs.mk"
 
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
 .if ${OPSYS} == "SunOS"
 DEPENDS+=	zlib-1.1.3:../../devel/zlib
 LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
+pre-configure:
+	${GUNZIP_CMD} -c ${DISTDIR}/gpg.1.gz > ${WRKSRC}/doc/gpg.1
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gnupg/files/md5 b/security/gnupg/files/md5
index ebf3031a4b0..ed0c1cfef74 100644
--- a/security/gnupg/files/md5
+++ b/security/gnupg/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.3 2000/02/27 04:16:56 wiz Exp $
+$NetBSD: md5,v 1.4 2000/03/02 08:21:32 wiz Exp $
 
 MD5 (gnupg-1.0.1.tar.gz) = 14ce577afd03d56cba5d8ee59b9580ed
+MD5 (gpg.1.gz) = c68de2894a22e42746b50f268af4f369
diff --git a/security/gnupg/files/patch-sum b/security/gnupg/files/patch-sum
index 6f45c9f58f1..f34a2d3a9d8 100644
--- a/security/gnupg/files/patch-sum
+++ b/security/gnupg/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/12/02 15:50:44 frueauf Exp $
+$NetBSD: patch-sum,v 1.3 2000/03/02 08:21:32 wiz Exp $
 
-MD5 (patch-ab) = 993d9c05ddd4afa998b7e075db776387
-MD5 (patch-ac) = 684e4698719a3032afe6330d90d7e568
+MD5 (patch-ab) = 59008643b57b255f9ee7d7eb84923e70
+MD5 (patch-ac) = d727203e6a48d22677b58a69af73bd78
diff --git a/security/gnupg/patches/patch-ab b/security/gnupg/patches/patch-ab
index 23e30e22246..f9b3f324bce 100644
--- a/security/gnupg/patches/patch-ab
+++ b/security/gnupg/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.4 1999/12/02 15:50:45 frueauf Exp $
+$NetBSD: patch-ab,v 1.5 2000/03/02 08:21:33 wiz Exp $
 
 Make this work on NetBSD.
 For Solaris, make the DATADIRNAME share.
 
---- configure.orig	Tue Sep  7 17:12:37 1999
-+++ configure	Thu Dec  2 16:03:10 1999
-@@ -2505,7 +2505,7 @@
+--- ./configure.orig	Thu Dec 16 10:15:33 1999
++++ ./configure	Thu Mar  2 01:50:58 2000
+@@ -1995,7 +1995,7 @@
              CFLAGS_RDYNAMIC="-Wl,-E"
              ;;
  
@@ -14,17 +14,17 @@ For Solaris, make the DATADIRNAME share.
              CFLAGS_RDYNAMIC=""
              ;;
  
-@@ -2553,6 +2553,9 @@
+@@ -2043,6 +2043,9 @@
          NAME_OF_DEV_URANDOM="/dev/urandom"
          DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
          ;;
 +    *-netbsd*)
-+	DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
++        DYNLINK_MOD_CFLAGS="-shared -rdynamic -fpic -Wl,-Bshareable -Wl,-x"
 +	;;
      *)
          NAME_OF_DEV_RANDOM="/dev/random"
          NAME_OF_DEV_URANDOM="/dev/urandom"
-@@ -3921,7 +3924,7 @@
+@@ -3441,7 +3444,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
diff --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac
index 6e505ed36cf..1882e2580cb 100644
--- a/security/gnupg/patches/patch-ac
+++ b/security/gnupg/patches/patch-ac
@@ -1,21 +1,21 @@
-$NetBSD: patch-ac,v 1.3 1999/12/02 15:50:45 frueauf Exp $
+$NetBSD: patch-ac,v 1.4 2000/03/02 08:21:33 wiz Exp $
 
---- mpi/config.links.orig	Mon Aug 30 11:06:48 1999
-+++ mpi/config.links	Thu Dec  2 15:42:48 1999
+--- ./mpi/config.links.orig	Fri Dec 10 14:04:00 1999
++++ ./mpi/config.links	Thu Mar  2 01:53:31 2000
 @@ -22,6 +22,16 @@
         cat  $srcdir/mpi/i386/syntax.h	   >>./mpi/asm-syntax.h
         path="i586 i386"
         ;;
-+    i[34]86*-*-netbsd*)
-+	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
-+	cat  $srcdir/mpi/i386/syntax.h      >>./mpi/asm-syntax.h
-+	path="i386"
-+	;;
-+    i[56]86*-*-netbsd* | pentium-*-netbsd* | pentiumpro-*-netbsd*)
-+	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
-+	cat  $srcdir/mpi/i386/syntax.h      >>./mpi/asm-syntax.h
-+	path="i586 i386"
-+	;;
-     i[34]86*-*-linuxaout* | i[34]86*-*-linuxoldld* | i[34]86*-*-*bsd*)
- 	echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
- 	echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h
++     i[34]86*-*-netbsd*)
++       echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
++       cat  $srcdir/mpi/i386/syntax.h      >>./mpi/asm-syntax.h
++       path="i386"
++       ;;
++     i[56]86*-*-netbsd* | pentium-*-netbsd* | pentiumpro-*-netbsd*)
++       echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
++       cat  $srcdir/mpi/i386/syntax.h      >>./mpi/asm-syntax.h
++       path="i586 i386"
++       ;;
+     i[34]86*-*-bsdi4*)
+        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
+        cat  $srcdir/mpi/i386/syntax.h	 >>./mpi/asm-syntax.h