Date: Sun, 1 Dec 2002 21:02:03 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 21797 for review Message-ID: <200212020502.gB2523sJ010399@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=21797 Change 21797 by marcel@marcel_vaio on 2002/12/01 21:01:54 IFC @21795 Affected files ... .. //depot/projects/ia64/contrib/cvs/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/cvs/INSTALL#3 integrate .. //depot/projects/ia64/contrib/cvs/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/cvs/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/cvs/NEWS#3 integrate .. //depot/projects/ia64/contrib/cvs/TODO#3 integrate .. //depot/projects/ia64/contrib/cvs/acconfig.h#2 delete .. //depot/projects/ia64/contrib/cvs/acinclude.m4#3 integrate .. //depot/projects/ia64/contrib/cvs/aclocal.m4#3 integrate .. //depot/projects/ia64/contrib/cvs/config.h.in#3 integrate .. //depot/projects/ia64/contrib/cvs/configure#3 integrate .. //depot/projects/ia64/contrib/cvs/configure.in#3 integrate .. //depot/projects/ia64/contrib/cvs/contrib/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/cvs/contrib/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/cvs/contrib/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/cvs/contrib/README#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/check_cvs.in#1 branch .. //depot/projects/ia64/contrib/cvs/contrib/cvs_acls.in#3 integrate .. //depot/projects/ia64/contrib/cvs/contrib/debug_check_log.sh#2 integrate .. //depot/projects/ia64/contrib/cvs/diff/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/cvs/diff/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/cvs/diff/diff.c#2 integrate .. //depot/projects/ia64/contrib/cvs/diff/system.h#3 integrate .. //depot/projects/ia64/contrib/cvs/doc/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/cvs/doc/HACKING.DOCS#1 branch .. //depot/projects/ia64/contrib/cvs/doc/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/cvs/doc/cvs.texinfo#3 integrate .. //depot/projects/ia64/contrib/cvs/doc/stamp-1#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/stamp-vti#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/version-client.texi#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/version.texi#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/cvs/lib/Makefile.am#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/cvs/lib/fnmatch.h#2 delete .. //depot/projects/ia64/contrib/cvs/lib/fnmatch.h.in#1 branch .. //depot/projects/ia64/contrib/cvs/lib/getdate.y#3 integrate .. //depot/projects/ia64/contrib/cvs/lib/gethostname.c#1 branch .. //depot/projects/ia64/contrib/cvs/lib/getline.c#3 integrate .. //depot/projects/ia64/contrib/cvs/lib/getline.h#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/getopt.h#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/getpagesize.h#1 branch .. //depot/projects/ia64/contrib/cvs/lib/hostname.c#2 delete .. //depot/projects/ia64/contrib/cvs/lib/regex.c#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/regex.h#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/strerror.c#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/system.h#2 integrate .. //depot/projects/ia64/contrib/cvs/man/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/cvs/man/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/cvs/noautomake.sh#2 integrate .. //depot/projects/ia64/contrib/cvs/src/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/cvs/src/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/cvs/src/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/cvs/src/add.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/admin.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/annotate.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/buffer.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/buffer.h#3 integrate .. //depot/projects/ia64/contrib/cvs/src/checkout.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/classify.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/client.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/commit.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/create_adm.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/cvs.h#3 integrate .. //depot/projects/ia64/contrib/cvs/src/cvsbug.in#2 integrate .. //depot/projects/ia64/contrib/cvs/src/cvsrc.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/diff.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/edit.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/filesubr.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/history.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/ignore.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/import.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/lock.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/log.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/login.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/logmsg.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/main.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/myndbm.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/options.h#1 branch .. //depot/projects/ia64/contrib/cvs/src/options.h.in#2 delete .. //depot/projects/ia64/contrib/cvs/src/patch.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/rcs.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/rcscmds.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/recurse.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/remove.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/root.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/sanity.sh#3 integrate .. //depot/projects/ia64/contrib/cvs/src/server.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/stamp-h2.in#2 delete .. //depot/projects/ia64/contrib/cvs/src/status.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/subr.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/tag.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/update.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/vers_ts.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/version.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/version.h.in#2 delete .. //depot/projects/ia64/contrib/cvs/src/watch.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/wrapper.c#3 integrate .. //depot/projects/ia64/contrib/cvs/stamp-h1.in#2 delete .. //depot/projects/ia64/contrib/cvs/tools/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/cvs/tools/Makefile.in#3 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/cvs/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/cvs/options.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/cvs/lib/config.h#3 integrate .. //depot/projects/ia64/sbin/gpt/create.c#4 integrate .. //depot/projects/ia64/sbin/gpt/gpt.c#15 integrate .. //depot/projects/ia64/sbin/gpt/map.h#5 integrate .. //depot/projects/ia64/sbin/gpt/migrate.c#6 integrate .. //depot/projects/ia64/sbin/gpt/show.c#5 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/devicename.c#4 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#25 integrate .. //depot/projects/ia64/usr.sbin/setfmac/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/setfmac/setfmac.8#3 integrate .. //depot/projects/ia64/usr.sbin/setfmac/setfmac.c#2 integrate Differences ... ==== //depot/projects/ia64/contrib/cvs/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,277 @@ +2002-11-21 Larry Jones <lawrence.jones@eds.com> + + * configure.in: Add contrib/check_cvs. + * configure: Regenerated. + +2002-11-12 Derek Price <derek@ximbiot.com> + + * .cvsignore: Update autom4te ignore pattern for version number + included in path name by new versions of autom4te. + +2002-10-28 Derek Price <derek@ximbiot.com> + + * configure.in: Flesh out some comments in regards to Sun Interactive + UNIX (ISC). + +2002-09-24 Derek Price <derek@ximbiot.com> + + * configure.in (WITH_KRB4): Update WITH_KRB4 output to use + AC_MSG_CHECKING and AC_MSG_RESULT for consitency. + (with-editor): Update comment. + + * configure: Regenerated. + +2002-09-24 Derek Price <derek@ximbiot.com> + + * configure.in (--enable-password-authenticated-client): New option. + (--enable-encryption): Increase the readability of the help text. + + * configure: Regenerated. + * config.h.in: Ditto. + +2002-09-24 Derek Price <derek@ximbiot.com> + + * configure.in (enable-encryption): Move to a more sensible location + and print a warning if it is specified with neither the client or the + server enabled. + (--with-editor): Move to a closer resemblance to alphabetical order. + (enables and withs): Reformat help strings for consistency. + * acinclude.m4: Ditto. + + * configure: Regenerated. + * aclocal.m4: Ditto. + +2002-09-24 Derek Price <derek@ximbiot.com> + + * configure.in (enable-force-editor): New option. + + * configure: Regenerated. + * config.h.in: Ditto. + +2002-09-24 Derek Price <derek@ximbiot.com> + + * acinclude.m4 (ACX_WITH_GSAPI): Use AC_MSG_CHECKING & AC_MSG_RESULT + instead of AS_MESSAGE for consistent appearance of the output even + though it makes the code look a little clunky. + +2002-09-24 Derek Price <derek@ximbiot.com> + + * INSTALL: Document --with-umask. + * configure.in (--with-umask): New option. + (--with-tmpdir): Move to something more closely resembling alphabetical + order of the --with- arguments. + + * configure: Regenerated. + * config.h.in: Ditto. + +2002-09-24 Derek Price <derek@ximbiot.com> + + * INSTALL: Note new Automake version. + * NEWS: Ditto. + * configure.in (AC_ISC_POSIX): Remove this obsolete call and comment + out some related code with an explanation. + + * Makefile.in: Regenerated using Automake 1.6.3. + * aclocal.m4: Ditto. + * configure: Regenerated. + +2002-09-24 Larry Jones <lawrence.jones@eds.com> + + * aclocal.m4: Remove no longer needed definition of AC_ISC_POSIX + from gettext-0.10.40. + * configure.in: Remove warnings about obsolete AC_STRUCT_ST_BLKSIZE + and AC_STRUCT_ST_RDEV, add check for geteuid(). + * configure, config.h.in: Regenerated. + +2002-09-24 Derek Price <derek@ximbiot.com> + + * TODO (227): New item. + +2002-09-24 Larry Jones <lawrence.jones@eds.com> + + * configure.in (--enable-server-flow-control): Fix nonportable code. + * configure: Regenerated. + +2002-09-24 Derek Price <derek@ximbiot.com> + + * INSTALL: Explain --with-tmpdir. + * configure.in (--with-tmpdir): New configure argument. + + * configure: Regenerated. + * config.h.in: Ditto. + +2002-09-24 Derek Price <derek@ximbiot.com> + + * INSTALL: Explain --with-editor. + * configure.in (--with-editor): New configure argument. + + * Makefile.in: Regenerated. + * configure: Ditto. + * config.h.in: Ditto. + +2002-09-24 Larry Jones <lawrence.jones@eds.com> + + * TODO (226): New item. + + * configure.in: Remove PATCH_PROGRAM. + * configure: Regenerated. + * config.h.in: Ditto. + +2002-09-20 Derek Price <derek@ximbiot.com> + + * INSTALL: Explain --enable-server-flow-control. + * configure.in (--enable-server-flow-control): New configure argument. + + * configure: Regenerated. + * config.h.in: Ditto. + +2002-09-20 Derek Price <derek@ximbiot.com> + + * configure.in: Set PATCH_PROGRAM as possible, autodetecting with + a user override. + + * configure: Regenerated. + * config.h.in: Ditto. + +2002-09-20 Derek Price <derek@ximbiot.com> + + * configure.in: Use AC_HELP_STRING to create pretty help strings. + Reformat some lines for legibility. + (with-krb4): Fix help strings and logging. + + * configure.in: Regenerated. + +2002-08-16 Derek Price <derek@ximbiot.com> + + * configure.in: Make CVS_BADROOT a configure option. + + * configure: Regenerated. + * config.h.in: Ditto. + +2002-08-12 Derek Price <oberon@umich.edu> + + * configure.in: Move ftruncate from AC_CHECK_FUNC to AC_REPLACE_FUNC. + (Symptoms reported by + Andrey Aristarkhov <Aristarkhov@bitechnology.ru>.) + * aclocal.m4: Regenerated. + * configure: Ditto. + +2002-07-09 Larry Jones <lawrence.jones@eds.com> + + * NEWS (Changes since 1.11.2): Note lock message times now UTC. + +2002-06-28 Derek Price <oberon@umich.edu> + + * INSTALL (Building [on] other platforms): Don't reference the Mac + README file since it has been missing for several releases. Mention + the UNIXness of Mac OS X and correct references to wincvs.org to point + to the new cvsgui.org . + (Reported by Sarah Gonzales <slindahl@rice.edu>.) + +2002-05-22 Larry Jones <lawrence.jones@eds.com> + + * TODO (173, 202): Update to reflect current state of affairs. + (207): Defunct as of 1.11.2. + + * NEWS (Changes from 1.11.1p1 to 1.11.2): Note new RereadLogAfterVerify + config option. + +2002-05-15 Larry Jones <lawrence.jones@eds.com> + + * NEWS (Changes from 1.11.1p1 to 1.11.2): Note log/rlog changes. + +2002-05-08 Derek Price <oberon@umich.edu> + + * configure.in: Add code to use lib/fnmatch.h.in redirection when + necessary to avoid namespace conflicts in #includes. + * configure: Regenerated. + +2002-05-08 Derek Price <oberon@umich.edu> + + * TODO (215): Add note. + +2002-05-08 Derek Price <oberon@umich.edu> + + * TODO (214): Clarify item. + +2002-05-02 Derek Price <oberon@umich.edu> + + * configure.in: Add check for fnmatch.h so we can avoid namespace + conflicts on systems where the fnmatch function is broken. Not sure + this applies to any systems but Mac OS X. + + * configure: Regenerated. + * config.h.in: Ditto. + +2002-05-02 Derek Price <oberon@umich.edu> + + * .cvsignore: Remove config.cache and add autom4te.cache. + +2002-05-02 Derek Price <oberon@umich.edu> + + * noautoconf.sh: Update this script for operation with the new autotools. + * stamp-h1.in: Remove this obsolete file. + +2002-05-01 Derek Price <oberon@umich.edu> + + * TODO (224): Comment on this item. + +2002-05-01 Larry Jones <lawrence.jones@eds.com> + + * TODO (215 - 225): New items. + +2002-05-01 Derek Price <oberon@umich.edu> + + * TODO (214): Add note about moving options.h options into the configure + script. + * configure.in: Remove last few references to options.h. + * configure: Regenerated. + +2002-04-30 Derek Price <oberon@umich.edu> + + * acconfig.h: Remove this file, it is deprecated. + + * Makefile.am (AUTOMAKE_OPTIONS): Move these into configure.in. + * acinclude.m4: Some minor updates for compatibility with the new + Autotools, some reformatting for readability, and a minor bugfix or + two. + * configure.in: Add new AC_DEFINE arguments and replace some direct + assignments to LIBOBJS with calls to AC_LIBOBJ. Call AC_INIT and + AM_INIT_AUTOMAKE with the new APIs. Call AC_PACKAGE_NAME, + AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION, and AC_PACKAGE_STRING to + subst/define the corresponding variables. Call AC_CONFIG_FILES with + the old AC_OUTPUT args and call AC_OUTPUT without args. Remove + references to version.h. + * cvs.spec.in: Use the new substs. + + * INSTALL: Mention new versions of Automake & Autoconf. + * NEWS: Ditto. + + * Makefile.in: Regenerated. + * aclocal.m4: Ditto. + * configure: Ditto. + * config.h.in: Ditto. + +2002-04-28 Derek Price <oberon@umich.edu> + + * TODO (208, 209, 210, 211, 212, 213): New items. + +2002-04-27 Derek Price <oberon@umich.edu> + + * configure.in: Set LIBOBJ for fnmatch.c and fnmatch.h using the + correct functions. Add checks for some functions whose names conflict + with functions on Mac OS X 10.1 with the most recent dev packages. + This should be removable after the Mac dev packages are fixed. + + * configure: Regenerated. + * config.h.in: Ditto. + +2002-04-18 Derek Price <oberon@umich.edu> + + * NEWS: Add a dummy entry so automake will let me update the version. + * configure.in: Update the version number. + * configure: Regenerated. + 2002-04-17 Derek Price <oberon@umich.edu> * configure.in: Update version number. ==== //depot/projects/ia64/contrib/cvs/INSTALL#3 (text+ko) ==== @@ -249,8 +249,8 @@ $ ./noautomake.sh --noautoconf - The CVS Makefiles and configure script were built using Automake 1.5 and - Autoconf 2.13, respectively. Other combinations of autotool versions may + The CVS Makefiles and configure script were built using Automake 1.6.3 and + Autoconf 2.53, respectively. Other combinations of autotool versions may or may not work. 2) Run "configure": @@ -278,14 +278,37 @@ Typically this can reduce the size of the executable by around 30%. + If you are building CVS with the server enabled, you can disable + server flow control using the --disable-server-flow-control + If you are working with a large remote repository and a 'cvs + checkout' is swamping your network and memory, enable flow control. + You will end up with even less probability of a consistent checkout + (see Concurrency in cvs.texinfo), but CVS doesn't try to guarantee + that anyway. The master server process will monitor how far it is + getting behind, if it reaches the high water mark, it will signal + the child process to stop generating data when convenient (ie: no + locks are held, currently at the beginning of a new directory). + Once the buffer has drained sufficiently to reach the low water + mark, it will be signalled to start again. You may override the + default hi/low watermarks here too by passing + '<lowwater>,<highwater>', in bytes, as an argument to + --enable-server-flow-control. The low water mark defaults to one + megabyte and the high water mark defaults to two megabytes. + + $ ./configure --enable-server-flow-control=1M,2M + + The --with-tmpdir argument to configure may be used to set a + specific directory for use as a default temporary directory. If not + set, configure will pick the first directory it finds which it has + read, write, and execute permissions to from $TMPDIR, $TMP, $TEMP, + /tmp, and /var/tmp, in that order. Failing that, it will use /tmp. + + The --with-umask argument to configure can be used to change + the default umask used by the CVS server executable. + Unlike previous versions of CVS, you do not need to install RCS or GNU diff. - NOTE: The configure program will cache the results of the previous - configure execution. If you need to re-run configure from scratch, you - may need to run "make distclean" first to remove the cached - configuration information. - If you are using gcc and are planning to modify CVS, you may want to configure with -Wall; see the file HACKING for details. @@ -431,7 +454,7 @@ C:\> vcvars32 C:\> nmake /f cvsnt.mak CFG="cvsnt - Win32 Debug" -* You might also try http://wincvs.org & http://www.cvsnt.org +* You might also try http://cvsgui.org & http://www.cvsnt.org ------------------------------------------------------------------------------- @@ -441,8 +464,9 @@ For VMS, see README.VMS -For Macintosh, see macintosh/README.MacCVS, or, since that file isn't there -anymore, you might try http://wincvs.org . +Mac OS X: Builds fine, just like UNIX. + +For older versions of Mac OS, you might try http://cvsgui.org . For a Java client, see jCVS (which is a separate package from CVS itself, but which might be preferable to the Macintosh port mentioned ==== //depot/projects/ia64/contrib/cvs/Makefile.am#3 (text+ko) ==== @@ -12,8 +12,6 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -AUTOMAKE_OPTIONS = 1.5 dist-bzip2 - ## Subdirectories to run make in for the primary targets. # Unix source subdirs, where we'll want to run lint and etags: # This is a legacy variable from b4 Automake ==== //depot/projects/ia64/contrib/cvs/Makefile.in#3 (text+ko) ==== @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -25,7 +26,6 @@ # 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. - SHELL = @SHELL@ srcdir = @srcdir@ @@ -56,9 +56,13 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -68,22 +72,26 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ CSH = @CSH@ DEPDIR = @DEPDIR@ -EXEEXT = @EXEEXT@ +EDITOR = @EDITOR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KRB4 = @KRB4@ LN_S = @LN_S@ -OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ PR = @PR@ PS2PDF = @PS2PDF@ RANLIB = @RANLIB@ ROFF = @ROFF@ +STRIP = @STRIP@ TEXI2DVI = @TEXI2DVI@ VERSION = @VERSION@ YACC = @YACC@ @@ -92,8 +100,6 @@ includeopt = @includeopt@ install_sh = @install_sh@ -AUTOMAKE_OPTIONS = 1.5 dist-bzip2 - # Unix source subdirs, where we'll want to run lint and etags: # This is a legacy variable from b4 Automake USOURCE_SUBDIRS = lib zlib diff src @@ -123,7 +129,7 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h $(top_builddir)/src/options.h +CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile DIST_SOURCES = @@ -131,23 +137,23 @@ uninstall-info-recursive all-recursive install-data-recursive \ install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive -DIST_COMMON = README ./stamp-h1.in AUTHORS COPYING COPYING.LIB \ - ChangeLog INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h \ - acinclude.m4 aclocal.m4 compile config.h.in configure \ - configure.in cvs.spec.in depcomp install-sh mdate-sh missing \ - mkinstalldirs +DIST_COMMON = README AUTHORS COPYING COPYING.LIB ChangeLog INSTALL \ + Makefile.am Makefile.in NEWS TODO acinclude.m4 aclocal.m4 \ + compile config.h.in configure configure.in cvs.spec.in depcomp \ + install-sh mdate-sh missing mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: + +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$@ $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -156,39 +162,31 @@ $(ACLOCAL_M4): configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + config.h: stamp-h1 @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + rm -f stamp-h1; \ + $(MAKE) stamp-h1; \ else :; fi + stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 stamp-h1T - @echo timestamp > stamp-h1T 2> /dev/null - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=config.h \ - $(SHELL) ./config.status - @mv stamp-h1T stamp-h1 -$(srcdir)/config.h.in: $(srcdir)/./stamp-h1.in - @if test ! -f $@; then \ - rm -f $(srcdir)/./stamp-h1.in; \ - $(MAKE) $(srcdir)/./stamp-h1.in; \ - else :; fi -$(srcdir)/./stamp-h1.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h - @rm -f $(srcdir)/./stamp-h1.in $(srcdir)/./stamp-h1.inT - @echo timestamp > $(srcdir)/./stamp-h1.inT 2> /dev/null + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h + +$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOHEADER) - @mv $(srcdir)/./stamp-h1.inT $(srcdir)/./stamp-h1.in + touch $(srcdir)/config.h.in distclean-hdr: - -rm -f config.h + -rm -f config.h stamp-h1 cvs.spec: $(top_builddir)/config.status cvs.spec.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ emx/Makefile: $(top_builddir)/config.status $(top_srcdir)/emx/Makefile.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ os2/Makefile: $(top_builddir)/config.status $(top_srcdir)/os2/Makefile.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ zlib/Makefile: $(top_builddir)/config.status $(top_srcdir)/zlib/Makefile.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $@ uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd @@ -198,7 +196,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -218,7 +216,7 @@ mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -246,16 +244,19 @@ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done +ETAGS = etags +ETAGSFLAGS = + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - mkid -fID $$unique $(LISP) + mkid -fID $$unique TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -266,51 +267,61 @@ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique GTAGS: - here=`CDPATH=: && cd $(top_builddir) && pwd` \ + here=`$(am__cd) $(top_builddir) && pwd` \ && cd $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) $$here distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = . -# Avoid unsightly `./'. distdir = $(PACKAGE)-$(VERSION) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } + GZIP_ENV = --best +distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) mkdir $(distdir) $(mkinstalldirs) $(distdir)/. $(distdir)/contrib $(distdir)/emx $(distdir)/os2 $(distdir)/src $(distdir)/zlib - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @list='$(DISTFILES)'; for file in $$list; 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 \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ || exit 1; \ fi; \ done - for subdir in $(SUBDIRS); do \ + list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ @@ -328,27 +339,33 @@ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) -dist: distdir +dist-gzip: distdir $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) dist-bzip2: distdir $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) + +dist dist-all: distdir + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) + $(am__remove_distdir) GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/=build mkdir $(distdir)/=inst chmod a-w $(distdir) - dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \ + dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ && cd $(distdir)/=build \ && ../configure --srcdir=.. --prefix=$$dc_install_base \ + $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -356,17 +373,24 @@ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ - || (echo "Error: files left after uninstall" 1>&2; \ - exit 1) ) \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && $(MAKE) $(AM_MAKEFLAGS) distclean \ + || { echo "ERROR: files left after uninstall:" ; \ + find $$dc_install_base -type f -print ; \ + exit 1; } >&2 ) \ + && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && rm -f $(distdir).tar.gz \ - && (test `find . -type f -print | wc -l` -eq 0 \ - || (echo "Error: files left after distclean" 1>&2; \ - exit 1) ) - -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) @echo "$(distdir).tar.gz is ready for distribution" | \ sed 'h;s/./=/g;p;x;p;x' +distcleancheck: distclean + if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 check-am: all-am check: check-recursive all-am: Makefile config.h @@ -384,6 +408,7 @@ installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -391,7 +416,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -400,12 +425,8 @@ clean-am: clean-generic mostlyclean-am -dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2 - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) distclean: distclean-recursive - -rm -f config.status config.cache config.log + -rm -f $(am__CONFIG_DISTCLEAN_FILES) distclean-am: clean-am distclean-generic distclean-hdr distclean-tags dvi: dvi-recursive @@ -427,7 +448,8 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf autom4te.cache maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive @@ -440,10 +462,10 @@ .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ clean-generic clean-recursive dist dist-all dist-bzip2 \ - distcheck distclean distclean-generic distclean-hdr \ - distclean-recursive distclean-tags distdir dvi dvi-am \ - dvi-recursive info info-am info-recursive install install-am \ - install-data install-data-am install-data-recursive \ + dist-gzip distcheck distclean distclean-generic distclean-hdr \ + distclean-recursive distclean-tags distcleancheck distdir dvi \ + dvi-am dvi-recursive info info-am info-recursive install \ + install-am install-data install-data-am install-data-recursive \ install-exec install-exec-am install-exec-recursive \ install-info install-info-am install-info-recursive install-man \ install-recursive install-strip installcheck installcheck-am \ ==== //depot/projects/ia64/contrib/cvs/NEWS#3 (text+ko) ==== @@ -1,4 +1,28 @@ -Changes since 1.11.1p1: +Changes since 1.11.2: + +* When waiting for another user's lock, the message timestamps are now +in UTC rather than the server's local time. + +* We've standardized on Automake version 1.6.3 and Autoconf version 2.53. +They are cleaner, less bug prone, and will hopfully allow me to start updating +sanity.sh to use Autotest and Autoshell. Again, this should only really affect +developers. See the section of the INSTALL file about using the autotools if +you are compiling CVS yourself. + +Changes from 1.11.1p1 to 1.11.2: + +* There is a new feature, enabled by RereadLogAfterVerify in CVSROOT/config, +which tells CVS to reread the log message after running the verifymsg +script. This allows the verifymsg script to reformat or otherwise +modify the log message. + +* The interpretation of revision ranges using :: in "log" and "rlog" +has changed: a::b now excludes the log message from revision a but +includes the log message from revision b. Also, revision ranges that +cross branch points should now work. + +* zlib has been updated to version 1.4. There is a security advisory +out in regards to 1.3. This should fix that problem. * The "log" and "rlog" commands now have a -S option to suppress the header information when no revisions are selected. ==== //depot/projects/ia64/contrib/cvs/TODO#3 (text+ko) ==== @@ -395,11 +395,11 @@ the checkout and update commands that could turn this invocation of the script off, for mature users. -173. We have a tagged branch in CVS. How do we get the version of that branch - (for an entire directory) that corresponds to the files on that branch on a - certain day? I'd like to specify BOTH -r and -D to 'cvs checkout', but I - can't. It looks like I can only specify the date for the main line (as - opposed to any branches). True? Any workarounds to get what I need? +173. Need generic date-on-branch handling. Currently, many commands + allow both -r and -D, but that's problematic for commands like diff + that interpret that as two revisions rather than a single revision. + Checkout and update -j takes tag:date which is probably a better + solution overall. 174. I would like to see "cvs release" modified so that it only removes files which are known to CVS - all the files in the repository, plus those which @@ -808,9 +808,9 @@ 201. cvs_temp_file should be creating temporary files in a privately owned subdirectory of of temp due to security issues on some systems. -202. Merge most of the diff & rdiff code. Enable rdiff to accept most -diff options. Make rdiff output look like diff's. Make CVS diff -garbage go to stderr and only standard diff output go to stdout. +202. Enable rdiff to accept most diff options. Make rdiff output look +like diff's. Make CVS diff garbage go to stderr and only standard diff +output go to stdout. 203. Add val-tags additions to the tagging code. Don't remove the update additions since val-tags could still be used as a cache when the @@ -828,8 +828,84 @@ 206. Restore directory-at-a-time locking for tag operations instead of locking the entire tree. -207. Fix the branch following logic in log to work with CVS branching. -Right now the code assumes RCS branching where all revisions on the -branch have the same number of components in their revision numbers and -that isn't true for CVS (revisions 1.2 and 2.4.6.8 can be on the same -branch in CVS). +208. Merge enhancements to the diff package back into the original GNU source. + +209. Go through this file and try to: + + a. Verify that items are still valid. + + b. Create test cases for valid items when they don't exist. + + c. Remove fixed and no longer applicable items. + +210. Explain to sanity.sh how to deal with paths with spaces and other odd +characters in them. + +211. Make sanity.sh run under the Win32 bash (cygwin) and maybe other Windex +environments (e.g. DGSS or whatever the MSVC portability environemnt is called). + +212. Autotestify (see autoconf source) sanity.sh. + +213. Examine desirability of updating the regex library (regex.{c,h}) to the +more recent versions that come with glibc and emacs. It might be worth waiting +for the emacs folks to get their act together and merge their changes into the >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212020502.gB2523sJ010399>