Date: Sun, 24 Mar 2013 18:31:38 +0000 (UTC) From: Warren Block <wblock@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r41305 - head/en_US.ISO8859-1/books/porters-handbook Message-ID: <201303241831.r2OIVcJI077737@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wblock Date: Sun Mar 24 18:31:38 2013 New Revision: 41305 URL: http://svnweb.freebsd.org/changeset/doc/41305 Log: Whitespace-only cleanup. Translators, please ignore. Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml head/en_US.ISO8859-1/books/porters-handbook/uses.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/book.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/book.xml Sun Mar 24 18:16:16 2013 (r41304) +++ head/en_US.ISO8859-1/books/porters-handbook/book.xml Sun Mar 24 18:31:38 2013 (r41305) @@ -3799,10 +3799,10 @@ ALWAYS_KEEP_DISTFILES= yes <sect2 id="uses"> <title><makevar>USES</makevar></title> - <para>There several parameters exist for defining different kind - of features and dependencies that the port in question uses. - They can be specified by adding the following line to the - <filename>Makefile</filename> of the port:</para> + <para>There several parameters exist for defining different + kind of features and dependencies that the port in question + uses. They can be specified by adding the following line to + the <filename>Makefile</filename> of the port:</para> <programlisting>USES= feature[:arguments]</programlisting> @@ -3810,8 +3810,8 @@ ALWAYS_KEEP_DISTFILES= yes linkend="uses-values"/>.</para> <warning> - <para><makevar>USES</makevar> cannot be assigned after inclusion of - <filename>bsd.port.pre.mk</filename>.</para> + <para><makevar>USES</makevar> cannot be assigned after + inclusion of <filename>bsd.port.pre.mk</filename>.</para> </warning> </sect2> @@ -4467,7 +4467,7 @@ OPTIONS_SINGLE_SG1= OPT3 OPT4</programli choices, where none or only one choice from each group is allowed:</para> - <programlisting>OPTIONS_RADIO= RG1 + <programlisting>OPTIONS_RADIO= RG1 OPTIONS_RADIO_RG1= OPT7 OPT8</programlisting> <para><makevar>OPTIONS</makevar> can also be grouped as @@ -4530,7 +4530,9 @@ RUN_DEPENDS+= bar:${PORTSDIR}/bar/bar </example> <example id ="ports-options-check-unset"> - <title>Check for Unset Port <makevar>OPTIONS</makevar></title> + <title>Check for Unset Port + <makevar>OPTIONS</makevar></title> + <programlisting>.if ! ${PORT_OPTIONS:MEXAMPLES} CONFIGURE_ARGS+=--without-examples .endif</programlisting> @@ -4583,30 +4585,37 @@ CONFIGURE_ARGS+= --without-examples <sect3> <title>Default Options</title> - <para>The following options are always on by default.</para> - <itemizedlist> + + <para>The following options are always on by default.</para> + + <itemizedlist> <listitem> <para><literal>DOCS</literal> — build and install documentation.</para> </listitem> + <listitem> <para><literal>NLS</literal> — Native Language Support.</para> - </listitem> + </listitem> + <listitem> - <para><literal>EXAMPLES</literal> — build and install - examples.</para> + <para><literal>EXAMPLES</literal> — build and + install examples.</para> </listitem> + <listitem> - <para><literal>IPV6</literal> — IPv6 protocol support.</para> + <para><literal>IPV6</literal> — IPv6 protocol + support.</para> </listitem> </itemizedlist> + <note> <para>There is no need to add these to - <makevar>OPTIONS_DEFAULT</makevar>. To have them show up - in the options selection dialog, however, they must be added - to <makevar>OPTIONS_DEFINE</makevar>.</para> - </note> + <makevar>OPTIONS_DEFAULT</makevar>. To have them show + up in the options selection dialog, however, they must + be added to <makevar>OPTIONS_DEFINE</makevar>.</para> + </note> </sect3> </sect2> @@ -4982,13 +4991,14 @@ PORTVERSION= 1.0</programlisting> </itemizedlist> <note> - <para>The <literal>DOCS</literal> option only controls additional - documentation installed in <makevar>DOCSDIR</makevar>. It - does not apply to standard man pages and info pages. - Things installed in <makevar>DATADIR</makevar> and + <para>The <literal>DOCS</literal> option only controls + additional documentation installed in + <makevar>DOCSDIR</makevar>. It does not apply to standard + man pages and info pages. Things installed in + <makevar>DATADIR</makevar> and <makevar>EXAMPLESDIR</makevar> are controlled by - <literal>DATA</literal> and - <literal>EXAMPLES</literal> options, respectively.</para> + <literal>DATA</literal> and <literal>EXAMPLES</literal> + options, respectively.</para> </note> <para>These variables are exported to @@ -5022,14 +5032,13 @@ PORTVERSION= 1.0</programlisting> is listed in <makevar>PORTDOCS</makevar> or matched by a glob pattern from this variable, the entire subtree of contained files and directories will be registered in the - final packing list. If the <literal>DOCS</literal> option has - been unset then files and directories listed in - <makevar>PORTDOCS</makevar> would not be installed - or added to port packing list. Installing the - documentation at <makevar>PORTDOCS</makevar> as shown above - remains up to the port itself. A typical example of - utilizing <makevar>PORTDOCS</makevar> looks as - follows:</para> + final packing list. If the <literal>DOCS</literal> option + has been unset then files and directories listed in + <makevar>PORTDOCS</makevar> would not be installed or added + to port packing list. Installing the documentation at + <makevar>PORTDOCS</makevar> as shown above remains up to the + port itself. A typical example of utilizing + <makevar>PORTDOCS</makevar> looks as follows:</para> <programlisting>PORTDOCS= README.* ChangeLog docs/*</programlisting> @@ -5916,13 +5925,15 @@ PLIST_SUB+= NLS="@comment " reside under <filename><makevar>LOCALBASE</makevar>/share/locale</filename>, should rarely be created and removed by a port. The most + popular languages have their respective directories listed - in <filename><makevar>PORTSDIR</makevar>/Templates/BSD.local.dist</filename>. + in + <filename><makevar>PORTSDIR</makevar>/Templates/BSD.local.dist</filename>. The directories for many other languages are governed by the <filename role="package">devel/gettext</filename> port. - Consult its <filename>pkg-plist</filename> and see - whether the port is going to install a message catalog file - for a unique language.</para> + Consult its <filename>pkg-plist</filename> and see whether + the port is going to install a message catalog file for a + unique language.</para> </sect2> </sect1> @@ -6840,7 +6851,7 @@ do-configure: <literal>_run</literal> suffixes can be used to force components dependency type (e.g., <literal>baseapps_run</literal>). If no suffix is set, a - default dependency type will be used. If you want to force + default dependency type will be used. If you want to force both types, add the component twice with both suffixes (e.g., <literal>automoc4_build automoc4_run</literal>). The most commonly used components are listed below (up-to-date @@ -10622,7 +10633,8 @@ as .putsy.conf and edit it.</programlist <literal>portsmon</literal>). This system attempts to classify port PRs by portname. To search for PRs about a particular port, use the <ulink - url="http://portsmon.FreeBSD.org/portoverview.py">Overview of One Port</ulink>.</para> + url="http://portsmon.FreeBSD.org/portoverview.py">Overview of + One Port</ulink>.</para> <para>If there is no pending PR, the next step is to send an email to the port's maintainer, as shown by <command>make @@ -10722,13 +10734,13 @@ as .putsy.conf and edit it.</programlist <sect1 id="svn-diff"> <title>Using <literal>SVN</literal> to Make Patches</title> - <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 - you submit your changes, or if the committer asks you to fix - something.</para> + <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 you submit your changes, or if the committer asks + you to fix something.</para> <screen>&prompt.user; <userinput>cd ~/my_wrkdir</userinput> <co id="my-wrkdir"/> &prompt.user; <userinput>svn co <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/ports/head/dns/pdnsd</userinput>; <co id="svn-FreeBSD-org"/> @@ -15807,29 +15819,30 @@ Reference: <http://www.freebsd.org/po <row> <entry>901501</entry> <entry>November 11, 2012</entry> - <entry>9.1-STABLE after LIST_PREV() added to queue.h.</entry> + <entry>9.1-STABLE after LIST_PREV() added to + queue.h.</entry> </row> <row> <entry>901502</entry> <entry>November 28, 2012</entry> - <entry>9.1-STABLE after USB serial jitter buffer requires - rebuild of USB serial device modules.</entry> + <entry>9.1-STABLE after USB serial jitter buffer + requires rebuild of USB serial device modules.</entry> </row> <row> <entry>901503</entry> <entry>February 21, 2013</entry> - <entry>9.1-STABLE after USB moved to the driver structure - requiring a rebuild of all USB modules. Also indicates - the presence of nmtree.</entry> + <entry>9.1-STABLE after USB moved to the driver + structure requiring a rebuild of all USB modules. + Also indicates the presence of nmtree.</entry> </row> <row> <entry>901504</entry> <entry>March 15, 2013</entry> - <entry>9.1-STABLE after install gained -l, -M, -N and related - flags and cat gained the -l option.</entry> + <entry>9.1-STABLE after install gained -l, -M, -N and + related flags and cat gained the -l option.</entry> </row> <row> @@ -15998,7 +16011,7 @@ Reference: <http://www.freebsd.org/po <entry>October 16, 2012</entry> <entry>10-CURRENT after the network interface cloning KPI changed and struct if_clone becoming opaque (rev - <svnref>241610</svnref>).</entry> + <svnref>241610</svnref>).</entry> </row> <row> @@ -16040,21 +16053,21 @@ Reference: <http://www.freebsd.org/po <row> <entry>1000025</entry> <entry>November 17, 2012</entry> - <entry>10-CURRENT after the sin6_scope_id member variable - in struct sockaddr_in6 was changed to being filled by the - kernel before passing the structure to the userland via - sysctl or routing socket. This means the KAME-specific - embedded scope id in sin6_addr.s6_addr[2] is always - cleared in userland application (rev - <svnref>243443</svnref>).</entry> + <entry>10-CURRENT after the sin6_scope_id member + variable in struct sockaddr_in6 was changed to being + filled by the kernel before passing the structure to + the userland via sysctl or routing socket. This means + the KAME-specific embedded scope id in + sin6_addr.s6_addr[2] is always cleared in userland + application (rev <svnref>243443</svnref>).</entry> </row> <row> <entry>1000026</entry> <entry>January 11, 2013</entry> <entry>10-CURRENT after install gained the -N flag (rev - <svnref>245313</svnref>). May also be used to indicate - the presense of nmtree.</entry> + <svnref>245313</svnref>). May also be used to + indicate the presense of nmtree.</entry> </row> <row> @@ -16331,12 +16344,12 @@ exec %%LOCALBASE%%/bin/java -jar %%DATAD <note> <para>If building the port errors out with - <literal>unrecognized option '-pthread'</literal>, - it may be desirable to use <command>cc</command> as linker by - setting <makevar>CONFIGURE_ENV</makevar> to - <literal>LD=${CC}</literal>. The - <literal>-pthread</literal> option is not supported by - <command>ld</command> directly.</para> + <literal>unrecognized option '-pthread'</literal>, it may be + desirable to use <command>cc</command> as linker by setting + <makevar>CONFIGURE_ENV</makevar> to + <literal>LD=${CC}</literal>. The + <literal>-pthread</literal> option is not supported by + <command>ld</command> directly.</para> </note> </sect1> @@ -16935,9 +16948,9 @@ pre-install: release of each port with distfiles that have already been fetched. However, as the Internet continually changes, distfiles can quickly go missing. <ulink - url="http://portscout.FreeBSD.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 + url="http://portscout.FreeBSD.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 Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/uses.xml Sun Mar 24 18:16:16 2013 (r41304) +++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml Sun Mar 24 18:31:38 2013 (r41305) @@ -24,27 +24,28 @@ role="package">devel/bison</filename> in one way or another. By default, with no arguments or with the <literal>build</literal> argument, it implies <command>bison</command> as a build-time - dependency, <literal>run</literal> implies a run-time dependency, and - <literal>both</literal> implies both run-time and build-time + dependency, <literal>run</literal> implies a run-time dependency, + and <literal>both</literal> implies both run-time and build-time dependencies.</entry> </row> <row> <entry><literal>cmake</literal></entry> <entry>none, <literal>outsource</literal></entry> - <entry>The port will use <application>CMake</application> for configuring - and building. With the <literal>outsource</literal> argument, an - out-of-source build will be performed. For more information see - <xref linkend="using-cmake"/>. - </entry> + + <entry>The port will use <application>CMake</application> for + configuring and building. With the <literal>outsource</literal> + argument, an out-of-source build will be performed. For more + information see <xref linkend="using-cmake"/>.</entry> </row> <row> <entry><literal>fuse</literal></entry> <entry>none</entry> - <entry>Implies the port will depend on the FUSE library and handle the the dependency on the kernel module depending on the version of - &os;. - </entry> + + <entry>Implies the port will depend on the FUSE library and handle + the the dependency on the kernel module depending on the version + of &os;.</entry> </row> <row> @@ -61,11 +62,12 @@ <entry>none, <literal>build</literal>, <literal>run</literal>, <literal>both</literal>, <literal>vars</literal></entry> <entry>Implies that the port uses <filename - role="package">mail/qmail</filename> in one way or another. With - the <literal>build</literal> argument, it implies <command>qmail</command> - as a build-time dependency. <literal>run</literal> implies a run-time - dependency. Using no argument or the <literal>both</literal> argument - implies both run-time and build-time dependencies. <literal>vars</literal> + role="package">mail/qmail</filename> in one way or another. + With the <literal>build</literal> argument, it implies + <command>qmail</command> as a build-time dependency. + <literal>run</literal> implies a run-time dependency. Using no + argument or the <literal>both</literal> argument implies both + run-time and build-time dependencies. <literal>vars</literal> will only set QMAIL variables for the port to use.</entry> </row> @@ -73,7 +75,7 @@ <entry><literal>zenoss</literal></entry> <entry>none</entry> <entry>Implies the port uses <filename - role="package">net-mgmt/zenoss</filename> in one way or another, but - largely is used for building zenoss related zenpack ports. - </entry> + role="package">net-mgmt/zenoss</filename> in one way or another, + but largely is used for building zenoss related zenpack + ports.</entry> </row>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303241831.r2OIVcJI077737>