[79149] trunk/doc-new/guide/xml/portfile-keywords.xml

[jmr at macports.org]

Revision: 79149
          http://trac.macports.org/changeset/79149
Author:   jmr at macports.org
Date:     2011-06-03 03:02:49 -0700 (Fri, 03 Jun 2011)
Log Message:
-----------
guide: update license info

Modified Paths:
--------------
    trunk/doc-new/guide/xml/portfile-keywords.xml

Modified: trunk/doc-new/guide/xml/portfile-keywords.xml
===================================================================
--- trunk/doc-new/guide/xml/portfile-keywords.xml	2011-06-03 09:47:24 UTC (rev 79148)
+++ trunk/doc-new/guide/xml/portfile-keywords.xml	2011-06-03 10:02:49 UTC (rev 79149)
@@ -198,18 +198,23 @@
       <listitem>
         <para>The proper format for license consists of the license name,
         followed by a hyphen and number if indicating a specific version. A
-        space should be placed between licenses if there is more than one.
+        space should be placed between licenses if there is more than one that
+        applies. If an element in the license list is itself a list, it is
+        interpreted as offering a choice of any one of the licenses in the
+        sub-list.
         </para>
 
-		<para>(Additional suggestions: If the version number is a
-		<quote>.0</quote> version, including the <quote>.0</quote> is
-		optional. If the author gives the choice of using a given license or
-		<quote>any later version</quote> of it, include a plus (+) after the
-		version number; if the version specified is also the earliest version,
-		just leave out a version number entirely since it implies all
-		versions. —L2G)</para>
+		<para>If the version number is a
+		<quote>.0</quote> version, the <quote>.0</quote> should be
+		omitted to make the version an integer. If the author gives the choice
+		of using a given license or <quote>any later version</quote> of it,
+		append a plus sign (+) to the version number. If the version
+		specified in this case is also the earliest version,
+		just leave out the version number entirely since it implies all
+		versions.</para>
 
         <programlisting>license           GPL-3</programlisting>
+        <programlisting>license           {freetype GPL}</programlisting>
       </listitem>
     </varlistentry>
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110603/eae34523/attachment.html>