Ok, cause I am to lame to teach cvs not so substitute $Id$, I trick it

by using a different diff format. No damn $Id$ anymore.

3 files changed, 147 insertions, 100 deletions

diff --git a/security/pgp5/patches/patch-ab b/security/pgp5/patches/patch-ab
index 90848ce5038..b0366462d07 100644
--- a/security/pgp5/patches/patch-ab
+++ b/security/pgp5/patches/patch-ab
@@ -1,30 +1,40 @@
-$NetBSD: patch-ab,v 1.3 1998/12/31 15:02:51 frueauf Exp $
+$NetBSD: patch-ab,v 1.4 1998/12/31 15:14:11 frueauf Exp $
 
---- apps/pgp/Makefile.in.orig	Sat Feb  7 20:54:56 1998
-+++ apps/pgp/Makefile.in	Tue Dec 29 23:55:51 1998
-@@ -6,7 +6,7 @@
- # $Id: patch-ab,v 1.3 1998/12/31 15:02:51 frueauf Exp $
- #
- 
--PROG = pgp
-+PROG = pgp5
- INSTALLPROGS = $(PROG)
- 
- COMMON=../common
-@@ -21,11 +21,11 @@
- 
- install:: $(PROG)
- 	(						\
--	    $(INSTALL) -m 755 pgp $(DESTDIR)$(bindir);	\
-+	    $(INSTALL) -m 755 pgp5 $(DESTDIR)$(bindir);	\
- 	    cd $(DESTDIR)$(bindir);			\
- 	    $(RM) pgpe pgps pgpv pgp_old;		\
--	    $(LN_S) pgp pgpe;				\
--	    $(LN_S) pgp pgps;				\
--	    $(LN_S) pgp pgpv;				\
--	    $(LN_S) pgp pgp_old				\
-+	    $(LN_S) pgp5 pgpe;				\
-+	    $(LN_S) pgp5 pgps;				\
-+	    $(LN_S) pgp5 pgpv;				\
-+	    $(LN_S) pgp5 pgp_old			\
- 	)
+*** apps/pgp/Makefile.in.orig	Sat Feb  7 20:54:56 1998
+--- apps/pgp/Makefile.in	Thu Dec 31 16:03:23 1998
+***************
+*** 7,11 ****
+  #
+  
+! PROG = pgp
+  INSTALLPROGS = $(PROG)
+  
+--- 7,11 ----
+  #
+  
+! PROG = pgp5
+  INSTALLPROGS = $(PROG)
+  
+***************
+*** 22,31 ****
+  install:: $(PROG)
+  	(						\
+! 	    $(INSTALL) -m 755 pgp $(DESTDIR)$(bindir);	\
+  	    cd $(DESTDIR)$(bindir);			\
+  	    $(RM) pgpe pgps pgpv pgp_old;		\
+! 	    $(LN_S) pgp pgpe;				\
+! 	    $(LN_S) pgp pgps;				\
+! 	    $(LN_S) pgp pgpv;				\
+! 	    $(LN_S) pgp pgp_old				\
+  	)
+--- 22,31 ----
+  install:: $(PROG)
+  	(						\
+! 	    $(INSTALL) -m 755 pgp5 $(DESTDIR)$(bindir);	\
+  	    cd $(DESTDIR)$(bindir);			\
+  	    $(RM) pgpe pgps pgpv pgp_old;		\
+! 	    $(LN_S) pgp5 pgpe;				\
+! 	    $(LN_S) pgp5 pgps;				\
+! 	    $(LN_S) pgp5 pgpv;				\
+! 	    $(LN_S) pgp5 pgp_old			\
+  	)
diff --git a/security/pgp5/patches/patch-ae b/security/pgp5/patches/patch-ae
index c722765fe83..648fb0f4dec 100644
--- a/security/pgp5/patches/patch-ae
+++ b/security/pgp5/patches/patch-ae
@@ -1,13 +1,17 @@
-$NetBSD: patch-ae,v 1.1.1.1 1998/12/31 14:25:30 frueauf Exp $
+$NetBSD: patch-ae,v 1.2 1998/12/31 15:14:11 frueauf Exp $
 
---- man/Makefile.in-orig	Sat Feb  7 20:54:57 1998
-+++ man/Makefile.in	Thu Dec 31 14:47:01 1998
-@@ -6,7 +6,7 @@
- # $Id: patch-ae,v 1.1.1.1 1998/12/31 14:25:30 frueauf Exp $
- #
- 
--MAN1=pgp.1 pgpe.1 pgpk.1 pgps.1 pgpv.1
-+MAN1=pgp5.1 pgpe.1 pgpk.1 pgps.1 pgpv.1
- MAN5=pgp.cfg.5
- MAN7=pgp-integration.7 pgp-intro.7
- 
+*** man/Makefile.in.orig	Sat Feb  7 20:54:57 1998
+--- man/Makefile.in	Thu Dec 31 16:08:48 1998
+***************
+*** 7,11 ****
+  #
+  
+! MAN1=pgp.1 pgpe.1 pgpk.1 pgps.1 pgpv.1
+  MAN5=pgp.cfg.5
+  MAN7=pgp-integration.7 pgp-intro.7
+--- 7,11 ----
+  #
+  
+! MAN1=pgp5.1 pgpe.1 pgpk.1 pgps.1 pgpv.1
+  MAN5=pgp.cfg.5
+  MAN7=pgp-integration.7 pgp-intro.7
diff --git a/security/pgp5/patches/patch-af b/security/pgp5/patches/patch-af
index 4d63fdc5bb3..1f7120173b7 100644
--- a/security/pgp5/patches/patch-af
+++ b/security/pgp5/patches/patch-af
@@ -1,60 +1,93 @@
-$NetBSD: patch-af,v 1.3 1998/12/31 15:02:51 frueauf Exp $
+$NetBSD: patch-af,v 1.4 1998/12/31 15:14:11 frueauf Exp $
 
---- man/pgp.1.orig	Sat Feb  7 21:08:26 1998
-+++ man/pgp.1	Thu Dec 31 15:16:09 1998
-@@ -1,38 +1,38 @@
- .\"
--.\" pgp.1
-+.\" pgp5.1
- .\"
- .\" Copyright (C) 1997 Pretty Good Privacy, Inc.  All rights reserved.
- .\"
- .\" $Id: patch-af,v 1.3 1998/12/31 15:02:51 frueauf Exp $
- .\"
- .\" Process this file with
--.\" groff -man -Tascii pgp.1
-+.\" groff -man -Tascii pgp5.1
- .\"
--.TH PGP 1 "JULY 1997 (v5.0)" PGP "User Manual"
-+.TH PGP5 1 "JULY 1997 (v5.0)" PGP "User Manual"
- .SH NAME
--PGP \- A suite of tools for encrypting, decrypting and verifying
-+PGP5 \- A suite of tools for encrypting, decrypting and verifying
- messages.
- .SH DESCRIPTION
- There are two files in this package, but several additional modes of
- operation are available via symbolic links:
- 
- .RS
--.BR pgp (1)
-+.BR pgp5 (1)
- is the main cryptographic engine of the PGP package.  However,
- invoking it as itself merely prints a usage summary.
- 
- .BR pgpe (1)
- is executed to encrypt, or encrypt and sign, files.  It is a link to
--.BR pgp (1).
-+.BR pgp5 (1).
- 
- .BR pgps (1)
- is executed to only sign files.  It is a link to
--.BR pgp (1).
-+.BR pgp5 (1).
- 
- .BR pgpv (1)
- is executed to only verify or decrypt signed or encrypted files.  It
- is a link to
--.BR pgp (1).
-+.BR pgp5 (1).
- 
- .BR pgpk (1)
- is the key management application, which is used to generate,
-@@ -167,7 +167,7 @@
- There is currently no way to specify just a secret or public keyring
- for an operation.
- 
--.B pgp --version
-+.B pgp5 --version
- doesn't work.  Use
- .B pgpk --version
- or one of the other commands, instead.
+*** man/pgp.1.orig	Sat Feb  7 21:08:26 1998
+--- man/pgp.1	Thu Dec 31 16:03:24 1998
+***************
+*** 1,4 ****
+  .\"
+! .\" pgp.1
+  .\"
+  .\" Copyright (C) 1997 Pretty Good Privacy, Inc.  All rights reserved.
+--- 1,4 ----
+  .\"
+! .\" pgp5.1
+  .\"
+  .\" Copyright (C) 1997 Pretty Good Privacy, Inc.  All rights reserved.
+***************
+*** 7,15 ****
+  .\"
+  .\" Process this file with
+! .\" groff -man -Tascii pgp.1
+  .\"
+! .TH PGP 1 "JULY 1997 (v5.0)" PGP "User Manual"
+  .SH NAME
+! PGP \- A suite of tools for encrypting, decrypting and verifying
+  messages.
+  .SH DESCRIPTION
+--- 7,15 ----
+  .\"
+  .\" Process this file with
+! .\" groff -man -Tascii pgp5.1
+  .\"
+! .TH PGP5 1 "JULY 1997 (v5.0)" PGP "User Manual"
+  .SH NAME
+! PGP5 \- A suite of tools for encrypting, decrypting and verifying
+  messages.
+  .SH DESCRIPTION
+***************
+*** 18,22 ****
+  
+  .RS
+! .BR pgp (1)
+  is the main cryptographic engine of the PGP package.  However,
+  invoking it as itself merely prints a usage summary.
+--- 18,22 ----
+  
+  .RS
+! .BR pgp5 (1)
+  is the main cryptographic engine of the PGP package.  However,
+  invoking it as itself merely prints a usage summary.
+***************
+*** 24,37 ****
+  .BR pgpe (1)
+  is executed to encrypt, or encrypt and sign, files.  It is a link to
+! .BR pgp (1).
+  
+  .BR pgps (1)
+  is executed to only sign files.  It is a link to
+! .BR pgp (1).
+  
+  .BR pgpv (1)
+  is executed to only verify or decrypt signed or encrypted files.  It
+  is a link to
+! .BR pgp (1).
+  
+  .BR pgpk (1)
+--- 24,37 ----
+  .BR pgpe (1)
+  is executed to encrypt, or encrypt and sign, files.  It is a link to
+! .BR pgp5 (1).
+  
+  .BR pgps (1)
+  is executed to only sign files.  It is a link to
+! .BR pgp5 (1).
+  
+  .BR pgpv (1)
+  is executed to only verify or decrypt signed or encrypted files.  It
+  is a link to
+! .BR pgp5 (1).
+  
+  .BR pgpk (1)
+***************
+*** 168,172 ****
+  for an operation.
+  
+! .B pgp --version
+  doesn't work.  Use
+  .B pgpk --version
+--- 168,172 ----
+  for an operation.
+  
+! .B pgp5 --version
+  doesn't work.  Use
+  .B pgpk --version