11 files changed, 49 insertions, 19 deletions

diff --git a/gnu/usr.bin/cvs/Makefile b/gnu/usr.bin/cvs/Makefile
index cd7ff2d9754f..65e72f9cfb7b 100644
--- a/gnu/usr.bin/cvs/Makefile
+++ b/gnu/usr.bin/cvs/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+MAINAINER=	peter@FreeBSD.org
+
 SUBDIR = lib libdiff cvs contrib cvsbug doc tools
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile
index 391e1f81186b..20e160eaf87a 100644
--- a/gnu/usr.bin/cvs/contrib/Makefile
+++ b/gnu/usr.bin/cvs/contrib/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+MAINAINER=	peter@FreeBSD.org
+
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${CVSDIR}/contrib
diff --git a/gnu/usr.bin/cvs/contrib/easy-import.pl b/gnu/usr.bin/cvs/contrib/easy-import.pl
index 0680b7b8cf9c..d2669578fdb9 100644
--- a/gnu/usr.bin/cvs/contrib/easy-import.pl
+++ b/gnu/usr.bin/cvs/contrib/easy-import.pl
@@ -22,7 +22,7 @@ sub scan_opts
 
     $dont_do_it = "-n" if $opt_n;
     if($opt_v) {
-	print STDERR '$Source: /home/ncvs/src/gnu/usr.bin/cvs/contrib/easy-import.pl,v $ $Revision: 1.14 $' . "\n"; # 'emacs kludge
+	print STDERR '$FreeBSD$' . "\n"; # 'emacs kludge
 	exit 0;
     }
     die "usage: $0 [-v] [-n] [moduledir]\n" .
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index 97e529acb01e..e0b3d011e206 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+MAINAINER=	peter@FreeBSD.org
+
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${CVSDIR}/src
@@ -15,22 +17,23 @@ SRCS=	add.c admin.c buffer.c checkin.c checkout.c classify.c client.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 \
+	modules.c myndbm.c no_diff.c parseinfo.c patch.c prepend_args.c \
+	rcs.c rcscmds.c \
 	recurse.c release.c remove.c repos.c root.c rtag.c run.c scramble.c \
 	server.c status.c subr.c tag.c update.c vers_ts.c version.c watch.c \
 	wrapper.c zlib.c
 
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../lib -DHAVE_CONFIG_H \
-	-I${CVSDIR}/src -I${CVSDIR}/lib -I${CVSDIR}/diff
+	 -I${CVSDIR}/src -I${CVSDIR}/lib -I${CVSDIR}/diff
 
 DPADD+=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
 LDADD+=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
 
 .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
 CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT
-LDADD+=	-lkrb -ldes
-DPADD+=	${LIBKRB} ${LIBDES}
-DISTRIBUTION=	krb
+LDADD+=	-lkrb -ldes -lcom_err
+DPADD+=	${LIBKRB} ${LIBDES} ${LIBCOM_ERR}
+DISTRIBUTION=	krb4
 # 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.
diff --git a/gnu/usr.bin/cvs/cvs/options.h b/gnu/usr.bin/cvs/cvs/options.h
index 144980e068a5..41e1f940cea8 100644
--- a/gnu/usr.bin/cvs/cvs/options.h
+++ b/gnu/usr.bin/cvs/cvs/options.h
@@ -1,3 +1,4 @@
+/* $FreeBSD$ */
 /*
  * Copyright (c) 1992, Brian Berliner and Jeff Polk
  * Copyright (c) 1989-1992, Brian Berliner
@@ -15,13 +16,12 @@
  * or the configure script directly.  Sorry.
  */
 
-/*
- * 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
- * not concerned about heterogeneous hosts accessing your modules
- * file, turn this option off.
- */
+/* By default, CVS stores its modules and other such items in flat
+   text files (MY_NDBM enables this).  Turning off MY_NDBM causes CVS
+   to look for a system-supplied ndbm database library and use it
+   instead.  That may speed things up, but the default setting
+   generally works fine too.  */
+
 #ifndef MY_NDBM
 #define	MY_NDBM
 #endif
@@ -89,13 +89,12 @@
  * 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.
+ * Therefore, RELATIVE_REPOS is now the default.  In the future, this
+ * is likely to disappear entirely as a compile-time (or other) option,
+ * so if you have other software which relies on absolute pathnames,
+ * update them.
  */
-#ifndef RELATIVE_REPOS
-/* #define	RELATIVE_REPOS	 */
-#endif
+#define RELATIVE_REPOS 1
 
 /*
  * When committing or importing files, you must enter a log message.
diff --git a/gnu/usr.bin/cvs/cvsbug/Makefile b/gnu/usr.bin/cvs/cvsbug/Makefile
index bb6195b0bf87..413df98fc36e 100644
--- a/gnu/usr.bin/cvs/cvsbug/Makefile
+++ b/gnu/usr.bin/cvs/cvsbug/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+MAINAINER=	peter@FreeBSD.org
+
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${CVSDIR}/src
diff --git a/gnu/usr.bin/cvs/doc/Makefile b/gnu/usr.bin/cvs/doc/Makefile
index 1954e91fe910..a60d5bbae97c 100644
--- a/gnu/usr.bin/cvs/doc/Makefile
+++ b/gnu/usr.bin/cvs/doc/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+MAINAINER=	peter@FreeBSD.org
+
 .include "${.CURDIR}/../Makefile.inc"
 
 SRCDIR= ${CVSDIR}/doc
diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile
index ba6db87a4ff7..37b691d082b4 100644
--- a/gnu/usr.bin/cvs/lib/Makefile
+++ b/gnu/usr.bin/cvs/lib/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+MAINAINER=	peter@FreeBSD.org
+
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${CVSDIR}/src
diff --git a/gnu/usr.bin/cvs/lib/config.h b/gnu/usr.bin/cvs/lib/config.h
index 67751b828f2d..4de42413f50e 100644
--- a/gnu/usr.bin/cvs/lib/config.h
+++ b/gnu/usr.bin/cvs/lib/config.h
@@ -1,3 +1,4 @@
+/* $FreeBSD$ */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
@@ -75,6 +76,10 @@
 /* Define if you have GSSAPI with MIT Kerberos version 5 available.  */
 /* #undef HAVE_GSSAPI */
 
+/* Define if GSS_C_NT_HOSTBASED_SERVICE is defined in the gssapi.h
+   header file.  Only relevant when using GSSAPI.  */
+/* #undef HAVE_GSS_C_NT_HOSTBASED_SERVICE */
+
 /* Define if you want CVS to be able to be a remote repository client.  */
 #define CLIENT_SUPPORT 1
 
@@ -192,6 +197,15 @@
 /* Define if you have the <fcntl.h> header file.  */
 #define HAVE_FCNTL_H 1
 
+/* Define if you have the <gssapi.h> header file.  */
+/* #undef HAVE_GSSAPI_H */
+
+/* Define if you have the <gssapi/gssapi.h> header file.  */
+/* #undef HAVE_GSSAPI_GSSAPI_H */
+
+/* Define if you have the <gssapi/gssapi_generic.h> header file.  */
+/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
+
 /* Define if you have the <io.h> header file.  */
 /* #undef HAVE_IO_H */
 
diff --git a/gnu/usr.bin/cvs/libdiff/Makefile b/gnu/usr.bin/cvs/libdiff/Makefile
index aefff8e1db31..bad35c8efb4c 100644
--- a/gnu/usr.bin/cvs/libdiff/Makefile
+++ b/gnu/usr.bin/cvs/libdiff/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+MAINAINER=	peter@FreeBSD.org
+
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${CVSDIR}/diff
diff --git a/gnu/usr.bin/cvs/tools/Makefile b/gnu/usr.bin/cvs/tools/Makefile
index aeb303d64e2c..59fa9032eb17 100644
--- a/gnu/usr.bin/cvs/tools/Makefile
+++ b/gnu/usr.bin/cvs/tools/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+MAINAINER=	peter@FreeBSD.org
+
 FILES=	INSTALL NEWS README \
 	pcl-cvs-lucid.el pcl-cvs-startup.el \
 	pcl-cvs.el pcl-cvs.texinfo