d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit was generated by cvs2svn to compensate for changes in r177391,

Browse Source 
which included commits to RCS files with non-trunk default branches.
This commit is contained in:
David E. O'Brien 2008-03-19 14:46:59 +00:00
commit 5109f5b5c7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=177392
49 changed files with 10294 additions and 7666 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
contrib/cvs/ChangeLog
View File

@ -1,3 +1,96 @@
2008-03-10 Mark D. Baushke <mdb@gnu.org>
* NEWS: Note new IgnoreUnknownConfigKeys CVSROOT/config option.
2008-01-30 Derek Price <derek@ximbiot.com>
* NEWS: Note improved join of removals.
2008-01-27 Mark D. Baushke <mdb@gnu.org>
* configure.in: Look for lshc rather than lsh to avoid problems
under Debian GNU/Linux.
* configure: Regenerated.
* configure.in: Add support for --with-ssh and CVS_SSH.
* NEWS: Note that :extssh: looks to CVS_SSH rather tha CVS_RSH.
* Makefile.in, config.h.in, configure: Regenerated.
2008-01-24 Mark D. Baushke <mdb@gnu.org>
* NEWS: Note that :extssh: method was fixed. New `cvs blame' as an
alias for `cvs annotate' command. New `cvs log -n' switch to undo
a `log -N' entry in a .cvsrc file.
2007-12-14 Larry Jones <lawrence.jones@siemens.com>
* configure.in: Add --disable-mmap.
* configure: Regenerated.
2007-10-19 Derek Price <derek@ximbiot.com>
* cvs.texinfo: Update Ximbiot's address and Copyright dates.
2007-08-22 Derek Price <derek@ximbiot.com>
* NEWS: Note `cvs server' accepts `--allow-root=PATH'. Note further
`cvs add' stops for `CVS' dirs.
* HACKING, NEWS: Note new Autotool versions.
2007-08-16 Derek Price <derek@ximbiot.com>
* NEWS: Note backport of `cvs --allow-root=PATH server'.
2007-06-18 Derek Price <derek@ximbiot.com>
* NEWS: Note import now keeps metadata to itself.
2007-06-15 Derek Price <derek@ximbiot.com>
* NEWS: Note `cvs import CVS-/CVS' fix.
2007-05-07 Derek Price <derek@ximbiot.com>
* NEWS: Note removal of remote `cvs init'.
2006-09-06 Derek Price <derek@ximbiot.com>
* NEWS: Note apply_rcs_diff speedup.
2006-08-28 Derek Price <derek@ximbiot.com>
* NEWS: Note strstr ("/./") assertion fix.
2006-08-25 Derek Price <derek@ximbiot.com>
* TODO (216): Removed.
2006-08-24 Derek Price <derek@ximbiot.com>
[bug #17032]
* NEWS: Note patch w/Name keyword fix.
2006-07-17 Derek Price <derek@ximbiot.com>
* FAQ, INSTALL, README: Update Copyright notice.
* HACKING: Ditto. Update Savannah URLs.
2006-06-29 Derek Price <derek@ximbiot.com>
* NEWS: Note trailing slash fix.
2006-06-28 Larry Jones <lawrence.jones@ugs.com>
* HACKING, NEWS: Note new Autoconf version.
* configure.in (AC_PREREQ): Require Autoconf 2.60.
* config.h.in, configure, **/Makefile.in: Regenerated.
2006-06-28 Derek Price <derek@ximbiot.com>
[bug #16961]
* NEWS: Note double-free fix.
2006-06-09 Derek Price <derek@ximbiot.com>
* NEWS: Note client/server conflict fix.

2
contrib/cvs/FAQ
View File

@ -1,6 +1,6 @@
-------------------------------------------------------------------------------
CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc.
CVS is Copyright (C) 1986-2006 The Free Software Foundation, Inc.
CVS is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

11
contrib/cvs/HACKING
View File

@ -2,7 +2,7 @@ How to write code for CVS
* License of CVS
CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc.
CVS is Copyright (C) 1986-2006 The Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -23,7 +23,10 @@ How to write code for CVS
Patches against the development version of CVS are most likely to be accepted:
$ CVS_RSH=ssh cvs -d:ext:anoncvs@savannah.nongnu.org:/cvsroot/cvs co ccvs
$ cvs -z3 -d:pserver:anonymous@cvs.sv.nongnu.org:/sources/cvs co ccvs
See the Savannah sources page <http://savannah.nongnu.org/cvs/?group=cvs> for
more information.
* Compiler options
@ -145,8 +148,8 @@ have the same versions the developers do, so the rules to run them
automatically aren't included in the generated Makefiles unless you run
configure with the --enable-maintainer-mode option.
The CVS Makefiles and configure script were built using Automake 1.9.6 and
Autoconf 2.59, respectively.
The CVS Makefiles and configure script were built using Automake 1.10 and
Autoconf 2.61, respectively.
There is a known bug in Autoconf 2.57 that will prevent the configure
scripts it generates from working on some platforms. Other combinations of

2
contrib/cvs/INSTALL
View File

@ -1,6 +1,6 @@
-------------------------------------------------------------------------------
CVS is Copyright (C) 1989-2005 The Free Software Foundation, Inc.
CVS is Copyright (C) 1986-2006 The Free Software Foundation, Inc.
CVS is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

136
contrib/cvs/Makefile.in
View File

@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -28,15 +28,11 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@ -62,7 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile
@ -70,10 +66,13 @@ SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-exec-recursive install-info-recursive \
install-recursive installcheck-recursive installdirs-recursive \
pdf-recursive ps-recursive uninstall-info-recursive \
uninstall-recursive
install-dvi-recursive install-exec-recursive \
install-html-recursive install-info-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@ -89,8 +88,6 @@ GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@ -111,6 +108,8 @@ ECHO_T = @ECHO_T@
EDITOR = @EDITOR@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -122,11 +121,8 @@ LIBS = @LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@
MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@
MKDIR_P = @MKDIR_P@
MKTEMP = @MKTEMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@ -148,12 +144,13 @@ STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -161,26 +158,38 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
includeopt = @includeopt@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_default_rsh = @with_default_rsh@
with_default_ssh = @with_default_ssh@
# Unix source subdirs, where we'll want to run lint and etags:
# This is a legacy variable from b4 Automake
@ -250,7 +259,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
$(MAKE) stamp-h1; \
$(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@ -271,7 +280,6 @@ os2/Makefile: $(top_builddir)/config.status $(top_srcdir)/os2/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@
zlib/Makefile: $(top_builddir)/config.status $(top_srcdir)/zlib/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@
uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@ -304,8 +312,7 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@ -407,24 +414,22 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
$(mkdir_p) $(distdir)/. $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/lib $(distdir)/os2 $(distdir)/src $(distdir)/windows-NT $(distdir)/zlib
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
test -d $(distdir) || mkdir $(distdir)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
$(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@ -438,7 +443,7 @@ distdir: $(DISTFILES)
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(mkdir_p) "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@ -446,6 +451,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
am__remove_distdir=: \
am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@ -453,7 +460,7 @@ distdir: $(DISTFILES)
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@ -528,7 +535,7 @@ distcheck: dist
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@ -597,12 +604,20 @@ info-am:
install-data-am:
install-dvi: install-dvi-recursive
install-exec-am:
install-html: install-html-recursive
install-info: install-info-recursive
install-man:
install-pdf: install-pdf-recursive
install-ps: install-ps-recursive
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@ -623,24 +638,25 @@ ps: ps-recursive
ps-am:
uninstall-am: uninstall-info-am
uninstall-am:
uninstall-info: uninstall-info-recursive
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
install-strip
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am clean clean-generic clean-recursive ctags \
ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
dist-tarZ dist-zip distcheck distclean distclean-generic \
distclean-hdr distclean-recursive distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic maintainer-clean-recursive \
mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-info-am
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-data install-data-am \
install-dvi install-dvi-am install-exec install-exec-am \
install-html install-html-am install-info install-info-am \
install-man install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
.PHONY: localcheck remotecheck

64
contrib/cvs/NEWS
View File

@ -1,6 +1,68 @@
Changes since 1.11.21:
Changes since 1.11.22:
**********************
NEW FEATURES
* A new log option -n reverts the -N option which may be in a .cvsrc
file.
* The `cvs blame' command is now a synonym for the `cvs annotate' command.
* The :extssh: method will use $CVS_SSH if set, or fall back on "ssh"
by default (but may be explicitly set using the --with-ssh flag to
configure).
* There is a new IgnoreUnknownConfigKeys option available for
CVSROOT/config to aid in the transition to newer versions of CVS.
BUG FIXES
* Merges of file removals using -j options are a little smarter.
* `cvs add' checks more thoroughly for `CVS' directories in the argument list.
* `cvs server' now accepts `--allow-root=PATH' options.
* `cvs import' no longer attempts to send CVS metadata to the server.
* `cvs import' makes more of an effort not to import paths containing files
and directories named `CVS'.
* The CVS server will no longer allow clients to run `cvs init'.
* Applying diffs when checking out very old revisions has been reduced from an
O(n^2) operation to an O(n) thanks to a patch from Michael J. Smith
<msmith@ideorlando.org> and additional touch-up work from the CVS team.
* Thanks to report from Paul Eggert <eggert@CS.UCLA.EDU>, an assertion failure
that could occur when "." was in the path (e.g. `cvs co /cvsroot/./module')
has been removed.
* Thanks to a report from Peter Toft <pto@linuxbog.dk>, CVS server now sends
correct patch files more often when the RCS `Name' keyword is present in
a working file (bug #17302).
* Thanks to a report from Dan Peterson <dbpete@aol.com>, clients now send the
right set of commands to the server when asked to update directories with
trailing slashes on their name.
* Thanks to a report and patch from <mbarabas@redhat.com>, potential stack
corruption during pserver login is avoided (bug #16961).
* The :extssh: method is now properly recognized as an alias for :ext:.
DEVELOPER ISSUES
* We've standardized on Autoconf version 2.61 to get a bug fix that notes
that the AIX C compiler's default mode isn't quite C89 and sets the
correct mode instead.
* We've standardized on Autoconf version 1.10 because it lets us simplify our
sources.
Changes from 1.11.21 to 1.11.22:
********************************
BUG FIXES
* The CVS client again correctly reports files with conflicts when using

4
contrib/cvs/README
View File

@ -1,8 +1,8 @@
CVS Kit
Copyright (C) 1986-2005 Free Software Foundation, Inc.
Copyright (C) 1986-2006 Free Software Foundation, Inc.
Portions Copyright (C) 1998-2005 Derek Price,
Portions Copyright (C) 1998-2006 Derek Price,
& Ximbiot <http://ximbiot.com>.
Portions Copyright (C) 1993-1994 Brian Berliner.
Portions Copyright (C) 1992 Brian Berliner and Jeff Polk.

3
contrib/cvs/TODO
View File

@ -815,9 +815,6 @@ glibc version.
where this makes sense? Would it be simpler? It seems to me the
major operational differences lie in the file list construction.
216. Avoid command-line keyword expansion modes overriding binary mode
(or make binary mode completely separate from keyword expansion mode).
218. Fix "checkout -d ." in client/server mode.
221. Handle spaces in file/directory names. (Most, if not all, of the

184
contrib/cvs/aclocal.m4 vendored
View File

@ -1,7 +1,7 @@
# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
# 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -11,7 +11,12 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
m4_if(m4_PACKAGE_VERSION, [2.61],,
[m4_fatal([this file was generated for autoconf 2.61.
You have another version of autoconf. If you want to use that,
you should regenerate the build system entirely.], [63])])
# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -21,14 +26,29 @@
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.10], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
# _AM_AUTOCONF_VERSION(VERSION)
# -----------------------------
# aclocal traces this macro to find the Autoconf version.
# This is a private macro too. Using m4_define simplifies
# the logic in aclocal, which can simply ignore this definition.
m4_define([_AM_AUTOCONF_VERSION], [])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced.
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.9.6])])
[AM_AUTOMAKE_VERSION([1.10])dnl
_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@ -85,14 +105,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 7
# serial 8
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@ -101,8 +121,10 @@ AC_DEFUN([AM_CONDITIONAL],
[AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])
AC_SUBST([$1_FALSE])
AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
@ -116,15 +138,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 8
# serial 9
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@ -152,6 +173,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
[$1], UPC, [depcc="$UPC" am_compiler_list=],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
@ -217,6 +239,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@ -269,7 +292,8 @@ if test "x$enable_dependency_tracking" != xno; then
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@ -294,8 +318,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
# So let's grep whole file.
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@ -354,8 +379,8 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -378,16 +403,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_PREREQ([2.58])dnl
[AC_PREREQ([2.60])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
# test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
fi
# test whether we have cygpath
@ -407,6 +436,9 @@ m4_ifval([$2],
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@ -442,6 +474,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
[_AM_DEPENDENCIES(OBJC)],
[define([AC_PROG_OBJC],
defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
])
@ -477,7 +513,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
install_sh=${install_sh-"$am_aux_dir/install-sh"}
install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@ -582,13 +618,14 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 3
# serial 5
# AM_PROG_CC_C_O
# --------------
@ -596,6 +633,7 @@ rm -f confinc confmf
AC_DEFUN([AM_PROG_CC_C_O],
[AC_REQUIRE([AC_PROG_CC_C_O])dnl
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([compile])dnl
# FIXME: we rely on the cache variable name because
# there is no other way.
set dummy $CC
@ -608,18 +646,22 @@ if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
CC="$am_aux_dir/compile $CC"
fi
dnl Make sure AC_PROG_CC is never called again, or it will override our
dnl setting of CC.
m4_define([AC_PROG_CC],
[m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 4
# serial 5
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@ -635,6 +677,7 @@ AC_SUBST($1)])
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
@ -645,7 +688,7 @@ else
fi
])
# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -653,60 +696,23 @@ fi
# AM_PROG_MKDIR_P
# ---------------
# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
#
# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
# created by `make install' are always world readable, even if the
# installer happens to have an overly restrictive umask (e.g. 077).
# This was a mistake. There are at least two reasons why we must not
# use `-m 0755':
# - it causes special bits like SGID to be ignored,
# - it may be too restrictive (some setups expect 775 directories).
#
# Do not use -m 0755 and let people choose whatever they expect by
# setting umask.
#
# We cannot accept any implementation of `mkdir' that recognizes `-p'.
# Some implementations (such as Solaris 8's) are not thread-safe: if a
# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
# concurrently, both version can detect that a/ is missing, but only
# one can create it and the other will error out. Consequently we
# restrict ourselves to GNU make (using the --version option ensures
# this.)
# Check for `mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
# We used to keeping the `.' as first argument, in order to
# allow $(mkdir_p) to be used without argument. As in
# $(mkdir_p) $(somedir)
# where $(somedir) is conditionally defined. However this is wrong
# for two reasons:
# 1. if the package is installed by a user who cannot write `.'
# make install will fail,
# 2. the above comment should most certainly read
# $(mkdir_p) $(DESTDIR)$(somedir)
# so it does not work when $(somedir) is undefined and
# $(DESTDIR) is not.
# To support the latter case, we have to write
# test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
# so the `.' trick is pointless.
mkdir_p='mkdir -p --'
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already
# exists.
for d in ./-p ./--version;
do
test -d $d && rmdir $d
done
# $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
if test -f "$ac_aux_dir/mkinstalldirs"; then
mkdir_p='$(mkinstalldirs)'
else
mkdir_p='$(install_sh) -d'
fi
fi
AC_SUBST([mkdir_p])])
[AC_PREREQ([2.60])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
dnl while keeping a definition of mkdir_p for backward compatibility.
dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
dnl Makefile.ins that do not define MKDIR_P, so we do our own
dnl adjustment using top_builddir (which is defined more often than
dnl MKDIR_P).
AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
case $mkdir_p in
[[\\/$]]* | ?:[[\\/]]*) ;;
*/*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
esac
])
# Helper functions for option handling. -*- Autoconf -*-
@ -818,9 +824,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Copyright (C) 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.

172
contrib/cvs/compile
View File

@ -1,8 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
# Copyright 1999, 2000 Free Software Foundation, Inc.
scriptversion=2005-05-14.22
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@ -17,66 +18,125 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# Usage:
# compile PROGRAM [ARGS]...
# `-o FOO.o' is removed from the args passed to the actual compile.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
prog=$1
shift
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
case $1 in
'')
echo "$0: No command. Try \`$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]
Wrapper for compilers which do not understand `-c -o'.
Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.
If you are trying to build a whole package this is not the
right script to run: please start by reading the file `INSTALL'.
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "compile $scriptversion"
exit $?
;;
esac
ofile=
cfile=
args=
while test $# -gt 0; do
case "$1" in
-o)
ofile=$2
shift
;;
*.c)
cfile=$1
args="$args $1"
;;
*)
args="$args $1"
;;
esac
shift
eat=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as `compile cc -o foo foo.c'.
# So we strip `-o arg' only if arg is an object.
eat=1
case $2 in
*.o | *.obj)
ofile=$2
;;
*)
set x "$@" -o "$2"
shift
;;
esac
;;
*.c)
cfile=$1
set x "$@" "$1"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
test -z "$ofile" && {
echo "compile: no \`-o' option seen" 1>&2
exit 1
}
test -z "$cfile" && {
echo "compile: no \`.c' file seen" 1>&2
exit 1
}
# Name of file we expect compiler to create.
cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
lockdir=`echo $ofile | sed -e 's|/|_|g'`
while true; do
if mkdir $lockdir > /dev/null 2>&1; then
break
fi
sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir $lockdir; exit 1" 1 2 15
# Run the compile.
"$prog" $args
status=$?
if test -f "$cofile"; then
mv "$cofile" "$ofile"
if test -z "$ofile" || test -z "$cfile"; then
# If no `-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no
# `.c' file was seen then we are probably linking. That is also
# ok.
exec "$@"
fi
rmdir $lockdir
exit $status
# Name of file we expect compiler to create.
cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
fi
sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
"$@"
ret=$?
if test -f "$cofile"; then
mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:

6
contrib/cvs/config.h.in
View File

@ -433,6 +433,10 @@
it. */
#undef SIZE_MAX
/* The default remote shell to use, if one does not specify the CVS_SSH
environment variable. */
#undef SSH_DFLT
/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
#undef STAT_MACROS_BROKEN
@ -506,7 +510,7 @@
/* Define to `int' if <sys/types.h> does not define. */
#undef pid_t
/* Define to `unsigned' if <sys/types.h> does not define. */
/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
/* Define to `int' if <sys/types.h> doesn't define. */

12229
contrib/cvs/configure vendored
View File

File diff suppressed because it is too large Load Diff

80
contrib/cvs/configure.in
View File

@ -1,9 +1,9 @@
dnl configure.in for cvs
AC_INIT([Concurrent Versions System (CVS)],[1.11.22],
AC_INIT([Concurrent Versions System (CVS)],[1.11.22.1],
[bug-cvs@nongnu.org],[cvs])
AC_CONFIG_SRCDIR(src/cvs.h)
AM_INIT_AUTOMAKE([gnu 1.7.9 dist-bzip2 no-define])
AC_PREREQ(2.58)
AC_PREREQ(2.60)
AC_PREFIX_PROGRAM(cvs)
AM_CONFIG_HEADER(config.h)
@ -300,9 +300,6 @@ if test "$ac_cv_func_fnmatch_works" = no; then
AC_LIBSOURCE(fnmatch.h.in)
fi
dnl for the buffer routine replacements
AC_FUNC_MMAP
# Try to find connect and gethostbyname.
AC_CHECK_LIB(nsl, main)
AC_SEARCH_LIBS(connect, xnet socket inet,
@ -497,6 +494,53 @@ dnl
dnl end --with-editor
dnl
dnl
dnl begin --with-ssh
dnl
# What remote shell transport should the :extssh: client cvs default to using?
AC_ARG_WITH(
[ssh],
AC_HELP_STRING(
[--with-ssh],
[The default remote shell CVS will use for :extssh: transport
(default autodetects)]), ,
[with_ssh="ssh lshc ssh2"])
if test no = "$with_ssh"; then
AC_MSG_WARN([Failed to find usable remote shell. Using 'ssh'.])
with_ssh=ssh
elif test yes = "$with_ssh"; then
# Make --with-ssh mean the same thing as --with-ssh=ssh
with_ssh=ssh
fi
if echo $with_ssh |grep ^/ >/dev/null; then
# If $with_ssh is an absolute path, issue a warning if the executable
# doesn't exist or isn't usable, but then trust the user and use it
# regardless
with_default_ssh=$with_ssh
AC_MSG_CHECKING([for a remote shell])
if ! test -f $with_ssh \
|| ! test -x $with_ssh; then
# warn the user that they may encounter problems
AC_MSG_WARN([$with_ssh is not a path to an executable file])
fi
else
# Search for a remote shell
AC_CHECK_PROGS([with_default_ssh], [$with_ssh], "ssh")
fi
AC_DEFINE_UNQUOTED(
[SSH_DFLT], ["$with_default_ssh"],
[The default remote shell to use, if one does not specify the
CVS_SSH environment variable.])
dnl done with finding a default CVS_SSH value
dnl
dnl end --with-ssh
dnl
dnl
dnl begin --with-rsh
dnl
@ -514,7 +558,7 @@ AC_ARG_WITH(
dnl and `remsh' is the remote shell, but look for it first since it
dnl probably won't exist on any platform where it shouldn't be preferred
dnl to `rsh'.
[with_rsh="remsh rsh ssh"])
[with_rsh="remsh rsh ssh lshc ssh2"])
if test no = "$with_rsh"; then
AC_MSG_WARN([Failed to find usable remote shell. Using 'rsh'.])
@ -661,6 +705,11 @@ dnl
dnl Done setting CVS Administrator Group
dnl
dnl
dnl end --with-*
dnl
dnl
dnl Set the NDBM library to use.
dnl
@ -699,17 +748,24 @@ dnl Done selecting NDBM library.
dnl
dnl
dnl end --with-*
dnl
dnl
dnl begin --enables
dnl
dnl Allow mmap for the buffer routine replacements to be disabled in
dnl case of problems.
AC_ARG_ENABLE(
[mmap],
AC_HELP_STRING(
[--disable-mmap],
[Don't mmap RCS files]))
if test no != "$enable_mmap"; then
AC_FUNC_MMAP
fi
# Check for options requesting client and server feature. If none are
# given and we have connect(), we want the full client & server arrangement.
AC_ARG_ENABLE(

93
contrib/cvs/contrib/Makefile.in
View File

@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -33,15 +33,11 @@
# GNU General Public License for more details.
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@ -84,8 +80,6 @@ contribDATA_INSTALL = $(INSTALL_DATA)
DATA = $(contrib_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@ -106,6 +100,8 @@ ECHO_T = @ECHO_T@
EDITOR = @EDITOR@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -117,11 +113,8 @@ LIBS = @LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@
MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@
MKDIR_P = @MKDIR_P@
MKTEMP = @MKTEMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@ -143,12 +136,13 @@ STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -156,26 +150,38 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
includeopt = @includeopt@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_default_rsh = @with_default_rsh@
with_default_ssh = @with_default_ssh@
contribdir = $(pkgdatadir)/contrib
contrib_SCRIPTS = \
check_cvs \
@ -282,7 +288,7 @@ sccs2rcs: $(top_builddir)/config.status $(srcdir)/sccs2rcs.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-contribSCRIPTS: $(contrib_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(contribdir)" || $(mkdir_p) "$(DESTDIR)$(contribdir)"
test -z "$(contribdir)" || $(MKDIR_P) "$(DESTDIR)$(contribdir)"
@list='$(contrib_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
@ -299,10 +305,9 @@ uninstall-contribSCRIPTS:
echo " rm -f '$(DESTDIR)$(contribdir)/$$f'"; \
rm -f "$(DESTDIR)$(contribdir)/$$f"; \
done
uninstall-info-am:
install-contribDATA: $(contrib_DATA)
@$(NORMAL_INSTALL)
test -z "$(contribdir)" || $(mkdir_p) "$(DESTDIR)$(contribdir)"
test -z "$(contribdir)" || $(MKDIR_P) "$(DESTDIR)$(contribdir)"
@list='$(contrib_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@ -325,22 +330,21 @@ CTAGS:
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
$(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@ -356,7 +360,7 @@ check: check-am
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(contribdir)" "$(DESTDIR)$(contribdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@ -404,12 +408,20 @@ info-am:
install-data-am: install-contribDATA install-contribSCRIPTS \
install-data-local
install-dvi: install-dvi-am
install-exec-am:
install-html: install-html-am
install-info: install-info-am
install-man:
install-pdf: install-pdf-am
install-ps: install-ps-am
installcheck-am:
maintainer-clean: maintainer-clean-am
@ -429,18 +441,21 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-contribDATA uninstall-contribSCRIPTS \
uninstall-info-am uninstall-local
uninstall-local
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-contribDATA install-contribSCRIPTS \
install-data install-data-am install-data-local install-exec \
install-exec-am install-info install-info-am install-man \
install-data install-data-am install-data-local install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-contribDATA uninstall-contribSCRIPTS \
uninstall-info-am uninstall-local
uninstall-contribDATA uninstall-contribSCRIPTS uninstall-local
# we'd rather have a link here rather than two copies of a script

159
contrib/cvs/depcomp
View File

@ -1,7 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
# Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
scriptversion=2006-10-15.18
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -15,8 +18,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@ -25,22 +28,45 @@
# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
case $1 in
'')
echo "$0: No command. Try \`$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: depcomp [--help] [--version] PROGRAM [ARGS]
Run PROGRAMS ARGS to compile a file, generating dependencies
as side-effects.
Environment variables:
depmode Dependency tracking mode.
source Source file read by `PROGRAMS ARGS'.
object Object file output by `PROGRAMS ARGS'.
DEPDIR directory where to store dependencies.
depfile Dependency file to output.
tmpdepfile Temporary file to use when outputing dependencies.
libtool Whether libtool is used (yes/no).
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "depcomp $scriptversion"
exit $?
;;
esac
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
# `libtool' can also be set to `yes' or `no'.
if test -z "$depfile"; then
base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
dir=`echo "$object" | sed 's,/.*$,/,'`
if test "$dir" = "$object"; then
dir=
fi
# FIXME: should be _deps on DOS.
depfile="$dir.deps/$base"
fi
# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
depfile=${depfile-`echo "$object" |
sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
@ -66,7 +92,20 @@ gcc3)
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
"$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
## Unfortunately, FreeBSD c89 acceptance of flags depends upon
## the command line argument order; so add the flags where they
## appear in depend2.am. Note that the slowdown incurred here
## affects only configure: in makefiles, %FASTDEP% shortcuts this.
for arg
do
case $arg in
-c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
*) set fnord "$@" "$arg" ;;
esac
shift # fnord
shift # $arg
done
"$@"
stat=$?
if test $stat -eq 0; then :
else
@ -251,6 +290,46 @@ icc)
rm -f "$tmpdepfile"
;;
hp2)
# The "hp" stanza above does not work with aCC (C++) and HP's ia64
# compilers, which have integrated preprocessors. The correct option
# to use with these is +Maked; it writes dependencies to a file named
# 'foo.d', which lands next to the object file, wherever that
# happens to be.
# Much of this is similar to the tru64 case; see comments there.
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
test "x$dir" = "x$object" && dir=
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
tmpdepfile1=$dir$base.d
tmpdepfile2=$dir.libs/$base.d
"$@" -Wc,+Maked
else
tmpdepfile1=$dir$base.d
tmpdepfile2=$dir$base.d
"$@" +Maked
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile1" "$tmpdepfile2"
exit $stat
fi
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
do
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
# Add `dependent.h:' lines.
sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
rm -f "$tmpdepfile" "$tmpdepfile2"
;;
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@ -262,27 +341,43 @@ tru64)
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
tmpdepfile1="$dir.libs/$base.lo.d"
tmpdepfile2="$dir.libs/$base.d"
# With Tru64 cc, shared objects can also be used to make a
# static library. This mechanism is used in libtool 1.4 series to
# handle both shared and static libraries in a single compilation.
# With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
#
# With libtool 1.5 this exception was removed, and libtool now
# generates 2 separate objects for the 2 libraries. These two
# compilations output dependencies in $dir.libs/$base.o.d and
# in $dir$base.o.d. We have to check for both files, because
# one of the two compilations can be disabled. We should prefer
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
# automatically cleaned when .libs/ is deleted, while ignoring
# the former would cause a distcleancheck panic.
tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
tmpdepfile2=$dir$base.o.d # libtool 1.5
tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
"$@" -Wc,-MD
else
tmpdepfile1="$dir$base.o.d"
tmpdepfile2="$dir$base.d"
tmpdepfile1=$dir$base.o.d
tmpdepfile2=$dir$base.d
tmpdepfile3=$dir$base.d
tmpdepfile4=$dir$base.d
"$@" -MD
fi
stat=$?
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile1" "$tmpdepfile2"
rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
exit $stat
fi
if test -f "$tmpdepfile1"; then
tmpdepfile="$tmpdepfile1"
else
tmpdepfile="$tmpdepfile2"
fi
for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
do
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
# That's a tab and a space in the [].
@ -426,7 +521,8 @@ cpp)
done
"$@" -E |
sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
@ -477,3 +573,12 @@ none)
esac
exit 0
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:

96
contrib/cvs/diff/Makefile.in
View File

@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -14,15 +14,11 @@
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@ -55,7 +51,7 @@ am_libdiff_a_OBJECTS = diff.$(OBJEXT) diff3.$(OBJEXT) \
ifdef.$(OBJEXT) util.$(OBJEXT) dir.$(OBJEXT) version.$(OBJEXT) \
side.$(OBJEXT)
libdiff_a_OBJECTS = $(am_libdiff_a_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@ -68,8 +64,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@ -90,6 +84,8 @@ ECHO_T = @ECHO_T@
EDITOR = @EDITOR@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -101,11 +97,8 @@ LIBS = @LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@
MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@
MKDIR_P = @MKDIR_P@
MKTEMP = @MKTEMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@ -127,12 +120,13 @@ STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -140,26 +134,38 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
includeopt = @includeopt@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_default_rsh = @with_default_rsh@
with_default_ssh = @with_default_ssh@
INCLUDES = -I$(top_srcdir)/lib
noinst_LIBRARIES = libdiff.a
libdiff_a_SOURCES = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c \
@ -231,19 +237,18 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
uninstall-info-am:
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@ -294,22 +299,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
$(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@ -370,12 +374,20 @@ info-am:
install-data-am:
install-dvi: install-dvi-am
install-exec-am:
install-html: install-html-am
install-info: install-info-am
install-man:
install-pdf: install-pdf-am
install-ps: install-ps-am
installcheck-am:
maintainer-clean: maintainer-clean-am
@ -395,18 +407,22 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-info-am
uninstall-am:
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-noinstLIBRARIES ctags distclean distclean-compile \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-strip installcheck \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-info-am
uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

60
contrib/cvs/doc/ChangeLog
View File

@ -1,3 +1,63 @@
2008-03-10 Mark D. Baushke <mdb@gnu.org>
* cvs.texinfo (config): Document the IgnoreUnknownConfigKeys
option.
2008-01-27 Mark D. Baushke <mdb@gnu.org>
* cvs.texinfo: Document use of --with-ssh flag to configure and
how :extssh: uses the CVS_SSH environment variable or "ssh".
* stamp-vti, version.texi: Regenerated.
* cvs.texinfo: Update copyright for 2008.
2008-01-24 Mark D. Baushke <mdb@gnu.org>
* cvs.texinfo (log options): Document the new cvs log -n
switch to reverse the -N switch.
* cvs.texinfo (annotate & rannotate): Document "blame" as a
synonym for the "annotate" command.
(Patch suggested by "David O'Brien" <obrien@FreeBSD.org>)
* cvs.1, stamp-1, stamp-vti, version-client.texi, version.texi:
Regenerated.
2007-05-07 Derek Price <derek@ximbiot.com>
* cvsclient.text: Remove references to remote `init' command.
2006-08-25 Derek Price <derek@ximbiot.com>
* cvsclient.texi (Requests, Responses): Remove reference to the
obsolete checkin & update programs.
2006-08-21 Derek Price <derek@ximbiot.com>
* cvs.texinfo (man page nodes): Tweak grammar, especially refs.
(Original patch from Kevin R. Bulgrien <kbulgrien@att.net>.)
* mkman.pl (do_keyword): Process ref and p?xref differently.
(Original patch from Kevin R. Bulgrien <kbulgrien@att.net>.)
2006-08-11 Mark D. Baushke <mdb@gnu.org>
* cvs.texinfo, cvsclient.texi: Fix some typos.
(inspired by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>)
2006-07-16 Derek Price <derek@ximbiot.com>
* cvs.texinfo (File permissions): Correct punctuation.
2006-07-11 Larry Jones <lawrence.jones@ugs.com>
* cvs.texinfo (log options): -b is a revision selection option, not
a header field option.
2006-06-22 Larry Jones <lawrence.jones@ugs.com>
* cvs.texinfo (user-defined logging, Informing others): Remove
references to the obsolete -i module option.
2006-06-08 Derek Price <derek@ximbiot.com>
* cvsclient.texi (Requests): Add Empty-conflicts.

46
contrib/cvs/doc/HACKING.DOCS Normal file
View File

@ -0,0 +1,46 @@
Here's some of the texinfo conventions the CVS documentation uses:
@code{ ... } command usage & command snippets, including
command names.
@var{ ... } variables - text which the user is expected to
replace with some meaningful text of their own
in actual usage.
@file{ ... } file names
@samp{ ... } for most anything else you need quotes around
(often still misused for command snippets)
@example ... @end example example command usage and output, etc.
@emph{ ... } emphasis - warnings, stress, etc. This will be
bracketed by underline characters in info files
(_ ... _) and in italics in PDF & probably in
postscript & HTML.
@strong{ ... } Similar to @emph{}, but the effect is to
bracket with asterisks in info files (* ... *)
and in bold in PDF & probably in postscript &
HTML.
@noindent Suppresses indentation of the following
paragraph. This can ocassionally be useful
after examples and the like.
@cindex ... Add a tag to the index.
@pxref{ ... } Cross reference in parentheses.
@xref{ ... } Cross reference.
Preformatted text should be marked as such (use @example... there may be other
ways) since many of the final output formats can use relational fonts otherwise
and marking it as formatted should restrict it to a fixed width font. Keep
this sort of text to 80 characters or less per line since larger may not be
properly viewable for some info users.
There are dictionary lists and function definition markers. Scan cvs.texinfo
for their usage. There may be table definitions as well but I haven't used
them.
Use lots of index markers. Scan the index for the current style. Try to reuse
an existing entry if the meaning is similar.
`makeinfo' 3.11 or greater is required for output generation since earlier
versions do not support the @ifnottex & @ifnothtml commands. There may be
other commands used in `cvs.texinfo' that are unsupported by earlier versions
of `makeinfo' by the time you read this.
For more on using texinfo docs, see the `info texinfo' documentation or
http://www.gnu.org/manual/texinfo/texinfo.html .

201
contrib/cvs/doc/Makefile.in
View File

@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -30,15 +30,11 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@ -75,13 +71,17 @@ MAKEINFOHTML = $(MAKEINFO) --html
AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
DVIPS = dvips
am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(man_MANS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@ -102,6 +102,8 @@ ECHO_T = @ECHO_T@
EDITOR = @EDITOR@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -113,11 +115,8 @@ LIBS = @LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@
MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@
MKDIR_P = @MKDIR_P@
MKTEMP = @MKTEMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@ -139,12 +138,13 @@ STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -152,26 +152,38 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
includeopt = @includeopt@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_default_rsh = @with_default_rsh@
with_default_ssh = @with_default_ssh@
info_TEXINFOS = cvs.texinfo cvsclient.texi
man_MANS = $(srcdir)/cvs.1
PSS = \
@ -388,9 +400,26 @@ maintainer-clean-1:
TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
$(DVIPS) -o $@ $<
uninstall-dvi-am:
@$(NORMAL_UNINSTALL)
@list='$(DVIS)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
rm -f "$(DESTDIR)$(dvidir)/$$f"; \
done
uninstall-html-am:
@$(NORMAL_UNINSTALL)
@list='$(HTMLS)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
done
uninstall-info-am:
@$(PRE_UNINSTALL)
@if (install-info --version && \
@if test -d '$(DESTDIR)$(infodir)' && \
(install-info --version && \
install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
list='$(INFO_DEPS)'; \
for file in $$list; do \
@ -404,12 +433,28 @@ uninstall-info-am:
for file in $$list; do \
relfile=`echo "$$file" | sed 's|^.*/||'`; \
relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
(if cd "$(DESTDIR)$(infodir)"; then \
(if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
else :; fi); \
done
uninstall-pdf-am:
@$(NORMAL_UNINSTALL)
@list='$(PDFS)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
done
uninstall-ps-am:
@$(NORMAL_UNINSTALL)
@list='$(PSS)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
rm -f "$(DESTDIR)$(psdir)/$$f"; \
done
dist-info: $(INFO_DEPS)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
list='$(INFO_DEPS)'; \
@ -418,10 +463,13 @@ dist-info: $(INFO_DEPS)
$(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
esac; \
if test -f $$base; then d=.; else d=$(srcdir); fi; \
for file in $$d/$$base*; do \
relfile=`expr "$$file" : "$$d/\(.*\)"`; \
test -f $(distdir)/$$relfile || \
cp -p $$file $(distdir)/$$relfile; \
base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
if test -f $$file; then \
relfile=`expr "$$file" : "$$d/\(.*\)"`; \
test -f $(distdir)/$$relfile || \
cp -p $$file $(distdir)/$$relfile; \
else :; fi; \
done; \
done
@ -443,7 +491,7 @@ maintainer-clean-aminfo:
done
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@ -494,23 +542,21 @@ CTAGS:
distdir: $(DISTFILES)
$(mkdir_p) $(distdir)/$(srcdir)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
$(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@ -529,7 +575,7 @@ check: check-am
all-am: Makefile $(INFO_DEPS) $(MANS)
installdirs:
for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@ -578,13 +624,42 @@ info-am: $(INFO_DEPS)
install-data-am: install-info-am install-man
install-dvi: install-dvi-am
install-dvi-am: $(DVIS)
@$(NORMAL_INSTALL)
test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
@list='$(DVIS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(dvidir)/$$f'"; \
$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/$$f"; \
done
install-exec-am:
install-html: install-html-am
install-html-am: $(HTMLS)
@$(NORMAL_INSTALL)
test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
@list='$(HTMLS)'; for p in $$list; do \
if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
if test -d "$$d$$p"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
$(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
$(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \
else \
echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
fi; \
done
install-info: install-info-am
install-info-am: $(INFO_DEPS)
@$(NORMAL_INSTALL)
test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
list='$(INFO_DEPS)'; \
for file in $$list; do \
@ -614,6 +689,28 @@ install-info-am: $(INFO_DEPS)
else : ; fi
install-man: install-man1
install-pdf: install-pdf-am
install-pdf-am: $(PDFS)
@$(NORMAL_INSTALL)
test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
@list='$(PDFS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
done
install-ps: install-ps-am
install-ps-am: $(PSS)
@$(NORMAL_INSTALL)
test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
@list='$(PSS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(psdir)/$$f'"; \
$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(psdir)/$$f"; \
done
installcheck-am:
maintainer-clean: maintainer-clean-am
@ -635,21 +732,27 @@ ps: ps-am
ps-am: $(PSS)
uninstall-am: uninstall-info-am uninstall-man
uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
uninstall-man uninstall-pdf-am uninstall-ps-am
uninstall-man: uninstall-man1
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic dist-info \
distclean distclean-generic distdir dvi dvi-am html html-am \
info info-am install install-am install-data install-data-am \
install-exec install-exec-am install-info install-info-am \
install-man install-man1 install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-1 maintainer-clean-aminfo \
maintainer-clean-generic maintainer-clean-vti mostlyclean \
mostlyclean-1 mostlyclean-aminfo mostlyclean-generic \
mostlyclean-vti pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-info-am uninstall-man uninstall-man1
install-dvi install-dvi-am install-exec install-exec-am \
install-html install-html-am install-info install-info-am \
install-man install-man1 install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-1 \
maintainer-clean-aminfo maintainer-clean-generic \
maintainer-clean-vti mostlyclean mostlyclean-1 \
mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \
pdf-am ps ps-am uninstall uninstall-am uninstall-dvi-am \
uninstall-html-am uninstall-info-am uninstall-man \
uninstall-man1 uninstall-pdf-am uninstall-ps-am
doc: info pdf

387
contrib/cvs/doc/cvs.1
View File

@ -235,7 +235,7 @@ left of \fBcvs_command\fR) are:
\fB--allow-root=\fIrootdir\fB\fR
.IP "" 2
Specify legal \fBcvsroot\fR directory. See
see node `Password authentication server\(aq in the CVS manual.
`Password authentication server\(aq in the CVS manual.
.SP
.IX "Authentication, stream"
.IX "Stream authentication"
@ -281,7 +281,7 @@ vice versa.)
.IP "" 2
Use \fIcvs_root_directory\fR as the root directory
pathname of the repository. Overrides the setting of
the \fB$CVSROOT\fR environment variable. see node `Repository\(aq in the CVS manual.
the \fB$CVSROOT\fR environment variable. See `Repository\(aq in the CVS manual.
.SP
.IX "EDITOR, overriding"
.IX "Overriding EDITOR"
@ -291,7 +291,7 @@ the \fB$CVSROOT\fR environment variable. see node `Repository\(aq in the CVS ma
Use \fIeditor\fR to enter revision log information. Overrides the
setting of the \fB$CVSEDITOR\fR and \fB$EDITOR\fR
environment variables. For more information, see
see node `Committing your changes\(aq in the CVS manual.
`Committing your changes\(aq in the CVS manual.
.SP
.IP "" 0
\fB-f\fR
@ -544,14 +544,14 @@ give an error if you mistype a tag name.
\fBWARNING: The \fBcommit\fB and \fBremove\fB
commands also have a
\fB-f\fB option, but it has a different behavior for
those commands. See see node `commit options\(aq in the CVS manual, and
see node `Removing files\(aq in the CVS manual.\fR
those commands. See `commit options\(aq in the CVS manual, and
`Removing files\(aq in the CVS manual.\fR
.SP
.IP "" 0
\fB-k \fIkflag\fB\fR
.IP "" 2
Alter the default processing of keywords.
see node `Keyword substitution\(aq in the CVS manual, for the meaning of
See `Keyword substitution\(aq in the CVS manual, for the meaning of
\fIkflag\fR. Your \fIkflag\fR specification is
\fIsticky\fR when you use it to create a private copy
of a source file; that is, when you use this option
@ -603,7 +603,7 @@ and \fBrtag\fR commands.
.IP "" 0
\fB-P\fR
.IP "" 2
Prune empty directories. See see node `Removing directories\(aq in the CVS manual.
Prune empty directories. See `Removing directories\(aq in the CVS manual.
.SP
.IP "" 0
\fB-p\fR
@ -642,8 +642,8 @@ future update commands, until you specify otherwise (for more information
on sticky tags/dates, see node `Sticky tags\(aq in the CVS manual).
.SP
The tag can be either a symbolic or numeric tag, as
described in see node `Tags\(aq in the CVS manual, or the name of a branch, as
described in see node `Branching and merging\(aq in the CVS manual.
described in `Tags\(aq in the CVS manual, or the name of a branch, as
described in `Branching and merging\(aq in the CVS manual.
When a command expects a specific revision,
the name of a branch is interpreted as the most recent
revision on that branch.
@ -671,6 +671,111 @@ Available with the following commands: \fBimport\fR,
and \fBupdate\fR.
.SP
.SP
.SH "add"
.SS "Add files and directories to the repository"
.IX "add (subcommand)"
.SP
.IP "\(bu" 2
Synopsis: add [-k rcs-kflag] [-m message] files...
.IP "\(bu" 2
Requires: repository, working directory.
.IP "\(bu" 2
Changes: repository, working directory.
.SP
The \fBadd\fR command is used to present new files
and directories for addition into the \fBcvs\fR
repository. When \fBadd\fR is used on a directory,
a new directory is created in the repository
immediately. When used on a file, only the working
directory is updated. Changes to the repository are
not made until the \fBcommit\fR command is used on
the newly added file.
.SP
The \fBadd\fR command also resurrects files that
have been previously removed. This can be done
before or after the \fBcommit\fR command is used
to finalize the removal of files. Resurrected files
are restored into the working directory at the time
the \fBadd\fR command is executed.
.SP
.SH "add options"
.SP
These standard options are supported by \fBadd\fR
(see node `Common options\(aq in the CVS manual, for a complete description of
them):
.SP
.IP "" 0
\fB-k \fIkflag\fB\fR
.IP "" 2
Process keywords according to \fIkflag\fR. See
`Keyword substitution\(aq in the CVS manual.
This option is sticky; future updates of
this file in this working directory will use the same
\fIkflag\fR. The \fBstatus\fR command can be viewed
to see the sticky options. For more information on
the \fBstatus\fR command, see node `Invoking CVS\(aq in the CVS manual.
.SP
.IP "" 0
\fB-m \fImessage\fB\fR
.IP "" 2
Use \fImessage\fR as the log message, instead of
invoking an editor.
.SP
.SH "add examples"
.SP
.SS "Adding a directory"
.SP
.PD 0
.SP
.IP "" 2
$ mkdir doc
.IP "" 2
$ cvs add doc
.IP "" 2
Directory /path/to/repository/doc added to the repository
.PD
.IP "" 0
.SP
.SS "Adding a file"
.SP
.PD 0
.SP
.SP
.IP "" 2
$ >TODO
.IP "" 2
$ cvs add TODO
.IP "" 2
cvs add: scheduling file \`TODO\(aq for addition
.IP "" 2
cvs add: use \(aqcvs commit\(aq to add this file permanently
.PD
.IP "" 0
.SP
.SS "Undoing a \fBremove\fR command"
.SP
.PD 0
.SP
.IP "" 2
$ rm -f makefile
.IP "" 2
$ cvs remove makefile
.IP "" 2
cvs remove: scheduling \`makefile\(aq for removal
.IP "" 2
cvs remove: use \(aqcvs commit\(aq to remove this file permanently
.IP "" 2
$ cvs add makefile
.IP "" 2
U makefile
.IP "" 2
cvs add: makefile, version 1.2, resurrected
.PD
.IP "" 0
.SP
.SH "admin"
.SS "Administration"
.IX "Admin (subcommand)"
@ -741,7 +846,7 @@ There can be no space between \fB-b\fR and its argument.
Sets the comment leader to \fIstring\fR. The comment
leader is not used by current versions of \fBcvs\fR or
\fBrcs\fR 5.7. Therefore, you can almost surely not
worry about it. see node `Keyword substitution\(aq in the CVS manual.
worry about it. See `Keyword substitution\(aq in the CVS manual.
.SP
.IP "" 0
\fB-e[\fIlogins\fB]\fR
@ -772,7 +877,7 @@ new \fBrcs\fR file, without depositing a revision. With
\fB-k\fIsubst\fB\fR
.IP "" 2
Set the default keyword
substitution to \fIsubst\fR. see node `Keyword
substitution to \fIsubst\fR. See `Keyword
substitution\(aq in the CVS manual. Giving an explicit \fB-k\fR option to
\fBcvs update\fR, \fBcvs export\fR, or \fBcvs
checkout\fR overrides this default.
@ -820,7 +925,7 @@ Replace the log message of revision \fIrev\fR with
.IP "" 2
Act like \fB-n\fR, except override any previous
assignment of \fIname\fR. For use with magic branches,
see see node `Magic branch numbers\(aq in the CVS manual.
see `Magic branch numbers\(aq in the CVS manual.
.SP
.IP "" 0
\fB-n\fIname\fB[:[\fIrev\fB]]\fR
@ -957,7 +1062,7 @@ change to be like the \fB::\fR case.
.SP
Due to the way \fBcvs\fR handles branches \fIrev\fR
cannot be specified symbolically if it is a branch.
see node `Magic branch numbers\(aq in the CVS manual, for an explanation.
See `Magic branch numbers\(aq in the CVS manual for an explanation.
.SP
Make sure that no-one has checked out a copy of the
revision you outdate. Strange things will happen if he
@ -1066,6 +1171,8 @@ Synopsis: annotate [options] files\&...
.IP "\(bu" 2
Requires: repository.
.IP "\(bu" 2
Synonym: blame
.IP "\(bu" 2
Changes: nothing.
.SP
For each file in \fIfiles\fR, print the head revision
@ -1075,7 +1182,7 @@ modification for each line.
.SH "annotate options"
.SP
These standard options are supported by \fBannotate\fR
(see node `Common options\(aq in the CVS manual, for a complete description of
(see node `Common options\(aq in the CVS manual for a complete description of
them):
.SP
.IP "" 0
@ -1138,9 +1245,9 @@ or replaced; you need to use \fBcvs diff\fR for that
(see node `diff\(aq in the CVS manual).
.SP
The options to \fBcvs annotate\fR are listed in
see node `Invoking CVS\(aq in the CVS manual, and can be used to select the files
`Invoking CVS\(aq in the CVS manual, and can be used to select the files
and revisions to annotate. The options are described
in more detail there and in see node `Common options\(aq in the CVS manual.
in more detail there and in `Common options\(aq in the CVS manual.
.SP
.SH "checkout"
.SS "Check out sources for editing"
@ -1167,7 +1274,7 @@ symbolic names for some
collection of source directories and files, or paths to
directories or files in the repository. The symbolic
names are defined in the \fBmodules\fR file.
see node `modules\(aq in the CVS manual.
See `modules\(aq in the CVS manual.
.SP
Depending on the modules you specify, \fBcheckout\fR may
recursively create directories and populate them with
@ -1211,13 +1318,13 @@ top level directory (where you originally ran
forget to change your directory to the top level
directory.
.SP
For the output produced by the \fBcheckout\fR command
see see node `update output\(aq in the CVS manual.
For the output produced by the \fBcheckout\fR command,
see node `update output\(aq in the CVS manual.
.SP
.SH "checkout options"
.SP
These standard options are supported by \fBcheckout\fR
(see node `Common options\(aq in the CVS manual, for a complete description of
(see node `Common options\(aq in the CVS manual for a complete description of
them):
.SP
.IP "" 0
@ -1225,7 +1332,7 @@ them):
.IP "" 2
Use the most recent revision no later than \fIdate\fR.
This option is sticky, and implies \fB-P\fR. See
see node `Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates.
`Sticky tags\(aq in the CVS manual for more information on sticky tags/dates.
.SP
.IP "" 0
\fB-f\fR
@ -1239,11 +1346,11 @@ the file).
\fB-k \fIkflag\fB\fR
.IP "" 2
Process keywords according to \fIkflag\fR. See
see node `Keyword substitution\(aq in the CVS manual.
`Keyword substitution\(aq in the CVS manual.
This option is sticky; future updates of
this file in this working directory will use the same
\fIkflag\fR. The \fBstatus\fR command can be viewed
to see the sticky options. See see node `Invoking CVS\(aq in the CVS manual, for
to see the sticky options. See `Invoking CVS\(aq in the CVS manual for
more information on the \fBstatus\fR command.
.SP
.IP "" 0
@ -1261,7 +1368,7 @@ see node `modules\(aq in the CVS manual).
.IP "" 0
\fB-P\fR
.IP "" 2
Prune empty directories. See see node `Moving directories\(aq in the CVS manual.
Prune empty directories. See `Moving directories\(aq in the CVS manual.
.SP
.IP "" 0
\fB-p\fR
@ -1277,7 +1384,7 @@ Checkout directories recursively. This option is on by default.
\fB-r \fItag\fB\fR
.IP "" 2
Use revision \fItag\fR. This option is sticky, and implies \fB-P\fR.
See see node `Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates.
See `Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates.
.SP
In addition to those, you can use these special command
options with \fBcheckout\fR:
@ -1287,7 +1394,7 @@ options with \fBcheckout\fR:
.IP "" 2
Reset any sticky tags, dates, or \fB-k\fR options.
Does not reset sticky \fB-k\fR options on modified files.
See see node `Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates.
See `Sticky tags\(aq in the CVS manual for more information on sticky tags/dates.
.SP
.IP "" 0
\fB-c\fR
@ -1350,7 +1457,7 @@ date. An optional date is specified by adding a colon
(:) to the tag:
\fB-j\fISymbolic_Tag\fB:\fIDate_Specifier\fB\fR.
.SP
see node `Branching and merging\(aq in the CVS manual.
See `Branching and merging\(aq in the CVS manual.
.SP
.IP "" 0
\fB-N\fR
@ -1365,7 +1472,7 @@ discussion.
\fB-s\fR
.IP "" 2
Like \fB-c\fR, but include the status of all modules,
and sort it by the status string. see node `modules\(aq in the CVS manual, for
and sort it by the status string. See `modules\(aq in the CVS manual, for
info about the \fB-s\fR option that is used inside the
modules file to set the module status.
.SP
@ -1434,7 +1541,7 @@ enter a log message that will be written to one or more
logging programs (see node `modules\(aq in the CVS manual, and see node `loginfo\(aq in the CVS manual)
and placed in the \fBrcs\fR file inside the
repository. This log message can be retrieved with the
\fBlog\fR command; see see node `log\(aq in the CVS manual. You can specify the
\fBlog\fR command; see node `log\(aq in the CVS manual. You can specify the
log message on the command line with the \fB-m
\fImessage\fB\fR option, and thus avoid the editor invocation,
or use the \fB-F \fIfile\fB\fR option to specify
@ -1443,7 +1550,7 @@ that the argument file contains the log message.
.SH "commit options"
.SP
These standard options are supported by \fBcommit\fR
(see node `Common options\(aq in the CVS manual, for a complete description of
(see node `Common options\(aq in the CVS manual for a complete description of
them):
.SP
.IP "" 0
@ -1477,7 +1584,7 @@ of invoking an editor.
\fB-f\fR
.IP "" 2
Note that this is not the standard behavior of
the \fB-f\fR option as defined in see node `Common options\(aq in the CVS manual.
the \fB-f\fR option as defined in `Common options\(aq in the CVS manual.
.SP
Force \fBcvs\fR to commit a new revision even if you haven\(aqt
made any changes to the file. If the current revision
@ -1630,7 +1737,7 @@ The exit status for diff is different than for other
.SH "diff options"
.SP
These standard options are supported by \fBdiff\fR
(see node `Common options\(aq in the CVS manual, for a complete description of
(see node `Common options\(aq in the CVS manual for a complete description of
them):
.SP
.IP "" 0
@ -1643,7 +1750,7 @@ See \fB-r\fR for how this affects the comparison.
\fB-k \fIkflag\fB\fR
.IP "" 2
Process keywords according to \fIkflag\fR. See
see node `Keyword substitution\(aq in the CVS manual.
`Keyword substitution\(aq in the CVS manual.
.SP
.IP "" 0
\fB-l\fR
@ -1733,7 +1840,7 @@ context.
\fB--changed-group-format=\fIformat\fB\fR
.IP "" 2
Use \fIformat\fR to output a line group containing differing lines from
both files in if-then-else format. see node `Line group formats\(aq in the CVS manual.
both files in if-then-else format. See `Line group formats\(aq in the CVS manual.
.SP
.IP "" 0
\fB-d\fR
@ -1855,7 +1962,7 @@ Print only the left column of two common lines in side by side format.
\fB--line-format=\fIformat\fB\fR
.IP "" 2
Use \fIformat\fR to output all input lines in if-then-else format.
see node `Line formats\(aq in the CVS manual.
See `Line formats\(aq in the CVS manual.
.SP
.IP "" 0
\fB--minimal\fR
@ -1882,25 +1989,25 @@ treat it as present but empty in the other directory.
\fB--new-group-format=\fIformat\fB\fR
.IP "" 2
Use \fIformat\fR to output a group of lines taken from just the second
file in if-then-else format. see node `Line group formats\(aq in the CVS manual.
file in if-then-else format. See `Line group formats\(aq in the CVS manual.
.SP
.IP "" 0
\fB--new-line-format=\fIformat\fB\fR
.IP "" 2
Use \fIformat\fR to output a line taken from just the second file in
if-then-else format. see node `Line formats\(aq in the CVS manual.
if-then-else format. See `Line formats\(aq in the CVS manual.
.SP
.IP "" 0
\fB--old-group-format=\fIformat\fB\fR
.IP "" 2
Use \fIformat\fR to output a group of lines taken from just the first
file in if-then-else format. see node `Line group formats\(aq in the CVS manual.
file in if-then-else format. See `Line group formats\(aq in the CVS manual.
.SP
.IP "" 0
\fB--old-line-format=\fIformat\fB\fR
.IP "" 2
Use \fIformat\fR to output a line taken from just the first file in
if-then-else format. see node `Line formats\(aq in the CVS manual.
if-then-else format. See `Line formats\(aq in the CVS manual.
.SP
.IP "" 0
\fB-p\fR
@ -2531,7 +2638,7 @@ In addition, these options (that are common to
.IP "" 2
Create a directory called \fIdir\fR for the working
files, instead of using the module name.
see node `checkout options\(aq in the CVS manual, for complete details on how
See `checkout options\(aq in the CVS manual for complete details on how
\fBcvs\fR handles this flag.
.SP
.IP "" 0
@ -2543,7 +2650,7 @@ Set keyword expansion mode (see node `Substitution modes\(aq in the CVS manual).
\fB-N\fR
.IP "" 2
Only useful together with \fB-d \fIdir\fB\fR.
see node `checkout options\(aq in the CVS manual, for complete details on how
See `checkout options\(aq in the CVS manual for complete details on how
\fBcvs\fR handles this flag.
.SP
.SH "history"
@ -2774,7 +2881,7 @@ distribution from an outside source (e.g., a source
vendor) into your source repository directory. You can
use this command both for initial creation of a
repository, and for wholesale updates to the module
from the outside source. see node `Tracking sources\(aq in the CVS manual, for
from the outside source. See `Tracking sources\(aq in the CVS manual for
a discussion on this subject.
.SP
The \fIrepository\fR argument gives a directory name
@ -2791,14 +2898,14 @@ you to do.
.SP
If \fBcvs\fR decides a file should be ignored
(see node `cvsignore\(aq in the CVS manual), it does not import it and prints
\fBI \fR followed by the filename (see node `import output\(aq in the CVS manual, for a
\fBI \fR followed by the filename (see node `import output\(aq in the CVS manual for a
complete description of the output).
.SP
If the file \fB$CVSROOT/CVSROOT/cvswrappers\fR exists,
any file whose names match the specifications in that
file will be treated as packages and the appropriate
filtering will be performed on the file/directory
before being imported. see node `Wrappers\(aq in the CVS manual.
before being imported. See `Wrappers\(aq in the CVS manual.
.SP
The outside source is saved in a first-level
branch, by default 1.1.1. Updates are leaves of this
@ -2826,7 +2933,7 @@ directory (see node `Getting the source\(aq in the CVS manual).
.SH "import options"
.SP
This standard option is supported by \fBimport\fR
(see node `Common options\(aq in the CVS manual, for a complete description):
(see node `Common options\(aq in the CVS manual for a complete description):
.SP
.IP "" 0
\fB-m \fImessage\fB\fR
@ -2839,7 +2946,7 @@ There are the following additional special options.
.IP "" 0
\fB-b \fIbranch\fB\fR
.IP "" 2
See see node `Multiple vendor branches\(aq in the CVS manual.
See `Multiple vendor branches\(aq in the CVS manual.
.SP
.IP "" 0
\fB-k \fIsubst\fB\fR
@ -2847,7 +2954,7 @@ See see node `Multiple vendor branches\(aq in the CVS manual.
Indicate the keyword expansion mode desired. This
setting will apply to all files created during the
import, but not to any files that previously existed in
the repository. See see node `Substitution modes\(aq in the CVS manual, for a
the repository. See `Substitution modes\(aq in the CVS manual for a
list of valid \fB-k\fR settings.
.SP
.IP "" 0
@ -2860,7 +2967,7 @@ default), specify \`-I !\(aq.
.SP
\fIname\fR can be a file name pattern of the same type
that you can specify in the \fB.cvsignore\fR file.
see node `cvsignore\(aq in the CVS manual.
See `cvsignore\(aq in the CVS manual.
.SP
.IP "" 0
\fB-W \fIspec\fB\fR
@ -2914,7 +3021,7 @@ see node `modules\(aq in the CVS manual.)
.SP
.SH "import examples"
.SP
See see node `Tracking sources\(aq in the CVS manual, and see node `From files\(aq in the CVS manual.
See `Tracking sources\(aq in the CVS manual, and `From files\(aq in the CVS manual.
.SP
.SH "log"
.SS "Print out log information for files"
@ -2952,10 +3059,11 @@ with the normal use inside \fBcvs\fB (see node `Common options\(aq in the CVS ma
.SP
By default, \fBlog\fR prints all information that is
available. All other options restrict the output. Note that the revision
selection options (\fB-d\fR, \fB-r\fR, \fB-s\fR, and \fB-w\fR) have no
selection options (\fB-b\fR, \fB-d\fR, \fB-r\fR, \fB-s\fR, and \fB-w\fR)
have no
effect, other than possibly causing a search for files in Attic directories,
when used in conjunction with the options that restrict the output to only
\fBlog\fR header fields (\fB-b\fR, \fB-h\fR, \fB-R\fR, and \fB-t\fR)
\fBlog\fR header fields (\fB-h\fR, \fB-R\fR, and \fB-t\fR)
unless the \fB-S\fR option is also specified.
.SP
.IP "" 0
@ -3035,6 +3143,14 @@ information, the log information is presented without
tags at all.
.SP
.IP "" 0
\fB-n\fR
.IP "" 2
Print the list of tags for this file. This option can
be very useful when your \fB.cvsrc\fR file has a
\fBlog -N\fR entry as a way to get a full list of all
of the tags.
.SP
.IP "" 0
\fB-R\fR
.IP "" 2
Print only the name of the \fBrcs\fR file.
@ -3116,7 +3232,7 @@ Print information about revisions whose state
attributes match one of the states given in the
comma-separated list \fIstates\fR. Individual states may
be any text string, though \fBcvs\fR commonly only uses two
states, \fBExp\fR and \fBdead\fR. See see node `admin options\(aq in the CVS manual
states, \fBExp\fR and \fBdead\fR. See `admin options\(aq in the CVS manual
for more information.
.SP
.IP "" 0
@ -3179,7 +3295,7 @@ the files that are located in other directories.
.SH "rdiff options"
.SP
These standard options are supported by \fBrdiff\fR
(see node `Common options\(aq in the CVS manual, for a complete description of
(see node `Common options\(aq in the CVS manual for a complete description of
them):
.SP
.IP "" 0
@ -3197,7 +3313,7 @@ recent revision (instead of ignoring the file).
\fB-k \fIkflag\fB\fR
.IP "" 2
Process keywords according to \fIkflag\fR. See
see node `Keyword substitution\(aq in the CVS manual.
`Keyword substitution\(aq in the CVS manual.
.SP
.IP "" 0
\fB-l\fR
@ -3268,7 +3384,7 @@ easily be fixed with a command such as this:
.IP "" 2
$ cvs rdiff -c -r FOO1_2 -r FOO1_4 tc | \\
.IP "" 2
$$ Mail -s \(aqThe patches you asked for\(aq foo@example.net
> Mail -s \(aqThe patches you asked for\(aq foo@example.net
.PD
.IP "" 0
@ -3341,9 +3457,9 @@ remain in your working directory.
\fBWARNING: The \fBrelease\fB command deletes
all directories and files recursively. This
has the very serious side-effect that any directory
that you have created inside your checked-out sources,
and not added to the repository (using the \fBadd\fB
command; see node `Adding files\(aq in the CVS manual) will be silently deleted\(emeven
created inside checked-out sources, and not added to
the repository (using the \fBadd\fB command;
see node `Adding files\(aq in the CVS manual) will be silently deleted\(emeven
if it is non-empty!\fR
.SP
.SH "release output"
@ -3376,7 +3492,7 @@ this file will be lost.
The file has been removed from your private copy of the
sources, but has not yet been removed from the
repository, since you have not yet committed the
removal. see node `commit\(aq in the CVS manual.
removal. See `commit\(aq in the CVS manual.
.SP
.IP "" 0
\fBM \fIfile\fB\fR
@ -3414,6 +3530,131 @@ Are you sure you want to release (and delete) directory \`tc\(aq: y
.IP "" 2
$
.PD
.IP "" 0
.SP
.SH "remove"
.SS "Remove files from active use"
.IX "remove (subcommand)"
.SP
.IP "\(bu" 2
Synopsis: remove [-flR] [files...]
.IP "\(bu" 2
Requires: repository, working directory.
.IP "\(bu" 2
Changes: working directory.
.SP
The \fBremove\fR command is used to remove unwanted
files from active use. The user normally deletes the
files from the working directory prior to invocation
of the \fBremove\fR command. Only the working
directory is updated. Changes to the repository are
not made until the \fBcommit\fR command is run.
.SP
The \fBremove\fR command does not delete files from
from the repository. \fBcvs\fR keeps all historical
data in the repository so that it is possible to
reconstruct previous states of the projects under
revision control.
.SP
To undo \fBcvs\fR \fBremove\fR or to resurrect files
that were previously removed, see node `add\(aq in the CVS manual.
.SP
.SH "remove options"
.SP
These standard options are supported by \fBremove\fR
(see node `Common options\(aq in the CVS manual for a complete description of
them):
.SP
.IP "" 0
\fB-l\fR
.IP "" 2
Local; run only in current working directory. See `Recursive behavior\(aq in the CVS manual.
.SP
.IP "" 0
\fB-R\fR
.IP "" 2
Process directories recursively. See `Recursive behavior\(aq in the CVS manual.
.SP
.SP
In addition, these options are also supported:
.SP
.IP "" 0
\fB-f\fR
.IP "" 2
Note that this is not the standard behavior of
the \fB-f\fR option as defined in `Common options\(aq in the CVS manual.
.SP
Delete files before removing them.
.SP
Entire directory hierarchies are easily removed
using \fB-f\fR, but take note that it is not as
easy to resurrect directory hierarchies as it is
to remove them.
.SP
.SP
.SH "remove examples"
.SP
.SS "Removing a file"
.SP
.PD 0
.SP
.IP "" 2
$ cvs remove remove.me
.IP "" 2
cvs remove: file \`remove.me\(aq still in working directory
.IP "" 2
cvs remove: 1 file exists; remove it first
.IP "" 2
$ rm -f remove.me
.IP "" 2
$ cvs remove remove.me
.IP "" 2
cvs remove: scheduling \`remove.me\(aq for removal
.IP "" 2
cvs remove: use \(aqcvs commit\(aq to remove this file permanently
.SP
.IP "" 2
$ ls remove.it
.IP "" 2
remove.it
.IP "" 2
$ cvs remove -f remove.it
.IP "" 2
cvs remove: scheduling \`remove.it\(aq for removal
.IP "" 2
cvs remove: use \(aqcvs commit\(aq to remove this file permanently
.PD
.IP "" 0
.SP
.SS "Removing entire directories"
.SP
.PD 0
.IP "" 2
$ tree -d a
.IP "" 2
a
.IP "" 2
|-- CVS
.IP "" 2
\`-- b
.IP "" 2
\`-- CVS
.SP
.IP "" 2
3 directories
.IP "" 2
$ cvs remove -f a
.IP "" 2
cvs remove: Removing a
.IP "" 2
cvs remove: Removing a/b
.IP "" 2
cvs remove: scheduling \`a/b/c\(aq for removal
.IP "" 2
cvs remove: use \(aqcvs commit\(aq to remove this file permanently
.PD
.IP "" 0
.SP
@ -3440,7 +3681,7 @@ since your last checkout or update.
.SH "update options"
.SP
These standard options are available with \fBupdate\fR
(see node `Common options\(aq in the CVS manual, for a complete description of
(see node `Common options\(aq in the CVS manual for a complete description of
them):
.SP
.IP "" 0
@ -3448,7 +3689,7 @@ them):
.IP "" 2
Use the most recent revision no later than \fIdate\fR.
This option is sticky, and implies \fB-P\fR.
See see node `Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates.
See `Sticky tags\(aq in the CVS manual for more information on sticky tags/dates.
.SP
.IP "" 0
\fB-f\fR
@ -3462,22 +3703,22 @@ the file).
\fB-k \fIkflag\fB\fR
.IP "" 2
Process keywords according to \fIkflag\fR. See
see node `Keyword substitution\(aq in the CVS manual.
`Keyword substitution\(aq in the CVS manual.
This option is sticky; future updates of
this file in this working directory will use the same
\fIkflag\fR. The \fBstatus\fR command can be viewed
to see the sticky options. See see node `Invoking CVS\(aq in the CVS manual, for
to see the sticky options. See `Invoking CVS\(aq in the CVS manual for
more information on the \fBstatus\fR command.
.SP
.IP "" 0
\fB-l\fR
.IP "" 2
Local; run only in current working directory. see node `Recursive behavior\(aq in the CVS manual.
Local; run only in current working directory. See `Recursive behavior\(aq in the CVS manual.
.SP
.IP "" 0
\fB-P\fR
.IP "" 2
Prune empty directories. See see node `Moving directories\(aq in the CVS manual.
Prune empty directories. See `Moving directories\(aq in the CVS manual.
.SP
.IP "" 0
\fB-p\fR
@ -3487,7 +3728,7 @@ Pipe files to the standard output.
.IP "" 0
\fB-R\fR
.IP "" 2
Update directories recursively (default). see node `Recursive
Update directories recursively (default). See `Recursive
behavior\(aq in the CVS manual.
.SP
.IP "" 0
@ -3495,7 +3736,7 @@ behavior\(aq in the CVS manual.
.IP "" 2
Retrieve revision/tag \fIrev\fR. This option is sticky,
and implies \fB-P\fR.
See see node `Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates.
See `Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates.
.SP
These special options are also available with
\fBupdate\fR.
@ -3505,7 +3746,7 @@ These special options are also available with
.IP "" 2
Reset any sticky tags, dates, or \fB-k\fR options.
Does not reset sticky \fB-k\fR options on modified files.
See see node `Sticky tags\(aq in the CVS manual, for more information on sticky tags/dates.
See `Sticky tags\(aq in the CVS manual for more information on sticky tags/dates.
.SP
.IP "" 0
\fB-C\fR
@ -3539,7 +3780,7 @@ Ignore files whose names match \fIname\fR (in your
working directory) during the update. You can specify
\fB-I\fR more than once on the command line to specify
several files to ignore. Use \fB-I !\fR to avoid
ignoring any files at all. see node `cvsignore\(aq in the CVS manual, for other
ignoring any files at all. See `cvsignore\(aq in the CVS manual for other
ways to make \fBcvs\fR ignore some files.
.SP
.IP "" 0
@ -3550,7 +3791,7 @@ update. You can use this option repeatedly.
.SP
\fIspec\fR can be a file name pattern of the same type
that you can specify in the \fB.cvswrappers\fR
file. see node `Wrappers\(aq in the CVS manual.
file. See `Wrappers\(aq in the CVS manual.
.SP
.IP "" 0
\fB-j\fIrevision\fB\fR
@ -3570,7 +3811,7 @@ the revision specified in the \fB-j\fR option.
Note that using a single \fB-j \fItagname\fB\fR option rather than
\fB-j \fIbranchname\fB\fR to merge changes from a branch will
often not remove files which were removed on the branch.
see node `Merging adds and removals\(aq in the CVS manual, for more.
See `Merging adds and removals\(aq in the CVS manual for more information.
.SP
In addition, each \fB-j\fR option can contain an optional
date specification which, when used with branches, can
@ -3579,7 +3820,7 @@ date. An optional date is specified by adding a colon
(:) to the tag:
\fB-j\fISymbolic_Tag\fB:\fIDate_Specifier\fB\fR.
.SP
see node `Branching and merging\(aq in the CVS manual.
See `Branching and merging\(aq in the CVS manual.
.SP
.SP
.SH "update output"
@ -3651,7 +3892,7 @@ is also in your working directory, with the name
\fB.#\fIfile\fB.\fIrevision\fB\fR where \fIrevision\fR
is the revision that your modified file started
from. Resolve the conflict as described in
see node `Conflicts example\(aq in the CVS manual.
`Conflicts example\(aq in the CVS manual.
(Note that some systems automatically purge
files that begin with \fB.#\fR if they have not been
accessed for a few days. If you intend to keep a copy

424
contrib/cvs/doc/cvs.texinfo
View File

@ -4,14 +4,14 @@
@macro copyleftnotice
@noindent
Copyright @copyright{} 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
Free Software Foundation, Inc.
@multitable @columnfractions .12 .88
@item Portions
@item @tab Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005
Derek R. Price,
@item @tab Copyright @copyright{} 2002, 2003, 2004, 2005
@item @tab Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2006, 2007 Derek R. Price,
@item @tab Copyright @copyright{} 2002, 2003, 2004, 2005, 2006, 2007
Ximbiot @url{http://ximbiot.com},
@item @tab Copyright @copyright{} 1992, 1993, 1999 Signum Support AB,
@item @tab and Copyright @copyright{} others.
@ -338,7 +338,7 @@ not address the issues involved.
Of course, you should place the tools created to
support such a build system (scripts, @file{Makefile}s,
etc) under @sc{cvs}.
etc.) under @sc{cvs}.
Figuring out what files need to be rebuilt when
something changes is, again, something to be handled
@ -374,7 +374,7 @@ within a single file, or across a whole collection of
files, will logically conflict with one another. Its
concept of a @dfn{conflict} is purely textual, arising
when two changes to the same base file are near enough
to spook the merge (i.e. @code{diff3}) command.
to spook the merge (i.e., @code{diff3}) command.
@sc{cvs} does not claim to help at all in figuring out
non-textual or distributed conflicts in program logic.
@ -394,7 +394,7 @@ peers.
Change control refers to a number of things. First of
all it can mean @dfn{bug-tracking}, that is being able
to keep a database of reported bugs and the status of
each one (is it fixed? in what release? has the bug
each one (Is it fixed? In what release? Has the bug
submitter agreed that it is fixed?). For interfacing
@sc{cvs} to an external bug-tracking system, see the
@file{rcsinfo} and @file{verifymsg} files
@ -1060,7 +1060,7 @@ for new directories that are added inside the tree, but
you must fix the permissions manually when a new
directory should have different permissions than its
parent directory. If you set the @code{CVSUMASK}
environment variable that will control the file
environment variable, that will control the file
permissions which @sc{cvs} uses in creating directories
and/or files in the repository. @code{CVSUMASK} does
not affect the file permissions in the working
@ -2183,13 +2183,24 @@ For information on disk space requirements, see
@ref{Creating a repository}.
@node Connecting via rsh
@subsection Connecting with rsh
@subsection Connecting with rsh or ssh
@cindex ssh
@sc{cvs} may use the @samp{ssh} protocol to perform
these operations, so the remote user host needs to have
a either an agent like @code{ssh-agent} to hold
credentials or a @file{.shosts} file which grants
access to the local user. Note that the program that
@sc{cvs} uses for this purpose may be specified using
the @file{--with-ssh} flag to configure.
@cindex rsh
@sc{cvs} uses the @samp{rsh} protocol to perform these
operations, so the remote user host needs to have a
@file{.rhosts} file which grants access to the local
user.
user. Note that the program that @sc{cvs} uses for this
purpose may be specified using the @file{--with-rsh}
flag to configure.
For example, suppose you are the user @samp{mozart} on
the local machine @samp{toe.example.com}, and the
@ -2208,6 +2219,13 @@ Then test that @samp{rsh} is working with
rsh -l bach faun.example.org 'echo $PATH'
@end example
@noindent
To test that @samp{ssh} is working use
@example
ssh -l bach faun.example.org 'echo $PATH'
@end example
@cindex CVS_SERVER, environment variable
Next you have to make sure that @code{rsh} will be able
to find the server. Make sure that the path which
@ -2229,14 +2247,21 @@ There is no need to edit @file{inetd.conf} or start a
@cindex :server:, setting up
@cindex :ext:, setting up
@cindex :extssh:, setting up
@cindex Kerberos, using kerberized rsh
@cindex SSH (rsh replacement)
@cindex rsh replacements (Kerberized, SSH, &c)
There are two access methods that you use in @code{CVSROOT}
for rsh. @code{:server:} specifies an internal rsh
There are three access methods that you use in @code{CVSROOT}
for rsh or ssh. @code{:server:} specifies an internal rsh
client, which is supported only by some @sc{cvs} ports.
@code{:extssh:} specifies an external ssh program. By
default this is @code{ssh} (unless otherwise specified
by the @file{--with-ssh} flag to configure) but you may set the
@code{CVS_SSH} environment variable to invoke another
program or wrapper script.
@code{:ext:} specifies an external rsh program. By
default this is @code{rsh} but you may set the
default this is @code{rsh} (unless otherwise specified
by the @file{--with-rsh} flag to configure) but you may set the
@code{CVS_RSH} environment variable to invoke another
program which can access the remote server (for
example, @code{remsh} on HP-UX 9 because @code{rsh} is
@ -2255,8 +2280,8 @@ to be inapplicable; consult the documentation for your rsh
replacement.
@c FIXME: there should be a way to specify the
@c program in CVSROOT, not CVS_RSH, so that one can use
@c different ones for different roots. e.g. ":ext;rsh=remsh:"
@c instead of ":ext:".
@c different ones for different roots. e.g.
@c ":ext;CVS_RSH=remsh:" instead of ":ext:".
@c See also the comment in src/client.c for rationale
@c concerning "rsh" being the default and never
@c "remsh".
@ -3541,7 +3566,7 @@ tags; see @ref{Sticky tags}.
When you tag more than one file with the same tag you
can think about the tag as "a curve drawn through a
matrix of filename vs. revision number." Say we have 5
matrix of filename vs.@: revision number." Say we have 5
files with the following revisions:
@example
@ -3673,7 +3698,7 @@ place. Therefore, one might delete, move, or rename a
tag.
@noindent
@strong{WARNING: the commands in this section are
@strong{WARNING: The commands in this section are
dangerous; they permanently discard historical
information and it can be difficult or impossible to
recover from errors. If you are a @sc{cvs}
@ -3703,7 +3728,7 @@ of branch tags. In that case, any non-branch tags encountered will
trigger warnings and will not be deleted.
@noindent
@strong{WARNING: Moving branch tags is very dangerous! If you think
@strong{WARNING: Moving branch tags is very dangerous! If you think
you need the @code{-B} option, think again and ask your @sc{cvs}
administrator about it (if that isn't you). There is almost certainly
another way to accomplish what you want to accomplish.}
@ -3734,7 +3759,7 @@ In that case, non-branch tags encountered with the given
name are ignored with a warning message.
@noindent
@strong{WARNING: Moving branch tags is very dangerous! If you think you
@strong{WARNING: Moving branch tags is very dangerous! If you think you
need the @code{-B} option, think again and ask your @sc{cvs}
administrator about it (if that isn't you). There is almost certainly
another way to accomplish what you want to accomplish.}
@ -4768,7 +4793,7 @@ directory.
@c changing right away.
Unlike most other commands, the @code{add} command is
not recursive. You have to expcicitly name files and
not recursive. You have to explicitly name files and
directories that you wish to add to the repository.
However, each directory will need to be added
separately before you will be able to add new files
@ -5445,8 +5470,8 @@ To log tags, use the @file{taginfo} file (@pxref{taginfo}).
@c FIXME: What is difference between doing it in the
@c modules file and using loginfo/taginfo? Why should
@c user use one or the other?
To log commits, checkouts, exports, and tags,
respectively, you can also use the @samp{-i},
To log checkouts, exports, and tags,
respectively, you can also use the
@samp{-o}, @samp{-e}, and @samp{-t} options in the
modules file. For a more flexible way of giving
notifications to various users, which requires less in
@ -6202,9 +6227,8 @@ See the documentation for pcl-cvs.
@cindex Mail, automatic mail on commit
It is often useful to inform others when you commit a
new revision of a file. The @samp{-i} option of the
@file{modules} file, or the @file{loginfo} file, can be
used to automate this process. @xref{modules}.
new revision of a file. The @file{loginfo} file can be
used to automate this process.
@xref{loginfo}. You can use these features of @sc{cvs}
to, for instance, instruct @sc{cvs} to mail a
message to all developers, or post a message to a local
@ -7234,7 +7258,7 @@ $ cd wdiff-0.05
$ cvs import -m "Import of FSF v. 0.05" fsf/wdiff FSF_DIST WDIFF_0_05
@end example
@strong{WARNING: If you use a release tag that already exists in one of the
@strong{WARNING: If you use a release tag that already exists in one of the
repository archives, files removed by an import may not be detected.}
For files that have not been modified locally, the newly created
@ -7608,6 +7632,7 @@ reference to @sc{cvs} commands, @pxref{Invoking CVS}).
* ~/.cvsrc:: Default options with the ~/.cvsrc file
* Global options:: Options you give to the left of cvs_command
* Common options:: Options you give to the right of cvs_command
* add:: Add files and directories to the repository
* admin:: Administration
* annotate:: What revision modified each line of a file?
* checkout:: Checkout sources for editing
@ -7619,6 +7644,7 @@ reference to @sc{cvs} commands, @pxref{Invoking CVS}).
* log:: Show log messages for files
* rdiff:: 'patch' format diffs between releases
* release:: Indicate that a directory is no longer in use
* remove:: Remove files from active development
* update:: Bring work tree in sync with repository
@end menu
@ -7819,7 +7845,7 @@ vice versa.)
@item -d @var{cvs_root_directory}
Use @var{cvs_root_directory} as the root directory
pathname of the repository. Overrides the setting of
the @code{$CVSROOT} environment variable. @xref{Repository}.
the @code{$CVSROOT} environment variable. See @ref{Repository}.
@cindex EDITOR, overriding
@cindex Overriding EDITOR
@ -8160,7 +8186,7 @@ those commands. See @ref{commit options}, and
@item -k @var{kflag}
Alter the default processing of keywords.
@xref{Keyword substitution}, for the meaning of
See @ref{Keyword substitution}, for the meaning of
@var{kflag}. Your @var{kflag} specification is
@dfn{sticky} when you use it to create a private copy
of a source file; that is, when you use this option
@ -8289,6 +8315,98 @@ and @code{update}.
@end table
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@node add
@appendixsec add---Add files and directories to the repository
@cindex add (subcommand)
@itemize @bullet
@item
Synopsis: add [-k rcs-kflag] [-m message] files...
@item
Requires: repository, working directory.
@item
Changes: repository, working directory.
@end itemize
The @code{add} command is used to present new files
and directories for addition into the @sc{cvs}
repository. When @code{add} is used on a directory,
a new directory is created in the repository
immediately. When used on a file, only the working
directory is updated. Changes to the repository are
not made until the @code{commit} command is used on
the newly added file.
The @code{add} command also resurrects files that
have been previously removed. This can be done
before or after the @code{commit} command is used
to finalize the removal of files. Resurrected files
are restored into the working directory at the time
the @code{add} command is executed.
@menu
* add options:: add options
* add examples:: add examples
@end menu
@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@node add options
@appendixsubsec add options
These standard options are supported by @code{add}
(@pxref{Common options}, for a complete description of
them):
@table @code
@item -k @var{kflag}
Process keywords according to @var{kflag}. See
@ref{Keyword substitution}.
This option is sticky; future updates of
this file in this working directory will use the same
@var{kflag}. The @code{status} command can be viewed
to see the sticky options. For more information on
the @code{status} command, @xref{Invoking CVS}.
@item -m @var{message}
Use @var{message} as the log message, instead of
invoking an editor.
@end table
@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@node add examples
@appendixsubsec add examples
@appendixsubsubsec Adding a directory
@example
$ mkdir doc
$ cvs add doc
Directory /path/to/repository/doc added to the repository
@end example
@appendixsubsubsec Adding a file
@example
$ >TODO
$ cvs add TODO
cvs add: scheduling file `TODO' for addition
cvs add: use 'cvs commit' to add this file permanently
@end example
@appendixsubsubsec Undoing a @code{remove} command
@example
$ rm -f makefile
$ cvs remove makefile
cvs remove: scheduling `makefile' for removal
cvs remove: use 'cvs commit' to remove this file permanently
$ cvs add makefile
U makefile
cvs add: makefile, version 1.2, resurrected
@end example
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@node admin
@appendixsec admin---Administration
@ -8367,7 +8485,7 @@ There can be no space between @samp{-b} and its argument.
Sets the comment leader to @var{string}. The comment
leader is not used by current versions of @sc{cvs} or
@sc{rcs} 5.7. Therefore, you can almost surely not
worry about it. @xref{Keyword substitution}.
worry about it. See @ref{Keyword substitution}.
@item -e[@var{logins}]
Might not work together with @sc{cvs}. Erase the login
@ -8390,7 +8508,7 @@ new @sc{rcs} file, without depositing a revision. With
@item -k@var{subst}
Set the default keyword
substitution to @var{subst}. @xref{Keyword
substitution to @var{subst}. See @ref{Keyword
substitution}. Giving an explicit @samp{-k} option to
@code{cvs update}, @code{cvs export}, or @code{cvs
checkout} overrides this default.
@ -8554,7 +8672,7 @@ change to be like the @samp{::} case.
Due to the way @sc{cvs} handles branches @var{rev}
cannot be specified symbolically if it is a branch.
@xref{Magic branch numbers}, for an explanation.
See @ref{Magic branch numbers} for an explanation.
@c FIXME: is this still true? I suspect not.
Make sure that no-one has checked out a copy of the
@ -8660,6 +8778,8 @@ Synopsis: annotate [options] files@dots{}
@item
Requires: repository.
@item
Synonym: blame
@item
Changes: nothing.
@end itemize
@ -8677,7 +8797,7 @@ modification for each line.
@appendixsubsec annotate options
These standard options are supported by @code{annotate}
(@pxref{Common options}, for a complete description of
(@pxref{Common options} for a complete description of
them):
@table @code
@ -8762,7 +8882,7 @@ symbolic names for some
collection of source directories and files, or paths to
directories or files in the repository. The symbolic
names are defined in the @samp{modules} file.
@xref{modules}.
See @ref{modules}.
@c Needs an example, particularly of the non-"modules"
@c case but probably of both.
@ -8812,8 +8932,8 @@ top level directory (where you originally ran
forget to change your directory to the top level
directory.
For the output produced by the @code{checkout} command
see @ref{update output}.
For the output produced by the @code{checkout} command,
@xref{update output}.
@menu
* checkout options:: checkout options
@ -8825,14 +8945,14 @@ see @ref{update output}.
@appendixsubsec checkout options
These standard options are supported by @code{checkout}
(@pxref{Common options}, for a complete description of
(@pxref{Common options} for a complete description of
them):
@table @code
@item -D @var{date}
Use the most recent revision no later than @var{date}.
This option is sticky, and implies @samp{-P}. See
@ref{Sticky tags}, for more information on sticky tags/dates.
@ref{Sticky tags} for more information on sticky tags/dates.
@item -f
Only useful with the @samp{-D @var{date}} or @samp{-r
@ -8846,7 +8966,7 @@ Process keywords according to @var{kflag}. See
This option is sticky; future updates of
this file in this working directory will use the same
@var{kflag}. The @code{status} command can be viewed
to see the sticky options. See @ref{Invoking CVS}, for
to see the sticky options. See @ref{Invoking CVS} for
more information on the @code{status} command.
@item -l
@ -8878,7 +8998,7 @@ options with @code{checkout}:
@item -A
Reset any sticky tags, dates, or @samp{-k} options.
Does not reset sticky @samp{-k} options on modified files.
See @ref{Sticky tags}, for more information on sticky tags/dates.
See @ref{Sticky tags} for more information on sticky tags/dates.
@item -c
Copy the module file, sorted, to the standard output,
@ -8935,7 +9055,7 @@ date. An optional date is specified by adding a colon
(:) to the tag:
@samp{-j@var{Symbolic_Tag}:@var{Date_Specifier}}.
@xref{Branching and merging}.
See @ref{Branching and merging}.
@item -N
Only useful together with @samp{-d @var{dir}}. With
@ -8946,7 +9066,7 @@ discussion.
@item -s
Like @samp{-c}, but include the status of all modules,
and sort it by the status string. @xref{modules}, for
and sort it by the status string. See @ref{modules}, for
info about the @samp{-s} option that is used inside the
modules file to set the module status.
@end table
@ -9013,7 +9133,7 @@ enter a log message that will be written to one or more
logging programs (@pxref{modules}, and @pxref{loginfo})
and placed in the @sc{rcs} file inside the
repository. This log message can be retrieved with the
@code{log} command; see @ref{log}. You can specify the
@code{log} command; @xref{log}. You can specify the
log message on the command line with the @samp{-m
@var{message}} option, and thus avoid the editor invocation,
or use the @samp{-F @var{file}} option to specify
@ -9029,7 +9149,7 @@ that the argument file contains the log message.
@appendixsubsec commit options
These standard options are supported by @code{commit}
(@pxref{Common options}, for a complete description of
(@pxref{Common options} for a complete description of
them):
@table @code
@ -9189,7 +9309,7 @@ compared. If any directories are given, all files
under them will be compared.
The exit status for diff is different than for other
@sc{cvs} commands; for details @ref{Exit status}.
@sc{cvs} commands; for details @xref{Exit status}.
@menu
* diff options:: diff options
@ -9201,7 +9321,7 @@ The exit status for diff is different than for other
@appendixsubsec diff options
These standard options are supported by @code{diff}
(@pxref{Common options}, for a complete description of
(@pxref{Common options} for a complete description of
them):
@table @code
@ -9296,7 +9416,7 @@ context.
@item --changed-group-format=@var{format}
Use @var{format} to output a line group containing differing lines from
both files in if-then-else format. @xref{Line group formats}.
both files in if-then-else format. See @ref{Line group formats}.
@item -d
Change the algorithm to perhaps find a smaller set of changes. This makes
@ -9374,7 +9494,7 @@ Print only the left column of two common lines in side by side format.
@item --line-format=@var{format}
Use @var{format} to output all input lines in if-then-else format.
@xref{Line formats}.
See @ref{Line formats}.
@item --minimal
Change the algorithm to perhaps find a smaller set of changes. This
@ -9391,19 +9511,19 @@ treat it as present but empty in the other directory.
@item --new-group-format=@var{format}
Use @var{format} to output a group of lines taken from just the second
file in if-then-else format. @xref{Line group formats}.
file in if-then-else format. See @ref{Line group formats}.
@item --new-line-format=@var{format}
Use @var{format} to output a line taken from just the second file in
if-then-else format. @xref{Line formats}.
if-then-else format. See @ref{Line formats}.
@item --old-group-format=@var{format}
Use @var{format} to output a group of lines taken from just the first
file in if-then-else format. @xref{Line group formats}.
file in if-then-else format. See @ref{Line group formats}.
@item --old-line-format=@var{format}
Use @var{format} to output a line taken from just the first file in
if-then-else format. @xref{Line formats}.
if-then-else format. See @ref{Line formats}.
@item -p
Show which C function each change is in.
@ -9871,7 +9991,7 @@ In addition, these options (that are common to
@item -d @var{dir}
Create a directory called @var{dir} for the working
files, instead of using the module name.
@xref{checkout options}, for complete details on how
See @ref{checkout options} for complete details on how
@sc{cvs} handles this flag.
@item -k @var{subst}
@ -9879,7 +9999,7 @@ Set keyword expansion mode (@pxref{Substitution modes}).
@item -N
Only useful together with @samp{-d @var{dir}}.
@xref{checkout options}, for complete details on how
See @ref{checkout options} for complete details on how
@sc{cvs} handles this flag.
@end table
@ -10097,7 +10217,7 @@ distribution from an outside source (e.g., a source
vendor) into your source repository directory. You can
use this command both for initial creation of a
repository, and for wholesale updates to the module
from the outside source. @xref{Tracking sources}, for
from the outside source. See @ref{Tracking sources} for
a discussion on this subject.
The @var{repository} argument gives a directory name
@ -10114,14 +10234,14 @@ you to do.
If @sc{cvs} decides a file should be ignored
(@pxref{cvsignore}), it does not import it and prints
@samp{I } followed by the filename (@pxref{import output}, for a
@samp{I } followed by the filename (@pxref{import output} for a
complete description of the output).
If the file @file{$CVSROOT/CVSROOT/cvswrappers} exists,
any file whose names match the specifications in that
file will be treated as packages and the appropriate
filtering will be performed on the file/directory
before being imported. @xref{Wrappers}.
before being imported. See @ref{Wrappers}.
The outside source is saved in a first-level
branch, by default 1.1.1. Updates are leaves of this
@ -10160,7 +10280,7 @@ directory (@pxref{Getting the source}).
@appendixsubsec import options
This standard option is supported by @code{import}
(@pxref{Common options}, for a complete description):
(@pxref{Common options} for a complete description):
@table @code
@item -m @var{message}
@ -10178,7 +10298,7 @@ See @ref{Multiple vendor branches}.
Indicate the keyword expansion mode desired. This
setting will apply to all files created during the
import, but not to any files that previously existed in
the repository. See @ref{Substitution modes}, for a
the repository. See @ref{Substitution modes} for a
list of valid @samp{-k} settings.
@item -I @var{name}
@ -10189,7 +10309,7 @@ default), specify `-I !'.
@var{name} can be a file name pattern of the same type
that you can specify in the @file{.cvsignore} file.
@xref{cvsignore}.
See @ref{cvsignore}.
@c -- Is this really true?
@item -W @var{spec}
@ -10306,10 +10426,11 @@ with the normal use inside @sc{cvs} (@pxref{Common options}).}
By default, @code{log} prints all information that is
available. All other options restrict the output. Note that the revision
selection options (@code{-d}, @code{-r}, @code{-s}, and @code{-w}) have no
selection options (@code{-b}, @code{-d}, @code{-r}, @code{-s}, and @code{-w})
have no
effect, other than possibly causing a search for files in Attic directories,
when used in conjunction with the options that restrict the output to only
@code{log} header fields (@code{-b}, @code{-h}, @code{-R}, and @code{-t})
@code{log} header fields (@code{-h}, @code{-R}, and @code{-t})
unless the @code{-S} option is also specified.
@table @code
@ -10369,6 +10490,12 @@ tags, so rather than "more"'ing over 3 pages of tag
information, the log information is presented without
tags at all.
@item -n
Print the list of tags for this file. This option can
be very useful when your @file{.cvsrc} file has a
@samp{log -N} entry as a way to get a full list of all
of the tags.
@item -R
Print only the name of the @sc{rcs} file.
@ -10515,7 +10642,7 @@ the files that are located in other directories.
@appendixsubsec rdiff options
These standard options are supported by @code{rdiff}
(@pxref{Common options}, for a complete description of
(@pxref{Common options} for a complete description of
them):
@table @code
@ -10585,7 +10712,7 @@ easily be fixed with a command such as this:
@example
$ cvs rdiff -c -r FOO1_2 -r FOO1_4 tc | \
$$ Mail -s 'The patches you asked for' foo@@example.net
> Mail -s 'The patches you asked for' foo@@example.net
@end example
Suppose you have made release 1.3, and forked a branch
@ -10658,9 +10785,9 @@ remain in your working directory.
@strong{WARNING: The @code{release} command deletes
all directories and files recursively. This
has the very serious side-effect that any directory
that you have created inside your checked-out sources,
and not added to the repository (using the @code{add}
command; @pxref{Adding files}) will be silently deleted---even
created inside checked-out sources, and not added to
the repository (using the @code{add} command;
@pxref{Adding files}) will be silently deleted---even
if it is non-empty!}
@end table
@ -10689,7 +10816,7 @@ this file will be lost.
The file has been removed from your private copy of the
sources, but has not yet been removed from the
repository, since you have not yet committed the
removal. @xref{commit}.
removal. See @ref{commit}.
@item M @var{file}
The file is modified in your working directory. There
@ -10720,6 +10847,112 @@ Are you sure you want to release (and delete) directory `tc': y
$
@end example
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@node remove
@appendixsec remove---Remove files from active use
@cindex remove (subcommand)
@itemize @bullet
@item
Synopsis: remove [-flR] [files...]
@item
Requires: repository, working directory.
@item
Changes: working directory.
@end itemize
The @code{remove} command is used to remove unwanted
files from active use. The user normally deletes the
files from the working directory prior to invocation
of the @code{remove} command. Only the working
directory is updated. Changes to the repository are
not made until the @code{commit} command is run.
The @code{remove} command does not delete files from
from the repository. @sc{cvs} keeps all historical
data in the repository so that it is possible to
reconstruct previous states of the projects under
revision control.
To undo @sc{cvs} @code{remove} or to resurrect files
that were previously removed, @xref{add}.
@menu
* remove options:: remove options
* remove examples:: remove examples
@end menu
@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@node remove options
@appendixsubsec remove options
These standard options are supported by @code{remove}
(@pxref{Common options} for a complete description of
them):
@table @code
@item -l
Local; run only in current working directory. See @ref{Recursive behavior}.
@item -R
Process directories recursively. See @ref{Recursive behavior}.
@end table
In addition, these options are also supported:
@table @code
@item -f
Note that this is not the standard behavior of
the @samp{-f} option as defined in @ref{Common options}.
Delete files before removing them.
Entire directory hierarchies are easily removed
using @samp{-f}, but take note that it is not as
easy to resurrect directory hierarchies as it is
to remove them.
@end table
@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@node remove examples
@appendixsubsec remove examples
@appendixsubsubsec Removing a file
@example
$ cvs remove remove.me
cvs remove: file `remove.me' still in working directory
cvs remove: 1 file exists; remove it first
$ rm -f remove.me
$ cvs remove remove.me
cvs remove: scheduling `remove.me' for removal
cvs remove: use 'cvs commit' to remove this file permanently
$ ls remove.it
remove.it
$ cvs remove -f remove.it
cvs remove: scheduling `remove.it' for removal
cvs remove: use 'cvs commit' to remove this file permanently
@end example
@appendixsubsubsec Removing entire directories
@example
$ tree -d a
a
|-- CVS
`-- b
`-- CVS
3 directories
$ cvs remove -f a
cvs remove: Removing a
cvs remove: Removing a/b
cvs remove: scheduling `a/b/c' for removal
cvs remove: use 'cvs commit' to remove this file permanently
@end example
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@node update
@appendixsec update---Bring work tree in sync with repository
@ -10753,14 +10986,14 @@ since your last checkout or update.
@appendixsubsec update options
These standard options are available with @code{update}
(@pxref{Common options}, for a complete description of
(@pxref{Common options} for a complete description of
them):
@table @code
@item -D date
Use the most recent revision no later than @var{date}.
This option is sticky, and implies @samp{-P}.
See @ref{Sticky tags}, for more information on sticky tags/dates.
See @ref{Sticky tags} for more information on sticky tags/dates.
@item -f
Only useful with the @samp{-D @var{date}} or @samp{-r
@ -10774,11 +11007,11 @@ Process keywords according to @var{kflag}. See
This option is sticky; future updates of
this file in this working directory will use the same
@var{kflag}. The @code{status} command can be viewed
to see the sticky options. See @ref{Invoking CVS}, for
to see the sticky options. See @ref{Invoking CVS} for
more information on the @code{status} command.
@item -l
Local; run only in current working directory. @xref{Recursive behavior}.
Local; run only in current working directory. See @ref{Recursive behavior}.
@item -P
Prune empty directories. See @ref{Moving directories}.
@ -10787,7 +11020,7 @@ Prune empty directories. See @ref{Moving directories}.
Pipe files to the standard output.
@item -R
Update directories recursively (default). @xref{Recursive
Update directories recursively (default). See @ref{Recursive
behavior}.
@item -r rev
@ -10804,7 +11037,7 @@ These special options are also available with
@item -A
Reset any sticky tags, dates, or @samp{-k} options.
Does not reset sticky @samp{-k} options on modified files.
See @ref{Sticky tags}, for more information on sticky tags/dates.
See @ref{Sticky tags} for more information on sticky tags/dates.
@item -C
Overwrite locally modified files with clean copies from
@ -10832,7 +11065,7 @@ Ignore files whose names match @var{name} (in your
working directory) during the update. You can specify
@samp{-I} more than once on the command line to specify
several files to ignore. Use @samp{-I !} to avoid
ignoring any files at all. @xref{cvsignore}, for other
ignoring any files at all. See @ref{cvsignore} for other
ways to make @sc{cvs} ignore some files.
@item -W@var{spec}
@ -10841,7 +11074,7 @@ update. You can use this option repeatedly.
@var{spec} can be a file name pattern of the same type
that you can specify in the @file{.cvswrappers}
file. @xref{Wrappers}.
file. See @ref{Wrappers}.
@item -j@var{revision}
With two @samp{-j} options, merge changes from the
@ -10859,7 +11092,7 @@ the revision specified in the @samp{-j} option.
Note that using a single @samp{-j @var{tagname}} option rather than
@samp{-j @var{branchname}} to merge changes from a branch will
often not remove files which were removed on the branch.
@xref{Merging adds and removals}, for more.
See @ref{Merging adds and removals} for more information.
In addition, each @samp{-j} option can contain an optional
date specification which, when used with branches, can
@ -10868,7 +11101,7 @@ date. An optional date is specified by adding a colon
(:) to the tag:
@samp{-j@var{Symbolic_Tag}:@var{Date_Specifier}}.
@xref{Branching and merging}.
See @ref{Branching and merging}.
@end table
@ -12242,7 +12475,7 @@ If using remote access methods (pserver, ext, etc.),
@sc{cvs} will execute this program on the server from a temporary
directory. The path is searched for this program.
If using ``local access'' (on a local or remote NFS file system, i.e.
If using ``local access'' (on a local or remote NFS file system, i.e.,
repository set just to a path),
the program will be executed from the newly checked-out tree, if
found there, or alternatively searched for in the path if not.
@ -12283,7 +12516,7 @@ two versions of the files, and require the user using
mechanisms outside @sc{cvs}, to insert any necessary
changes.
@strong{WARNING: do not use @code{COPY} with
@strong{WARNING: Do not use @code{COPY} with
@sc{cvs} 1.9 or earlier - such versions of @sc{cvs} will
copy one version of your file over the other, wiping
out the previous contents.}
@ -13596,6 +13829,20 @@ CPU intensive but is not recommended for use with large repositories}
@xref{verifymsg}, for more information on how verifymsg
may be used.
@cindex IgnoreUnknownConfigKeys, in CVSROOT/config
@item IgnoreUnknownConfigKeys=@var{value}
If @var{value} is @samp{yes}, then @sc{cvs} should
ignore any keywords in @file{CVSROOT/config} which it
does not recognize. This option is intended primarily
for transitions between versions of @sc{cvs} which
support more configuration options in an environment
where a read-only mirror of the current @sc{cvs} server
may be maintained by someone else who is not yet ready
to upgrade to the same version. It is recommended that
this option be used only for a short time so that
problems with the @file{CVSROOT/config} file will be
found quickly. The default is @samp{no}.
@end table
@c ---------------------------------------------------------------------
@ -13683,6 +13930,12 @@ Specifies the external program which @sc{cvs} connects with,
when @code{:ext:} access method is specified.
@pxref{Connecting via rsh}.
@cindex CVS_SSH, environment variable
@item $CVS_SSH
Specifies the external program which @sc{cvs} connects with,
when @code{:extssh:} access method is specified.
@pxref{Connecting via rsh}.
@item $CVS_SERVER
Used in client-server mode when accessing a remote
repository using @sc{rsh}. It specifies the name of
@ -14077,7 +14330,7 @@ cause, please let us know as described in @ref{BUGS}.
@item end of file from server (consult above messages if any)
The most common cause for this message is if you are
using an external @code{rsh} program and it exited with
using an external @code{rsh} or @code{ssh} program and it exited with
an error. In this case the @code{rsh} program should
have printed a message, which will appear before the
above message. For more information on setting up a
@ -14546,13 +14799,14 @@ fee. One such company is:
@cindex Ximbiot
@cindex Support, getting CVS support
@example
Ximbiot
319 S. River St.
Harrisburg, PA 17104-1657
Ximbiot LLC
Suite 230
200 Diversion St.
Rochester Hills, MI 48307-6636
USA
Email: info@@ximbiot.com
Phone: (717) 579-6168
Fax: (717) 234-3125
Phone: (248) 835-1260
Fax: (248) 835-1263
@url{http://ximbiot.com/}
@end example

55
contrib/cvs/doc/cvsclient.texi
View File

@ -205,7 +205,7 @@ this response, which is generic, or a more specific response using
@samp{E} and/or @samp{error}.
@item E @var{text}
Provide a message for the user. After this reponse, the authentication
Provide a message for the user. After this response, the authentication
protocol continues with another response. Typically the server will
provide a series of @samp{E} responses followed by @samp{error}.
Compatibility note: @sc{cvs} 1.9.10 and older clients will print
@ -245,7 +245,7 @@ version or the other.
The procedure here is to start with @samp{BEGIN
GSSAPI REQUEST}. GSSAPI authentication information is then exchanged
between the client and the server. Each packet of information consists
of a two byte big endian length, followed by that many bytes of data.
of a two byte big-endian length, followed by that many bytes of data.
After the GSSAPI authentication is complete, the server continues with
the responses described above (@samp{I LOVE YOU}, etc.).
@ -537,8 +537,7 @@ Here are the requests:
Response expected: no. Tell the server which @code{CVSROOT} to use.
Note that @var{pathname} is @emph{not} a fully qualified @code{CVSROOT}
variable, but only the local directory part of it. @var{pathname} must
already exist on the server; if creating a new root, use the @code{init}
request, not @code{Root}. Again, @var{pathname} @emph{does not} include
already exist on the server. Again, @var{pathname} @emph{does not} include
the hostname of the server, how to access the server, etc.; by the time
the CVS protocol is in use, connection, authentication, etc., are
already taken care of.
@ -546,7 +545,7 @@ already taken care of.
The @code{Root} request must be sent only once, and it must be sent
before any requests other than @code{Valid-responses},
@code{valid-requests}, @code{UseUnchanged}, @code{Set},
@code{Global_option}, @code{init}, @code{noop}, or @code{version}.
@code{Global_option}, @code{noop}, or @code{version}.
@item Valid-responses @var{request-list} \n
Response expected: no.
@ -569,7 +568,7 @@ also for @code{ci} and the other commands; normal usage is to send
@code{Entry} or @code{Modified}, and then a final @code{Directory}
for the original directory, then the command.
The @var{local-directory} is relative to
the top level at which the command is occurring (i.e. the last
the top level at which the command is occurring (i.e., the last
@code{Directory} which is sent before the command);
to indicate that top level, @samp{.} should be sent for
@var{local-directory}.
@ -758,18 +757,6 @@ each time it sends a @code{Directory} request for a given directory.
However, the server is not obliged to remember them beyond the context
of a single command.
@item Checkin-prog @var{program} \n
Response expected: no. Tell the server that the directory most recently
specified with @code{Directory} has a checkin program @var{program}.
Such a program would have been previously set with the
@code{Set-checkin-prog} response.
@item Update-prog @var{program} \n
Response expected: no. Tell the server that the directory most recently
specified with @code{Directory} has an update program @var{program}.
Such a program would have been previously set with the
@code{Set-update-prog} response.
@item Entry @var{entry-line} \n
Response expected: no. Tell the server what version of a file is on the
local machine. The name in @var{entry-line} is a name relative to the
@ -853,7 +840,7 @@ Commands for which @code{Modified} is necessary are @code{co},
Commands which do not need to inform the server about a working
directory, and thus should not be sending either @code{Modified} or
@code{Is-modified}: @code{rdiff}, @code{rtag}, @code{history},
@code{init}, and @code{release}.
and @code{release}.
Commands for which further investigation is warranted are:
@code{remove}, @code{add}, and @code{export}. Pending such
@ -953,7 +940,7 @@ there are some situations it cannot handle (ignore patterns, or
situations where the user specifies a filename and the client does not
know about that file).
Though this request will be supported into the forseeable future, it has been
Though this request will be supported into the foreseeable future, it has been
the source of numerous bug reports in the past due to the complexity of testing
this functionality via the test suite and client developers are encouraged not
to use it. Instead, please consider munging conflicting names and maintaining
@ -1192,12 +1179,6 @@ should not send @code{Directory}, @code{Entry}, or @code{Modified}
requests for these commands; they are not used. Arguments to these
commands are module names, as described for @code{co}.
@item init @var{root-name} \n
Response expected: yes. If it doesn't already exist, create a @sc{cvs}
repository @var{root-name}. Note that @var{root-name} is a local
directory and @emph{not} a fully qualified @code{CVSROOT} variable.
The @code{Root} request need not have been previously sent.
@item update \n
Response expected: yes. Actually do a @code{cvs update} command. This
uses any previous @code{Argument}, @code{Directory}, @code{Entry},
@ -1216,7 +1197,7 @@ of the operation - unlike most commands, the repository field of each
@code{Directory} request is ignored (it merely must point somewhere
within the root). The files to be imported are sent in @code{Modified}
requests (files which the client knows should be ignored are not sent;
the server must still process the CVSROOT/cvsignore file unless -I ! is
the server must still process the CVSROOT/cvsignore file unless -I !@: is
sent). A log message must have been specified with a @code{-m}
argument.
@ -1393,7 +1374,7 @@ indicates that the response is over.
@c lame terms (mostly because they are so awkward). Any better ideas?
The responses @code{Checked-in}, @code{New-entry}, @code{Updated},
@code{Created}, @code{Update-existing}, @code{Merged}, and
@code{Patched} are refered to as @dfn{file updating} responses, because
@code{Patched} are referred to as @dfn{file updating} responses, because
they change the status of a file in the working directory in some way.
The responses @code{Mode}, @code{Mod-time}, and @code{Checksum} are
referred to as @dfn{file update modifying} responses because they modify
@ -1412,7 +1393,7 @@ Many of the responses contain something called @var{pathname}.
@c end in "/.".
The name is somewhat misleading; it actually indicates a pair of
pathnames. First, a local directory name
relative to the directory in which the command was given (i.e. the last
relative to the directory in which the command was given (i.e., the last
@code{Directory} before the command). Then a linefeed and a repository
name. Then
a slash and the filename (without a @samp{,v} ending).
@ -1463,7 +1444,7 @@ patches, it will include @samp{update-patches} in this list. The
@item Checked-in @var{pathname} \n
Additional data: New Entries line, \n. This means a file @var{pathname}
has been successfully operated on (checked in, added, etc.). name in
has been successfully operated on (checked in, added, etc.). The name in
the Entries line is the same as the last component of @var{pathname}.
@item New-entry @var{pathname} \n
@ -1636,16 +1617,6 @@ specify a directory, not a file within a directory. Tell the client to
store the file transmission as the template log message, and then use
that template in the future when prompting the user for a log message.
@item Set-checkin-prog @var{dir} \n
Additional data: @var{prog} \n. Tell the client to set a checkin
program, which should be supplied with the @code{Checkin-prog} request
for future operations.
@item Set-update-prog @var{dir} \n
Additional data: @var{prog} \n. Tell the client to set an update
program, which should be supplied with the @code{Update-prog} request
for future operations.
@item Notified @var{pathname} \n
Indicate to the client that the notification for @var{pathname} has been
done. There should be one such response for every @code{Notify}
@ -1857,7 +1828,7 @@ and requests would be longer.
@c line breaks. Any better solutions?
@c Other than that, this exchange is taken verbatim from the data
@c exchanged by CVS (as of Nov 1996). That is why some of the requests and
@c reponses are not quite what you would pick for pedagogical purposes.
@c responses are not quite what you would pick for pedagogical purposes.
@example
C: Root /u/cvsroot
@ -2029,7 +2000,7 @@ Similarly, the @code{http://cvs.nongnu.org} site, in particular the
@itemize @bullet
@item
The @code{Modified} request could be speeded up by sending diffs rather
The @code{Modified} request could be sped up by sending diffs rather
than entire files. The client would need some way to keep the version
of the file which was originally checked out; probably requiring the use
of "cvs edit" in this case is the most sensible course (the "cvs edit"

139
contrib/cvs/doc/mdate-sh
View File

@ -1,6 +1,10 @@
#!/bin/sh
# Get modification time of a file or directory and pretty-print it.
# Copyright 1995, 1996, 1997 Free Software Foundation, Inc.
scriptversion=2005-06-29.22
# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005 Free Software
# Foundation, Inc.
# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
#
# This program is free software; you can redistribute it and/or modify
@ -15,7 +19,37 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
case $1 in
'')
echo "$0: No file. Try \`$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: mdate-sh [--help] [--version] FILE
Pretty-print the modification time of FILE.
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "mdate-sh $scriptversion"
exit $?
;;
esac
# Prevent date giving response in another language.
LANG=C
@ -25,24 +59,46 @@ export LC_ALL
LC_TIME=C
export LC_TIME
# Get the extended ls output of the file or directory.
# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
if ls -L /dev/null 1>/dev/null 2>&1; then
set - x`ls -L -l -d $1`
else
set - x`ls -l -d $1`
# GNU ls changes its time format in response to the TIME_STYLE
# variable. Since we cannot assume `unset' works, revert this
# variable to its documented default.
if test "${TIME_STYLE+set}" = set; then
TIME_STYLE=posix-long-iso
export TIME_STYLE
fi
# The month is at least the fourth argument
# (3 shifts here, the next inside the loop).
shift
shift
shift
# Find the month. Next argument is day, followed by the year or time.
save_arg1=$1
# Find out how to get the extended ls output of a file or directory.
if ls -L /dev/null 1>/dev/null 2>&1; then
ls_command='ls -L -l -d'
else
ls_command='ls -l -d'
fi
# A `ls -l' line looks as follows on OS/2.
# drwxrwx--- 0 Aug 11 2001 foo
# This differs from Unix, which adds ownership information.
# drwxrwx--- 2 root root 4096 Aug 11 2001 foo
#
# To find the date, we split the line on spaces and iterate on words
# until we find a month. This cannot work with files whose owner is a
# user named `Jan', or `Feb', etc. However, it's unlikely that `/'
# will be owned by a user whose name is a month. So we first look at
# the extended ls output of the root directory to decide how many
# words should be skipped to get the date.
# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
set x`ls -l -d /`
# Find which argument is the month.
month=
command=
until test $month
do
shift
# Add another shift to the command.
command="$command shift;"
case $1 in
Jan) month=January; nummonth=1;;
Feb) month=February; nummonth=2;;
@ -59,7 +115,51 @@ do
esac
done
day=$2
# Get the extended ls output of the file or directory.
set dummy x`eval "$ls_command \"\$save_arg1\""`
# Remove all preceding arguments
eval $command
# Because of the dummy argument above, month is in $2.
#
# On a POSIX system, we should have
#
# $# = 5
# $1 = file size
# $2 = month
# $3 = day
# $4 = year or time
# $5 = filename
#
# On Darwin 7.7.0 and 7.6.0, we have
#
# $# = 4
# $1 = day
# $2 = month
# $3 = year or time
# $4 = filename
# Get the month.
case $2 in
Jan) month=January; nummonth=1;;
Feb) month=February; nummonth=2;;
Mar) month=March; nummonth=3;;
Apr) month=April; nummonth=4;;
May) month=May; nummonth=5;;
Jun) month=June; nummonth=6;;
Jul) month=July; nummonth=7;;
Aug) month=August; nummonth=8;;
Sep) month=September; nummonth=9;;
Oct) month=October; nummonth=10;;
Nov) month=November; nummonth=11;;
Dec) month=December; nummonth=12;;
esac
case $3 in
???*) day=$1;;
*) day=$3; shift;;
esac
# Here we have to deal with the problem that the ls output gives either
# the time of day or the year.
@ -90,3 +190,12 @@ esac
# The result.
echo $day $month $year
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:

9
contrib/cvs/doc/mkman.pl
View File

@ -2,7 +2,8 @@
#
# Generate a man page from sections of a Texinfo manual.
#
# Copyright 2004 The Free Software Foundation,
# Copyright 2004, 2006
# The Free Software Foundation,
# Derek R. Price,
# & Ximbiot <http://ximbiot.com>
#
@ -72,8 +73,10 @@ sub do_keyword
{
my ($file, $parent, $keyword, $content) = @_;
return "see node \`$content\\(aq in the CVS manual"
if $keyword =~ /^(p?x)?ref$/;
return "`$content\\(aq in the CVS manual"
if $keyword eq "ref";
return "see node `$content\\(aq in the CVS manual"
if $keyword =~ /^p?xref$/;
return "\\fP\\fP$content"
if $keyword =~ /^splitrcskeyword$/;

8
contrib/cvs/doc/stamp-1
View File

@ -1,4 +1,4 @@
@set UPDATED 8 June 2006
@set UPDATED-MONTH June 2006
@set EDITION 1.11.22
@set VERSION 1.11.22
@set UPDATED 7 May 2007
@set UPDATED-MONTH May 2007
@set EDITION 1.11.22.1
@set VERSION 1.11.22.1

8
contrib/cvs/doc/stamp-vti
View File

@ -1,4 +1,4 @@
@set UPDATED 15 May 2006
@set UPDATED-MONTH May 2006
@set EDITION 1.11.22
@set VERSION 1.11.22
@set UPDATED 27 January 2008
@set UPDATED-MONTH January 2008
@set EDITION 1.11.22.1
@set VERSION 1.11.22.1

8
contrib/cvs/doc/version-client.texi
View File

@ -1,4 +1,4 @@
@set UPDATED 8 June 2006
@set UPDATED-MONTH June 2006
@set EDITION 1.11.22
@set VERSION 1.11.22
@set UPDATED 7 May 2007
@set UPDATED-MONTH May 2007
@set EDITION 1.11.22.1
@set VERSION 1.11.22.1

8
contrib/cvs/doc/version.texi
View File

@ -1,4 +1,4 @@
@set UPDATED 15 May 2006
@set UPDATED-MONTH May 2006
@set EDITION 1.11.22
@set VERSION 1.11.22
@set UPDATED 27 January 2008
@set UPDATED-MONTH January 2008
@set EDITION 1.11.22.1
@set VERSION 1.11.22.1

624
contrib/cvs/install-sh
View File

@ -1,36 +1,62 @@
#!/bin/sh
#
# install - install a program, script, or datafile
# This comes from X11R5 (mit/util/scripts/install.sh).
scriptversion=2006-10-14.15
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
# following copyright and license.
#
# Copyright 1991 by the Massachusetts Institute of Technology
# Copyright (C) 1994 X Consortium
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation, and that the name of M.I.T. not be used in advertising or
# publicity pertaining to distribution of the software without specific,
# written prior permission. M.I.T. makes no representations about the
# suitability of this software for any purpose. It is provided "as is"
# without express or implied warranty.
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to
# deal in the Software without restriction, including without limitation the
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
# sell copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
# Except as contained in this notice, the name of the X Consortium shall not
# be used in advertising or otherwise to promote the sale, use or other deal-
# ings in this Software without prior written authorization from the X Consor-
# tium.
#
#
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch. It can only install one file at a time, a restriction
# shared with many OS's install programs.
# from scratch.
nl='
'
IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
if test -z "$doit"; then
doit_exec=exec
else
doit_exec=$doit
fi
# put in absolute paths if you don't have them in your path; or use env. vars.
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
@ -41,211 +67,441 @@ stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
transformbasename=""
transform_arg=""
instcmd="$mvprog"
chmodcmd="$chmodprog 0755"
chowncmd=""
chgrpcmd=""
stripcmd=""
posix_glob=
posix_mkdir=
# Desired mode of installed file.
mode=0755
chmodcmd=$chmodprog
chowncmd=
chgrpcmd=
stripcmd=
rmcmd="$rmprog -f"
mvcmd="$mvprog"
src=""
dst=""
dir_arg=""
src=
dst=
dir_arg=
dstarg=
no_target_directory=
while [ x"$1" != x ]; do
case $1 in
-c) instcmd="$cpprog"
shift
continue;;
usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
-d) dir_arg=true
shift
continue;;
In the 1st form, copy SRCFILE to DSTFILE.
In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
In the 4th, create DIRECTORIES.
-m) chmodcmd="$chmodprog $2"
shift
shift
continue;;
Options:
-c (ignored)
-d create directories instead of installing files.
-g GROUP $chgrpprog installed files to GROUP.
-m MODE $chmodprog installed files to MODE.
-o USER $chownprog installed files to USER.
-s $stripprog installed files.
-t DIRECTORY install into DIRECTORY.
-T report an error if DSTFILE is a directory.
--help display this help and exit.
--version display version info and exit.
-o) chowncmd="$chownprog $2"
shift
shift
continue;;
Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
"
-g) chgrpcmd="$chgrpprog $2"
shift
shift
continue;;
while test $# -ne 0; do
case $1 in
-c) shift
continue;;
-s) stripcmd="$stripprog"
shift
continue;;
-d) dir_arg=true
shift
continue;;
-t=*) transformarg=`echo $1 | sed 's/-t=//'`
shift
continue;;
-g) chgrpcmd="$chgrpprog $2"
shift
shift
continue;;
-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
shift
continue;;
--help) echo "$usage"; exit $?;;
*) if [ x"$src" = x ]
then
src=$1
else
# this colon is to work around a 386BSD /bin/sh bug
:
dst=$1
fi
shift
continue;;
esac
done
-m) mode=$2
shift
shift
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
continue;;
if [ x"$src" = x ]
then
echo "install: no input file specified"
exit 1
else
true
fi
-o) chowncmd="$chownprog $2"
shift
shift
continue;;
if [ x"$dir_arg" != x ]; then
dst=$src
src=""
if [ -d $dst ]; then
instcmd=:
chmodcmd=""
else
instcmd=mkdir
fi
else
-s) stripcmd=$stripprog
shift
continue;;
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if [ -f $src -o -d $src ]
then
true
else
echo "install: $src does not exist"
exit 1
fi
if [ x"$dst" = x ]
then
echo "install: no destination specified"
exit 1
else
true
fi
# If destination is a directory, append the input filename; if your system
# does not like double slashes in filenames, you may need to add some logic
if [ -d $dst ]
then
dst="$dst"/`basename $src`
else
true
fi
fi
## this sed command emulates the dirname command
dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Make sure that the destination directory exists.
# this part is taken from Noah Friedman's mkinstalldirs script
# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
defaultIFS='
'
IFS="${IFS-${defaultIFS}}"
oIFS="${IFS}"
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
IFS="${oIFS}"
pathcomp=''
while [ $# -ne 0 ] ; do
pathcomp="${pathcomp}${1}"
-t) dstarg=$2
shift
shift
continue;;
if [ ! -d "${pathcomp}" ] ;
then
$mkdirprog "${pathcomp}"
else
true
fi
-T) no_target_directory=true
shift
continue;;
pathcomp="${pathcomp}/"
--version) echo "$0 $scriptversion"; exit $?;;
--) shift
break;;
-*) echo "$0: invalid option: $1" >&2
exit 1;;
*) break;;
esac
done
if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
if test -n "$dstarg"; then
# $@ is not empty: it contains at least $arg.
set fnord "$@" "$dstarg"
shift # fnord
fi
shift # arg
dstarg=$arg
done
fi
if [ x"$dir_arg" != x ]
then
$doit $instcmd $dst &&
if test $# -eq 0; then
if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2
exit 1
fi
# It's OK to call `install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
else
if test -z "$dir_arg"; then
trap '(exit $?); exit' 1 2 13 15
# If we're going to rename the final executable, determine the name now.
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
case $mode in
# Optimize common cases.
*644) cp_umask=133;;
*755) cp_umask=22;;
if [ x"$transformarg" = x ]
then
dstfile=`basename $dst`
*[0-7])
if test -z "$stripcmd"; then
u_plus_rw=
else
u_plus_rw='% 200'
fi
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
*)
if test -z "$stripcmd"; then
u_plus_rw=
else
u_plus_rw=,u+rw
fi
cp_umask=$mode$u_plus_rw;;
esac
fi
for src
do
# Protect names starting with `-'.
case $src in
-*) src=./$src ;;
esac
if test -n "$dir_arg"; then
dst=$src
dstdir=$dst
test -d "$dstdir"
dstdir_status=$?
else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if test ! -f "$src" && test ! -d "$src"; then
echo "$0: $src does not exist." >&2
exit 1
fi
if test -z "$dstarg"; then
echo "$0: no destination specified." >&2
exit 1
fi
dst=$dstarg
# Protect names starting with `-'.
case $dst in
-*) dst=./$dst ;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
echo "$0: $dstarg: Is a directory" >&2
exit 1
fi
dstdir=$dst
dst=$dstdir/`basename "$src"`
dstdir_status=0
else
# Prefer dirname, but fall back on a substitute if dirname fails.
dstdir=`
(dirname "$dst") 2>/dev/null ||
expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$dst" : 'X\(//\)[^/]' \| \
X"$dst" : 'X\(//\)$' \| \
X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
echo X"$dst" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
}
/^X\(\/\/\)[^/].*/{
s//\1/
q
}
/^X\(\/\/\)$/{
s//\1/
q
}
/^X\(\/\).*/{
s//\1/
q
}
s/.*/./; q'
`
test -d "$dstdir"
dstdir_status=$?
fi
fi
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
case $posix_mkdir in
'')
# Create intermediate dirs using mode 755 as modified by the umask.
# This is like FreeBSD 'install' as of 1997-10-28.
umask=`umask`
case $stripcmd.$umask in
# Optimize common cases.
*[2367][2367]) mkdir_umask=$umask;;
.*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
*[0-7])
mkdir_umask=`expr $umask + 22 \
- $umask % 100 % 40 + $umask % 20 \
- $umask % 10 % 4 + $umask % 2
`;;
*) mkdir_umask=$umask,go-w;;
esac
# With -d, create the new directory with the user-specified mode.
# Otherwise, rely on $mkdir_umask.
if test -n "$dir_arg"; then
mkdir_mode=-m$mode
else
dstfile=`basename $dst $transformbasename |
sed $transformarg`$transformbasename
mkdir_mode=
fi
# don't allow the sed command to completely eliminate the filename
posix_mkdir=false
case $umask in
*[123567][0-7][0-7])
# POSIX mkdir -p sets u+wx bits regardless of umask, which
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
if [ x"$dstfile" = x ]
then
dstfile=`basename $dst`
if (umask $mkdir_umask &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writeable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
$mkdirprog -m$different_mode -p -- "$tmpdir" && {
ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
rmdir "$tmpdir/d" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
fi
trap '' 0;;
esac;;
esac
if
$posix_mkdir && (
umask $mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
)
then :
else
# The umask is ridiculous, or mkdir does not conform to POSIX,
# or it failed possibly due to a race condition. Create the
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
/*) prefix=/ ;;
-*) prefix=./ ;;
*) prefix= ;;
esac
case $posix_glob in
'')
if (set -f) 2>/dev/null; then
posix_glob=true
else
posix_glob=false
fi ;;
esac
oIFS=$IFS
IFS=/
$posix_glob && set -f
set fnord $dstdir
shift
$posix_glob && set +f
IFS=$oIFS
prefixes=
for d
do
test -z "$d" && continue
prefix=$prefix$d
if test -d "$prefix"; then
prefixes=
else
true
if $posix_mkdir; then
(umask=$mkdir_umask &&
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
# Don't fail if two instances are running concurrently.
test -d "$prefix" || exit 1
else
case $prefix in
*\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
*) qprefix=$prefix;;
esac
prefixes="$prefixes '$qprefix'"
fi
fi
prefix=$prefix/
done
# Make a temp file name in the proper directory.
if test -n "$prefixes"; then
# Don't fail if two instances are running concurrently.
(umask $mkdir_umask &&
eval "\$doit_exec \$mkdirprog $prefixes") ||
test -d "$dstdir" || exit 1
obsolete_mkdir_used=true
fi
fi
fi
dsttmp=$dstdir/#inst.$$#
if test -n "$dir_arg"; then
{ test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
{ test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
else
# Move or copy the file name to the temp name
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
rmtmp=$dstdir/_rm.$$_
$doit $instcmd $src $dsttmp &&
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
trap "rm -f ${dsttmp}" 0 &&
# Copy the file name to the temp name.
(umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits
# and set any options; do chmod last to preserve setuid bits.
#
# If any of these fail, we abort the whole thing. If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
&& { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
# If any of these fail, we abort the whole thing. If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command.
# Now rename the file to the real destination.
{ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
|| {
# The rename failed, perhaps because mv can't rename something else
# to itself, or perhaps because mv is so ancient that it does not
# support -f.
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
# Now remove or move aside any old file at destination location.
# We try this two ways since rm can't unlink itself on some
# systems and the destination file might be busy for other
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
if test -f "$dst"; then
$doit $rmcmd -f "$dst" 2>/dev/null \
|| { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
&& { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
|| {
echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
else
:
fi
} &&
# Now rename the file to the real destination.
# Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dst"
}
} || exit 1
$doit $rmcmd -f $dstdir/$dstfile &&
$doit $mvcmd $dsttmp $dstdir/$dstfile
trap '' 0
fi
done
fi &&
exit 0
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:

5
contrib/cvs/lib/ChangeLog
View File

@ -1,3 +1,8 @@
2006-06-23 Larry Jones <lawrence.jones@ugs.com>
* xsize.h: Avoid SGI problem with <stdint.h> being unusable in C89
mode.
2005-11-14 Mark D. Baushke <mdb@gnu.org>
* system.h (FOLD_FN_CHAR): Distinguish OSX_ and VMS_ variations

117
contrib/cvs/lib/Makefile.in
View File

@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -31,15 +31,11 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@ -80,13 +76,14 @@ libcvs_a_OBJECTS = $(am_libcvs_a_OBJECTS)
am_getdate_OBJECTS = getdate-getdate.$(OBJEXT)
getdate_OBJECTS = $(am_getdate_OBJECTS)
getdate_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
YLWRAP = $(top_srcdir)/ylwrap
SOURCES = $(libcvs_a_SOURCES) $(getdate_SOURCES)
@ -95,8 +92,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@ -117,6 +112,8 @@ ECHO_T = @ECHO_T@
EDITOR = @EDITOR@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -128,11 +125,8 @@ LIBS = @LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@
MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@
MKDIR_P = @MKDIR_P@
MKTEMP = @MKTEMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@ -154,12 +148,13 @@ STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -167,26 +162,38 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
includeopt = @includeopt@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_default_rsh = @with_default_rsh@
with_default_ssh = @with_default_ssh@
# For now we need to include $(top_srcdir)/src because some systems
# (at least 'AIX rioscpu2 3 4 000030498200',
@ -274,7 +281,7 @@ clean-checkPROGRAMS:
-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
getdate$(EXEEXT): $(getdate_OBJECTS) $(getdate_DEPENDENCIES)
@rm -f getdate$(EXEEXT)
$(LINK) $(getdate_LDFLAGS) $(getdate_OBJECTS) $(getdate_LDADD) $(LIBS)
$(LINK) $(getdate_OBJECTS) $(getdate_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@ -312,36 +319,35 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yesno.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
getdate-getdate.o: getdate.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getdate-getdate.o -MD -MP -MF "$(DEPDIR)/getdate-getdate.Tpo" -c -o getdate-getdate.o `test -f 'getdate.c' || echo '$(srcdir)/'`getdate.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/getdate-getdate.Tpo" "$(DEPDIR)/getdate-getdate.Po"; else rm -f "$(DEPDIR)/getdate-getdate.Tpo"; exit 1; fi
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getdate-getdate.o -MD -MP -MF $(DEPDIR)/getdate-getdate.Tpo -c -o getdate-getdate.o `test -f 'getdate.c' || echo '$(srcdir)/'`getdate.c
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/getdate-getdate.Tpo $(DEPDIR)/getdate-getdate.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getdate.c' object='getdate-getdate.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdate-getdate.o `test -f 'getdate.c' || echo '$(srcdir)/'`getdate.c
getdate-getdate.obj: getdate.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getdate-getdate.obj -MD -MP -MF "$(DEPDIR)/getdate-getdate.Tpo" -c -o getdate-getdate.obj `if test -f 'getdate.c'; then $(CYGPATH_W) 'getdate.c'; else $(CYGPATH_W) '$(srcdir)/getdate.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/getdate-getdate.Tpo" "$(DEPDIR)/getdate-getdate.Po"; else rm -f "$(DEPDIR)/getdate-getdate.Tpo"; exit 1; fi
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getdate-getdate.obj -MD -MP -MF $(DEPDIR)/getdate-getdate.Tpo -c -o getdate-getdate.obj `if test -f 'getdate.c'; then $(CYGPATH_W) 'getdate.c'; else $(CYGPATH_W) '$(srcdir)/getdate.c'; fi`
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/getdate-getdate.Tpo $(DEPDIR)/getdate-getdate.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getdate.c' object='getdate-getdate.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdate-getdate.obj `if test -f 'getdate.c'; then $(CYGPATH_W) 'getdate.c'; else $(CYGPATH_W) '$(srcdir)/getdate.c'; fi`
.y.c:
$(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
uninstall-info-am:
$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@ -392,9 +398,9 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@failed=0; all=0; xfail=0; xpass=0; skip=0; \
@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
srcdir=$(srcdir); export srcdir; \
list='$(TESTS)'; \
list=' $(TESTS) '; \
if test -n "$$list"; then \
for tst in $$list; do \
if test -f ./$$tst; then dir=./; \
@ -403,7 +409,7 @@ check-TESTS: $(TESTS)
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
*" $$tst "*) \
*$$ws$$tst$$ws*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
echo "XPASS: $$tst"; \
@ -415,7 +421,7 @@ check-TESTS: $(TESTS)
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
*" $$tst "*) \
*$$ws$$tst$$ws*) \
xfail=`expr $$xfail + 1`; \
echo "XFAIL: $$tst"; \
;; \
@ -465,22 +471,21 @@ check-TESTS: $(TESTS)
else :; fi
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
$(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@ -546,12 +551,20 @@ info-am:
install-data-am:
install-dvi: install-dvi-am
install-exec-am:
install-html: install-html-am
install-info: install-info-am
install-man:
install-pdf: install-pdf-am
install-ps: install-ps-am
installcheck-am:
maintainer-clean: maintainer-clean-am
@ -571,18 +584,22 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-info-am
uninstall-am:
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
clean-checkPROGRAMS clean-generic clean-noinstLIBRARIES ctags \
distclean distclean-compile distclean-generic distclean-local \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-info-am
tags uninstall uninstall-am
# Until Automake gets its act together

4
contrib/cvs/lib/xsize.h
View File

@ -24,7 +24,9 @@
/* Get SIZE_MAX. */
#include <limits.h>
#if HAVE_STDINT_H
#if HAVE_INTTYPES_H
# include <inttypes.h>
#elif HAVE_STDINT_H
# include <stdint.h>
#endif

96
contrib/cvs/man/Makefile.in
View File

@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -30,15 +30,11 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@ -69,8 +65,6 @@ NROFF = nroff
MANS = $(man_MANS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@ -91,6 +85,8 @@ ECHO_T = @ECHO_T@
EDITOR = @EDITOR@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -102,11 +98,8 @@ LIBS = @LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@
MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@
MKDIR_P = @MKDIR_P@
MKTEMP = @MKTEMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@ -128,12 +121,13 @@ STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -141,26 +135,38 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
includeopt = @includeopt@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_default_rsh = @with_default_rsh@
with_default_ssh = @with_default_ssh@
man_MANS = cvs.5 cvsbug.8
EXTRA_DIST = \
.cvsignore \
@ -198,10 +204,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
uninstall-info-am:
install-man5: $(man5_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@ -246,7 +251,7 @@ uninstall-man5:
done
install-man8: $(man8_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
@ -297,22 +302,21 @@ CTAGS:
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
$(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@ -328,7 +332,7 @@ check: check-am
all-am: Makefile $(MANS)
installdirs:
for dir in "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@ -374,12 +378,20 @@ info-am:
install-data-am: install-man
install-dvi: install-dvi-am
install-exec-am:
install-html: install-html-am
install-info: install-info-am
install-man: install-man5 install-man8
install-pdf: install-pdf-am
install-ps: install-ps-am
installcheck-am:
maintainer-clean: maintainer-clean-am
@ -398,19 +410,23 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-info-am uninstall-man
uninstall-am: uninstall-man
uninstall-man: uninstall-man5 uninstall-man8
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
install-man5 install-man8 install-strip installcheck \
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-man5 install-man8 install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
uninstall-man uninstall-man5 uninstall-man8
pdf-am ps ps-am uninstall uninstall-am uninstall-man \
uninstall-man5 uninstall-man8
# for backwards compatibility with the old makefiles

218
contrib/cvs/missing
View File

@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
scriptversion=2006-05-10.23
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@ -15,8 +19,13 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
@ -24,19 +33,35 @@ if test $# -eq 0; then
fi
run=:
sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
case "$1" in
# In the cases where this matters, `missing' is being run in the
# srcdir already.
if test -f configure.ac; then
configure_ac=configure.ac
else
configure_ac=configure.in
fi
msg="missing on your system"
case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
# Exit code 63 means version mismatch. This often happens
# when the user try to use an ancient version of a tool on
# a file that requires a minimum version. In this case we
# we should proceed has if the program had been absent, or
# if --run hadn't been passed.
if test $? = 63; then
run=:
msg="probably too old"
fi
;;
esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@ -54,6 +79,7 @@ Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@ -61,11 +87,15 @@ Supported PROGRAM values:
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Send bug reports to <bug-automake@gnu.org>."
exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
echo "missing 0.3 - GNU automake"
echo "missing $scriptversion (GNU Automake)"
exit $?
;;
-*)
@ -74,10 +104,45 @@ Supported PROGRAM values:
exit 1
;;
aclocal)
esac
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
tar)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
exit 1
fi
;;
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
# Could not run --version or --help. This is probably someone
# running `$TOOL --version' or `$TOOL --help' to check whether
# $TOOL exists and not knowing $TOOL uses missing.
exit 1
fi
;;
esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acinclude.m4' or \`configure.in'. You might want
WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
@ -85,8 +150,8 @@ WARNING: \`$1' is missing on your system. You should only need it if
autoconf)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified \`configure.in'. You might want to install the
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
@ -94,15 +159,15 @@ WARNING: \`$1' is missing on your system. You should only need it if
autoheader)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acconfig.h' or \`configure.in'. You might want
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
case "$f" in
case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@ -111,10 +176,10 @@ WARNING: \`$1' is missing on your system. You should only need it if
touch $touch_files
;;
automake)
automake*)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
@ -122,71 +187,92 @@ WARNING: \`$1' is missing on your system. You should only need it if
while read f; do touch "$f"; done
;;
autom4te)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo "#! /bin/sh"
echo "# Created by GNU Automake missing as a replacement of"
echo "# $ $@"
echo "exit 0"
chmod +x $file
exit 1
fi
;;
bison|yacc)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if [ $# -ne 1 ]; then
if test $# -ne 1; then
eval LASTARG="\${$#}"
case "$LASTARG" in
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
if [ -f "$SRCFILE" ]; then
if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
if [ -f "$SRCFILE" ]; then
if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
if [ ! -f y.tab.h ]; then
if test ! -f y.tab.h; then
echo >y.tab.h
fi
if [ ! -f y.tab.c ]; then
if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
lex|flex)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if [ $# -ne 1 ]; then
if test $# -ne 1; then
eval LASTARG="\${$#}"
case "$LASTARG" in
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
if [ -f "$SRCFILE" ]; then
if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
if [ ! -f lex.yy.c ]; then
if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
help2man)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
fi
if [ -f "$file" ]; then
file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@ -197,48 +283,57 @@ WARNING: \`$1' is missing on your system. You should only need it if
makeinfo)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
# The file to touch is that specified with -o ...
file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
file=`sed -n '
/^@setfilename/{
s/.* \([^ ]*\) *$/\1/
p
q
}' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
# If the file does not exist, the user really needs makeinfo;
# let's fail without touching anything.
test -f $file || exit 1
touch $file
;;
tar)
shift
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
# messages.
if (gnutar --version > /dev/null 2>&1); then
gnutar ${1+"$@"} && exit 0
gnutar "$@" && exit 0
fi
if (gtar --version > /dev/null 2>&1); then
gtar ${1+"$@"} && exit 0
gtar "$@" && exit 0
fi
firstarg="$1"
if shift; then
case "$firstarg" in
case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" ${1+"$@"} && exit 0
tar "$firstarg" "$@" && exit 0
;;
esac
case "$firstarg" in
case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" ${1+"$@"} && exit 0
tar "$firstarg" "$@" && exit 0
;;
esac
fi
@ -252,10 +347,10 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and you do not seem to have it handy on your
system. You might have modified some files without having the
WARNING: \`$1' is needed, and is $msg.
You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequirements for installing
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
@ -263,3 +358,10 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
esac
exit 0
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:

167
contrib/cvs/mkinstalldirs
View File

@ -1,40 +1,161 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman <friedman@prep.ai.mit.edu>
scriptversion=2006-05-11.19
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Public domain
# $Id: mkinstalldirs,v 1.4 2001/04/12 13:02:39 dprice Exp $
# Public domain.
#
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
nl='
'
IFS=" "" $nl"
errstatus=0
dirmode=
usage="\
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
Create each directory DIR (with mode MODE, if specified), including all
leading file name components.
Report bugs to <bug-automake@gnu.org>."
# process command line arguments
while test $# -gt 0 ; do
case $1 in
-h | --help | --h*) # -h for help
echo "$usage"
exit $?
;;
-m) # -m PERM arg
shift
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
dirmode=$1
shift
;;
--version)
echo "$0 $scriptversion"
exit $?
;;
--) # stop option processing
shift
break
;;
-*) # unknown option
echo "$usage" 1>&2
exit 1
;;
*) # first non-opt arg
break
;;
esac
done
for file
do
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
if test -d "$file"; then
shift
else
break
fi
done
pathcomp=
for d
do
pathcomp="$pathcomp$d"
case "$pathcomp" in
-* ) pathcomp=./$pathcomp ;;
esac
case $# in
0) exit 0 ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp"
# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
# mkdir -p a/c at the same time, both will detect that a is missing,
# one will create a, then the other will try to create a and die with
# a "File exists" error. This is a problem when calling mkinstalldirs
# from a parallel make. We use --version in the probe to restrict
# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already
# exists.
test -d ./-p && rmdir ./-p
test -d ./--version && rmdir ./--version
fi
;;
*)
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
test ! -d ./--version; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
else
# Clean up after NextStep and OpenStep mkdir.
for d in ./-m ./-p ./--version "./$dirmode";
do
test -d $d && rmdir $d
done
fi
;;
esac
mkdir "$pathcomp" || lasterr=$?
for file
do
case $file in
/*) pathcomp=/ ;;
*) pathcomp= ;;
esac
oIFS=$IFS
IFS=/
set fnord $file
shift
IFS=$oIFS
if test ! -d "$pathcomp"; then
errstatus=$lasterr
fi
fi
for d
do
test "x$d" = x && continue
pathcomp="$pathcomp/"
done
pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
lasterr=
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
errstatus=$lasterr
fi
fi
fi
fi
pathcomp=$pathcomp/
done
done
exit $errstatus
# mkinstalldirs ends here
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:

269
contrib/cvs/src/ChangeLog
View File

@ -1,3 +1,270 @@
2008-03-10 Mark D. Baushke <mdb@gnu.org>
* mkmodules.c, parseinfo.c: Update copyright.
* parseinfo.c (parse_config): Add support for new
"IgnoreUnknownConfigKeys" configuration key.
* mkmodules.c (config_contents): Add text about the
"IgnoreUnknownConfigKeys" option.
* sanity.sh (config): Test that IgnoreUnknownConfigKeys=yes works.
2008-01-30 Derek R. Price <derek@ximbiot.com>
* update.c (join_file): Use local copy to detect deletion conflicts,
as opposed to the base revision. Restore freeing of rev2 to its
original location. Use simpler conflict message.
* sanity.sh: Update to compensate.
2008-01-29 Derek R. Price <derek@ximbiot.com>
* update.c (join_file): Remove trace that is no longer needed.
2008-01-29 Derek R. Price <derek@ximbiot.com>
Paul Edwards <fight.subjugation@gmail.com>
* update.c (join_file): Detect deletion conflicts.
* sanity.sh (join, join4): Adjusted for this fix.
(join8, join9): Add new tests for conflicts.
2008-01-27 Mark D. Baushke <mdb@gnu.org>
* filesubr.c (xreadlink): s/128/BUFSIZ/ avoid magic numbers.
* client.c (start_rsh_server): Use CVS_SSH for the :extssh:
method or fall back to "ssh" as set using the --with-ssh flag to
configure.
* client.h, log.c, main.c, recurse.c, root.c: Update copyright for
2008.
2008-01-24 Mark D. Baushke <mdb@gnu.org>
* log.c (cvslog): New -n option to revert the -N switch.
(log_usage): Add -n to the help string.
* main.c (cmds[]): Add "blame" as a synonym for the
"annotate" command.
* sanity.sh (cvs-log): New tests for 'cvs log -N -n' validation.
(ann-10w1blame): Test the 'cvs blame' synonym for annotate.
(Patch suggested by "David O'Brien" <obrien@FreeBSD.org>)
* edit.c (notify_check): Rename to...
(cvs_notify_check): ...this to avoid Mac OSX symbol conflicts.
* client.h, edit.h, recurse.c: Change all references.
* client.c (start_rsh_server): Use RSH_DFLT not a hardcoded "rsh"
* root.c (parse_cvsroot): Fix parsing for the :extssh: method.
* sanity.sh (expr_set_DASHDASH): Fix for non-POSIX expr
implementations.
(CVSROOTDIR): Use 'cvsrootdir' instead of 'cvsroot' to
avoid problems on case preserving and/or case insensitive
filesystems (e.g., HFS+).
(CVSROOT_DIRNAME): Use ${TESTDIR}/${CVSROOTDIR} instead of
${TESTDIR}/cvsroot to avoid filesystem case sensitivity problems.
(crerepos-extssh): Clone of crerepos tests, but use the :extssh:
method.
2007-12-19 Larry Jones <lawrence.jones@siemens.com>
* client.c, import.c, lock.c, login.c, mkmodules.c, modules.c,
rcs.c, server.c: Fix gcc -Wall warnings.
2007-12-16 Larry Jones <lawrence.jones@siemens.com>
* rcs.c (HAVE_MMAP): Fall back to stdio if mmap fails.
2007-12-13 Larry Jones <lawrence.jones@siemens.com>
* rcs.c (rcsbuf_ftell): Avoid potential overflow.
2007-12-12 Larry Jones <lawrence.jones@siemens.com>
* vers_ts.c (time_stamp): Add warnings for [l]stat failures
other than no such file.
2007-08-26 Derek Price <derek@ximbiot.com>
* mkmodules.c (in_root): Rename to...
(in_repository): ...this.
2007-08-26 Larry Jones <lawrence.jones@ugs.com>
* mkmodules.c (in_root, init): Unmix declarations and code.
2007-08-22 Derek Price <derek@ximbiot.com>
* add.c (add): Check last component of argument paths instead of the
entire argument.
* sanity.sh (add-restricted): Test indirect paths to `CVS' dir with
add.
* server.c (serve_init): Remove unnecessary argument to printf style
function.
* mkmodules.c (in_root): New function.
(init): Verify that new roots are not created inside others.
* sanity.sh (init-3): New test for same.
2007-08-16 Derek Price <derek@ximbiot.com>
* root.c (root_allow_used): New function and...
* root.h (root_allow_used): ...its prototype.
* server.c (serve_root): Backport --allow-root test for `cvs server'.
* sanity.sh (server2-5, server2-6): New tests for the above.
2007-06-18 Derek Price <derek@ximbiot.com>
* client.c (send_repository): Don't attempt to send metadata from CVS
subdirectories when importing.
2007-06-15 Derek Price <derek@ximbiot.com>
* import.c (import): Check more carefully for files and directories
named "CVS".
* sanity.sh (import-1b): New test for same.
(import-2): Test files named "CVS", in addition to directories.
2007-05-22 Larry Jones <lawrence.jones@ugs.com>
* rcs.c (RCS_fully_parse): Include revision in error message.
2007-05-07 Derek Price <derek@ximbiot.com>
* mkmodules.c (init): Assert that the server is not active.
* server.c (serve_init): Send error message when the init command is
received from a client.
* sanity.sh (*): Avoid using remote init.
(skip_always, localonly, restore_adm): New convenience functions.
2007-03-08 Larry Jones <lawrence.jones@ugs.com>
* rcs.c (findmagictag): Cast node->data before doing arithmetic
since it's now (void *).
2007-03-05 Larry Jones <lawrence.jones@ugs.com>
* rcs.c (RCS_delete_revs): When checking for tagged revisions,
include magic branch tags.
2007-03-01 Larry Jones <lawrence.jones@ugs.com>
* import.c (import_descend_dir): Correct error message.
* sanity.sh (pserver-3a): New test.
2006-09-14 Derek Price <derek@ximbiot.com>
* sanity.sh (server3, client2): New tests.
2006-09-07 Derek Price <derek@ximbiot.com>
[bug #17560]
* rcs.c (apply_rcs_changes): Improve comments. Restore repaired error
handling.
2006-09-06 Larry Jones <lawrence.jones@ugs.com>
* rcs.c (apply_rcs_changes): Improve linked list handling. Remove
unused variables and unreachable error handling code. Avoid unneeded
dynamic allocation of temp linevector. Minor stylistic code clean up.
2006-09-06 Derek Price <derek@ximbiot.com>
[bug #17560]
* rcs.c (apply_rcs_changes): Improve header block comment. Clean up
unused linevector on non-fatal error.
2006-09-06 Derek Price <derek@ximbiot.com>
[bug #17560]
* rcs.c (apply_rcs_changes): Remove an unecessary memcpy. Avoid some
other processing on error.
(linevector_delete): Remove - it's no longer used.
2006-09-06 Mark D. Baushke <mdb@gnu.org>
[bug #17560]
* rcs.c (apply_rcs_changes): Fix the merge algorithm from O(n^2)
to O(n).
(Based on a patch submitted by "Michael J. Smith"
<msmith@ideorlando.org>)
2006-08-28 Derek Price <derek@ximbiot.com>
* recurse.c (do_recursion): Remove misguided assertion.
* sanity.sh (dottedroot-3): Add test for the above.
(Thanks to report from Paul Eggert <eggert@CS.UCLA.EDU>.)
[bug #17168]
* classify.c (Classify_File): Use T_PATCH for changed keywords instead
of T_CHECKOUT to conserver bandwidth. Don't sticky check when marking
files for update anyhow.
* sanity.sh: Update to compensate (s/^U /[UP] /).
2006-08-25 Derek Price <derek@ximbiot.com>
[bug #17168]
* classify.c (Classify_file): Mark files with potential keyword
substitution changes as needing update.
* sanity.sh: Update to compensate.
(keyword, keywordname, serverpatch): Update to compensate, removing
the last few "checksum failed" tests.
* classify.c (Classify_File): Remove hacks which worked around checksum
failures from bug #17032.
2006-08-24 Derek Price <derek@ximbiot.com>
[bug #17032]
* update.c (patch_file): Correctly recreate client working files
containing the RCS `Name' keyword before generating patches.
* sanity.sh (keyword-23r): Merge with local case to compensate.
2006-08-17 Larry Jones <lawrence.jones@ugs.com>
* hash.h: Rename structs node and list to hashnode and hashlist
to avoid name clashes.
2006-07-25 Mark D. Baushke <mdb@gnu.org>
* login.c (free_cvs_password): New function to control freeing of
the static get_cvs_passwd() returned storage.
(login): Call it.
* cvs.h (free_cvs_password): Add prototype for it.
* client.c (auth_server): Call it.
[Alter the previous NetBSD coverity cid-3404 patch.]
2006-07-11 Larry Jones <lawrence.jones@ugs.com>
* log.c (log_usage): Fix misleading description of -b (it selects
revisions on the default branch *in addition to* revisions selected
with -r).
2006-06-29 Derek Price <derek@ximbiot.com>
* client.c (is_arg_a_parent_or_listed_dir): Strip trailing slashes from
dir name defore searching for it. Partially addresses TODO #205.
* sanity.sh (trailingslashes): Update to compensate.
2006-06-28 Derek Price <derek@ximbiot.com>
[bug #16961]
* login.c (get_cvs_password): Return copy of global variable.
(Patch from <mbarabas@redhat.com>.)
2006-06-23 Larry Jones <lawrence.jones@ugs.com>
* server.c (do_cvs_command): Remove unused variable.
2006-06-22 Larry Jones <lawrence.jones@ugs.com>
* mkmodules.c (modules_contents): Remove defunct -i option.
2006-06-10 Derek Price <derek@ximbiot.com>
* sanity.sh (conflicts4): Don't expect specific file permissions. Use
$PLUS.
2006-06-08 Derek Price <derek@ximbiot.com>
* sanity.sh (conflicts4): Test that the client honors Empty-conflicts.
@ -2042,7 +2309,7 @@
* ignore.c (ignore_files): Use CVS_LSTAT() instead of lstat().
* filesubr.c (xcmp): Make sure S_ISLNK exists before calling it.
(Reported by Paul Edwards <kerravon@nosppaam.w3.to>.)
(Reported by Paul Edwards <fight.subjugation@gmail.com>.)
2003-10-31 Derek Price <derek@ximbiot.com>

106
contrib/cvs/src/Makefile.in
View File

@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -32,15 +32,11 @@
# GNU General Public License for more details.
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@ -89,7 +85,7 @@ cvs_OBJECTS = $(am_cvs_OBJECTS)
cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@ -102,8 +98,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@ -124,6 +118,8 @@ ECHO_T = @ECHO_T@
EDITOR = @EDITOR@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -135,11 +131,8 @@ LIBS = @LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@
MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@
MKDIR_P = @MKDIR_P@
MKTEMP = @MKTEMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@ -161,12 +154,13 @@ STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -174,26 +168,38 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
includeopt = @includeopt@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_default_rsh = @with_default_rsh@
with_default_ssh = @with_default_ssh@
# $(includeopt) is CVS specific and set by configure
# FIXME - This includes line is dependant on its order. This means there is
@ -333,7 +339,7 @@ cvsbug: $(top_builddir)/config.status $(srcdir)/cvsbug.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@ -356,10 +362,10 @@ clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
cvs$(EXEEXT): $(cvs_OBJECTS) $(cvs_DEPENDENCIES)
@rm -f cvs$(EXEEXT)
$(LINK) $(cvs_LDFLAGS) $(cvs_OBJECTS) $(cvs_LDADD) $(LIBS)
$(LINK) $(cvs_OBJECTS) $(cvs_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
@ -440,19 +446,18 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zlib.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
uninstall-info-am:
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@ -503,22 +508,21 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
$(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@ -535,7 +539,7 @@ check: check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@ -584,12 +588,20 @@ info-am:
install-data-am:
install-dvi: install-dvi-am
install-exec-am: install-binPROGRAMS install-binSCRIPTS
install-html: install-html-am
install-info: install-info-am
install-man:
install-pdf: install-pdf-am
install-ps: install-ps-am
installcheck-am:
maintainer-clean: maintainer-clean-am
@ -609,21 +621,23 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-info-am
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
clean-binPROGRAMS clean-generic ctags distclean \
distclean-compile distclean-generic distclean-tags distdir dvi \
dvi-am html html-am info info-am install install-am \
install-binPROGRAMS install-binSCRIPTS install-data \
install-data-am install-exec install-exec-am install-info \
install-info-am install-man install-strip installcheck \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-info-am
uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS
check-local: localcheck remotecheck

2
contrib/cvs/src/add.c
View File

@ -117,7 +117,7 @@ add (argc, argv)
strip_trailing_slashes (argv[i]);
if (strcmp (argv[i], ".") == 0
|| strcmp (argv[i], "..") == 0
|| fncmp (argv[i], CVSADM) == 0)
|| fncmp (last_component(argv[i]), CVSADM) == 0)
{
if (!quiet)
error (0, 0, "cannot add special file `%s'; skipping", argv[i]);

68
contrib/cvs/src/classify.c
View File

@ -17,6 +17,50 @@
static void sticky_ck PROTO ((struct file_info *finfo, int aflag,
Vers_TS * vers));
static inline int keywords_may_change PROTO ((int aflag, Vers_TS * vers));
static inline int
keywords_may_change (aflag, vers)
int aflag;
Vers_TS * vers;
{
int retval;
if (/* Options are different... */
strcmp (vers->entdata->options, vers->options)
/* ...or... */
|| (/* ...clearing stickies... */
aflag
/* ...and... */
&& (/* ...there used to be a tag which subs in Name keys... */
(vers->entdata->tag && !isdigit (vers->entdata->tag[0]))
/* ...or there used to be a keyword mode which may be
* changed by -A...
*/
|| (strlen (vers->entdata->options)
&& strcmp (vers->entdata->options, "-kkv")
&& strcmp (vers->entdata->options, "-kb"))))
/* ...or... */
|| (/* ...this is not commit... */
strcmp (cvs_cmd_name, "commit")
/* ...and... */
&& (/* ...the tag is changing in a way that affects Name keys... */
(vers->entdata->tag && vers->tag
&& strcmp (vers->entdata->tag, vers->tag)
&& !(isdigit (vers->entdata->tag[0])
&& isdigit (vers->entdata->tag[0])))
|| (!vers->entdata->tag && vers->tag
&& !isdigit (vers->tag[0])))))
retval = 1;
else
retval = 0;
return retval;
}
/*
* Classify the state of a file
*/
@ -297,15 +341,14 @@ Classify_File (finfo, tag, date, options, force_tag_match, aflag, versp,
*/
/* TODO: decide whether we need to check file permissions
for a mismatch, and return T_CONFLICT if so. */
if (vers->entdata->options &&
strcmp (vers->entdata->options, vers->options) != 0)
ret = T_CHECKOUT;
if (keywords_may_change (aflag, vers))
ret = T_PATCH;
else if (vers->ts_conflict)
ret = T_CONFLICT;
else
{
sticky_ck (finfo, aflag, vers);
ret = T_UPTODATE;
sticky_ck (finfo, aflag, vers);
}
}
else if (No_Difference (finfo, vers))
@ -366,29 +409,14 @@ Classify_File (finfo, tag, date, options, force_tag_match, aflag, versp,
ret = T_CHECKOUT;
}
else if (strcmp (vers->ts_user, vers->ts_rcs) == 0)
{
/*
* The user file is still unmodified, so just get it as well
*/
if (strcmp (vers->entdata->options ?
vers->entdata->options : "", vers->options) != 0
|| (vers->srcfile != NULL
&& (vers->srcfile->flags & INATTIC) != 0))
ret = T_CHECKOUT;
else
ret = T_PATCH;
}
ret = T_PATCH;
else if (No_Difference (finfo, vers))
/* really modified, needs to merge */
ret = T_NEEDS_MERGE;
else if ((strcmp (vers->entdata->options ?
vers->entdata->options : "", vers->options)
!= 0)
|| (vers->srcfile != NULL
&& (vers->srcfile->flags & INATTIC) != 0))
/* not really modified, check it out */
ret = T_CHECKOUT;
else
ret = T_PATCH;
}

4
contrib/cvs/src/client.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1994-2005 The Free Software Foundation, Inc.
* Copyright (C) 1994-2008 The Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -65,7 +65,7 @@ extern struct buffer *cvs_gssapi_wrap_buffer_initialize ();
#ifdef CLIENT_SUPPORT
/*
* Flag variable for seeing whether the server has been started yet.
* As of this writing, only edit.c:notify_check() uses it.
* As of this writing, only edit.c:cvs_notify_check() uses it.
*/
extern int server_started;

6
contrib/cvs/src/edit.c
View File

@ -147,8 +147,8 @@ dummy_fileproc (callerdat, finfo)
struct file_info *finfo;
{
/* This is a pretty hideous hack, but the gist of it is that recurse.c
won't call notify_check unless there is a fileproc, so we can't just
pass NULL for fileproc. */
won't call cvs_notify_check unless there is a fileproc, so we
can't just pass NULL for fileproc. */
return 0;
}
@ -991,7 +991,7 @@ notify_do (type, filename, who, val, watches, repository)
#ifdef CLIENT_SUPPORT
/* Check and send notifications. This is only for the client. */
void
notify_check (repository, update_dir)
cvs_notify_check (repository, update_dir)
const char *repository;
const char *update_dir;
{

4
contrib/cvs/src/edit.h
View File

@ -17,8 +17,8 @@ extern int watch_off PROTO ((int argc, char **argv));
/* Check to see if any notifications are sitting around in need of being
sent. These are the notifications stored in CVSADM_NOTIFY (edit,unedit);
commit calls notify_do directly. */
extern void notify_check PROTO ((const char *repository,
const char *update_dir));
extern void cvs_notify_check PROTO ((const char *repository,
const char *update_dir));
#endif /* CLIENT_SUPPORT */
/* Issue a notification for file FILENAME. TYPE is 'E' for edit, 'U'

18
contrib/cvs/src/hash.h
View File

@ -27,26 +27,26 @@ enum ntype
};
typedef enum ntype Ntype;
struct node
struct hashnode
{
Ntype type;
struct node *next;
struct node *prev;
struct node *hashnext;
struct node *hashprev;
struct hashnode *next;
struct hashnode *prev;
struct hashnode *hashnext;
struct hashnode *hashprev;
char *key;
void *data;
void (*delproc) ();
};
typedef struct node Node;
typedef struct hashnode Node;
struct list
struct hashlist
{
Node *list;
Node *hasharray[HASHSIZE];
struct list *next;
struct hashlist *next;
};
typedef struct list List;
typedef struct hashlist List;
List *getlist PROTO((void));
Node *findnode PROTO((List * list, const char *key));

2
contrib/cvs/src/modules.c
View File

@ -129,7 +129,7 @@ my_module (db, mname, m_type, msg, callback_proc, where, shorten,
char *line;
int modargc;
int xmodargc;
char **modargv;
char **modargv = NULL;
char **xmodargv = NULL;
/* Found entry from modules file, including options and such. */
char *value = NULL;

11
contrib/cvs/src/root.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1986-2005 The Free Software Foundation, Inc.
* Copyright (C) 1986-2008 The Free Software Foundation, Inc.
*
* Portions Copyright (C) 1998-2005 Derek Price, Ximbiot <http://ximbiot.com>,
* and others.
@ -182,6 +182,12 @@ static int root_allow_count;
static char **root_allow_vector;
static int root_allow_size;
int
root_allow_used ()
{
return root_allow_count;
}
void
root_allow_add (arg)
char *arg;
@ -438,6 +444,8 @@ parse_cvsroot (root_in)
newroot->method = server_method;
else if (strcmp (method, "ext") == 0)
newroot->method = ext_method;
else if (strcmp (method, "extssh") == 0)
newroot->method = extssh_method;
else if (strcmp (method, "fork") == 0)
newroot->method = fork_method;
else
@ -667,6 +675,7 @@ parse_cvsroot (root_in)
# endif
case server_method:
case ext_method:
case extssh_method:
no_port = 1;
/* no_password already set */
check_hostname = 1;

1
contrib/cvs/src/root.h
View File

@ -54,3 +54,4 @@ void Create_Root PROTO((const char *dir, const char *rootdir));
void root_allow_add PROTO ((char *));
void root_allow_free PROTO ((void));
int root_allow_ok PROTO ((char *));
int root_allow_used PROTO ((void));

1458
contrib/cvs/src/sanity.sh
View File

File diff suppressed because it is too large Load Diff

6
contrib/cvs/src/vers_ts.c
View File

@ -361,6 +361,9 @@ time_stamp (file)
{
mtime = sb.st_mtime;
}
else if (! existence_error (errno))
error (0, errno, "cannot lstat %s", file);
/* If it's a symlink, return whichever is the newest mtime of
the link and its target, for safety.
*/
@ -369,6 +372,9 @@ time_stamp (file)
if (mtime < sb.st_mtime)
mtime = sb.st_mtime;
}
else if (! existence_error (errno))
error (0, errno, "cannot stat %s", file);
if (mtime)
{
struct tm *tm_p;

87
contrib/cvs/tools/Makefile.in
View File

@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005 Free Software Foundation, Inc.
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@ -30,15 +30,11 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@ -65,8 +61,6 @@ SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@ -87,6 +81,8 @@ ECHO_T = @ECHO_T@
EDITOR = @EDITOR@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -98,11 +94,8 @@ LIBS = @LIBS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MAKE_TARGETS_IN_VPATH_FALSE = @MAKE_TARGETS_IN_VPATH_FALSE@
MAKE_TARGETS_IN_VPATH_TRUE = @MAKE_TARGETS_IN_VPATH_TRUE@
MKDIR_P = @MKDIR_P@
MKTEMP = @MKTEMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@ -124,12 +117,13 @@ STRIP = @STRIP@
TEXI2DVI = @TEXI2DVI@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -137,26 +131,38 @@ am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host_alias = @host_alias@
htmldir = @htmldir@
includedir = @includedir@
includeopt = @includeopt@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
with_default_rsh = @with_default_rsh@
with_default_ssh = @with_default_ssh@
EXTRA_DIST = \
README .cvsignore
@ -192,7 +198,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
uninstall-info-am:
tags: TAGS
TAGS:
@ -201,22 +206,21 @@ CTAGS:
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
$(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@ -275,12 +279,20 @@ info-am:
install-data-am:
install-dvi: install-dvi-am
install-exec-am:
install-html: install-html-am
install-info: install-info-am
install-man:
install-pdf: install-pdf-am
install-ps: install-ps-am
installcheck-am:
maintainer-clean: maintainer-clean-am
@ -299,16 +311,19 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-info-am
uninstall-am:
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am install-man \
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-info-am
mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
# for backwards compatibility with the old makefiles