PERFORCE change 138933 for review
John Birrell
jb at FreeBSD.org
Sat Mar 29 15:37:05 PDT 2008
http://perforce.freebsd.org/chv.cgi?CH=138933
Change 138933 by jb at jb_freebsd1 on 2008/03/29 22:37:03
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#11 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#14 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/disks/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/geom/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/jails/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/ports/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#30 integrate
.. //depot/projects/dtrace/ports/UPDATING#62 integrate
.. //depot/projects/dtrace/src/Makefile.inc1#43 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#41 integrate
.. //depot/projects/dtrace/src/cddl/lib/Makefile#12 integrate
.. //depot/projects/dtrace/src/cddl/usr.bin/Makefile#7 integrate
.. //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#6 integrate
.. //depot/projects/dtrace/src/contrib/pf/pfctl/pfctl_altq.c#6 integrate
.. //depot/projects/dtrace/src/contrib/pf/pfctl/pfctl_qstats.c#4 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kld.c#3 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/main.c#6 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#14 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/modf.3#5 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#8 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/cpuset.2#1 branch
.. //depot/projects/dtrace/src/lib/libc/sys/cpuset_getaffinity.2#1 branch
.. //depot/projects/dtrace/src/lib/libthr/Makefile#17 integrate
.. //depot/projects/dtrace/src/lib/msun/src/e_log.c#7 integrate
.. //depot/projects/dtrace/src/lib/msun/src/e_logf.c#6 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_expm1.c#6 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_expm1f.c#6 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_fmaf.c#4 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_log1p.c#5 integrate
.. //depot/projects/dtrace/src/lib/msun/src/s_log1pf.c#6 integrate
.. //depot/projects/dtrace/src/rescue/rescue/Makefile#11 integrate
.. //depot/projects/dtrace/src/sbin/ggate/Makefile#9 integrate
.. //depot/projects/dtrace/src/share/man/man3/Makefile#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/arcmsr.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/ng_pptpgre.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man5/src.conf.5#14 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.own.mk#21 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_if.c#7 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_ioctl.c#11 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pfvar.h#5 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part.h#6 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#33 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_object.c#21 integrate
.. //depot/projects/dtrace/src/tools/build/mk/OptionalObsoleteFiles.inc#14 integrate
.. //depot/projects/dtrace/src/tools/build/options/WITHOUT_LIBKSE#2 delete
.. //depot/projects/dtrace/src/usr.bin/Makefile#16 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#24 integrate
.. //depot/projects/dtrace/src/usr.sbin/amd/amd/Makefile#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/clear_locks/Makefile#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/Makefile#9 integrate
.. //depot/projects/dtrace/www/en/gnome/docs/faq2.sgml#18 integrate
.. //depot/projects/dtrace/www/en/projects/ideas/ideas.xml#16 integrate
.. //depot/projects/dtrace/www/hu/about.sgml#3 integrate
.. //depot/projects/dtrace/www/hu/administration.sgml#4 integrate
.. //depot/projects/dtrace/www/hu/docproj/sgml.sgml#2 integrate
.. //depot/projects/dtrace/www/hu/docs/books.sgml#4 integrate
.. //depot/projects/dtrace/www/hu/docs/webresources.sgml#2 integrate
.. //depot/projects/dtrace/www/hu/features.sgml#4 integrate
.. //depot/projects/dtrace/www/hu/index.xsl#5 integrate
.. //depot/projects/dtrace/www/hu/platforms/i386.sgml#3 integrate
.. //depot/projects/dtrace/www/hu/search/search.sgml#3 integrate
.. //depot/projects/dtrace/www/hu/search/web.atoz#3 integrate
.. //depot/projects/dtrace/www/hu/share/sgml/navibar.l10n.ent#4 integrate
.. //depot/projects/dtrace/www/hu/where.sgml#5 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#11 (text+ko) ====
@@ -1,6 +1,6 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.40 2008/01/22 17:39:13 trhodes Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.41 2008/03/29 07:53:42 remko Exp $
-->
@@ -510,7 +510,7 @@
<filename class="directory">/dev</filename>, which will be named
based on their file system type. For example,
<acronym>UFS</acronym>2 file system labels will be created in
- the <filename class="directory">/dev/ufs2</filename>
+ the <filename class="directory">/dev/ufs</filename>
directory.</para>
<para>A generic label will go away with the next reboot. These
@@ -537,10 +537,10 @@
</warning>
<para>A label should now exist in
- <filename class="directory">/dev/ufs2</filename> which may be
+ <filename class="directory">/dev/ufs</filename> which may be
added to <filename>/etc/fstab</filename>:</para>
- <programlisting>/dev/ufs2/home /home ufs rw 2 2</programlisting>
+ <programlisting>/dev/ufs/home /home ufs rw 2 2</programlisting>
<note>
<para>The file system must not be mounted while attempting
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#14 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.278 2008/03/25 18:50:19 miwi Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.279 2008/03/29 04:00:09 ganbold Exp $
-->
<chapter id="ports">
@@ -1371,7 +1371,7 @@
<screen>&prompt.root; <userinput>portmaster <replaceable>shells/bash</replaceable></userinput></screen>
- <para>Please see &man.portmaster.8; from more information.</para>
+ <para>Please see &man.portmaster.8; for more information.</para>
</sect3>
</sect2>
==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/disks/chapter.sgml#4 (text+ko) ====
@@ -1,9 +1,9 @@
<!--
The FreeBSD Mongolian Documentation Project
- Original revision 1.281
+ Original revision 1.282
- $FreeBSD: doc/mn_MN.UTF-8/books/handbook/disks/chapter.sgml,v 1.9 2008/01/24 03:23:02 keramida Exp $
+ $FreeBSD: doc/mn_MN.UTF-8/books/handbook/disks/chapter.sgml,v 1.10 2008/03/29 03:57:17 ganbold Exp $
-->
<chapter id="disks">
@@ -331,7 +331,7 @@
<screen>&prompt.root; <userinput>dd if=/dev/zero of=/dev/da1 bs=1k count=1</userinput>
&prompt.root; <userinput>bsdlabel -Bw da1 auto</userinput>
&prompt.root; <userinput>bsdlabel -e da1</userinput> # create the `e' partition
-&prompt.root; <userinput>newfs -d0 /dev/da1e</userinput>
+&prompt.root; <userinput>newfs /dev/da1e</userinput>
&prompt.root; <userinput>mkdir -p /1</userinput>
&prompt.root; <userinput>vi /etc/fstab</userinput> # add an entry for /dev/da1e
&prompt.root; <userinput>mount /1</userinput></screen>
@@ -1765,7 +1765,7 @@
ÑÑ
лÑÑ
ÑÑÑÑÑ Ó©Ð¼Ð½Ó© <quote>бÑлдÑгдÑÑн</quote> байÑ
ÑÑÑой. ÐиÑÑÑн дÑÑÑ Ð´Ð¸Ñкний
бүÑ
зай ÑÑандаÑÑ UFS2 ÑайлÑн ÑиÑÑемÑÑй аÑиглагдана:</para>
- <screen>&prompt.root; <userinput>dd if=/dev/zero of=<replaceable>/dev/acd0</replaceable> count=2</userinput>
+ <screen>&prompt.root; <userinput>dd if=/dev/zero of=<replaceable>/dev/acd0</replaceable> bs=2k count=1</userinput>
&prompt.root; <userinput>bsdlabel -Bw <replaceable>acd0</replaceable></userinput>
&prompt.root; <userinput>newfs <replaceable>/dev/acd0</replaceable></userinput></screen>
==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/geom/chapter.sgml#5 (text+ko) ====
@@ -1,9 +1,9 @@
<!--
The FreeBSD Mongolian Documentation Project
- Original revision 1.40
+ Original revision 1.41
- $FreeBSD: doc/mn_MN.UTF-8/books/handbook/geom/chapter.sgml,v 1.11 2008/01/24 03:23:02 keramida Exp $
+ $FreeBSD: doc/mn_MN.UTF-8/books/handbook/geom/chapter.sgml,v 1.12 2008/03/29 12:11:57 ganbold Exp $
-->
<chapter id="GEOM">
@@ -498,7 +498,7 @@
үлддÑг Ñвдал Ñм. ÐдгÑÑÑ Ñ
аÑг/ÑоÑгонÑÑдад ÑÑдгÑÑÑийн ÑайлÑн ÑиÑÑемийн ÑÓ©Ñөл
дÑÑÑ ÑÑÑÑилÑан нÑÑ Ð±Ò¯Ñ
ий ÑÑÑгай Ñан <filename class="directory">/dev</filename>
Ñан доÑÐ¾Ñ Ó©Ð³Ó©Ð³Ð´Ð´Ó©Ð³. ÐиÑÑÑ Ð½Ñ <acronym>UFS</acronym>2 ÑайлÑн ÑиÑÑемийн
- Ñ
аÑг/ÑоÑгонÑÑд <filename class="directory">/dev/ufs2</filename> Ñанд
+ Ñ
аÑг/ÑоÑгонÑÑд <filename class="directory">/dev/ufs</filename> Ñанд
Ò¯Ò¯ÑгÑгддÑг.</para>
<para>ÐÑөнÑ
ий Ñ
аÑг/ÑоÑго Ð½Ñ Ð´Ð°Ñаагийн Ñдаа аÑаалаÑ
ад аÑилдаг. ÐдгÑÑÑ Ñ
аÑг/ÑоÑгонÑÑд
@@ -522,11 +522,11 @@
Ñвдал Ñм.</para>
</warning>
- <para>ХаÑг/ÑоÑго одоо <filename class="directory">/dev/ufs2</filename> Ñанд
+ <para>ХаÑг/ÑоÑго одоо <filename class="directory">/dev/ufs</filename> Ñанд
Ò¯Ò¯ÑÑÑн байÑ
ÑÑÑой бөгөөд Ñүүнийг <filename>/etc/fstab</filename> Ñайлд нÑмж
болоÑ
Ñм:</para>
- <programlisting>/dev/ufs2/home /home ufs rw 2 2</programlisting>
+ <programlisting>/dev/ufs/home /home ufs rw 2 2</programlisting>
<note>
<para><command>tunefs</command>-г ажиллÑÑлаÑ
даа ÑайлÑн ÑиÑÑемийг
==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/jails/chapter.sgml#3 (text+ko) ====
@@ -1,9 +1,9 @@
<!--
The FreeBSD Mongolian Documentation Project
- Original revision 1.14
+ Original revision 1.15
- $FreeBSD: doc/mn_MN.UTF-8/books/handbook/jails/chapter.sgml,v 1.9 2007/10/21 17:59:29 keramida Exp $
+ $FreeBSD: doc/mn_MN.UTF-8/books/handbook/jails/chapter.sgml,v 1.10 2008/03/29 03:57:17 ganbold Exp $
-->
<chapter id="jails">
<chapterinfo>
@@ -244,7 +244,7 @@
&prompt.root; <userinput>cd etc/</userinput> <footnote><para>ÐÐ½Ñ Ð°Ð»Ñ
ам нÑ
&os; 6.0 болон ÑүүнÑÑÑ Ñ
ойÑÑ
Ñ
ÑвиилбаÑÑÑдад ÑааÑдлагагүй.</para></footnote>
&prompt.root; <userinput>make distribution DESTDIR=$D</userinput> <co id="jaildistrib">
-&prompt.root; <userinput>mount_devfs devfs $D/dev</userinput> <co id="jaildevfs"></screen>
+&prompt.root; <userinput>mount -t devfs devfs $D/dev</userinput> <co id="jaildevfs"></screen>
<calloutlist>
<callout arearefs="jailpath">
==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/ports/chapter.sgml#5 (text+ko) ====
@@ -1,9 +1,9 @@
<!--
The FreeBSD Mongolian Documentation Project
- Original revision 1.274
+ Original revision 1.278
- $FreeBSD: doc/mn_MN.UTF-8/books/handbook/ports/chapter.sgml,v 1.11 2008/03/20 14:39:16 keramida Exp $
+ $FreeBSD: doc/mn_MN.UTF-8/books/handbook/ports/chapter.sgml,v 1.12 2008/03/29 03:57:17 ganbold Exp $
-->
<chapter id="ports">
@@ -535,47 +535,29 @@
<procedure>
<title>CVSup аÑга</title>
- <para>ÐÐ½Ñ Ð°Ñга Ð½Ñ <application>CVSup</application>-г аÑиглан
+ <para>ÐÐ½Ñ Ð°Ñга Ð½Ñ <application>CVSup</application> пÑоÑоколÑг аÑиглан
поÑÑÑн ÑÑглÑÑлгаа ÑÑÑлгаж мөн байнга ÑинÑÑилж болоÑ
Ñ
амгийн ÑÒ¯ÑгÑн аÑга Ñм.
Ð¥ÑÑÑв Ñа <application>CVSup</application>-н ÑÐ°Ð»Ð°Ð°Ñ Ð´ÑлгÑÑÑнгүй мÑдÑÑ
ийг
Ñ
Ò¯ÑÑж байвал <link linkend="cvsup">CVSup-г Ñ
ÑÑÑглÑÑ
нÑ</link> Ñ
ÑÑгÑÑÑ Ñ
аÑааÑай.</para>
- <note>
- <para><application>csup</application> гÑдÑг пÑогÑам нÑ
- <application>CVSup</application> пÑогÑамÑг C пÑогÑам дÑÑÑ
- даÑ
ин биÑÑÑн Ñ
ÑÐ²Ð¸Ð»Ð±Ð°Ñ Ð½Ñ Ð±Ó©Ð³Ó©Ó©Ð´ &os;-н 6.2 Ñм ÑÑ ÑÑвÑл
- ÑүүнÑÑÑ Ð´ÑÑÑÑ
и Ñ
ÑвилбаÑÑ Ð±Ð¾Ð»Ð¾Ð¼Ð¶Ñой бÑй.
- <application>csup</application> Ð½Ñ Ò¯Ð½Ð´ÑÑн ÑÑÑлгаÑÑай Ñ
амÑ
- ÑÑÑлгагддаг болоÑ
Ð¾Ð¾Ñ #1 дүгÑÑÑ Ð°Ð»Ñ
мÑг алгаÑаад
- <command>cvsup</command>-н оÑонд
- <command>csup</command> гÑж биÑиж Ñ
ÑÑÑглÑÑ
Ñ
ÑÑÑгÑÑй.
- Ð¥ÑÑÑÐ½Ñ Ñ
ÑвилбаÑÑÑдад
- <application>csup</application>-г
- <filename role="package">net/csup</filename> Ñан доÑÑооÑ
- поÑÑ/Ð±Ð°Ð³Ñ Ñ
ÑлбÑÑÑÑÑ ÑÑÑлгаж болно.</para>
- </note>
+ <note>
+ <para>&os; ÑиÑÑемд оÑÑон <application>CVSup</application> пÑоÑоколÑн
+ ÑийдÑл Ð½Ñ <application>csup</application> гÑж нÑÑлÑгддÑг.
+ ÐÐ½Ñ Ð½Ñ &os; 6.2-Ñ Ð°Ð½Ñ
Ñдаа оÑÑон. Ð¥ÑÑÑин &os; Ñ
ÑвилбаÑÑн Ñ
ÑÑÑглÑгÑид
+ үүнийг <filename role="package">net/csup</filename> поÑÑ/багÑÑн
+ ÑÑÑламжÑÐ°Ð¹Ð³Ð°Ð°Ñ ÑÑÑлгаж болно.</para>
+ </note>
- <para><application>CVSup</application>-г анÑ
Ñдаагаа ажиллÑÑлаÑ
ÑнÑ
аа өмнө
+ <para><application>csup</application>-г анÑ
Ñдаагаа ажиллÑÑлаÑ
ÑнÑ
аа өмнө
<filename role="directory">/usr/ports</filename> Ñанг Ñ
ооÑон байлгаÑ
Ñ
ÑÑÑгÑÑй.
Ð¥ÑÑÑв Ñг Ñан доÑÐ¾Ñ Ó©Ó©Ñ ÑÑ
ÑÑÑÐ²Ð°Ð»Ð¶Ð°Ð°Ñ ÑÑÑлгаÑан поÑÑÑн ÑÑглÑÑлга байвал,
- <application>CVSup</application> Ð½Ñ Ñг ÑайлÑÑдÑг ÑинÑÑилж нөÑ
дөггүй билÑÑ.
+ <application>csup</application> Ð½Ñ Ñг ÑайлÑÑдÑг ÑинÑÑилж нөÑ
дөггүй билÑÑ.
</para>
<step>
- <para><filename
- role="package">net/cvsup-without-gui</filename> багÑÑг ÑÑ
лÑÑд ÑÑÑлгана:</para>
+ <para><command>csup</command> ÑÑÑаалÑг ажиллÑÑлна:</para>
- <screen>&prompt.root; <userinput>pkg_add -r cvsup-without-gui</userinput></screen>
-
- <para><link
- linkend="cvsup-install">CVSup-г ÑÑÑлгаÑ
</link> (<xref
- linkend="cvsup-install">) Ñ
ÑÑгÑÑÑ Ð½ÑмÑÐ»Ñ Ð¼ÑдÑÑллийг Ñ
аÑна ÑÑ.</para>
- </step>
-
- <step>
- <para><command>cvsup</command>-г ажиллÑÑлна:</para>
-
- <screen>&prompt.root; <userinput>cvsup -L 2 -h <replaceable>cvsup.FreeBSD.org</replaceable> /usr/share/examples/cvsup/ports-supfile</userinput></screen>
+<screen>&prompt.root; <userinput>csup -L 2 -h <replaceable>cvsup.FreeBSD.org</replaceable> /usr/share/examples/cvsup/ports-supfile</userinput></screen>
<para>
<replaceable>cvsup.FreeBSD.org</replaceable> гÑдгийг
@@ -614,16 +596,16 @@
</step>
<step>
- <para>Ðдоо <command>cvsup</command>-г ажиллÑÑлаÑ
Ñн ÑÑлд даÑааÑ
алÑ
мÑг Ñ
ийÑ
Ñ
ÑÑÑгÑÑй:</para>
+ <para>Ðдоо <command>csup</command>-г ажиллÑÑлаÑ
Ñн ÑÑлд даÑааÑ
алÑ
мÑг Ñ
ийÑ
Ñ
ÑÑÑгÑÑй:</para>
- <screen>&prompt.root; <userinput>cvsup -L 2 <replaceable>/root/ports-supfile</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>csup -L 2 <replaceable>/root/ports-supfile</replaceable></userinput></screen>
</step>
</procedure>
</note>
</step>
<step>
- <para>ÐаÑаа Ð½Ñ &man.cvsup.1; ÑÑÑаалÑг ажиллÑÑлÑÐ½Ð°Ð°Ñ ÑÑÑ
айн үед Ñ
Ó©Ñвүүлж байгаа
+ <para>ÐаÑаа Ð½Ñ &man.csup.1; ÑÑÑаалÑг ажиллÑÑлÑÐ½Ð°Ð°Ñ ÑÑÑ
айн үед Ñ
Ó©Ñвүүлж байгаа
поÑÑÑÑдÑг ÑÑ Ð¾ÑÑÑлаад бүÑ
поÑÑÑн ÑÑглÑÑлгÑг ÑаÑаж аван Ñүүлд оÑÑон Ó©Ó©ÑÑлөлÑүүдийг мөн ÑинÑÑилдÑг.</para>
</step>
</procedure>
@@ -1216,44 +1198,97 @@
<para>ÐÑлгÑÑÑнгүй мÑдÑÑллийг
&man.portmanager.1;-Ñ Ñ
аÑна ÑÑ.</para>
-<!--
</sect3>
- <sect3 id="bpkg">
- <title>Bpkg аÑиглан багÑÑÑд болон поÑÑÑÑдÑг ÑинÑÑлÑÑ
нÑ</title>
+ <sect3 id="portmaster">
+ <title>Portmaster аÑиглан поÑÑÑг ÑинÑÑлÑÑ
нÑ</title>
<indexterm>
- <primary>bpkg</primary>
+ <primary>portmaster</primary>
</indexterm>
- <para><application>Bpkg</application> Ð½Ñ Ðнди Ðозелагийн биÑÑÑн, Ñ
ÑлбаÑ
- бөгөөд Ñ
Ò¯ÑиÑÑ
Ñг Ñ
ÑÑÑгÑÑл Ñм. ÐÐ½Ñ Ð½Ñ Ð±Ð°Ð³ÑÑÑд/поÑÑÑÑдÑг ÑдиÑдаÑ
ад зоÑиÑлагдÑан
- нÑг ÑнивеÑÑал Ñ
ÑÑÑгÑлийг бий болгоÑ
зоÑÐ¸Ð»Ð³Ð¾Ð¾Ñ Ñ
ийгджÑÑ.
- <application>Bpkg</application> Ð½Ñ Ñ
оÑÑÑÑн багÑÑÑд болон поÑÑÑÑдÑай
- ажиллаж Ñаддаг бөгөөд ингÑÑнÑÑÑ Ñ
оÑÑланг Ð½Ñ Ð°Ñигладаг Ñ
үмүүÑÑ Ð¸Ñ
- аÑигÑай болгодог. ÐÐ½Ñ Ñ
ÑÑÑгÑÑл Ð½Ñ <filename role="package">ports-mgmt/bpkg
- </filename> поÑÑÐ¾Ð¾Ñ ÑÑÑлгагдаж болдог:</para>
+ <para><application>Portmaster</application> Ð½Ñ <quote>үндÑÑн</quote>
+ ÑиÑÑемд байдаг (бÑÑад поÑÑÑÑÐ´Ð°Ð°Ñ Ñ
амааÑдаггүй) Ñ
ÑÑÑгÑлүүдийг аÑиглаÑ
ааÑ
+ Ñ
ийгдÑÑн бөгөөд Ð°Ð»Ñ Ð¿Ð¾ÑÑÑг ÑинÑÑлÑÑ
ÑÑ ÑогÑооÑ
Ñн ÑÑлд
+ <filename class="directory">/var/db/pkg/</filename> Ñан доÑоÑÑ
ийг
+ аÑигладаг. ТÑÑÑÑÑ <filename role="package">ports-mgmt/portmaster</filename>
+ поÑÑ Ñ
ÑлбÑÑÑÑÑ Ð±Ð°Ð¹Ð´Ð°Ð³:</para>
- <screen>&prompt.root; <userinput>cd <filename role="directory">/usr/ports/ports-mgmt/bpkg</filename></userinput>
+ <screen>&prompt.root; <userinput>cd <filename role="directory">/usr/ports/ports-mgmt/portmaster</filename></userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
- <para>СÑÑлгагдÑан бүÑ
поÑÑÑÑдÑг Ð´Ð¾Ð¾Ñ Ð´ÑÑдÑан Ñ
ÑÐ»Ð±Ð°Ñ ÑÑÑаалÑг
- аÑиглан инÑеÑакÑив гоÑимд ÑинÑÑилж болдог:</para>
+ <para><application>Portmaster</application> Ð½Ñ Ð¿Ð¾ÑÑÑÑдÑг дөÑвөн
+ ÑÓ©Ñөлд бүлÑглÑдÑг:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Root бÑÑÑ ÑзгÑÑÑ Ð¿Ð¾ÑÑÑÑд (Ñ
амааÑÑан поÑÑÑÑд байÑ
гүй, бÑÑÐ´Ð°Ð°Ñ Ñ
амааÑдаггүй)</para>
+ </listitem>
+ <listitem>
+ <para>Trunk бÑÑÑ Ð³Ð¾Ð» поÑÑÑÑд (Ñ
амааÑÑан поÑÑÑÑд байÑ
гүй, бÑÑдÑÑд Ñ
амааÑдаг)</para>
+ </listitem>
+ <listitem>
+ <para>Ð¡Ð°Ð»Ð±Ð°Ñ Ð¿Ð¾ÑÑÑÑд (Ñ
амааÑÑан поÑÑÑÑдÑай, бÑÑдÑÑд Ñ
амааÑдаг)</para>
+ </listitem>
+ <listitem>
+ <para>ÐÐ°Ð²Ñ Ð¿Ð¾ÑÑÑÑд (Ñ
амааÑÑан поÑÑÑÑдÑай, бÑÑÐ´Ð°Ð°Ñ Ñ
амааÑдаггүй)</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Та ÑÑÑлгагдÑан бүÑ
поÑÑÑÑдÑг жагÑааж болоÑ
бөгөөд
+ <option>-L</option> ÑоÑ
иÑÑÑлга аÑиглан ÑинÑÑлÑÐ»Ñ Ð±Ð°Ð¹Ð³Ð°Ð°
+ ÑÑÑÑ
ийг Ñ
айж болно:</para>
+
+<screen>&prompt.root; <userinput>portmaster -L</userinput>
+===>>> Root ports (No dependencies, not depended on)
+===>>> ispell-3.2.06_18
+===>>> screen-4.0.3
+ ===>>> New version available: screen-4.0.3_1
+===>>> tcpflow-0.21_1
+===>>> 7 root ports
+...
+===>>> Branch ports (Have dependencies, are depended on)
+===>>> apache-2.2.3
+ ===>>> New version available: apache-2.2.8
+...
+===>>> Leaf ports (Have dependencies, not depended on)
+===>>> automake-1.9.6_2
+===>>> bash-3.1.17
+ ===>>> New version available: bash-3.2.33
+...
+===>>> 32 leaf ports
+
+===>>> 137 total installed ports
+ ===>>> 83 have new versions available
+</screen>
+
+ <para>ÐÒ¯Ñ
ÑÑÑлгагдÑан поÑÑÑÑдÑг ÑÐ½Ñ Ñ
ÑÐ»Ð±Ð°Ñ ÑÑÑаал аÑиглан
+ ÑинÑÑилж болно:</para>
+
+ <screen>&prompt.root; <userinput>portmaster -a</userinput></screen>
- <screen>&prompt.root; <userinput>bpkg -a</userinput></screen>
+ <note><para>ÐнÑ
дагÑÐ°Ð°Ñ <application>Portmaster</application> нÑ
+ байгаа поÑÑÑг ÑÑÑгаÑ
ааÑаа өмнө Ð½Ó©Ó©Ñ Ð±Ð°Ð³Ñ Ò¯Ò¯ÑгÑдÑг. Ð¥ÑÑÑв ÑинÑ
+ Ñ
ÑÐ²Ð¸Ð»Ð±Ð°Ñ ÑÑÑÐ»Ð³Ð°Ð»Ñ Ð°Ð¼Ð¶Ð¸Ð»ÑÑай болÑон бол <application>Portmaster</application>
+ Ð½Ó©Ó©Ñ Ð±Ð°Ð³ÑÑг ÑÑÑгана. <option>-b</option> ÑонголÑÑг аÑиглаж
+ <application>Portmaster</application>-Ñ Ð½Ó©Ó©Ñийг авÑомаÑааÑ
+ ÑÑÑгаÑ
гүй байÑ
Ñг ÑÑÑаана. <option>-i</option> ÑонголÑÑг аÑиглаÑнааÑ
+ поÑÑ Ð±Ò¯Ñийг ÑинÑÑлÑÑ
ÑÑÑ Ó©Ð¼Ð½Ó© аÑÑÑж лавлан
+ <application>Portmaster</application>-ийг инÑеÑакÑив гоÑимд
+ ÑÑ
лүүлнÑ.</para></note>
- <para>СÑÑлгагдÑан бүÑ
поÑÑÑÑдÑг Ð´Ð¾Ð¾Ñ Ð´ÑÑдÑан Ñ
ÑÐ»Ð±Ð°Ñ ÑÑÑаалÑг
- аÑиглан инÑеÑакÑив Ð±Ð¸Ñ Ð³Ð¾Ñимд ÑинÑÑилж болдог:</para>
+ <para>Ð¥ÑÑÑв ÑинÑÑлÑÑ
пÑоÑеÑÑийн ÑвÑад алдаа гаÑвал Ñа бүÑ
поÑÑÑг ÑинÑÑлÑÑ
+ бÑÑÑ Ð´Ð°Ñ
ин бүÑÑÑÑ
ийн ÑÑлд <option>-f</option>-г аÑиглаж болно:</para>
- <screen>&prompt.root; <userinput>bpkg -A</userinput></screen>
+ <screen>&prompt.root; <userinput>portmaster -af</userinput></screen>
- <para>Та Ð±Ð°Ñ Ñ
амгийн Ñүүлд ÑÑÑлгагдÑан багÑÑÑдÑг дÑлгÑÑÑнд үзүүлж болно:</para>
+ <para>Ð¨Ð¸Ð½Ñ Ð¿Ð¾ÑÑ Ð±Ò¯ÑÑÑж ÑÑÑлгаÑ
ааÑаа өмнө бүÑ
Ñ
амааÑалÑай поÑÑÑÑдÑг ÑинÑÑилж
+ <application>Portmaster</application>-ийг ÑиÑÑемд ÑÐ¸Ð½Ñ Ð¿Ð¾ÑÑ ÑÑÑлгаÑ
даа
+ Ñа Ð±Ð°Ñ Ð°Ñиглаж болно:</para>
- <screen>&prompt.user; <userinput>bpkg -t | head</userinput></screen>
+ <screen>&prompt.root; <userinput>portmaster <replaceable>shells/bash</replaceable></userinput></screen>
- <para>ÐÑлгÑÑÑнгүй мÑдÑÑллийг
- <application>Bpkg</application>-ийн гаÑÑн Ð°Ð²Ð»Ð°Ð³Ð°Ð°Ñ Ò¯Ð·Ð½Ñ Ò¯Ò¯.</para>
--->
+ <para>ÐÑлгÑÑÑнгүй мÑдÑÑллийг &man.portmaster.8;-Ñ Ò¯Ð·Ð½Ñ Ò¯Ò¯.</para>
</sect3>
</sect2>
==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml#5 (text+ko) ====
@@ -1,9 +1,9 @@
<!--
The FreeBSD Mongolian Documentation Project
- Original revision 1.107
+ Original revision 1.110
- $FreeBSD: doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml,v 1.8 2008/03/21 23:04:13 ganbold Exp $
+ $FreeBSD: doc/mn_MN.UTF-8/books/handbook/printing/chapter.sgml,v 1.9 2008/03/29 03:57:17 ganbold Exp $
-->
<chapter id="printing">
@@ -1778,8 +1778,10 @@
<para><command>lprps</command> Ð½Ñ FreeBSD-ийн поÑÑÑн ÑÑглÑÑлгад
байдаг (<link linkend="ports">ÐоÑÑÑн ÑÑглÑÑлга</link> бүлгийг Ò¯Ð·Ð½Ñ Ò¯Ò¯).
- ÐÑдÑÑж Ñа Ó©Ó©ÑÓ©Ó© ÑаÑаж аван бүÑÑÑж ÑÑÑлгаж болно. <command>lprps</command>-г
- ÑÑÑлгаÑÐ½Ñ Ð´Ð°Ñаа <command>lprps</command>-ийн Ñ
ÑÑÑг болоÑ
<command>psif</command>
+ ÐÑиглаÑ
ÑааÑÐ½Ñ Ñ
ÑмжÑÑний дагÑÑ <filename role="package">print/lprps-a4</filename>
+ болон <filename role="package">print/lprps-letter</filename> поÑÑÑн Ð°Ð»Ñ Ð½Ñгийг
+ ÑÑÑлгаж Ñа болно. <command>lprps</command>-г ÑÑÑлгаÑÐ½Ñ Ð´Ð°Ñаа
+ <command>lprps</command>-ийн Ñ
ÑÑÑг болоÑ
<command>psif</command>
пÑогÑамд замÑг зааж өгөÑ
Ñ
ÑÑÑгÑÑй. Ð¥ÑÑÑв Ñа <command>lprps</command>-г
поÑÑÑн ÑÑглÑÑÐ»Ð³Ð°Ð°Ñ ÑÑÑлгаÑан бол Ð´Ð¾Ð¾Ñ Ð´ÑÑдÑанÑг <filename>/etc/printcap</filename>
Ñайл даÑ
Ñ ÑÑваа &postscript; Ñ
ÑвлÑгÑийн оÑÑÑлгад аÑиглаÑ
Ñ
ÑÑÑгÑÑй:</para>
@@ -1841,26 +1843,26 @@
<emphasis>үнÑÑÑй</emphasis> ÑÑандаÑÑ Ñм.
Aladdin Enterprises-ийн аÑÐ°Ð°Ñ Ñ
аÑин ÑөлөөÑÑй &postscript;-ÑÑй ÑÓ©ÑÑÑй,
FreeBSD дÑÑÑ Ð°Ð¶Ð¸Ð»Ð»Ð°Ð´Ð°Ð³ <application>Ghostscript</application> гÑгддÑг
- пÑогÑам байдаг. Ghostscript Ð½Ñ Ð¸Ñ
ÑнÑ
&postscript; ÑайлÑÑдÑг ÑнÑиж Ñаддаг бөгөөд
- ÑÑдгÑÑÑийн Ñ
ÑÑдаÑнÑÑдÑг PostScript Ð±Ð¸Ñ Ñ
ÑвлÑгÑдийн олон загваÑÑÑдÑг оÑолÑÑÑлаад
- ÑÓ©Ñөл бүÑийн ÑÓ©Ñ
Ó©Ó©Ñөмжүүд ÑÒ¯Ò¯ амилÑÑлж Ñаддаг. Ghostscript-г ÑÑÑлгаж
+ пÑогÑам байдаг. <application>Ghostscript</application> Ð½Ñ Ð¸Ñ
ÑнÑ
&postscript; ÑайлÑÑдÑг ÑнÑиж Ñаддаг бөгөөд
+ ÑÑдгÑÑÑийн Ñ
ÑÑдаÑнÑÑдÑг &postscript; Ð±Ð¸Ñ Ñ
ÑвлÑгÑдийн олон загваÑÑÑдÑг оÑолÑÑÑлаад
+ ÑÓ©Ñөл бүÑийн ÑÓ©Ñ
Ó©Ó©Ñөмжүүд ÑÒ¯Ò¯ амилÑÑлж Ñаддаг. <application>Ghostscript</application>-г ÑÑÑлгаж
Ó©Ó©Ñийн Ñ
ÑвлÑгÑийн Ñ
ÑвÑд ÑÑÑгай ÑекÑÑийн ÑүүлÑÒ¯Ò¯Ñийг аÑиглан Ñа Ó©Ó©Ñийн &postscript;
Ð±Ð¸Ñ Ñ
ÑвлÑгÑийг жинÑ
ÑÐ½Ñ &postscript; Ñ
ÑвлÑÐ³Ñ ÑигÑÑÑ Ð°Ð¶Ð¸Ð»Ð»ÑÑлаÑ
боломжÑой
байдаг.</para>
- <para>Ghostscript Ð½Ñ FreeBSD-ийн поÑÑÑн ÑÑглÑÑлгад байдаг ÑÑÐ¸Ñ Ñ
ÑÑÑв Ñа үүнийг
- ÑÑÑлгаÑ
Ñг Ñ
Ò¯ÑвÑл ÑÑндÑÑÑ ÑÑÑлгаж болно. Та Ó©Ó©ÑÓ©Ó© үүнийг Ñ
ÑлбаÑÑ
Ð½Ð°Ð°Ñ ÑаÑан авÑ, бүÑÑÑн
- ÑÑÑлгаж Ð±Ð°Ñ Ð±Ð¾Ð»Ð¾Ñ
Ñм.</para>
+ <para><application>Ghostscript</application> Ð½Ñ FreeBSD-ийн поÑÑÑн ÑÑглÑÑлгад байдаг.
+ Ðлон Ñ
ÑÐ²Ð¸Ð»Ð±Ð°Ñ Ð±Ð°Ð¹Ð´Ð°Ð³ бөгөөд Ñ
амгийн иÑ
ÑÑÑ Ð°Ñиглагддаг Ñ
ÑÐ²Ð¸Ð»Ð±Ð°Ñ Ð½Ñ
+ <filename role="package">print/ghostscript-gpl</filename> Ñм.</para>
<para>&postscript; Ñиг Ð´Ò¯Ñ Ò¯Ð·Ò¯Ò¯Ð»ÑÑ
ийн ÑÑлд &postscript; Ñайл Ñ
ÑвлÑж байна ÑÑ
гÑдгийг илÑүүлÑÑ
ÑекÑÑ ÑүүлÑÒ¯Ò¯Ñ Ð±Ð¸Ð´Ñнд байна. Ð¥ÑÑÑв ÑÐ½Ñ Ð½Ñ Ñийм Ð±Ð¸Ñ Ð±Ð¾Ð» ÑүүлÑÒ¯Ò¯Ñ Ð½Ñ
ÑайлÑг Ñ
ÑвлÑÐ³Ñ ÑÑÑÑ ÑÑÑд дамжÑÑлна; үгүй бол ÑÐ½Ñ Ð½Ñ ÑайлÑг Ñ
ÑвлÑгÑийн ойлгодог
- Ñ
ÑлбÑÑ ÑÑÑÑ ÑÑ
лÑÑд Ñ
ÑвиÑгаÑ
Ghostscript-г аÑиглаÑ
болно.</para>
+ Ñ
ÑлбÑÑ ÑÑÑÑ ÑÑ
лÑÑд Ñ
ÑвиÑгаÑ
<application>Ghostscript</application>-г аÑиглаÑ
болно.</para>
<para>Ðнд жиÑÑÑ Ð±Ð°Ð¹Ð½Ð°: даÑааÑ
ÑкÑÐ¸Ð¿Ñ Ð½Ñ Hewlett Packard DeskJet 500
Ñ
ÑвлÑгÑдÑд зоÑиÑлÑан ÑекÑÑ ÑүүлÑÒ¯Ò¯Ñ Ñм. ÐÑÑад Ñ
ÑвлÑгÑдийн Ñ
ÑвÑд
- <option>-sDEVICE</option> нÑмÑÐ»Ñ Ó©Ð³Ó©Ð³Ð´Ð»Ð¸Ð¹Ð³ ÑолÑж <command>gs</command> (Ghostscript)
- ÑÑÑаал ÑÑÑÑ Ó©Ð³Ó©Ñ
Ñ
ÑÑÑгÑÑй. (Ghostscript-ийн ÑÑÑ
айн үеийн ÑÑÑлгаÑÑн дÑмждÑг ÑÓ©Ñ
Ó©Ó©Ñөмжүүдийн
+ <option>-sDEVICE</option> нÑмÑÐ»Ñ Ó©Ð³Ó©Ð³Ð´Ð»Ð¸Ð¹Ð³ ÑолÑж <command>gs</command> (<application>Ghostscript</application>)
+ ÑÑÑаал ÑÑÑÑ Ó©Ð³Ó©Ñ
Ñ
ÑÑÑгÑÑй. (<application>Ghostscript</application>-ийн ÑÑÑ
айн үеийн ÑÑÑлгаÑÑн дÑмждÑг ÑÓ©Ñ
Ó©Ó©Ñөмжүүдийн
жагÑаалÑÑг аваÑ
Ñн ÑÑлд <command>gs -h</command> гÑж биÑиÑ
Ñ
ÑÑÑгÑÑй.</para>
<programlisting>#!/bin/sh
@@ -2067,7 +2069,7 @@
оÑÑÑлгад DVI Ñ
ÑвиÑгаÑ
ÑүүлÑÒ¯Ò¯Ñийг бид нÑмÑÑ
болно. <literal>bamboo</literal>
Ñ
ÑвлÑгÑийн Ñ
ÑвÑд ÑÐ¸Ð½Ñ <literal>df</literal> боломжийг оÑÑÑлÑан
<filename>/etc/printcap</filename> ÑайлÑн жиÑÑÑг Ñнд даÑ
ин
- үзүүлÑв.</para>
+ үзүүлÑв:</para>
<programlisting>#
# /etc/printcap for host rose - added df filter for bamboo
@@ -2111,7 +2113,7 @@
<title>Ð¥ÑвиÑгаÑ
ÑүүлÑÒ¯Ò¯Ñийн заÑим жиÑÑÑнүүд</title>
<para>Ð¥ÑвиÑгаÑ
ÑүүлÑÒ¯Ò¯Ñүүдийг ÑÑÑлгаÑ
ÑогÑмол алÑ
мÑÑд байдаггүй болоÑ
ооÑ
- заÑим жиÑÑÑнүүдийг Ñнд дÑÑдÑÑ. ÐдгÑÑÑийг Ó©Ó©Ñийн ÑүүлÑÒ¯Ò¯Ñийг
+ ÑÐ½Ñ Ñ
ÑÑÑÐ³Ñ Ð·Ð°Ñим нÑг ажилладаг жиÑÑÑнүүдийг Ñнд дÑÑдÑÑ. ÐдгÑÑÑийг Ó©Ó©Ñийн ÑүүлÑÒ¯Ò¯Ñийг
Ñ
ийÑ
дÑÑ Ð·Ð°Ð°Ð²Ð°Ñ Ð±Ð¾Ð»Ð³Ð¾Ð½ аÑиглааÑай. ТоÑ
иÑоÑ
Ð¾Ð¾Ñ Ð±Ð¾Ð» ÑÑÑд аÑиглаÑ
Ñ
ÑÑÑгÑÑй.</para>
==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#30 (text+ko) ====
@@ -20,7 +20,7 @@
lexicographical order by the entity (i.e., the dots used in place of
special characters should not be expanded when comparing).
- $FreeBSD: doc/share/sgml/man-refs.ent,v 1.456 2008/03/28 21:33:18 brueffer Exp $
+ $FreeBSD: doc/share/sgml/man-refs.ent,v 1.457 2008/03/29 15:29:23 bmah Exp $
-->
<!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -191,6 +191,7 @@
<!ENTITY man.fg.1 "<citerefentry/<refentrytitle/fg/<manvolnum/1//">
<!ENTITY man.fgrep.1 "<citerefentry/<refentrytitle/fgrep/<manvolnum/1//">
<!ENTITY man.fi.1 "<citerefentry/<refentrytitle/fi/<manvolnum/1//">
+<!ENTITY man.fifolog.1 "<citerefentry/<refentrytitle/fifolog/<manvolnum/1//">
<!ENTITY man.file.1 "<citerefentry/<refentrytitle/file/<manvolnum/1//">
<!ENTITY man.file2c.1 "<citerefentry/<refentrytitle/file2c/<manvolnum/1//">
<!ENTITY man.filetest.1 "<citerefentry/<refentrytitle/filetest/<manvolnum/1//">
@@ -651,6 +652,7 @@
<!ENTITY man.unsetenv.1 "<citerefentry/<refentrytitle/unsetenv/<manvolnum/1//">
<!ENTITY man.until.1 "<citerefentry/<refentrytitle/until/<manvolnum/1//">
<!ENTITY man.unvis.1 "<citerefentry/<refentrytitle/unvis/<manvolnum/1//">
+<!ENTITY man.unzip.1 "<citerefentry/<refentrytitle/unzip/<manvolnum/1//">
<!ENTITY man.uptime.1 "<citerefentry/<refentrytitle/uptime/<manvolnum/1//">
<!ENTITY man.usbhidaction.1 "<citerefentry/<refentrytitle/usbhidaction/<manvolnum/1//">
<!ENTITY man.usbhidctl.1 "<citerefentry/<refentrytitle/usbhidctl/<manvolnum/1//">
@@ -752,6 +754,7 @@
<!ENTITY man.clock.settime.2 "<citerefentry/<refentrytitle/clock_settime/<manvolnum/2//">
<!ENTITY man.close.2 "<citerefentry/<refentrytitle/close/<manvolnum/2//">
<!ENTITY man.connect.2 "<citerefentry/<refentrytitle/connect/<manvolnum/2//">
+<!ENTITY man.cpuset.2 "<citerefentry/<refentrytitle/cpuset/<manvolnum/2//">
<!ENTITY man.creat.2 "<citerefentry/<refentrytitle/creat/<manvolnum/2//">
<!ENTITY man.dup.2 "<citerefentry/<refentrytitle/dup/<manvolnum/2//">
<!ENTITY man.dup2.2 "<citerefentry/<refentrytitle/dup2/<manvolnum/2//">
@@ -3466,6 +3469,7 @@
<!ENTITY man.mac.test.4 "<citerefentry/<refentrytitle/mac_test/<manvolnum/4//">
<!ENTITY man.machfb.4 "<citerefentry/<refentrytitle/machfb/<manvolnum/4//">
<!ENTITY man.maestro3.4 "<citerefentry/<refentrytitle/maestro3/<manvolnum/4//">
+<!ENTITY man.malo.4 "<citerefentry/<refentrytitle/malo/<manvolnum/4//">
<!ENTITY man.matcd.4 "<citerefentry/<refentrytitle/matcd/<manvolnum/4//">
<!ENTITY man.mcd.4 "<citerefentry/<refentrytitle/mcd/<manvolnum/4//">
<!ENTITY man.md.4 "<citerefentry/<refentrytitle/md/<manvolnum/4//">
==== //depot/projects/dtrace/ports/UPDATING#62 (text+ko) ====
@@ -6,6 +6,20 @@
time you update your ports collection, before attempting any port
upgrades.
+20080329:
+ AFFECTS: users of www/phpadsnew
+ AUTHOR: beech at FreeBSD.org
+
+ Phpadsnew has been replaced with www/openx.
+ To upgrade please do the following:
+
+ 1. Install www/openx
+ 2. Copy the configuration file from phpadsnew to the var directory
+ of www/openx.
+ 3. Copy your banner images from phpadsnew/www/images to openx/www/images
+ 4. Access openx on your browser and follow the instructions for upgrading.
+ 5. When you are satisfied everthing is working properly remove www/phpadsnew
+
20080326:
AFFECTS: users of emulators/linux_base-f8
AUTHOR: bsam at FreeBSD.org
@@ -6253,4 +6267,4 @@
2) Update all p5-* modules.
portupgrade -f p5-\*
-$FreeBSD: ports/UPDATING,v 1.607 2008/03/28 05:38:32 beech Exp $
+$FreeBSD: ports/UPDATING,v 1.608 2008/03/29 19:50:39 beech Exp $
==== //depot/projects/dtrace/src/Makefile.inc1#43 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.601 2008/03/02 11:10:46 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.602 2008/03/29 17:44:38 ru Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1067,18 +1067,14 @@
${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
- lib/libopie lib/libpam ${_default_thread_lib} \
+ lib/libopie lib/libpam ${_lib_libthr} \
lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
${_secure_lib_libssl} lib/libdwarf lib/libproc
-.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no"
-_default_thread_lib= lib/${DEFAULT_THREAD_LIB}
-.elif ${MK_LIBTHR} != "no"
-_default_thread_lib= lib/libthr
-.elif ${MK_LIBKSE} != "no"
-_default_thread_lib= lib/libkse
+.if ${MK_LIBTHR} != "no"
+_lib_libthr= lib/libthr
.endif
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
==== //depot/projects/dtrace/src/ObsoleteFiles.inc#41 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.134 2008/03/26 06:45:28 remko Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.135 2008/03/29 17:44:38 ru Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -30,7 +30,6 @@
# 20071201: Removal of XRPU driver
OLD_FILES+=usr/include/sys/xrpuio.h
# 20071129: Disabled static versions of libkse by default
-.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no"
OLD_FILES+=usr/lib/libkse.a
OLD_FILES+=usr/lib/libkse_p.a
OLD_FILES+=usr/lib/libkse_pic.a
@@ -39,7 +38,6 @@
OLD_FILES+=usr/lib32/libkse_p.a
OLD_FILES+=usr/lib32/libkse_pic.a
.endif
-.endif
# 20071129: Removed a Solaris compatibility header
OLD_FILES+=usr/include/sys/_elf_solaris.h
# 20071125: Renamed to pmc_get_msr()
==== //depot/projects/dtrace/src/cddl/lib/Makefile#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
+# $FreeBSD: src/cddl/lib/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $
.include <bsd.own.mk>
@@ -14,7 +14,7 @@
.if ${MK_ZFS} != "no"
_libzfs= libzfs
-.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
+.if ${MK_LIBTHR} != "no"
_libzpool= libzpool
.endif
.endif
==== //depot/projects/dtrace/src/cddl/usr.bin/Makefile#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $
.include <bsd.own.mk>
@@ -10,7 +10,7 @@
${_ztest}
.if ${MK_ZFS} != "no"
-.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
+.if ${MK_LIBTHR} != "no"
_ztest= ztest
.endif
.endif
==== //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $
.include <bsd.own.mk>
@@ -6,7 +6,7 @@
${_zdb}
.if ${MK_ZFS} != "no"
-.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
+.if ${MK_LIBTHR} != "no"
_zdb= zdb
.endif
.endif
==== //depot/projects/dtrace/src/contrib/pf/pfctl/pfctl_altq.c#6 (text+ko) ====
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.9 2007/07/03 12:30:02 mlaier Exp $");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_altq.c,v 1.10 2008/03/29 00:24:36 mlaier Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -153,6 +153,10 @@
return;
}
+#ifdef __FreeBSD__
+ if (a->local_flags & PFALTQ_FLAG_IF_REMOVED)
+ printf("INACTIVE ");
+#endif
printf("altq on %s ", a->ifname);
switch (a->scheduler) {
@@ -187,6 +191,10 @@
{
unsigned i;
+#ifdef __FreeBSD__
+ if (a->local_flags & PFALTQ_FLAG_IF_REMOVED)
+ printf("INACTIVE ");
+#endif
printf("queue ");
for (i = 0; i < level; ++i)
printf(" ");
@@ -1145,7 +1153,11 @@
sizeof(ifr.ifr_name))
errx(1, "getifmtu: strlcpy");
if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) == -1)
+#ifdef __FreeBSD__
+ ifr.ifr_mtu = 1500;
+#else
err(1, "SIOCGIFMTU");
+#endif
if (shutdown(s, SHUT_RDWR) == -1)
err(1, "shutdown");
if (close(s))
==== //depot/projects/dtrace/src/contrib/pf/pfctl/pfctl_qstats.c#4 (text+ko) ====
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.6 2005/05/03 16:55:20 mlaier Exp $");
+__FBSDID("$FreeBSD: src/contrib/pf/pfctl/pfctl_qstats.c,v 1.7 2008/03/29 00:24:36 mlaier Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
@@ -118,6 +118,10 @@
for (node = root; node != NULL; node = node->next) {
if (iface != NULL && strcmp(node->altq.ifname, iface))
continue;
+#ifdef __FreeBSD__
+ if (node->altq.local_flags & PFALTQ_FLAG_IF_REMOVED)
+ continue;
+#endif
pfctl_print_altq_node(dev, node, 0, opts);
}
}
@@ -157,7 +161,12 @@
warn("DIOCGETALTQ");
return (-1);
}
+#ifdef __FreeBSD__
+ if (pa.altq.qid > 0 &&
+ !(pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED)) {
+#else
if (pa.altq.qid > 0) {
+#endif
pq.nr = nr;
pq.ticket = pa.ticket;
pq.buf = &qstats.data;
@@ -175,6 +184,19 @@
pfctl_insert_altq_node(root, pa.altq, qstats);
}
}
+#ifdef __FreeBSD__
+ else if (pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED) {
+ memset(&qstats.data, 0, sizeof(qstats.data));
+ if ((node = pfctl_find_altq_node(*root, pa.altq.qname,
+ pa.altq.ifname)) != NULL) {
+ memcpy(&node->qstats.data, &qstats.data,
+ sizeof(qstats.data));
+ update_avg(node);
+ } else {
+ pfctl_insert_altq_node(root, pa.altq, qstats);
+ }
+ }
+#endif
}
return (mnr);
}
@@ -280,6 +302,10 @@
{
if (a->altq.qid == 0)
return;
+#ifdef __FreeBSD__
+ if (a->altq.local_flags & PFALTQ_FLAG_IF_REMOVED)
+ return;
+#endif
switch (a->altq.scheduler) {
case ALTQT_CBQ:
==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/kld.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.6 2008/01/29 23:44:34 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kld.c,v 1.7 2008/03/29 03:48:06 jhb Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -331,6 +331,7 @@
char *path;
int error;
+ head = NULL;
prev = &head;
/*
==== //depot/projects/dtrace/src/gnu/usr.bin/gdb/kgdb/main.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.14 2008/01/29 23:37:59 jhb Exp $");
+__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/main.c,v 1.15 2008/03/29 17:46:03 jhb Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -59,6 +59,7 @@
#include <top.h>
#include <bfd.h>
#include <gdbcore.h>
+#include <wrapper.h>
extern void (*init_ui_hook)(char *);
@@ -188,13 +189,15 @@
char *s;
CORE_ADDR n;
- s = strdup(exp);
- old_chain = make_cleanup(free_current_contents, &expr);
- expr = parse_expression(s);
- val = (expr != NULL) ? evaluate_expression(expr) : NULL;
- n = (val != NULL) ? value_as_address(val) : 0;
+ n = 0;
+ s = xstrdup(exp);
+ old_chain = make_cleanup(xfree, s);
+ if (gdb_parse_exp_1(&s, NULL, 0, &expr) && *s == '\0') {
+ make_cleanup(free_current_contents, &expr);
+ if (gdb_evaluate_expression(expr, &val))
+ n = value_as_address(val);
+ }
do_cleanups(old_chain);
- free(s);
return (n);
}
==== //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#14 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.132 2008/03/12 02:33:17 davidxu Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.133 2008/03/29 16:19:35 das Exp $
# machine-independent gen sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -120,6 +120,7 @@
isgreater.3 isunordered.3
MLINKS+=ldexp.3 ldexpf.3 ldexp.3 ldexpl.3
MLINKS+=makecontext.3 swapcontext.3
+MLINKS+=modf.3 modff.3 modf.3 modfl.3
MLINKS+=popen.3 pclose.3
MLINKS+=psignal.3 strsignal.3 psignal.3 sys_siglist.3 psignal.3 sys_signame.3
MLINKS+=pwcache.3 group_from_gid.3 pwcache.3 user_from_uid.3
==== //depot/projects/dtrace/src/lib/libc/gen/modf.3#5 (text+ko) ====
@@ -30,35 +30,42 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)modf.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/gen/modf.3,v 1.9 2007/01/09 00:27:54 imp Exp $
+.\" $FreeBSD: src/lib/libc/gen/modf.3,v 1.10 2008/03/29 16:19:35 das Exp $
.\"
-.Dd June 4, 1993
+.Dd March 29, 2008
.Dt MODF 3
.Os
.Sh NAME
-.Nm modf
+.Nm modf ,
+.Nm modff ,
+.Nm modfl
.Nd extract signed integral and fractional values from floating-point number
.Sh LIBRARY
-.Lb libc
+.Lb libm
.Sh SYNOPSIS
.In math.h
.Ft double
.Fn modf "double value" "double *iptr"
+.Ft float
+.Fn modff "float value" "float *iptr"
+.Ft long double
+.Fn modfl "long double value" "long double *iptr"
.Sh DESCRIPTION
The
-.Fn modf
-function breaks the argument
+.Fn modf ,
+.Fn modff ,
+and
+.Fn modfl
+functions break the argument
.Fa value
into integral and fractional parts, each of which has the
same sign as the argument.
It stores the integral part as a
-.Vt double
+floating point number
in the object pointed to by
.Fa iptr .
.Sh RETURN VALUES
-The
-.Fn modf
-function returns the signed fractional part of
+These functions return the signed fractional part of
.Fa value .
.Sh SEE ALSO
.Xr frexp 3 ,
@@ -66,6 +73,9 @@
.Xr math 3
.Sh STANDARDS
The
-.Fn modf
-function conforms to
-.St -isoC .
+.Fn modf ,
+.Fn modff ,
+and
+.Fn modfl
+functions conform to
+.St -isoC-99 .
==== //depot/projects/dtrace/src/lib/libc/sys/Makefile.inc#8 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
-# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.130 2008/03/12 10:12:22 jeff Exp $
+# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.132 2008/03/29 10:26:29 jeff Exp $
# sys sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys
@@ -63,8 +63,8 @@
aio_suspend.2 aio_waitcomplete.2 aio_write.2 \
bind.2 brk.2 chdir.2 chflags.2 \
chmod.2 chown.2 chroot.2 clock_gettime.2 close.2 \
- connect.2 dup.2 execve.2 extattr_get_file.2 \
- fcntl.2 fhopen.2 flock.2 fork.2 fsync.2 \
+ connect.2 cpuset.2 cpuset_getaffinity.2 dup.2 execve.2 \
+ extattr_get_file.2 fcntl.2 fhopen.2 flock.2 fork.2 fsync.2 \
getdirentries.2 getdtablesize.2 \
getfh.2 getfsstat.2 getgid.2 getgroups.2 getitimer.2 getlogin.2 \
getpeername.2 getpgrp.2 getpid.2 getpriority.2 getrlimit.2 \
@@ -104,6 +104,8 @@
MLINKS+=chmod.2 fchmod.2 chmod.2 lchmod.2
MLINKS+=chown.2 fchown.2 chown.2 lchown.2
MLINKS+=clock_gettime.2 clock_getres.2 clock_gettime.2 clock_settime.2
+MLINKS+=cpuset.2 cpuset_setid.2 cpuset.2 cpuset_getid.2
+MLINKS+=cpuset_getaffinity.2 cpuset_setaffinity.2
MLINKS+=dup.2 dup2.2
MLINKS+=extattr_get_file.2 extattr.2 \
extattr_get_file.2 extattr_delete_fd.2 \
==== //depot/projects/dtrace/src/lib/libthr/Makefile#17 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list