Package for development version of CVS.

24 files changed, 550 insertions, 0 deletions

diff --git a/devel/cvs-current/Makefile b/devel/cvs-current/Makefile
new file mode 100644
index 00000000000..19d02b1ab70
--- /dev/null
+++ b/devel/cvs-current/Makefile
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+#
+
+DISTNAME=       cvs-1.10.6
+CATEGORIES=	devel
+MASTER_SITES=   ftp://download.cyclic.com/pub/${DISTNAME}/
+
+MAINTAINER=	cjs@netbsd.org
+HOMEPAGE=	http://www.cyclic.com/cvs/info.html
+
+GNU_CONFIGURE=	yes
+USE_GTEXINFO=	yes
+
+#.if exists(/usr/lib/libkrb.a)
+#CONFIGURE_ARGS+=	--with-krb4=/usr --enable-encryption
+#.endif
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(RCS_LOCALID)
+CFLAGS+=	-DLOCALID=\"\\\"${RCS_LOCALID}\\\"\"
+.endif
+
+CONFIGURE_ENV+=	perl_path=${LOCALBASE}/bin/perl
+
+INFO_FILES=	cvs.info cvsclient.info
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvs-current/files/md5 b/devel/cvs-current/files/md5
new file mode 100644
index 00000000000..7ebaf22ac8d
--- /dev/null
+++ b/devel/cvs-current/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+MD5 (cvs-1.10.6.tar.gz) = f4cb3843910573906b39fe0bdc085feb
diff --git a/devel/cvs-current/files/patch-sum b/devel/cvs-current/files/patch-sum
new file mode 100644
index 00000000000..16543cded94
--- /dev/null
+++ b/devel/cvs-current/files/patch-sum
@@ -0,0 +1,19 @@
+$NetBSD: patch-sum,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+MD5 (patch-aa) = 5849cf99985eeb67db5f9f69e69e8fd5
+MD5 (patch-ab) = 152906e7f3605dabf55aeedd9af72cce
+MD5 (patch-ac) = 4cef2709c703f5eddadbeea4bf941391
+MD5 (patch-ad) = 872077097162e9ccc5bcba45981ea548
+MD5 (patch-ae) = 74b1abdcc1972981cd39bba16a78cc14
+MD5 (patch-af) = 1ee137f81f348d6d8287bc1cc2212c80
+MD5 (patch-ak) = 69517b9d8bd99ad50703caf011dd255a
+MD5 (patch-al) = 87018fccd6c509c604cf842bd4c8f85c
+MD5 (patch-am) = 0be44417892999e4a24c5702c4fab1be
+MD5 (patch-an) = 34b5a26b689faab274229e6bee887d80
+MD5 (patch-ao) = 6c9bf927b697b2241d71946e37c7e9db
+MD5 (patch-ap) = f0f6cb26ee707757e98b7011296a1e0a
+MD5 (patch-aq) = 4376c574048a1dcb9a43dcd0e84dcec5
+MD5 (patch-ar) = c24e0c575c1a14c39a77747743dc4c58
+MD5 (patch-as) = a1ee9d85ca2a060240d8d75f1d41f1a2
+MD5 (patch-at) = 0891e77ee194454422e366555abc157d
+MD5 (patch-au) = c29d29e86268d86449cb445a8ad909c5
diff --git a/devel/cvs-current/patches/patch-aa b/devel/cvs-current/patches/patch-aa
new file mode 100644
index 00000000000..644dbe3931f
--- /dev/null
+++ b/devel/cvs-current/patches/patch-aa
@@ -0,0 +1,35 @@
+$NetBSD: patch-aa,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- Makefile.in.orig	Thu Jan 15 15:45:45 1998
++++ Makefile.in	Thu Mar 19 22:44:33 1998
+@@ -94,7 +94,7 @@
+ 
+ ### Subdirectories to run make in for the primary targets.
+ # Unix source subdirs, where we'll want to run lint and etags:
+-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 macintosh vms
+@@ -187,21 +187,18 @@
+ .PHONY: check
+ check:
+ 	cd lib ; $(MAKE) $(FLAGS_TO_PASS)
+-	cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
+ 	cd diff ; $(MAKE) $(FLAGS_TO_PASS)
+ 	cd src ; $(MAKE) $(FLAGS_TO_PASS) check
+ 
+ .PHONY: remotecheck
+ remotecheck:
+ 	cd lib ; $(MAKE) $(FLAGS_TO_PASS)
+-	cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
+ 	cd diff ; $(MAKE) $(FLAGS_TO_PASS)
+ 	cd src ; $(MAKE) $(FLAGS_TO_PASS) remotecheck
+ 
+ .PHONY: installcheck
+ installcheck:
+ 	cd lib ; $(MAKE) $(FLAGS_TO_PASS)
+-	cd zlib ; $(MAKE) $(FLAGS_TO_PASS)
+ 	cd diff ; $(MAKE) $(FLAGS_TO_PASS)
+ 	cd src ; $(MAKE) $(FLAGS_TO_PASS) installcheck
+ 
diff --git a/devel/cvs-current/patches/patch-ab b/devel/cvs-current/patches/patch-ab
new file mode 100644
index 00000000000..361160f1816
--- /dev/null
+++ b/devel/cvs-current/patches/patch-ab
@@ -0,0 +1,29 @@
+$NetBSD: patch-ab,v 1.1.1.1 1999/07/26 23:38:49 cjs 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 @@
+ @setfilename cvsclient.info
+ @include CVSvn.texi
+ 
++@dircategory Programming & development tools
++@direntry
++* CVS-CLIENT: (cvsclient).	CVS client/server Reference Manual.
++@end direntry
++
+ @node Top
+ @top CVS Client/Server
+ 
diff --git a/devel/cvs-current/patches/patch-ac b/devel/cvs-current/patches/patch-ac
new file mode 100644
index 00000000000..c5b958e14fd
--- /dev/null
+++ b/devel/cvs-current/patches/patch-ac
@@ -0,0 +1,39 @@
+$NetBSD: patch-ac,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- src/Makefile.in.orig	Thu Jun 18 13:21:42 1998
++++ src/Makefile.in	Wed Aug 12 13:32:09 1998
+@@ -86,10 +86,8 @@
+ 	@cd ..; $(MAKE) lint SUBDIRS=src
+ 
+ install: installdirs
+-	@for prog in $(PROGS); do \
+-	  echo Installing $$prog in $(bindir); \
+-	  $(INSTALL) $$prog $(bindir)/$$prog ; \
+-	done
++	$(INSTALL_PROGRAM) cvs $(bindir)/
++	$(BSD_INSTALL_SCRIPT) cvsbug $(bindir)/
+ 
+ installdirs:
+ 	$(SHELL) $(top_srcdir)/mkinstalldirs $(bindir)
+@@ -144,10 +142,10 @@
+ 
+ # Linking rules.
+ 
+-$(PROGS): ../lib/libcvs.a ../zlib/libz.a ../diff/libdiff.a
++$(PROGS): ../lib/libcvs.a ../diff/libdiff.a
+ 
+ cvs: $(OBJECTS)
+-	$(CC) $(OBJECTS) ../lib/libcvs.a ../zlib/libz.a ../diff/libdiff.a $(LIBS) $(LDFLAGS) -o $@ 
++	$(CC) $(OBJECTS) ../lib/libcvs.a -lz ../diff/libdiff.a $(LIBS) $(LDFLAGS) -o $@ 
+ 
+ xlint: $(SOURCES)
+ 	files= ; \
+@@ -181,7 +179,7 @@
+ 	$(CC) $(CPPFLAGS) $(INCLUDES) -I$(top_srcdir)/diff $(DEFS) $(CFLAGS) -c $(srcdir)/rcscmds.c
+ 
+ zlib.o: zlib.c $(top_srcdir)/zlib/zlib.h
+-	$(CC) $(CPPFLAGS) $(INCLUDES) -I$(top_srcdir)/zlib $(DEFS) $(CFLAGS) -c $(srcdir)/zlib.c
++	$(CC) $(CPPFLAGS) $(INCLUDES) $(DEFS) $(CFLAGS) -c $(srcdir)/zlib.c
+ 
+ subdir = src
+ Makefile: ../config.status Makefile.in
diff --git a/devel/cvs-current/patches/patch-ad b/devel/cvs-current/patches/patch-ad
new file mode 100644
index 00000000000..aa6fa4e33e3
--- /dev/null
+++ b/devel/cvs-current/patches/patch-ad
@@ -0,0 +1,35 @@
+$NetBSD: patch-ad,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- contrib/Makefile.in.orig	Sat Feb 21 22:02:32 1998
++++ contrib/Makefile.in	Fri Aug 21 14:53:04 1998
+@@ -37,7 +37,7 @@
+ # Use cp if you don't have install.
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT}
+ 
+ DISTFILES = \
+ 	ChangeLog README .cvsignore intro.doc \
+@@ -81,10 +81,10 @@
+ 
+ install: all installdirs
+ 	for f in $(CONTRIB_FILES) ; do\
+-		$(INSTALL_DATA) $(srcdir)/$$f $(libdir)/cvs/contrib/$$f; \
++		$(INSTALL_DATA) $(srcdir)/$$f $(prefix)/share/cvs/contrib/$$f; \
+ 	done
+ 	for f in $(CONTRIB_PROGS) ; do\
+-		$(INSTALL_PROGRAM) $$f $(libdir)/cvs/contrib/$$f; \
++		$(INSTALL_PROGRAM) $$f $(prefix)/share/cvs/contrib/$$f; \
+ 	done
+ 	for f in $(PROGS) ; do\
+ 		$(INSTALL_PROGRAM) $$f $(bindir)/$$f; \
+@@ -92,7 +92,7 @@
+ .PHONY: install
+ 
+ installdirs:
+-	$(top_srcdir)/mkinstalldirs $(libdir)/cvs/contrib
++	$(top_srcdir)/mkinstalldirs $(prefix)/share/cvs/contrib
+ .PHONY: installdirs
+ 
+ tags:
diff --git a/devel/cvs-current/patches/patch-ae b/devel/cvs-current/patches/patch-ae
new file mode 100644
index 00000000000..c60eb2670b1
--- /dev/null
+++ b/devel/cvs-current/patches/patch-ae
@@ -0,0 +1,32 @@
+$NetBSD: patch-ae,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- src/rcs.c.orig	Wed Aug 12 13:14:05 1998
++++ src/rcs.c	Wed Aug 12 13:17:05 1998
+@@ -3559,6 +3559,9 @@
+     { KEYWORD_INIT ("Revision") },
+     { KEYWORD_INIT ("Source") },
+     { KEYWORD_INIT ("State") },
++#ifdef LOCALID
++    { KEYWORD_INIT (LOCALID) },
++#endif
+     { NULL, 0 }
+ };
+ enum keyword
+@@ -3573,7 +3576,8 @@
+     KEYWORD_RCSFILE,
+     KEYWORD_REVISION,
+     KEYWORD_SOURCE,
+-    KEYWORD_STATE
++    KEYWORD_STATE,
++    KEYWORD_LOCALID
+ };
+ 
+ /* Convert an RCS date string into a readable string.  This is like
+@@ -3801,6 +3805,7 @@
+ 
+ 	    case KEYWORD_HEADER:
+ 	    case KEYWORD_ID:
++	    case KEYWORD_LOCALID:
+ 		{
+ 		    char *path;
+ 		    int free_path;
diff --git a/devel/cvs-current/patches/patch-af b/devel/cvs-current/patches/patch-af
new file mode 100644
index 00000000000..a3d8a11ca1b
--- /dev/null
+++ b/devel/cvs-current/patches/patch-af
@@ -0,0 +1,24 @@
+$NetBSD: patch-af,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- src/update.c.orig	Thu Jun 25 16:56:50 1998
++++ src/update.c	Mon Jan 18 20:17:08 1999
+@@ -1304,11 +1304,18 @@
+ 		    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-current/patches/patch-ak b/devel/cvs-current/patches/patch-ak
new file mode 100644
index 00000000000..82b77934d52
--- /dev/null
+++ b/devel/cvs-current/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- src/checkout.c.orig	Sun Jul 26 22:54:04 1998
++++ src/checkout.c	Tue Apr 20 10:15:03 1999
+@@ -180,7 +180,7 @@
+ 	    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-current/patches/patch-al b/devel/cvs-current/patches/patch-al
new file mode 100644
index 00000000000..f7e23079b46
--- /dev/null
+++ b/devel/cvs-current/patches/patch-al
@@ -0,0 +1,21 @@
+$NetBSD: patch-al,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- src/client.c.orig	Sun Jul 26 22:54:06 1998
++++ src/client.c	Tue Apr 20 10:45:19 1999
+@@ -4172,6 +4172,16 @@
+ 		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-current/patches/patch-am b/devel/cvs-current/patches/patch-am
new file mode 100644
index 00000000000..60ee09368e1
--- /dev/null
+++ b/devel/cvs-current/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- src/cvs.h.orig	Sun Jul 26 22:54:11 1998
++++ src/cvs.h	Tue Apr 20 10:15:03 1999
+@@ -383,6 +383,7 @@
+ 
+ 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;
diff --git a/devel/cvs-current/patches/patch-an b/devel/cvs-current/patches/patch-an
new file mode 100644
index 00000000000..6d5384ccfca
--- /dev/null
+++ b/devel/cvs-current/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- src/history.c~	Sun Jul 25 15:33:24 1999
++++ src/history.c	Sun Jul 25 15:40:52 1999
+@@ -721,7 +721,7 @@
+     if (trace)
+ 	fprintf (stderr, "%s-> fopen(%s,a)\n",
+ 		 CLIENT_SERVER_STR, fname);
+-    if (noexec)
++    if (nolock)
+ 	goto out;
+     fd = CVS_OPEN (fname, O_WRONLY | O_APPEND | O_CREAT | OPEN_BINARY, 0666);
+     if (fd < 0)
diff --git a/devel/cvs-current/patches/patch-ao b/devel/cvs-current/patches/patch-ao
new file mode 100644
index 00000000000..12983154396
--- /dev/null
+++ b/devel/cvs-current/patches/patch-ao
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- src/lock.c.orig	Wed Mar  4 00:41:50 1998
++++ src/lock.c	Tue Apr 20 10:15:04 1999
+@@ -243,7 +243,7 @@
+     FILE *fp;
+     char *tmp;
+ 
+-    if (noexec)
++    if (nolock)
+ 	return (0);
+ 
+     /* we only do one directory at a time for read locks! */
+@@ -316,7 +316,7 @@
+ {
+     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-current/patches/patch-ap b/devel/cvs-current/patches/patch-ap
new file mode 100644
index 00000000000..c05c6cf1713
--- /dev/null
+++ b/devel/cvs-current/patches/patch-ap
@@ -0,0 +1,47 @@
+$NetBSD: patch-ap,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- src/main.c.orig	Wed Apr 28 13:51:25 1999
++++ src/main.c	Sun Jul 25 15:50:33 1999
+@@ -41,6 +41,7 @@
+ 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
+@@ -229,6 +230,7 @@
+     "    -w           Make checked-out files read-write (default).\n",
+     "    -l           Turn history logging off.\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",
+@@ -509,7 +511,7 @@
+     opterr = 1;
+ 
+     while ((c = getopt_long
+-            (argc, argv, "+Qqrwtnlvb:T:e:d:Hfz:s:xa", long_options, &option_index))
++            (argc, argv, "+Qqrwtnulvb:T:e:d:Hfz:s:xa", long_options, &option_index))
+            != EOF)
+     {
+ 	switch (c)
+@@ -547,6 +549,8 @@
+ 		break;
+ 	    case 'n':
+ 		noexec = 1;
++	    case 'u':			/* Fall through */
++		nolock = 1;
+ 	    case 'l':			/* Fall through */
+ 		logoff = 1;
+ 		break;
+@@ -926,7 +930,7 @@
+ 		 * BUT, only if the history file exists.
+ 		 */
+ 
+-		if (!client_active)
++		if (!client_active && !nolock)
+ 		{
+ 		    char *path;
+ 		    int save_errno;
diff --git a/devel/cvs-current/patches/patch-aq b/devel/cvs-current/patches/patch-aq
new file mode 100644
index 00000000000..901954b1afb
--- /dev/null
+++ b/devel/cvs-current/patches/patch-aq
@@ -0,0 +1,22 @@
+$NetBSD: patch-aq,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- src/recurse.c.orig	Sun Jul 26 22:54:14 1998
++++ src/recurse.c	Tue Apr 20 10:15:04 1999
+@@ -364,7 +364,7 @@
+     if (frame->flags == R_SKIP_ALL)
+ 	return (0);
+ 
+-    should_readlock = noexec ? 0 : frame->readlock;
++    should_readlock = nolock ? 0 : frame->readlock;
+ 
+     /* The fact that locks are not active here is what makes us fail to have
+        the
+@@ -406,7 +406,7 @@
+      */
+     if (server_active
+ 	/* If there are writelocks around, we cannot pause here.  */
+-	&& (should_readlock || noexec))
++	&& (should_readlock || nolock))
+ 	server_pause_check();
+ #endif
+ 
diff --git a/devel/cvs-current/patches/patch-ar b/devel/cvs-current/patches/patch-ar
new file mode 100644
index 00000000000..4ef38aa37a7
--- /dev/null
+++ b/devel/cvs-current/patches/patch-ar
@@ -0,0 +1,30 @@
+$NetBSD: patch-ar,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- src/server.c.orig	Tue May 11 16:21:52 1999
++++ src/server.c	Sun Jul 25 16:11:40 1999
+@@ -794,6 +794,8 @@
+        nothing.  But for rsh, we need to do it now.  */
+     parse_config (CVSroot_directory);
+ 
++    if (!nolock)
++    {
+     path = malloc (strlen (CVSroot_directory)
+ 		   + sizeof (CVSROOTADM)
+ 		   + sizeof (CVSROOTADM_HISTORY)
+@@ -824,6 +826,7 @@
+ 	pending_error = save_errno;
+     }
+     free (path);
++    }
+ 
+ #ifdef HAVE_PUTENV
+     env = malloc (strlen (CVSROOT_ENV) + strlen (CVSroot_directory) + 1 + 1);
+@@ -2091,6 +2094,8 @@
+     {
+ 	case 'n':
+ 	    noexec = 1;
++	case 'u':
++	    nolock = 1;
+ 	    break;
+ 	case 'q':
+ 	    quiet = 1;
diff --git a/devel/cvs-current/patches/patch-as b/devel/cvs-current/patches/patch-as
new file mode 100644
index 00000000000..283c16d8bbd
--- /dev/null
+++ b/devel/cvs-current/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- src/tag.c.orig	Tue Jul 14 21:59:02 1998
++++ src/tag.c	Tue Apr 20 10:15:05 1999
+@@ -851,7 +851,7 @@
+ 	/* The tags is valid but not mentioned in val-tags.  Add it.  */
+ 	datum value;
+ 
+-	if (noexec)
++	if (nolock)
+ 	{
+ 	    if (db != NULL)
+ 		dbm_close (db);
diff --git a/devel/cvs-current/patches/patch-at b/devel/cvs-current/patches/patch-at
new file mode 100644
index 00000000000..d390b16f349
--- /dev/null
+++ b/devel/cvs-current/patches/patch-at
@@ -0,0 +1,20 @@
+$NetBSD: patch-at,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- src/logmsg.c.orig	Sat Jan 10 12:46:19 1998
++++ src/logmsg.c	Sun May 23 09:32:11 1999
+@@ -587,6 +587,15 @@
+ 				  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-current/patches/patch-au b/devel/cvs-current/patches/patch-au
new file mode 100644
index 00000000000..89619d3768f
--- /dev/null
+++ b/devel/cvs-current/patches/patch-au
@@ -0,0 +1,15 @@
+$NetBSD: patch-au,v 1.1.1.1 1999/07/26 23:38:49 cjs Exp $
+
+--- src/commit.c.orig	Thu Aug  6 20:04:11 1998
++++ src/commit.c	Tue May 25 10:25:05 1999
+@@ -984,7 +984,9 @@
+ 		  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 = (char *) li;
+ 	    (void) addnode (ulist, p);
diff --git a/devel/cvs-current/pkg/COMMENT b/devel/cvs-current/pkg/COMMENT
new file mode 100644
index 00000000000..970355fd91a
--- /dev/null
+++ b/devel/cvs-current/pkg/COMMENT
@@ -0,0 +1 @@
+Concurrent Versions System; beta version.
diff --git a/devel/cvs-current/pkg/DESCR b/devel/cvs-current/pkg/DESCR
new file mode 100644
index 00000000000..d130c82dc7d
--- /dev/null
+++ b/devel/cvs-current/pkg/DESCR
@@ -0,0 +1,8 @@
+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.
+
+This is the latest development version. It may not be as bug-free
+as the most recent release of CVS.
diff --git a/devel/cvs-current/pkg/MESSAGE b/devel/cvs-current/pkg/MESSAGE
new file mode 100644
index 00000000000..524bb828a57
--- /dev/null
+++ b/devel/cvs-current/pkg/MESSAGE
@@ -0,0 +1,26 @@
+=============================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 1999/07/26 23:38:49 cjs 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-current/pkg/PLIST b/devel/cvs-current/pkg/PLIST
new file mode 100644
index 00000000000..522b8cb7546
--- /dev/null
+++ b/devel/cvs-current/pkg/PLIST
@@ -0,0 +1,43 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 1999/07/26 23:38:49 cjs 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
+info/cvs.info-3
+info/cvs.info-4
+info/cvs.info-5
+info/cvs.info-6
+info/cvs.info-7
+info/cvs.info-8
+info/cvs.info-9
+info/cvsclient.info
+info/cvsclient.info-1
+info/cvsclient.info-2
+info/cvsclient.info-3
+@exec	install-info --info-dir=%D/info		%D/info/cvs.info
+@exec	install-info --info-dir=%D/info		%D/info/cvsclient.info
+share/cvs/contrib/README
+share/cvs/contrib/clmerge
+share/cvs/contrib/cln_hist
+share/cvs/contrib/commit_prep
+share/cvs/contrib/cvs_acls
+share/cvs/contrib/cvs2vendor
+share/cvs/contrib/cvscheck
+share/cvs/contrib/cvscheck.man
+share/cvs/contrib/intro.doc
+share/cvs/contrib/log
+share/cvs/contrib/log_accum
+share/cvs/contrib/mfpipe
+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
+man/man1/cvs.1
+man/man5/cvs.5
+man/man8/cvsbug.8