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

[Warren Block]

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>