From owner-svn-doc-head@freebsd.org  Thu Mar  3 13:01:58 2016
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 B3229A9328F;
 Thu,  3 Mar 2016 13:01:58 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 8493DB82;
 Thu,  3 Mar 2016 13:01:58 +0000 (UTC)
 (envelope-from wblock@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u23D1vY2045143;
 Thu, 3 Mar 2016 13:01:57 GMT (envelope-from wblock@FreeBSD.org)
Received: (from wblock@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u23D1voi045142;
 Thu, 3 Mar 2016 13:01:57 GMT (envelope-from wblock@FreeBSD.org)
Message-Id: <201603031301.u23D1voi045142@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wblock set sender to
 wblock@FreeBSD.org using -f
From: Warren Block <wblock@FreeBSD.org>
Date: Thu, 3 Mar 2016 13:01:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r48316 -
 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.21
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Mar 2016 13:01:58 -0000

Author: wblock
Date: Thu Mar  3 13:01:57 2016
New Revision: 48316
URL: https://svnweb.freebsd.org/changeset/doc/48316

Log:
  Always set PORTVERSION!  Except when DISTVERSION is set, then NEVER set
  PORTVERSION!  (Requested by koobs in IRC.)  Also clarify the part about
  PORTNAME being unique.  (Unrequested, but that didn't stop me.)

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  3 09:44:05 2016	(r48315)
+++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml	Thu Mar  3 13:01:57 2016	(r48316)
@@ -53,13 +53,16 @@
 	<varname>PORTVERSION</varname></title>
 
       <para>Set <varname>PORTNAME</varname> to the base
-	name of the port, and <varname>PORTVERSION</varname> to the
-	version number of the port.</para>
+	name of the port.  Set <varname>PORTVERSION</varname> to the
+	version number of the port unless
+	<varname>DISTVERSION</varname> is used (see
+	<xref linkend="makefile-distversion"/>).</para>
 
       <important>
-	<para>The package name must be unique among all of the ports
-	  tree.  Make sure that there is not already a port with the
-	  same <varname>PORTNAME</varname> and if there is add one of
+	<para>The package name must be unique across the entire ports
+	  tree.  Make sure that the <varname>PORTNAME</varname> is not
+	  already in use by an existing port.  If the name has already
+	  been used, add either
 	  <link
 	    linkend="porting-pkgnameprefix-suffix"><varname>PKGNAMEPREFIX</varname>
 	    or <varname>PKGNAMESUFFIX</varname></link>.</para>