Convert to USE_NEW_TEXINFO.

Remove unnecessary patches on texinfo sources.

5 files changed, 7 insertions, 39 deletions

diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 1a25a2e3620..7b34a72355f 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2003/06/02 01:20:54 jschauma Exp $
+# $NetBSD: Makefile,v 1.65 2003/06/19 21:55:26 seb Exp $
 #
 
 DISTNAME=	cvs-1.11.5
@@ -46,10 +46,10 @@ pre-fetch:
 
 CONFIGURE_ENV+=	perl_path=${PERL5}
 
+USE_NEW_TEXINFO=	yes
 INFO_FILES=	cvs.info cvsclient.info
+USE_MAKEINFO=		yes
 TEXINFO_REQD?=		4.0
-TEXINFO_OVERRIDE=	YES
 
 .include "../../devel/zlib/buildlink2.mk"
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvs/PLIST b/devel/cvs/PLIST
index 2fe92e841ef..25ecf150096 100644
--- a/devel/cvs/PLIST
+++ b/devel/cvs/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2003/01/21 09:58:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/06/19 21:55:26 seb Exp $
 bin/cvs
 bin/cvsbug
 bin/rcs2log
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cvs.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cvsclient.info
 info/cvs.info
 info/cvs.info-1
 info/cvs.info-2
@@ -18,8 +16,6 @@ info/cvsclient.info
 info/cvsclient.info-1
 info/cvsclient.info-2
 info/cvsclient.info-3
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cvsclient.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cvs.info
 man/man1/cvs.1
 man/man5/cvs.5
 man/man8/cvsbug.8
diff --git a/devel/cvs/distinfo b/devel/cvs/distinfo
index 56f774068e1..f87db04eb81 100644
--- a/devel/cvs/distinfo
+++ b/devel/cvs/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.11 2003/03/07 05:41:13 grant Exp $
+$NetBSD: distinfo,v 1.12 2003/06/19 21:55:26 seb Exp $
 
 SHA1 (cvs-1.11.5.tar.gz) = d60316d12c0aa7c3140e62db614b9ac10ed42f2c
 Size (cvs-1.11.5.tar.gz) = 2741316 bytes
 SHA1 (cvs-1.11.4-v6-20030102.diff.gz) = e162597be51853fde2f849c2bc07ba580891ae1e
 Size (cvs-1.11.4-v6-20030102.diff.gz) = 12671 bytes
 SHA1 (patch-aa) = f4edc7f2c99937881042d8fd39aec3ef6a4ba70a
-SHA1 (patch-ab) = d803ed98eb512873d662efc161b357b78adf7dfa
+SHA1 (patch-ab) = 7aa219b430e49244373ccaa049403a94be4d4191
 SHA1 (patch-ac) = 432bc81bc7fb89644b2b7a9fff991a1dee32ee38
 SHA1 (patch-ae) = 509ba28b402049573cff6d9dba471332e39834fa
 SHA1 (patch-af) = 0463ada714be222594597906a84b177e803c5940
-SHA1 (patch-ag) = e301b54d193cef394ffbe482ceb1bbd0d5d73343
 SHA1 (patch-ah) = bb2e096452371e6006427a175271efa30b75110b
 SHA1 (patch-ai) = a269d62c85379f5b91dff3bf129d0608f0ceb94c
 SHA1 (patch-ak) = ddf7dfb70c23be3eeeda2bd7fff6b8dd7514c053
diff --git a/devel/cvs/patches/patch-ab b/devel/cvs/patches/patch-ab
index 6d2f2876dda..e9a5e392a42 100644
--- a/devel/cvs/patches/patch-ab
+++ b/devel/cvs/patches/patch-ab
@@ -1,18 +1,7 @@
-$NetBSD: patch-ab,v 1.6 2002/11/24 21:31:22 hubertf Exp $
+$NetBSD: patch-ab,v 1.7 2003/06/19 21:55:26 seb Exp $
 
 --- doc/cvs.texinfo.orig	Wed Apr 17 20:24:27 2002
 +++ doc/cvs.texinfo
-@@ -40,6 +40,10 @@
- @setfilename cvs.info
- @include version.texi
- @settitle CVS---Concurrent Versions System v@value{VERSION}
-+@dircategory Programming & development tools
-+@direntry
-+* CVS: (cvs)                   CVS Reference Manual.
-+@end direntry
- @setchapternewpage odd
- 
- @c -- TODO list:
 @@ -13478,6 +13482,11 @@
  
  @xref{verifymsg}, for more information on how verifymsg
diff --git a/devel/cvs/patches/patch-ag b/devel/cvs/patches/patch-ag
deleted file mode 100644
index 42354058b08..00000000000
--- a/devel/cvs/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2000/10/18 03:31:16 hubertf Exp $
-
---- doc/cvsclient.texi.orig	Wed Aug 30 03:16:32 2000
-+++ doc/cvsclient.texi
-@@ -8,6 +8,11 @@
- * cvsclient: (cvsclient).      The CVS client/server protocol.
- @end direntry
- 
-+@dircategory Programming & development tools
-+@direntry
-+* CVS-CLIENT: (cvsclient).	CVS client/server Reference Manual.
-+@end direntry
-+
- @node Top
- @top CVS Client/Server
-