Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Mar 2008 18:26:23 GMT
From:      John Birrell <jb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 138119 for review
Message-ID:  <200803191826.m2JIQNDn020186@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=138119

Change 138119 by jb@jb_freebsd8 on 2008/03/19 18:25:58

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#8 integrate
.. //depot/projects/dtrace/ports/LEGAL#37 integrate
.. //depot/projects/dtrace/ports/MOVED#71 integrate
.. //depot/projects/dtrace/ports/UPDATING#57 integrate
.. //depot/projects/dtrace/src/contrib/cvs/ChangeLog#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/FAQ#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/HACKING#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/INSTALL#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/Makefile.in#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/NEWS#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/README#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/TODO#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/aclocal.m4#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/compile#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/config.h.in#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/configure#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/configure.in#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/contrib/Makefile.in#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/depcomp#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/diff/Makefile.in#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/ChangeLog#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/HACKING.DOCS#1 branch
.. //depot/projects/dtrace/src/contrib/cvs/doc/Makefile.in#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/cvs.1#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/cvs.texinfo#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/cvsclient.texi#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/mdate-sh#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/mkman.pl#2 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/stamp-1#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/stamp-vti#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/version-client.texi#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/doc/version.texi#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/install-sh#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/lib/ChangeLog#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/lib/Makefile.in#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/lib/xsize.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/man/Makefile.in#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/missing#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/mkinstalldirs#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/ChangeLog#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/Makefile.in#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/add.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/classify.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/client.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/client.h#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/cvs.h#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/edit.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/edit.h#4 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/hash.h#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/import.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/lock.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/log.c#6 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/login.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/main.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/mkmodules.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/modules.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/parseinfo.c#6 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/rcs.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/recurse.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/root.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/root.h#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/sanity.sh#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/server.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/update.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/src/vers_ts.c#5 integrate
.. //depot/projects/dtrace/src/contrib/cvs/tools/Makefile.in#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/zfs#2 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/Makefile#8 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/cvs/lib/Makefile#4 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/cvs/lib/config.h.proto#4 integrate
.. //depot/projects/dtrace/src/lib/libelf/elf_update.3#10 integrate
.. //depot/projects/dtrace/src/lib/libelf/elf_update.c#12 integrate
.. //depot/projects/dtrace/src/lib/libsdp/sdp.h#6 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_affinity.c#2 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_create.c#10 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_exit.c#8 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_sig.c#11 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.cpu.mk#12 integrate
.. //depot/projects/dtrace/src/sys/conf/files#75 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_common.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_version.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_ioctl.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_amd.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_drive.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_cpuset.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#24 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exit.c#20 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_kthread.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_lockf.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_proc.c#21 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_resource.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sig.c#23 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thr.c#21 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thread.c#22 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#34 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#30 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_sleepqueue.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/sys_generic.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/sys_process.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/tty.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#22 integrate
.. //depot/projects/dtrace/src/sys/netinet/libalias/alias_irc.c#8 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsock.c#8 integrate
.. //depot/projects/dtrace/src/sys/sparc64/include/atomic.h#5 integrate
.. //depot/projects/dtrace/src/sys/sun4v/include/atomic.h#6 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/intr_machdep.c#9 integrate
.. //depot/projects/dtrace/src/sys/sys/eventhandler.h#9 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#38 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_snapshot.c#15 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_glue.c#12 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_meter.c#12 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_page.c#31 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_page.h#10 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_pageout.c#11 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_pageq.c#10 delete
.. //depot/projects/dtrace/src/tools/tools/mctest/mctest.cc#1 branch
.. //depot/projects/dtrace/src/tools/tools/mctest/mctest.h#1 branch
.. //depot/projects/dtrace/src/usr.bin/netstat/inet6.c#8 integrate
.. //depot/projects/dtrace/src/usr.bin/tar/Makefile#6 integrate
.. //depot/projects/dtrace/src/usr.bin/tar/matching.c#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/arp/arp.8#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/arp/arp.c#8 integrate
.. //depot/projects/dtrace/src/usr.sbin/bluetooth/sdpd/gn.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/bluetooth/sdpd/lan.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/bluetooth/sdpd/nap.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/bluetooth/sdpd/panu.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/bluetooth/sdpd/profile.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/bluetooth/sdpd/profile.h#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/fifolog/lib/fifolog_int.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/fifolog/lib/fifolog_write_poll.c#2 integrate
.. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#11 integrate
.. //depot/projects/dtrace/www/en/projects/summerofcode.xsl#3 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#8 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.105 2008/03/17 21:06:43 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.106 2008/03/18 19:47:19 blackend Exp $
 -->
 
 <chapter id="printing">
@@ -1567,7 +1567,7 @@
               usage, the text filter must also account for pages printed,
               usually by counting the number of lines printed and comparing
               that to the number of lines per page the printer supports.  The
-              text filter is started with the following argument list:
+              text filter is started with the following argument list:</para>
 
               <cmdsynopsis>
                 <command>filter-name</command>
@@ -1580,7 +1580,7 @@
                 <arg choice="plain"><replaceable>acct-file</replaceable></arg>
               </cmdsynopsis>
 
-              where
+              <para>where</para>
               
               <variablelist>
                 <varlistentry>
@@ -1647,7 +1647,6 @@
                   </listitem>
                 </varlistentry>
               </variablelist>
-            </para>
           </listitem>
 
 	  <indexterm>
@@ -1664,7 +1663,7 @@
                 linkend="printing-advanced-convfilters">Conversion
                 Filters</link> tells all about them. Conversion filters also
               need to do accounting, if you need printer accounting.
-              Conversion filters are started with the following arguments:
+              Conversion filters are started with the following arguments:</para>
 
               <cmdsynopsis>
                 <command>filter-name</command>
@@ -1676,7 +1675,7 @@
                 <arg choice="plain"><replaceable>acct-file</replaceable></arg>
               </cmdsynopsis>
 
-              where <replaceable>pixel-width</replaceable> is the value
+	    <para>where <replaceable>pixel-width</replaceable> is the value
               from the <literal>px</literal> capability (default 0) and
               <replaceable>pixel-height</replaceable> is the value from the
               <literal>py</literal> capability (default 0).</para>
@@ -1687,7 +1686,7 @@
               is no text filter, or if header pages are enabled. In my
               experience, output filters are rarely used.  Section <link
                 linkend="printing-advanced-of">Output Filters</link> describe
-              them.  There are only two arguments to an output filter:
+              them.  There are only two arguments to an output filter:</para>
 
               <cmdsynopsis>
                 <command>filter-name</command>
@@ -1695,7 +1694,7 @@
                 <arg choice="plain">-l <replaceable>length</replaceable></arg>
               </cmdsynopsis>
 
-              which are identical to the text filters <option>-w</option> and
+              <para>which are identical to the text filters <option>-w</option> and
               <option>-l</option> arguments.</para>
           </listitem>
         </itemizedlist>

==== //depot/projects/dtrace/ports/LEGAL#37 (text+ko) ====

@@ -1,5 +1,5 @@
 # Creator:  Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.572 2008/03/13 15:24:57 pav Exp $
+# $FreeBSD: ports/LEGAL,v 1.574 2008/03/19 13:49:36 jadawin Exp $
 
    **********************************************************************
    ***                      NOTE TO COMMITTERS                        ***
@@ -738,3 +738,4 @@
 						agreement required
 rapid-*			math/rapid		No commercial use
 dtiquery-*		science/dtiquery	License agreement is required
+clustalw-*		biology/clustalw	No commercial use

==== //depot/projects/dtrace/ports/MOVED#71 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1559 2008/03/17 21:56:39 lippe Exp $
+# $FreeBSD: ports/MOVED,v 1.1562 2008/03/18 09:29:47 johans Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -3434,4 +3434,5 @@
 security/nmapfe|security/zenmap|2008-03-14|Project renamed
 x11/hs-x11-extras-ghc||2008-03-14|Has expired: Use x11/hs-x11-ghc instead
 www/mod_dosevasise20||2008-03-14|Has expired: Use www/mod_evasive20 instead
-textproc/p5-Text-ParseWords|2008-03-16|Module included in core perl
+textproc/p5-Text-ParseWords||2008-03-16|Module included in core perl
+devel/hc12mem|devel/hcs12mem|2008-03-17|Project renamed

==== //depot/projects/dtrace/ports/UPDATING#57 (text+ko) ====

@@ -6,6 +6,35 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20080318:
+  AFFECTS: users of audio/gnump3d
+  AUTHOR:  jadawin@FreeBSD.org
+
+  The layout of gnump3d 3.0 is changed, please read the documents and the
+  manual pages of gnump3d.
+
+20080318:
+  AFFECTS: users of net/skype net/skype_devel
+  AUTHOR: beech@FreeBSD.org
+
+  For FreeBSD versions 7.0 and above:
+  It is now recommended (and will be required in future versions) to
+  update to linux_base-fc6. Please do the following:
+
+  1. Make sure there are no running linux applications.
+  2. Unmount linprocfs (umount /compat/linux/proc)
+  3. Uninstall your current linux_base port
+  4. Unload linux kernel module (kldunload linux.ko)
+  5. Set appropriate sysctl (sysctl compat.linux.osrelease=2.6.16)
+  6. Install emulation/linux_base-fc6
+  4  Remount linprocfs (mount /compat/linux/proc)
+  5. Add compat.linux.osrelease=2.6.16 to etc/sysctl.conf
+
+  For FreeBSD versions 5.x and 6.x:
+  Please use the legacy version net/skype12
+
+	portupgrade -o net/skype12 net/skype
+
 20080316:
   AFFECTS: users of net/iscsi-target
   AUTHOR: rafan@FreeBSD.org
@@ -6177,4 +6206,4 @@
   2) Update all p5-* modules.
 	portupgrade -f p5-\*
 
-$FreeBSD: ports/UPDATING,v 1.599 2008/03/16 09:20:35 rafan Exp $
+$FreeBSD: ports/UPDATING,v 1.602 2008/03/18 19:52:50 beech Exp $

==== //depot/projects/dtrace/src/contrib/cvs/ChangeLog#5 (text+ko) ====

@@ -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.

==== //depot/projects/dtrace/src/contrib/cvs/FAQ#5 (text+ko) ====

@@ -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

==== //depot/projects/dtrace/src/contrib/cvs/HACKING#5 (text+ko) ====

@@ -2,7 +2,7 @@
 
 * 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 @@
 
 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 @@
 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

==== //depot/projects/dtrace/src/contrib/cvs/INSTALL#5 (text+ko) ====

@@ -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

==== //depot/projects/dtrace/src/contrib/cvs/Makefile.in#5 (text+ko) ====

@@ -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__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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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__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 @@
 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 @@
 	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 @@
 	  $(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 @@
 
 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 @@
 	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 @@
 	      $(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 @@
 	-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 @@
 	$(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 @@
 
 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-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

==== //depot/projects/dtrace/src/contrib/cvs/NEWS#5 (text+ko) ====

@@ -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

==== //depot/projects/dtrace/src/contrib/cvs/README#5 (text+ko) ====

@@ -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.

==== //depot/projects/dtrace/src/contrib/cvs/TODO#5 (text+ko) ====

@@ -815,9 +815,6 @@
 	  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

==== //depot/projects/dtrace/src/contrib/cvs/aclocal.m4#5 (text+ko) ====

@@ -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_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_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 @@
 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 @@
 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 @@
        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 @@
   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 -*-

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803191826.m2JIQNDn020186>