Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Jun 2015 15:17:23 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r46893 - head/en_US.ISO8859-1/books/porters-handbook/makefiles
Message-ID:  <201506291517.t5TFHNYD085107@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Mon Jun 29 15:17:22 2015
New Revision: 46893
URL: https://svnweb.freebsd.org/changeset/doc/46893

Log:
  Catch up with newly created macros.
  
  Approved by:	wblock (mentor)
  Sponsored by:	Absolight
  Differential Revision:	https://reviews.freebsd.org/D2539

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 Jun 29 15:16:38 2015	(r46892)
+++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml	Mon Jun 29 15:17:22 2015	(r46893)
@@ -1654,15 +1654,16 @@ PORTEPOCH=	1</programlisting>
 	  Variables</title>
 
 	<para>Shortcut abbreviations are available for popular
-	  archives like SourceForge (<literal>SF</literal>), GNU
-	  (<literal>GNU</literal>), or Perl CPAN
-	  (<literal>CPAN</literal>).  <varname>MASTER_SITES</varname>
-	  can use them directly:</para>
+	  archives like SourceForge (<literal>SOURCEFORGE</literal>),
+	  GNU (<literal>GNU</literal>), or Perl CPAN
+	  (<literal>PERL_CPAN</literal>).
+	  <varname>MASTER_SITES</varname> can use them
+	  directly:</para>
 
 	<programlisting>MASTER_SITES=	GNU/make</programlisting>
 
 	<para>The older expanded format still works, but all ports
-	  should be converted to the compact format.  The expanded
+	  have been converted to the compact format.  The expanded
 	  format looks like this:</para>
 
 	<programlisting>MASTER_SITES=		${MASTER_SITE_GNU}
@@ -1687,24 +1688,89 @@ MASTER_SITE_SUBDIR=	make</programlisting
 
 	  <programlisting>MASTER_SITES=	<replaceable>FOO</replaceable>/<replaceable>bar</replaceable></programlisting>
 	</tip>
+
+	<note>
+	  <para>Some
+	    <varname>MASTER_SITE_<replaceable>*</replaceable></varname>
+	    names are quite long, and for ease of use, shortcuts have
+	    been defined:</para>
+
+	  <table frame="none" xml:id="makefile-master_sites-shortcut">
+	    <title>Shortcuts for
+	      <varname>MASTER_SITE_<replaceable>*</replaceable></varname>
+	      Macros</title>
+
+	    <tgroup cols="2">
+	      <thead>
+		<row>
+		  <entry>Macro</entry>
+		  <entry>Shortcut</entry>
+		</row>
+	      </thead>
+
+	      <tbody>
+		<row>
+		  <entry><varname>PERL_CPAN</varname></entry>
+		  <entry><varname>CPAN</varname></entry>
+		</row>
+
+		<row>
+		  <entry><varname>GITHUB</varname></entry>
+		  <entry><varname>GH</varname></entry>
+		</row>
+
+		<row>
+		  <entry><varname>GITHUB_CLOUD</varname></entry>
+		  <entry><varname>GHC</varname></entry>
+		</row>
+
+		<row>
+		  <entry><varname>LIBREOFFICE_DEV</varname></entry>
+		  <entry><varname>LODEV</varname></entry>
+		</row>
+
+		<row>
+		  <entry><varname>NETLIB</varname></entry>
+		  <entry><varname>NL</varname></entry>
+		</row>
+
+		<row>
+		  <entry><varname>RUBYGEMS</varname></entry>
+		  <entry><varname>RG</varname></entry>
+		</row>
+
+		<row>
+		  <entry><varname>SOURCEFORGE</varname></entry>
+		  <entry><varname>SF</varname></entry>
+		</row>
+
+		<row>
+		  <entry><varname>SOURCEFORGE_JP</varname></entry>
+		  <entry><varname>SFJP</varname></entry>
+		</row>
+	      </tbody>
+	    </tgroup>
+	  </table>
+	</note>
       </sect3>
 
       <sect3 xml:id="makefile-master_sites-magic">
 	<title>Magic MASTER_SITES Macros</title>
 
-	<para>Several <emphasis>magic</emphasis> macros exist for
+	<para>Several <quote>magic</quote> macros exist for
 	  popular sites with a predictable directory structure.  For
-	  these, just use the abbreviation and the system will try to
-	  guess the correct subdirectory automatically.  For a port
+	  these, just use the abbreviation and the system will choose
+	  a subdirectory automatically.  For a port
 	  named <literal>Stardict</literal>, of version
 	  <literal>1.2.3</literal>, and hosted on SourceForge, adding
 	  this line:</para>
 
 	<programlisting>MASTER_SITES=	SF</programlisting>
 
-	<para>Will infer a subdirectory named
+	<para>infers a subdirectory named
 	  <literal>/project/stardict/stardict/1.2.3</literal>.  If the
-	  guess is incorrect, it can be overridden as follows.</para>
+	  inferred directory is incorrect, it can be
+	  overridden:</para>
 
 	<programlisting>MASTER_SITES=	SF/stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
 
@@ -1714,7 +1780,7 @@ MASTER_SITE_SUBDIR=	make</programlisting
 MASTER_SITE_SUBDIR=	stardict/WyabdcRealPeopleTTS/${PORTVERSION}</programlisting>
 
 	<table frame="none" xml:id="makefile-master_sites-popular">
-	  <title>Popular Magic <varname>MASTER_SITES</varname>
+	  <title>Magic <varname>MASTER_SITES</varname>
 	    Macros</title>
 
 	  <tgroup cols="2">
@@ -1752,6 +1818,11 @@ MASTER_SITE_SUBDIR=	stardict/WyabdcRealP
 	      </row>
 
 	      <row>
+		<entry><varname>CPAN</varname></entry>
+		<entry><literal>${PORTNAME:C/-.*//}</literal></entry>
+	      </row>
+
+	      <row>
 		<entry><varname>DEBIAN</varname></entry>
 		<entry><literal>pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME}</literal></entry>
 	      </row>
@@ -1762,11 +1833,26 @@ MASTER_SITE_SUBDIR=	stardict/WyabdcRealP
 	      </row>
 
 	      <row>
+		<entry><varname>FESTIVAL</varname></entry>
+		<entry><literal>${PORTREVISION}</literal></entry>
+	      </row>
+
+	      <row>
 		<entry><varname>GCC</varname></entry>
 		<entry><literal>releases/${DISTNAME}</literal></entry>
 	      </row>
 
 	      <row>
+		<entry><varname>GENTOO</varname></entry>
+		<entry><literal>distfiles</literal></entry>
+	      </row>
+
+	      <row>
+		<entry><varname>GIMP</varname></entry>
+		<entry><literal>${PORTNAME}/${PORTVERSION:R}/</literal></entry>
+	      </row>
+
+	      <row>
 		<entry><varname>GH</varname></entry>
 		<entry><literal>${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/</literal></entry>
 	      </row>
@@ -1777,22 +1863,17 @@ MASTER_SITE_SUBDIR=	stardict/WyabdcRealP
 	      </row>
 
 	      <row>
-		<entry><varname>GHL</varname></entry>
-		<entry><literal>${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/</literal></entry>
-	      </row>
-
-	      <row>
 		<entry><varname>GNOME</varname></entry>
 		<entry><literal>sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}</literal></entry>
 	      </row>
 
 	      <row>
-		<entry><varname>GIMP</varname></entry>
-		<entry><literal>${PORTNAME}/${PORTVERSION:R}/</literal></entry>
+		<entry><varname>GNU</varname></entry>
+		<entry><literal>${PORTNAME}</literal></entry>
 	      </row>
 
 	      <row>
-		<entry><varname>GNU</varname></entry>
+		<entry><varname>GNUPG</varname></entry>
 		<entry><literal>${PORTNAME}</literal></entry>
 	      </row>
 
@@ -1827,8 +1908,13 @@ MASTER_SITE_SUBDIR=	stardict/WyabdcRealP
 	      </row>
 
 	      <row>
-		<entry><varname>CPAN</varname></entry>
-		<entry><literal>${PORTNAME:C/-.*//}</literal></entry>
+		<entry><varname>QT</varname></entry>
+		<entry><literal>archive/qt/${PORTVERSION:R}</literal></entry>
+	      </row>
+
+	      <row>
+		<entry><varname>SAMBA</varname></entry>
+		<entry><literal>${PORTNAME}</literal></entry>
 	      </row>
 
 	      <row>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506291517.t5TFHNYD085107>