PERFORCE change 140099 for review
John Birrell
jb at FreeBSD.org
Wed Apr 16 06:32:16 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=140099
Change 140099 by jb at jb_freebsd1 on 2008/04/16 06:32:06
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-users/article.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#2 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#66 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#7 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/share/sgml/glossary/freebsd-glossary.sgml#2 integrate
.. //depot/projects/dtrace/ports/CHANGES#12 integrate
.. //depot/projects/dtrace/ports/MOVED#76 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.commands.mk#3 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.port.mk#16 integrate
.. //depot/projects/dtrace/ports/UPDATING#66 integrate
.. //depot/projects/dtrace/src/Makefile.inc1#44 integrate
.. //depot/projects/dtrace/src/etc/rc.d/dhclient#10 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#15 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/Symbol.map#6 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/tcgetsid.3#1 branch
.. //depot/projects/dtrace/src/lib/libc/gen/termios.c#5 integrate
.. //depot/projects/dtrace/src/lib/libfetch/common.c#8 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#16 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_rwlock.c#6 integrate
.. //depot/projects/dtrace/src/sbin/dhclient/bpf.c#5 integrate
.. //depot/projects/dtrace/src/sbin/restore/dirs.c#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/nfe.4#6 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/clock.h#9 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/pcb_ext.h#4 delete
.. //depot/projects/dtrace/src/sys/amd64/isa/clock.c#11 integrate
.. //depot/projects/dtrace/src/sys/conf/files.amd64#28 integrate
.. //depot/projects/dtrace/src/sys/conf/files.i386#33 integrate
.. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_asus.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_ibm.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-all.h#12 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#26 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-dma.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-lowlevel.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/fb/vga.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/k8temp/k8temp.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/nvram/nvram.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/re/if_re.c#20 integrate
.. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_vnops.c#9 integrate
.. //depot/projects/dtrace/src/sys/i386/include/clock.h#9 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/clock.c#14 integrate
.. //depot/projects/dtrace/src/sys/ia64/conf/DEFAULTS#13 integrate
.. //depot/projects/dtrace/src/sys/ia64/conf/GENERIC#15 integrate
.. //depot/projects/dtrace/src/sys/ia64/conf/SKI#4 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/clock.c#8 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/interrupt.c#11 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#19 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/nexus.c#8 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/sapic.c#5 integrate
.. //depot/projects/dtrace/src/sys/isa/atrtc.c#2 integrate
.. //depot/projects/dtrace/src/sys/isa/rtc.h#4 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#33 integrate
.. //depot/projects/dtrace/src/sys/kern/tty.c#13 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#24 integrate
.. //depot/projects/dtrace/src/sys/mips/conf/SENTRY5#2 integrate
.. //depot/projects/dtrace/src/sys/mips/include/ns16550.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/include/pcb_ext.h#2 delete
.. //depot/projects/dtrace/src/sys/mips/mips/cache.c#2 integrate
.. //depot/projects/dtrace/src/sys/mips/mips/copystr.S#2 integrate
.. //depot/projects/dtrace/src/sys/mips/mips/machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/mips/mips/mainbus.c#2 integrate
.. //depot/projects/dtrace/src/sys/net/bpf.c#20 integrate
.. //depot/projects/dtrace/src/sys/net/if_tap.c#11 integrate
.. //depot/projects/dtrace/src/sys/netgraph/bluetooth/include/ng_bluetooth.h#4 integrate
.. //depot/projects/dtrace/src/sys/netgraph/netgraph.h#10 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#21 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_constants.h#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_indata.c#11 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_input.c#11 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#13 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#13 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_var.h#6 integrate
.. //depot/projects/dtrace/src/sys/netinet6/sctp6_usrreq.c#8 integrate
.. //depot/projects/dtrace/src/sys/sys/protosw.h#8 integrate
.. //depot/projects/dtrace/src/sys/sys/socket.h#11 integrate
.. //depot/projects/dtrace/src/sys/sys/ttycom.h#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/ndiscvt/inf.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/ndiscvt/ndiscvt.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/ndiscvt/ndisgen.sh#4 integrate
.. //depot/projects/dtrace/www/en/cgi/man.cgi#9 integrate
.. //depot/projects/dtrace/www/en/docs/books.sgml#15 integrate
.. //depot/projects/dtrace/www/en/donations/donors.sgml#29 integrate
.. //depot/projects/dtrace/www/en/donations/wantlist.sgml#31 integrate
.. //depot/projects/dtrace/www/en/internet.sgml#6 integrate
.. //depot/projects/dtrace/www/en/projects/projects.sgml#13 integrate
.. //depot/projects/dtrace/www/share/sgml/commercial.hardware.xml#7 integrate
.. //depot/projects/dtrace/www/share/sgml/commercial.isp.xml#11 integrate
.. //depot/projects/dtrace/www/share/sgml/usergroups.xml#19 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-users/article.sgml#2 (text+ko) ====
@@ -19,7 +19,7 @@
<holder>The FreeBSD Documentation Project</holder>
</copyright>
- <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/linux-users/article.sgml,v 1.1 2008/03/11 11:35:43 gabor Exp $</releaseinfo>
+ <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/linux-users/article.sgml,v 1.2 2008/04/14 13:08:18 jkois Exp $</releaseinfo>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -122,7 +122,7 @@
version of the application. You can use the
<envar>PACKAGESITE</envar> variable to override this default
behavior. For example, set <envar>PACKAGESITE</envar> to
- <ulink url="ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/Latest/"</ulink>
+ <ulink url="ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/Latest/"></ulink>
to download the most recent packages built for the
6.X series.</para>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#2 (text+ko) ====
@@ -17,7 +17,7 @@
<!-- 11 April 2008 -->
</author>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/remote-install/article.sgml,v 1.1 2008/04/11 00:18:27 danger Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/remote-install/article.sgml,v 1.2 2008/04/15 18:33:21 remko Exp $</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -336,7 +336,7 @@
&prompt.root; <userinput>bsdlabel -wB /dev/ad0s1</userinput> <co id="bsdlabel-writing">
&prompt.root; <userinput>bsdlabel -wB /dev/ad1s1</userinput>
&prompt.root; <userinput>bsdlabel -e /dev/ad0s1</userinput> <co id="bsdlabel-editing">
-&prompt.root; <userinput>bsdlabel /dev/ad0s1 > /tmp/bsdlabel.txt && bsdlabel -R /tmp/bsdlabel.txt</userinput> <co id="bsdlabel-restore">
+&prompt.root; <userinput>bsdlabel /dev/ad0s1 > /tmp/bsdlabel.txt && bsdlabel -R /dev/ad1s1 /tmp/bsdlabel.txt</userinput> <co id="bsdlabel-restore">
&prompt.root; <userinput>gmirror label root /dev/ad[01]s1a</userinput> <co id="gmirror1">
&prompt.root; <userinput>gmirror label var /dev/ad[01]s1d</userinput>
&prompt.root; <userinput>gmirror label usr /dev/ad[01]s1e</userinput>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#66 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.921 2008/04/11 09:28:22 dfr Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.922 2008/04/14 16:53:37 pav Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -5384,9 +5384,9 @@
<title>Getting fake <envar>DISPLAY</envar> using Xvfb</title>
<para>Some applications require a working X11 display for compilation to
- succeed. This pose a problem for the FreeBSD package building
- cluster, which operates headless. When the following canonical hack
- is used, the package cluster will start the virtual framebuffer
+ succeed. This pose a problem for machines which operates headless.
+ When the following variable is used, the build infrastructure will
+ start the virtual framebuffer
X server. The working <envar>DISPLAY</envar> is then passed
to the build.</para>
==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml#4 (text+ko) ====
@@ -1,9 +1,9 @@
<!--
The FreeBSD Mongolian Documentation Project
- Original revision 1.180
+ Original revision 1.181
- $FreeBSD: doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml,v 1.8 2008/01/28 23:02:20 keramida Exp $
+ $FreeBSD: doc/mn_MN.UTF-8/books/handbook/kernelconfig/chapter.sgml,v 1.9 2008/04/15 01:57:28 ganbold Exp $
-->
<chapter id="kernelconfig">
@@ -1348,7 +1348,7 @@
<sect1 id="kernelconfig-trouble">
<title>Ð¥ÑÑÑв ÑÐ¼Ð°Ñ Ð½Ñг Ñм бÑÑÑÑÑвал</title>
- <para>Ó¨Ó©ÑÑлөн ÑоÑ
иÑÑÑлÑан Ñөмийг бүÑÑÑж байÑ
үед 5 ÑÓ©Ñлийн аÑÑÑдал гаÑÑ
+ <para>Ó¨Ó©ÑÑлөн ÑоÑ
иÑÑÑлÑан Ñөмийг бүÑÑÑж байÑ
үед 4 ÑÓ©Ñлийн аÑÑÑдал гаÑÑ
болзоÑгүй байдаг. ТÑдгÑÑÑ Ð½Ñ:</para>
<variablelist>
==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#7 (text+ko) ====
@@ -1,9 +1,9 @@
<!--
The FreeBSD Mongolian Documentation Project
- Original revision 1.111
+ Original revision 1.112
- $FreeBSD: doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml,v 1.10 2008/04/02 01:02:04 ganbold Exp $
+ $FreeBSD: doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml,v 1.11 2008/04/15 01:57:28 ganbold Exp $
-->
<chapter id="printing">
@@ -2327,9 +2327,9 @@
<secondary>ÑүүлÑÒ¯Ò¯Ñ</secondary>
<tertiary>apsfilter</tertiary>
</indexterm>
- <para>FreeBSD-н поÑÑÑн ÑÑглÑÑлга доÑÐ¾Ñ <command>apsfilter</command>
+ <para>FreeBSD-н поÑÑÑн ÑÑглÑÑлга доÑÐ¾Ñ <command>apsfilter</command> (<filename role="package">print/apsfilter</filename>)
нÑÑÑÑй авÑÐ¾Ð¼Ð°Ñ Ñ
ÑвиÑÐ³Ð°Ð»Ñ Ñ
ийдÑг ÑекÑÑ ÑүүлÑÒ¯Ò¯Ñ Ð±Ð¸Ð¹. ÐÐ½Ñ ÑүүлÑÒ¯Ò¯Ñ Ð½Ñ
- Ñнгийн ÑекÑÑ, &postscript;, мөн DVI ÑайлÑÑдÑг ÑанÑж ÑÑдÑнд
+ Ñнгийн ÑекÑÑ, &postscript;, DVI болон баÑаг бүÑ
л ÑÓ©Ñлийн ÑайлÑÑдÑг ÑанÑж ÑÑдÑнд
ÑоÑ
иÑÑон ÑүүлÑÒ¯Ò¯Ñийг Ð½Ñ Ð°Ð²ÑомаÑÐ°Ð°Ñ Ð°Ð¶Ð¸Ð»Ð»ÑÑлдаг. </para>
</sect4>
</sect3>
@@ -2553,8 +2553,8 @@
<para>Толгой Ñ
ÑÑдаÑнÑÑдÑг идÑвÑ
жүүлÑнÑÑÑ <application>LPD</application>
Ð½Ñ Ñ
ÑÑÑглÑгÑ, Ñ
оÑÑ, болон ажлÑг ÑаниÑлаÑ
Ñом Ò¯ÑгүүдÑÑй <emphasis>ÑÑÑ
- Ñолгой</emphasis> бүÑ
ий Ñ
ÑÑдÑÑг Ò¯Ò¯ÑгÑÑ
болно. Ðнд жиÑÑÑ Ð±Ð°Ð¹Ð½Ð° (kelly нÑ
- outline гÑÑÑн нÑÑÑÑй ажлÑг <hostid>rose</hostid>-Ñ Ñ
ÑвлÑжÑÑ):</para>
+ Ñолгой</emphasis> бүÑ
ий Ñ
ÑÑдÑÑг Ò¯Ò¯ÑгÑÑ
болно. Ðнд жиÑÑÑ Ð±Ð°Ð¹Ð½Ð° (<username>kelly</username> нÑ
+ <quote>outline</quote> гÑÑÑн нÑÑÑÑй ажлÑг <hostid>rose</hostid>-Ñ Ñ
ÑвлÑжÑÑ):</para>
<programlisting> k ll ll
k l l
@@ -3069,11 +3069,11 @@
<para>Ðдоо <hostid>orchid</hostid> дÑÑÑÑ
Ñ
ÑÑÑглÑгÑид
<literal>rattan</literal> болон <literal>bamboo</literal> Ñ
ÑвлÑгÑдийг
Ñ
ÑÑÑглÑж Ñадна. ÐиÑÑÑ Ð½Ñ <hostid>orchid</hostid> дÑÑÑÑ
Ñ
ÑÑÑглÑгÑ
- даÑааÑ
ÑÑÑаал өгвөл
+ даÑааÑ
ÑÑÑаал өгвөл:</para>
<screen>&prompt.user; <userinput>lpr -P bamboo -d sushi-review.dvi</userinput></screen>
- <hostid>orchid</hostid> дÑÑÑÑ
<application>LPD</application>
+ <para><hostid>orchid</hostid> дÑÑÑÑ
<application>LPD</application>
ÑиÑÑем Ñ
ÑвлÑÑ
ажлÑÑдÑг <filename>/var/spool/lpd/bamboo</filename>
гÑÑÑн ÑÒ¯Ñ Ñ
Ð°Ð´Ð³Ð°Ð»Ð°Ð³Ñ ÑÑÑ Ñ
ÑÑлна. ÐÐ½Ñ Ñ
ÑвлÑгдÑÑ
ажил нÑ
DVI Ñайл байÑнÑг Ñа анзааÑна ÑÑ. <hostid>rose</hostid> маÑинд
==== //depot/projects/dtrace/doc/mn_MN.UTF-8/share/sgml/glossary/freebsd-glossary.sgml#2 (text+ko) ====
@@ -1,9 +1,9 @@
<!--
The FreeBSD Mongolian Documentation Project
- Original revision 1.28
+ Original revision 1.29
- $FreeBSD: doc/mn_MN.UTF-8/share/sgml/glossary/freebsd-glossary.sgml,v 1.2 2007/05/15 09:53:52 keramida Exp $
+ $FreeBSD: doc/mn_MN.UTF-8/share/sgml/glossary/freebsd-glossary.sgml,v 1.3 2008/04/15 01:59:42 ganbold Exp $
FreeBSD Glossary Terms
Please keep this file sorted alphabetically/ASCIIly by glossterm.
@@ -1623,7 +1623,7 @@
ÑÑглÑÑлга.
<ulink url="http://www.rfc-editor.org/">www.rfc-editor.org</ulink>-г
Ò¯Ð·Ð½Ñ Ò¯Ò¯.
- <para>
+ </para>
<para>Ð¥Ñн нÑг Ð½Ñ Ñанал болгоÑон Ó©Ó©ÑÑлөлÑÑÑй бөгөөд ÑÑгÑÑд Ñанал Ñ
үлÑÑн аваÑ
Ñг
Ñ
Ò¯ÑÑÑ
үед Ð±Ð°Ñ Ñ
ÑÑÑглÑгддÑг еÑөнÑ
ий ÑÑ
агдаÑ
ÑÑн Ñм.</para>
==== //depot/projects/dtrace/ports/CHANGES#12 (text+ko) ====
@@ -10,6 +10,18 @@
All ports committers are allowed to commit to this file.
+20080414:
+AUTHOR: pav at FreeBSD.org
+
+ * @rmtry is now supported in pkg-plist.
+
+ * USE_DISPLAY made more powerful, see comments in bsd.port.mk for details.
+
+ * ${PW} is now defined.
+
+ * LIB_DEPENDS can now be used with libraries with + sign in their name
+ without the need for escaping.
+
20080312:
AUTHOR: pav at FreeBSD.org
@@ -1425,4 +1437,4 @@
Contact Erwin Lansing if you have any questions about your use of
this document.
-$FreeBSD: ports/CHANGES,v 1.80 2008/03/11 23:51:24 pav Exp $
+$FreeBSD: ports/CHANGES,v 1.81 2008/04/14 16:51:40 pav Exp $
==== //depot/projects/dtrace/ports/MOVED#76 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1572 2008/04/09 18:40:21 ahze Exp $
+# $FreeBSD: ports/MOVED,v 1.1573 2008/04/14 09:54:46 sat Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -3449,3 +3449,4 @@
archivers/deepforest||2008-04-09|Has expired: development stalled for years, outdated, unmaintained
graphics/libimg-tkstep80||2008-04-09|Has expired: tkstep80 scheduled for expiration
x11-toolkits/tkstep80||2008-04-09|Has expired: development stalled for years, outdated, unmaintained
+devel/p5-Tie-Watch|x11-toolkits/p5-Tk|2008-04-14|bundled with p5-Tk
==== //depot/projects/dtrace/ports/Mk/bsd.commands.mk#3 (text+ko) ====
@@ -5,7 +5,7 @@
#
# Created by: Gabor Kovesdan <gabor at FreeBSD.org>
#
-# $FreeBSD: ports/Mk/bsd.commands.mk,v 1.2 2008/03/11 23:31:29 pav Exp $
+# $FreeBSD: ports/Mk/bsd.commands.mk,v 1.3 2008/04/14 16:46:41 pav Exp $
#
# DO NOT COMMIT CHANGES TO THIS FILE BY YOURSELF, EVEN IF YOU DID NOT GET
# A RESPONSE FROM THE MAINTAINER(S) WITHIN A REASONABLE TIMEFRAME! ALL
@@ -42,6 +42,7 @@
FILE?= /usr/bin/file
FIND?= /usr/bin/find
FMT?= /usr/bin/fmt
+GMAKE?= gmake
GREP?= /usr/bin/grep
GUNZIP_CMD?= /usr/bin/gunzip -f
GZCAT?= /usr/bin/gzcat
@@ -67,6 +68,7 @@
PASTE?= /usr/bin/paste
PAX?= /bin/pax
PRINTF?= /usr/bin/printf
+PW?= /usr/sbin/pw
REALPATH?= /bin/realpath
RM?= /bin/rm
RMDIR?= /bin/rmdir
@@ -87,8 +89,22 @@
UNZIP_CMD?= ${LOCALBASE}/bin/unzip
WHICH?= /usr/bin/which
XARGS?= /usr/bin/xargs
+XMKMF?= ${LOCALBASE}/bin/xmkmf -a
YACC?= /usr/bin/yacc
+.if exists(/sbin/md5)
+MD5?= /sbin/md5
+.else
+MD5?= md5
+.endif
+.if exists(/sbin/sha256)
+SHA256?= /sbin/sha256
+.elif exists(${LOCALBASE}/sbin/sha256)
+SHA256?= ${LOCALBASE}/sbin/sha256
+.else
+SHA256?= NO
+.endif
+
# ECHO is defined in /usr/share/mk/sys.mk, which can either be "echo",
# or "true" if the make flag -s is given. Use ECHO_CMD where you mean
# the echo command.
==== //depot/projects/dtrace/ports/Mk/bsd.port.mk#16 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.591 2008/03/11 23:45:04 pav Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.592 2008/04/14 16:46:41 pav Exp $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -373,6 +373,11 @@
# USE_X_PREFIX - If set, this port installs in ${X11BASE}. Implies USE_XLIB.
# USE_XLIB - If set, this port uses the X libraries. In the USE_LINUX
# case the linux X libraries are referenced.
+# USE_DISPLAY - If set, this ports requires a (virtual) X11 environment
+# setup. If the environment variable DISPLAY Is not set,
+# then an extra build dependency on Xvfb is added. Further,
+# if PACKAGE_BUILDING is not set, then CONFIGURE_ENV and
+# MAKE_ENV are extended with a DISPLAY variable.
#
# USE_FREETYPE - If set, this port uses the freetype print libraries.
# USE_GL - A list of Mesa or GL related dependencies needed by the port.
@@ -1563,8 +1568,9 @@
DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \
WWWDIR=${WWWDIR} ETCDIR=${ETCDIR}
-PLIST_REINPLACE+= dirrmtry stopdaemon
+PLIST_REINPLACE+= dirrmtry stopdaemon rmtry
PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true!
+PLIST_REINPLACE_RMTRY=s!^@rmtry \(.*\)!@unexec rm -f %D/\1 2>/dev/null || true!
PLIST_REINPLACE_STOPDAEMON=s!^@stopdaemon \(.*\)!@unexec %D/etc/rc.d/\1${RC_SUBR_SUFFIX} forcestop 2>/dev/null || true!
.if defined(WITHOUT_CPU_CFLAGS)
@@ -1849,11 +1855,15 @@
BUILD_DEPENDS+= imake:${X_IMAKE_PORT}
.endif
-.if defined(PACKAGE_BUILDING) && defined(USE_DISPLAY)
+.if defined(USE_DISPLAY) && !defined(DISPLAY)
BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \
${X11BASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT}
+.if !defined(PACKAGE_BUILDING)
+CONFIGURE_ENV+= DISPLAY="localhost:1001"
+MAKE_ENV+= DISPLAY="localhost:1001"
.endif
+.endif
.if defined(USE_XPM)
USE_XORG+= xpm
@@ -2072,22 +2082,6 @@
# Use this as the first operand to always build dependency.
NONEXISTENT?= /nonexistent
-# Miscellaneous overridable commands:
-GMAKE?= gmake
-XMKMF?= xmkmf -a
-.if exists(/sbin/md5)
-MD5?= /sbin/md5
-.else
-MD5?= md5
-.endif
-.if exists(/sbin/sha256)
-SHA256?= /sbin/sha256
-.elif exists(${LOCALBASE}/sbin/sha256)
-SHA256?= ${LOCALBASE}/sbin/sha256
-.else
-SHA256?= NO
-.endif
-
CHECKSUM_ALGORITHMS?= md5 sha256
MD5_FILE?= ${MASTERDIR}/distinfo
@@ -2201,10 +2195,13 @@
.else
MTREE_FILE= ${PORTSDIR}/Templates/BSD.local.dist
.endif
+MTREE_FILE_DEFAULT=yes
.endif
MTREE_CMD?= /usr/sbin/mtree
MTREE_ARGS?= -U ${MTREE_FOLLOWS_SYMLINKS} -f ${MTREE_FILE} -d -e -p
+READLINK_CMD?= /usr/bin/readlink
+
# Determine whether or not we can use rootly owner/group functions.
.if !defined(UID)
UID!= ${ID} -u
@@ -2760,8 +2757,7 @@
palm parallel pear perl5 plan9 polish portuguese ports-mgmt \
print python ruby rubygems russian \
scheme science security shells spanish sysutils \
- tcl tcl80 tcl82 tcl83 tcl84 textproc \
- tk tk80 tk82 tk83 tk84 tkstep80 \
+ tcl textproc tk \
ukrainian vietnamese windowmaker www \
x11 x11-clocks x11-drivers x11-fm x11-fonts x11-servers x11-themes \
x11-toolkits x11-wm xfce zope
@@ -3814,10 +3810,15 @@
exit 1; \
else \
${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \
- if [ ${PREFIX} = ${LOCALBASE} ]; then \
+ if [ ${PREFIX} = ${LOCALBASE} -a "${MTREE_FILE_DEFAULT}" = "yes" ]; then \
cd ${PREFIX}/share/nls; \
- ${LN} -shf C POSIX; \
- ${LN} -shf C en_US.US-ASCII; \
+ for link in POSIX en_US.US-ASCII; \
+ do \
+ if [ x"`${READLINK_CMD} $${link}`" != x"C" ]; \
+ then \
+ ${LN} -shf C $${link}; \
+ fi; \
+ done; \
fi; \
fi; \
else \
@@ -3900,6 +3901,7 @@
.endif
.endif
+.if !defined(DISABLE_SECURITY_CHECK)
.if !target(security-check)
.if !defined(OLD_SECURITY_CHECK)
@@ -4034,6 +4036,10 @@
fi
.endif # !defined(OLD_SECURITY_CHECK)
.endif
+.else # i.e. defined(DISABLE_SECURITY_CHECK)
+security-check:
+ @${ECHO_MSG} " WARNING: Security check has been disabled."
+.endif # !defined(DISABLE_SECURITY_CHECK)
################################################################
# Skeleton targets start here
@@ -4872,11 +4878,7 @@
.if defined(LIB_DEPENDS) && !defined(NO_DEPENDS)
@for i in ${LIB_DEPENDS}; do \
lib=$${i%%:*}; \
- case $$lib in \
- *.*.*) pattern="`${ECHO_CMD} $$lib | ${SED} -e 's/\./\\\\./g'`" ;;\
- *.*) pattern="$${lib%%.*}\.$${lib#*.}" ;;\
- *) pattern="$$lib" ;;\
- esac; \
+ pattern="`${ECHO_CMD} $$lib | ${SED} -E -e 's/\./\\\\./g' -e 's/(\\\\)?\+/\\\\+/g'`"\
dir=$${i#*:}; \
target=$${i##*:}; \
if ${TEST} $$dir = $$target; then \
==== //depot/projects/dtrace/ports/UPDATING#66 (text+ko) ====
@@ -131,7 +131,7 @@
AUTHOR: beech at FreeBSD.org
For FreeBSD versions 7.0 and above:
- It is now recommended (and will be required in future versions) to
+ It is recommended (and is now required for skype-devel) to
update to linux_base-fc6. Please do the following:
1. Make sure there are no running linux applications.
@@ -6322,4 +6322,4 @@
2) Update all p5-* modules.
portupgrade -f p5-\*
-$FreeBSD: ports/UPDATING,v 1.616 2008/04/08 20:55:52 beech Exp $
+$FreeBSD: ports/UPDATING,v 1.617 2008/04/15 05:46:21 beech Exp $
==== //depot/projects/dtrace/src/Makefile.inc1#44 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.603 2008/04/15 05:14:42 ru Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -990,10 +990,12 @@
#
# cross-tools: Build cross-building tools
#
-.if ${TARGET_ARCH} != ${MACHINE_ARCH}
+.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
_btxld= usr.sbin/btxld
.endif
+.endif
+.if ${TARGET_ARCH} != ${MACHINE_ARCH}
.if ${MK_RESCUE} != "no" || defined(RELEASEDIR)
_crunchide= usr.sbin/crunch/crunchide
.endif
==== //depot/projects/dtrace/src/etc/rc.d/dhclient#10 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/dhclient,v 1.31 2008/02/01 23:43:58 brooks Exp $
+# $FreeBSD: src/etc/rc.d/dhclient,v 1.32 2008/04/15 23:03:35 brooks Exp $
#
# PROVIDE: dhclient
@@ -26,6 +26,10 @@
if [ -n "$pids" ]; then
exit 0
fi
+ elif [ -e /var/run/dhclient.pid ]; then
+ if [ -n "`pgrep -F /var/run/dhclient.pid`" ]; then
+ exit 0
+ fi
fi
fi
==== //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#15 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.133 2008/03/29 16:19:35 das Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.134 2008/04/15 08:33:32 davidxu Exp $
# machine-independent gen sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -63,7 +63,7 @@
setjmp.3 setmode.3 setproctitle.3 \
siginterrupt.3 signal.3 sigsetops.3 sleep.3 \
statvfs.3 stringlist.3 \
- strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \
+ strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 tcgetsid.3 \
tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 time.3 times.3 timezone.3 \
ttyname.3 tzset.3 ualarm.3 ucontext.3 ulimit.3 uname.3 \
unvis.3 usleep.3 utime.3 valloc.3 vis.3 wordexp.3
==== //depot/projects/dtrace/src/lib/libc/gen/Symbol.map#6 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.8 2008/01/26 17:09:40 yar Exp $
+ * $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.9 2008/04/15 08:33:32 davidxu Exp $
*/
FBSD_1.0 {
@@ -337,6 +337,7 @@
fts_get_clientptr;
fts_get_stream;
fts_set_clientptr;
+ tcgetsid;
};
FBSDprivate_1.0 {
==== //depot/projects/dtrace/src/lib/libc/gen/termios.c#5 (text+ko) ====
@@ -31,7 +31,7 @@
static char sccsid[] = "@(#)termios.c 8.2 (Berkeley) 2/21/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/termios.c,v 1.14 2007/01/09 00:27:55 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/termios.c,v 1.15 2008/04/15 08:33:32 davidxu Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -99,6 +99,17 @@
return ((pid_t)s);
}
+pid_t
+tcgetsid(int fd)
+{
+ int s;
+
+ if (_ioctl(fd, TIOCGSID, &s) < 0)
+ return ((pid_t)-1);
+
+ return ((pid_t)s);
+}
+
speed_t
cfgetospeed(t)
const struct termios *t;
==== //depot/projects/dtrace/src/lib/libfetch/common.c#8 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.55 2008/03/20 09:55:27 des Exp $");
+__FBSDID("$FreeBSD: src/lib/libfetch/common.c,v 1.56 2008/04/15 23:29:51 cperciva Exp $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -655,7 +655,7 @@
{
static char word[1024];
- if (fscanf(f, " %1024s ", word) != 1)
+ if (fscanf(f, " %1023s ", word) != 1)
return (NULL);
return (word);
}
==== //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#16 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.49 2008/03/05 07:01:20 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.50 2008/04/16 03:19:11 davidxu Exp $
*/
#include "namespace.h"
@@ -160,7 +160,6 @@
STATIC_LIB_REQUIRE(_spinlock_debug);
STATIC_LIB_REQUIRE(_spinunlock);
STATIC_LIB_REQUIRE(_thread_init_hack);
-STATIC_LIB_REQUIRE(_vfork);
/*
* These are needed when linking statically. All references within
==== //depot/projects/dtrace/src/lib/libthr/thread/thr_rwlock.c#6 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.14 2008/04/02 04:32:31 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.15 2008/04/14 08:08:40 davidxu Exp $
*/
#include <errno.h>
@@ -32,7 +32,6 @@
#include "namespace.h"
#include <pthread.h>
-#include <pthread_np.h>
#include "un-namespace.h"
#include "thr_private.h"
==== //depot/projects/dtrace/src/sbin/dhclient/bpf.c#5 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/dhclient/bpf.c,v 1.7 2006/09/26 01:02:02 brooks Exp $");
+__FBSDID("$FreeBSD: src/sbin/dhclient/bpf.c,v 1.8 2008/04/15 22:48:56 brooks Exp $");
#include "dhcpd.h"
#include <sys/ioctl.h>
@@ -245,6 +245,21 @@
unsigned char buf[256];
struct iovec iov[2];
int result, bufp = 0;
+ int sock;
+
+ if (to->sin_addr.s_addr != INADDR_BROADCAST) {
+ note("SENDING DIRECT");
+ /* We know who the server is, send the packet via
+ normal socket interface */
+
+ if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) >= 0) {
+ result = sendto (sock, (char *)raw, len, 0,
+ (struct sockaddr *)to, sizeof *to);
+ close(sock);
+ if (result > 0)
+ return result;
+ }
+ }
/* Assemble the headers... */
assemble_hw_header(interface, buf, &bufp, hto);
==== //depot/projects/dtrace/src/sbin/restore/dirs.c#7 (text+ko) ====
@@ -37,7 +37,7 @@
static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/restore/dirs.c,v 1.33 2008/04/11 21:48:13 mckusick Exp $";
+ "$FreeBSD: src/sbin/restore/dirs.c,v 1.34 2008/04/14 20:15:53 mckusick Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -120,6 +120,7 @@
static void rst_seekdir(RST_DIR *, long, long);
static long rst_telldir(RST_DIR *);
static struct direct *searchdir(ino_t, char *);
+static void fail_dirtmp(char *);
/*
* Extract directory contents, building up a directory structure
@@ -147,7 +148,7 @@
if (fd == -1 || (df = fdopen(fd, "w")) == NULL) {
if (fd != -1)
close(fd);
- warn("%s - cannot create directory temporary\nfopen", dirfile);
+ warn("%s: cannot create directory database", dirfile);
done(1);
}
if (genmode != 0) {
@@ -160,7 +161,7 @@
if (fd == -1 || (mf = fdopen(fd, "w")) == NULL) {
if (fd != -1)
close(fd);
- warn("%s - cannot create modefile\nfopen", modefile);
+ warn("%s: cannot create modefile", modefile);
done(1);
}
}
@@ -172,25 +173,24 @@
for (;;) {
curfile.name = "<directory file - name unknown>";
curfile.action = USING;
- if (curfile.mode == 0 || (curfile.mode & IFMT) != IFDIR) {
- (void) fclose(df);
- dirp = opendirfile(dirfile);
- if (dirp == NULL)
- fprintf(stderr, "opendirfile: %s\n",
- strerror(errno));
- if (mf != NULL)
- (void) fclose(mf);
- i = dirlookup(dot);
- if (i == 0)
- panic("Root directory is not on tape\n");
- return;
- }
+ if (curfile.mode == 0 || (curfile.mode & IFMT) != IFDIR)
+ break;
itp = allocinotab(&curfile, seekpt);
getfile(putdir, putdirattrs, xtrnull);
putent(&nulldir);
flushent();
itp->t_size = seekpt - itp->t_seekpt;
}
+ if (fclose(df) != 0)
+ fail_dirtmp(dirfile);
+ dirp = opendirfile(dirfile);
+ if (dirp == NULL)
+ fprintf(stderr, "opendirfile: %s\n", strerror(errno));
+ if (mf != NULL && fclose(mf) != 0)
+ fail_dirtmp(modefile);
+ i = dirlookup(dot);
+ if (i == 0)
+ panic("Root directory is not on tape\n");
}
/*
@@ -390,7 +390,8 @@
if (dirloc + dp->d_reclen > DIRBLKSIZ) {
((struct direct *)(dirbuf + prev))->d_reclen =
DIRBLKSIZ - prev;
- (void) fwrite(dirbuf, 1, DIRBLKSIZ, df);
+ if (fwrite(dirbuf, DIRBLKSIZ, 1, df) != 1)
+ fail_dirtmp(dirfile);
dirloc = 0;
}
memmove(dirbuf + dirloc, dp, (long)dp->d_reclen);
@@ -405,7 +406,8 @@
flushent(void)
{
((struct direct *)(dirbuf + prev))->d_reclen = DIRBLKSIZ - prev;
- (void) fwrite(dirbuf, (int)dirloc, 1, df);
+ if (fwrite(dirbuf, (int)dirloc, 1, df) != 1)
+ fail_dirtmp(dirfile);
seekpt = ftell(df);
dirloc = 0;
}
@@ -417,8 +419,8 @@
putdirattrs(char *buf, long size)
{
- if (mf != NULL)
- (void) fwrite(buf, 1, size, mf);
+ if (mf != NULL && fwrite(buf, size, 1, mf) != 1)
+ fail_dirtmp(modefile);
}
/*
@@ -582,6 +584,11 @@
myuid = getuid();
for (;;) {
(void) fread((char *)&node, 1, sizeof(struct modeinfo), mf);
+ if (ferror(mf)) {
+ warn("%s: cannot read modefile.", modefile);
+ fprintf(stderr, "Mode, owner, and times not set.\n");
+ break;
+ }
if (feof(mf))
break;
if (node.extsize > 0) {
@@ -596,8 +603,22 @@
}
if (bufsize >= node.extsize) {
(void) fread(buf, 1, node.extsize, mf);
+ if (ferror(mf)) {
+ warn("%s: cannot read modefile.",
+ modefile);
+ fprintf(stderr, "Not all external ");
+ fprintf(stderr, "attributes set.\n");
+ break;
+ }
} else {
(void) fseek(mf, node.extsize, SEEK_CUR);
+ if (ferror(mf)) {
+ warn("%s: cannot seek in modefile.",
+ modefile);
+ fprintf(stderr, "Not all directory ");
+ fprintf(stderr, "attributes set.\n");
+ break;
+ }
}
}
ep = lookupino(node.ino);
@@ -639,8 +660,6 @@
}
if (bufsize > 0)
free(buf);
- if (ferror(mf))
- panic("error setting directory modes\n");
(void) fclose(mf);
}
@@ -734,7 +753,8 @@
node.flags = ctxp->file_flags;
node.uid = ctxp->uid;
node.gid = ctxp->gid;
- (void) fwrite((char *)&node, 1, sizeof(struct modeinfo), mf);
+ if (fwrite((char *)&node, sizeof(struct modeinfo), 1, mf) != 1)
+ fail_dirtmp(modefile);
return (itp);
}
@@ -760,9 +780,33 @@
{
closemt();
- if (modefile[0] != '#')
+ if (modefile[0] != '#') {
+ (void) truncate(modefile, 0);
(void) unlink(modefile);
- if (dirfile[0] != '#')
+ }
+ if (dirfile[0] != '#') {
+ (void) truncate(dirfile, 0);
(void) unlink(dirfile);
+ }
exit(exitcode);
}
+
+/*
+ * Print out information about the failure to save directory,
+ * extended attribute, and mode information.
+ */
+static void
+fail_dirtmp(char *filename)
+{
+ const char *tmpdir;
+
+ warn("%s: cannot write directory database", filename);
+ if (errno == ENOSPC) {
+ if ((tmpdir = getenv("TMPDIR")) == NULL || tmpdir[0] == '\0')
+ tmpdir = _PATH_TMP;
+ fprintf(stderr, "Try making space in %s, %s\n%s\n", tmpdir,
+ "or set environment variable TMPDIR",
+ "to an alternate location with more disk space.");
+ }
+ done(1);
+}
==== //depot/projects/dtrace/src/share/man/man4/nfe.4#6 (text+ko) ====
@@ -14,9 +14,9 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD: src/share/man/man4/nfe.4,v 1.9 2007/11/27 06:54:13 remko Exp $
+.\" $FreeBSD: src/share/man/man4/nfe.4,v 1.10 2008/04/16 00:17:24 yongari Exp $
.\"
-.Dd Nov 27, 2007
+.Dd April 16, 2008
.Dt NFE 4
.Os
.Sh NAME
@@ -43,7 +43,7 @@
driver supports PCI Ethernet adapters based on the NVIDIA
nForce Media and Communications Processors (MCP), such as
the nForce, nForce 2, nForce 3, CK804, MCP04, MCP51, MCP55,
-MCP61, MCP65 and MCP67 Ethernet controller chips.
+MCP61, MCP65, MCP67 and MCP73 Ethernet controller chips.
.Pp
Supported features include (hardware support provided):
.Pp
@@ -116,6 +116,8 @@
.It
NVIDIA nForce MCP67 Networking Adapter
.It
+NVIDIA nForce MCP73 Networking Adapter
+.It
NVIDIA nForce2 MCP2 Networking Adapter
.It
NVIDIA nForce2 400 MCP4 Networking Adapter
==== //depot/projects/dtrace/src/sys/amd64/include/clock.h#9 (text+ko) ====
@@ -3,7 +3,7 @@
* Garrett Wollman, September 1994.
* This file is in the public domain.
*
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.58 2008/03/26 20:09:18 phk Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.59 2008/04/14 07:59:59 phk Exp $
*/
#ifndef _MACHINE_CLOCK_H_
@@ -27,8 +27,6 @@
* Driver to clock driver interface.
*/
-int rtcin(int reg);
-void writertc(int reg, unsigned char val);
void init_TSC(void);
void init_TSC_tc(void);
==== //depot/projects/dtrace/src/sys/amd64/isa/clock.c#11 (text+ko) ====
@@ -33,19 +33,12 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.241 2008/03/26 22:11:59 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.242 2008/04/14 07:59:59 phk Exp $");
/*
* Routines to handle clock hardware.
*/
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list