Standardize patch.

2 files changed, 56 insertions, 94 deletions

diff --git a/security/pgp5/distinfo b/security/pgp5/distinfo
index 885a4130fc3..04cf77f6470 100644
--- a/security/pgp5/distinfo
+++ b/security/pgp5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:37 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/03/14 12:26:46 wiz Exp $
 
 SHA1 (pgp50i-unix-src.tar.gz) = b740afe0bf557deedb53604274997cb2bbecac33
 Size (pgp50i-unix-src.tar.gz) = 927363 bytes
@@ -7,7 +7,7 @@ SHA1 (patch-ab) = a33fb784788d54d96ffb9dc620391bc33cbbab98
 SHA1 (patch-ac) = 18908d3b5203cd10a85f06b2c58be3d76f838cc8
 SHA1 (patch-ad) = 101bf4a58513c0a7a9cdf365512e5053a360ea43
 SHA1 (patch-ae) = 3b780aaea67f99c37205400afeb9d37086017092
-SHA1 (patch-af) = 50abf220e83f7e7453b1566d9a59568f18c319ec
+SHA1 (patch-af) = 56a8404f3e5d42c5bb8ff80c2eb3900f8dca56be
 SHA1 (patch-ag) = 47f80a3df4c2f375ce273c90422d452bacdb1806
 SHA1 (patch-ah) = 5f6289b1b3d9d4d3741febea61b709caebdaa704
 SHA1 (patch-ai) = abaf43318b95d608693022144b565f7172a9bcfb
diff --git a/security/pgp5/patches/patch-af b/security/pgp5/patches/patch-af
index 1f7120173b7..ab94c4fbd1a 100644
--- a/security/pgp5/patches/patch-af
+++ b/security/pgp5/patches/patch-af
@@ -1,93 +1,55 @@
-$NetBSD: patch-af,v 1.4 1998/12/31 15:14:11 frueauf Exp $
+$NetBSD: patch-af,v 1.5 2002/03/14 12:26:46 wiz Exp $
 
-*** 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
+--- man/pgp.1.orig	Sat Feb  7 21:08:26 1998
++++ man/pgp.1
+@@ -1,4 +1,4 @@
+ .\"
+-.\" pgp.1
++.\" pgp5.1
+ .\"
+ .\" Copyright (C) 1997 Pretty Good Privacy, Inc.  All rights reserved.
+@@ -7,9 +7,9 @@
+ .\"
+ .\" 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
+@@ -18,5 +18,5 @@
+ 
+ .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.
+@@ -24,14 +24,14 @@
+ .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)
+@@ -168,5 +168,5 @@
+ for an operation.
+ 
+-.B pgp --version
++.B pgp5 --version
+ doesn't work.  Use
+ .B pgpk --version