aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO8859-1/books
diff options
context:
space:
mode:
authorGabor Kovesdan <gabor@FreeBSD.org>2012-08-19 23:05:52 +0000
committerGabor Kovesdan <gabor@FreeBSD.org>2012-08-19 23:05:52 +0000
commit7ba98a21ad60d519a113cdca26d39d1a5b25e75d (patch)
treeb19c87af81f785c40bb5001157e321746bb99db2 /en_US.ISO8859-1/books
parentacb8333ccd5233d73bf3b9dc204b3900b94187a3 (diff)
parent421beffdb74571114cfece54aeaf5a7927e3bde5 (diff)
downloaddoc-7ba98a21ad60d519a113cdca26d39d1a5b25e75d.tar.gz
doc-7ba98a21ad60d519a113cdca26d39d1a5b25e75d.zip
MFH
Approved by: doceng (implicit)
Notes
Notes: svn path=/projects/sgml2xml/; revision=39398
Diffstat (limited to 'en_US.ISO8859-1/books')
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml8
-rw-r--r--en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml31
-rw-r--r--en_US.ISO8859-1/books/faq/book.sgml399
-rw-r--r--en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml9
-rw-r--r--en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml35
-rw-r--r--en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml5
-rw-r--r--en_US.ISO8859-1/books/handbook/config/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/handbook/desktop/chapter.sgml12
-rw-r--r--en_US.ISO8859-1/books/handbook/eresources/chapter.sgml62
-rw-r--r--en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml12
-rw-r--r--en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml8
-rw-r--r--en_US.ISO8859-1/books/handbook/introduction/chapter.sgml22
-rw-r--r--en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml7
-rw-r--r--en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml42
-rw-r--r--en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/handbook/ports/chapter.sgml6
-rw-r--r--en_US.ISO8859-1/books/handbook/users/chapter.sgml2
-rw-r--r--en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml18
-rw-r--r--en_US.ISO8859-1/books/handbook/x11/chapter.sgml90
-rw-r--r--en_US.ISO8859-1/books/porters-handbook/book.sgml467
20 files changed, 571 insertions, 672 deletions
diff --git a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml
index 8996025baa..05730d6781 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml
@@ -687,13 +687,17 @@
debugging information).</para>
<para>You should configure the kernel in question with <command>config
- -g</command>, include <option>DDB</option> into the configuration, and
+ -g</command> if building the <quote>traditional</quote> way. If
+ building the <quote>new</quote> way, make sure that
+ <literal>makeoptions DEBUG=-g</literal> is in the configuration.
+ In both cases, include <option>DDB</option> in the configuration, and
compile it as usual. This gives a large binary, due to the
debugging information. Copy this kernel to the target machine, strip
the debugging symbols off with <command>strip -x</command>, and boot it
using the <option>-d</option> boot option. Connect the serial line
of the target machine that has "flags 080" set on its sio device
- to any serial line of the debugging host.
+ to any serial line of the debugging host. See &man.sio.4; for
+ information on how to set the flags on an sio device.
Now, on the debugging machine, go to the compile directory of the target
kernel, and start <command>gdb</command>:</para>
diff --git a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml
index d952462f13..e1125bbd16 100644
--- a/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml
+++ b/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml
@@ -1675,29 +1675,7 @@ else if (pid == 0) { /* child */
<sect2>
<title>Emacs</title>
- <para>Unfortunately, &unix; systems do not come with the kind of
- everything-you-ever-wanted-and-lots-more-you-did-not-in-one-gigantic-package
- integrated development environments that other systems
- have.
-
- <footnote>
- <para>Some powerful, free IDEs now exist, such as KDevelop
- in the Ports Collection.</para>
- </footnote>
-
- However, it is possible to set up your own environment. It
- may not be as pretty, and it may not be quite as integrated,
- but you can set it up the way you want it. And it is free.
- And you have the source to it.</para>
-
- <para>The key to it all is Emacs. Now there are some people who
- loathe it, but many who love it. If you are one of the former,
- I am afraid this section will hold little of interest to you.
- Also, you will need a fair amount of memory to run it&mdash;I would
- recommend 8MB in text mode and 16MB in X as the bare minimum
- to get reasonable performance.</para>
-
- <para>Emacs is basically a highly customizable
+ <para>Emacs is a highly customizable
editor&mdash;indeed, it has been customized to the point where
it is more like an operating system than an editor! Many
developers and sysadmins do in fact spend practically all
@@ -1749,14 +1727,9 @@ else if (pid == 0) { /* child */
you to look at the source code as you step through your
program.</para>
</listitem>
-
- <listitem>
- <para>You can read Usenet news and mail while your program
- is compiling.</para>
- </listitem>
</itemizedlist>
- <para>And doubtless many more that I have overlooked.</para>
+ <para>And doubtless many more that have been overlooked.</para>
<para>Emacs can be installed on &os; using
the <filename role="package">editors/emacs</filename>
diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index d07b375c2a..9eff975fb9 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -1288,28 +1288,21 @@
<answer>
<para>For &os; you will need a 486 or better PC, with
- 24&nbsp;MB or more of RAM and at least 150&nbsp;MB of hard
+ 64&nbsp;MB or more of RAM and at least 1&nbsp;GB of hard
disk space.</para>
- <para>All versions of &os; can run with a low end MDA graphics
- card but to run &xorg;, a VGA or better video card is
- needed.</para>
-
<para>See also <xref linkend="hardware"/>.</para>
</answer>
</qandaentry>
<qandaentry>
<question id="custom-boot-floppy">
- <para>How can I make my own custom install floppy?</para>
+ <para>How can I make my own custom install disk?</para>
</question>
<answer>
- <para>Currently there is no way to <emphasis>just</emphasis>
- make a custom install floppy. You have to cut a whole new
- release, which will include your install floppy.</para>
-
- <para>To make a custom release, follow the instructions in the
+ <para>Customized &os; installation media can be created by
+ building a custom release. Follow the instructions in the
<ulink
url="&url.articles.releng;/article.html">Release Engineering</ulink>
article.</para>
@@ -1822,35 +1815,17 @@
<qandaentry>
<question id="need-complete-sources">
- <para>Do I need to install the complete sources?</para>
+ <para>Do I need to install the source?</para>
</question>
<answer>
- <para>In general, no. However, we would strongly recommend
- that you install, at a minimum, the <literal>base</literal>
- source kit, which includes several of the files mentioned
- here, and the <literal>sys</literal> (kernel) source kit,
- which includes sources for the kernel. There is nothing in
- the system which requires the presence of the sources to
- operate, however, except for the kernel-configuration
- program &man.config.8;. With the exception of the kernel
- sources, our build structure is set up so that you can
- read-only mount the sources from elsewhere via NFS and still
- be able to make new binaries (due to the kernel-source
- restriction, we recommend that you not mount this on
- <filename class="directory">/usr/src</filename> directly, but
- rather in some other location with appropriate symbolic
- links to duplicate the top-level structure of the source
- tree).</para>
-
- <para>Having the sources on-line and knowing how to build a
- system with them will make it much easier for you to upgrade
- to future releases of &os;.</para>
-
- <para>To actually select a subset of the sources, use the
- <guimenuitem>Custom</guimenuitem> menu item when you are in
- the <guimenuitem>Distributions</guimenuitem> menu of the
- system installation tool.</para>
+ <para>In general, no. There is nothing in the base
+ system which requires the presence of the source to
+ operate. Some ports, like <filename
+ role="package">sysutils/lsof</filename>, will not build
+ unless the source is installed. In particular, if the
+ port builds a kernel module or directly operates on kernel
+ structures, the source must be installed.</para>
</answer>
</qandaentry>
@@ -1860,18 +1835,15 @@
</question>
<answer>
- <para>Building a new kernel was originally pretty much a
- required step in a &os; installation, but more recent releases
- have benefited from the introduction of much friendlier
- kernel configuration methods. It is very easy to configure
- the kernel's configuration by much more flexible
- <quote>hints</quote> which can be set at the loader
- prompt.</para>
-
- <para>It may still be worthwhile building a new kernel
- containing just the drivers that you need, just to save a
- bit of RAM, but it is no longer necessary for most
- systems.</para>
+ <para>Usually not. The supplied <literal>GENERIC</literal>
+ kernel contains the drivers an ordinary computer will
+ need. &man.freebsd-update.8;, the &os; binary upgrade
+ tool, cannot upgrade custom kernels, another reason
+ to stick with the GENERIC kernel when possible.
+ For computers with very limited RAM, such as
+ embedded systems, it may be worthwhile to build a
+ smaller custom kernel containing just the required
+ drivers.</para>
</answer>
</qandaentry>
@@ -1882,8 +1854,10 @@
</question>
<answer>
- <para>The default password format on &os; is to use
- <emphasis>MD5</emphasis>-based passwords. These are
+ <para>&os;&nbsp;7 and 8 use MD5 password hashing by
+ default. Recent versions
+ of &os; use <emphasis>SHA512</emphasis> by default.
+ These are
believed to be more secure than the traditional &unix;
password format, which used a scheme based on the
<emphasis>DES</emphasis> algorithm. DES passwords are still
@@ -2293,19 +2267,9 @@
support on Intel CPUs that support this feature. A kernel
with the <literal>options SMP</literal> feature enabled
will automatically detect the additional logical
- processors. The default &os; scheduler treats the logical
- processors the same as additional physical processors; in
- other words, no attempt is made to optimize scheduling
- decisions given the shared resources between logical
- processors within the same CPU. Because this naive
- scheduling can result in suboptimal performance, under
- certain circumstances it may be useful to disable the
- logical processors with the
- <varname>machdep.hlt_logical_cpus</varname> sysctl
- variable. It is also possible to halt any CPU in the idle
- loop with the <varname>machdep.hlt_cpus</varname> sysctl
- variable. The &man.smp.4; manual page has more
- details.</para>
+ processors.</para>
+
+ <para>&man.smp.4; has more details.</para>
</answer>
</qandaentry>
</qandaset>
@@ -4090,7 +4054,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
<answer>
<para>The Open Group has released the source code to
- <application>&motif;&nbsp;2.2.2</application>. You can
+ <application>&motif;</application>. You can
install the <filename
role="package">x11-toolkits/open-motif</filename> package,
or compile it from ports. Refer to <ulink
@@ -5242,7 +5206,7 @@ use "disklabel -r" to install initial label</screen>
<term>ZFS</term>
<listitem>
- <para>As of this writing, &os; includes a port of
+ <para>&os; includes a port of
&sun;'s ZFS driver. The current recommendation is to
use it only on &arch.amd64; platforms with sufficient
memory. For more information, see &man.zfs.8;.</para>
@@ -7687,133 +7651,6 @@ Key F15 A A Menu Workplace Nop</programlisting>
</qandaentry>
<qandaentry>
- <question id="dec-pci-chipset">
- <para>Which network cards are based on the DEC PCI
- chipset?</para>
- </question>
-
- <answer>
- <para>Here is a list compiled by Glen Foster
- <email>gfoster@driver.nsta.org</email>, with some more
- modern additions:</para>
-
- <table>
- <title>Network Cards Based on the DEC PCI Chipset</title>
-
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Vendor</entry>
-
- <entry>Model</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
- <entry>ASUS</entry>
-
- <entry>PCI-L101-TB</entry>
- </row>
-
- <row>
- <entry>Accton</entry>
-
- <entry>ENI1203</entry>
- </row>
-
- <row>
- <entry>Cogent</entry>
-
- <entry>EM960PCI</entry>
- </row>
-
- <row>
- <entry>Compex</entry>
-
- <entry>ENET32-PCI</entry>
- </row>
-
- <row>
- <entry>D-Link</entry>
-
- <entry>DE-530</entry>
- </row>
-
- <row>
- <entry>Dayna</entry>
-
- <entry>DP1203, DP2100</entry>
- </row>
-
- <row>
- <entry>DEC</entry>
-
- <entry>DE435, DE450</entry>
- </row>
-
- <row>
- <entry>Danpex</entry>
-
- <entry>EN-9400P3</entry>
- </row>
-
- <row>
- <entry>JCIS</entry>
-
- <entry>Condor JC1260</entry>
- </row>
-
- <row>
- <entry>Linksys</entry>
-
- <entry>EtherPCI</entry>
- </row>
-
- <row>
- <entry>Mylex</entry>
-
- <entry>LNP101</entry>
- </row>
-
- <row>
- <entry>SMC</entry>
-
- <entry>EtherPower 10/100 (Model 9332)</entry>
- </row>
-
- <row>
- <entry>SMC</entry>
-
- <entry>EtherPower (Model 8432)</entry>
- </row>
-
- <row>
- <entry>TopWare</entry>
-
- <entry>TE-3500P</entry>
- </row>
-
- <row>
- <entry>Znyx (2.2.x)</entry>
-
- <entry>ZX312, ZX314, ZX342, ZX345, ZX346,
- ZX348</entry>
- </row>
-
- <row>
- <entry>Znyx (3.x)</entry>
-
- <entry>ZX345Q, ZX346Q, ZX348Q, ZX412Q, ZX414, ZX442,
- ZX444, ZX474, ZX478, ZX212, ZX214 (10mbps/hd)</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </answer>
- </qandaentry>
-
- <qandaentry>
<question id="fqdn-hosts">
<para>Why do I have to use the FQDN for hosts on my
site?</para>
@@ -9243,92 +9080,6 @@ ATDT1234567</programlisting>
</qandaentry>
<qandaentry>
- <question id="useful-port-numbers">
- <para>Has anybody made a list of useful port numbers?</para>
- </question>
-
- <answer>
- <para>Not yet, but this is intended to grow into such a list
- (if any interest is shown). In each example,
- <replaceable>internal</replaceable> should be replaced with
- the IP number of the machine playing the game.</para>
-
- <itemizedlist>
- <listitem>
- <para><application>Asheron's Call</application></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable> :65000
- 65000</literal></para>
-
- <para>Manually change the port number within the game to
- <literal>65000</literal>. If you have got a number of
- machines that you wish to play on assign a unique port
- number for each (i.e. <literal>65001</literal>,
- <literal>65002</literal>, etc) and add a <literal>nat
- port</literal> line for each one.</para>
- </listitem>
-
- <listitem>
- <para><application>Half Life</application></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:27005
- 27015</literal></para>
- </listitem>
-
- <listitem>
- <para><application>PCAnywhere 8.0</application></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:5632
- 5632</literal></para>
-
- <para><literal>nat port tcp
- <replaceable>internal</replaceable>:5631
- 5631</literal></para>
- </listitem>
-
- <listitem>
- <para><application>Quake</application></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:6112
- 6112</literal></para>
- </listitem>
-
- <listitem>
- <para><application>Quake 2</application></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:27901
- 27910</literal></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:60021
- 60021</literal></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:60040
- 60040</literal></para>
- </listitem>
-
- <listitem>
- <para><application>Red Alert</application></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:8675
- 8675</literal></para>
-
- <para><literal>nat port udp
- <replaceable>internal</replaceable>:5009
- 5009</literal></para>
- </listitem>
- </itemizedlist>
- </answer>
- </qandaentry>
-
- <qandaentry>
<question id="fcs-errors">
<para>What are FCS errors?</para>
</question>
@@ -9378,78 +9129,6 @@ ATDT1234567</programlisting>
</answer>
</qandaentry>
- <qandaentry id="PPPoEwithNAT">
- <question id="macos-win98-pppoe-freeze">
- <para>Why do &macos; and &windows;&nbsp;98 connections freeze
- when running PPPoE on the gateway?</para>
- </question>
-
- <answer>
- <para>Thanks to Michael Wozniak
- <email>mwozniak@netcom.ca</email> for figuring this out and
- Dan Flemming <email>danflemming@mac.com</email> for the Mac
- solution:</para>
-
- <para>This is due to what is called a <quote>Black
- Hole</quote> router. &macos; and &windows;&nbsp;98 (and maybe
- other &microsoft; OSs) send TCP packets with a requested
- segment size too big to fit into a PPPoE frame (MTU is
- <literal>1500</literal> by default for Ethernet)
- <emphasis>and</emphasis> have the <quote>do not
- fragment</quote> bit set (default of TCP) and the Telco
- router is not sending ICMP <quote>must fragment</quote> back
- to the WWW site you are trying to load. (Alternatively, the
- router is sending the ICMP packet correctly, but the
- firewall at the WWW site is dropping it.) When the www
- server is sending you frames that do not fit into the PPPoE
- pipe the Telco router drops them on the floor and your page
- does not load (some pages/graphics do as they are smaller
- than a MSS). This seems to be the default of most Telco
- PPPoE configurations.</para>
-
- <para>One fix is to use <application>regedit</application> on
- your 95/98 system to add the following registry entry:</para>
-
- <programlisting>HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\Class\NetTrans\0000\MaxMTU</programlisting>
-
- <para>It should be a string with a value
- <literal>1436</literal>, as some ADSL routers are reported
- to be unable to deal with packets larger than this. This
- registry key has been changed to
- <literal>Tcpip\Parameters\Interfaces\<replaceable>ID for
- adapter</replaceable>\MTU</literal> in &windows;&nbsp;2000
- and becomes a <literal>DWORD</literal>.</para>
-
- <para>Refer to the Microsoft Knowledge Base documents <ulink
- url="http://support.microsoft.com/support/kb/articles/Q158/4/74.asp">Q158474 - Windows TCPIP Registry Entries</ulink>
- and <ulink
- url="http://support.microsoft.com/support/kb/articles/Q120/6/42.asp">Q120642 - TCPIP &amp; NBT Configuration Parameters for &windowsnt;</ulink>
- for more information on changing &windows; MTU to work with
- a NAT router.</para>
-
- <para>Another regedit possibility under &windows;&nbsp;2000 to
- set the <literal>Tcpip\Parameters\Interfaces\<replaceable>ID
- for adapter</replaceable>\EnablePMTUBHDetect</literal>
- <literal>DWORD</literal> to <literal>1</literal> as
- mentioned in the Microsoft document 120642 mentioned
- above.</para>
-
- <para>Unfortunately, &macos; does not provide an interface for
- changing TCP/IP settings. However, there are several commercial
- programs available that will allow users to customize TCP/IP
- settings. &macos; NAT users should search for their MTU
- settings and enter <literal>1450</literal> instead of
- <literal>1500</literal>.</para>
-
- <para>The &man.ppp.8; has an <command>enable
- tcpmssfixup</command> command that will automatically adjust
- the MSS to an appropriate value. This facility is enabled
- by default. If you are stuck with an older version of
- &man.ppp.8;, you may want to look at the <filename
- role="package">net/tcpmssd</filename> port.</para>
- </answer>
- </qandaentry>
-
<qandaentry>
<question id="desperation">
<para>None of this helps &mdash; I am desperate! What can I
@@ -10647,24 +10326,6 @@ hint.sio.7.irq="12"</programlisting>
</qandaentry>
<qandaentry>
- <question id="split-1392k">
- <para>How did you split the distribution into 1392&nbsp;KB
- files?</para>
- </question>
-
- <answer>
- <para>Newer BSD based systems have a <option>-b</option>
- option to &man.split.1; that allows them to split files on
- arbitrary byte boundaries.</para>
-
- <para>Here is an example from
- <filename>/usr/src/release/Makefile</filename>.</para>
-
- <programlisting>ZIPNSPLIT= gzip --no-name -9 -c | split -b 1392k -</programlisting>
- </answer>
- </qandaentry>
-
- <qandaentry>
<question id="submitting-kernel-extensions">
<para>I have written a kernel extension, who do I send it
to?</para>
diff --git a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
index 9a454e53b2..a53a76c0a6 100644
--- a/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
+++ b/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml
@@ -116,6 +116,15 @@
<screen>&prompt.root; <userinput><command>cd</command> en_US.ISO8859-1/htdocs</userinput>
&prompt.root; <userinput><command>make</command> <maketarget>all</maketarget></userinput></screen>
+
+ <tip>
+ <para>The build requires a few files from the Ports Collection
+ and may fail without a properly configured Ports CVS
+ mirror. Set the <makevar>NOPORTSCVS</makevar> environment
+ variable as described in <xref linkend="the-website-env"/>
+ to use your local Ports Collection (typically <filename
+ class="directory">/usr/ports</filename>) instead.</para>
+ </tip>
</step>
</procedure>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index b69ec5bc75..c43896a855 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -5968,14 +5968,34 @@ round-trip min/avg/max/stddev = 2.530/2.643/2.774/0.103 ms</screen>
<para>These settings will help you configure a machine that
will be on your LAN and act as a client, not a router. To
- have &man.rtsol.8; autoconfigure your interface on boot all
- you need to add is:</para>
+ have &man.rtsol.8; autoconfigure your interface on boot on
+ &os;&nbsp;9.<replaceable>x</replaceable> and later,
+ add:</para>
+
+ <programlisting>ipv6_prefer="YES"</programlisting>
+
+ <para>to <filename>rc.conf</filename>.</para>
+
+ <para>For &os;&nbsp;8.<replaceable>x</replaceable> and
+ earlier, add:</para>
<programlisting>ipv6_enable="YES"</programlisting>
<para>To statically assign an IP address such as <hostid
role="ip6addr">2001:471:1f11:251:290:27ff:fee0:2093</hostid>,
- to your <devicename>fxp0</devicename> interface, add:</para>
+ to your <devicename>fxp0</devicename> interface, add the
+ following for &os;&nbsp;9.<replaceable>x</replaceable>:</para>
+
+ <programlisting>ifconfig_fxp0_ipv6="inet6 2001:471:1f11:251:290:27ff:fee0:2093 prefixlen <replaceable>64</replaceable>"</programlisting>
+
+ <note>
+ <para>Be sure to change <replaceable>prefixlen
+ 64</replaceable> to the appropriate value for the subnet
+ within which the computer is networked.</para>
+ </note>
+
+ <para>For &os;&nbsp;8<replaceable>x</replaceable> and earlier,
+ add:</para>
<programlisting>ipv6_ifconfig_fxp0="2001:471:1f11:251:290:27ff:fee0:2093"</programlisting>
@@ -6008,10 +6028,15 @@ round-trip min/avg/max/stddev = 2.530/2.643/2.774/0.103 ms</screen>
<programlisting>gifconfig_gif0="<replaceable>MY_IPv4_ADDR REMOTE_IPv4_ADDR</replaceable>"</programlisting>
<para>To apply the IPv6 address you have been assigned for use
- as your IPv6 tunnel endpoint, add:</para>
+ as your IPv6 tunnel endpoint, add the following for
+ &os;&nbsp;9.<replaceable>x</replaceable> and later:</para>
- <programlisting>ipv6_ifconfig_gif0="<replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting>
+ <programlisting>ifconfig_gif0_ipv6="inet6 <replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting>
+ <para>For &os;&nbsp;8.<replaceable>x</replaceable> and
+ earlier, add:</para>
+
+ <programlisting>ipv6_ifconfig_gif0="<replaceable>MY_ASSIGNED_IPv6_TUNNEL_ENDPOINT_ADDR</replaceable>"</programlisting>
<para>Then all you have to do is set the default route for
IPv6. This is the other side of the IPv6 tunnel:</para>
diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
index c673feab89..22726b5503 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
@@ -1401,6 +1401,11 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
</listitem>
<listitem>
+ <para><literal>freebsd-zfs</literal> - A &os; ZFS
+ filesystem. See <xref linkend="filesystems-zfs"/>.</para>
+ </listitem>
+
+ <listitem>
<para><literal>freebsd-swap</literal> - &os; swap
space.</para>
</listitem>
diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.sgml b/en_US.ISO8859-1/books/handbook/config/chapter.sgml
index c9f70de077..10ce0668c9 100644
--- a/en_US.ISO8859-1/books/handbook/config/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.sgml
@@ -2694,7 +2694,7 @@ kern.maxvnodes: 100000</screen>
<para>Use &man.swapon.8; to add a swap partition to the system.
For example:</para>
- <screen>&prompt.root; <userinput>swapon<replaceable> /dev/ada1s1p2</replaceable></userinput></screen>
+ <screen>&prompt.root; <userinput>swapon<replaceable> /dev/ada1s1b</replaceable></userinput></screen>
<warning>
@@ -2710,9 +2710,9 @@ kern.maxvnodes: 100000</screen>
entry to <filename>/etc/fstab</filename> for the
partition:</para>
- <programlisting><replaceable>/dev/ada1s1p2</replaceable> none swap sw 0 0</programlisting>
+ <programlisting><replaceable>/dev/ada1s1b</replaceable> none swap sw 0 0</programlisting>
- <para>See &man.fstab.5; for an explaination of the entries in
+ <para>See &man.fstab.5; for an explanation of the entries in
<filename>/etc/fstab</filename>.</para>
</sect2>
diff --git a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
index dd153bdb1a..570755fd12 100644
--- a/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml
@@ -409,6 +409,18 @@
<application>Konqueror</application>,
available in <filename role="package">misc/konq-plugins</filename>.</para>
+ <para><application>Konqueror</application> supports WebKit as
+ well as its own KHTML. WebKit is used by many modern browsers
+ including Chromium. To use WebKit with
+ <application>Konqueror</application> on &os;:</para>
+
+ <screen>&prompt.root; <userinput>cd /usr/ports/www/kwebkitpart</userinput>
+&prompt.root; <userinput>make install clean</userinput></screen>
+
+ <para>Then in <application>Konqueror</application>, click
+ <quote>Settings</quote>, <quote>Configure Konqueror</quote>,
+ then <quote>Change KHTML to WebKit</quote>.</para>
+
<para><application>Konqueror</application> also supports <application>&flash;</application>; a <quote>How To</quote> guide
for getting <application>&flash;</application> support on
<application>Konqueror</application>
diff --git a/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml b/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
index 4b78c81663..20ca42d10b 100644
--- a/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml
@@ -395,6 +395,11 @@
</row>
<row>
+ <entry>&a.numerics.name;</entry>
+ <entry>Discussions of high quality implementation of libm functions</entry>
+ </row>
+
+ <row>
<entry>&a.office.name;</entry>
<entry>Office applications on &os;</entry>
</row>
@@ -616,7 +621,7 @@
you can change your digest options in your account options
section.</para>
- <para><emphasis>CVS &amp; SVN lists:</emphasis> The following lists
+ <para><emphasis>SVN lists:</emphasis> The following lists
are for people interested in seeing the log messages for changes to
various areas of the source tree. They are
<emphasis>Read-Only</emphasis> lists and should not have mail sent to
@@ -634,40 +639,61 @@
<tbody>
<row>
- <entry>&a.cvsall.name;</entry>
- <entry><filename>/usr/(CVSROOT|doc|ports)</filename></entry>
- <entry>All changes to any place in the tree (superset of other CVS commit lists)</entry>
+ <entry>&a.svn-doc-all.name;</entry>
+ <entry><filename>/usr/doc</filename></entry>
+ <entry>All changes to the doc Subversion repository (except
+ for <filename>user</filename>,
+ <filename>projects</filename>
+ and <filename>translations</filename>)</entry>
+ </row>
+
+ <row>
+ <entry>&a.svn-doc-head.name;</entry>
+ <entry><filename>/usr/doc</filename></entry>
+ <entry>All changes to the <quote>head</quote> branch of
+ the doc Subversion repository</entry>
+ </row>
+
+ <row>
+ <entry>&a.svn-doc-projects.name;</entry>
+ <entry><filename>/usr/doc/projects</filename></entry>
+ <entry>All changes to the <filename>projects</filename>
+ area of the doc Subversion repository</entry>
</row>
<row>
- <entry>&a.cvs-doc.name;</entry>
- <entry><filename>/usr/(doc|www)</filename></entry>
- <entry>All changes to the doc and www trees</entry>
+ <entry>&a.svn-doc-svnadmin.name;</entry>
+ <entry><filename>/usr/doc</filename></entry>
+ <entry>All changes to the administrative scripts, hooks,
+ and other configuration data of the doc Subversion
+ repository</entry>
</row>
<row>
- <entry>&a.cvs-ports.name;</entry>
+ <entry>&a.svn-ports-all.name;</entry>
<entry><filename>/usr/ports</filename></entry>
- <entry>All changes to the ports tree</entry>
+ <entry>All changes to the ports Subversion repository</entry>
</row>
<row>
- <entry>&a.cvs-projects.name;</entry>
- <entry><filename>/usr/projects</filename></entry>
- <entry>All changes to the projects tree</entry>
+ <entry>&a.svn-ports-head.name;</entry>
+ <entry><filename>/usr/ports</filename></entry>
+ <entry>All changes to the <quote>head</quote> branch of
+ the ports Subversion repository</entry>
</row>
<row>
- <entry>&a.cvs-src.name;</entry>
- <entry><filename>/usr/src</filename></entry>
- <entry>All changes to the src tree (generated by the svn-to-cvs
- importer commits)</entry>
+ <entry>&a.svn-ports-svnadmin.name;</entry>
+ <entry><filename>/usr/ports</filename></entry>
+ <entry>All changes to the administrative scripts, hooks,
+ and other configuration data of the ports Subversion
+ repository</entry>
</row>
<row>
<entry>&a.svn-src-all.name;</entry>
<entry><filename>/usr/src</filename></entry>
- <entry>All changes to the Subversion repository (except
+ <entry>All changes to the src Subversion repository (except
for <filename>user</filename>
and <filename>projects</filename>)</entry>
</row>
@@ -676,7 +702,7 @@
<entry>&a.svn-src-head.name;</entry>
<entry><filename>/usr/src</filename></entry>
<entry>All changes to the <quote>head</quote> branch of
- the Subversion repository (the &os;-CURRENT
+ the src Subversion repository (the &os;-CURRENT
branch)</entry>
</row>
diff --git a/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml b/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
index 3f6ab55101..12e186855f 100644
--- a/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/filesystems/chapter.sgml
@@ -769,12 +769,12 @@ errors: No known data errors</screen>
<para>First, load the kernel loadable module:</para>
- <screen>kldload ext2fs</screen>
+ <screen>&prompt.root; <userinput>kldload ext2fs</userinput></screen>
<para>Then, to mount an &man.ext2fs.5; volume located on
<filename>/dev/ad1s1</filename>:</para>
- <screen><userinput>mount -t ext2fs /dev/ad1s1 /mnt</userinput></screen>
+ <screen>&prompt.root; <userinput>mount -t ext2fs /dev/ad1s1 /mnt</userinput></screen>
</sect2>
<sect2>
<title>XFS</title>
@@ -791,7 +791,7 @@ errors: No known data errors</screen>
<para>To load <acronym>XFS</acronym> as a kernel-loadable
module:</para>
- <screen>kldload xfs</screen>
+ <screen>&prompt.root; <userinput>kldload xfs</userinput></screen>
<para>The &man.xfs.5; driver lets the &os; kernel access
XFS filesystems. However, at present only read-only
@@ -801,7 +801,7 @@ errors: No known data errors</screen>
<para>To mount a &man.xfs.5; volume located on
<filename>/dev/ad1s1</filename>, do the following:</para>
- <screen><userinput>mount -t xfs /dev/as1s1 /mnt</userinput></screen>
+ <screen>&prompt.root; <userinput>mount -t xfs /dev/as1s1 /mnt</userinput></screen>
<para>Also useful to note is that the
<filename role="package">sysutils/xfsprogs</filename> port
@@ -828,12 +828,12 @@ errors: No known data errors</screen>
<para>First, the kernel-loadable module needs to be loaded:</para>
- <screen>kldload reiserfs</screen>
+ <screen>&prompt.root; <userinput>kldload reiserfs</userinput></screen>
<para>Then, to mount a ReiserFS volume located on
<filename>/dev/ad1s1</filename>:</para>
- <screen><userinput>mount -t reiserfs /dev/ad1s1 /mnt</userinput></screen>
+ <screen>&prompt.root; <userinput>mount -t reiserfs /dev/ad1s1 /mnt</userinput></screen>
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml b/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
index 68e90c31d3..5ba27303cc 100644
--- a/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml
@@ -2132,8 +2132,7 @@ pass in quick on rl0 proto tcp from any to any port = 20 flags S keep state</pro
run time loadable module. The system will dynamically load the
kernel module when the <filename>rc.conf</filename> statement
<literal>firewall_enable="YES"</literal> is used. There is no
- need to compile IPFW into the &os; kernel unless
- <acronym>NAT</acronym> functionality is desired.</para>
+ need to compile IPFW into the &os; kernel.</para>
<para>After rebooting your system with
<literal>firewall_enable="YES"</literal> in
@@ -2181,9 +2180,8 @@ net.inet.ip.fw.verbose_limit=5</programlisting>
</indexterm>
<para>It is not a mandatory requirement to enable IPFW by
- compiling the following options into the &os; kernel, unless
- <acronym>NAT</acronym> functionality is required. It is presented here
- as background information.</para>
+ compiling the following options into the &os; kernel. It is
+ presented here as background information only.</para>
<programlisting>options IPFIREWALL</programlisting>
diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml b/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
index 9e1955cc04..c826d91bce 100644
--- a/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
@@ -811,23 +811,27 @@
The switch was deemed necessary, as the technical limitations
imposed by <application>CVS</application> were becoming obvious
due to the rapid expansion of the source tree and the amount
- of history already stored. While the base repository now uses
+ of history already stored. The Documentation Project
+ and Ports Collection repositories also moved from
+ <application>CVS</application> to
+ <application>SVN</application> in May 2012 and July
+ 2012, respectively.</para>
+
+ <para>While the <literal>src/</literal> and
+ <literal>ports/</literal> repositories now use
<application>SVN</application>, client side tools like
<application>csup</application> that depend on the older
<application>CVS</application> infrastructure, continue to
work normally &mdash; changes in the
<application>SVN</application> repository are backported to
- <application>CVS</application> for this purpose.</para>
-
- <para>In May 2012, the Documentation Project repository
- also moved from <application>CVS</application> to
- <application>SVN</application>. Unlike the base system,
+ <application>CVS</application> for this purpose.
+ Unlike <literal>src/</literal> and
+ <literal>ports/</literal>,
the documentation <application>SVN</application>
repository is not backported to
<application>CVS</application>.</para>
- <para>The Ports repository is
- currently using <application>CVS</application>. The primary
+ <para>The primary <application>CVS</application>
<ulink
url="http://www.FreeBSD.org/cgi/cvsweb.cgi">repository</ulink>
resides on a machine in Santa Clara CA, USA
@@ -878,7 +882,7 @@
is one of the functions of the core team, as is the
recruitment of new core team members as others move on.
The current core team was elected from a pool of committer
- candidates in July 2010. Elections are held
+ candidates in July 2012. Elections are held
every 2 years.</para>
<para>Some core team members also have specific areas of
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
index 040d416838..59336ff9fc 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
@@ -724,8 +724,11 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENT</progra
<programlisting>options GEOM_PART_GPT # GUID Partition Tables.</programlisting>
- <para>This option brings the ability to have a large number of
- partitions on a single disk.</para>
+ <para>Adds support for <ulink
+ url="http://en.wikipedia.org/wiki/GUID_Partition_Table">GUID
+ Partition Tables</ulink>. GPT provides the ability to have a
+ large number of partitions per disk, 128 in the standard
+ configuration.</para>
<programlisting>options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!]</programlisting>
diff --git a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
index 2fb48a8f5c..c458ffe084 100644
--- a/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
@@ -21,13 +21,6 @@
<itemizedlist>
<listitem>
<address>
- <otheraddr>CompUSA</otheraddr>
- WWW: <otheraddr><ulink url="http://www.compusa.com/"></ulink></otheraddr>
- </address>
- </listitem>
-
- <listitem>
- <address>
<otheraddr>Frys Electronics</otheraddr>
WWW: <otheraddr><ulink url="http://www.frys.com/"></ulink></otheraddr>
</address>
@@ -68,16 +61,6 @@
<listitem>
<address>
- <otheraddr>Ikarios</otheraddr>
- <street>22-24 rue Voltaire</street>
- <postcode>92000</postcode> <city>Nanterre</city>
- <country>France</country>
- WWW: <otheraddr><ulink url="http://ikarios.com/form/#freebsd"></ulink></otheraddr>
- </address>
- </listitem>
-
- <listitem>
- <address>
<otheraddr>JMC Software</otheraddr>
<country>Ireland</country>
Phone: <phone>353 1 6291282</phone>
@@ -158,19 +141,6 @@
please contact a distributor:</para>
<itemizedlist>
- <listitem>
- <address>
- <otheraddr>Cylogistics</otheraddr>
- <street>809B Cuesta Dr., #2149</street>
- <city>Mountain View</city>, <state>CA</state> <postcode>94040</postcode>
- <country>USA</country>
- Phone: <phone>+1 650 694-4949</phone>
- Fax: <fax>+1 650 694-4953</fax>
- Email: <email>sales@cylogistics.com</email>
- WWW: <otheraddr><ulink url="http://www.cylogistics.com/"></ulink></otheraddr>
- </address>
- </listitem>
-
<listitem>
<address>
<otheraddr>Ingram Micro</otheraddr>
@@ -206,18 +176,6 @@
WWW: <otheraddr><ulink url="http://linuxcenter.ru/freebsd"></ulink></otheraddr>
</address>
</listitem>
-
- <listitem>
- <address>
- <otheraddr>Navarre Corp</otheraddr>
- <street>7400 49th Ave South</street>
- <city>New Hope</city>, <state>MN</state> <postcode>55428</postcode>
- <country>USA</country>
- Phone: <phone>+1 763 535-8333</phone>
- Fax: <fax>+1 763 535-0341</fax>
- WWW: <otheraddr><ulink url="http://www.navarre.com/"></ulink></otheraddr>
- </address>
- </listitem>
</itemizedlist>
</sect2>
</sect1>
diff --git a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
index ba3c98b137..654a57b607 100644
--- a/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml
@@ -8,7 +8,7 @@
Do not edit this file except as instructed by the addkey.sh script.
- See the README file in doc/share/pgpkeys for instructions.
+ See the README file in head/share/pgpkeys for instructions.
-->
<appendix id="pgpkeys">
diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
index c1e7dbc677..1738a2d6af 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
@@ -274,11 +274,11 @@
</listitem>
<listitem>
- <indexterm><primary>FreshMeat</primary></indexterm>
+ <indexterm><primary>Freecode</primary></indexterm>
<para>If you do not know the name of the application you want,
- try using a site like FreshMeat (<ulink
- url="http://www.freshmeat.net/"></ulink>) to find an
+ try using a site like Freecode (<ulink
+ url="http://www.freecode.com/"></ulink>) to find an
application, then check back at the FreeBSD site to see if
the application has been ported yet.</para>
</listitem>
diff --git a/en_US.ISO8859-1/books/handbook/users/chapter.sgml b/en_US.ISO8859-1/books/handbook/users/chapter.sgml
index ddc97babed..3b0f588d73 100644
--- a/en_US.ISO8859-1/books/handbook/users/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/users/chapter.sgml
@@ -821,7 +821,7 @@ passwd: done</screen>
&man.mlock.2;). Some system-critical programs, such as
&man.amd.8;, lock into main memory such that in the event
of being swapped out, they do not contribute to
- a system's trashing in time of trouble.</para>
+ a system's thrashing in time of trouble.</para>
</listitem>
</varlistentry>
diff --git a/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml b/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
index d5c85acbd5..6a904673cf 100644
--- a/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
@@ -1115,8 +1115,7 @@ EndSection</programlisting>
<application>VMware</application> (like
<filename role="package">emulators/vmware3</filename>), which
utilized the &linux; binary compatibility layer. Shortly after
- the release of &os;&nbsp;7.2, the Open Source Edition
- (<acronym>OSE</acronym>) of Sun's
+ the release of &os;&nbsp;7.2, Sun's
<application>&virtualbox;</application> appeared in the
Ports&nbsp;Collection as a native &os; program.</para>
@@ -1124,14 +1123,13 @@ EndSection</programlisting>
developed, complete virtualization package, that is available
for most operating systems including &windows;, &macos;, &linux;
and &os;. It is equally capable at running &windows; or &unix;
- like guests. It comes in two flavors, an open source and a
- proprietary edition. From the user's point of view, perhaps the
- most important limitation of the <acronym>OSE</acronym> is the
- lack of USB support. Other differences may be found in the
- <quote>Editions</quote> page of the
- <application>&virtualbox;</application> wiki, at
- <ulink url="http://www.virtualbox.org/wiki/Editions"></ulink>.
- Currently, only the OSE is available for &os;.</para>
+ like guests. It is released as open source software, but with
+ closed-source components available in a separate extension pack.
+ These components include support for USB 2.0 devices, among others.
+ More information may be found on the <quote>Downloads</quote> page
+ of the <application>&virtualbox;</application> wiki, at
+ <ulink url="http://www.virtualbox.org/wiki/Downloads"></ulink>.
+ Currently, these extensions are not available for &os;.</para>
<sect2 id="virtualization-virtualbox-install">
<title>Installing &virtualbox;</title>
diff --git a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
index ec397c1aaf..ba9cf67779 100644
--- a/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
@@ -365,36 +365,47 @@
<sect2>
<title>Before Starting</title>
- <para>Before configuration of X11
- the following information about the target system is needed:</para>
+ <para>In most cases, X11 is self-configuring. Those with older
+ or unusual equipment may find it helpful to gather some
+ hardware information before beginning configuration.</para>
<itemizedlist>
- <listitem><para>Monitor specifications</para></listitem>
- <listitem><para>Video Adapter chipset</para></listitem>
- <listitem><para>Video Adapter memory</para></listitem>
+ <listitem><para>Monitor sync frequencies</para></listitem>
+ <listitem><para>Video card chipset</para></listitem>
+ <listitem><para>Video card memory</para></listitem>
</itemizedlist>
- <indexterm><primary>horizontal scan rate</primary></indexterm>
- <indexterm><primary>vertical scan rate</primary></indexterm>
-
- <para>The specifications for the monitor are used by
- X11 to determine the resolution and
- refresh rate to run at. These specifications can usually be
- obtained from the documentation that came with the monitor or from
- the manufacturer's website. There are two ranges of numbers that
- are needed, the horizontal scan rate and the vertical synchronization
- rate.</para>
-
- <para>The video adapter's chipset defines what driver module
- X11 uses to talk to the graphics
- hardware. With most chipsets, this can be automatically
- determined, but it is still useful to know in case the automatic
- detection does not work correctly.</para>
-
- <para>Video memory on the graphic adapter determines the
- resolution and color depth which the system can run at. This is
- important to know so the user knows the limitations of the
- system.</para>
+ <indexterm>
+ <primary>horizontal sync frequency</primary>
+ </indexterm>
+ <indexterm>
+ <primary>horizontal scan rate</primary>
+ <see>horizontal sync frequency</see>
+ </indexterm>
+ <indexterm><primary>refresh rate</primary></indexterm>
+ <indexterm>
+ <primary>vertical sync frequency</primary>
+ <see>refresh rate</see>
+ </indexterm>
+ <indexterm>
+ <primary>vertical scan rate</primary>
+ <see>refresh rate</see>
+ </indexterm>
+
+ <para>Screen resolution and refresh rate are determined by the
+ monitor's horizontal and vertical sync frequencies. Almost
+ all monitors support electronic autodetection of these values.
+ A few monitors do not provide these values, and the
+ specifications must be determined from the printed manual
+ or manufacturer web site.</para>
+
+ <para>The video card chipset is also autodetected, and used to
+ select the proper video driver. It is beneficial for the user
+ to be aware of which chipset is installed for when
+ autodetection does not provide the desired result.</para>
+
+ <para>Video card memory determines the maximum resolution and
+ color depth which can be displayed.</para>
</sect2>
<sect2>
@@ -585,12 +596,12 @@ dbus_enable="YES"</programlisting>
<indexterm><primary>X11 tuning</primary></indexterm>
- <para>Next, tune the <filename>xorg.conf.new</filename>
- configuration file to taste. Open the file in a text editor such
- as &man.emacs.1; or &man.ee.1;. First, add the
- frequencies for the target system's monitor. These are usually
- expressed as a horizontal and vertical synchronization rate. These
- values are added to the <filename>xorg.conf.new</filename> file
+ <para>The <filename>xorg.conf.new</filename>
+ configuration file may now be tuned to taste. Open the file in a text editor such
+ as &man.emacs.1; or &man.ee.1;. If the monitor is an older
+ or unusual model that does not support autodetection of
+ sync frequencies, those settings can
+ be added to <filename>xorg.conf.new</filename>
under the <literal>"Monitor"</literal> section:</para>
<programlisting>Section "Monitor"
@@ -601,14 +612,11 @@ dbus_enable="YES"</programlisting>
VertRefresh 48-120
EndSection</programlisting>
- <para>The <literal>HorizSync</literal> and
- <literal>VertRefresh</literal> keywords may be missing in the
- configuration file. If they are, they need to be added, with
- the correct horizontal synchronization rate placed after the
- <literal>HorizSync</literal> keyword and the vertical
- synchronization rate after the <literal>VertRefresh</literal>
- keyword. In the example above the target monitor's rates were
- entered.</para>
+ <para>Most monitors support sync frequency autodetection, making
+ manual entry of these values unnecessary. For the few
+ monitors that do not support autodetection, avoid potential
+ damage by only entering values provided by the
+ manufacturer.</para>
<para>X allows DPMS (Energy Star) features to be used with capable
monitors. The &man.xset.1; program controls the time-outs and can force
@@ -685,7 +693,7 @@ EndSection</programlisting>
<title>Advanced Configuration Topics</title>
<sect3>
- <title>Configuration with &intel; i810 Graphics Chipsets</title>
+ <title>Configuration with &intel; <literal>i810</literal> Graphics Chipsets</title>
<indexterm><primary>Intel i810 graphic chipset</primary></indexterm>
diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index 1d8c7f8b6b..1d6a2cf3cf 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -137,7 +137,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
MAINTAINER= asami@FreeBSD.org
-COMMENT= A cat chasing a mouse all over the screen
+COMMENT= Cat chasing a mouse all over the screen
MAN1= oneko.1
MANCOMPRESSED= yes
@@ -147,7 +147,7 @@ USE_IMAKE= yes
<para>See if you can figure it out. Do not worry about the
contents of the <literal>&dollar;FreeBSD&dollar;</literal>
- line, it will be filled in automatically by CVS when the port
+ line, it will be filled in automatically by SVN when the port
is imported to our main ports tree. You can find a more
detailed example in the <link
linkend="porting-samplem">sample Makefile</link>
@@ -720,7 +720,7 @@ PLIST_DIRS= lib/X11/oneko</programlisting>
<filename>patch-ab</filename> etc, always mention the path and
file name in patch names.</para>
- <para>Do not put RCS strings in patches. CVS will mangle them
+ <para>Do not put RCS strings in patches. SVN will mangle them
when we put the files into the ports tree, and when we check
them out again, they will come out different and the patch
will fail. RCS strings are surrounded by dollar
@@ -751,7 +751,7 @@ PLIST_DIRS= lib/X11/oneko</programlisting>
take a working piece of functionality from one project to fix
similar areas in another, please be careful: the resulting
line patch may be full of non-functional changes. It not only
- increases the size of the CVS repository but makes it hard to
+ increases the size of the SVN repository but makes it hard to
find out what exactly caused the problem and what you changed
at all.</para>
@@ -2451,6 +2451,10 @@ MASTER_SITE_SUBDIR= make</programlisting>
<programlisting>MASTER_SITES= SF/stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
+ <para>This can be also written as</para>
+ <programlisting>MASTER_SITES= SF
+MASTER_SITE_SUBDIR= stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
+
<table frame="none">
<title>Popular Magic <makevar>MASTER_SITES</makevar>
Macros</title>
@@ -3411,20 +3415,42 @@ ALWAYS_KEEP_DISTFILES= yes
<title><makevar>COMMENT</makevar></title>
<para>This is a one-line description of the port.
- <emphasis>Please</emphasis> do not include the package name
- (or version number of the software) in the comment. The
- comment should begin with a capital and end without a period.
- Here is an example:</para>
+ Please respect the following rules:</para>
+ <orderedlist>
+ <listitem>
+ <para>Try to keep the COMMENT value at no longer than 70
+ characters, as this line will be used by the &man.pkg.info.1;
+ utility to display a one-line summary of the port;</para>
+ </listitem>
+ <listitem>
+ <para>Do <emphasis>not</emphasis> include the package name
+ (or version number of the software);</para>
+ </listitem>
+ <listitem>
+ <para>The comment should begin with a capital and end without a
+ period;</para>
+ </listitem>
+ <listitem>
+ <para>Do not start with an indefinite article (i.e. A or An);</para>
+ </listitem>
+ <listitem>
+ <para>Names are capitalized (e.g. Apache, JavaScript, Perl);</para>
+ </listitem>
+ <listitem>
+ <para>For lists of words use the Oxford comma (e.g. green,
+ red<emphasis>,</emphasis> and blue);</para>
+ </listitem>
+ <listitem>
+ <para>Spell check the text.</para>
+ </listitem>
+ </orderedlist>
+ <para>Here is an example:</para>
- <programlisting>COMMENT= A cat chasing a mouse all over the screen</programlisting>
+ <programlisting>COMMENT= Cat chasing a mouse all over the screen</programlisting>
<para>The COMMENT variable should immediately follow the
MAINTAINER variable in the
<filename>Makefile</filename>.</para>
-
- <para>Please try to keep the COMMENT value at no longer than 70
- characters, as this line will be used by the &man.pkg.info.1;
- utility to display a one-line summary of the port.</para>
</sect1>
<sect1 id="makefile-depend">
@@ -3452,10 +3478,10 @@ ALWAYS_KEEP_DISTFILES= yes
and <replaceable>target</replaceable> is the target to call
in that directory. For example,</para>
- <programlisting>LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg</programlisting>
+ <programlisting>LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg</programlisting>
- <para>will check for a shared jpeg library with major
- version 9, and descend into the
+ <para>will check for a shared jpeg library with any version,
+ and descend into the
<filename>graphics/jpeg</filename> subdirectory of your
ports tree to build and install it if it is not found. The
<replaceable>target</replaceable> part can be omitted if it
@@ -3466,13 +3492,13 @@ ALWAYS_KEEP_DISTFILES= yes
<para>The <replaceable>lib</replaceable> part is a regular
expression which is being looked up in the
<command>ldconfig -r</command> output. Values such as
- <literal>intl.[5-7]</literal> and <literal>intl</literal>
+ <literal>intl.9</literal> and <literal>intl.[5-7]</literal>
are allowed. The first pattern,
+ <literal>intl.9</literal>, will match only version 9 of
+ intl, while
<literal>intl.[5-7]</literal>, will match any of:
<literal>intl.5</literal>, <literal>intl.6</literal> or
- <literal>intl.7</literal>. The second pattern,
- <literal>intl</literal>, will match any version of the
- <literal>intl</literal> library.</para>
+ <literal>intl.7</literal>.</para>
</note>
<para>The dependency is checked twice, once from within the
@@ -3503,11 +3529,11 @@ ALWAYS_KEEP_DISTFILES= yes
<para>For example,</para>
- <programlisting>RUN_DEPENDS= ${LOCALBASE}/etc/innd:${PORTSDIR}/news/inn \
+ <programlisting>RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn \
xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr</programlisting>
<para>will check if the file or directory
- <filename>/usr/local/etc/innd</filename> exists, and build
+ <filename>/usr/local/news/bin/innd</filename> exists, and build
and install it from the <filename>news/inn</filename>
subdirectory of the ports tree if it is not found. It will
also see if an executable called
@@ -3887,7 +3913,7 @@ BAR_DESC= Enable bar support
.include &lt;bsd.port.options.mk&gt;
-.if ${PORTOPTIONS:MBAR}
+.if ${PORT_OPTIONS:MBAR}
LIB_DEPENDS= bar:${PORTSDIR}/foo/bar
.endif</programlisting>
</example>
@@ -3899,6 +3925,42 @@ LIB_DEPENDS= bar:${PORTSDIR}/foo/bar
installation, and updating of these ports and their
packages.</para>
</sect2>
+
+ <sect2 id="use-want">
+ <title><makevar>USE_</makevar> and
+ <makevar>WANT_</makevar></title>
+
+ <para><makevar>USE_</makevar> variables are set by the port
+ maintainer to define software on which this port depends. A
+ port that needs Firefox would set</para>
+
+ <programlisting>USE_FIREFOX= yes</programlisting>
+
+ <para>Some <makevar>USE_</makevar> variables can accept
+ version numbers or other parameters. For example, a port
+ that requires Apache 2.2 would set</para>
+
+ <programlisting>USE_APACHE= 22</programlisting>
+
+ <para>For more control over dependencies in some cases,
+ <makevar>WANT_</makevar> variables are available to more
+ precisely specify what is needed. For example, consider the
+ <filename role="package">mail/squirrelmail</filename> port.
+ This port needs some PHP modules, which are listed in the
+ <makevar>USE_PHP</makevar> variable:</para>
+
+ <programlisting>USE_PHP= session mhash gettext mbstring pcre openssl xml</programlisting>
+
+ <para>Those modules may be available in CLI or web versions,
+ so the web version is selected with a
+ <makevar>WANT_</makevar> variable:</para>
+
+ <programlisting>WANT_PHP_WEB= yes</programlisting>
+
+ <para>Available <makevar>USE_</makevar> and
+ <makevar>WANT_</makevar> variables are defined in the files
+ in <filename>/usr/ports/Mk</filename>.</para>
+ </sect2>
</sect1>
<sect1 id="makefile-masterdir">
@@ -4112,7 +4174,7 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</programlisting>
<para>These variables are designed to be set by the system
administrator. There are many that are standardized in
the <ulink
- url="http://www.freebsd.org/cgi/cvsweb.cgi/ports/KNOBS?rev=HEAD&amp;content-type=text/x-cvsweb-markup"><filename>ports/KNOBS</filename></ulink>
+ url="http://svn.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>ports/KNOBS</filename></ulink>
file.</para>
<para>When creating a port, do not make knob names specific
@@ -4192,7 +4254,7 @@ ${MANPREFIX}/man/de/man3/baz.3.gz</programlisting>
for the benefit of end-users and to help keep the number
of knob names down. A list of popular knob names can be
found in the <ulink
- url="http://www.freebsd.org/cgi/cvsweb.cgi/ports/KNOBS?rev=HEAD&amp;content-type=text/x-cvsweb-markup">KNOBS</ulink>
+ url="http://svn.FreeBSD.org/ports/head/KNOBS?view=markup"><filename>KNOBS</filename></ulink>
file.</para>
<para>Knob names should reflect what the knob is and does.
@@ -4426,7 +4488,7 @@ CONFIGURE_ARGS+= --with-foo
<title>Wrong Handling of an Option</title>
<programlisting>.if ${PORT_OPTIONS:MFOO}
-LIB_DEPENDS+= foo.0:${PORTSDIR}/devel/foo
+LIB_DEPENDS+= foo:${PORTSDIR}/devel/foo
CONFIGURE_ARGS+= --enable-foo
.endif</programlisting>
</example>
@@ -4445,7 +4507,7 @@ CONFIGURE_ARGS+= --enable-foo
<title>Correct Handling of an Option</title>
<programlisting>.if ${PORT_OPTIONS:MFOO}
-LIB_DEPENDS+= foo.0:${PORTSDIR}/devel/foo
+LIB_DEPENDS+= foo:${PORTSDIR}/devel/foo
CONFIGURE_ARGS+= --enable-foo
.else
CONFIGURE_ARGS+= --disable-foo
@@ -5456,6 +5518,45 @@ IGNORE= may not be redistributed because of licensing reasons. Please visit <rep
</sect2>
</sect1>
+ <sect1 id="using-pkg-config">
+ <title>Using <literal>pkg-config</literal></title>
+
+ <para>If your ports requires <literal>pkg-config</literal>,
+ just set <makevar>USE_PKGCONFIG</makevar> to the following
+ possible values:</para>
+ <table frame="none">
+ <title>Values for <makevar>USE_PKGCONFIG</makevar></title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Definition</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry><makevar>USE_PKGCONFIG= yes</makevar></entry>
+ <entry>The ports uses pkg-config only at build time</entry>
+ </row>
+ <row>
+ <entry><makevar>USE_PKGCONFIG= build</makevar></entry>
+ <entry>The ports uses pkg-config only at build time</entry>
+ </row>
+ <row>
+ <entry><makevar>USE_PKGCONFIG= run</makevar></entry>
+ <entry>The ports uses pkg-config only at run time</entry>
+ </row>
+ <row>
+ <entry><makevar>USE_PKGCONFIG= both</makevar></entry>
+ <entry>The ports uses pkg-config both at build and run time</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </sect1>
+
<sect1 id="using-gettext">
<title>Using GNU <literal>gettext</literal></title>
@@ -6919,8 +7020,8 @@ QT_COMPONENTS= moc_build qmake_build rcc_build uic_build</programlisting>
section are implemented in <filename>bsd.java.mk</filename>.
If you ever think that your port needs more sophisticated
Java support, please first have a look at the <ulink
- url="http://www.freebsd.org/cgi/cvsweb.cgi/ports/Mk/bsd.java.mk">
- bsd.java.mk CVS log</ulink> as it usually takes some time
+ url="http://svn.FreeBSD.org/ports/head/Mk/bsd.java.mk?view=markup">bsd.java.mk
+ SVN log</ulink> as it usually takes some time
to document the latest features. Then, if you think the
support you are lacking would be beneficial to many other
Java ports, feel free to discuss it on the &a.java;.</para>
@@ -6955,17 +7056,18 @@ QT_COMPONENTS= moc_build qmake_build rcc_build uic_build</programlisting>
<entry><makevar>USE_APACHE</makevar></entry>
<entry>The port requires Apache. Possible values:
<literal>yes</literal> (gets any version),
- <literal>2.0</literal>, <literal>2.2</literal>,
- <literal>2.0+</literal>, etc.
- Default dependency is on version
- <literal>2.2</literal>.</entry>
+ <literal>20</literal>, <literal>22</literal>,
+ <literal>20-22</literal>, <literal>20+</literal>,
+ etc. The default APACHE version is
+ <literal>22</literal>. More details are available in
+ <filename>ports/Mk/bsd.apache.mk</filename> and at
+ <ulink url="http://wiki.freebsd.org/Apache/">wiki.freebsd.org/Apache/</ulink>.</entry>
</row>
<row>
<entry><makevar>WITH_APACHE2</makevar></entry>
<entry>This variable is deprecated and should
- not be used
- any more.</entry>
+ not be used any more.</entry>
</row>
<row>
@@ -9011,7 +9113,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
role="package">databases/postgresql90-client</filename>
port. An associated variable,
<makevar>WANT_PGSQL_VER</makevar>, may be set to
- values such as 83, 84, 90, or 91. You can declare a
+ values such as 83, 84, 90, 91 or 92. You can declare a
minimum or maximum value;
<makevar>WANT_PGSQL_VER</makevar>=
<literal> 90+</literal> will cause the
@@ -9031,8 +9133,7 @@ CFLAGS+= -DLUA_VERSION_STRING="${VER_STR}"
</table>
<para>More details are available in <ulink
- url="http://www.freebsd.org/cgi/cvsweb.cgi/ports/Mk/bsd.database.mk">
- bsd.database.mk</ulink>.</para>
+ url="http://svn.FreeBSD.org/ports/head/Mk/bsd.database.mk?view=markup">bsd.database.mk</ulink>.</para>
</sect1>
<sect1 id="rc-scripts">
@@ -9143,13 +9244,13 @@ run_rc_command "$1"</programlisting>
<para>in their <filename>rc.conf.local</filename> file, and a
variable substitution using &quot;:=&quot; would
- inappropriately override the user's intention.</para>
+ inappropriately override the user's intention. The
+ <literal>_enable</literal> variable is not optional,
+ and should use the &quot;:&quot; for the default.</para>
<note>
<para>No new scripts should be added with the
- <filename>.sh</filename> suffix. At some point there will
- be a mass repocopy of all the scripts that still have that
- suffix.</para>
+ <filename>.sh</filename> suffix.</para>
</note>
<sect2>
@@ -9355,7 +9456,7 @@ GROUPS= pulse pulse-access pulse-rt</programlisting>
<filename>ports/GIDs</filename>.</para>
</sect1>
- <sect1>
+ <sect1 id="requiring-kernel-sources">
<title>Ports That Rely on Kernel Sources</title>
<para>Some ports (such as kernel loadable modules) need the
@@ -10169,8 +10270,8 @@ as .putsy.conf and edit it.</programlisting>
<screen>&prompt.user; <userinput>/usr/bin/diff something.orig something > something.diff</userinput></screen>
</informalexample>
- <para>Otherwise, you should either use the <command>cvs
- diff</command> method (<xref linkend="cvs-diff"/>) or copy the
+ <para>Otherwise, you should either use the <command>svn
+ diff</command> method (<xref linkend="svn-diff"/>) or copy the
contents of the port to an entire different directory and use
the result of the recursive &man.diff.1; output of the new and
old ports directories (e.g., if your modified port directory is
@@ -10209,7 +10310,7 @@ as .putsy.conf and edit it.</programlisting>
<quote>Class</quote> of your PR should be
<literal>change-request</literal>. Please mention any added or
deleted files in the message, as they have to be explicitly
- specified to &man.cvs.1; when doing a commit. If the diff is
+ specified to &man.svn.1; when doing a commit. If the diff is
more than about 20KB, please compress and uuencode it;
otherwise, just include it in the PR as is.</para>
@@ -10238,11 +10339,11 @@ as .putsy.conf and edit it.</programlisting>
<para>Now that you have done all that, you will want to read about
how to keep up-to-date in <xref linkend="keeping-up"/>.</para>
- <sect1 id="cvs-diff">
- <title>Using <literal>CVS</literal> to Make Patches</title>
+ <sect1 id="svn-diff">
+ <title>Using <literal>SVN</literal> to Make Patches</title>
- <para>If you can, please submit a &man.cvs.1; diff; they are
- easier to handle than diffs between <quote>new and old</quote>
+ <para>If you can, please submit a &man.svn.1 diff; they are easier to
+ handle than diffs between <quote>new and old</quote>
directories. Plus it is easier for you to see what you have
changed and to update your diff if something is modified in
the Ports Collection from when you started to work on it until
@@ -10250,7 +10351,7 @@ as .putsy.conf and edit it.</programlisting>
something.</para>
<screen>&prompt.user; <userinput>cd ~/my_wrkdir</userinput> <co id="my-wrkdir"/>
-&prompt.user; <userinput>cvs -d R_CVSROOT co pdnsd</userinput> <co id="R-CVSROOT"/> <co id="module-name"/>
+&prompt.user; <userinput>svn co svn://svn.FreeBSD.org/ports/head/dns/pdnsd</userinput> <co id="svn-FreeBSD-org"/>
&prompt.user; <userinput>cd ~/my_wrkdir/pdnsd</userinput></screen>
<calloutlist>
@@ -10261,53 +10362,38 @@ as .putsy.conf and edit it.</programlisting>
class="directory">/usr/ports/</filename>.</para>
</callout>
- <callout arearefs="R-CVSROOT">
- <para>R_CVSROOT is any public cvs server, see how to use cvs
- in the <ulink
- url="&url.books.handbook;/anoncvs.html">&os;
- Handbook</ulink>.</para>
- </callout>
-
- <callout arearefs="module-name">
- <para>pdnsd is the module name for the port; it is generally
- the name of the port, although there are some exceptions,
- notably for language-specific categories (<filename
- role="package">german/selfhtml</filename> has the module
- name de-selfhtml); you can either look up the module name
- via the <ulink
- url="&url.base;/cgi/cvsweb.cgi/ports">cvsweb
- interface</ulink> or use the whole path, in our example
- <filename
- class="directory">ports/dns/pdnsd</filename>.</para>
+ <callout arearefs="svn-FreeBSD-org">
+ <para><ulink url="http://svn.FreeBSD.org/">svn.FreeBSD.org</ulink>
+ is a public <literal>SVN</literal> server.</para>
</callout>
</calloutlist>
<para>While in the working directory, make any changes that you
would usually make to the port. If you add or remove a file,
- use <command>cvs</command> to track these changes:</para>
+ use <command>svn</command> to track these changes:</para>
- <screen>&prompt.user; <userinput>cvs add new_file</userinput>
-&prompt.user; <userinput>cvs remove deleted_file</userinput></screen>
+ <screen>&prompt.user; <userinput>svn add new_file</userinput>
+&prompt.user; <userinput>svn remove deleted_file</userinput></screen>
<para>Make sure that you check the port using the checklist in
<xref linkend="porting-testing"/> and
<xref linkend="porting-portlint"/>.</para>
- <screen>&prompt.user; <userinput>cvs status</userinput>
-&prompt.user; <userinput>cvs update</userinput> <co id="cvs-update"/></screen>
+ <screen>&prompt.user; <userinput>svn status</userinput>
+&prompt.user; <userinput>svn update</userinput> <co id="svn-update"/></screen>
<calloutlist>
- <callout arearefs="cvs-update">
+ <callout arearefs="svn-update">
<para>This will try to merge the differences between your
- patch and current CVS; watch the output carefully. The
+ patch and current SVN; watch the output carefully. The
letter in front of each file name indicates what was done
- with it. See <xref linkend="table-cvs-up"/> for a complete
+ with it. See <xref linkend="table-svn-up"/> for a complete
list.</para>
</callout>
</calloutlist>
- <table pgwide="1" frame="none" id="table-cvs-up">
- <title><literal>CVS</literal> Update File Prefixes</title>
+ <table pgwide="1" frame="none" id="table-svn-up">
+ <title><literal>SVN</literal> Update File Prefixes</title>
<tgroup cols="2">
<tbody>
@@ -10317,7 +10403,7 @@ as .putsy.conf and edit it.</programlisting>
</row>
<row>
- <entry>P</entry>
+ <entry>G</entry>
<entry>The file was updated without problems (you will
only see this when working against a remote
repository).</entry>
@@ -10339,25 +10425,22 @@ as .putsy.conf and edit it.</programlisting>
</table>
<para>If you get <literal>C</literal> as a result of
- <literal>cvs update</literal> it means something changed in
- the CVS and &man.cvs.1; was not able to merge your local
- changes and those from CVS. It is always a good idea to
- inspect the changes anyway, since <command>cvs</command> does
- not know anything about how a port should be, so it might (and
- probably will) merge things that do not make sense.</para>
+ <command>svn update</command> it means something changed in
+ the SVN repository and &man.svn.1; was not able to merge your
+ local changes and those from the repository. It is always a good idea
+ to inspect the changes anyway, since &man.svn.1;
+ does not know anything about how a port should be, so it might
+ (and probably will) merge things that do not make sense.</para>
<para>The last step is to make a unified &man.diff.1;
- of the files against CVS:</para>
+ of the files against SVN:</para>
- <screen>&prompt.user; <userinput>cvs diff -uN &gt; ../`basename ${PWD}`.diff</userinput></screen>
+ <screen>&prompt.user; <userinput>svn diff &gt; ../`basename ${PWD}`.diff</userinput></screen>
<note>
- <para>It is important to use <option>-N</option> to ensure
- that files you have added or removed are accounted for in
- the patch. The patch will include any removed files when
- applied, though the file contents will be empty, so remember
- to include these in the PR so the committer knows to remove
- them.</para>
+ <para>Any files that have been removed should be explicitly
+ mentioned in the PR, because file removal may not be obvious
+ to the committer.</para>
</note>
<para>Send your patch following the guidelines in
@@ -10384,12 +10467,24 @@ as .putsy.conf and edit it.</programlisting>
instructions, please make sure to get the shell escaping
right.</para>
- <para>If your port is deleted or renamed, you should add an
- entry to <filename>/usr/ports/MOVED</filename>. Entries in
- this file use the following format:</para>
+ <para>The <filename>/usr/ports/MOVED</filename> file is used to
+ list moved or removed ports. Each line in the file is made
+ up of the name of the port, where the port was moved to, when,
+ and why. If the port was removed, the section detailing where
+ it was moved to can be left blank. Each section must be
+ separated by the <literal>|</literal> (pipe) character, like
+ so:</para>
<programlisting>old name|new name (blank for deleted)|date of move|reason</programlisting>
+ <para>The date should be entered in the form <literal>YYYY-
+ MM-DD</literal>. New entries should be added to the end
+ of the file to keep it in chronological order.</para>
+
+ <para>If a port was removed but has since been restored,
+ delete the line in this file that states that it was
+ removed.</para>
+
<para>The changes can be validated with
<command>Tools/scripts/MOVEDlint.awk</command>.</para>
</sect1>
@@ -10981,7 +11076,7 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<para>The preferred way to tell 4.3BSD/Reno (1990) and newer
versions of the BSD code apart is by using the
<literal>BSD</literal> macro defined in <ulink
- url="http://cvsweb.freebsd.org/src/sys/sys/param.h">sys/param.h</ulink>.
+ url="http://svnweb.freebsd.org/base/head/sys/sys/param.h?view=markup">sys/param.h</ulink>.
Hopefully that file is already included; if not, add the
code:</para>
@@ -11085,7 +11180,7 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<para>Here is a convenient list of
<literal>__FreeBSD_version</literal> values as defined in
<ulink
- url="http://cvsweb.freebsd.org/src/sys/sys/param.h">sys/param.h</ulink>:</para>
+ url="http://svnweb.FreeBSD.org/base/head/sys/sys/param.h?view=markup">sys/param.h</ulink>:</para>
<table frame="none">
<title><literal>__FreeBSD_version</literal> Values</title>
@@ -14898,7 +14993,7 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<entry>802517</entry>
<entry>February 15, 2012</entry>
<entry>8.2-STABLE after introduction of the new
- extentensible sysctl(3) interface NET_RT_IFLISTL
+ extensible sysctl(3) interface NET_RT_IFLISTL
to query address lists (rev
<svnref>231769</svnref>.</entry>
</row>
@@ -15287,9 +15382,9 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<entry>900503</entry>
<entry>February 15, 2012</entry>
<entry>9.0-STABLE after introduction of the new
- extentensible sysctl(3) interface NET_RT_IFLISTL
+ extensible sysctl(3) interface NET_RT_IFLISTL
to query address lists (rev
- <svnref>231768</svnref>.</entry>
+ <svnref>231768</svnref>).</entry>
</row>
<row>
@@ -15297,7 +15392,7 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<entry>March 3, 2012</entry>
<entry>9.0-STABLE after changes related to mounting
of filesystem inside a jail (rev
- <svnref>232728</svnref>.</entry>
+ <svnref>232728</svnref>).</entry>
</row>
<row>
@@ -15380,12 +15475,19 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<entry>1000008</entry>
<entry>February 11, 2012</entry>
<entry>10-CURRENT after introduction of the new
- extentensible sysctl(3) interface NET_RT_IFLISTL
+ extensible sysctl(3) interface NET_RT_IFLISTL
to query address lists (rev
<svnref>231505</svnref>).</entry>
</row>
<row>
+ <entry>1000009</entry>
+ <entry>February 25, 2012</entry>
+ <entry>10-CURRENT after import of libarchive 3.0.3
+ (rev <svnref>232153</svnref>).</entry>
+ </row>
+
+ <row>
<entry>1000010</entry>
<entry>March 31, 2012</entry>
<entry>10-CURRENT after xlocale cleanup (rev
@@ -15412,6 +15514,27 @@ Reference: &lt;http://www.freebsd.org/ports/portaudit/74a9541d-5d6c-11d8-80e3-00
<entry>10-CURRENT after byacc import
(rev <svnref>235788</svnref>).</entry>
</row>
+
+ <row>
+ <entry>1000014</entry>
+ <entry>June 27, 2012</entry>
+ <entry>10-CURRENT after BSD sort becoming the default
+ sort (rev <svnref>237629</svnref>).</entry>
+ </row>
+
+ <row>
+ <entry>1000015</entry>
+ <entry>July 12, 2012</entry>
+ <entry>10-CURRENT after import of OpenSSL 1.0.1c
+ (rev <svnref>238405</svnref>).</entry>
+ </row>
+
+ <row>
+ <entry>(not changed)</entry>
+ <entry>July 13, 2012</entry>
+ <entry>10-CURRENT after the fix for LLVM/Clang 3.1
+ regression (rev <svnref>238429</svnref>).</entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -15714,7 +15837,7 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting>
<title><filename>README.html</filename></title>
<para>Do not include the <filename>README.html</filename> file.
- This file is not part of the cvs collection but is generated
+ This file is not part of the SVN collection but is generated
using the <command>make readme</command> command.</para>
<note>
@@ -15787,9 +15910,9 @@ exec %%LOCALBASE%%/bin/java -jar %%DATADIR%%/foo.jar "$@"</programlisting>
<listitem>
<para><makevar>FORBIDDEN</makevar> is used for ports that
- do contain a security vulnerability or induce grave
+ contain a security vulnerability or induce grave
concern regarding the security of a FreeBSD system with
- a given port installed (ex: a reputably insecure program
+ a given port installed (e.g., a reputably insecure program
or a program that provides easily exploitable services).
Ports should be marked as <makevar>FORBIDDEN</makevar>
as soon as a particular piece of software has a
@@ -16017,6 +16140,77 @@ IGNORE= POINTYHAT is not supported
and confirm the changes with them.</para>
</sect1>
+ <sect1 id="dads-avoiding-linuxisms">
+ <title>Avoiding Linuxisms</title>
+
+ <para>Do not use <filename>/proc</filename> if there are any
+ other ways of getting the information, e.g.
+ <function>setprogname(argv[0])</function> in
+ <function>main()</function> and then &man.getprogname.3; if
+ you want to <quote>know your name</quote>.</para>
+
+ <para>Do not rely on behaviour that is undocumented by
+ <acronym>POSIX</acronym>.</para>
+
+ <para>Do not record timestamps in the critical path of the
+ application if it also works without. Getting timestamps may
+ be slow, depending on the accuracy of timestamps in the
+ <acronym>OS</acronym>. If timestamps are really needed,
+ determine how precise they have to be and use an
+ <acronym>API</acronym> which is documented to just deliver the
+ needed precision.</para>
+
+ <para>A number of simple syscalls (for example
+ &man.gettimeofday.2;, &man.getpid.2;) are much faster on
+ &linux; than on any other operating system due to caching and
+ the vsyscall performance optimizations. Do not rely on them
+ being cheap in performance-critical applications. In general,
+ try hard to avoid syscalls if possible.</para>
+
+ <para>Do not rely on &linux;-specific socket behaviour. In
+ particular, default socket buffer sizes are different (call
+ &man.setsockopt.2; with <literal>SO_SNDBUF</literal> and
+ <literal>SO_RCVBUF</literal>, and while &linux;'s &man.send.2;
+ blocks when the socket buffer is full, &os;'s will fail and
+ set <literal>ENOBUFS</literal> in errno.</para>
+
+ <para>If relying on non-standard behaviour is required,
+ encapsulate it properly into a generic <acronym>API</acronym>,
+ do a check for the behaviour in the configure stage, and stop
+ if it is missing.</para>
+
+ <para>Check the <ulink
+ url="http://www.freebsd.org/cgi/man.cgi">man pages</ulink> to
+ see if the function used is a <acronym>POSIX</acronym>
+ interface (in the <quote>STANDARDS</quote> section of the man
+ page).</para>
+
+ <para>Do not assume that <filename>/bin/sh</filename> is
+ <application>bash</application>. Ensure that a command line
+ passed to &man.system.3; will work with a
+ <acronym>POSIX</acronym> compliant shell.</para>
+
+ <para>A list of common <application>bash</application>isms is
+ available <ulink
+ url="https://wiki.ubuntu.com/DashAsBinSh">here</ulink>.</para>
+
+ <para>Do not <literal>#include
+ <filename>&lt;stdint.h&gt;</filename></literal> if
+ <filename>inttypes.h</filename> is sufficient. This will
+ ensure that the software builds on older versions of
+ &os;.</para>
+
+ <para>Check that headers are included in the
+ <acronym>POSIX</acronym> or man page recommended way, e.g.
+ <filename>sys/types.h</filename> is often forgotten, which is
+ not as much of a problem for &linux; as it is for &os;.</para>
+
+ <para>Compile threaded applications with
+ <quote>-pthread</quote>, not <quote>-lpthread</quote> or
+ variations thereof.</para>
+
+ </sect1>
+
<sect1 id="dads-misc">
<title>Miscellanea</title>
@@ -16059,9 +16253,9 @@ not be changed when upgrading the port later.]
# Whom: Satoshi Asami &lt;asami@FreeBSD.org&gt;
#
# &dollar;FreeBSD&dollar;
-[ ^^^^^^^^^ This will be automatically replaced with RCS ID string by CVS
+[ ^^^^^^^^^ This will be automatically replaced with RCS ID string by SVN
when it is committed to our repository. If upgrading a port, do not alter
-this line back to "&dollar;FreeBSD&dollar;". CVS deals with it automatically.]
+this line back to "&dollar;FreeBSD&dollar;". SVN deals with it automatically.]
#
[section to describe the port itself and the master site - PORTNAME
@@ -16096,7 +16290,7 @@ COMMENT= A DVI Previewer for the X Window System
[dependencies -- can be empty]
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript
-LIB_DEPENDS= Xpm.5:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= Xpm:${PORTSDIR}/graphics/xpm
[this section is for other standard bsd.port.mk variables that do not
belong to any of the above]
@@ -16172,20 +16366,20 @@ pre-install:
commits.</para>
</sect1>
- <sect1 id="cvsweb">
+ <sect1 id="svnweb">
<title>The Web Interface to the Source Repository</title>
<para>It is possible to browse the files in the source
repository by using a web interface. Changes that affect the
entire port system are now documented in the <ulink
- url="http://cvsweb.FreeBSD.org/ports/CHANGES">
- CHANGES</ulink> file. Changes that affect individual ports
+ url="http://svnweb.FreeBSD.org/ports/head/CHANGES">CHANGES</ulink>
+ file. Changes that affect individual ports
are now documented in the <ulink
- url="http://cvsweb.FreeBSD.org/ports/UPDATING">
- UPDATING</ulink> file. However, the definitive answer to
+ url="http://svnweb.FreeBSD.org/ports/head/UPDATING">UPDATING</ulink>
+ file. However, the definitive answer to
any question is undoubtedly to read the source code of <ulink
- url="http://cvsweb.FreeBSD.org/ports/Mk/bsd.port.mk">
- bsd.port.mk</ulink>, and associated files.</para>
+ url="http://svnweb.FreeBSD.org/ports/head/Mk/bsd.port.mk">bsd.port.mk</ulink>,
+ and associated files.</para>
</sect1>
<sect1 id="ports-mailling-list">
@@ -16218,19 +16412,40 @@ pre-install:
</sect1>
<sect1 id="distfile-survey">
- <title>The &os; Ports Distfile Scanner</title>
+ <title>Portscout: the &os; Ports Distfile Scanner</title>
<para>The build cluster is dedicated to building the latest
release of each port with distfiles that have already been
fetched. However, as the Internet continually changes,
- distfiles can quickly go missing. The <ulink
- url="http://www.portscout.org">FreeBSD Ports distfile
- scanner</ulink> attempts to query every download site for
- every port to find out if each distfile is still currently
- available. Maintainers are asked to check this report
- periodically, not only to speed up the building process for
- users, but to help avoid wasting bandwidth of the sites that
- volunteer to host all these distfiles.</para>
+ distfiles can quickly go missing. <ulink
+ url="http://portscout.org">Portscout</ulink>, the &os;
+ Ports distfile scanner, attempts to query every download site
+ for every port to find out if each distfile is still
+ available. <application>Portscout</application> can generate
+ <acronym>HTML</acronym> reports and send emails about newly
+ available ports to those who request them. Unless not
+ otherwise subscribed, maintainers are asked to check
+ periodically for changes, either by hand or using the
+ <acronym>RSS</acronym> feed.</para>
+
+ <para><application>Portscout</application>'s first page gives
+ the email address of the port maintainer, the number of ports
+ the maintainer is responsible for, the number of those ports
+ with new distfiles, and the percentage of those ports that are
+ out-of-date. The search function allows for searching by
+ email address for a specific maintainer, and for selecting
+ whether or not only out-of-date ports should be shown.</para>
+
+ <para>Upon clicking on a maintainer's email address,
+ a list of all of their ports is displayed, along with port
+ category, current version number, whether or not there is a
+ new version, when the port was last updated, and finally when
+ it was last checked. A search function on this page allows
+ the user to search for a specific port.</para>
+
+ <para>Clicking on a port name in the list displays the
+ <ulink url="http://freshports.org">FreshPorts</ulink> port
+ information.</para>
</sect1>
<sect1 id="portsmon">