From owner-p4-projects@FreeBSD.ORG  Fri Oct  6 07:35:28 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 0AAD916A407; Fri,  6 Oct 2006 07:35:27 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7E52916A415
	for <perforce@freebsd.org>; Fri,  6 Oct 2006 07:35:27 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E835743D46
	for <perforce@freebsd.org>; Fri,  6 Oct 2006 07:35:26 +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 k967ZQfB033274
	for <perforce@freebsd.org>; Fri, 6 Oct 2006 07:35:26 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k967ZPSB033247
	for perforce@freebsd.org; Fri, 6 Oct 2006 07:35:25 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 6 Oct 2006 07:35:25 GMT
Message-Id: <200610060735.k967ZPSB033247@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 107347 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: Fri, 06 Oct 2006 07:35:28 -0000

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

Change 107347 by jb@jb_freebsd7 on 2006/10/06 07:34:36

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#27 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#5 integrate
.. //depot/projects/dtrace/ports/LEGAL#9 integrate
.. //depot/projects/dtrace/ports/MOVED#18 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.gnustep.mk#3 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.linux-rpm.mk#5 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.lua.mk#2 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#8 integrate
.. //depot/projects/dtrace/ports/Tools/scripts/rmport#4 integrate
.. //depot/projects/dtrace/src/gnu/lib/libstdc++/Makefile#4 integrate
.. //depot/projects/dtrace/src/lib/libthread_db/Makefile#3 integrate
.. //depot/projects/dtrace/src/share/doc/papers/Makefile#3 integrate
.. //depot/projects/dtrace/src/share/man/man1/Makefile#3 integrate
.. //depot/projects/dtrace/src/share/man/man4/sched_ule.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man5/Makefile#6 integrate
.. //depot/projects/dtrace/src/share/man/man9/Makefile#9 integrate
.. //depot/projects/dtrace/src/share/man/man9/kqueue.9#2 integrate
.. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#13 integrate
.. //depot/projects/dtrace/src/sys/boot/i386/btx/btx/btx.S#4 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#18 integrate
.. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ipmi/ipmi_smic.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ips/ips.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ips/ipsreg.h#3 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#15 integrate
.. //depot/projects/dtrace/src/sys/ia64/conf/GENERIC#6 integrate
.. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#7 integrate
.. //depot/projects/dtrace/src/sys/powerpc/conf/GENERIC#6 integrate
.. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#9 integrate
.. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#10 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#13 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#11 integrate
.. //depot/projects/dtrace/www/en/platforms/xbox.sgml#5 integrate
.. //depot/projects/dtrace/www/en/projects/summerofcode-2006.sgml#2 integrate
.. //depot/projects/dtrace/www/en/projects/summerofcode.sgml#11 integrate
.. //depot/projects/dtrace/www/en/releases/6.2R/schedule.sgml#3 integrate
.. //depot/projects/dtrace/www/en/releng/index.sgml#13 integrate
.. //depot/projects/dtrace/www/en/smp/index.sgml#5 integrate
.. //depot/projects/dtrace/www/en/snapshots/index.sgml#11 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#3 integrate
.. //depot/projects/dtrace/www/share/sgml/press.xml#3 integrate
.. //depot/projects/dtrace/www/share/sgml/release.ent#3 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.620 2006/10/05 00:40:40 alepulver Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.623 2006/10/06 02:55:13 alepulver Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -5592,6 +5592,11 @@
     </listitem>
 
     <listitem>
+      <para>Martin Jackson
+	<email>mhjacks@swbell.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>Martin Kammerhofer
 	<email>mkamm@gmx.net</email></para>
     </listitem>
@@ -8251,6 +8256,11 @@
     </listitem>
 
     <listitem>
+      <para>Simon Cornelius P. Umacob
+	<email>simoncpu@infoweapons.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Simon Dick
 	<email>simond@irrelevant.org</email></para>
     </listitem>
@@ -8556,6 +8566,11 @@
     </listitem>
 
     <listitem>
+      <para>Steven Kreuzer
+	<email>skreuzer@f2o.org</email></para>
+    </listitem>
+
+    <listitem>
       <para>Steven McCanne
 	<email>mccanne@cs.berkeley.edu</email></para>
     </listitem>

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

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml,v 1.22 2006/10/02 13:44:03 rwatson Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml,v 1.23 2006/10/05 12:14:46 rwatson Exp $
 -->
 
 <!-- Need more documentation on praudit, auditreduce, etc.  Plus more info
@@ -664,6 +664,11 @@
 
       <para>The change will take effect once you have saved the
 	new <filename>/etc/crontab</filename>.</para>
+
+      <para>Automatic rotation of the audit trail file based on file size is
+	possible via the <option>filesz</option> option in
+	&man.audit.control.5;, and is described in the configuration files
+	section of this chapter.</para>
     </sect2>
 
     <sect2>

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

@@ -1,5 +1,5 @@
 # Creator:  Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.503 2006/10/05 00:11:51 alepulver Exp $
+# $FreeBSD: ports/LEGAL,v 1.505 2006/10/06 00:27:31 alepulver Exp $
 
    **********************************************************************
    ***                      NOTE TO COMMITTERS                        ***
@@ -26,20 +26,20 @@
 112887-04.tar		editors/staroffice60	Must be bought and downloaded
 						directly from Sun via WWW
 						interface
-116518-03.tar		editors/staroffice70	Must be bought and downloaded
+116518-*		editors/staroffice70	Must be bought and downloaded
 						directly from Sun via WWW
 						interface
-116518-03.tar		german/staroffice70	Must be bought and downloaded
+116518-*		german/staroffice70	Must be bought and downloaded
 						directly from Sun via WWW
 						interface
 5400s_fbsd_cli_v10.zip	sysutils/aaccli		May not be redistributed in
 						binary form
 ac3dlx*			graphics/linux-ac3d	Commercial license, no
 						distribution
-acroread/AdobeReader_*-7*.*.rpm print/acroread7	Must fill out redistribution
+acroread/AdobeReader_*	print/acroread7		Must fill out redistribution
 						form at
 						http://www.adobe.com/products/acrobat/distribute.html
-acroread/AdbeRdr70_linux_jpn.tar.gz japanese/acroread	Must fill out redistribution
+acroread/AdobeReader_*	japanese/acroread	Must fill out redistribution
 						form at
 						http://www.adobe.com/products/acrobat/distribute.html
 actx-*			games/actx		Contains commercial character
@@ -49,24 +49,24 @@
 						author
 aestats-*		games/aestats		Commercial use is prohibited
 AGSatellite0520*	net-p2p/linux-agsatellite	Unsure of licensing issues
-AlephOne-*		games/alephone-data	Bungie/Microsoft do not
+infinity.*		games/alephone-data	Bungie/Microsoft do not
 						allow charging for Marathon
 						data files
-adstudio-novm.tar.gz	databases/adstudio	Free for personal or educational
+ads-java-novm-*		databases/adstudio	Free for personal or educational
 						use but a commercial license is
 						required for all other usages
 altivore.c		security/altivore	No redistribution allowed
 annelid-*		games/annelid		Redistribution is limited
-apache*-ssl		www/apache13-ssl	Crypto; export-controlled
-apache2/mod_taf_thief.c	www/mod_traf_thief	No license
+apache_*ssl_*		www/apache13-ssl	Crypto; export-controlled
+apache2/mod_traf_thief-*.c www/mod_traf_thief	No license
 apple_pascal_0.dsk.gz	emulators/p-interp	Redistribution rights for Apple
 						Pascal disk images are unclear
-AquaGatekeeper-*	net/AquaGatekeeper	No redistribution allowed
+AquaGatekeeper*		net/AquaGatekeeper	No redistribution allowed
 armyops*-linux.run	games/linux-americasarmy Redistribution is limited
 asWedit-*		www/aswedit		Commercial software
 atari800/*		emulators/atari800	xf25 contains copyright ROMs
 						and cannot be distributed
-autopano-sift		graphics/autopano-sift	May be covered by patents
+autopano-sift-*		graphics/autopano-sift	May be covered by patents
 bamg*			math/bamg		Contact author personally
 						regarding commercial use
 baudline_*		audio/baudline		No redistribution allowed
@@ -76,11 +76,11 @@
 						redistribution
 bicom*			archivers/bicom		Contact author personally
 						regarding commercial use
-blast-freebsd*		biology/blast		Must be downloaded from vendor site
+blast*.freebsd-*	biology/blast		Must be downloaded from vendor site
 boodler-*		audio/boodler		Not for commercial use
 Browser*.tar.gz		net/ldapbrowser		No reply from author regarding
 						redistribution licensing
-bsp_upektfmess-*	security/bsp_upektfmess	License prohibits redistribution
+TFMESS_BSP_FreeBSD_*	security/bsp_upektfmess	License prohibits redistribution
 bzip-*			archivers/bzip		Some algorithms used may
 						infringe certain US patents.
 						Opinions differ.  Commercial
@@ -89,13 +89,13 @@
 cap60/*			net/cap			Do not sell for profit
 ccc-*.alpha.rpm		lang/compaq-cc		Distribution not allowed
 checkpassword-*.tar.gz	security/checkpassword	Unsure of djb's license
-citrix_ica-*-de.tar.gz	german/citrix_ica	License prohibits redistribution
-citrix_ica-*-ja.tar.gz	japanese/citrix_ica	License prohibits redistribution
-citrix_ica-*.tar.gz	net/citrix_ica		License prohibits redistribution
+citrix_ica-*		german/citrix_ica	License prohibits redistribution
+citrix_ica-*		japanese/citrix_ica	License prohibits redistribution
+citrix_ica-*		net/citrix_ica		License prohibits redistribution
 cfs-*			security/cfs		Crypto; export-controlled
 clibpdf*.tar.gz		print/clibpdf		Needs a license to bundle with
 						other products
-CODE2000.ZIP		x11-fonts/code2000	Only unmodified original
+code2000-*/CODE2000.ZIP	x11-fonts/code2000	Only unmodified original
 						package can be distributed
 collections*.zip	java/collections	See the license
 clibpdf*		print/clibpdf		License required for bundling
@@ -119,13 +119,13 @@
 						is prohibited
 csound/*		audio/csound-manual	audio/same as csound
 cyberbit/*		x11-fonts/cyberbit-ttfonts Not free for commercial use
-DansGuardian-2.[678]-*	www/dansguardian	Not free for installation by
+dansguardian-2.[678]*	www/dansguardian	Not free for installation by
 						3rd parties charging for
 						installation or support; not
 						free for commercial use
-DarwinStreamingSrc*.zip	net/DarwinStreamingServer Server License restrictions
+DarwinStreamingSrvr*-Source.tar net/DarwinStreamingServer Server License restrictions
 						See http://www.opensource.apple.com/apsl/
-dat-*.tar		security/vscan		Restricted to the license
+vbsd*e.tar.Z		security/vscan		Restricted to the license
 						terms set for VirusScan
 dc3play-*		graphics/dc3play	No redistribution due to
 						beta status
@@ -144,14 +144,14 @@
 						restrictions on distribution
 						Source tarball may go on CD-ROM
 dgd/*			net/dgd-net		Same as dgd
-diablo-caffe-1.5*.tar.bz2	java/diablo-jdk15	License does not allow distribution
-							with fee
-diablo-latte-1.5*.tar.bz2	java/diablo-jre15	License does not allow distribution
-							with fee
+diablo-caffe-freebsd*-*-* java/diablo-jdk15	License does not allow distribution
+						with fee
+diablo-latte-freebsd*-*-* java/diablo-jre15	License does not allow distribution
+						with fee
 dist10.tar.gz		audio/mp3encode		Condition is not clear
 divx4linux-*.tgz	multimedia/linux-divx4linux4 Unsure of licensing issues
 divx4linux-*.tar.gz	multimedia/linux-divx4linux Unsure of licensing issues
-djbdns			dns/djbdns		No license -- see
+djbdns*			dns/djbdns		No license -- see
 						http://cr.yp.to/softwarelaw.html
 djbfft-*		math/djbfft		No license -- see
 						http://cr.yp.to/softwarelaw.html
@@ -162,7 +162,7 @@
 						free trial for everybody
 						We currently ask for permission
 						to put a package on the CD-ROM
-dns.tar.Z		dns/h2n			Never get an approval yet
+dns.*.tar.Z		dns/h2n			Never get an approval yet
 doom3-linux-*		games/linux-doom3*	Redistribution limited
 doomsrc.zip		games/doom		requested by id Software
 dr_freebsd_*.zip	sysutils/megarc		Must be downloaded manually
@@ -174,7 +174,7 @@
 eawpats*		audio/eawpats		Some of the patches are not
 						for commercial use
 eClient-linux.run	games/atitd		Redistribution not allowed
-eclipse/jp.azzurri.clay.core_1.0.5.bin.dist.20040730.zip java/eclipse-clay-core License
+eclipse/jp.azzurri.clay.core_*.bin.dist.* java/eclipse-clay-core License
 						agreement is required to download
 edith*			editors/edith		Redistribution not allowed
 eijiro*			japanese/eijiro-fpw	The original dictionary is not free
@@ -189,9 +189,9 @@
 f-prot-sig*		security/f-prot-sig	Free for personal use only
 f6kuzzzz.taz		databases/libudbc	Downloading and redistribution
 						terms are unclear
-faac			audio/faac		Restrictive copyright (do not
+faac*			audio/faac		Restrictive copyright (do not
 						sell for profit)
-faad			audio/faad		Restrictive copyright (do not
+faad*			audio/faad		Restrictive copyright (do not
 						sell for profit)
 fasta2*			biology/fasta		May not be sold or incorporated
 						into a commercial product
@@ -210,14 +210,14 @@
 festival/voice_mwm_di-*	audio/festvox-mwm	No commercial use
 festival/voice_ogirab_di-* audio/festvox-ogirab No commercial use
 festival/voice_tll_di-*	audio/festvox-tll	No commercial use
-fMSX*			emulators/fmsx		Unclear legal status of
+fmsx*/*			emulators/fmsx		Unclear legal status of
 						distributed ROMs
 foiltex*		textproc/foiltex	Redistribution on a not-for-profit
 						basis only
-fonts-ttf-gentium-*	x11-fonts/gentium	License forbids commercial
+ttf-sil-gentium_*	x11-fonts/gentium	License forbids commercial
 						distribution without permission
 fp-freebsd-ws-*		security/f-prot		Free for personal use only
-FreeFem++*		math/freefem++		No resale, not for commercial usage
+freefem++-*		math/freefem++		No resale, not for commercial usage
 framework-*		security/metasploit-devel	May not be re-sold
 freefonts-*		x11-fonts/freefonts	Some of the fonts are
 						shareware.  Some are freeware.
@@ -232,7 +232,7 @@
 						tempoita.license say "placed
 						into the public domain and may
 						[not be] sold")
-freenet6-client-*	net/freenet6		Must agree to License Agreement
+tspc-*-src.tgz		net/freenet6		Must agree to License Agreement
 						before downloading
 freqship/*		sysutils/freqsdwn	License agreement is required
 						to download
@@ -241,7 +241,7 @@
 								distribute the music
 ftree-*			misc/ftree		Cannot distribute commercially
 fwtk/*			security/fwtk		No redistribution allowed
-Frisk-*			games/xfrisk		Copyright/trademark violation?
+XFrisk-*		games/xfrisk		Copyright/trademark violation?
 gap/*			math/gap		Do not sell for profit
 gentoo-linux/stage1-*	emulators/linux_base-gentoo-stage1 Binaries
 						licensed under GNU GPL without
@@ -251,22 +251,22 @@
 gibi-*			french/gibi		Only free for use in conjunction with
 						french/aster.  For any other purpose,
 						you have to acquire a license
-giftool-*		graphics/giftool	Do not redistribute for profit
+giftool*		graphics/giftool	Do not redistribute for profit
 glimpse-*		textproc/glimpse	Do not sell for profit
-gnome2/MCity-microGUI*	x11-themes/metacity-theme-microgui Themes may contain artwork not
+gnome2/mcitymicrogui-default* x11-themes/metacity-theme-microgui Themes may contain artwork not
 						done by the author.  Keep FreeBSD safe
 						if the theme author violated copyrights
 gnupg-*			security/gnupg		Crypto; export-controlled
 goemon.tgz		audio/timidity		Uses copyrighted patches
 gogo239b.tgz		audio/gogo		Condition is not clear
 goodway*_free.zip	games/linux-goodway	Redistribution prohibited
-GoogleEarthLinux.bin	astro/google-earth	Not really sure about the redistribution terms
+GoogleEarthLinux-*	astro/google-earth	Not really sure about the redistribution terms
 goPod-*			misc/*gopod		Unclear legal status in EU countries
 grande-KXL-*.tar.gz	games/grande		Possible copyright infringement
-graphviz/*		graphics/graphviz	Needs license before fetching
+graphviz-*		graphics/graphviz	Needs license before fetching
 GTL-*			misc/gtl		Non-commercial use only,
 						license forbids redistribution
-hcfpcimodem*lnxtbeta*.tar.gz	comms/hcfmdm	No redistribution allowed
+hcfmdm/*		comms/hcfmdm		No redistribution allowed
 himeno/*		benchmarks/himenobench	Uncertain to distribute sources and binaries
 hjb3_0-linux.sfx	www/hotjava		Licensed for individual
 						non-commercial use only
@@ -280,19 +280,19 @@
 						prohibited
 IBMJava2-SDK-131.tgz	java/linux-ibm-jdk13	Redistribution of repackaged
 						binaries not permitted
-IBMJava2-SDK-141.tgz	java/linux-ibm-jdk14	Redistribution of repackaged
+IBMJava2-SDK-*		java/linux-ibm-jdk14	Redistribution of repackaged
 						binaries not permitted
 ICON-AquaFusion.*	x11-themes/gnome-icons-aqua-fusion Author rights unclear
 ICON-CoolGorilla.*	x11-themes/gnome-icons-cool-gorilla Author rights unclear
-ICON-Crystal-SVG-For-Gnome.* x11-themes/gnome-icons-crystal Author rights unclear
+CrystalSVGforGnomeIcons* x11-themes/gnome-icons-crystal Author rights unclear
 ICON-Gentoo-Test.*	x11-themes/gnome-icons-gentoo-test Author rights unclear
 ICON-Gnome-RH8.*	x11-themes/gnome-icons-refined Author rights unclear
-ICON-Iris-*		x11-themes/gnome-icons-iris Author rights unclear
-ICON-Noia-full-*	x11-themes/gnome-icons-noia-full Author rights unclear
-ICON-NoiaWarm-*		x11-themes/gnome-icons-noia-warm Author rights unclear
+ICON-Iris*		x11-themes/gnome-icons-iris Author rights unclear
+ICON-Noia.*		x11-themes/gnome-icons-noia-full Author rights unclear
+ICON-NoiaWarm.*		x11-themes/gnome-icons-noia-warm Author rights unclear
 ICON-Slick.*		x11-themes/gnome-icons-slick Author rights unclear
 ICON-Snow-Apple.*	x11-themes/gnome-icons-snow-apple Author rights unclear
-ICON-Snowish.*		x11-themes/gnome-icons-snowish Author rights unclear
+SnowIsh-*		x11-themes/gnome-icons-snowish Author rights unclear
 ICON-Stylish.*		x11-themes/gnome-icons-stylish Author rights unclear
 ICON-Ximian-South-*	x11-themes/gnome-icons-ximian-south Author rights unclear
 idea.V*.tar.Z		security/idea		A patented algorithm that
@@ -302,7 +302,7 @@
 invitationtoruby.tgz	devel/invitation_to_ruby No commercial use
 install40.jar		games/sfbol		Commerical software. Licenses
 						does not allow redistribution.
-iperf-*-source.tar.gz	benchmarks/iperf	Cannot charge a fee for the
+iperf-*			benchmarks/iperf	Cannot charge a fee for the
 						software
 IPv6socket_scrub.tar	net/ipv6socket_scrub	Not redistributable,
 						license agreement required
@@ -319,7 +319,7 @@
 						binaries not permitted
 j2sdk-*-linux-i586.bin	java/linux-sun-jdk14	Redistribution of repackaged
 						binaries not permitted
-j2sdk-*-rc1-linux-*	java/linux-blackdown-jdk14 License does not allow
+j2sdk-*-linux-i586.bin	java/linux-blackdown-jdk14 License does not allow
 						distribution with fee
 j2sdk-1_3_1-src.tar.gz	java/jdk13		Redistribution of pre-compiled
 						binaries is not permitted
@@ -333,7 +333,7 @@
 						binaries is not permitted
 jdk-1_5_0-doc.*		java/jdk15-doc		This documentation is under
 						license and export control
-jdk-1_5_0-*-i586.bin	java/linux-sun-jdk15	Redistribution of repackaged
+jdk-1_5_0*-i586.bin	java/linux-sun-jdk15	Redistribution of repackaged
 						binaries not permitted
 j2sdkee-*		java/j2sdkee13		For development and testing use
 						only; redistribution prohibited
@@ -363,11 +363,11 @@
 jre118_v3-glibc-*	java/linux-blackdown-jre11 License does not allow
 						distribution with fee
 jsdk20-solaris2-sparc*	java/jsdk		No commercial use
-jude-comunity-*.zip	devel/jude-community	License restrictions
-kaffe-*		java/kaffe		Restrictive copyright
+jude-community-*.zip	devel/jude-community	License restrictions
+kaffe-*			java/kaffe		Restrictive copyright
 KASH3-*			math/kash3		Not for commercial
 						distribution or use
-kde-icons-*		x11-themes/kde-icons-*	Unclear about licensing
+KDE/ICONS-*		x11-themes/kde-icons-*	Unclear about licensing
 						status
 ladder.tar		games/ladder		Possible copyright problems?
 lame*			audio/lame		May be patented
@@ -377,11 +377,11 @@
 libidea-*		security/libidea	Crypto; export-controlled
 libots-*.alpha.rpm	lang/compaq-cc		Distribution not allowed
 libSDLx11.so.tar.gz	multimedia/mtv		No redistribution
-LimeWireLinux.tgz	net-p2p/limewire	No redistribution allowed
+LimeWireOther.zip	net-p2p/limewire	No redistribution allowed
 linunace*		archivers/linux-unace	Distribution is permitted within the
 						original package only
 Linux-ACU-Driver-v*	sysutils/linux-acu	Redistribution not allowed
-linux-gtk2		x11-toolkits/linux-gtk2	LGPL binary, no source
+rpm/i386/fedora/4/gtk2-* x11-toolkits/linux-gtk2 LGPL binary, no source
 linuxq3ademo-*		games/linux-quake3-demo	Restrictive license by Loki Software
 l0phtcrack/*		security/l0phtcrack	Parts are under GPL, so
 						binaries should not be
@@ -410,14 +410,14 @@
 mindfocus-*		games/mindfocus		Contains commercial
 						character data
 mindterm-*		security/mindterm-binary Do not sell for profit
-mingw/OPENGL95.EXE	devel/mingw-opengl-headers Not sure if we can redistribute it freely
-miracl			math/miracl		Free for non-profit
+mingw/Opengl95.exe	devel/mingw-opengl-headers Not sure if we can redistribute it freely
+miracl*			math/miracl		Free for non-profit
 						use but a commercial license is
 						required for all other usages
 mMosaic*		www/mmosaic		Do not sell (per NCSA).  Do not
 						distribute binary (GPL/BSD
 						conflict)
-mmv.tar.Z		misc/mmv		Restrictive/unclear copyright
+mmv_*			misc/mmv		Restrictive/unclear copyright
 molden*			biology/molden		free for academic, non profit usage,
 						do not re-distribute source and
 						executable
@@ -434,28 +434,28 @@
 						agreement required
 ncftpd-*		ftp/ncftpd		30 day evaluation license
 netbeans-*		java/netbeans		Restrictive copyright
-netcomponents-*		java/netcomponents	No redistribution except as part
+NetComponents-*		java/netcomponents	No redistribution except as part
 						of a substantially different product
 netshow_linux.gz	multimedia/netshow	Commercial software
-nfbtr758.zip		textproc/nfbtrans	Unclear copyright status
+nfbtr*			textproc/nfbtrans	Unclear copyright status
 nntpcache-*		news/nntpcache		Commercial or government use
 						requires license
 nsc2ke.*		math/nsc2ke		No resale, contact author for
 						commercial usage
 nte-1.*			mbone/nte		Crypto; export-controlled
-MRONWnn6.tgz		japanese/Wnn6		You should buy from Omron
+OMRONWnn6.tgz		japanese/Wnn6		You should buy from Omron
 						Software Co., Ltd.
 oneko-*.tar.gz		games/oneko-sakura	Including derivatives from
 						CARDCAPTOR SAKURA
-onion-fec		net/onion-fec		Some uses of FEC
+fec-*			net/onion-fec		Some uses of FEC
 						technology are patent encumbered
 openssl-*		security/openssl	Crypto; export/import-controlled
 opera-*			www/linux-opera		No redistribution, commercial
 						software
-optimfrog-*		audio/optimfrog		No commercial use
+OptimFROG*		audio/optimfrog		No commercial use
 oracle/*		databases/jdbc-oracle*	This software is under license
 						and export controls
-otojiro*.txt		japanese/otojiro-fpw	The original dictionary is not free
+otojiro*		japanese/otojiro-fpw	The original dictionary is not free
 ovt-*			science/ovt		Registration is needed to download
 						the tarball
 p-interp-*.tar.gz	emulators/p-interp	Redistribution rights for
@@ -480,8 +480,11 @@
 hcwPVRP2.sys		multimedia/pvr250	Driver is part of the CD-ROM
 						distribution coming with the
 						TV card
+hcwPVRP2.sys		multimedia/pvrxxx	Driver is part of the CD-ROM
+						distribution coming with the
+						TV card
 qkmj95p5-freebsd	games/qkmj		Do not sell for profit
-qmail-*			mail/qmail-*		Restricted binary distribution
+qmail*			mail/qmail-*		Restricted binary distribution
 						of modified versions
 qtools-*		mail/qtools		Possibly restricted binary
 						distribution of modified
@@ -495,7 +498,7 @@
 ringtonetools-*		misc/ringtonetools	Not free for commercial organizations
 rkive3.1.tar.Z		news/rkive		Restrictive copyright
 rman-3.*		textproc/rman		Do not sell for profit
-linux-realplayer-*.rpm	multimedia/linux-realplayer Redistribution not allowed
+RealPlayer-*.rpm	multimedia/linux-realplayer Redistribution not allowed
 ruby/ruby_cast_256.zip	security/ruby-cast_256	Crypto; export-controlled
 runrev/linux.tgz	devel/linux-runrev	Do not sell for profit
 savage/savage*		games/linux-savage	Savage is freeware, but i am 
@@ -518,8 +521,8 @@
 sim*.zip		emulators/sim		No commercial use
 simpjava.tar.gz		java/simplicity		Restrictive license
 ski-*.i386.rpm		emulators/ski		Restrictive license
-skype_ver-*		net/skype		Not for redistribution
-SlimServer_v*		audio/slimserver	Version 6.0 and above contain
+skype*			net/skype		Not for redistribution
+slimserver/*		audio/slimserver	Version 6.0 and above contain
 						non-redistributable firmware,
 						images, and documentation.  See
 						License.txt in the distribution
@@ -569,7 +572,7 @@
 tools-for-freebsd-*	emulators/vmware-tools2	Not sure if we can
 						redistribute this
 tracker-*.tgz		audio/tracker		Non-redistributable beta
-triangle.zip		math/triangle		No commercial use without prior
+triangle-*/*		math/triangle		No commercial use without prior
 						arrangement with the author
 Tripwire-*-1.tar.gz	security/tripwire-131	Cannot be redistributed
 						for more than the cost of
@@ -577,7 +580,7 @@
 tripwire-*.tar.gz	security/tripwire12	Cannot be redistributed for
 						more than the cost of
 						duplication
-ttf30.exe		japanese/epson-ttfonts	Cannot be redistributed,
+epson/ttf30.exe		japanese/epson-ttfonts	Cannot be redistributed,
 						cannot fetch outside from
 						Japan, user must have
 						Japanese version of Windows
@@ -595,17 +598,17 @@
 						of a license agreement
 upsmon*			sysutils/upsmon		Redistribute only with
 						original source code
-ut_linux_mgr_		sysutils/linux-megamgr	Redistribution prohibited
+ut_linux_mgr_*		sysutils/linux-megamgr	Redistribution prohibited
 urchin*.tar.gz		www/urchin5		Commercial software, also comes
 						bundled with Apache-SSL
-unreal.tournament*.run	games/linux-ut		Redistribution limited
+linux-ut/*		games/linux-ut		Redistribution limited
 ut2004-lnx-*		games/linux-ut2004-demo	Redistribution limited
 uzap.tar.gz             editors/uzap		Restrictive copyright
 vbsd440e.tar.Z		security/vscan		Commercial software
 vdesk-*			x11/vdesk		Distributed without license
 vice-*			emulators/vice		ROMs are copyrighted by
 						Commodore Business Machines
-visualworks/7.2/*	lang/visualworks	Do not redistribute
+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
@@ -620,8 +623,8 @@
 VTK-*			math/vtk		Portions contain patented algorithms
 						and may require a license for
 						commercial use
-waeiji*.txt		japanese/waeijiro-fpw	The original dictionary is not free
-warsow_*		games/linux-warsow	Redistribution is limited, art
+waeijiro-fpw-*		japanese/waeijiro-fpw	The original dictionary is not free
+warsow/*		games/linux-warsow	Redistribution is limited, art
 						is copyrighted
 webcopy-*		www/webcopy		Do not sell for profit
 webfonts/*		x11-fonts/webfonts	Restrictive copyright
@@ -640,9 +643,9 @@
 xhime*.tgz		games/xhime		Contains commercial character
 						data
 xinvaders-*		games/xinvaders		Do not sell for profit
-xmame-*			emulators/xmame		Do not sell for fee
+xmame/*			emulators/xmame		Do not sell for fee
 X-Plane-Net-Install.gz	games/linux-x-plane-net-installer	Redistribution prohibited
-XLIN*.tar.bz2		games/linux-x-plane	Redistribution prohibited
+linux-x-plane-*		games/linux-x-plane	Redistribution prohibited
 xmdiary-*		deskutils/xmdiary	Do not sell for profit
 xrisk-*			games/xrisk		Copyright/trademark violation?
 xsmbrowser-*		net/xsmbrowser		Commercial software
@@ -668,7 +671,7 @@
 						copyright
 twelf-*			lang/twelf		License is currently
 						indeterminate
-pfpro-*			finance/pfpro		Only available for customers
+pfpro*			finance/pfpro		Only available for customers
 						subscribed to the VeriSign
 						PayFlow Pro Service
 simian-*                devel/simian            Have to agree to

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

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1146 2006/10/03 14:28:09 girgen Exp $
+# $FreeBSD: ports/MOVED,v 1.1149 2006/10/06 03:53:42 maho Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -2480,3 +2480,7 @@
 comms/pstngw||2006-10-02|Has expired
 net/openh323-112||2006-10-02|Has expired
 devel/pwlib152||2006-10-02|Has expired
+net/coda5_server||2006-10-05|Has expired: no longer available from mastersite
+net/coda5_client||2006-10-05|Has expired: no longer available from mastersite
+net/coda5_doc||2006-10-05|Has expired: coda5 removed
+math/ufspase|math/suitespase|2006-10-05|portname has been changed

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

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.30 2006/09/28 19:15:53 dinoex Exp $
+# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.31 2006/10/05 17:27:31 dinoex Exp $
 #
 # This file contains some variable definitions that are supposed to
 # make your life easier when dealing with ports related to the GNUstep.
@@ -64,7 +64,7 @@
 #	call install target with GNUstep.sh sourced in the current shell
 #
 # USE_GNUSTEP_MAKE=yes
-#       require GNUstep.sh for build and install
+#	require GNUstep.sh for build and install
 #
 # USE_GNUSTEP_SYSTEM_LIBS=	Renaissance:x11-toolkits/renaissance
 #	depends on a shared lib in System directrory

==== //depot/projects/dtrace/ports/Mk/bsd.linux-rpm.mk#5 (text+ko) ====

@@ -1,32 +1,32 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.10 2006/10/02 14:00:45 vd Exp $
+# $FreeBSD: ports/Mk/bsd.linux-rpm.mk,v 1.11 2006/10/05 17:20:25 bsam Exp $
 #
 
 # Variables:
-#  - LINUX_DIST:	Will be used to set some dist-specific presets.
-#			Valid values: fedora
-#  - LINUX_DIST_VER:	Use depends upon the dist-specific presets.
-#			Valid values for "fedora": all version numbers
-#				e.g. 3 for fedora core 3, 4 for fedora core 4
-#				This is used to set MASTER_SITE_{,SRC_}SUBDIR
-#				if it isn't already set.
-#  - MASTER_SITE_SRC_SUBDIR:	The subdir for the src RPM's.
-#  - DISTFILES:		For simple cases this will be set automatically
-#			based upon the DISTNAME.
-#  - SRC_DISTFILES:	Variable which contains the corresponding src RPM's.
-#			If there's no corresponding src RPM, it has to be
-#			set to the empty value (SRC_DISTFILES=	"").
-#  - AUTOMATIC_PLIST:	Generate a dynamic plist (please have a look at the
-#			porters handbook section which talks about plists.
-#			This feature is reserved for rare cases).
-#  - BRANDELF_DIRS:	A list of directories with executables to brand
-#			as a linux executable. The directories has to not
-#			contain libraries.
-#  - BRANDELF_FILES:	A list of files to brand as a linux executable in
-#			case BRANDELF_DIRS can't be used.
-
+# LINUX_DIST		- Will be used to set some dist-specific presets.
+#					  Valid values: fedora
+# LINUX_DIST_VER	- Use depends upon the dist-specific presets.
+#					  Valid values for "fedora": all version numbers
+#					  e.g. 3 for fedora core 3, 4 for fedora core 4
+#					  This is used to set MASTER_SITE_{,SRC_}SUBDIR
+#					  if it isn't already set.
+# MASTER_SITE_SRC_SUBDIR
+#					- The subdir for the src RPM's.
+# DISTFILES			- For simple cases this will be set automatically
+#					  based upon the DISTNAME.
+# SRC_DISTFILES		- Variable which contains the corresponding src RPM's.
+#					  If there's no corresponding src RPM, it has to be
+#					  set to the empty value (SRC_DISTFILES=	"").
+# AUTOMATIC_PLIST	- Generate a dynamic plist (please have a look at the
+#					  porters handbook section which talks about plists.
+#					  This feature is reserved for rare cases).
+# BRANDELF_DIRS		- A list of directories with executables to brand
+#					  as a linux executable. The directories has to not
+#					  contain libraries.
+# BRANDELF_FILES	- A list of files to brand as a linux executable in
+#					  case BRANDELF_DIRS can't be used.
 
 .if !defined(_POSTMKINCLUDED) && !defined(Linux_RPM_Pre_Include)
 

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

@@ -1,7 +1,7 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.1 2006/09/15 06:57:07 linimon Exp $
+# $FreeBSD: ports/Mk/bsd.lua.mk,v 1.2 2006/10/05 18:17:25 alepulver Exp $
 #
 # bsd.lua.mk - Support for Lua based ports.
 #
@@ -76,13 +76,14 @@
 # LUA_INCDIR	- The directory where Lua and tolua header files are installed.
 # LUA_LIBDIR	- The directory where Lua and tolua libraries are installed.
 # LUA_MODLIBDIR	- The directory where Lua modules (.lua) are installed.
-# LUA_MODSHAREDIR	- The directory where Lua module libraries (.so) are
-#					  installed.
-# LUA_PKGNAMEPREFIX	- The package name prefix used by Lua modules.
+# LUA_MODSHAREDIR
+#				- The directory where Lua module libraries (.so) are installed.
+# LUA_PKGNAMEPREFIX
+#				- The package name prefix used by Lua modules.
 #
 # Examples:
 # - A port that needs Lua 4.0 and tolua (also 4.0) libraries (lua for building
-#   and running and tolua for building).
+#	and running and tolua for building).
 #	USE_LUA=	4.0
 #	LUA_COMPS=	lua tolua
 # - A port that needs Ruby bindings for Lua 5.0 for building and running.
@@ -94,7 +95,7 @@
 # - A port that needs Lua version 5.0 or higher for building and running.
 #	USE_LUA=	5.0+
 # - A port that needs Lua of any version other than 5.1 for building and
-#   running.
+#	running.
 #	USE_LUA_NOT=5.1
 #
 

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

@@ -20,7 +20,7 @@
 #
 # Note: all entries should terminate with a slash.
 #
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.398 2006/09/12 14:23:12 kuriyama Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.399 2006/10/05 17:26:10 dinoex Exp $
 #
 
 # Where to put distfiles that don't have any other master site
@@ -455,6 +455,7 @@
 .if !defined(IGNORE_MASTER_SITE_GNUSTEP)
 MASTER_SITE_GNUSTEP+= \
 	http://downloads.planetmirror.com/pub/gnustep/gnustep/%SUBDIR%/ \
+	http://public.planetmirror.com/pub/gnustep/gnustep/%SUBDIR%/ \
 	ftp://ftp.gnustep.org/pub/gnustep/%SUBDIR%/ \
 	ftp://ftp.easynet.nl/mirror/GNUstep/pub/gnustep/%SUBDIR%/
 .endif

==== //depot/projects/dtrace/ports/Tools/scripts/rmport#4 (text+ko) ====

@@ -30,7 +30,7 @@
 # Originally written by Vasil Dimov <vd@FreeBSD.org>
 # Others:
 #
-# $FreeBSD: ports/Tools/scripts/rmport,v 1.8 2006/09/14 09:13:39 vd Exp $
+# $FreeBSD: ports/Tools/scripts/rmport,v 1.9 2006/10/05 10:40:29 vd Exp $
 #
 # MAINTAINER=	vd@FreeBSD.org
 #
@@ -144,7 +144,7 @@
 		fi
 
 		# check if some Makefiles mention the port to be deleted
-		portdir_grep="^[^#].*/`basename ${catport}`([[:space:]]+|$)"
+		portdir_grep="^[^#].*/`basename ${catport}`([[:space:]]|/|$)"
 		r="`find ${PORTSDIR} -mindepth 2 -maxdepth 3 \( -name "Makefile*" -or -path "*Mk/*.mk" \) \
 			|xargs grep -EH "${portdir_grep}" \
 			|grep -vE "^(${rmcatports})" || :`"

==== //depot/projects/dtrace/src/gnu/lib/libstdc++/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.57 2006/09/30 12:52:15 ru Exp $
+# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.58 2006/10/05 20:55:37 obrien Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 SRCDIR=	${.CURDIR}/../../../contrib/libstdc++
@@ -12,6 +12,9 @@
 SHLIB_MAJOR=	5
 
 CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
+.if ${MACHINE_ARCH} == "arm"
+CFLAGS+=	-D_GLIBCXX_SJLJ_EXCEPTIONS=1
+.endif
 CFLAGS+=	-I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include
 CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
 CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections \

==== //depot/projects/dtrace/src/lib/libthread_db/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthread_db/Makefile,v 1.7 2006/03/29 14:08:45 deischen Exp $
+# $FreeBSD: src/lib/libthread_db/Makefile,v 1.8 2006/10/05 06:26:31 davidxu Exp $
 
 .PATH:	${.CURDIR}/arch/${MACHINE_ARCH}
 
@@ -6,7 +6,6 @@
 SHLIB_MAJOR= 2
 SRCS=	thread_db.c
 SRCS+=	libpthread_db.c libpthread_md.c
-SRCS+=	libc_r_db.c libc_r_md.c
 SRCS+=	libthr_db.c
 INCS=	thread_db.h
 WARNS?= 1

==== //depot/projects/dtrace/src/share/doc/papers/Makefile#3 (text+ko) ====

@@ -1,12 +1,12 @@
-# $FreeBSD: src/share/doc/papers/Makefile,v 1.16 2005/08/01 12:14:52 phk Exp $
+# $FreeBSD: src/share/doc/papers/Makefile,v 1.17 2006/10/05 13:42:30 ru Exp $
 
 SUBDIR=	beyond4.3 \
 	bufbio \
 	contents \
 	devfs \
 	diskperf \
+	fsinterface \
 	hwpmc \
-	fsinterface \
 	jail \
 	kernmalloc \
 	kerntune \

==== //depot/projects/dtrace/src/share/man/man1/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD: src/share/man/man1/Makefile,v 1.18 2005/12/05 08:01:10 stefanf Exp $
+# $FreeBSD: src/share/man/man1/Makefile,v 1.19 2006/10/05 12:40:44 ru Exp $
 
 MAN=	builtin.1 intro.1
 
@@ -74,8 +74,8 @@
 	builtin.1 suspend.1 \
 	builtin.1 switch.1 \
 	builtin.1 telltc.1 \
+	builtin.1 then.1 \
 	builtin.1 times.1 \
-	builtin.1 then.1 \
 	builtin.1 trap.1 \
 	builtin.1 type.1 \
 	builtin.1 ulimit.1 \

==== //depot/projects/dtrace/src/share/man/man4/sched_ule.4#4 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/sched_ule.4,v 1.4 2006/09/30 15:14:48 ru Exp $
+.\" $FreeBSD: src/share/man/man4/sched_ule.4,v 1.5 2006/10/05 20:31:58 simon Exp $
 .\"
 .Dd April 7, 2005
 .Os
@@ -87,4 +87,4 @@
 performance with several known workloads, and reports of instability.
 Deployment of
 .Nm
-in production environments should be done cautiously.
+in production environments is not recommended at this time.

==== //depot/projects/dtrace/src/share/man/man5/Makefile#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD: src/share/man/man5/Makefile,v 1.73 2006/08/31 09:51:33 cperciva Exp $
+#	$FreeBSD: src/share/man/man5/Makefile,v 1.74 2006/10/05 12:40:44 ru Exp $
 
 .include <bsd.own.mk>
 
@@ -17,9 +17,9 @@
 	dir.5 \
 	disktab.5 \
 	elf.5 \
-	ext2fs.5 \
 	ethers.5 \
 	eui64.5 \
+	ext2fs.5 \
 	fbtab.5 \
 	fdescfs.5 \
 	forward.5 \

==== //depot/projects/dtrace/src/share/man/man9/Makefile#9 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.280 2006/10/04 20:16:23 jmg Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.282 2006/10/05 12:40:44 ru Exp $
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
@@ -402,10 +402,6 @@
 	bus_space.9 bus_space_read_2.9 \
 	bus_space.9 bus_space_read_4.9 \
 	bus_space.9 bus_space_read_8.9 \
-	bus_space.9 bus_space_read_stream_1.9 \
-	bus_space.9 bus_space_read_stream_2.9 \
-	bus_space.9 bus_space_read_stream_4.9 \
-	bus_space.9 bus_space_read_stream_8.9 \
 	bus_space.9 bus_space_read_multi_1.9 \
 	bus_space.9 bus_space_read_multi_2.9 \
 	bus_space.9 bus_space_read_multi_4.9 \
@@ -422,6 +418,10 @@
 	bus_space.9 bus_space_read_region_stream_2.9 \
 	bus_space.9 bus_space_read_region_stream_4.9 \
 	bus_space.9 bus_space_read_region_stream_8.9 \
+	bus_space.9 bus_space_read_stream_1.9 \
+	bus_space.9 bus_space_read_stream_2.9 \
+	bus_space.9 bus_space_read_stream_4.9 \
+	bus_space.9 bus_space_read_stream_8.9 \
 	bus_space.9 bus_space_set_multi_1.9 \
 	bus_space.9 bus_space_set_multi_2.9 \
 	bus_space.9 bus_space_set_multi_4.9 \
@@ -444,10 +444,6 @@
 	bus_space.9 bus_space_write_2.9 \
 	bus_space.9 bus_space_write_4.9 \
 	bus_space.9 bus_space_write_8.9 \
-	bus_space.9 bus_space_write_stream_1.9 \
-	bus_space.9 bus_space_write_stream_2.9 \
-	bus_space.9 bus_space_write_stream_4.9 \
-	bus_space.9 bus_space_write_stream_8.9 \
 	bus_space.9 bus_space_write_multi_1.9 \
 	bus_space.9 bus_space_write_multi_2.9 \
 	bus_space.9 bus_space_write_multi_4.9 \
@@ -463,7 +459,11 @@
 	bus_space.9 bus_space_write_region_stream_1.9 \
 	bus_space.9 bus_space_write_region_stream_2.9 \
 	bus_space.9 bus_space_write_region_stream_4.9 \
-	bus_space.9 bus_space_write_region_stream_8.9
+	bus_space.9 bus_space_write_region_stream_8.9 \
+	bus_space.9 bus_space_write_stream_1.9 \
+	bus_space.9 bus_space_write_stream_2.9 \
+	bus_space.9 bus_space_write_stream_4.9 \
+	bus_space.9 bus_space_write_stream_8.9
 MLINKS+=byteorder.9 be16dec.9 \
 	byteorder.9 be16enc.9 \
 	byteorder.9 be16toh.9 \
@@ -555,8 +555,8 @@
 	disk.9 disk_destroy.9
 MLINKS+=domain.9 DOMAIN_SET.9 \
 	domain.9 net_add_domain.9 \
+	domain.9 pfctlinput.9 \
 	domain.9 pfctlinput2.9 \
-	domain.9 pfctlinput.9 \
 	domain.9 pffindproto.9 \
 	domain.9 pffindtype.9
 MLINKS+=DRIVER_MODULE.9 MULTI_DRIVER_MODULE.9
@@ -592,8 +592,8 @@
 MLINKS+=hash.9 hash32.9 \
 	hash.9 hash32_buf.9 \
 	hash.9 hash32_str.9 \
+	hash.9 hash32_stre.9 \
 	hash.9 hash32_strn.9 \
-	hash.9 hash32_stre.9 \
 	hash.9 hash32_strne.9
 MLINKS+=hashinit.9 hashdestroy.9 \
 	hashinit.9 phashinit.9
@@ -666,18 +666,18 @@
 	kobj.9 kobj_create.9 \
 	kobj.9 kobj_delete.9 \
 	kobj.9 kobj_init.9
-MLINKS+=kqueue.9 kqfd_register.9 \
-	kqueue.9 knlist_add.9 \
+MLINKS+=kqueue.9 knlist_add.9 \
+	kqueue.9 knlist_clear.9 \
+	kqueue.9 knlist_delete.9 \
+	kqueue.9 knlist_destroy.9 \
+	kqueue.9 knlist_empty.9 \
+	kqueue.9 knlist_init.9 \
 	kqueue.9 knlist_remove.9 \
 	kqueue.9 knlist_remove_inevent.9 \
-	kqueue.9 knlist_empty.9 \
-	kqueue.9 knlist_init.9 \
-	kqueue.9 knlist_destroy.9 \
-	kqueue.9 knlist_clear.9 \
-	kqueue.9 knlist_delete.9 \
 	kqueue.9 knote_fdclose.9 \
 	kqueue.9 KNOTE_LOCKED.9 \
 	kqueue.9 KNOTE_UNLOCKED.9 \
+	kqueue.9 kqfd_register.9 \
 	kqueue.9 kqueue_add_filteropts.9 \
 	kqueue.9 kqueue_del_filteropts.9
 MLINKS+=kthread.9 kproc_shutdown.9 \
@@ -1091,8 +1091,7 @@
 	uidinfo.9 uihashinit.9 \
 	uidinfo.9 uihold.9
 MLINKS+=uio.9 uiomove.9
-MLINKS+=usbdi.9 usb_find_desc.9 \
-	usbdi.9 usbd_abort_default_pipe.9 \
+MLINKS+=usbdi.9 usbd_abort_default_pipe.9 \
 	usbdi.9 usbd_abort_pipe.9 \
 	usbdi.9 usbd_alloc_buffer.9 \
 	usbdi.9 usbd_alloc_xfer.9 \
@@ -1139,7 +1138,8 @@
 	usbdi.9 usbd_setup_isoc_xfer.9 \
 	usbdi.9 usbd_setup_xfer.9 \
 	usbdi.9 usbd_sync_transfer.9 \
-	usbdi.9 usbd_transfer.9
+	usbdi.9 usbd_transfer.9 \
+	usbdi.9 usb_find_desc.9
 MLINKS+=vcount.9 count_dev.9
 MLINKS+=vfsconf.9 vfs_modevent.9 \
 	vfsconf.9 vfs_register.9 \


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