Update to 1.11.19.

pkgsrc change:
patch-ag, provided by Georg Schwarz, added to fix the build on IRIX.

NEWS:
Changes since 1.11.18:
**********************

BUG FIXES

* An intermittant assertion failure in checkout has been fixed.

* Thanks to a report from Chris Bohn, all the source files
  needed for the Windows "red file" fix are actually included in the
  distribution.

* Misc bug and documentation fixes.

Changes from 1.11.17 to 1.11.18:
********************************

BUG FIXES

* Thanks to a report from Gottfried Ganssauge, CVS no
  longer exits when it encounters links pointing to paths containing more
  than 128 characters.

* Thanks to a report from Dan Peterson, error messages from
  GSSAPI servers are no longer truncated.

* Thanks to a report from Dan Peterson, attempts to resurrect
  a file on the trunk that was added on a branch no longer causes an assertion
  failure.

* Thanks to a report from Dan Peterson, imports to branches
  like "1.1." no longer create corrupt RCS archives.

* Thanks to a report from Chris Bohn, links from J.C. Hamlin,
  and code posted by Jonathan Gilligan, we think we have
  finally corrected the Windows "red-file" (daylight savings time) bug once and
  for all.

* Thanks to a patch from Jeroen Ruigrok/asmodai, the
  log_accum.pl script should no longer elicit warnings from Perl 5.8.5.

* The r* commands (rlog, rls, etc.) can once again handle requests to run
  against the entire repository (e.g. `cvs rlog .').  Thanks go to Dan Peterson
  for the report.

* A problem where the attempted access of files via tags beginning with spaces
  could cause the CVS server to hang has been fixed.  This was a particular
  problem with WinCVS clients because users would sometimes accidentally
  include spaces in tags pasted into a dialog box.  This fix also altered some
  of the error messages generated by the use of invalid tags.  Thanks go to Dan
  Peterson for the report.

* Thanks to James E Wilson for a bug fix to
  modules processing "gcc-core -a !gcc/f gcc" will no longer exclude
  gcc/fortran by mistake.

* Thanks to Conrad Pino, the Windows build works once again.

* Misc updates to the manual.

DEVELOPER ISSUES

* We've standardized on Automake 1.9.3 to get some at new features that make
  our jobs easier.  See the note below on the Autoconf upgrade for more
  details.

* We've standardized on Autoconf version 2.59 to get presumed bug fixes and
  features, but nothing specific.  Mostly, once we decide to upgrade one of the
  autotools we just figure it'll save time later to grab the most current
  versions of the others too.  See the HACKING file for more on using the
  autotools with CVS.

21 files changed, 141 insertions, 130 deletions

diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 4eccaf3d477..b190c3b3ac3 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.81 2005/02/17 17:43:33 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2005/03/01 15:36:48 wiz Exp $
 #
 
-DISTNAME=	cvs-1.11.17
-PKGREVISION=	2
+DISTNAME=	cvs-1.11.19
 CATEGORIES=	devel
 # (SSL) download URL according to http://www.cvshome.org/ is
-# https://ccvs.cvshome.org/files/documents/19/191/cvs-1.11.17.tar.bz2
-MASTER_SITES=	http://musthave.sunbase.org/progs/ccvs/${DISTNAME}/ \
+# https://ccvs.cvshome.org/files/documents/19/742/cvs-1.11.19.tar.bz2
+MASTER_SITES=	http://distro.ibiblio.org/pub/linux/distributions/sorcerer/sources/cvs/1.11.19/ \
 		${MASTER_SITE_BACKUP}
 EXTRACT_SUFX=	.tar.bz2
 
@@ -29,7 +28,7 @@ BUILD_DEFS+=		USE_INET6
     empty(MACHINE_PLATFORM:MLinux-*)
 CONFIGURE_ARGS+=	--enable-ipv6
 PATCH_SITES=		ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=		cvs-1.11.17-v6-20040610.diff.gz
+PATCHFILES=		cvs-1.11.19-v6-20050205.diff.gz
 PATCH_DIST_STRIP=	-p1
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
diff --git a/devel/cvs/distinfo b/devel/cvs/distinfo
index b4672980c63..6f660cbe3d5 100644
--- a/devel/cvs/distinfo
+++ b/devel/cvs/distinfo
@@ -1,30 +1,31 @@
-$NetBSD: distinfo,v 1.24 2005/02/23 22:24:11 agc Exp $
+$NetBSD: distinfo,v 1.25 2005/03/01 15:36:48 wiz Exp $
 
-SHA1 (cvs-1.11.17.tar.bz2) = d64282e744424ec7c5f92b66e78e5a6fded90ff9
-RMD160 (cvs-1.11.17.tar.bz2) = 7c3be2ec28dfe258ab65f0322cd46f710c69bf6c
-Size (cvs-1.11.17.tar.bz2) = 2343366 bytes
-SHA1 (cvs-1.11.17-v6-20040610.diff.gz) = 2e26d569ea2c5a9379b4d7544c09597fddc346e6
-RMD160 (cvs-1.11.17-v6-20040610.diff.gz) = 684ef0a06e135ad2d6b42c420192cc697dabb74b
-Size (cvs-1.11.17-v6-20040610.diff.gz) = 12807 bytes
-SHA1 (patch-aa) = 54f4e33a268bb9f65ed7b832a32de83abdc9f9e1
-SHA1 (patch-ab) = 741a7b58f5497045f5c79334cea3b4b236d6bc6a
-SHA1 (patch-ac) = c2142c0fab9603bf8d605fa53957d50bb0b40b3d
+SHA1 (cvs-1.11.19.tar.bz2) = 0d5e93a4380d02d4b6b41259b538c05d04d9d633
+RMD160 (cvs-1.11.19.tar.bz2) = 3a499e4dd32e4302e61e282ede48598bab0997fa
+Size (cvs-1.11.19.tar.bz2) = 2392762 bytes
+SHA1 (cvs-1.11.19-v6-20050205.diff.gz) = 5cd1519d99c8a6bc124fd5e4daaf5202cde87f07
+RMD160 (cvs-1.11.19-v6-20050205.diff.gz) = a6c304badf71464798311f121f3eb2df50501c2f
+Size (cvs-1.11.19-v6-20050205.diff.gz) = 13004 bytes
+SHA1 (patch-aa) = 57bcc59a51d44f436d2f79a0752e44e317589650
+SHA1 (patch-ab) = 4a539ac6e37e3dc48ab0c427487806e2f3ff78ae
+SHA1 (patch-ac) = 4da02fe019da9721afe6f9af0cd1db44214b575e
 SHA1 (patch-ad) = da297e6f5f1a8ad4cf0c47f7b57f6bbb860ea64c
-SHA1 (patch-ae) = d924435a3622da0fb7733e5abd56c42141ec99a2
-SHA1 (patch-af) = 91909b9b0fd0052c65ea01638087023ddf5fdf8c
-SHA1 (patch-ah) = 38a1757ef83789bb780a83bde95c2c6e8f65e1ca
-SHA1 (patch-ai) = 4427e59513bd0d3c8b479a270c8c4e0a41db9c88
-SHA1 (patch-ak) = 9d8b5633a589d0e423f0da8bf029f9141604738b
-SHA1 (patch-al) = dc5900560304190bc6534d9b5b031ef852ab84ef
-SHA1 (patch-am) = d11c3e8cb4ad713c04bbdfba2ff9a42d0bf17fe9
+SHA1 (patch-ae) = 2fcd5c228c0e18a2ea54f0bcee29e200193544c0
+SHA1 (patch-af) = af7e1f8dba74b40129d623b096ddf5a6c5dbefb4
+SHA1 (patch-ag) = e5c273fb784c5e340cbdf7ff182a6ae09c93dc4f
+SHA1 (patch-ah) = 47b9f55979ed65844efe22fb614b105ae247408d
+SHA1 (patch-ai) = ef52993cef430675f3efd09ae37cee522fd93369
+SHA1 (patch-ak) = dc51b6899005cbfdbad1876060c7ef53cce3156f
+SHA1 (patch-al) = 7f223fd872f96788af499743f07e49d45d64715f
+SHA1 (patch-am) = a2a83f3a3788a99f008372f5a8d7ee9a3a6dbf72
 SHA1 (patch-an) = 5fda0f44ff5ee165f18cedd43c6adf97a51e6398
-SHA1 (patch-ao) = ca6a926a7059c5056667038547abea6a66715368
-SHA1 (patch-ap) = cca991b0856a3a96718288742d0e1a765b9f435c
-SHA1 (patch-aq) = 0f77f8994de67c730afd20e54b4c8f2c4ae8ca6c
-SHA1 (patch-ar) = 3c8374635eb0710780772e06bf4d9402d1762efa
-SHA1 (patch-as) = 406f56419556d9953ddf0ca7bff5fd14a6e55689
-SHA1 (patch-at) = 179a6aa982fd2f599bc1a62a9e7c6e78a80bfd00
-SHA1 (patch-au) = 48657a4c8aa8fd3fcef9f28b9b2b2d5e5556af2f
+SHA1 (patch-ao) = e19a61b0ccb0e71491fb53d553f03d85135ef5c6
+SHA1 (patch-ap) = 9aa44fc82540f86aefa14c47f1d2632377a0471f
+SHA1 (patch-aq) = bc828ae6c5eff55e7952752cb50317e268dcdd7b
+SHA1 (patch-ar) = 4c47f223205de1b6afd3858e4161f99550e1d099
+SHA1 (patch-as) = 35e59c65a544cdd8bd8c6808fdf3410c590dd827
+SHA1 (patch-at) = 1cbed8c43bda54a851a7ff1b85e78a224cbeeca2
+SHA1 (patch-au) = ba788685ee842d07ac866183185e257ce2dcf749
 SHA1 (patch-av) = d381dbf50a59d78e0a4bf8fff09b2570988d5647
 SHA1 (patch-ay) = 7a0ee5bf1707afeaeb9092ce3faf7fc594044a2b
-SHA1 (patch-az) = 6cd82e3608e62beb8f2aa8e64f115008359abaa7
+SHA1 (patch-az) = e732ec022131d3ca23f7193625e4e2f305600fa9
diff --git a/devel/cvs/patches/patch-aa b/devel/cvs/patches/patch-aa
index e2a5adc42ca..68a2afda0c4 100644
--- a/devel/cvs/patches/patch-aa
+++ b/devel/cvs/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.10 2004/05/22 10:38:06 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2005/03/01 15:36:48 wiz Exp $
 
---- Makefile.in.orig	2004-05-19 16:05:42.000000000 +0200
+--- Makefile.in.orig	2005-02-01 00:11:19.000000000 +0100
 +++ Makefile.in
-@@ -142,7 +142,7 @@ target_alias = @target_alias@
+@@ -65,7 +65,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+  configure.lineno configure.status.lineno
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile
++CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -183,7 +183,7 @@ target_alias = @target_alias@
  
  # Unix source subdirs, where we'll want to run lint and etags:
  # This is a legacy variable from b4 Automake
@@ -11,12 +20,3 @@ $NetBSD: patch-aa,v 1.10 2004/05/22 10:38:06 wiz Exp $
  # All other subdirs:
  SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
  	windows-NT os2 emx vms
-@@ -172,7 +172,7 @@ subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile
-+CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile
- DIST_SOURCES =
- 
- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
diff --git a/devel/cvs/patches/patch-ab b/devel/cvs/patches/patch-ab
index 038418592e8..594246f8a11 100644
--- a/devel/cvs/patches/patch-ab
+++ b/devel/cvs/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.13 2004/09/09 22:26:17 wiz Exp $
+$NetBSD: patch-ab,v 1.14 2005/03/01 15:36:48 wiz Exp $
 
---- doc/cvs.texinfo.orig	2004-05-27 22:18:34.000000000 +0200
+--- doc/cvs.texinfo.orig	2005-01-31 23:25:55.000000000 +0100
 +++ doc/cvs.texinfo
-@@ -13496,6 +13496,11 @@ CPU intensive but is not recommended for
+@@ -13504,6 +13504,11 @@ CPU intensive but is not recommended for
  
  @xref{verifymsg}, for more information on how verifymsg
  may be used.
diff --git a/devel/cvs/patches/patch-ac b/devel/cvs/patches/patch-ac
index ee9d81eaac1..6fe66658d4c 100644
--- a/devel/cvs/patches/patch-ac
+++ b/devel/cvs/patches/patch-ac
@@ -1,17 +1,26 @@
-$NetBSD: patch-ac,v 1.9 2004/03/27 04:22:56 jlam Exp $
+$NetBSD: patch-ac,v 1.10 2005/03/01 15:36:48 wiz Exp $
 
---- src/Makefile.in.orig	Fri Feb 13 10:29:20 2004
+--- src/Makefile.in.orig	2005-02-01 00:11:15.000000000 +0100
 +++ src/Makefile.in
-@@ -146,7 +146,7 @@ target_alias = @target_alias@
+@@ -88,7 +88,7 @@ am_cvs_OBJECTS = add.$(OBJEXT) admin.$(O
+ 	version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \
+ 	wrapper.$(OBJEXT) zlib.$(OBJEXT)
+ cvs_OBJECTS = $(am_cvs_OBJECTS)
+-cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
++cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -201,7 +201,7 @@ target_alias = @target_alias@
  # some namespace hackery going on that maybe shouldn't be.  Long term fix is to
  # try and remove naming ocnflicts and fix Automake to allow particular includes
  # to be attached only to particular object files.  Short term fix is either or.
 -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
 +INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
- 
- bin_PROGRAMS = cvs
  bin_SCRIPTS = cvsbug
-@@ -228,7 +228,7 @@ cvs_SOURCES = \
+ 
+ # The cvs executable
+@@ -280,7 +280,7 @@ cvs_SOURCES = \
  cvs_LDADD = \
  	../diff/libdiff.a \
  	../lib/libcvs.a \
@@ -20,12 +29,3 @@ $NetBSD: patch-ac,v 1.9 2004/03/27 04:22:56 jlam Exp $
  
  
  # extra clean targets
-@@ -272,7 +272,7 @@ am_cvs_OBJECTS = add.$(OBJEXT) admin.$(O
- 	vers_ts.$(OBJEXT) watch.$(OBJEXT) wrapper.$(OBJEXT) \
- 	zlib.$(OBJEXT)
- cvs_OBJECTS = $(am_cvs_OBJECTS)
--cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
-+cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
- cvs_LDFLAGS =
- SCRIPTS = $(bin_SCRIPTS)
- 
diff --git a/devel/cvs/patches/patch-ae b/devel/cvs/patches/patch-ae
index 087957a4fba..eb89a620b9d 100644
--- a/devel/cvs/patches/patch-ae
+++ b/devel/cvs/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.8 2004/04/15 22:28:36 wiz Exp $
+$NetBSD: patch-ae,v 1.9 2005/03/01 15:36:48 wiz Exp $
 
---- src/rcs.c.orig	Fri Apr  2 21:16:34 2004
+--- src/rcs.c.orig	2005-01-31 23:15:08.000000000 +0100
 +++ src/rcs.c
-@@ -3483,7 +3483,7 @@ struct rcs_keyword
+@@ -3498,7 +3498,7 @@ struct rcs_keyword
      size_t len;
  };
  #define KEYWORD_INIT(s) (s), sizeof (s) - 1
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.8 2004/04/15 22:28:36 wiz Exp $
  {
      { KEYWORD_INIT ("Author") },
      { KEYWORD_INIT ("Date") },
-@@ -3496,6 +3496,7 @@ static const struct rcs_keyword keywords
+@@ -3511,6 +3511,7 @@ static const struct rcs_keyword keywords
      { KEYWORD_INIT ("Revision") },
      { KEYWORD_INIT ("Source") },
      { KEYWORD_INIT ("State") },
@@ -19,7 +19,7 @@ $NetBSD: patch-ae,v 1.8 2004/04/15 22:28:36 wiz Exp $
      { NULL, 0 }
  };
  enum keyword
-@@ -3510,7 +3511,8 @@ enum keyword
+@@ -3525,7 +3526,8 @@ enum keyword
      KEYWORD_RCSFILE,
      KEYWORD_REVISION,
      KEYWORD_SOURCE,
@@ -29,7 +29,7 @@ $NetBSD: patch-ae,v 1.8 2004/04/15 22:28:36 wiz Exp $
  };
  
  /* Convert an RCS date string into a readable string.  This is like
-@@ -3647,6 +3649,11 @@ expand_keywords (rcs, ver, name, log, lo
+@@ -3662,6 +3664,11 @@ expand_keywords (rcs, ver, name, log, lo
  	return;
      }
  
@@ -41,7 +41,7 @@ $NetBSD: patch-ae,v 1.8 2004/04/15 22:28:36 wiz Exp $
      /* If we are using -kkvl, dig out the locker information if any.  */
      locker = NULL;
      if (expand == KFLAG_KVL)
-@@ -3738,6 +3745,7 @@ expand_keywords (rcs, ver, name, log, lo
+@@ -3753,6 +3760,7 @@ expand_keywords (rcs, ver, name, log, lo
  
  	    case KEYWORD_HEADER:
  	    case KEYWORD_ID:
@@ -49,7 +49,7 @@ $NetBSD: patch-ae,v 1.8 2004/04/15 22:28:36 wiz Exp $
  		{
  		    const char *path;
  		    int free_path;
-@@ -4383,7 +4391,7 @@ RCS_checkout (rcs, workfile, rev, nameta
+@@ -4402,7 +4410,7 @@ RCS_checkout (rcs, workfile, rev, nameta
  	if (info != NULL)
  	{
  	    /* If the size of `devtype' changes, fix the sscanf call also */
diff --git a/devel/cvs/patches/patch-af b/devel/cvs/patches/patch-af
index ba2deb785a1..95bf739bf68 100644
--- a/devel/cvs/patches/patch-af
+++ b/devel/cvs/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.10 2004/05/22 10:38:06 wiz Exp $
+$NetBSD: patch-af,v 1.11 2005/03/01 15:36:48 wiz Exp $
 
---- src/update.c.orig	2004-05-04 19:25:54.000000000 +0200
+--- src/update.c.orig	2005-01-31 23:18:01.000000000 +0100
 +++ src/update.c
-@@ -1359,11 +1359,18 @@ VERS: ", 0);
+@@ -1366,11 +1366,18 @@ VERS: ", 0);
  		    xchmod (finfo->file, 1);
  		else
  		{
diff --git a/devel/cvs/patches/patch-ag b/devel/cvs/patches/patch-ag
new file mode 100644
index 00000000000..19c720a2f54
--- /dev/null
+++ b/devel/cvs/patches/patch-ag
@@ -0,0 +1,20 @@
+$NetBSD: patch-ag,v 1.5 2005/03/01 15:36:48 wiz Exp $
+
+--- lib/xtime.h.orig	2004-11-11 23:30:47.000000000 +0100
++++ lib/xtime.h
+@@ -12,6 +12,9 @@
+  * functions
+  */
+ 
++#ifndef _XTIME_H_                                                                                  
++#define _XTIME_H_                                                                                  
++
+ #ifdef vms
+ # include <time.h>
+ #else /* vms */
+@@ -55,3 +58,5 @@ extern long timezone;
+ # endif /* !defined(HAVE_FTIME) && !defined(HAVE_TIMEZONE) */
+ 
+ #endif /* !vms */
++
++#endif /* !_XTIME_H_ */
diff --git a/devel/cvs/patches/patch-ah b/devel/cvs/patches/patch-ah
index 99512c108a0..41d62760c9b 100644
--- a/devel/cvs/patches/patch-ah
+++ b/devel/cvs/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.6 2003/12/12 22:05:55 wiz Exp $
+$NetBSD: patch-ah,v 1.7 2005/03/01 15:36:48 wiz Exp $
 
---- src/mkmodules.c.orig	Wed Oct  8 21:56:13 2003
+--- src/mkmodules.c.orig	2005-01-31 23:14:17.000000000 +0100
 +++ src/mkmodules.c
-@@ -308,6 +308,9 @@ static const char *const config_contents
+@@ -313,6 +313,9 @@ static const char *const config_contents
      "# repositories.  Set it to `never' (the previous CVS behavior) to prevent\n",
      "# verifymsg scripts from changing the log message.\n",
      "#RereadLogAfterVerify=always\n",
diff --git a/devel/cvs/patches/patch-ai b/devel/cvs/patches/patch-ai
index 0115cc8e3b1..b66e36b8629 100644
--- a/devel/cvs/patches/patch-ai
+++ b/devel/cvs/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.7 2004/04/15 22:28:36 wiz Exp $
+$NetBSD: patch-ai,v 1.8 2005/03/01 15:36:48 wiz Exp $
 
---- src/parseinfo.c.orig	Fri Mar 19 21:36:39 2004
+--- src/parseinfo.c.orig	2005-01-31 23:14:54.000000000 +0100
 +++ src/parseinfo.c
-@@ -350,6 +350,14 @@ parse_config (cvsroot)
+@@ -355,6 +355,14 @@ parse_config (cvsroot)
  		goto error_return;
  	    }
  	}
diff --git a/devel/cvs/patches/patch-ak b/devel/cvs/patches/patch-ak
index b2cc0d21c69..eb61af5ce0f 100644
--- a/devel/cvs/patches/patch-ak
+++ b/devel/cvs/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.5 2003/07/12 09:19:19 wiz Exp $
+$NetBSD: patch-ak,v 1.6 2005/03/01 15:36:48 wiz Exp $
 
---- src/checkout.c.orig	Thu Feb 27 18:47:01 2003
+--- src/checkout.c.orig	2005-01-31 23:11:04.000000000 +0100
 +++ src/checkout.c
-@@ -191,7 +191,7 @@ checkout (argc, argv)
+@@ -196,7 +196,7 @@ checkout (argc, argv)
  	    case 'p':
  		pipeout = 1;
  		run_module_prog = 0;	/* don't run module prog when piping */
diff --git a/devel/cvs/patches/patch-al b/devel/cvs/patches/patch-al
index 3c156c29fe3..2acc5c7bd6a 100644
--- a/devel/cvs/patches/patch-al
+++ b/devel/cvs/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.9 2004/05/22 10:38:06 wiz Exp $
+$NetBSD: patch-al,v 1.10 2005/03/01 15:36:48 wiz Exp $
 
---- src/client.c.orig	2004-05-22 12:21:08.000000000 +0200
+--- src/client.c.orig	2004-11-18 16:45:30.000000000 +0100
 +++ src/client.c
-@@ -4511,6 +4511,16 @@ start_server ()
+@@ -4519,6 +4519,16 @@ start_server ()
  		error (1, 0,
  		       "This server does not support the global -n option.");
  	}
diff --git a/devel/cvs/patches/patch-am b/devel/cvs/patches/patch-am
index efcf12b7e0d..36f3703f769 100644
--- a/devel/cvs/patches/patch-am
+++ b/devel/cvs/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.12 2004/09/09 22:26:17 wiz Exp $
+$NetBSD: patch-am,v 1.13 2005/03/01 15:36:48 wiz Exp $
 
---- src/cvs.h.orig	2004-06-09 16:34:54.000000000 +0200
+--- src/cvs.h.orig	2005-01-31 23:19:01.000000000 +0100
 +++ src/cvs.h
-@@ -372,6 +372,7 @@ extern int really_quiet, quiet;
+@@ -380,6 +380,7 @@ extern int really_quiet, quiet;
  extern int use_editor;
  extern int cvswrite;
  extern mode_t cvsumask;
@@ -10,7 +10,7 @@ $NetBSD: patch-am,v 1.12 2004/09/09 22:26:17 wiz Exp $
  
  
  
-@@ -390,6 +391,7 @@ extern int safe_location PROTO ((char *)
+@@ -398,6 +399,7 @@ extern int safe_location PROTO ((char *)
  
  extern int trace;		/* Show all commands */
  extern int noexec;		/* Don't modify disk anywhere */
diff --git a/devel/cvs/patches/patch-ao b/devel/cvs/patches/patch-ao
index 55baadbf4fe..2b76c2a9d3f 100644
--- a/devel/cvs/patches/patch-ao
+++ b/devel/cvs/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.6 2004/04/15 22:28:36 wiz Exp $
+$NetBSD: patch-ao,v 1.7 2005/03/01 15:36:48 wiz Exp $
 
---- src/lock.c.orig	Thu Apr  1 23:25:57 2004
+--- src/lock.c.orig	2005-01-31 23:13:07.000000000 +0100
 +++ src/lock.c
-@@ -407,7 +407,7 @@ Reader_Lock (xrepository)
+@@ -412,7 +412,7 @@ Reader_Lock (xrepository)
  	(void) fprintf (stderr, "%s-> Reader_Lock(%s)\n", CLIENT_SERVER_STR,
                          xrepository);
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ao,v 1.6 2004/04/15 22:28:36 wiz Exp $
  	return 0;
  
      /* we only do one directory at a time for read locks! */
-@@ -481,7 +481,7 @@ Writer_Lock (list)
+@@ -486,7 +486,7 @@ Writer_Lock (list)
  {
      char *wait_repos;
  
diff --git a/devel/cvs/patches/patch-ap b/devel/cvs/patches/patch-ap
index 099f9462c74..15884b8653f 100644
--- a/devel/cvs/patches/patch-ap
+++ b/devel/cvs/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.6 2003/12/12 22:05:56 wiz Exp $
+$NetBSD: patch-ap,v 1.7 2005/03/01 15:36:48 wiz Exp $
 
---- src/main.c.orig	Wed Oct  8 17:49:43 2003
+--- src/main.c.orig	2005-02-03 15:50:51.000000000 +0100
 +++ src/main.c
-@@ -41,6 +41,7 @@ int really_quiet = 0;
+@@ -46,6 +46,7 @@ int really_quiet = 0;
  int quiet = 0;
  int trace = 0;
  int noexec = 0;
@@ -10,7 +10,7 @@ $NetBSD: patch-ap,v 1.6 2003/12/12 22:05:56 wiz Exp $
  int logoff = 0;
  
  /* Set if we should be writing CVSADM directories at top level.  At
-@@ -49,6 +50,7 @@ int logoff = 0;
+@@ -54,6 +55,7 @@ int logoff = 0;
  int top_level_admin = 0;
  
  mode_t cvsumask = UMASK_DFLT;
@@ -18,7 +18,7 @@ $NetBSD: patch-ap,v 1.6 2003/12/12 22:05:56 wiz Exp $
  
  char *CurDir;
  
-@@ -248,6 +250,7 @@ static const char *const opt_usage[] =
+@@ -244,6 +246,7 @@ static const char *const opt_usage[] =
      "    -r           Make checked-out files read-only.\n",
      "    -w           Make checked-out files read-write (default).\n",
      "    -n           Do not execute anything that will change the disk.\n",
@@ -26,7 +26,7 @@ $NetBSD: patch-ap,v 1.6 2003/12/12 22:05:56 wiz Exp $
      "    -t           Show trace of program execution -- try with -n.\n",
      "    -v           CVS version and copyright.\n",
      "    -T tmpdir    Use 'tmpdir' for temporary files.\n",
-@@ -406,7 +409,7 @@ main (argc, argv)
+@@ -402,7 +405,7 @@ main (argc, argv)
      int help = 0;		/* Has the user asked for help?  This
  				   lets us support the `cvs -H cmd'
  				   convention to give help for cmd. */
@@ -35,7 +35,7 @@ $NetBSD: patch-ap,v 1.6 2003/12/12 22:05:56 wiz Exp $
      static struct option long_options[] =
      {
          {"help", 0, NULL, 'H'},
-@@ -536,6 +539,11 @@ main (argc, argv)
+@@ -526,6 +529,11 @@ main (argc, argv)
  		break;
  	    case 'n':
  		noexec = 1;
diff --git a/devel/cvs/patches/patch-aq b/devel/cvs/patches/patch-aq
index 2240fc974fd..db1e238f8ba 100644
--- a/devel/cvs/patches/patch-aq
+++ b/devel/cvs/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.7 2004/09/09 22:26:09 wiz Exp $
+$NetBSD: patch-aq,v 1.8 2005/03/01 15:36:48 wiz Exp $
 
---- src/recurse.c.orig	2004-03-19 23:21:18.000000000 +0100
+--- src/recurse.c.orig	2005-01-31 23:15:21.000000000 +0100
 +++ src/recurse.c
-@@ -526,7 +526,7 @@ do_recursion (frame)
+@@ -554,7 +554,7 @@ do_recursion (frame)
      if (frame->flags == R_SKIP_ALL)
  	return (0);
  
@@ -11,12 +11,3 @@ $NetBSD: patch-aq,v 1.7 2004/09/09 22:26:09 wiz Exp $
  
      /* The fact that locks are not active here is what makes us fail to have
         the
-@@ -566,7 +566,7 @@ do_recursion (frame)
-      * generating data, to give the buffers a chance to drain to the
-      * remote client.  We should not have locks active at this point,
-      * but if there are writelocks around, we cannot pause here.  */
--    if (server_active && locktype != CVS_LOCK_NONE)
-+    if (server_active && locktype != CVS_LOCK_WRITE)
- 	server_pause_check();
- #endif
- 
diff --git a/devel/cvs/patches/patch-ar b/devel/cvs/patches/patch-ar
index fbc2ef0e663..0832a314501 100644
--- a/devel/cvs/patches/patch-ar
+++ b/devel/cvs/patches/patch-ar
@@ -1,6 +1,6 @@
-$NetBSD: patch-ar,v 1.14 2004/09/09 22:26:17 wiz Exp $
+$NetBSD: patch-ar,v 1.15 2005/03/01 15:36:48 wiz Exp $
 
---- src/server.c.orig	2004-09-10 00:21:52.000000000 +0200
+--- src/server.c.orig	2004-09-24 21:59:08.000000000 +0200
 +++ src/server.c
 @@ -773,6 +773,7 @@ E Protocol error: Root says \"%s\" but p
         nothing.  But for rsh, we need to do it now.  */
@@ -31,7 +31,7 @@ $NetBSD: patch-ar,v 1.14 2004/09/09 22:26:17 wiz Exp $
  	case 'q':
  	    quiet = 1;
  	    break;
-@@ -5292,6 +5298,7 @@ switch_to_user (cvs_username, username)
+@@ -5293,6 +5299,7 @@ switch_to_user (cvs_username, username)
      const char *username;
  {
      struct passwd *pw;
@@ -39,7 +39,7 @@ $NetBSD: patch-ar,v 1.14 2004/09/09 22:26:17 wiz Exp $
  
      pw = getpwnam (username);
      if (pw == NULL)
-@@ -5370,7 +5377,15 @@ error 0 %s: no such system user\n", user
+@@ -5371,7 +5378,15 @@ error 0 %s: no such system user\n", user
  	}
      }
  
diff --git a/devel/cvs/patches/patch-as b/devel/cvs/patches/patch-as
index d2e09a96014..8fb83ec9bdd 100644
--- a/devel/cvs/patches/patch-as
+++ b/devel/cvs/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.6 2004/04/15 22:28:36 wiz Exp $
+$NetBSD: patch-as,v 1.7 2005/03/01 15:36:48 wiz Exp $
 
---- src/tag.c.orig	Tue Apr  6 20:37:10 2004
+--- src/tag.c.orig	2005-01-31 23:17:45.000000000 +0100
 +++ src/tag.c
-@@ -1290,7 +1290,7 @@ Numeric tag %s contains characters other
+@@ -1300,7 +1300,7 @@ Numeric tag %s contains characters other
  	/* The tags is valid but not mentioned in val-tags.  Add it.  */
  	datum value;
  
diff --git a/devel/cvs/patches/patch-at b/devel/cvs/patches/patch-at
index 75ce7101a58..bf97c3c60a2 100644
--- a/devel/cvs/patches/patch-at
+++ b/devel/cvs/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.11 2004/05/22 10:38:06 wiz Exp $
+$NetBSD: patch-at,v 1.12 2005/03/01 15:36:48 wiz Exp $
 
---- src/logmsg.c.orig	2004-03-19 21:35:29.000000000 +0100
+--- src/logmsg.c.orig	2005-01-31 23:13:45.000000000 +0100
 +++ src/logmsg.c
-@@ -226,6 +226,8 @@ do_editor (dir, messagep, repository, ch
+@@ -231,6 +231,8 @@ do_editor (dir, messagep, repository, ch
  	    (*messagep)[strlen (*messagep) - 1] != '\n')
  	    (void) fprintf (fp, "\n");
      }
@@ -11,7 +11,7 @@ $NetBSD: patch-at,v 1.11 2004/05/22 10:38:06 wiz Exp $
  
      if (repository != NULL)
  	/* tack templates on if necessary */
-@@ -302,7 +304,7 @@ do_editor (dir, messagep, repository, ch
+@@ -307,7 +309,7 @@ do_editor (dir, messagep, repository, ch
      run_setup (editinfo_editor ? editinfo_editor : Editor);
      run_arg (fname);
      if ((retcode = run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
@@ -20,7 +20,7 @@ $NetBSD: patch-at,v 1.11 2004/05/22 10:38:06 wiz Exp $
  	error (editinfo_editor ? 1 : 0, retcode == -1 ? errno : 0,
  	       editinfo_editor ? "Logfile verification failed" :
  	       "warning: editor session failed");
-@@ -685,6 +687,15 @@ title_proc (p, closure)
+@@ -690,6 +692,15 @@ title_proc (p, closure)
  				  strlen (str_list) + strlen (p->key) + 5);
  		    (void) strcat (str_list, p->key);
  		    break;
diff --git a/devel/cvs/patches/patch-au b/devel/cvs/patches/patch-au
index 52512dff0d6..7c157389309 100644
--- a/devel/cvs/patches/patch-au
+++ b/devel/cvs/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.9 2004/09/09 22:26:17 wiz Exp $
+$NetBSD: patch-au,v 1.10 2005/03/01 15:36:48 wiz Exp $
 
---- src/commit.c.orig	2004-06-09 16:34:54.000000000 +0200
+--- src/commit.c.orig	2005-01-31 23:11:19.000000000 +0100
 +++ src/commit.c
-@@ -1035,7 +1035,9 @@ warning: file `%s' seems to still contai
+@@ -1040,7 +1040,9 @@ warning: file `%s' seems to still contai
  		  xmalloc (sizeof (struct logfile_info)));
  	    li->type = status;
  	    li->tag = xstrdup (vers->tag);
@@ -13,7 +13,7 @@ $NetBSD: patch-au,v 1.9 2004/09/09 22:26:17 wiz Exp $
  	    li->rev_new = NULL;
  	    p->data = li;
  	    (void) addnode (ulist, p);
-@@ -1187,7 +1189,7 @@ precommit_proc (repository, filter)
+@@ -1192,7 +1194,7 @@ precommit_proc (repository, filter)
      run_setup (filter);
      run_arg (repository);
      (void) walklist (saved_ulist, precommit_list_proc, NULL);
diff --git a/devel/cvs/patches/patch-az b/devel/cvs/patches/patch-az
index c854320c73a..0e111143e46 100644
--- a/devel/cvs/patches/patch-az
+++ b/devel/cvs/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.7 2004/04/15 22:28:36 wiz Exp $
+$NetBSD: patch-az,v 1.8 2005/03/01 15:36:48 wiz Exp $
 
---- src/modules.c.orig	Sun Apr 11 16:46:52 2004
+--- src/modules.c.orig	2005-01-31 23:14:32.000000000 +0100
 +++ src/modules.c
-@@ -741,7 +741,8 @@ module `%s' is a request for a file in a
+@@ -746,7 +746,8 @@ module `%s' is a request for a file in a
  		    cvs_output ("'\n", 0);
  		    cvs_flushout ();
  		}