From owner-svn-doc-head@freebsd.org  Mon Jul  6 09:26:36 2015
Return-Path: <owner-svn-doc-head@freebsd.org>
Delivered-To: svn-doc-head@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 2D546A2DC;
 Mon,  6 Jul 2015 09:26:36 +0000 (UTC) (envelope-from mat@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 0198112FE;
 Mon,  6 Jul 2015 09:26:36 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t669QZeK035718;
 Mon, 6 Jul 2015 09:26:35 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t669QZNH035717;
 Mon, 6 Jul 2015 09:26:35 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201507060926.t669QZNH035717@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 6 Jul 2015 09:26:35 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46928 -
 head/en_US.ISO8859-1/books/porters-handbook/makefiles
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jul 2015 09:26:36 -0000

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>