svn commit: r46928 - head/en_US.ISO8859-1/books/porters-handbook/makefiles

[Mathieu Arnold]

Author: mat
Date: Mon Jul  6 09:26:34 2015
New Revision: 46928
URL: https://svnweb.freebsd.org/changeset/doc/46928

Log:
  Rewrite the master_site_n section to use macros.
  
  Approved by:	wblock (mentor)
  Differential Revision:	https://reviews.freebsd.org/D2940

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml

Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml	Mon Jul  6 08:51:55 2015	(r46927)
+++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml	Mon Jul  6 09:26:34 2015	(r46928)
@@ -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>