9 files changed, 113 insertions, 100 deletions

diff --git a/gnu/usr.bin/cvs/Makefile b/gnu/usr.bin/cvs/Makefile
index a15127d6652b..ae97b5f5edb3 100644
--- a/gnu/usr.bin/cvs/Makefile
+++ b/gnu/usr.bin/cvs/Makefile
@@ -1,5 +1,5 @@
-#	$Id: Makefile,v 1.7 1995/12/10 22:58:29 peter Exp $
+#	$Id: Makefile,v 1.8 1996/08/20 23:52:29 peter Exp $
 
-SUBDIR = lib cvs contrib cvsbug doc tools
+SUBDIR = lib libdiff cvs contrib cvsbug doc tools
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/cvs/Makefile.inc b/gnu/usr.bin/cvs/Makefile.inc
index daeb2743917a..e1889d679ced 100644
--- a/gnu/usr.bin/cvs/Makefile.inc
+++ b/gnu/usr.bin/cvs/Makefile.inc
@@ -3,13 +3,20 @@
 CVSDIR=		$(.CURDIR)/../../../../contrib/cvs
 
 .if exists(${.OBJDIR}/../lib)
-LIBDESTDIR=	${.OBJDIR}/../lib
+LIBCVSDIR=	${.OBJDIR}/../lib
 .else
-LIBDESTDIR=	${.CURDIR}/../lib
+LIBCVSDIR=	${.CURDIR}/../lib
 .endif
 
-LDDESTDIR=	-L${LIBDESTDIR}
-LIBCVS=		${LIBDESTDIR}/libcvs.a
+LIBCVS=		${LIBCVSDIR}/libcvs.a
+
+.if exists(${.OBJDIR}/../libdiff)
+LIBDIFFDIR=	${.OBJDIR}/../libdiff
+.else
+LIBDIFFDIR=	${.CURDIR}/../libdiff
+.endif
+
+LIBDIFF=	${LIBDIFFDIR}/libdiff.a
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile
index 5802e060e901..47d2df50ab7a 100644
--- a/gnu/usr.bin/cvs/contrib/Makefile
+++ b/gnu/usr.bin/cvs/contrib/Makefile
@@ -1,10 +1,12 @@
-#	$Id: Makefile,v 1.6 1996/09/05 08:43:50 peter Exp $
+#	$Id: Makefile,v 1.6.2.1 1997/06/28 03:27:49 peter Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${CVSDIR}/contrib
 .PATH:	${CVSDIR}/man
 
+#pvcs_to_rcs left out, it needs perl5
+
 SCRIPTS= clmerge cln_hist commit_prep cvs2vendor cvs_acls cvscheck \
 	 log log_accum mfpipe rcs-to-cvs rcs2log rcslock sccs2rcs \
 	 easy-import
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index 55a86d4fa557..fe114fdaf10c 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.14 1996/08/20 23:54:06 peter Exp $
+#	$Id: Makefile,v 1.14.2.1 1997/06/28 03:27:50 peter Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -12,7 +12,8 @@ MAN5=	cvs.5
 
 SRCS=	add.c admin.c buffer.c checkin.c checkout.c classify.c client.c \
 	commit.c create_adm.c cvsrc.c diff.c edit.c entries.c error.c \
-	expand_path.c fileattr.c filesubr.c find_names.c hash.c history.c \
+	expand_path.c fileattr.c filesubr.c find_names.c \
+	hardlink.c hash.c history.c \
 	ignore.c import.c lock.c log.c login.c logmsg.c main.c mkmodules.c \
 	modules.c myndbm.c no_diff.c parseinfo.c patch.c rcs.c rcscmds.c \
 	recurse.c release.c remove.c repos.c root.c rtag.c run.c scramble.c \
@@ -21,7 +22,39 @@ SRCS=	add.c admin.c buffer.c checkin.c checkout.c classify.c client.c \
 
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../lib -I${CVSDIR}/src -I${CVSDIR}/lib -DHAVE_CONFIG_H
 
-DPADD+=	${LIBCVS} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
-LDADD+=	-lcvs -lgnuregex -lmd -lcrypt -lz
+DPADD+=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
+LDADD+=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
+
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
+CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT
+LDADD+=	-lkrb -ldes
+DPADD+=	${LIBKRB} ${LIBDES}
+DISTRIBUTION=	krb
+# XXX do we want to mess with this?  It's probably not really worth it for
+# the public freebsd stuff, but others might want it.  It's an optional
+# feature anyway, the -x switch is needed to activate it.
+CFLAGS+= -DENCRYPTION
+.endif
+
+#
+# Regression test support
+#
+CLEANDIRS+=cvs-sanity
+USERID!=id -u
+regress:
+	mkdir -p ${.OBJDIR}/cvs-sanity/tmp ${.OBJDIR}/cvs-sanity/work
+.if ${USERID} == "0"
+	chown -R nobody ${.OBJDIR}/cvs-sanity
+	(TESTDIR=`sh -c 'cd ${.OBJDIR}/cvs-sanity/tmp && /bin/pwd'`;\
+	        export TESTDIR;\
+		cd ${.OBJDIR}/cvs-sanity/work;\
+		su -m nobody -c "sh ${CVSDIR}/src/sanity.sh ${.OBJDIR}/cvs")
+.else
+	(TESTDIR=`sh -c 'cd ${.OBJDIR}/cvs-sanity/tmp && /bin/pwd'`;\
+		export TESTDIR;\
+		cd ${.OBJDIR}/cvs-sanity/work;\
+		sh ${CVSDIR}/src/sanity.sh ${.OBJDIR}/cvs)
+.endif
+
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cvs/cvs/options.h b/gnu/usr.bin/cvs/cvs/options.h
index 476d747d0c44..144980e068a5 100644
--- a/gnu/usr.bin/cvs/cvs/options.h
+++ b/gnu/usr.bin/cvs/cvs/options.h
@@ -3,7 +3,7 @@
  * Copyright (c) 1989-1992, Brian Berliner
  * 
  * You may distribute under the terms of the GNU General Public License as
- * specified in the README file that comes with the CVS 1.4 kit.
+ * specified in the README file that comes with the CVS source distribution.
  * 
  * This file holds (most of) the configuration tweaks that can be made to
  * customize CVS for your site.  CVS comes configured for a typical SunOS 4.x
@@ -16,19 +16,6 @@
  */
 
 /*
- * CVS provides the most features when used in conjunction with the
- * Version-5 release of RCS.  Thus, it is the default.  This also
- * assumes that GNU diff Version-1.15 is being used as well -- you
- * will have to configure your RCS V5 release separately to make this
- * the case. If you do not have RCS V5 and GNU diff V1.15, comment out
- * this define. You should not try mixing and matching other
- * combinations of these tools.
- */
-#ifndef HAVE_RCS5
-#define	HAVE_RCS5
-#endif
-
-/*
  * For portability and heterogeneity reasons, CVS is shipped by
  * default using my own text-file version of the ndbm database library
  * in the src/myndbm.c file.  If you want better performance and are
@@ -40,23 +27,6 @@
 #endif
 
 /*
- * The "diff" program to execute when creating patch output.  This
- * "diff" must support the "-c" option for context diffing.  Specify a
- * full pathname if your site wants to use a particular diff.  Note
- * that unlike the diff used with RCS, you *must not* supply -a here
- * (doing so will cause the server to generate patches which patch
- * cannot handle in some cases).
- * 
- * NOTE: this program is only used for the ``patch'' sub-command (and
- * for ``update'' if you are using the server).  The other commands
- * use rcsdiff which will use whatever version of diff was specified
- * when rcsdiff was built on your system.
- */
-#ifndef DIFF
-#define	DIFF	"diff"
-#endif
-
-/*
  * The "patch" program to run when using the CVS server and accepting
  * patches across the network.  Specify a full pathname if your site
  * wants to use a particular patch.
@@ -65,41 +35,6 @@
 #define PATCH_PROGRAM	"patch"
 #endif
 
-/*
- * By default, RCS programs are executed with the shell or through
- * execlp(), so the user's PATH environment variable is searched.  If
- * you'd like to bind all RCS programs to a certain directory (perhaps
- * one not in most people's PATH) then set the default in RCSBIN_DFLT.
- * Note that setting this here will cause all RCS programs to be
- * executed from this directory, unless the user overrides the default
- * with the RCSBIN environment variable or the "-b" option to CVS.
- * 
- * If you use the password-authenticating server, then you need to
- * make sure that the server can find the RCS programs to invoke them.
- * The authenticating server starts out running as root, and then
- * switches to run as the appropriate user once authentication is
- * complete.  But no actual shell is ever started by that user, so the
- * PATH environment variable may not contain the directory with the
- * RCS binaries, even though if that user logged in normally, PATH
- * would include the directory.
- *
- * One way to solve this problem is to set RCSBIN_DFLT here.  An
- * alternative is to make sure that root has the right directory in
- * its path already.  Another, probably better alternative is to
- * specify -b in /etc/inetd.conf.
- *
- * You may also have to set RCSBIN_DFLT here if there's no global
- * start-up script run for users by rshd and your RCS programs are not
- * in a directory in the default PATH assigned by rshd.
- *
- * This define should be either the empty string ("") or a full
- * pathname to the directory containing all the installed programs
- * from the RCS distribution.
- */
-#ifndef RCSBIN_DFLT
-#define	RCSBIN_DFLT	""
-#endif
-
 /* Directory used for storing temporary files, if not overridden by
    environment variables or the -T global option.  There should be little
    need to change this (-T is a better mechanism if you need to use a
@@ -149,10 +84,14 @@
  * working directory.  This path is either a full-path or a path
  * relative to CVSROOT.
  * 
- * The only advantage that I can see to having a relative path is that
+ * The big advantage that I can see to having a relative path is that
  * one can change the physical location of the master source
- * repository, change one's CVSROOT environment variable, and CVS will
- * work without problems.  I recommend using full-paths.
+ * repository, change the contents of CVS/Root files in your
+ * checked-out code, and CVS will work without problems.
+ *
+ * This is likely to be the default in the future, but we want to give
+ * people who may be relying on absolute pathnames time to update
+ * their scripts/software.
  */
 #ifndef RELATIVE_REPOS
 /* #define	RELATIVE_REPOS	 */
@@ -261,8 +200,3 @@
 #ifndef STDC_HEADERS
 extern void exit ();
 #endif
-
-#ifndef getwd
-extern char *getwd ();
-#endif
-
diff --git a/gnu/usr.bin/cvs/cvsbug/Makefile b/gnu/usr.bin/cvs/cvsbug/Makefile
index 0222324927f5..15829bcc1a2f 100644
--- a/gnu/usr.bin/cvs/cvsbug/Makefile
+++ b/gnu/usr.bin/cvs/cvsbug/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1996/08/20 23:55:14 peter Exp $
+#	$Id: Makefile,v 1.4.2.1 1997/06/28 03:27:51 peter Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -11,15 +11,16 @@ CLEANFILES+= cvsbug ver
 
 .SUFFIXES: .sh
 
-all:	cvsbug
+all: cvsbug
 
-.sh:
-	echo > ver cvs-`sed < ${CVSDIR}/src/version.c \
+ver: version.c
+	echo > ${.TARGET} cvs-`sed < ${.ALLSRC} \
 		    -e '/version_string/!d' \
 		    -e 's/[^0-9.]*\([0-9.]*\).*/\1/' \
 		    -e q`
-	sed -e "s,xVERSIONx,`cat ver`,g" $> > $@
 
+.sh: ver
+	sed -e "s,xVERSIONx,`cat ver`,g" ${.IMPSRC} > ${.TARGET}
 
 beforeinstall:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/gnu/usr.bin/cvs/lib/config.h b/gnu/usr.bin/cvs/lib/config.h
index e8128f4739cd..67751b828f2d 100644
--- a/gnu/usr.bin/cvs/lib/config.h
+++ b/gnu/usr.bin/cvs/lib/config.h
@@ -8,6 +8,9 @@
 /* #undef _ALL_SOURCE */
 #endif
 
+/* Define if the closedir function returns void instead of int.  */
+/* #undef CLOSEDIR_VOID */
+
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
 
@@ -17,12 +20,18 @@
 /* Define if you support file names longer than 14 characters.  */
 #define HAVE_LONG_FILE_NAMES 1
 
+/* Define if your struct stat has st_blksize.  */
+#define HAVE_ST_BLKSIZE 1
+
 /* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
 #define HAVE_SYS_WAIT_H 1
 
 /* Define if utime(file, NULL) sets file's timestamp to the present.  */
 #define HAVE_UTIME_NULL 1
 
+/* Define if you have <vfork.h>.  */
+/* #undef HAVE_VFORK_H */
+
 /* Define if on MINIX.  */
 /* #undef _MINIX */
 
@@ -57,9 +66,15 @@
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef uid_t */
 
+/* Define vfork as fork if vfork does not work.  */
+/* #undef vfork */
+
 /* Define if you have MIT Kerberos version 4 available.  */
 /* #undef HAVE_KERBEROS */
 
+/* Define if you have GSSAPI with MIT Kerberos version 5 available.  */
+/* #undef HAVE_GSSAPI */
+
 /* Define if you want CVS to be able to be a remote repository client.  */
 #define CLIENT_SUPPORT 1
 
@@ -76,6 +91,26 @@
 /* Define if you have the connect function.  */
 /* #undef HAVE_CONNECT */
 
+/* Define if this system supports chown(), link(), and friends.  */
+#define PRESERVE_PERMISSIONS_SUPPORT 1
+
+/* Define if you have memchr (always for CVS).  */
+#define HAVE_MEMCHR 1
+
+/* Define if you have strchr (always for CVS).  */
+#define HAVE_STRCHR 1
+
+/* Define if utime requires write access to the file (true on Windows,
+   but not Unix).  */
+/* #undef UTIME_EXPECTS_WRITABLE */
+
+/* Define if setmode is required when writing binary data to stdout.  */
+/* #undef USE_SETMODE_STDOUT */
+
+/* Define if the diff library should use setmode for binary files.
+   FIXME: Why two different macros for setmode?  */
+/* #undef HAVE_SETMODE */
+
 /* Define if you have the crypt function.  */
 #define HAVE_CRYPT 1
 
@@ -106,9 +141,6 @@
 /* Define if you have the krb_get_err_text function.  */
 /* #undef HAVE_KRB_GET_ERR_TEXT */
 
-/* Define if you have the mkfifo function.  */
-#define HAVE_MKFIFO 1
-
 /* Define if you have the mktemp function.  */
 #define HAVE_MKTEMP 1
 
@@ -142,9 +174,6 @@
 /* Define if you have the tzset function.  */
 #define HAVE_TZSET 1
 
-/* Define if you have the vfork function.  */
-#define HAVE_VFORK 1
-
 /* Define if you have the vprintf function.  */
 #define HAVE_VPRINTF 1
 
@@ -166,6 +195,9 @@
 /* Define if you have the <io.h> header file.  */
 /* #undef HAVE_IO_H */
 
+/* Define if you have the <limits.h> header file.  */
+#define HAVE_LIMITS_H 1
+
 /* Define if you have the <memory.h> header file.  */
 #define HAVE_MEMORY_H 1
 
@@ -184,6 +216,9 @@
 /* Define if you have the <sys/dir.h> header file.  */
 /* #undef HAVE_SYS_DIR_H */
 
+/* Define if you have the <sys/file.h> header file.  */
+#define HAVE_SYS_FILE_H 1
+
 /* Define if you have the <sys/ndir.h> header file.  */
 /* #undef HAVE_SYS_NDIR_H */
 
@@ -211,6 +246,9 @@
 /* Define if you have the crypt library (-lcrypt).  */
 #define HAVE_LIBCRYPT 1
 
+/* Define if you have the gen library (-lgen).  */
+/* #undef HAVE_LIBGEN */
+
 /* Define if you have the inet library (-linet).  */
 /* #undef HAVE_LIBINET */
 
diff --git a/gnu/usr.bin/cvs/libdiff/Makefile b/gnu/usr.bin/cvs/libdiff/Makefile
index 826446f3e30b..b5b41cc5157f 100644
--- a/gnu/usr.bin/cvs/libdiff/Makefile
+++ b/gnu/usr.bin/cvs/libdiff/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.14 1997/05/15 23:00:07 peter Exp $
+#	$Id: Makefile,v 1.1 1998/01/26 04:14:21 peter Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/tools/Makefile b/gnu/usr.bin/cvs/tools/Makefile
index f54e35566d57..eb0f37f81134 100644
--- a/gnu/usr.bin/cvs/tools/Makefile
+++ b/gnu/usr.bin/cvs/tools/Makefile
@@ -1,6 +1,4 @@
-#	$Id: Makefile,v 1.7 1995/12/11 01:58:50 peter Exp $
-
-.include "${.CURDIR}/../Makefile.inc"
+#	$Id: Makefile,v 1.1 1996/08/21 00:04:28 peter Exp $
 
 FILES=	INSTALL NEWS README \
 	pcl-cvs-lucid.el pcl-cvs-startup.el \