svn commit: r46935 - in release/10.2.0: en_US.ISO8859-1/books/handbook/x11 en_US.ISO8859-1/books/porters-handbook/makefiles en_US.ISO8859-1/books/porters-handbook/special en_US.ISO8859-1/books/port...
Marc Fonvieille
blackend at FreeBSD.org
Tue Jul 7 15:47:28 UTC 2015
Author: blackend
Date: Tue Jul 7 15:47:25 2015
New Revision: 46935
URL: https://svnweb.freebsd.org/changeset/doc/46935
Log:
r46934
https://svnweb.freebsd.org/changeset/doc/46934
Remove a forgotten original line which breaks the PDF build.
While I'm there MFH:
r46928-46929
https://svnweb.freebsd.org/changeset/doc/46928
Rewrite the master_site_n section to use macros.
https://svnweb.freebsd.org/changeset/doc/46929
Various small fixes for en_US.ISO8859-1/books/porters-handbook
r46930
https://svnweb.freebsd.org/changeset/doc/46930
Fix path for Xorg fonts to /usr/local/share/fonts/
Approved by: doceng (implicit)
Modified:
release/10.2.0/en_US.ISO8859-1/books/handbook/x11/chapter.xml
release/10.2.0/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
release/10.2.0/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
release/10.2.0/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
release/10.2.0/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml
Directory Properties:
release/10.2.0/ (props changed)
release/10.2.0/en_US.ISO8859-1/ (props changed)
release/10.2.0/fr_FR.ISO8859-1/ (props changed)
Modified: release/10.2.0/en_US.ISO8859-1/books/handbook/x11/chapter.xml
==============================================================================
--- release/10.2.0/en_US.ISO8859-1/books/handbook/x11/chapter.xml Tue Jul 7 15:21:12 2015 (r46934)
+++ release/10.2.0/en_US.ISO8859-1/books/handbook/x11/chapter.xml Tue Jul 7 15:47:25 2015 (r46935)
@@ -577,12 +577,12 @@ dbus_enable="YES"</programlisting>
to the X server configuration file
(<filename>/etc/X11/xorg.conf</filename>), which reads:</para>
- <programlisting>FontPath "/usr/local/lib/X11/fonts/urwfonts/"</programlisting>
+ <programlisting>FontPath "/usr/local/share/fonts/urwfonts/"</programlisting>
<para>Alternatively, at the command line in the X session
run:</para>
- <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/urwfonts</userinput>
+ <screen>&prompt.user; <userinput>xset fp+ /usr/local/share/fonts/urwfonts</userinput>
&prompt.user; <userinput>xset fp rehash</userinput></screen>
<para>This will work but will be lost when the X session is
@@ -619,7 +619,7 @@ dbus_enable="YES"</programlisting>
<para>Now make a directory for the &truetype; fonts (for
example,
- <filename>/usr/local/lib/X11/fonts/TrueType</filename>) and
+ <filename>/usr/local/share/fonts/TrueType</filename>) and
copy all of the &truetype; fonts into this directory. Keep in
mind that &truetype; fonts cannot be directly taken from an
&apple; &mac;; they must be in &unix;/&ms-dos;/&windows;
@@ -632,14 +632,14 @@ dbus_enable="YES"</programlisting>
Ports Collection as
<package>x11-fonts/ttmkfdir</package>.</para>
- <screen>&prompt.root; <userinput>cd /usr/local/lib/X11/fonts/TrueType</userinput>
+ <screen>&prompt.root; <userinput>cd /usr/local/share/fonts/TrueType</userinput>
&prompt.root; <userinput>ttmkfdir -o fonts.dir</userinput></screen>
<para>Now add the &truetype; directory to the font path. This
is just the same as described in <xref
linkend="type1"/>:</para>
- <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/TrueType</userinput>
+ <screen>&prompt.user; <userinput>xset fp+ /usr/local/share/fonts/TrueType</userinput>
&prompt.user; <userinput>xset fp rehash</userinput></screen>
<para>or add a <literal>FontPath</literal> line to
@@ -677,7 +677,7 @@ dbus_enable="YES"</programlisting>
</indexterm>
<para>All fonts in <application>&xorg;</application> that are
- found in <filename>/usr/local/lib/X11/fonts/</filename> and
+ found in <filename>/usr/local/share/fonts/</filename> and
<filename>~/.fonts/</filename> are automatically made
available for anti-aliasing to Xft-aware applications. Most
recent applications are Xft-aware, including
@@ -707,7 +707,7 @@ dbus_enable="YES"</programlisting>
<fontconfig></programlisting>
<para>As previously stated, all fonts in
- <filename>/usr/local/lib/X11/fonts/</filename> as well as
+ <filename>/usr/local/share/fonts/</filename> as well as
<filename>~/.fonts/</filename> are already made available to
Xft-aware applications. If you wish to add another directory
outside of these two directory trees, add a line similar to
Modified: release/10.2.0/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
==============================================================================
--- release/10.2.0/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Tue Jul 7 15:21:12 2015 (r46934)
+++ release/10.2.0/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Tue Jul 7 15:47:25 2015 (r46935)
@@ -2742,27 +2742,26 @@ MASTER_SITE_SUBDIR= directory-trial:1 di
</listitem>
<listitem>
- <para>How do I group one of the special variables from
+ <para>How do I group one of the special macros from
<filename>bsd.sites.mk</filename>, for example,
- <varname>MASTER_SITE_SOURCEFORGE</varname>?</para>
+ SourceForge (<literal>SF</literal>)?</para>
- <para>See <xref
- linkend="ports-master-sites-n-example-detailed-use-master-site-sourceforge"/>.</para>
+ <para>This has been simplified as much as possible. See
+ <xref
+ linkend="ports-master-sites-n-example-detailed-use-master-site-sourceforge"/>.</para>
<example
xml:id="ports-master-sites-n-example-detailed-use-master-site-sourceforge">
<title>Detailed Use of <literal>MASTER_SITES:n</literal>
- with
- <varname>MASTER_SITE_SOURCEFORGE</varname></title>
+ with SourceForge (<literal>SF</literal>)</title>
- <programlisting>MASTER_SITES= http://site1/ ${MASTER_SITE_SOURCEFORGE:S/$/:sourceforge,TEST/}
+ <programlisting>MASTER_SITES= http://site1/ SF/something/1.0:sourceforge,TEST
DISTFILES= something.tar.gz:sourceforge</programlisting>
- </example>
<para><filename>something.tar.gz</filename> will be
- fetched from all sites within
- <varname>MASTER_SITE_SOURCEFORGE</varname>.</para>
+ fetched from all sites within SourceForge.</para>
+ </example>
</listitem>
<listitem>
@@ -4693,6 +4692,16 @@ PORTVERSION= 1.0</programlisting>
<programlisting>WRKSRC= ${WRKDIR}/${PORTNAME}</programlisting>
</sect2>
+ <sect2 xml:id="makefile-wrksrc_subdir">
+ <title><varname>WRKSRC_SUBDIR</varname></title>
+
+ <para>If the source files needed for the port are in a
+ subdirectory of the extracted distribution file, set
+ <varname>WRKSRC_SUBDIR</varname> to that directory.</para>
+
+ <programlisting>WRKSRC_SUBDIR= src</programlisting>
+ </sect2>
+
<sect2 xml:id="makefile-no_wrksubdir">
<title><varname>NO_WRKSUBDIR</varname></title>
@@ -4701,6 +4710,14 @@ PORTVERSION= 1.0</programlisting>
indicate that.</para>
<programlisting>NO_WRKSUBDIR= yes</programlisting>
+
+ <note>
+ <para>Because <varname>WRKDIR</varname> is the only directory
+ that is supposed to be writable during the build, and is
+ used to store many files recording the status of the build,
+ it is always better to force extraction into a subdirectory
+ anyway.</para>
+ </note>
</sect2>
</sect1>
Modified: release/10.2.0/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
==============================================================================
--- release/10.2.0/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Tue Jul 7 15:21:12 2015 (r46934)
+++ release/10.2.0/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Tue Jul 7 15:47:25 2015 (r46935)
@@ -31,21 +31,16 @@
in &os;, <varname>DESTDIR</varname> has a different meaning
(see <xref linkend="porting-prefix"/>).</para>
- <para>When a port still requires system-wide privileges in order
- to run the <buildtarget>stage</buildtarget> and
- <buildtarget>package</buildtarget> targets, this line must be
- added to the
- <filename>Makefile</filename>:</para>
-
- <programlisting>NEED_ROOT= yes</programlisting>
-
<note>
- <para>The vast majority of ports do not <emphasis>really
- need</emphasis> to be root. It can mostly be avoided by
- using <link
- linkend="uses-uidfix"><literal>USES=uidfix</literal></link>,
- and from time to time by slightly patching the port's
- <filename>Makefiles</filename>.</para>
+ <para>No port <emphasis>really</emphasis> needs to be root. It
+ can mostly be avoided by using <link
+ linkend="uses-uidfix"><literal>USES=uidfix</literal></link>.
+ If the port still runs commands like &man.chown.8;,
+ &man.chgrp.1;, or forces owner or group with &man.install.1;
+ then use <link
+ linkend="uses-fakeroot"><literal>USES=fakeroot</literal></link>
+ to fake those calls. Sligh patching of the port's
+ <filename>Makefiles</filename> will be needed.</para>
</note>
<para>Meta ports, or ports that do not install files themselves
@@ -57,6 +52,13 @@
<programlisting>NO_MTREE= yes</programlisting>
+ <tip>
+ <para>Metaports should use <link
+ linkend="uses-metaport"><literal>USES=metaport</literal></link>.
+ It sets up defaults for ports that do not fetch, build, or
+ install anything.</para>
+ </tip>
+
<para>Staging is enabled by prepending
<varname>STAGEDIR</varname> to paths used in the
<buildtarget>pre-install</buildtarget>,
Modified: release/10.2.0/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
==============================================================================
--- release/10.2.0/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml Tue Jul 7 15:21:12 2015 (r46934)
+++ release/10.2.0/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml Tue Jul 7 15:47:25 2015 (r46935)
@@ -407,7 +407,9 @@
<entry>(none)</entry>
<entry>Changes some default behaviour of build systems to
- allow installing as a user.</entry>
+ allow installing as a user. See <link
+ xlink:href="http://fakeroot.alioth.debian.org/"/> for
+ more information on <command>fakeroot</command>.</entry>
</row>
<row xml:id="uses-fam">
Modified: release/10.2.0/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml
==============================================================================
--- release/10.2.0/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml Tue Jul 7 15:21:12 2015 (r46934)
+++ release/10.2.0/fr_FR.ISO8859-1/books/handbook/audit/chapter.xml Tue Jul 7 15:47:25 2015 (r46935)
@@ -328,8 +328,6 @@ requirements. -->
<row>
<entry>fa</entry>
<entry>accès à aux attributs des fichiers</entry>
- <entry>Audit the access of object attributes such as
- &man.stat.1; and &man.pathconf.2;.</entry>
<entry>enregistre l'accès aux attributs des objets comme
&man.stat.1;, &man.pathconf.2;.</entry>
</row>
More information about the svn-doc-all
mailing list