From owner-svn-doc-head@FreeBSD.ORG  Thu Mar 19 20:01:46 2015
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 58EBC598;
 Thu, 19 Mar 2015 20:01:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 430BEF8D;
 Thu, 19 Mar 2015 20:01:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2JK1kg9048006;
 Thu, 19 Mar 2015 20:01:46 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2JK1jCG048005;
 Thu, 19 Mar 2015 20:01:46 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201503192001.t2JK1jCG048005@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 19 Mar 2015 20:01:45 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46360 -
 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.18-1
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: Thu, 19 Mar 2015 20:01:46 -0000

Author: mat (ports committer)
Date: Thu Mar 19 20:01:45 2015
New Revision: 46360
URL: https://svnweb.freebsd.org/changeset/doc/46360

Log:
  Document the changes in USE_GITHUB.
  
  Differential Revision:	https://reviews.freebsd.org/D2100
  Approved by:	brd
  Sponsored by:	Absolight

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	Thu Mar 19 19:20:20 2015	(r46359)
+++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml	Thu Mar 19 20:01:45 2015	(r46360)
@@ -1721,7 +1721,7 @@ MASTER_SITE_SUBDIR=	stardict/WyabdcRealP
 
 	    <row>
 	      <entry><varname>GH</varname></entry>
-	      <entry><literal>/${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/</literal></entry>
+	      <entry><literal>/${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}</literal></entry>
 	    </row>
 
 	    <row>
@@ -1806,7 +1806,6 @@ MASTER_SITE_SUBDIR=	stardict/WyabdcRealP
 		<entry>Variable</entry>
 		<entry>Description</entry>
 		<entry>Default</entry>
-		<entry>Mandatory</entry>
 	      </row>
 	    </thead>
 
@@ -1815,8 +1814,7 @@ MASTER_SITE_SUBDIR=	stardict/WyabdcRealP
 		<entry><varname>GH_ACCOUNT</varname></entry>
 		<entry>Account name of the GitHub user hosting the
 		  project</entry>
-		<entry>none</entry>
-		<entry>Mandatory</entry>
+		<entry><literal>${PORTNAME}</literal></entry>
 	      </row>
 
 	      <row>
@@ -1830,21 +1828,10 @@ MASTER_SITE_SUBDIR=	stardict/WyabdcRealP
 		<entry><varname>GH_TAGNAME</varname></entry>
 		<entry>Name of the tag to download (2.0.1, hash, ...)
 		  Using the name of a branch here is incorrect.  It is
-		  possible to do
-		  <literal>GH_TAGNAME=${GH_COMMIT}</literal> to do a
+		  also possible to use the hash of a commit id to do a
 		  snapshot</entry>
 		<entry><literal>${DISTVERSION}</literal></entry>
 	      </row>
-
-	      <row>
-		<entry><varname>GH_COMMIT</varname></entry>
-		<entry>first 7 digits of the commit that generated
-		  <varname>GH_TAGNAME</varname> (see
-		  <link
-		    xlink:href="http://www.freebsd.org/cgi/man.cgi?query=git-describe&amp;sektion=1&amp;manpath=FreeBSD+Ports">git-describe(1)</link>)</entry>
-		<entry>none</entry>
-		<entry>Mandatory</entry>
-	      </row>
 	    </tbody>
 	  </tgroup>
 	</table>
@@ -1863,13 +1850,12 @@ MASTER_SITE_SUBDIR=	stardict/WyabdcRealP
 PORTVERSION=	1.2.7
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	freebsd
-GH_COMMIT=	f53e577</programlisting>
+GH_ACCOUNT=	freebsd</programlisting>
 
 	  <para>It will automatically have
 	    <varname>MASTER_SITES</varname> set to <literal>GH
 	      GHC</literal> and <varname>WRKSRC</varname> to
-	    <literal>${WRKDIR}/freebsd-pkg-f53e577</literal>.</para>
+	    <literal>${WRKDIR}/pkg-1.2.7</literal>.</para>
 	</example>
 
 	<example xml:id="makefile-master_sites-github-ex2">
@@ -1889,13 +1875,12 @@ PORTVERSION=	1.3.0.a.20140411
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	pkg
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	6dbb17b</programlisting>
+GH_TAGNAME=	6dbb17b</programlisting>
 
 	  <para>It will automatically have
 	    <varname>MASTER_SITES</varname> set to <literal>GH
 	      GHC</literal> and <varname>WRKSRC</varname> to
-	    <literal>${WRKDIR}/freebsd-pkg-6dbb17b</literal>.</para>
+	    <literal>${WRKDIR}/pkg-6dbb17b</literal>.</para>
 	</example>
 
       </sect3>