Move cvs to scmcvs so it can be checked out on a case-insensitive

filesystem without interference from devel/CVS metadata. PKGNAME
stays the same. Discussed with agc.

29 files changed, 0 insertions, 719 deletions

diff --git a/devel/cvs/DESCR b/devel/cvs/DESCR
deleted file mode 100644
index 31f933361aa..00000000000
--- a/devel/cvs/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-CVS is a version control system, which allows you to keep old versions
-of files (usually source code), keep a log of who, when, and why
-changes occurred, etc., like RCS or SCCS.  It handles multiple
-developers, multiple directories, triggers to enable/log/control
-various operations, and can work over a wide area network.
diff --git a/devel/cvs/MESSAGE b/devel/cvs/MESSAGE
deleted file mode 100644
index 2197fe81184..00000000000
--- a/devel/cvs/MESSAGE
+++ /dev/null
@@ -1,27 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/07/09 17:03:27 grant Exp $
-
-Set up the master source repository.  See the "Setting up the repository"
-section of cvs.info for details; the one-line summary is (if you are
-putting the repository in /src/master):
-
-	$ cvs -d /src/master init
-
-Have all users of the CVS system set the CVSROOT environment
-variable appropriately to reflect the placement of your source
-repository.  If the above example is used, the following commands
-can be placed in user's ~/.profile, ~/.bash_profile file; or in the
-system-wide /etc/profile:
-
-	CVSROOT=/src/master; export CVSROOT
-
-for sh/bash/ksh users, or place the following commands in the user's
-~/.login, or system-wide in the /etc/csh.login file:
-
-	setenv CVSROOT /src/master
-
-for csh/tcsh users.  If these environment variables are not already set
-in your current shell, set them now (or source the login script you
-just edited).
-
-===========================================================================
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
deleted file mode 100644
index a4ba2261706..00000000000
--- a/devel/cvs/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.95 2007/02/20 18:47:48 wiz Exp $
-#
-
-DISTNAME=	cvs-1.11.21
-CATEGORIES=	devel scm
-MASTER_SITES=	http://ftp.gnu.org/non-gnu/cvs/source/stable/1.11.21/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://cvs.nongnu.org/
-COMMENT=	Concurrent Versions System
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-GNU_CONFIGURE=	yes
-
-.include "options.mk"
-
-CONFIGURE_ENV+=	PERL=${TOOLS_PERL5:Q}
-
-INFO_FILES=	# PLIST
-USE_TOOLS+=	makeinfo
-TEXINFO_REQD?=	4.0
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvs/PLIST b/devel/cvs/PLIST
deleted file mode 100644
index cc278b19d5c..00000000000
--- a/devel/cvs/PLIST
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2006/03/30 03:44:42 jlam Exp $
-bin/cvs
-bin/cvsbug
-bin/rcs2log
-info/cvs.info
-info/cvsclient.info
-man/man1/cvs.1
-man/man5/cvs.5
-man/man8/cvsbug.8
-share/cvs/contrib/README
-share/cvs/contrib/check_cvs
-share/cvs/contrib/clmerge
-share/cvs/contrib/cln_hist
-share/cvs/contrib/commit_prep
-share/cvs/contrib/cvs2vendor
-share/cvs/contrib/cvs_acls
-share/cvs/contrib/cvscheck
-share/cvs/contrib/debug_check_log
-share/cvs/contrib/intro.doc
-share/cvs/contrib/log
-share/cvs/contrib/log_accum
-share/cvs/contrib/mfpipe
-share/cvs/contrib/pvcs2rcs
-share/cvs/contrib/rcs-to-cvs
-share/cvs/contrib/rcs2log
-share/cvs/contrib/rcslock
-share/cvs/contrib/sccs2rcs
-@dirrm share/cvs/contrib
-@dirrm share/cvs
diff --git a/devel/cvs/distinfo b/devel/cvs/distinfo
deleted file mode 100644
index d63a8ea073b..00000000000
--- a/devel/cvs/distinfo
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: distinfo,v 1.28 2006/01/29 02:40:40 wiz Exp $
-
-SHA1 (cvs-1.11.21.tar.bz2) = d114ed2943a4027f1277b04f57867a2e09a1f432
-RMD160 (cvs-1.11.21.tar.bz2) = bc3f15b506174de6d304e9608a26e80d3e2f0513
-Size (cvs-1.11.21.tar.bz2) = 2929933 bytes
-SHA1 (patch-aa) = 57bcc59a51d44f436d2f79a0752e44e317589650
-SHA1 (patch-ab) = 6196c150bdb56419b59896d783070a8512755919
-SHA1 (patch-ac) = 24022b7dc3a276e91a45a28a36654c5c6611ba46
-SHA1 (patch-ad) = da297e6f5f1a8ad4cf0c47f7b57f6bbb860ea64c
-SHA1 (patch-ae) = a471c39b4700db2c86b10e480585ad979a2dc9b1
-SHA1 (patch-af) = fe22f70e0d281822fb74e8b3c43715ca7f987e79
-SHA1 (patch-ag) = 5dd358a7dbf5db402d3e56faf49e8748afdd05f2
-SHA1 (patch-ah) = 47b9f55979ed65844efe22fb614b105ae247408d
-SHA1 (patch-ai) = d51b3f1429e73156cbfb7e0480a34ac6ce7a208d
-SHA1 (patch-ak) = 8be3a5014e9dce3ae5381bcdaaa4530349e6f58c
-SHA1 (patch-al) = 3f20d43ed1423ae6e811d9ec2d35af4932e84b41
-SHA1 (patch-am) = 76285476206efe60bdcaf3623ec3cec1cb13cb68
-SHA1 (patch-an) = 3a72df42abde4749d1a15e54481845ba8337f863
-SHA1 (patch-ao) = 035bdc8d83d88577e62602f2fb669f1d0c94f49b
-SHA1 (patch-ap) = c2b5da1fc02df7348b514d3b704984b53de213f5
-SHA1 (patch-aq) = a1fe8e522d05a8fdf3ac6dcb03892b6e6b9d8040
-SHA1 (patch-ar) = 32477a1cbd479225806bbefd04e84c496fbc4691
-SHA1 (patch-at) = 9df99f83f83da870e1d9c86854d04bb5816dc9ff
-SHA1 (patch-au) = 8f8bbda565f0edd2eecb56030ed0301c6044b488
-SHA1 (patch-av) = 84da8f0a398ddf36412becb2aebd7008e3f80c44
-SHA1 (patch-ay) = 6ba3315df137028fc5b2bebfef79aa3d540994c4
-SHA1 (patch-az) = 4b773728b228af6c69d4e10cf59f1677feaa54ea
-SHA1 (patch-ba) = 25f9a2f7e35db0d2bfefae5ebf7be43d21a8a9ee
diff --git a/devel/cvs/options.mk b/devel/cvs/options.mk
deleted file mode 100644
index 01b07974878..00000000000
--- a/devel/cvs/options.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2006/01/29 02:40:40 wiz Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.cvs
-PKG_SUPPORTED_OPTIONS=	kerberos
-
-.include "../../mk/bsd.prefs.mk"
-
-.if empty(MACHINE_PLATFORM:MSunOS-5.[89]-*) && \
-    empty(MACHINE_PLATFORM:MSunOS-5.10-*) && \
-    empty(MACHINE_PLATFORM:MLinux-*) && \
-    defined(NOT_YET_AVAILABLE_FOR_CVS_1_11_21)
-PKG_SUPPORTED_OPTIONS+=	inet6
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-PATCH_SITES=		ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=		cvs-1.11.19-v6-20050205.diff.gz
-PATCH_DIST_STRIP=	-p1
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-.if !empty(PKG_OPTIONS:Mkerberos)
-.  include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-encryption
-CONFIGURE_ARGS+=	--with-gssapi=${KRB5BASE:Q}
-CONFIGURE_ARGS+=	--with-krb4=${KRB5BASE:Q}
-.  if ${OPSYS} == "Darwin"
-LDFLAGS+=		-framework Kerberos
-.  endif
-.else
-CONFIGURE_ARGS+=	--without-gssapi
-.endif
diff --git a/devel/cvs/patches/patch-aa b/devel/cvs/patches/patch-aa
deleted file mode 100644
index 68a2afda0c4..00000000000
--- a/devel/cvs/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2005/03/01 15:36:48 wiz Exp $
-
---- Makefile.in.orig	2005-02-01 00:11:19.000000000 +0100
-+++ Makefile.in
-@@ -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
--USOURCE_SUBDIRS = lib zlib diff src
-+USOURCE_SUBDIRS = lib diff src
- # All other subdirs:
- SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
- 	windows-NT os2 emx vms
diff --git a/devel/cvs/patches/patch-ab b/devel/cvs/patches/patch-ab
deleted file mode 100644
index 393e5386ae5..00000000000
--- a/devel/cvs/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.16 2006/01/29 02:40:40 wiz Exp $
-
---- doc/cvs.texinfo.orig	2005-09-26 04:49:45.000000000 +0200
-+++ doc/cvs.texinfo
-@@ -13578,6 +13578,11 @@ CPU intensive but is not recommended for
- 
- @xref{verifymsg}, for more information on how verifymsg
- may be used.
-+
-+@cindex tag, in CVSROOT/config
-+@item tag=@var{value}
-+Enable an additional keyword that gets expanded on checkout;
-+any string is legal.
- @end table
- 
- @c ---------------------------------------------------------------------
diff --git a/devel/cvs/patches/patch-ac b/devel/cvs/patches/patch-ac
deleted file mode 100644
index e76e1f95471..00000000000
--- a/devel/cvs/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.11 2006/01/29 02:40:40 wiz Exp $
-
---- src/Makefile.in.orig	2005-09-28 05:32:23.000000000 +0200
-+++ src/Makefile.in
-@@ -86,7 +86,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)
-@@ -199,7 +199,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_SCRIPTS = cvsbug
- 
- # The cvs executable
-@@ -278,7 +278,7 @@ cvs_SOURCES = \
- cvs_LDADD = \
- 	../diff/libdiff.a \
- 	../lib/libcvs.a \
--	../zlib/libz.a
-+	-lz
- 
- 
- # extra clean targets
diff --git a/devel/cvs/patches/patch-ad b/devel/cvs/patches/patch-ad
deleted file mode 100644
index 3d71fb61bbd..00000000000
--- a/devel/cvs/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2004/09/09 22:25:16 wiz Exp $
-
---- lib/sighandle.c.orig	2004-02-03 15:37:50.000000000 +0100
-+++ lib/sighandle.c
-@@ -155,8 +155,10 @@ int			sig;
- 	this = SIG_handlers[sig];
- 	while (this != (struct SIG_hlist *) NULL)
- 	{
--		(*this->handler)(sig);
-+		/* handler may free this (and thus clobber this->next) */
-+		struct SIG_hlist *current = this;
- 		this = this->next;
-+		(*current->handler)(sig);
- 	}
- 
- 	return;
diff --git a/devel/cvs/patches/patch-ae b/devel/cvs/patches/patch-ae
deleted file mode 100644
index a1bea68bd2f..00000000000
--- a/devel/cvs/patches/patch-ae
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-ae,v 1.11 2006/01/29 02:40:40 wiz Exp $
-
---- src/rcs.c.orig	2005-09-26 16:31:36.000000000 +0200
-+++ src/rcs.c
-@@ -3534,7 +3534,7 @@ struct rcs_keyword
-     size_t len;
- };
- #define KEYWORD_INIT(s) (s), sizeof (s) - 1
--static const struct rcs_keyword keywords[] =
-+static struct rcs_keyword keywords[] =
- {
-     { KEYWORD_INIT ("Author") },
-     { KEYWORD_INIT ("Date") },
-@@ -3547,6 +3547,7 @@ static const struct rcs_keyword keywords
-     { KEYWORD_INIT ("Revision") },
-     { KEYWORD_INIT ("Source") },
-     { KEYWORD_INIT ("State") },
-+    { NULL, 0 },
-     { NULL, 0 }
- };
- enum keyword
-@@ -3561,7 +3562,8 @@ enum keyword
-     KEYWORD_RCSFILE,
-     KEYWORD_REVISION,
-     KEYWORD_SOURCE,
--    KEYWORD_STATE
-+    KEYWORD_STATE,
-+    KEYWORD_LOCALID
- };
- 
- /* Convert an RCS date string into a readable string.  This is like
-@@ -3698,6 +3700,11 @@ expand_keywords (rcs, ver, name, log, lo
- 	return;
-     }
- 
-+    if (RCS_citag != NULL) {
-+	keywords[KEYWORD_LOCALID].string = RCS_citag;
-+	keywords[KEYWORD_LOCALID].len = strlen(RCS_citag);
-+    }
-+
-     /* If we are using -kkvl, dig out the locker information if any.  */
-     locker = NULL;
-     if (expand == KFLAG_KVL)
-@@ -3789,6 +3796,7 @@ expand_keywords (rcs, ver, name, log, lo
- 
- 	    case KEYWORD_HEADER:
- 	    case KEYWORD_ID:
-+	    case KEYWORD_LOCALID:
- 		{
- 		    const char *path;
- 		    int free_path;
-@@ -4462,7 +4470,7 @@ RCS_checkout (rcs, workfile, rev, nameta
- 	if (info != NULL)
- 	{
- 	    /* If the size of `devtype' changes, fix the sscanf call also */
--	    char devtype[16];
-+	    char devtype[16+1];
- 
- 	    if (sscanf (info->data, "%15s %lu",
- 			devtype, &devnum_long) < 2)
diff --git a/devel/cvs/patches/patch-af b/devel/cvs/patches/patch-af
deleted file mode 100644
index 17ec21afc07..00000000000
--- a/devel/cvs/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.13 2006/01/29 02:40:40 wiz Exp $
-
---- src/update.c.orig	2005-09-24 19:58:16.000000000 +0200
-+++ src/update.c
-@@ -1341,11 +1341,18 @@ VERS: ", 0);
- 		    xchmod (finfo->file, 1);
- 		else
- 		{
-+		    mode_t oumask, writeaccess;
-+
- 		    /* We know that we are the server here, so
-                        although xchmod checks umask, we don't bother.  */
--		    mode |= (((mode & S_IRUSR) ? S_IWUSR : 0)
-+		    /* Not bothering with the umask makes the files
-+		       mode 0777 on old clients, though. -chb */
-+		    oumask = umask(0);
-+		    (void) umask(oumask);
-+		    writeaccess = (((mode & S_IRUSR) ? S_IWUSR : 0)
- 			     | ((mode & S_IRGRP) ? S_IWGRP : 0)
- 			     | ((mode & S_IROTH) ? S_IWOTH : 0));
-+		    mode |= (~oumask) & writeaccess;
- 		}
- 	    }
- 
diff --git a/devel/cvs/patches/patch-ag b/devel/cvs/patches/patch-ag
deleted file mode 100644
index c533ac7d164..00000000000
--- a/devel/cvs/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.6 2005/04/19 12:39:18 wiz Exp $
-
---- lib/xtime.h.orig	2005-03-04 20:05:09.000000000 +0100
-+++ lib/xtime.h
-@@ -14,6 +14,9 @@
- #ifndef XTIME_HEADER_INCLUDED
- #define XTIME_HEADER_INCLUDED
- 
-+#ifndef _XTIME_H_                                                                                  
-+#define _XTIME_H_                                                                                  
-+
- #ifdef vms
- # include <time.h>
- #else /* vms */
-@@ -58,4 +61,6 @@ extern long timezone;
- 
- #endif /* !vms */
- 
-+#endif /* !_XTIME_H_ */
-+
- #endif /* !XTIME_HEADER_INCLUDED */
diff --git a/devel/cvs/patches/patch-ah b/devel/cvs/patches/patch-ah
deleted file mode 100644
index 41d62760c9b..00000000000
--- a/devel/cvs/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.7 2005/03/01 15:36:48 wiz Exp $
-
---- src/mkmodules.c.orig	2005-01-31 23:14:17.000000000 +0100
-+++ src/mkmodules.c
-@@ -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",
-+    "\n",
-+    "# Set this to the name of a local tag to use in addition to Id\n",
-+    "#tag=OurTag\n",
-     NULL
- };
- 
diff --git a/devel/cvs/patches/patch-ai b/devel/cvs/patches/patch-ai
deleted file mode 100644
index 8be8a9c9821..00000000000
--- a/devel/cvs/patches/patch-ai
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ai,v 1.9 2005/04/19 12:39:18 wiz Exp $
-
---- src/parseinfo.c.orig	2005-03-16 23:01:21.000000000 +0100
-+++ src/parseinfo.c
-@@ -357,6 +357,14 @@ parse_config (cvsroot)
- 		goto error_return;
- 	    }
- 	}
-+	else if (strcmp (line, "tag") == 0) {
-+	    RCS_citag = strdup(p);
-+	    if (RCS_citag == NULL) {
-+		error (0, 0, "%s: no memory for local tag '%s'",
-+		       infopath, p);
-+		goto error_return;
-+	    }
-+	}
- 	else if (strcmp (line, "PreservePermissions") == 0)
- 	{
- 	    if (strcmp (p, "no") == 0)
diff --git a/devel/cvs/patches/patch-ak b/devel/cvs/patches/patch-ak
deleted file mode 100644
index 96e363a1aaa..00000000000
--- a/devel/cvs/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.7 2006/01/29 02:40:40 wiz Exp $
-
---- src/checkout.c.orig	2005-09-24 19:56:35.000000000 +0200
-+++ src/checkout.c
-@@ -194,7 +194,7 @@ checkout (argc, argv)
- 	    case 'p':
- 		pipeout = 1;
- 		run_module_prog = 0;	/* don't run module prog when piping */
--		noexec = 1;		/* so no locks will be created */
-+		noexec = nolock = 1;	/* so no locks will be created */
- 		break;
- 	    case 'c':
- 		cat = 1;
diff --git a/devel/cvs/patches/patch-al b/devel/cvs/patches/patch-al
deleted file mode 100644
index 8b65acb444a..00000000000
--- a/devel/cvs/patches/patch-al
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-al,v 1.11 2005/04/19 12:39:18 wiz Exp $
-
---- src/client.c.orig	2005-03-17 16:47:22.000000000 +0100
-+++ src/client.c
-@@ -4528,6 +4528,16 @@ start_server ()
- 		error (1, 0,
- 		       "This server does not support the global -n option.");
- 	}
-+	if (nolock && !noexec)
-+	{
-+	    if (have_global)
-+	    {
-+		send_to_server ("Global_option -u\012", 0);
-+	    }
-+	    else
-+		error (1, 0,
-+		       "This server does not support the global -u option.");
-+	}
- 	if (quiet)
- 	{
- 	    if (have_global)
diff --git a/devel/cvs/patches/patch-am b/devel/cvs/patches/patch-am
deleted file mode 100644
index 6d1daff8caa..00000000000
--- a/devel/cvs/patches/patch-am
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-am,v 1.14 2006/01/29 02:40:40 wiz Exp $
-
---- src/cvs.h.orig	2005-09-22 16:07:05.000000000 +0200
-+++ src/cvs.h
-@@ -382,6 +382,7 @@ extern int really_quiet, quiet;
- extern int use_editor;
- extern int cvswrite;
- extern mode_t cvsumask;
-+extern char *RCS_citag;
- 
- 
- 
-@@ -400,6 +401,7 @@ extern int safe_location PROTO ((char *)
- 
- extern int trace;		/* Show all commands */
- extern int noexec;		/* Don't modify disk anywhere */
-+extern int nolock;		/* Don't create locks */
- extern int logoff;		/* Don't write history entry */
- 
- extern int top_level_admin;
-@@ -694,6 +696,7 @@ void sleep_past PROTO ((time_t desttime)
- #define	RUN_STDOUT_APPEND     0x0004    /* append to stdout, don't truncate */
- #define	RUN_STDERR_APPEND     0x0008    /* append to stderr, don't truncate */
- #define	RUN_SIGIGNORE         0x0010    /* ignore interrupts for command */
-+#define	RUN_UNSETXID          0x0020	/* undo setxid in child */
- #define	RUN_TTY               (char *)0 /* for the benefit of lint */
- 
- void run_add_arg_p PROTO ((int *, size_t *, char ***, const char *s));
diff --git a/devel/cvs/patches/patch-an b/devel/cvs/patches/patch-an
deleted file mode 100644
index 4571cdf5a8e..00000000000
--- a/devel/cvs/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.8 2006/01/29 02:40:40 wiz Exp $
-
---- src/history.c.orig	2005-08-02 22:46:57.000000000 +0200
-+++ src/history.c
-@@ -760,7 +760,7 @@ history_write (type, update_dir, revs, n
-     if (trace)
- 	fprintf (stderr, "%s-> fopen(%s,a)\n",
- 		 CLIENT_SERVER_STR, fname);
--    if (noexec)
-+    if (nolock)
- 	goto out;
- 
-     if (!history_lock (current_parsed_root->directory))
diff --git a/devel/cvs/patches/patch-ao b/devel/cvs/patches/patch-ao
deleted file mode 100644
index 5022127dd56..00000000000
--- a/devel/cvs/patches/patch-ao
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ao,v 1.8 2006/01/29 02:40:40 wiz Exp $
-
---- src/lock.c.orig	2005-05-03 17:34:53.000000000 +0200
-+++ src/lock.c
-@@ -420,7 +420,7 @@ Reader_Lock (xrepository)
- 	(void) fprintf (stderr, "%s-> Reader_Lock(%s)\n", CLIENT_SERVER_STR,
-                         xrepository);
- 
--    if (noexec)
-+    if (nolock)
- 	return 0;
- 
-     /* we only do one directory at a time for read locks! */
-@@ -494,7 +494,7 @@ Writer_Lock (list)
- {
-     char *wait_repos;
- 
--    if (noexec)
-+    if (nolock)
- 	return 0;
- 
-     /* We only know how to do one list at a time */
diff --git a/devel/cvs/patches/patch-ap b/devel/cvs/patches/patch-ap
deleted file mode 100644
index 72b44112cc5..00000000000
--- a/devel/cvs/patches/patch-ap
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ap,v 1.8 2006/01/29 02:40:40 wiz Exp $
-
---- src/main.c.orig	2005-09-05 20:04:38.000000000 +0200
-+++ src/main.c
-@@ -46,6 +46,7 @@ int really_quiet = 0;
- int quiet = 0;
- int trace = 0;
- int noexec = 0;
-+int nolock = 0;
- int logoff = 0;
- 
- /* Set if we should be writing CVSADM directories at top level.  At
-@@ -54,6 +55,7 @@ int logoff = 0;
- int top_level_admin = 0;
- 
- mode_t cvsumask = UMASK_DFLT;
-+char *RCS_citag = NULL;
- 
- char *CurDir;
- 
-@@ -243,6 +245,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",
-+    "    -u           Don't create locks (implies -l).\n",
-     "    -t           Show trace of program execution -- try with -n.\n",
-     "    -v           CVS version and copyright.\n",
-     "    -T tmpdir    Use 'tmpdir' for temporary files.\n",
-@@ -401,7 +404,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. */
--    static const char short_options[] = "+Qqrwtnvb:T:e:d:Hfz:s:xa";
-+    static const char short_options[] = "+Qqrwtunvb:T:e:d:Hfz:s:xa";
-     static struct option long_options[] =
-     {
-         {"help", 0, NULL, 'H'},
-@@ -525,6 +528,11 @@ main (argc, argv)
- 		break;
- 	    case 'n':
- 		noexec = 1;
-+		nolock = 1;
-+		logoff = 1;
-+		break;
-+	    case 'u':
-+		nolock = 1;
- 		logoff = 1;
- 		break;
- 	    case 'v':
diff --git a/devel/cvs/patches/patch-aq b/devel/cvs/patches/patch-aq
deleted file mode 100644
index b1c9c5005ea..00000000000
--- a/devel/cvs/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.9 2006/01/29 02:40:40 wiz Exp $
-
---- src/recurse.c.orig	2005-09-04 02:26:43.000000000 +0200
-+++ src/recurse.c
-@@ -551,7 +551,7 @@ do_recursion (frame)
-     if (frame->flags == R_SKIP_ALL)
- 	return (0);
- 
--    locktype = noexec ? CVS_LOCK_NONE : frame->locktype;
-+    locktype = nolock ? CVS_LOCK_NONE : frame->locktype;
- 
-     /* The fact that locks are not active here is what makes us fail to have
-        the
diff --git a/devel/cvs/patches/patch-ar b/devel/cvs/patches/patch-ar
deleted file mode 100644
index 9c0efcae354..00000000000
--- a/devel/cvs/patches/patch-ar
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ar,v 1.17 2006/01/29 02:40:40 wiz Exp $
-
---- src/server.c.orig	2005-09-22 17:57:34.000000000 +0200
-+++ src/server.c
-@@ -782,6 +782,7 @@ E Protocol error: Root says \"%s\" but p
-        nothing.  But for rsh, we need to do it now.  */
-     parse_config (current_parsed_root->directory);
- 
-+    if (!nolock) {
-     path = xmalloc (strlen (current_parsed_root->directory)
- 		   + sizeof (CVSROOTADM)
- 		   + 2);
-@@ -799,6 +800,7 @@ E Protocol error: Root says \"%s\" but p
- 	pending_error = save_errno;
-     }
-     free (path);
-+    }
- 
- #ifdef HAVE_PUTENV
-     env = xmalloc (strlen (CVSROOT_ENV) + strlen (current_parsed_root->directory) + 2);
-@@ -2283,8 +2285,12 @@ serve_global_option (arg)
- 	    break;
- 	case 'n':
- 	    noexec = 1;
-+	    nolock = 1;
- 	    logoff = 1;
- 	    break;
-+	case 'u':
-+	    nolock = 1;
-+	    break;
- 	case 'q':
- 	    quiet = 1;
- 	    break;
-@@ -5306,6 +5312,7 @@ switch_to_user (cvs_username, username)
-     const char *username;
- {
-     struct passwd *pw;
-+    int rc;
- 
-     pw = getpwnam (username);
-     if (pw == NULL)
-@@ -5384,7 +5391,15 @@ error 0 %s: no such system user\n", user
- 	}
-     }
- 
--    if (setuid (pw->pw_uid) < 0)
-+#ifdef SETXID_SUPPORT
-+    /* Honor the setuid bit iff set. */
-+    if (getuid() != geteuid())
-+        rc = setuid (geteuid ());
-+    else 
-+#else
-+        rc = setuid (pw->pw_uid);
-+#endif 
-+    if (rc < 0)
-     {
- 	/* Note that this means that if run as a non-root user,
- 	   CVSROOT/passwd must contain the user we are running as
diff --git a/devel/cvs/patches/patch-at b/devel/cvs/patches/patch-at
deleted file mode 100644
index 46fbcaf09be..00000000000
--- a/devel/cvs/patches/patch-at
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-at,v 1.13 2006/01/29 02:40:40 wiz Exp $
-
---- src/logmsg.c.orig	2005-09-04 02:26:42.000000000 +0200
-+++ src/logmsg.c
-@@ -227,6 +227,8 @@ do_editor (dir, messagep, repository, ch
- 	    (*messagep)[strlen (*messagep) - 1] != '\n')
- 	    (void) fprintf (fp, "\n");
-     }
-+    else
-+	(void) fprintf (fp, "\n");
- 
-     if (repository != NULL)
- 	/* tack templates on if necessary */
-@@ -298,7 +300,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,
--			     RUN_NORMAL | RUN_SIGIGNORE)) != 0)
-+			     RUN_NORMAL | RUN_SIGIGNORE | RUN_UNSETXID)) != 0)
- 	error (editinfo_editor ? 1 : 0, retcode == -1 ? errno : 0,
- 	       editinfo_editor ? "Logfile verification failed" :
- 	       "warning: editor session failed");
-@@ -679,6 +681,15 @@ title_proc (p, closure)
- 				  strlen (str_list) + strlen (p->key) + 5);
- 		    (void) strcat (str_list, p->key);
- 		    break;
-+		case 't':
-+		    str_list =
-+			xrealloc (str_list,
-+				  (strlen (str_list)
-+				   + (li->tag ? strlen (li->tag) : 0)
-+				   + 10)
-+				  );
-+		    (void) strcat (str_list, (li->tag ? li->tag : ""));
-+		    break;
- 		case 'V':
- 		    str_list =
- 			xrealloc (str_list,
diff --git a/devel/cvs/patches/patch-au b/devel/cvs/patches/patch-au
deleted file mode 100644
index 30187786c09..00000000000
--- a/devel/cvs/patches/patch-au
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-au,v 1.11 2006/01/29 02:40:40 wiz Exp $
-
---- src/commit.c.orig	2005-09-22 09:56:20.000000000 +0200
-+++ src/commit.c
-@@ -1024,7 +1024,9 @@ warning: file `%s' seems to still contai
- 		  xmalloc (sizeof (struct logfile_info)));
- 	    li->type = status;
- 	    li->tag = xstrdup (vers->tag);
--	    li->rev_old = xstrdup (vers->vn_rcs);
-+	    /* If the file was re-added, we want the revision in the commitlog
-+	       to be NONE, not the previous dead revision. */
-+	    li->rev_old = status == T_ADDED ? NULL : xstrdup (vers->vn_rcs);
- 	    li->rev_new = NULL;
- 	    p->data = li;
- 	    (void) addnode (ulist, p);
-@@ -1176,7 +1178,7 @@ precommit_proc (repository, filter)
-     run_setup (filter);
-     run_arg (repository);
-     (void) walklist (saved_ulist, precommit_list_proc, NULL);
--    return run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL|RUN_REALLY);
-+    return run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL|RUN_REALLY|RUN_UNSETXID);
- }
- 
- 
diff --git a/devel/cvs/patches/patch-av b/devel/cvs/patches/patch-av
deleted file mode 100644
index ff31ec358c5..00000000000
--- a/devel/cvs/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.11 2006/01/29 02:40:40 wiz Exp $
-
---- configure.in.orig	2005-09-28 05:29:46.000000000 +0200
-+++ configure.in
-@@ -377,7 +377,7 @@ if test -n "$krb_h"; then
-            [LDFLAGS=$hold_ldflags
-             # Using open here instead of printf so we don't
-             # get confused by the cached value for printf from above.
--            AC_CHECK_LIB(krb,open,[krb_lib=yes krb_libdir=])])
-+            AC_CHECK_LIB(krb,open,[krb_lib=yes krb_libdir=])],[-ldes -lcom_err -lroken -lcrypt])
-        LDFLAGS=$hold_ldflags
-   else
-        AC_CHECK_LIB(krb,printf,[krb_lib=yes krb_libdir=])
diff --git a/devel/cvs/patches/patch-ay b/devel/cvs/patches/patch-ay
deleted file mode 100644
index 35aee93a063..00000000000
--- a/devel/cvs/patches/patch-ay
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ay,v 1.6 2006/01/29 02:40:40 wiz Exp $
-
---- src/run.c.orig	2005-06-07 00:23:30.000000000 +0200
-+++ src/run.c
-@@ -208,6 +208,13 @@ run_exec (stin, stout, sterr, flags)
- #endif
-     if (pid == 0)
-     {
-+#ifdef SETXID_SUPPORT
-+	if (flags & RUN_UNSETXID) {
-+	    (void) setgid (getgid ());
-+	    (void) setuid (getuid ());
-+	}
-+#endif
-+
- 	if (shin != 0)
- 	{
- 	    (void) dup2 (shin, 0);
diff --git a/devel/cvs/patches/patch-az b/devel/cvs/patches/patch-az
deleted file mode 100644
index 1bfdc771c82..00000000000
--- a/devel/cvs/patches/patch-az
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-az,v 1.9 2005/04/19 12:39:18 wiz Exp $
-
---- src/modules.c.orig	2005-03-16 23:01:21.000000000 +0100
-+++ src/modules.c
-@@ -747,7 +747,8 @@ module `%s' is a request for a file in a
- 		    cvs_output ("'\n", 0);
- 		    cvs_flushout ();
- 		}
--		err += run_exec (RUN_TTY, RUN_TTY, RUN_TTY, RUN_NORMAL);
-+		err += run_exec (RUN_TTY, RUN_TTY, RUN_TTY,
-+				 RUN_NORMAL | RUN_UNSETXID);
- 		free (expanded_path);
- 	    }
- 	    if (real_prog) free (real_prog);
diff --git a/devel/cvs/patches/patch-ba b/devel/cvs/patches/patch-ba
deleted file mode 100644
index 7efa4836c7b..00000000000
--- a/devel/cvs/patches/patch-ba
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2005/08/26 21:36:29 adrianp Exp $
-
---- src/cvsbug.in.orig	2005-08-26 22:30:56.000000000 +0100
-+++ src/cvsbug.in
-@@ -109,14 +109,14 @@ elif [ -f /bin/domainname ]; then
-     /usr/bin/ypcat passwd 2>/dev/null | cat - /etc/passwd | grep "^$LOGNAME:" |
-       cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
-     ORIGINATOR="`cat $TEMP`"
--    rm -f $TEMP
-+    > $TEMP
-   fi
- fi
- 
- if [ "$ORIGINATOR" = "" ]; then
-   grep "^$LOGNAME:" /etc/passwd | cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
-   ORIGINATOR="`cat $TEMP`"
--  rm -f $TEMP
-+  > $TEMP
- fi
- 
- if [ -n "$ORGANIZATION" ]; then