Split multipatch into multiple patches.

7 files changed, 62 insertions, 53 deletions

diff --git a/security/pgp2/distinfo b/security/pgp2/distinfo
index 3200b955c41..6d0d3207322 100644
--- a/security/pgp2/distinfo
+++ b/security/pgp2/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 13:10:11 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/12/01 20:19:57 wiz Exp $
 
 SHA1 (pgp263is.tar.gz) = 031e061ba1d62d7db35f1f854c489867e88f421d
 RMD160 (pgp263is.tar.gz) = b1cba2be918cecc8b9062272d43626c8876fa7f4
 Size (pgp263is.tar.gz) = 607982 bytes
-SHA1 (patch-aa) = cc2cc39d7b9ccf6fd1dd0ec69581f70a00ac30b6
-SHA1 (patch-ab) = 68b5c6a491fb665c1044a3208d6f5c4d1f65ce83
-SHA1 (patch-ac) = 70fd2925b2ef03d62f1a993cef6ac7eef90f4a75
+SHA1 (patch-aa) = 740486e879c161041969fedebc565dd7683c277c
+SHA1 (patch-ab) = d210fadf6ef45ecce20381174ec1b55615dc3490
+SHA1 (patch-ac) = 32e69f1335c3aa7b974dc7fa4100d1f9ebf358ec
+SHA1 (patch-ad) = 93f72f3e4f91f478429da8fda4671e171eb167ac
+SHA1 (patch-ae) = 307dddd61ef0ee3257a11822fc7bd423c5fd784f
+SHA1 (patch-af) = 33802b9f8d875293ea8e5e58a1e1eafd8cde7afe
diff --git a/security/pgp2/patches/patch-aa b/security/pgp2/patches/patch-aa
index 55c80726c55..f40bde867ef 100644
--- a/security/pgp2/patches/patch-aa
+++ b/security/pgp2/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 1998/08/07 11:13:45 agc Exp $
+$NetBSD: patch-aa,v 1.5 2005/12/01 20:19:57 wiz Exp $
 
---- fileio.h.orig	Sat Jan  6 14:46:36 1996
-+++ fileio.h	Wed Mar 18 21:35:20 1998
+--- fileio.h.orig	1996-01-06 20:46:36.000000000 +0100
++++ fileio.h
 @@ -21,15 +21,6 @@
  #define FOPWPBIN	"w+b","ctx=stm"
  #else
@@ -18,43 +18,3 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 11:13:45 agc Exp $
  #define FOPRBIN		"r"
  #define FOPRTXT		"r"
  #define FOPWBIN		"w"
---- md5.c.orig	Sat Jan  6 15:21:09 1996
-+++ md5.c	Wed Mar 18 21:36:42 1998
-@@ -15,6 +15,7 @@
-  * will fill a supplied 16-byte array with the digest.
-  */
- #include <string.h>		/* for memcpy() */
-+#include "usuals.h"
- #include "md5.h"
- 
- #ifndef HIGHFIRST
---- rsaglue2.c.orig	Tue Jan  2 09:17:27 1996
-+++ rsaglue2.c	Wed Mar 18 21:35:20 1998
-@@ -52,9 +52,8 @@
- Uses the RSAREF(tm) Toolkit, which is copyright RSA Data Security, Inc.\n\
- Distributed by the Massachusetts Institute of Technology.\n");
- 
--#include <global.h>
--#include <rsaref.h>
--#include <rsa.h>
-+#include <rsaref/rsaref.h>
-+#include <rsaref/rsa.h>
- /*
-  * The functions we call in rsa.h are:
-  *
---- usuals.h.orig	Fri Sep 15 08:18:52 1995
-+++ usuals.h	Wed Mar 18 21:35:39 1998
-@@ -3,6 +3,13 @@
- #ifndef USUALS /* Assures no redefinitions of usual types...*/
- #define USUALS
- 
-+#ifdef __NetBSD__
-+#include <sys/types.h>
-+#if BYTE_ORDER == BIG_ENDIAN
-+#define HIGHFIRST
-+#endif
-+#endif
-+
- typedef unsigned char boolean;	/* values are TRUE or FALSE */
- typedef unsigned char byte;	/* values are 0-255 */
- typedef byte *byteptr;	/* pointer to byte */
diff --git a/security/pgp2/patches/patch-ab b/security/pgp2/patches/patch-ab
index 8a15c4ee11b..2722572bcf5 100644
--- a/security/pgp2/patches/patch-ab
+++ b/security/pgp2/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2000/02/05 04:35:51 wiz Exp $
---- sparc.S.orig	Sun Jun 20 21:52:19 1999
-+++ sparc.S	Sun Jun 20 21:53:04 1999
+$NetBSD: patch-ab,v 1.3 2005/12/01 20:19:57 wiz Exp $
+--- sparc.S.orig	1994-10-13 18:33:04.000000000 +0100
++++ sparc.S
 @@ -7,7 +7,7 @@
  !
  ! other sources must be compiled with UNIT32 and HIGHFIRST defined
diff --git a/security/pgp2/patches/patch-ac b/security/pgp2/patches/patch-ac
index f45dc615e8d..91b108aa49f 100644
--- a/security/pgp2/patches/patch-ac
+++ b/security/pgp2/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2000/02/05 04:35:51 wiz Exp $
---- platform.h.orig	Sun Jun 20 22:21:24 1999
-+++ platform.h	Sun Jun 20 22:21:49 1999
+$NetBSD: patch-ac,v 1.3 2005/12/01 20:19:57 wiz Exp $
+--- platform.h.orig	1996-01-06 21:01:34.000000000 +0100
++++ platform.h
 @@ -179,7 +179,7 @@
  #define PLATFORM_SPECIFIED
  #endif /* i386 */
diff --git a/security/pgp2/patches/patch-ad b/security/pgp2/patches/patch-ad
new file mode 100644
index 00000000000..4a0afe1522d
--- /dev/null
+++ b/security/pgp2/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2005/12/01 20:19:57 wiz Exp $
+
+--- md5.c.orig	1996-01-06 21:21:09.000000000 +0100
++++ md5.c
+@@ -15,6 +15,7 @@
+  * will fill a supplied 16-byte array with the digest.
+  */
+ #include <string.h>		/* for memcpy() */
++#include "usuals.h"
+ #include "md5.h"
+ 
+ #ifndef HIGHFIRST
diff --git a/security/pgp2/patches/patch-ae b/security/pgp2/patches/patch-ae
new file mode 100644
index 00000000000..7210efbb748
--- /dev/null
+++ b/security/pgp2/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2005/12/01 20:19:57 wiz Exp $
+
+--- rsaglue2.c.orig	1996-01-02 15:17:27.000000000 +0100
++++ rsaglue2.c
+@@ -52,9 +52,8 @@ char signon_legalese[] = _LANG("\
+ Uses the RSAREF(tm) Toolkit, which is copyright RSA Data Security, Inc.\n\
+ Distributed by the Massachusetts Institute of Technology.\n");
+ 
+-#include <global.h>
+-#include <rsaref.h>
+-#include <rsa.h>
++#include <rsaref/rsaref.h>
++#include <rsaref/rsa.h>
+ /*
+  * The functions we call in rsa.h are:
+  *
diff --git a/security/pgp2/patches/patch-af b/security/pgp2/patches/patch-af
new file mode 100644
index 00000000000..b293f371659
--- /dev/null
+++ b/security/pgp2/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.1 2005/12/01 20:19:57 wiz Exp $
+
+--- usuals.h.orig	1995-09-15 14:18:52.000000000 +0200
++++ usuals.h
+@@ -3,6 +3,13 @@
+ #ifndef USUALS /* Assures no redefinitions of usual types...*/
+ #define USUALS
+ 
++#ifdef __NetBSD__
++#include <sys/types.h>
++#if BYTE_ORDER == BIG_ENDIAN
++#define HIGHFIRST
++#endif
++#endif
++
+ typedef unsigned char boolean;	/* values are TRUE or FALSE */
+ typedef unsigned char byte;	/* values are 0-255 */
+ typedef byte *byteptr;	/* pointer to byte */