From owner-p4-projects@FreeBSD.ORG  Tue Dec  5 01:41:04 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6F1BF16A54A; Tue,  5 Dec 2006 01:41:04 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4144616A53F
	for <perforce@freebsd.org>; Tue,  5 Dec 2006 01:41:04 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0092E43CBC
	for <perforce@freebsd.org>; Tue,  5 Dec 2006 01:40:25 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB51f1h2091245
	for <perforce@freebsd.org>; Tue, 5 Dec 2006 01:41:01 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB51ewTf091151
	for perforce@freebsd.org; Tue, 5 Dec 2006 01:40:58 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 5 Dec 2006 01:40:58 GMT
Message-Id: <200612050140.kB51ewTf091151@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111097 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Dec 2006 01:41:04 -0000

http://perforce.freebsd.org/chv.cgi?CH=111097

Change 111097 by jb@jb_freebsd8 on 2006/12/05 01:40:06

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#37 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#25 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#16 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#8 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#8 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#34 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#18 integrate
.. //depot/projects/dtrace/doc/share/sgml/freebsd.ent#10 integrate
.. //depot/projects/dtrace/ports/LEGAL#15 integrate
.. //depot/projects/dtrace/ports/MOVED#34 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.autotools.mk#4 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#13 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.wx.mk#4 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/processonelog#8 integrate
.. //depot/projects/dtrace/src/etc/rc.initdiskless#6 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#16 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/freebsd-tips#5 integrate
.. //depot/projects/dtrace/src/lib/libarchive/archive_write_open_filename.c#2 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/confstr.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/err.3#5 integrate
.. //depot/projects/dtrace/src/lib/libc/net/nscachedcli.c#4 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/close.2#4 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_cancel.c#5 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_cond.c#6 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#11 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_sig.c#7 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.c#6 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_umtx.h#6 integrate
.. //depot/projects/dtrace/src/sbin/camcontrol/camcontrol.c#6 integrate
.. //depot/projects/dtrace/src/sbin/mount_unionfs/Makefile#4 integrate
.. //depot/projects/dtrace/src/sbin/mount_unionfs/mount_unionfs.8#4 integrate
.. //depot/projects/dtrace/src/sbin/mount_unionfs/mount_unionfs.c#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/Makefile#16 integrate
.. //depot/projects/dtrace/src/share/man/man4/npe.4#1 branch
.. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#18 integrate
.. //depot/projects/dtrace/src/sys/amd64/isa/clock.c#5 integrate
.. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysvec.c#9 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#17 integrate
.. //depot/projects/dtrace/src/sys/cam/cam_ccb.h#6 integrate
.. //depot/projects/dtrace/src/sys/cam/cam_xpt.c#9 integrate
.. //depot/projects/dtrace/src/sys/cam/scsi/scsi_all.h#6 integrate
.. //depot/projects/dtrace/src/sys/compat/linsysfs/linsysfs.c#3 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#15 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_stats.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#16 integrate
.. //depot/projects/dtrace/src/sys/dev/bge/if_bgereg.h#11 integrate
.. //depot/projects/dtrace/src/sys/dev/hme/if_hme.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_freebsd.c#13 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/acphy.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/amphy.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/miidevs#7 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/rgephy.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/mii/tdkphy.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt.h#17 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt_cam.c#20 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.c#9 integrate
.. //depot/projects/dtrace/src/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_vnops.c#6 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/clock.c#6 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thr.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_umtx.c#14 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_lock.c#5 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_rman.c#9 integrate
.. //depot/projects/dtrace/src/sys/net/bridgestp.c#12 integrate
.. //depot/projects/dtrace/src/sys/net/bridgestp.h#7 integrate
.. //depot/projects/dtrace/src/sys/net/if_bridge.c#20 integrate
.. //depot/projects/dtrace/src/sys/net/if_bridgevar.h#9 integrate
.. //depot/projects/dtrace/src/sys/netinet/igmp.c#5 integrate
.. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#15 integrate
.. //depot/projects/dtrace/src/sys/sun4v/include/tsb.h#6 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#20 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/tsb.c#8 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#18 integrate
.. //depot/projects/dtrace/src/sys/sys/umtx.h#8 integrate
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.sh#5 integrate
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wX.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wXl.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wc.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wdl.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wdn.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.we.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wf.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wg.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wgd.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wo.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wp1.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wp2.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wp3.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wp4.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wp5.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wp6.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wu.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wwe.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wx.out#1 branch
.. //depot/projects/dtrace/src/tools/regression/usr.bin/jot/regress.wxn.out#1 branch
.. //depot/projects/dtrace/src/usr.bin/jot/jot.c#5 integrate
.. //depot/projects/dtrace/www/en/developers.sgml#15 integrate
.. //depot/projects/dtrace/www/en/donations/donors.sgml#20 integrate
.. //depot/projects/dtrace/www/en/donations/wantlist.sgml#18 integrate
.. //depot/projects/dtrace/www/en/index.xsl#11 integrate
.. //depot/projects/dtrace/www/en/layout/css/layout.css#5 integrate
.. //depot/projects/dtrace/www/en/platforms/arm.sgml#5 integrate
.. //depot/projects/dtrace/www/share/sgml/events.xml#8 integrate
.. //depot/projects/dtrace/www/share/sgml/header.ent#4 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#37 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.644 2006/12/01 19:38:56 miwi Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.647 2006/12/05 00:54:00 nivit Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -3563,6 +3563,11 @@
     </listitem>
 
     <listitem>
+      <para>Hugo Leisink
+	<email>hugo@leisink.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>Hung-Chi Chu
 	<email>hcchu@r350.ee.ntu.edu.tw</email></para>
     </listitem>
@@ -6552,11 +6557,6 @@
     </listitem>
 
     <listitem>
-      <para>Nicola Vitale
-	<email>nivit@users.sourceforge.net</email></para>
-    </listitem>
-
-    <listitem>
       <para>Nicolas Jombart
 	<email>ecu@ipv42.net</email></para>
     </listitem>
@@ -9740,6 +9740,11 @@
     </listitem>
 
     <listitem>
+      <para>Yu-Xi Lim
+        <email>yuxi@gmx.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>Yuu Yashiki
 	<email>s974123@cc.matsuyama-u.ac.jp</email></para>
     </listitem>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#25 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.161 2006/11/29 23:38:58 lx Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.162 2006/12/05 00:54:00 nivit Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -1302,6 +1302,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.nivit;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.jfv;</para>
     </listitem>
 

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#16 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.33 2006/10/14 08:13:05 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.34 2006/12/04 14:03:30 joel Exp $ -->
 
   <itemizedlist>
     <listitem>
@@ -466,7 +466,7 @@
     </listitem>
 
     <listitem>
-      <para>&a.assar; (2000 - 2002)</para><!-- Unclassified commit bit -->
+      <para>&a.assar; (2000 - 2002)</para>
     </listitem>
 
     <listitem>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.337 2006/11/08 10:09:37 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.338 2006/12/04 14:43:50 keramida Exp $
 -->
 
 <chapter id="install">
@@ -2358,7 +2358,7 @@
 	    <para>The address block being used for this local area
 	      network is a Class C block
 	      (<hostid role="ipaddr">192.168.0.0</hostid> -
-	      <hostid role="ipaddr">192.168.255.255</hostid>).
+	      <hostid role="ipaddr">192.168.0.255</hostid>).
 	      The default netmask is for a Class C network
 	      (<hostid role="netmask">255.255.255.0</hostid>).</para>
 	  </listitem>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.420 2006/06/23 01:59:09 linimon Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.421 2006/12/03 17:56:47 hrs Exp $
 -->
 
 <appendix id="mirrors">
@@ -2766,6 +2766,14 @@
 
     <variablelist>
       <varlistentry>
+	<term>RELENG_6_2_0_RELEASE</term>
+
+	<listitem>
+	  <para>FreeBSD 6.2</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term>RELENG_6_1_0_RELEASE</term>
 
 	<listitem>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.177 2006/11/12 19:22:48 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.178 2006/12/03 13:46:58 marck Exp $
 -->
 
 <chapter id="x11">
@@ -750,7 +750,7 @@
       <filename role="package">x11-fonts/ttmkfdir</filename>.</para>
 
     <screen>&prompt.root; <userinput>cd /usr/X11R6/lib/X11/fonts/TrueType</userinput>
-&prompt.root; <userinput>ttmkfdir &gt; fonts.dir</userinput></screen>
+&prompt.root; <userinput>ttmkfdir -o fonts.dir</userinput></screen>
 
     <para>Now add the &truetype; directory to the font
       path.  This is just the same as described above for <link

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#34 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.771 2006/11/30 23:52:09 pav Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.772 2006/12/04 07:30:48 ariff Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -10658,6 +10658,11 @@
 		    <entry>7.0-CURRENT after the addition of libelf.</entry>
 		    <entry>700025</entry>
 		  </row>
+		  <row>
+		    <entry>7.0-CURRENT after major changes on sound
+		      sysctls.</entry>
+		    <entry>700026</entry>
+		  </row>
 		</tbody>
 	      </tgroup>
 	    </table>

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#18 (text+ko) ====

@@ -13,7 +13,7 @@
                  builds for the other languages, and we will poke fun of you
                  in public.
 
-     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.404 2006/11/29 23:13:59 lx Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.405 2006/12/04 23:41:35 nivit Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>">
@@ -700,6 +700,8 @@
 
 <!ENTITY a.niklas "Niklas Saers <email>niklas@FreeBSD.org</email>">
 
+<!ENTITY a.nivit "Nicola Vitale <email>nivit@FreeBSD.org</email>">
+
 <!ENTITY a.njl "Nate Lawson <email>njl@FreeBSD.org</email>">
 
 <!ENTITY a.nobutaka "Nobutaka MANTANI <email>nobutaka@FreeBSD.org</email>">

==== //depot/projects/dtrace/doc/share/sgml/freebsd.ent#10 (text+ko) ====

@@ -1,7 +1,7 @@
 <!-- -*- sgml -*-
      DocBook Miscellaneous FreeBSD Entities.
 
-     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.88 2006/11/10 06:11:06 danger Exp $
+     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.90 2006/12/03 18:02:32 hrs Exp $
 
 This file is now valid XML as well as SGML.  Please do not add CDATA
 attributes or anything else that will prevent this file from being

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

@@ -1,5 +1,5 @@
 # Creator:  Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.510 2006/12/01 15:26:45 pav Exp $
+# $FreeBSD: ports/LEGAL,v 1.512 2006/12/04 16:28:34 vd Exp $
 
    **********************************************************************
    ***                      NOTE TO COMMITTERS                        ***
@@ -608,7 +608,6 @@
 						Commodore Business Machines
 vwnc7.3.1/*		lang/visualworks	Do not redistribute
 vje30/*			japanese/vje30		Commercial software
-VMware-*.tar.gz		emulators/vmware2	Not sure if we can redistribute this
 vmware-freebsd-tools.*	emulators/vmware-guestd3 Not sure if we can redistribute this
 vmware-freebsd-tools.*	emulators/vmware-guestd4 Not sure if we can redistribute this
 						[RESTRICTED]

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

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1192 2006/12/02 12:16:37 rafan Exp $
+# $FreeBSD: ports/MOVED,v 1.1197 2006/12/04 16:28:34 vd Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -2549,3 +2549,12 @@
 net/ripetools|net/ripe-whois|2006-11-24|Has expired: project no longer exists
 devel/sge||2006-11-26|Removed
 mail/pantomime-ssl|mail/pantomime|2006-12-01|Removed
+x11-toolkits/p5-Gtk2-PodViewer|x11-toolkits/p5-Gtk2-Ex-PodViewer|2006-12-03|CPAN module renamed
+audio/xmms-rateplug||2006-12-04|Has expired: Project disappeared from the internet
+chinese/iiimf-le-chewing||2006-12-04|Has expired: fails to install (dependency problem)
+deskutils/mhc-xemacs21-mule||2006-12-04|Has expired: hangs during build
+devel/alleyoop||2006-12-04|Has expired: Does not compile
+devel/hs-crypto||2006-12-04|Has expired: is incompatible with current GHC, needs updating
+editors/gedit-autocomplete-plugin||2006-12-04|Has expired: Not compatible with gedit versions >= 2.14
+emulators/vmware2||2006-12-04|Has expired: Unfetchable
+finance/ccard||2006-12-04|Has expired: Project disappeared from the internet

==== //depot/projects/dtrace/ports/Mk/bsd.autotools.mk#4 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.24 2006/07/05 02:18:08 linimon Exp $
+# $FreeBSD: ports/Mk/bsd.autotools.mk,v 1.25 2006/12/04 01:07:25 ade Exp $
 #
 # Please view me with 4 column tabs!
 #
@@ -51,7 +51,7 @@
 #	- Extra arguments passed to automake during configure step
 #
 # ACLOCAL_ARGS=...
-#   - Arguments passed to aclocal during configure step
+#	- Arguments passed to aclocal during configure step
 #
 # AUTOCONF_ARGS=...
 #	- Extra arguments passed to autoconf during configure step

==== //depot/projects/dtrace/ports/Mk/bsd.sites.mk#13 (text+ko) ====

@@ -20,7 +20,7 @@
 #
 # Note: all entries should terminate with a slash.
 #
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.402 2006/11/24 19:24:51 pav Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.403 2006/12/02 21:57:05 dinoex Exp $
 #
 
 # Where to put distfiles that don't have any other master site
@@ -460,6 +460,11 @@
 	ftp://ftp.easynet.nl/mirror/GNUstep/pub/gnustep/%SUBDIR%/
 .endif
 
+.if !defined(IGNORE_MASTER_SITE_GNUSTEP_CH)
+MASTER_SITE_GNUSTEP_CH+= \
+	http://io.debian.net/~tar/ports/distfiles/
+.endif
+
 .if !defined(IGNORE_MASTER_SITE_GNU_ALPHA)
 MASTER_SITE_GNU_ALPHA+=	\
 	ftp://alpha.gnu.org/pub/gnu/%SUBDIR%/ \

==== //depot/projects/dtrace/ports/Mk/bsd.wx.mk#4 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.wx.mk,v 1.2 2006/11/13 21:15:38 alepulver Exp $
+# $FreeBSD: ports/Mk/bsd.wx.mk,v 1.4 2006/12/03 18:04:39 pav Exp $
 #
 # bsd.wx.mk - Support for WxWidgets based ports.
 #
@@ -132,10 +132,18 @@
 
 _WX_COMPS_ALL=			wx contrib python mozilla svg
 _WX_DEP_TYPES_ALL=		build lib run
-_WX_VERS_ALL=			2.4 2.6
-_WX_VERS_UC_ALL=		2.6
+_WX_VERS_ALL=			2.4 2.6 2.8
+_WX_VERS_UC_ALL=		2.6 2.8
 _WX_VERS_LISTS=			WANT_WX_VER WITH_WX_VER
 
+# _WX_ILLEGAL_VERS_PYTHON	- List of versions where wxPython is not available
+# _WX_ILLEGAL_VERS_MOZILLA	- List of versions where wxmozilla is not available
+# _WX_ILLEGAL_VERS_SVG		- List of versions where wxsvg is not available
+
+_WX_ILLEGAL_VERS_PYTHON=	2.8
+_WX_ILLEGAL_VERS_MOZILLA=	2.6 2.8
+_WX_ILLEGAL_VERS_SVG=		2.4 2.8
+
 #
 # Variables used to determine what is needed:
 # _WX_PORT_comp_ver		- Port directory.
@@ -145,6 +153,7 @@
 # _WX_DEPTYPE_comp_ver	- Default dependency type (optional).
 #
 
+# wxgtk 2.4
 _WX_PORT_wx_2.4=		x11-toolkits/wxgtk24
 _WX_LIB_wx_2.4=			wx_gtk2-2.4
 
@@ -157,6 +166,7 @@
 _WX_PORT_mozilla_2.4=	x11-toolkits/wxmozilla
 _WX_LIB_mozilla_2.4=	wxmozilla_gtk2-2.4
 
+# wxgtk 2.6
 _WX_PORT_wx_2.6=		x11-toolkits/wxgtk26${_WX_UCL}
 _WX_LIB_wx_2.6=			wx_base${_WX_UC}-2.6
 
@@ -166,9 +176,16 @@
 _WX_PORT_python_2.6=	x11-toolkits/py-wxPython26${_WX_UCL}
 _WX_FILE_python_2.6=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2${_WX_PYSUFX}/wx/__init__.py
 
-_WX_PORT_svg_2.6=		x11-toolkits/wxsvg
+_WX_PORT_svg_2.6=		graphics/wxsvg
 _WX_LIB_svg_2.6=		wxsvg
 
+# wxgtk 2.8
+_WX_PORT_wx_2.8=		x11-toolkits/wxgtk28${_WX_UCL}
+_WX_LIB_wx_2.8=			wx_base${_WX_UC}-2.8
+
+_WX_PORT_contrib_2.8=	x11-toolkits/wxgtk28${_WX_UCL}-contrib
+_WX_LIB_contrib_2.8=	wx_gtk2${_WX_UC}_fl-2.8
+
 # Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropiately.
 # Set _WX_DEPTYPE_comp_ver for "python" to "run", and others to "lib".
 
@@ -377,6 +394,28 @@
 _WX_PYSUFX=				-ansi
 .endif
 
+# Limit range of possible versions for python, svg and mozila
+
+.for comp in ${WX_COMPS}
+_WX_COMP=	${comp}
+.  if ${_WX_COMP} == "python"
+.    for excl in ${_WX_ILLEGAL_VERS_PYTHON}
+_WX_VER_FINAL:=	${_WX_VER_FINAL:S/${excl}//}
+.    endfor
+.  endif
+.  if ${_WX_COMP} == "mozilla"
+.    for excl in ${_WX_ILLEGAL_VERS_MOZILLA}
+_WX_VER_FINAL:=	${_WX_VER_FINAL:S/${excl}//}
+.    endfor
+.  endif
+.  if ${_WX_COMP} == "svg"
+.    for excl in ${_WX_ILLEGAL_VERS_SVG}
+_WX_VER_FINAL:=	${_WX_VER_FINAL:S/${excl}//}
+.    endfor
+.  endif
+.endfor
+
+
 #
 # Choose final version.
 #

==== //depot/projects/dtrace/ports/Tools/portbuild/scripts/processonelog#8 (text+ko) ====

@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: ports/Tools/portbuild/scripts/processonelog,v 1.12 2006/09/14 05:30:04 kris Exp $
+# $FreeBSD: ports/Tools/portbuild/scripts/processonelog,v 1.13 2006/12/03 17:59:09 dinoex Exp $
 #
 # Read a single errorlogfile and output a line of the format
 #    $filename|$portname|$affected|$logsize|$dir|$maintainer|\
@@ -267,6 +267,8 @@
   reason="threads"; tag="threads"
 elif bzgrep -q "<varargs.h> is obsolete with this version of GCC" $1; then
   reason="varargs"; tag="varargs"
+elif bzgrep -q "shminit failed: Permission denied" $1; then
+  reason="sysvipc"; tag="sysvipc"
 
 # Although these can be fairly common, and thus in one sense ought to be
 # earlier in the evaluation, in practice they are most often secondary

==== //depot/projects/dtrace/src/etc/rc.initdiskless#6 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.initdiskless,v 1.51 2006/09/01 16:33:15 brooks Exp $
+# $FreeBSD: src/etc/rc.initdiskless,v 1.52 2006/12/03 23:50:29 luigi Exp $
 
 # On entry to this script the entire system consists of a read-only root
 # mounted via NFS. The kernel has run BOOTP and configured an interface
@@ -70,12 +70,13 @@
 #		then /dev/ad0s3 will be be mounted on /conf/1.2.3.4/foo/
 #
 # /conf/T/M/diskless_remount
-#		The contents of the file points to an NFS filesystem. E.g. if
-#		/conf/base/etc/diskless_remount contains "foo.com:/etc",
-#		then foo.com:/etc will be be mounted on /conf/base/etc/
-#		If the file contains a pathname starting with "/", then
-#		the root path is prepended to it; this allows relocation of
-#		the root filesystem without changing configuration files.
+#		The contents of the file points to an NFS filesystem,
+#		possibly followed by mount_nfs options. If the server name
+#		is omitted, the script will prepend the root path used when
+#		booting. E.g. if you booted from foo.com:/path/to/root,
+#		an entry for /conf/base/etc/diskless_remount could be any of
+#			foo.com:/path/to/root/etc
+#			/etc -o ro
 #		Because mount_nfs understands ".." in paths, it is
 #		possible to mount from locations above the NFS root with
 #		paths such as "/../../etc".
@@ -132,6 +133,14 @@
 
 dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null`
 
+# DEBUGGING
+# log something on stdout if verbose.
+o_verbose=0     # set to 1 or 2 if you want more debugging
+log() {
+    [ ${o_verbose} -gt 0 ] && echo "*** $* ***"
+    [ ${o_verbose} -gt 1 ] && read -p "=== Press enter to continue" foo
+}
+
 # chkerr:
 #
 # Routine to check for error
@@ -151,6 +160,23 @@
     esac
 }
 
+# The list of filesystems to umount after the copy
+to_umount=""
+
+handle_remount() { # $1 = mount point
+    local nfspt mountopts b
+    b=$1
+    log handle_remount $1
+    [ -d $b -a -f $b/diskless_remount ] || return
+    read nfspt mountopts < $b/diskless_remount
+    log "nfspt ${nfspt} mountopts ${mountopts}"
+    # prepend the nfs root if not present
+    [ `expr "$nfspt" : '\(.\)'` = "/" ] && nfspt="${nfsroot}${nfspt}"
+    mount_nfs $mountopts $nfspt $b
+    chkerr $? "mount_nfs $nfspt $b"
+    to_umount="$b ${to_umount}"
+}
+
 # Create a generic memory disk
 #
 mount_md() {
@@ -160,16 +186,16 @@
 # Create the memory filesystem if it has not already been created
 #
 create_md() {
-    if [ "x`eval echo \\$md_created_$1`" = "x" ]; then
+	[ "x`eval echo \\$md_created_$1`" = "x" ] || return # only once
 	if [ "x`eval echo \\$md_size_$1`" = "x" ]; then
 	    md_size=10240
 	else
 	    md_size=`eval echo \\$md_size_$1`
 	fi
+	log create_md $1 with size $md_size
 	mount_md $md_size /$1
 	/bin/chmod 755 /$1
 	eval md_created_$1=created
-    fi
 }
 
 # DEBUGGING
@@ -205,7 +231,7 @@
 	echo "Interface ${bootp_ifc} IP-Address ${bootp_ipa} Broadcast ${bootp_ipbca} ${class}"
 fi
 
-# Figure out our NFS root path
+log Figure out our NFS root path
 #
 set -- `mount -t nfs`
 while [ $# -ge 1 ] ; do
@@ -228,19 +254,8 @@
 	templates="${templates} ${bootp_ipa} ip/${bootp_ipa}"
 fi
 
-# The list of filesystems to umount after the copy
-to_umount=""
-
 # If /conf/diskless_remount exists, remount all of /conf.
-if [ -d /conf -a -f /conf/diskless_remount ]; then
-    nfspt=`/bin/cat /conf/diskless_remount`
-    if [ `expr "$nfspt" : '\(.\)'` = "/" ]; then
-	nfspt="${nfsroot}${nfspt}"
-    fi
-    mount_nfs $nfspt /conf
-    chkerr $? "mount_nfs $nfspt /conf"
-    to_umount="/conf"
-fi
+handle_remount /conf
 
 # Resolve templates in /conf/base, /conf/default, /conf/${bootp_ipbca},
 # and /conf/${bootp_ipa}.  For each subdirectory found within these
@@ -262,18 +277,17 @@
 #   it before attemping to the remount.  This allows the root to be
 #   relocated without needing to change the remount files.
 #
+log "templates are ${templates}"
 for i in ${templates} ; do
     for j in /conf/$i/* ; do
+	[ -d $j ] || continue
+
 	# memory filesystem size specification
-	#
 	subdir=${j##*/}
-	if [ -d $j -a -f $j/md_size ]; then
-	    eval md_size_$subdir=`cat $j/md_size`
-	fi
+	[ -f $j/md_size ] && eval md_size_$subdir=`cat $j/md_size`
 
-	# remount
-	#
-	if [ -d $j -a -f $j/remount ]; then
+	# remount. Beware, the command is in the file itself!
+	if [ -f $j/remount ]; then
 	    nfspt=`/bin/cat $j/remount`
 	    $nfspt $j
 	    chkerr $? "$nfspt $j"
@@ -281,16 +295,7 @@
 	fi
 
 	# NFS remount
-	#
-	if [ -d $j -a -f $j/diskless_remount ]; then
-	    nfspt=`/bin/cat $j/diskless_remount`
-	    if [ `expr "$nfspt" : '\(.\)'` = "/" ]; then
-		nfspt="${nfsroot}${nfspt}"
-	    fi
-	    mount_nfs $nfspt $j
-	    chkerr $? "mount_nfs $nfspt $j"
-	    to_umount="$j ${to_umount}"
-	fi
+	handle_remount $j
     done
 done
 

==== //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#16 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.230 2006/10/30 12:01:57 keramida Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.231 2006/12/03 15:25:55 maxim Exp $
 
 %
 =======================================================================
@@ -1034,7 +1034,7 @@
 completed," he said.
 		-- Geoffrey James, "The Tao of Programming"
 %
-	A manger went to his programmers and told them: "As regards to your
+	A manager went to his programmers and told them: "As regards to your
 work hours: you are going to have to come in at nine in the morning and leave
 at five in the afternoon."  At this, all of them became angry and several
 resigned on the spot.

==== //depot/projects/dtrace/src/games/fortune/datfiles/freebsd-tips#5 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.41 2006/10/09 04:11:34 chinsan Exp $
+$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.42 2006/12/03 15:22:45 maxim Exp $
 %
 Having trouble using fetch through a firewall? Try setting the environment
 variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details.
@@ -317,7 +317,7 @@
 to TCP or UDP connections, but also for proxying them with inetd(8).
 %
 If other operating systems have damaged your Master Boot Record, you can
-reinstall it either with /stand/sysinstall or with boot0cfg(8). See
+reinstall it either with /usr/sbin/sysinstall or with boot0cfg(8). See
 "man boot0cfg" for details.
 %
 Need to see the calendar for this month? Simply type "cal".  To see the

==== //depot/projects/dtrace/src/lib/libarchive/archive_write_open_filename.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_filename.c,v 1.17 2006/11/26 19:00:49 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_filename.c,v 1.18 2006/12/04 08:01:53 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
@@ -118,6 +118,12 @@
 			archive_write_set_bytes_in_last_block(a, 0);
 	}
 
+	if (fstat(mine->fd, &st) != 0) {
+               archive_set_error(a, errno, "Couldn't stat '%s'",
+                   mine->filename);
+               return (ARCHIVE_FATAL);
+	}
+
 	/*
 	 * Set up default last block handling.
 	 */

==== //depot/projects/dtrace/src/lib/libc/gen/confstr.3#4 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)confstr.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/gen/confstr.3,v 1.13 2003/09/08 19:57:14 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/confstr.3,v 1.14 2006/12/03 08:22:36 maxim Exp $
 .\"
-.Dd June 18, 2001
+.Dd December 3, 2006
 .Dt CONFSTR 3
 .Os
 .Sh NAME
@@ -92,7 +92,7 @@
 .Sh RETURN VALUES
 If the call to
 .Fn confstr
-is not successful, \-1 is returned and
+is not successful, 0 is returned and
 .Va errno
 is set appropriately.
 Otherwise, if the variable does not have a configuration defined value,

==== //depot/projects/dtrace/src/lib/libc/gen/err.3#5 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)err.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.21 2006/09/29 22:57:22 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/err.3,v 1.22 2006/12/03 19:26:17 dds Exp $
 .\"
 .Dd March 6, 1999
 .Dt ERR 3
@@ -114,7 +114,7 @@
 .Fn vwarnc
 functions append an error message obtained from
 .Xr strerror 3
-based on a code or the global variable
+based on a supplied error code value or the global variable
 .Va errno ,
 preceded by another colon and space unless the
 .Fa fmt

==== //depot/projects/dtrace/src/lib/libc/net/nscachedcli.c#4 (text) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/nscachedcli.c,v 1.2 2006/05/02 23:02:32 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/nscachedcli.c,v 1.3 2006/12/04 17:08:43 ume Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
@@ -72,7 +72,7 @@
 	timeout.tv_nsec = 0;
 	result = 0;
 	do {
-		nevents = kevent(connection->write_queue, NULL, 0, &eventlist,
+		nevents = _kevent(connection->write_queue, NULL, 0, &eventlist,
 		    1, &timeout);
 		if ((nevents == 1) && (eventlist.filter == EVFILT_WRITE)) {
 			s_result = _write(connection->sockfd, data + result,
@@ -114,7 +114,7 @@
 	timeout.tv_nsec = 0;
 	result = 0;
 	do {
-		nevents = kevent(connection->read_queue, NULL, 0, &eventlist,
+		nevents = _kevent(connection->read_queue, NULL, 0, &eventlist,
 		    1, &timeout);
 		if (nevents == 1 && eventlist.filter == EVFILT_READ) {
 			s_result = _read(connection->sockfd, data + result,
@@ -170,16 +170,16 @@
 
 	EV_SET(&eventlist, connection->sockfd, EVFILT_WRITE, EV_ADD,
 	    NOTE_LOWAT, sizeof(int), NULL);
-	res = kevent(connection->write_queue, &eventlist, 1, NULL, 0, NULL);
+	res = _kevent(connection->write_queue, &eventlist, 1, NULL, 0, NULL);
 
-	nevents = kevent(connection->write_queue, NULL, 0, &eventlist, 1,
+	nevents = _kevent(connection->write_queue, NULL, 0, &eventlist, 1,
 	    NULL);
 	if (nevents == 1 && eventlist.filter == EVFILT_WRITE) {
 		result = (_sendmsg(connection->sockfd, &cred_hdr, 0) == -1) ?
 		    -1 : 0;
 		EV_SET(&eventlist, connection->sockfd, EVFILT_WRITE, EV_ADD,
 		    0, 0, NULL);
-		kevent(connection->write_queue, &eventlist, 1, NULL, 0, NULL);
+		_kevent(connection->write_queue, &eventlist, 1, NULL, 0, NULL);
 		return (result);
 	} else
 		return (-1);
@@ -224,13 +224,13 @@
 	assert(retval->write_queue != -1);
 
 	EV_SET(&eventlist, retval->sockfd, EVFILT_WRITE, EV_ADD, 0, 0, NULL);
-	res = kevent(retval->write_queue, &eventlist, 1, NULL, 0, NULL);
+	res = _kevent(retval->write_queue, &eventlist, 1, NULL, 0, NULL);
 
 	retval->read_queue = kqueue();
 	assert(retval->read_queue != -1);
 
 	EV_SET(&eventlist, retval->sockfd, EVFILT_READ, EV_ADD, 0, 0, NULL);
-	res = kevent(retval->read_queue, &eventlist, 1, NULL, 0, NULL);
+	res = _kevent(retval->read_queue, &eventlist, 1, NULL, 0, NULL);
 
 	return (retval);
 }

==== //depot/projects/dtrace/src/lib/libc/sys/close.2#4 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)close.2	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/lib/libc/sys/close.2,v 1.24 2004/07/02 23:52:13 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/close.2,v 1.26 2006/12/04 20:34:25 ru Exp $
 .\"
-.Dd April 19, 1994
+.Dd December 4, 2006
 .Dt CLOSE 2
 .Os
 .Sh NAME
@@ -118,6 +118,9 @@
 An interrupt was received.
 .It Bq Er ENOSPC
 The underlying object did not fit, cached data was lost.
+.It Bq Er ECONNRESET
+The underlying object was a stream socket that was shut down by the peer
+before all pending data was delivered.
 .El
 .Sh SEE ALSO
 .Xr accept 2 ,

==== //depot/projects/dtrace/src/lib/libthr/thread/thr_cancel.c#5 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_cancel.c,v 1.14 2006/11/24 09:57:37 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_cancel.c,v 1.15 2006/12/04 14:20:41 davidxu Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 testcancel(struct pthread *curthread)
 {
 	if (__predict_false(SHOULD_CANCEL(curthread) &&
-	    !THR_IN_CRITICAL(curthread)))
+	    !THR_IN_CRITICAL(curthread) && curthread->cancel_defer == 0))
 		_pthread_exit(PTHREAD_CANCELED);
 }
 
@@ -155,3 +155,24 @@
 	if (curthread->cancel_enable)
 		curthread->cancel_point--;
 }
+
+void
+_thr_cancel_enter_defer(struct pthread *curthread)
+{
+	if (curthread->cancel_enable) {
+		curthread->cancel_point++;
+		testcancel(curthread);
+		curthread->cancel_defer++;
+	}
+}
+
+void
+_thr_cancel_leave_defer(struct pthread *curthread, int check)
+{
+	if (curthread->cancel_enable) {
+		curthread->cancel_defer--;
+		if (check)
+			testcancel(curthread);
+		curthread->cancel_point--;
+	}
+}

==== //depot/projects/dtrace/src/lib/libthr/thread/thr_cond.c#6 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_cond.c,v 1.20 2006/11/24 09:57:37 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_cond.c,v 1.21 2006/12/04 14:20:41 davidxu Exp $
  */
 
 #include "namespace.h"
@@ -67,16 +67,12 @@
 	int             rval = 0;
 
 	if ((pcond = (pthread_cond_t)
-	    malloc(sizeof(struct pthread_cond))) == NULL) {
+	    calloc(1, sizeof(struct pthread_cond))) == NULL) {
 		rval = ENOMEM;
 	} else {
 		/*
 		 * Initialise the condition variable structure:
 		 */
-		_thr_umutex_init(&pcond->c_lock);
-		pcond->c_seqno = 0;
-		pcond->c_waiters = 0;
-		pcond->c_wakeups = 0;
 		if (cond_attr == NULL || *cond_attr == NULL) {
 			pcond->c_pshared = 0;
 			pcond->c_clockid = CLOCK_REALTIME;
@@ -84,6 +80,7 @@
 			pcond->c_pshared = (*cond_attr)->c_pshared;
 			pcond->c_clockid = (*cond_attr)->c_clockid;
 		}
+		_thr_umutex_init(&pcond->c_lock);
 		*cond = pcond;
 	}
 	/* Return the completion status: */
@@ -118,32 +115,27 @@
 int
 _pthread_cond_destroy(pthread_cond_t *cond)
 {
+	struct pthread		*curthread = _get_curthread();
 	struct pthread_cond	*cv;
-	struct pthread		*curthread = _get_curthread();
 	int			rval = 0;
 
 	if (*cond == NULL)
 		rval = EINVAL;
 	else {
+		cv = *cond;
+		THR_UMUTEX_LOCK(curthread, &cv->c_lock);
 		/* Lock the condition variable structure: */
-		THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock);
-		if ((*cond)->c_waiters + (*cond)->c_wakeups != 0) {
-			THR_LOCK_RELEASE(curthread, &(*cond)->c_lock);
+		if (cv->c_kerncv.c_has_waiters) {
+			THR_UMUTEX_UNLOCK(curthread, &cv->c_lock);
 			return (EBUSY);
 		}
-
 		/*
 		 * NULL the caller's pointer now that the condition
 		 * variable has been destroyed:
 		 */
-		cv = *cond;

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