FIX: don't insert two directory entries for the CVS info file.

While at it, broke out the patch-ab file into patch-ab and patch-av
so each only patches a single source file in the distribution.  This
makes it considerably easier to update patches.

3 files changed, 33 insertions, 16 deletions

diff --git a/devel/cvs-current/files/patch-sum b/devel/cvs-current/files/patch-sum
index 16543cded94..ba8fcef8d4c 100644
--- a/devel/cvs-current/files/patch-sum
+++ b/devel/cvs-current/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+$NetBSD: patch-sum,v 1.2 1999/08/29 14:52:29 kim Exp $
 
 MD5 (patch-aa) = 5849cf99985eeb67db5f9f69e69e8fd5
-MD5 (patch-ab) = 152906e7f3605dabf55aeedd9af72cce
+MD5 (patch-ab) = 847f8ac956af77558ecab7a5465af3ed
 MD5 (patch-ac) = 4cef2709c703f5eddadbeea4bf941391
 MD5 (patch-ad) = 872077097162e9ccc5bcba45981ea548
 MD5 (patch-ae) = 74b1abdcc1972981cd39bba16a78cc14
@@ -17,3 +17,4 @@ MD5 (patch-ar) = c24e0c575c1a14c39a77747743dc4c58
 MD5 (patch-as) = a1ee9d85ca2a060240d8d75f1d41f1a2
 MD5 (patch-at) = 0891e77ee194454422e366555abc157d
 MD5 (patch-au) = c29d29e86268d86449cb445a8ad909c5
+MD5 (patch-av) = 648331d7bece041a5b4318cb3badb487
diff --git a/devel/cvs-current/patches/patch-ab b/devel/cvs-current/patches/patch-ab
index 361160f1816..6d8d03d7a0b 100644
--- a/devel/cvs-current/patches/patch-ab
+++ b/devel/cvs-current/patches/patch-ab
@@ -1,18 +1,5 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+$NetBSD: patch-ab,v 1.2 1999/08/29 14:52:30 kim Exp $
 
---- doc/cvs.texinfo.orig	Wed Mar  4 10:47:24 1998
-+++ doc/cvs.texinfo	Thu Mar 19 22:45:08 1998
-@@ -41,6 +41,10 @@
- @setfilename cvs.info
- @include CVSvn.texi
- @settitle CVS---Concurrent Versions System
-+@dircategory Programming & development tools
-+@direntry
-+* CVS: (cvs)			CVS Reference Manual.
-+@end direntry
- @setchapternewpage odd
- 
- @c -- TODO list:
 --- doc/cvsclient.texi.orig	Tue Feb 10 18:07:31 1998
 +++ doc/cvsclient.texi	Thu Mar 19 22:45:08 1998
 @@ -3,6 +3,11 @@
diff --git a/devel/cvs-current/patches/patch-av b/devel/cvs-current/patches/patch-av
new file mode 100644
index 00000000000..54827442397
--- /dev/null
+++ b/devel/cvs-current/patches/patch-av
@@ -0,0 +1,29 @@
+$NetBSD: patch-av,v 1.1 1999/08/29 14:52:30 kim Exp $
+
+--- doc/cvs.texinfo.orig	Fri May 14 12:28:05 1999
++++ doc/cvs.texinfo	Sun Aug 29 10:45:33 1999
+@@ -40,20 +40,16 @@
+ @setfilename cvs.info
+ @include CVSvn.texi
+ @settitle CVS---Concurrent Versions System
++@dircategory Programming & development tools
++@direntry
++* CVS: (cvs)			CVS Reference Manual.
++@end direntry
+ @setchapternewpage odd
+ 
+ @c -- TODO list:
+ @c -- Fix all lines that match "^@c -- "
+ @c -- Also places marked with FIXME should be manual
+ @c problems (as opposed to FIXCVS for CVS problems).
+-
+-@ifinfo
+-@format
+-START-INFO-DIR-ENTRY
+-* CVS: (cvs).          Concurrent Versions System
+-END-INFO-DIR-ENTRY
+-@end format
+-@end ifinfo
+ 
+ @ifinfo
+ Copyright @copyright{} 1992, 1993 Signum Support AB