From owner-svn-doc-all@freebsd.org Tue Jul 7 15:47:28 2015 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 01BBB996159 for ; Tue, 7 Jul 2015 15:47:28 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D996A1614; Tue, 7 Jul 2015 15:47:27 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t67FlRUj056986; Tue, 7 Jul 2015 15:47:27 GMT (envelope-from blackend@FreeBSD.org) Received: (from blackend@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t67FlQbO056977; Tue, 7 Jul 2015 15:47:26 GMT (envelope-from blackend@FreeBSD.org) Message-Id: <201507071547.t67FlQbO056977@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: blackend set sender to blackend@FreeBSD.org using -f From: Marc Fonvieille Date: Tue, 7 Jul 2015 15:47:26 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org Subject: 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... X-SVN-Group: doc-release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jul 2015 15:47:28 -0000 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" to the X server configuration file (/etc/X11/xorg.conf), which reads: - FontPath "/usr/local/lib/X11/fonts/urwfonts/" + FontPath "/usr/local/share/fonts/urwfonts/" Alternatively, at the command line in the X session run: - &prompt.user; xset fp+ /usr/local/lib/X11/fonts/urwfonts + &prompt.user; xset fp+ /usr/local/share/fonts/urwfonts &prompt.user; xset fp rehash This will work but will be lost when the X session is @@ -619,7 +619,7 @@ dbus_enable="YES" Now make a directory for the &truetype; fonts (for example, - /usr/local/lib/X11/fonts/TrueType) and + /usr/local/share/fonts/TrueType) 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" Ports Collection as x11-fonts/ttmkfdir. - &prompt.root; cd /usr/local/lib/X11/fonts/TrueType + &prompt.root; cd /usr/local/share/fonts/TrueType &prompt.root; ttmkfdir -o fonts.dir Now add the &truetype; directory to the font path. This is just the same as described in : - &prompt.user; xset fp+ /usr/local/lib/X11/fonts/TrueType + &prompt.user; xset fp+ /usr/local/share/fonts/TrueType &prompt.user; xset fp rehash or add a FontPath line to @@ -677,7 +677,7 @@ dbus_enable="YES" All fonts in &xorg; that are - found in /usr/local/lib/X11/fonts/ and + found in /usr/local/share/fonts/ and ~/.fonts/ 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" <fontconfig> As previously stated, all fonts in - /usr/local/lib/X11/fonts/ as well as + /usr/local/share/fonts/ as well as ~/.fonts/ 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 - How do I group one of the special variables from + How do I group one of the special macros from bsd.sites.mk, for example, - MASTER_SITE_SOURCEFORGE? + SourceForge (SF)? - See . + This has been simplified as much as possible. See + . Detailed Use of <literal>MASTER_SITES:n</literal> - with - <varname>MASTER_SITE_SOURCEFORGE</varname> + with SourceForge (SF) - MASTER_SITES= http://site1/ ${MASTER_SITE_SOURCEFORGE:S/$/:sourceforge,TEST/} + MASTER_SITES= http://site1/ SF/something/1.0:sourceforge,TEST DISTFILES= something.tar.gz:sourceforge - something.tar.gz will be - fetched from all sites within - MASTER_SITE_SOURCEFORGE. + fetched from all sites within SourceForge. + @@ -4693,6 +4692,16 @@ PORTVERSION= 1.0 WRKSRC= ${WRKDIR}/${PORTNAME} + + <varname>WRKSRC_SUBDIR</varname> + + If the source files needed for the port are in a + subdirectory of the extracted distribution file, set + WRKSRC_SUBDIR to that directory. + + WRKSRC_SUBDIR= src + + <varname>NO_WRKSUBDIR</varname> @@ -4701,6 +4710,14 @@ PORTVERSION= 1.0 indicate that. NO_WRKSUBDIR= yes + + + Because WRKDIR 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. + 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;, DESTDIR has a different meaning (see ). - When a port still requires system-wide privileges in order - to run the stage and - package targets, this line must be - added to the - Makefile: - - NEED_ROOT= yes - - The vast majority of ports do not really - need to be root. It can mostly be avoided by - using USES=uidfix, - and from time to time by slightly patching the port's - Makefiles. + No port really needs to be root. It + can mostly be avoided by using USES=uidfix. + If the port still runs commands like &man.chown.8;, + &man.chgrp.1;, or forces owner or group with &man.install.1; + then use USES=fakeroot + to fake those calls. Sligh patching of the port's + Makefiles will be needed. Meta ports, or ports that do not install files themselves @@ -57,6 +52,13 @@ NO_MTREE= yes + + Metaports should use USES=metaport. + It sets up defaults for ports that do not fetch, build, or + install anything. + + Staging is enabled by prepending STAGEDIR to paths used in the pre-install, 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 @@ (none) Changes some default behaviour of build systems to - allow installing as a user. + allow installing as a user. See for + more information on fakeroot. 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. --> fa accès à aux attributs des fichiers - Audit the access of object attributes such as - &man.stat.1; and &man.pathconf.2;. enregistre l'accès aux attributs des objets comme &man.stat.1;, &man.pathconf.2;.