Update bmake glue after 1.11.2.1-20021201 import. options.h is no longer

touched by configure in the autoconf system and a standard version is
now used.

Approved by:    re

4 files changed, 697 insertions, 653 deletions

diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index 55e9ab9..7e5ab4a 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	peter@FreeBSD.org
 PROG=	cvs
 MAN=	cvs.1 cvs.5
 
-SRCS=	version.h add.c admin.c annotate.c buffer.c \
+SRCS=	add.c admin.c annotate.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 \
@@ -41,13 +41,6 @@ DISTRIBUTION=	krb4
 CFLAGS+= -DENCRYPTION
 .endif
 
-CLEANFILES+=	version.h
-VERSION!=	sed < ${CVSDIR}/configure \
-		-e '/^VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q
-
-version.h: version.h.in
-	sed -e "s,@VERSION@,${VERSION}-FreeBSD,g" ${.ALLSRC} > ${.TARGET}
-
 #
 # Regression test support
 #
diff --git a/gnu/usr.bin/cvs/cvs/options.h b/gnu/usr.bin/cvs/cvs/options.h
deleted file mode 100644
index 41e1f94..0000000
--- a/gnu/usr.bin/cvs/cvs/options.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* $FreeBSD$ */
-/*
- * Copyright (c) 1992, Brian Berliner and Jeff Polk
- * 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 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
- * environment.  The comments for each configurable item are intended to be
- * self-explanatory.  All #defines are tested first to see if an over-riding
- * option was specified on the "make" command line.
- * 
- * If special libraries are needed, you will have to edit the Makefile.in file
- * or the configure script directly.  Sorry.
- */
-
-/* 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
-
-/*
- * 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.
- */
-#ifndef PATCH_PROGRAM
-#define PATCH_PROGRAM	"patch"
-#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
-   different directory for temporary files).  */
-#ifndef TMPDIR_DFLT
-#define	TMPDIR_DFLT	"/tmp"
-#endif
-
-/*
- * The default editor to use, if one does not specify the "-e" option
- * to cvs, or does not have an EDITOR environment variable.  I set
- * this to just "vi", and use the shell to find where "vi" actually
- * is.  This allows sites with /usr/bin/vi or /usr/ucb/vi to work
- * equally well (assuming that your PATH is reasonable).
- */
-#ifndef EDITOR_DFLT
-#define	EDITOR_DFLT	"vi"
-#endif
-
-/*
- * The default umask to use when creating or otherwise setting file or
- * directory permissions in the repository.  Must be a value in the
- * range of 0 through 0777.  For example, a value of 002 allows group
- * rwx access and world rx access; a value of 007 allows group rwx
- * access but no world access.  This value is overridden by the value
- * of the CVSUMASK environment variable, which is interpreted as an
- * octal number.
- */
-#ifndef UMASK_DFLT
-#define	UMASK_DFLT	002
-#endif
-
-/*
- * The cvs admin command is restricted to the members of the group
- * CVS_ADMIN_GROUP.  If this group does not exist, all users are
- * allowed to run cvs admin.  To disable the cvs admin for all users,
- * create an empty group CVS_ADMIN_GROUP.  To disable access control
- * for cvs admin, comment out the define below.
- */
-#ifndef CVS_ADMIN_GROUP
-#define CVS_ADMIN_GROUP "cvsadmin"
-#endif
-
-/*
- * The Repository file holds the path to the directory within the
- * source repository that contains the RCS ,v files for each CVS
- * working directory.  This path is either a full-path or a path
- * relative to CVSROOT.
- * 
- * 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 the contents of CVS/Root files in your
- * checked-out code, and CVS will work without problems.
- *
- * 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.
- */
-#define RELATIVE_REPOS 1
-
-/*
- * When committing or importing files, you must enter a log message.
- * Normally, you can do this either via the -m flag on the command
- * line or an editor will be started for you.  If you like to use
- * logging templates (the rcsinfo file within the $CVSROOT/CVSROOT
- * directory), you might want to force people to use the editor even
- * if they specify a message with -m.  Enabling FORCE_USE_EDITOR will
- * cause the -m message to be appended to the temp file when the
- * editor is started.
- */
-#ifndef FORCE_USE_EDITOR
-/* #define 	FORCE_USE_EDITOR */
-#endif
-
-/*
- * When locking the repository, some sites like to remove locks and
- * assume the program that created them went away if the lock has
- * existed for a long time.  This used to be the default for previous
- * versions of CVS.  CVS now attempts to be much more robust, so lock
- * files should not be left around by mistake. The new behaviour will
- * never remove old locks (they must now be removed by hand).
- * Enabling CVS_FUDGELOCKS will cause CVS to remove locks that are
- * older than CVSLCKAGE seconds.
- * 
- * Use of this option is NOT recommended.
- */
-#ifndef CVS_FUDGELOCKS
-/* #define CVS_FUDGELOCKS */
-#endif
-
-/*
- * When committing a permanent change, CVS and RCS make a log entry of
- * who committed the change.  If you are committing the change logged
- * in as "root" (not under "su" or other root-priv giving program),
- * CVS/RCS cannot determine who is actually making the change.
- *
- * As such, by default, CVS disallows changes to be committed by users
- * logged in as "root".  You can disable this option by commenting out
- * the lines below.
- */
-#ifndef CVS_BADROOT
-#define	CVS_BADROOT
-#endif
-
-/* Define this to enable the SETXID support.  The way to use this is
-   to create a group with no users in it (except perhaps cvs
-   administrators), set the cvs executable to setgid that group, chown
-   all the repository files to that group, and change all directory
-   permissions in the repository to 770.  The last person to modify a
-   file will own it, but as long as directory permissions are set
-   right that won't matter.  You'll need a system which inherits file
-   groups from the parent directory (WARNING: using the wrong kind of
-   system (I think Solaris 2.4 is the wrong kind, for example) will
-   create a security hole!  You will receive no warning other than the
-   fact that files in the working directory are owned by the group
-   which cvs is setgid to).
-
-   One security hole which has been reported is that setgid is not
-   turned off when the editor is invoked--most editors provide a way
-   to execute a shell, or the user can specify an editor (this one is
-   large enough to drive a truck through).  Don't assume that the
-   holes described here are the only ones; I don't know how carefully
-   SETXID has been inspected for security holes.  */
-#ifndef SETXID_SUPPORT
-/* #define SETXID_SUPPORT */
-#endif
-
-/*
- * Should we build the password-authenticating client?  Whether to
- * include the password-authenticating _server_, on the other hand, is
- * set in config.h.
- */
-#ifdef CLIENT_SUPPORT
-#define AUTH_CLIENT_SUPPORT 1
-#endif
-
-/*
- * If you are working with a large remote repository and a 'cvs
- * checkout' is swamping your network and memory, define these to
- * enable flow control.  You will end up with even less probability of
- * a consistent checkout (see Concurrency in cvs.texinfo), but CVS
- * doesn't try to guarantee that anyway.  The master server process
- * will monitor how far it is getting behind, if it reaches the high
- * water mark, it will signal the child process to stop generating
- * data when convenient (ie: no locks are held, currently at the
- * beginning of a new directory).  Once the buffer has drained
- * sufficiently to reach the low water mark, it will be signalled to
- * start again.  You may override the default hi/low watermarks here
- * too.
- */
-#define SERVER_FLOWCONTROL
-#define SERVER_HI_WATER (2 * 1024 * 1024)
-#define SERVER_LO_WATER (1 * 1024 * 1024)
-
-/* End of CVS configuration section */
-
-/*
- * Externs that are included in libc, but are used frequently enough
- * to warrant defining here.
- */
-#ifndef STDC_HEADERS
-extern void exit ();
-#endif
diff --git a/gnu/usr.bin/cvs/lib/config.h b/gnu/usr.bin/cvs/lib/config.h
index 4169f82..5877b44 100644
--- a/gnu/usr.bin/cvs/lib/config.h
+++ b/gnu/usr.bin/cvs/lib/config.h
@@ -1,350 +1,476 @@
 /* $FreeBSD$ */
-/* config.h.  Generated automatically by configure.  */
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* config.h.  Generated by configure.  */
+/* config.h.in.  Generated from configure.in by autoheader.  */
 
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-/* #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 */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef gid_t */
-
-/* Define if your system has a working fnmatch function.  */
-#define HAVE_FNMATCH 1
-
-/* Define if you support file names longer than 14 characters.  */
-#define HAVE_LONG_FILE_NAMES 1
+/* Enable AUTH_CLIENT_SUPPORT to enable pserver as a remote access method in
+   the CVS client (default) */
+#define AUTH_CLIENT_SUPPORT 1
 
-/* Define if you have a working `mmap' system call.  */
-#define HAVE_MMAP 1
-
-/* Define if your struct stat has st_blksize.  */
-#define HAVE_ST_BLKSIZE 1
+/* Define if you want to use the password authenticated server. */
+#define AUTH_SERVER_SUPPORT 1
 
-/* Define if your struct stat has st_rdev.  */
-#define HAVE_ST_RDEV 1
+/* Define if you want CVS to be able to be a remote repository client. */
+#define CLIENT_SUPPORT 1
 
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
-#define HAVE_SYS_WAIT_H 1
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
+/* #undef CLOSEDIR_VOID */
 
-/* Define if utime(file, NULL) sets file's timestamp to the present.  */
-#define HAVE_UTIME_NULL 1
+/* When committing a permanent change, CVS and RCS make a log entry of who
+   committed the change. If you are committing the change logged in as "root"
+   (not under "su" or other root-priv giving program), CVS/RCS cannot
+   determine who is actually making the change. As such, by default, CVS
+   prohibits changes committed by users logged in as "root". You can disable
+   checking by passing the "--enable-rootcommit" option to configure or by
+   commenting out the lines below. */
+#define CVS_BADROOT 1
+
+/* The default editor to use, if one does not specify the "-e" option to cvs,
+   or does not have an EDITOR environment variable. If this is not set to an
+   absolute path to an executable, use the shell to find where the editor
+   actually is. This allows sites with /usr/bin/vi or /usr/ucb/vi to work
+   equally well (assuming that their PATH is reasonable). */
+#define EDITOR_DFLT "vi"
+
+/* Define to enable encryption support. */
+/* #undef ENCRYPTION */
 
-/* Define if you have <vfork.h>.  */
-/* #undef HAVE_VFORK_H */
+/* When committing or importing files, you must enter a log message. Normally,
+   you can do this either via the -m flag on the command line, the -F flag on
+   the command line, or an editor will be started for you. If you like to use
+   logging templates (the rcsinfo file within the /CVSROOT directory),
+   you might want to force people to use the editor even if they specify a
+   message with -m or -F. Enabling FORCE_USE_EDITOR will cause the -m or -F
+   message to be appended to the temp file when the editor is started. */
+/* #undef FORCE_USE_EDITOR */
 
-/* Define if on MINIX.  */
-/* #undef _MINIX */
+/* Define to an alternative value if GSS_C_NT_HOSTBASED_SERVICE isn't defined
+   in the gssapi.h header file. MIT Kerberos 1.2.1 requires this. Only
+   relevant when using GSSAPI. */
+/* #undef GSS_C_NT_HOSTBASED_SERVICE */
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef mode_t */
+/* Define if you have the connect function. */
+#define HAVE_CONNECT 1
 
-/* Define if your C compiler doesn't accept -c and -o together.  */
-/* #undef NO_MINUS_C_MINUS_O */
+/* Define if you have the crypt function. */
+#define HAVE_CRYPT 1
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
+/* Define to 1 if you have the <direct.h> header file. */
+/* #undef HAVE_DIRECT_H */
 
-/* Define if the system does not provide POSIX.1 features except
-   with this defined.  */
-/* #undef _POSIX_1_SOURCE */
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#define HAVE_DIRENT_H 1
 
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
+/* Define to 1 if you have the `dup2' function. */
+#define HAVE_DUP2 1
 
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
 
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
+/* Define to 1 if you have the `fchdir' function. */
+#define HAVE_FCHDIR 1
 
-/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
-/* #undef STAT_MACROS_BROKEN */
+/* Define to 1 if you have the `fchmod' function. */
+#define HAVE_FCHMOD 1
 
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
 
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#define TIME_WITH_SYS_TIME 1
+/* Define to 1 if your system has a working `fnmatch' function. */
+#define HAVE_FNMATCH 1
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef uid_t */
+/* Define to 1 if you have the <fnmatch.h> header file. */
+#define HAVE_FNMATCH_H 1
 
-/* Define vfork as fork if vfork does not work.  */
-/* #undef vfork */
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
 
-/* Define if you have MIT Kerberos version 4 available.  */
-/* #undef HAVE_KERBEROS */
+/* Define to 1 if you have the `fsync' function. */
+#define HAVE_FSYNC 1
 
-/* Define if you want CVS to be able to be a remote repository client.  */
-#define CLIENT_SUPPORT 1
+/* Define to 1 if you have the `ftime' function. */
+/* #undef HAVE_FTIME */
 
-/* Define if you want CVS to be able to serve repositories to remote
-   clients.  */
-#define SERVER_SUPPORT 1
+/* Define to 1 if you have the `ftruncate' function. */
+#define HAVE_FTRUNCATE 1
 
-/* Define if you want to use the password authenticated server.  */
-#define AUTH_SERVER_SUPPORT 1
+/* Define to 1 if you have the `geteuid' function. */
+#define HAVE_GETEUID 1
 
-/* Define if you want encryption support.  */
-/* #undef ENCRYPTION */
+/* Define to 1 if you have the `getgroups' function. */
+#define HAVE_GETGROUPS 1
 
-/* Define if you have the connect function.  */
-#define HAVE_CONNECT 1
+/* Define to 1 if you have the `gethostname' function. */
+#define HAVE_GETHOSTNAME 1
 
-/* Define if you have memchr (always for CVS).  */
-#define HAVE_MEMCHR 1
+/* Define to 1 if you have the `getopt' function. */
+#define HAVE_GETOPT 1
 
-/* Define if you have strchr (always for CVS).  */
-#define HAVE_STRCHR 1
+/* Define to 1 if you have the `getpagesize' function. */
+#define HAVE_GETPAGESIZE 1
 
-/* Define if utime requires write access to the file (true on Windows,
-   but not Unix).  */
-/* #undef UTIME_EXPECTS_WRITABLE */
+/* Define to 1 if you have the `getpassphrase' function. */
+/* #undef HAVE_GETPASSPHRASE */
 
-/* Define if setmode is required when writing binary data to stdout.  */
-/* #undef USE_SETMODE_STDOUT */
+/* Define if you have the getspnam function. */
+/* #undef HAVE_GETSPNAM */
 
-/* Define if the diff library should use setmode for binary files.
-   FIXME: Why two different macros for setmode?  */
-/* #undef HAVE_SETMODE */
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
 
-/* Define if you have the crypt function.  */
-#define HAVE_CRYPT 1
+/* Define if you have GSSAPI with Kerberos version 5 available. */
+/* #undef HAVE_GSSAPI */
 
-/* Define if you have the getspnam function.  */
-/* #undef HAVE_GETSPNAM */
+/* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */
+/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
 
-/* Define to force lib/regex.c to use malloc instead of alloca.  */
-#define REGEX_MALLOC 1
+/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
+/* #undef HAVE_GSSAPI_GSSAPI_H */
 
-/* Define to force lib/regex.c to define re_comp et al.  */
-#define _REGEX_RE_COMP 1
+/* Define to 1 if you have the <gssapi.h> header file. */
+/* #undef HAVE_GSSAPI_H */
 
-/* Define if you have the dup2 function.  */
-#define HAVE_DUP2 1
+/* Define to 1 if you have the `initgroups' function. */
+#define HAVE_INITGROUPS 1
 
-/* Define if you have the fchdir function.  */
-#define HAVE_FCHDIR 1
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
 
-/* Define if you have the fchmod function.  */
-#define HAVE_FCHMOD 1
+/* Define to 1 if you have the <io.h> header file. */
+/* #undef HAVE_IO_H */
 
-/* Define if you have the fsync function.  */
-#define HAVE_FSYNC 1
+/* Define if you have MIT Kerberos version 4 available. */
+/* #undef HAVE_KERBEROS */
 
-/* Define if you have the ftime function.  */
-/* #undef HAVE_FTIME */
+/* Define to 1 if you have the <krb5.h> header file. */
+/* #undef HAVE_KRB5_H */
 
-/* Define if you have the ftruncate function.  */
-#define HAVE_FTRUNCATE 1
+/* Define to 1 if you have the `krb_get_err_text' function. */
+/* #undef HAVE_KRB_GET_ERR_TEXT */
 
-/* Define if you have the getgroups function.  */
-#define HAVE_GETGROUPS 1
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+/* #undef HAVE_LIBNSL */
 
-/* Define if you have the getpagesize function.  */
-#define HAVE_GETPAGESIZE 1
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
 
-/* Define if you have the getpassphrase function.  */
-/* #undef HAVE_GETPASSPHRASE */
+/* Define to 1 if you have the `login' function. */
+/* #undef HAVE_LOGIN */
 
-/* Define if you have the gettimeofday function.  */
-#define HAVE_GETTIMEOFDAY 1
+/* Define to 1 if you have the `logout' function. */
+/* #undef HAVE_LOGOUT */
 
-/* Define if you have the initgroups function.  */
-#define HAVE_INITGROUPS 1
+/* Define to 1 if you support file names longer than 14 characters. */
+#define HAVE_LONG_FILE_NAMES 1
 
-/* Define if you have the krb_get_err_text function.  */
-/* #undef HAVE_KRB_GET_ERR_TEXT */
+/* Define if you have memchr (always for CVS). */
+#define HAVE_MEMCHR 1
 
-/* Define if you have the memmove function.  */
+/* Define to 1 if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
 
-/* Define if you have the mkdir function.  */
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mkdir' function. */
 #define HAVE_MKDIR 1
 
-/* Define if you have the mknod function.  */
+/* Define to 1 if you have the `mknod' function. */
 #define HAVE_MKNOD 1
 
-/* Define if you have the mkstemp function.  */
+/* Define to 1 if you have the `mkstemp' function. */
 #define HAVE_MKSTEMP 1
 
-/* Define if you have the mktemp function.  */
+/* Define to 1 if you have the `mktemp' function. */
 #define HAVE_MKTEMP 1
 
-/* Define if you have the nanosleep function.  */
+/* Define to 1 if you have a working `mmap' system call. */
+#define HAVE_MMAP 1
+
+/* Define to 1 if you have the `nanosleep' function. */
 #define HAVE_NANOSLEEP 1
 
-/* Define if you have the putenv function.  */
+/* Define to 1 if you have the <ndbm.h> header file. */
+#define HAVE_NDBM_H 1
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_NDIR_H */
+
+/* Define to 1 if you have the `putenv' function. */
 #define HAVE_PUTENV 1
 
-/* Define if you have the readlink function.  */
+/* Define to 1 if you have the `readlink' function. */
 #define HAVE_READLINK 1
 
-/* Define if you have the rename function.  */
+/* Define to 1 if you have the `regcomp' function. */
+#define HAVE_REGCOMP 1
+
+/* Define to 1 if you have the `regerror' function. */
+#define HAVE_REGERROR 1
+
+/* Define to 1 if you have the `regexec' function. */
+#define HAVE_REGEXEC 1
+
+/* Define to 1 if you have the `regfree' function. */
+#define HAVE_REGFREE 1
+
+/* Define to 1 if you have the `rename' function. */
 #define HAVE_RENAME 1
 
-/* Define if you have the select function.  */
+/* Define to 1 if you have the `select' function. */
 /* #undef HAVE_SELECT */
 
-/* Define if you have the sigaction function.  */
+/* Define if the diff library should use setmode for binary files. */
+/* #undef HAVE_SETMODE */
+
+/* Define to 1 if you have the `sigaction' function. */
 #define HAVE_SIGACTION 1
 
-/* Define if you have the sigblock function.  */
+/* Define to 1 if you have the `sigblock' function. */
 #define HAVE_SIGBLOCK 1
 
-/* Define if you have the sigprocmask function.  */
+/* Define to 1 if you have the `sigprocmask' function. */
 #define HAVE_SIGPROCMASK 1
 
-/* Define if you have the sigsetmask function.  */
+/* Define to 1 if you have the `sigsetmask' function. */
 #define HAVE_SIGSETMASK 1
 
-/* Define if you have the sigvec function.  */
+/* Define to 1 if you have the `sigvec' function. */
 #define HAVE_SIGVEC 1
 
-/* Define if you have the strerror function.  */
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define if you have strchr (always for CVS). */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strerror' function. */
 #define HAVE_STRERROR 1
 
-/* Define if you have the strstr function.  */
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strstr' function. */
 #define HAVE_STRSTR 1
 
-/* Define if you have the strtoul function.  */
+/* Define to 1 if you have the `strtoul' function. */
 #define HAVE_STRTOUL 1
 
-/* Define if you have the tempnam function.  */
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+
+/* Define to 1 if `st_rdev' is member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_RDEV 1
+
+/* Define to 1 if you have the <syslog.h> header file. */
+#define HAVE_SYSLOG_H 1
+
+/* Define to 1 if you have the <sys/bsdtypes.h> header file. */
+/* #undef HAVE_SYS_BSDTYPES_H */
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_DIR_H */
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_NDIR_H */
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/timeb.h> header file. */
+#define HAVE_SYS_TIMEB_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
+
+/* Define to 1 if you have the `tempnam' function. */
 #define HAVE_TEMPNAM 1
 
-/* Define if you have the timezone function.  */
+/* Define to 1 if you have the `timezone' function. */
 #define HAVE_TIMEZONE 1
 
-/* Define if you have the tzset function.  */
+/* Define to 1 if you have the `tzset' function. */
 #define HAVE_TZSET 1
 
-/* Define if you have the usleep function.  */
-/* #undef HAVE_USLEEP */
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
 
-/* Define if you have the valloc function.  */
-#define HAVE_VALLOC 1
+/* Define to 1 if you have the `usleep' function. */
+/* #undef HAVE_USLEEP */
 
-/* Define if you have the vprintf function.  */
-#define HAVE_VPRINTF 1
+/* Define to 1 if you have the <utime.h> header file. */
+#define HAVE_UTIME_H 1
 
-/* Define if you have the wait3 function.  */
-#define HAVE_WAIT3 1
+/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
+#define HAVE_UTIME_NULL 1
 
-/* Define if you have the waitpid function.  */
-#define HAVE_WAITPID 1
+/* Define to 1 if you have the `valloc' function. */
+#define HAVE_VALLOC 1
 
-/* Define if you have the <direct.h> header file.  */
-/* #undef HAVE_DIRECT_H */
+/* Define to 1 if you have the `vfork' function. */
+#define HAVE_VFORK 1
 
-/* Define if you have the <dirent.h> header file.  */
-#define HAVE_DIRENT_H 1
+/* Define to 1 if you have the <vfork.h> header file. */
+/* #undef HAVE_VFORK_H */
 
-/* Define if you have the <errno.h> header file.  */
-#define HAVE_ERRNO_H 1
+/* Define to 1 if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
 
-/* Define if you have the <fcntl.h> header file.  */
-#define HAVE_FCNTL_H 1
+/* Define to 1 if you have the `wait3' function. */
+#define HAVE_WAIT3 1
 
-/* Define if you have the <gssapi.h> header file.  */
-/* #undef HAVE_GSSAPI_H */
+/* Define to 1 if you have the `waitpid' function. */
+#define HAVE_WAITPID 1
 
-/* Define if you have the <gssapi/gssapi.h> header file.  */
-/* #undef HAVE_GSSAPI_GSSAPI_H */
+/* Define to 1 if `fork' works. */
+#define HAVE_WORKING_FORK 1
 
-/* Define if you have the <gssapi/gssapi_generic.h> header file.  */
-/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
+/* Define to 1 if `vfork' works. */
+#define HAVE_WORKING_VFORK 1
 
-/* Define if you have the <io.h> header file.  */
-/* #undef HAVE_IO_H */
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
 
-/* Define if you have the <krb5.h> header file.  */
-/* #undef HAVE_KRB5_H */
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "bug-cvs@gnu.org"
 
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "Concurrent Versions System (CVS)"
 
-/* Define if you have the <memory.h> header file.  */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the <ndbm.h> header file.  */
-#define HAVE_NDBM_H 1
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "Concurrent Versions System (CVS) 1.11.2.1-20021024-FreeBSD"
 
-/* Define if you have the <ndir.h> header file.  */
-/* #undef HAVE_NDIR_H */
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "cvs"
 
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.11.2.1-20021024-FreeBSD"
 
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
+/* Path to the pr utility */
+#define PR_PROGRAM "/usr/bin/pr"
 
-/* Define if you have the <sys/bsdtypes.h> header file.  */
-/* #undef HAVE_SYS_BSDTYPES_H */
+/* Define to force lib/regex.c to use malloc instead of alloca. */
+#define REGEX_MALLOC 1
 
-/* Define if you have the <sys/dir.h> header file.  */
-/* #undef HAVE_SYS_DIR_H */
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
 
-/* Define if you have the <sys/file.h> header file.  */
-#define HAVE_SYS_FILE_H 1
+/* If you are working with a large remote repository and a 'cvs checkout' is
+   swamping your network and memory, define these to enable flow control. You
+   will end up with even less probability of a consistent checkout (see
+   Concurrency in cvs.texinfo), but CVS doesn't try to guarantee that anyway.
+   The master server process will monitor how far it is getting behind, if it
+   reaches the high water mark, it will signal the child process to stop
+   generating data when convenient (ie: no locks are held, currently at the
+   beginning of a new directory). Once the buffer has drained sufficiently to
+   reach the low water mark, it will be signalled to start again. */
+#define SERVER_FLOWCONTROL 1
+
+/* The high water mark in bytes for server flow control. Required if
+   SERVER_FLOWCONTROL is defined, and useless otherwise. */
+#define SERVER_HI_WATER (2 * 1024 * 1024)
+
+/* The low water mark in bytes for server flow control. Required if
+   SERVER_FLOWCONTROL is defined, and useless otherwise. */
+#define SERVER_LO_WATER (1 * 1024 * 1024)
+
+/* Define if you want CVS to be able to serve repositories to remote clients.
+   */
+#define SERVER_SUPPORT 1
 
-/* Define if you have the <sys/ndir.h> header file.  */
-/* #undef HAVE_SYS_NDIR_H */
+/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
+/* #undef STAT_MACROS_BROKEN */
 
-/* Define if you have the <sys/param.h> header file.  */
-#define HAVE_SYS_PARAM_H 1
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
 
-/* Define if you have the <sys/resource.h> header file.  */
-#define HAVE_SYS_RESOURCE_H 1
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
 
-/* Define if you have the <sys/select.h> header file.  */
-#define HAVE_SYS_SELECT_H 1
+/* 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 different
+   directory for temporary files). */
+#define TMPDIR_DFLT "/tmp"
+
+/* The default umask to use when creating or otherwise setting file or
+   directory permissions in the repository. Must be a value in the range of 0
+   through 0777. For example, a value of 002 allows group rwx access and world
+   rx access; a value of 007 allows group rwx access but no world access. This
+   value is overridden by the value of the CVSUMASK environment variable,
+   which is interpreted as an octal number. */
+#define UMASK_DFLT 002
+
+/* Define if setmode is required when writing binary data to stdout. */
+/* #undef USE_SETMODE_STDOUT */
 
-/* Define if you have the <sys/stat.h> header file.  */
-#define HAVE_SYS_STAT_H 1
+/* Define if utime requires write access to the file (true on Windows, but not
+   Unix). */
+/* #undef UTIME_EXPECTS_WRITABLE */
 
-/* Define if you have the <sys/time.h> header file.  */
-#define HAVE_SYS_TIME_H 1
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+/* # undef _ALL_SOURCE */
+#endif
 
-/* Define if you have the <sys/timeb.h> header file.  */
-#define HAVE_SYS_TIMEB_H 1
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
 
-/* Define if you have the <sys/types.h> header file.  */
-#define HAVE_SYS_TYPES_H 1
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+/* #undef _POSIX_1_SOURCE */
 
-/* Define if you have the <syslog.h> header file.  */
-#define HAVE_SYSLOG_H 1
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
 
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
+/* Define to force lib/regex.c to define re_comp et al. */
+#define _REGEX_RE_COMP 1
 
-/* Define if you have the <utime.h> header file.  */
-#define HAVE_UTIME_H 1
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
 
-/* Name of package */
-#define PACKAGE "cvs"
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef gid_t */
 
-/* Version number of package */
-#define VERSION "1.11.2"
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef mode_t */
 
-/* Path to the pr utility */
-#define PR_PROGRAM "/usr/bin/pr"
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
 
-/* Define if you have GSSAPI with Kerberos version 5 available. */
-/* #undef HAVE_GSSAPI */
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
 
-/* Define to an alternative value if GSS_C_NT_HOSTBASED_SERVICE isn't defined
-in the gssapi.h header file.  MIT Kerberos 1.2.1 requires this.  Only relevant
-when using GSSAPI. */
-/* #undef GSS_C_NT_HOSTBASED_SERVICE */
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef uid_t */
 
+/* Define as `fork' if `vfork' does not work. */
+/* #undef vfork */
diff --git a/gnu/usr.bin/cvs/lib/config.h.proto b/gnu/usr.bin/cvs/lib/config.h.proto
index 4169f82..5877b44 100644
--- a/gnu/usr.bin/cvs/lib/config.h.proto
+++ b/gnu/usr.bin/cvs/lib/config.h.proto
@@ -1,350 +1,476 @@
 /* $FreeBSD$ */
-/* config.h.  Generated automatically by configure.  */
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* config.h.  Generated by configure.  */
+/* config.h.in.  Generated from configure.in by autoheader.  */
 
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-/* #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 */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef gid_t */
-
-/* Define if your system has a working fnmatch function.  */
-#define HAVE_FNMATCH 1
-
-/* Define if you support file names longer than 14 characters.  */
-#define HAVE_LONG_FILE_NAMES 1
+/* Enable AUTH_CLIENT_SUPPORT to enable pserver as a remote access method in
+   the CVS client (default) */
+#define AUTH_CLIENT_SUPPORT 1
 
-/* Define if you have a working `mmap' system call.  */
-#define HAVE_MMAP 1
-
-/* Define if your struct stat has st_blksize.  */
-#define HAVE_ST_BLKSIZE 1
+/* Define if you want to use the password authenticated server. */
+#define AUTH_SERVER_SUPPORT 1
 
-/* Define if your struct stat has st_rdev.  */
-#define HAVE_ST_RDEV 1
+/* Define if you want CVS to be able to be a remote repository client. */
+#define CLIENT_SUPPORT 1
 
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
-#define HAVE_SYS_WAIT_H 1
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
+/* #undef CLOSEDIR_VOID */
 
-/* Define if utime(file, NULL) sets file's timestamp to the present.  */
-#define HAVE_UTIME_NULL 1
+/* When committing a permanent change, CVS and RCS make a log entry of who
+   committed the change. If you are committing the change logged in as "root"
+   (not under "su" or other root-priv giving program), CVS/RCS cannot
+   determine who is actually making the change. As such, by default, CVS
+   prohibits changes committed by users logged in as "root". You can disable
+   checking by passing the "--enable-rootcommit" option to configure or by
+   commenting out the lines below. */
+#define CVS_BADROOT 1
+
+/* The default editor to use, if one does not specify the "-e" option to cvs,
+   or does not have an EDITOR environment variable. If this is not set to an
+   absolute path to an executable, use the shell to find where the editor
+   actually is. This allows sites with /usr/bin/vi or /usr/ucb/vi to work
+   equally well (assuming that their PATH is reasonable). */
+#define EDITOR_DFLT "vi"
+
+/* Define to enable encryption support. */
+/* #undef ENCRYPTION */
 
-/* Define if you have <vfork.h>.  */
-/* #undef HAVE_VFORK_H */
+/* When committing or importing files, you must enter a log message. Normally,
+   you can do this either via the -m flag on the command line, the -F flag on
+   the command line, or an editor will be started for you. If you like to use
+   logging templates (the rcsinfo file within the /CVSROOT directory),
+   you might want to force people to use the editor even if they specify a
+   message with -m or -F. Enabling FORCE_USE_EDITOR will cause the -m or -F
+   message to be appended to the temp file when the editor is started. */
+/* #undef FORCE_USE_EDITOR */
 
-/* Define if on MINIX.  */
-/* #undef _MINIX */
+/* Define to an alternative value if GSS_C_NT_HOSTBASED_SERVICE isn't defined
+   in the gssapi.h header file. MIT Kerberos 1.2.1 requires this. Only
+   relevant when using GSSAPI. */
+/* #undef GSS_C_NT_HOSTBASED_SERVICE */
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef mode_t */
+/* Define if you have the connect function. */
+#define HAVE_CONNECT 1
 
-/* Define if your C compiler doesn't accept -c and -o together.  */
-/* #undef NO_MINUS_C_MINUS_O */
+/* Define if you have the crypt function. */
+#define HAVE_CRYPT 1
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
+/* Define to 1 if you have the <direct.h> header file. */
+/* #undef HAVE_DIRECT_H */
 
-/* Define if the system does not provide POSIX.1 features except
-   with this defined.  */
-/* #undef _POSIX_1_SOURCE */
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#define HAVE_DIRENT_H 1
 
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
+/* Define to 1 if you have the `dup2' function. */
+#define HAVE_DUP2 1
 
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
 
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
+/* Define to 1 if you have the `fchdir' function. */
+#define HAVE_FCHDIR 1
 
-/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
-/* #undef STAT_MACROS_BROKEN */
+/* Define to 1 if you have the `fchmod' function. */
+#define HAVE_FCHMOD 1
 
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
 
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#define TIME_WITH_SYS_TIME 1
+/* Define to 1 if your system has a working `fnmatch' function. */
+#define HAVE_FNMATCH 1
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef uid_t */
+/* Define to 1 if you have the <fnmatch.h> header file. */
+#define HAVE_FNMATCH_H 1
 
-/* Define vfork as fork if vfork does not work.  */
-/* #undef vfork */
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
 
-/* Define if you have MIT Kerberos version 4 available.  */
-/* #undef HAVE_KERBEROS */
+/* Define to 1 if you have the `fsync' function. */
+#define HAVE_FSYNC 1
 
-/* Define if you want CVS to be able to be a remote repository client.  */
-#define CLIENT_SUPPORT 1
+/* Define to 1 if you have the `ftime' function. */
+/* #undef HAVE_FTIME */
 
-/* Define if you want CVS to be able to serve repositories to remote
-   clients.  */
-#define SERVER_SUPPORT 1
+/* Define to 1 if you have the `ftruncate' function. */
+#define HAVE_FTRUNCATE 1
 
-/* Define if you want to use the password authenticated server.  */
-#define AUTH_SERVER_SUPPORT 1
+/* Define to 1 if you have the `geteuid' function. */
+#define HAVE_GETEUID 1
 
-/* Define if you want encryption support.  */
-/* #undef ENCRYPTION */
+/* Define to 1 if you have the `getgroups' function. */
+#define HAVE_GETGROUPS 1
 
-/* Define if you have the connect function.  */
-#define HAVE_CONNECT 1
+/* Define to 1 if you have the `gethostname' function. */
+#define HAVE_GETHOSTNAME 1
 
-/* Define if you have memchr (always for CVS).  */
-#define HAVE_MEMCHR 1
+/* Define to 1 if you have the `getopt' function. */
+#define HAVE_GETOPT 1
 
-/* Define if you have strchr (always for CVS).  */
-#define HAVE_STRCHR 1
+/* Define to 1 if you have the `getpagesize' function. */
+#define HAVE_GETPAGESIZE 1
 
-/* Define if utime requires write access to the file (true on Windows,
-   but not Unix).  */
-/* #undef UTIME_EXPECTS_WRITABLE */
+/* Define to 1 if you have the `getpassphrase' function. */
+/* #undef HAVE_GETPASSPHRASE */
 
-/* Define if setmode is required when writing binary data to stdout.  */
-/* #undef USE_SETMODE_STDOUT */
+/* Define if you have the getspnam function. */
+/* #undef HAVE_GETSPNAM */
 
-/* Define if the diff library should use setmode for binary files.
-   FIXME: Why two different macros for setmode?  */
-/* #undef HAVE_SETMODE */
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
 
-/* Define if you have the crypt function.  */
-#define HAVE_CRYPT 1
+/* Define if you have GSSAPI with Kerberos version 5 available. */
+/* #undef HAVE_GSSAPI */
 
-/* Define if you have the getspnam function.  */
-/* #undef HAVE_GETSPNAM */
+/* Define to 1 if you have the <gssapi/gssapi_generic.h> header file. */
+/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
 
-/* Define to force lib/regex.c to use malloc instead of alloca.  */
-#define REGEX_MALLOC 1
+/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
+/* #undef HAVE_GSSAPI_GSSAPI_H */
 
-/* Define to force lib/regex.c to define re_comp et al.  */
-#define _REGEX_RE_COMP 1
+/* Define to 1 if you have the <gssapi.h> header file. */
+/* #undef HAVE_GSSAPI_H */
 
-/* Define if you have the dup2 function.  */
-#define HAVE_DUP2 1
+/* Define to 1 if you have the `initgroups' function. */
+#define HAVE_INITGROUPS 1
 
-/* Define if you have the fchdir function.  */
-#define HAVE_FCHDIR 1
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
 
-/* Define if you have the fchmod function.  */
-#define HAVE_FCHMOD 1
+/* Define to 1 if you have the <io.h> header file. */
+/* #undef HAVE_IO_H */
 
-/* Define if you have the fsync function.  */
-#define HAVE_FSYNC 1
+/* Define if you have MIT Kerberos version 4 available. */
+/* #undef HAVE_KERBEROS */
 
-/* Define if you have the ftime function.  */
-/* #undef HAVE_FTIME */
+/* Define to 1 if you have the <krb5.h> header file. */
+/* #undef HAVE_KRB5_H */
 
-/* Define if you have the ftruncate function.  */
-#define HAVE_FTRUNCATE 1
+/* Define to 1 if you have the `krb_get_err_text' function. */
+/* #undef HAVE_KRB_GET_ERR_TEXT */
 
-/* Define if you have the getgroups function.  */
-#define HAVE_GETGROUPS 1
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+/* #undef HAVE_LIBNSL */
 
-/* Define if you have the getpagesize function.  */
-#define HAVE_GETPAGESIZE 1
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
 
-/* Define if you have the getpassphrase function.  */
-/* #undef HAVE_GETPASSPHRASE */
+/* Define to 1 if you have the `login' function. */
+/* #undef HAVE_LOGIN */
 
-/* Define if you have the gettimeofday function.  */
-#define HAVE_GETTIMEOFDAY 1
+/* Define to 1 if you have the `logout' function. */
+/* #undef HAVE_LOGOUT */
 
-/* Define if you have the initgroups function.  */
-#define HAVE_INITGROUPS 1
+/* Define to 1 if you support file names longer than 14 characters. */
+#define HAVE_LONG_FILE_NAMES 1
 
-/* Define if you have the krb_get_err_text function.  */
-/* #undef HAVE_KRB_GET_ERR_TEXT */
+/* Define if you have memchr (always for CVS). */
+#define HAVE_MEMCHR 1
 
-/* Define if you have the memmove function.  */
+/* Define to 1 if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
 
-/* Define if you have the mkdir function.  */
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mkdir' function. */
 #define HAVE_MKDIR 1
 
-/* Define if you have the mknod function.  */
+/* Define to 1 if you have the `mknod' function. */
 #define HAVE_MKNOD 1
 
-/* Define if you have the mkstemp function.  */
+/* Define to 1 if you have the `mkstemp' function. */
 #define HAVE_MKSTEMP 1
 
-/* Define if you have the mktemp function.  */
+/* Define to 1 if you have the `mktemp' function. */
 #define HAVE_MKTEMP 1
 
-/* Define if you have the nanosleep function.  */
+/* Define to 1 if you have a working `mmap' system call. */
+#define HAVE_MMAP 1
+
+/* Define to 1 if you have the `nanosleep' function. */
 #define HAVE_NANOSLEEP 1
 
-/* Define if you have the putenv function.  */
+/* Define to 1 if you have the <ndbm.h> header file. */
+#define HAVE_NDBM_H 1
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_NDIR_H */
+
+/* Define to 1 if you have the `putenv' function. */
 #define HAVE_PUTENV 1
 
-/* Define if you have the readlink function.  */
+/* Define to 1 if you have the `readlink' function. */
 #define HAVE_READLINK 1
 
-/* Define if you have the rename function.  */
+/* Define to 1 if you have the `regcomp' function. */
+#define HAVE_REGCOMP 1
+
+/* Define to 1 if you have the `regerror' function. */
+#define HAVE_REGERROR 1
+
+/* Define to 1 if you have the `regexec' function. */
+#define HAVE_REGEXEC 1
+
+/* Define to 1 if you have the `regfree' function. */
+#define HAVE_REGFREE 1
+
+/* Define to 1 if you have the `rename' function. */
 #define HAVE_RENAME 1
 
-/* Define if you have the select function.  */
+/* Define to 1 if you have the `select' function. */
 /* #undef HAVE_SELECT */
 
-/* Define if you have the sigaction function.  */
+/* Define if the diff library should use setmode for binary files. */
+/* #undef HAVE_SETMODE */
+
+/* Define to 1 if you have the `sigaction' function. */
 #define HAVE_SIGACTION 1
 
-/* Define if you have the sigblock function.  */
+/* Define to 1 if you have the `sigblock' function. */
 #define HAVE_SIGBLOCK 1
 
-/* Define if you have the sigprocmask function.  */
+/* Define to 1 if you have the `sigprocmask' function. */
 #define HAVE_SIGPROCMASK 1
 
-/* Define if you have the sigsetmask function.  */
+/* Define to 1 if you have the `sigsetmask' function. */
 #define HAVE_SIGSETMASK 1
 
-/* Define if you have the sigvec function.  */
+/* Define to 1 if you have the `sigvec' function. */
 #define HAVE_SIGVEC 1
 
-/* Define if you have the strerror function.  */
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define if you have strchr (always for CVS). */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strerror' function. */
 #define HAVE_STRERROR 1
 
-/* Define if you have the strstr function.  */
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strstr' function. */
 #define HAVE_STRSTR 1
 
-/* Define if you have the strtoul function.  */
+/* Define to 1 if you have the `strtoul' function. */
 #define HAVE_STRTOUL 1
 
-/* Define if you have the tempnam function.  */
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+
+/* Define to 1 if `st_rdev' is member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_RDEV 1
+
+/* Define to 1 if you have the <syslog.h> header file. */
+#define HAVE_SYSLOG_H 1
+
+/* Define to 1 if you have the <sys/bsdtypes.h> header file. */
+/* #undef HAVE_SYS_BSDTYPES_H */
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_DIR_H */
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_NDIR_H */
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/timeb.h> header file. */
+#define HAVE_SYS_TIMEB_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
+
+/* Define to 1 if you have the `tempnam' function. */
 #define HAVE_TEMPNAM 1
 
-/* Define if you have the timezone function.  */
+/* Define to 1 if you have the `timezone' function. */
 #define HAVE_TIMEZONE 1
 
-/* Define if you have the tzset function.  */
+/* Define to 1 if you have the `tzset' function. */
 #define HAVE_TZSET 1
 
-/* Define if you have the usleep function.  */
-/* #undef HAVE_USLEEP */
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
 
-/* Define if you have the valloc function.  */
-#define HAVE_VALLOC 1
+/* Define to 1 if you have the `usleep' function. */
+/* #undef HAVE_USLEEP */
 
-/* Define if you have the vprintf function.  */
-#define HAVE_VPRINTF 1
+/* Define to 1 if you have the <utime.h> header file. */
+#define HAVE_UTIME_H 1
 
-/* Define if you have the wait3 function.  */
-#define HAVE_WAIT3 1
+/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
+#define HAVE_UTIME_NULL 1
 
-/* Define if you have the waitpid function.  */
-#define HAVE_WAITPID 1
+/* Define to 1 if you have the `valloc' function. */
+#define HAVE_VALLOC 1
 
-/* Define if you have the <direct.h> header file.  */
-/* #undef HAVE_DIRECT_H */
+/* Define to 1 if you have the `vfork' function. */
+#define HAVE_VFORK 1
 
-/* Define if you have the <dirent.h> header file.  */
-#define HAVE_DIRENT_H 1
+/* Define to 1 if you have the <vfork.h> header file. */
+/* #undef HAVE_VFORK_H */
 
-/* Define if you have the <errno.h> header file.  */
-#define HAVE_ERRNO_H 1
+/* Define to 1 if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
 
-/* Define if you have the <fcntl.h> header file.  */
-#define HAVE_FCNTL_H 1
+/* Define to 1 if you have the `wait3' function. */
+#define HAVE_WAIT3 1
 
-/* Define if you have the <gssapi.h> header file.  */
-/* #undef HAVE_GSSAPI_H */
+/* Define to 1 if you have the `waitpid' function. */
+#define HAVE_WAITPID 1
 
-/* Define if you have the <gssapi/gssapi.h> header file.  */
-/* #undef HAVE_GSSAPI_GSSAPI_H */
+/* Define to 1 if `fork' works. */
+#define HAVE_WORKING_FORK 1
 
-/* Define if you have the <gssapi/gssapi_generic.h> header file.  */
-/* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */
+/* Define to 1 if `vfork' works. */
+#define HAVE_WORKING_VFORK 1
 
-/* Define if you have the <io.h> header file.  */
-/* #undef HAVE_IO_H */
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
 
-/* Define if you have the <krb5.h> header file.  */
-/* #undef HAVE_KRB5_H */
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "bug-cvs@gnu.org"
 
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "Concurrent Versions System (CVS)"
 
-/* Define if you have the <memory.h> header file.  */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the <ndbm.h> header file.  */
-#define HAVE_NDBM_H 1
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "Concurrent Versions System (CVS) 1.11.2.1-20021024-FreeBSD"
 
-/* Define if you have the <ndir.h> header file.  */
-/* #undef HAVE_NDIR_H */
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "cvs"
 
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.11.2.1-20021024-FreeBSD"
 
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
+/* Path to the pr utility */
+#define PR_PROGRAM "/usr/bin/pr"
 
-/* Define if you have the <sys/bsdtypes.h> header file.  */
-/* #undef HAVE_SYS_BSDTYPES_H */
+/* Define to force lib/regex.c to use malloc instead of alloca. */
+#define REGEX_MALLOC 1
 
-/* Define if you have the <sys/dir.h> header file.  */
-/* #undef HAVE_SYS_DIR_H */
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
 
-/* Define if you have the <sys/file.h> header file.  */
-#define HAVE_SYS_FILE_H 1
+/* If you are working with a large remote repository and a 'cvs checkout' is
+   swamping your network and memory, define these to enable flow control. You
+   will end up with even less probability of a consistent checkout (see
+   Concurrency in cvs.texinfo), but CVS doesn't try to guarantee that anyway.
+   The master server process will monitor how far it is getting behind, if it
+   reaches the high water mark, it will signal the child process to stop
+   generating data when convenient (ie: no locks are held, currently at the
+   beginning of a new directory). Once the buffer has drained sufficiently to
+   reach the low water mark, it will be signalled to start again. */
+#define SERVER_FLOWCONTROL 1
+
+/* The high water mark in bytes for server flow control. Required if
+   SERVER_FLOWCONTROL is defined, and useless otherwise. */
+#define SERVER_HI_WATER (2 * 1024 * 1024)
+
+/* The low water mark in bytes for server flow control. Required if
+   SERVER_FLOWCONTROL is defined, and useless otherwise. */
+#define SERVER_LO_WATER (1 * 1024 * 1024)
+
+/* Define if you want CVS to be able to serve repositories to remote clients.
+   */
+#define SERVER_SUPPORT 1
 
-/* Define if you have the <sys/ndir.h> header file.  */
-/* #undef HAVE_SYS_NDIR_H */
+/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
+/* #undef STAT_MACROS_BROKEN */
 
-/* Define if you have the <sys/param.h> header file.  */
-#define HAVE_SYS_PARAM_H 1
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
 
-/* Define if you have the <sys/resource.h> header file.  */
-#define HAVE_SYS_RESOURCE_H 1
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
 
-/* Define if you have the <sys/select.h> header file.  */
-#define HAVE_SYS_SELECT_H 1
+/* 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 different
+   directory for temporary files). */
+#define TMPDIR_DFLT "/tmp"
+
+/* The default umask to use when creating or otherwise setting file or
+   directory permissions in the repository. Must be a value in the range of 0
+   through 0777. For example, a value of 002 allows group rwx access and world
+   rx access; a value of 007 allows group rwx access but no world access. This
+   value is overridden by the value of the CVSUMASK environment variable,
+   which is interpreted as an octal number. */
+#define UMASK_DFLT 002
+
+/* Define if setmode is required when writing binary data to stdout. */
+/* #undef USE_SETMODE_STDOUT */
 
-/* Define if you have the <sys/stat.h> header file.  */
-#define HAVE_SYS_STAT_H 1
+/* Define if utime requires write access to the file (true on Windows, but not
+   Unix). */
+/* #undef UTIME_EXPECTS_WRITABLE */
 
-/* Define if you have the <sys/time.h> header file.  */
-#define HAVE_SYS_TIME_H 1
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+/* # undef _ALL_SOURCE */
+#endif
 
-/* Define if you have the <sys/timeb.h> header file.  */
-#define HAVE_SYS_TIMEB_H 1
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
 
-/* Define if you have the <sys/types.h> header file.  */
-#define HAVE_SYS_TYPES_H 1
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+/* #undef _POSIX_1_SOURCE */
 
-/* Define if you have the <syslog.h> header file.  */
-#define HAVE_SYSLOG_H 1
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
 
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
+/* Define to force lib/regex.c to define re_comp et al. */
+#define _REGEX_RE_COMP 1
 
-/* Define if you have the <utime.h> header file.  */
-#define HAVE_UTIME_H 1
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
 
-/* Name of package */
-#define PACKAGE "cvs"
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef gid_t */
 
-/* Version number of package */
-#define VERSION "1.11.2"
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef mode_t */
 
-/* Path to the pr utility */
-#define PR_PROGRAM "/usr/bin/pr"
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
 
-/* Define if you have GSSAPI with Kerberos version 5 available. */
-/* #undef HAVE_GSSAPI */
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
 
-/* Define to an alternative value if GSS_C_NT_HOSTBASED_SERVICE isn't defined
-in the gssapi.h header file.  MIT Kerberos 1.2.1 requires this.  Only relevant
-when using GSSAPI. */
-/* #undef GSS_C_NT_HOSTBASED_SERVICE */
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef uid_t */
 
+/* Define as `fork' if `vfork' does not work. */
+/* #undef vfork */