svn commit: r45883 - in head/en_US.ISO8859-1/books/porters-handbook: special uses

[Warren Block]

Author: wblock
Date: Tue Oct 28 20:15:02 2014
New Revision: 45883
URL: https://svnweb.freebsd.org/changeset/doc/45883

Log:
  Add mva's updates to the Using Python section, with thanks to mat.
  
  Differential Revision:	https://reviews.freebsd.org/D573

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
  head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml

Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml	Tue Oct 28 12:02:59 2014	(r45882)
+++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml	Tue Oct 28 20:15:02 2014	(r45883)
@@ -2762,19 +2762,19 @@ SOCKETS_USE=	PHP=sockets
       <tgroup cols="2">
 	<tbody>
 	  <row>
-	    <entry><varname>USE_PYTHON</varname></entry>
-	    <entry>The port needs Python.  Minimal required version
+	    <entry><varname>USES=python</varname></entry>
+	    <entry>The port needs Python. The minimal required version
 	      can be specified with values such as
-	      <literal>2.6+</literal>.  Version ranges can also be
-	      specified, by separating two version numbers with a
-	      dash, for example, <literal>2.6-2.7</literal></entry>
+	      <literal>2.7+</literal>. Version ranges can also be
+	      specified by separating two version numbers with a
+	      dash: <literal>USES=python:3.2-3.3</literal></entry>
 	  </row>
 
 	  <row>
-	    <entry><varname>USE_PYDISTUTILS</varname></entry>
-	    <entry>Use Python distutils for configuring, compiling
-	      and installing.  This is required when the port comes
-	      with <filename>setup.py</filename>.  This overrides
+	    <entry><varname>USE_PYTHON=distutils</varname></entry>
+	    <entry>Use Python distutils for configuring, compiling,
+	      and installing. This is required when the port comes
+	      with <filename>setup.py</filename>. This overrides
 	      the <buildtarget>do-build</buildtarget> and
 	      <buildtarget>do-install</buildtarget> targets and may
 	      also override <buildtarget>do-configure</buildtarget>
@@ -2783,10 +2783,29 @@ SOCKETS_USE=	PHP=sockets
 	  </row>
 
 	  <row>
+	    <entry><varname>USE_PYTHON=autoplist</varname></entry>
+	    <entry>Create the packaging list automatically. This also requires
+	    <literal>USE_PYTHON=distutils</literal> to be set.
+        </entry>
+	  </row>
+
+      <row>
+        <entry><varname>USE_PYTHON=concurrent</varname></entry>
+        <entry>The port will use an unique prefix, typically
+        <literal>PYTHON_PKGNAMEPREFIX</literal> for certain directories, such
+        as <literal>EXAMPLESDIR</literal> and <literal>DOCSDIR</literal> and
+        also will append a suffix, the python version from
+        <literal>PYTHON_VER</literal>, to binaries and scripts to be
+        installed. This allows ports to be installed for different Python
+        versions at the same time, which otherwise would install conflicting
+        files.</entry>
+      </row>
+
+	  <row>
 	    <entry><varname>PYTHON_PKGNAMEPREFIX</varname></entry>
 	    <entry>Used as a <varname>PKGNAMEPREFIX</varname> to
 	      distinguish packages for different Python versions.
-	      Example: <literal>py24-</literal></entry>
+	      Example: <literal>py27-</literal></entry>
 	  </row>
 
 	  <row>
@@ -2837,7 +2856,25 @@ SOCKETS_USE=	PHP=sockets
     </table>
 
     <para>A complete list of available variables can be found in
-      <filename>/usr/ports/Mk/bsd.python.mk</filename>.</para>
+      <filename>/usr/ports/Mk/Uses/python.mk</filename>.</para>
+
+
+	<example xml:id="python-Makefile">
+	  <title>Makefile for a Simple <application>Python</application>
+	    Module</title>
+
+	  <programlisting>PORTNAME=	sample
+PORTVERSION=	1.2.3
+CATEGORIES=	devel
+
+MAINTAINER=	john at doe.tld
+COMMENT=	Python sample module
+
+USES=		python
+USE_PYTHON=	autoplist distutils
+
+.include <bsd.port.mk></programlisting>
+	</example>
 
     <para>Some Python applications claim to have
       <varname>DESTDIR</varname> support (which would be required

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue Oct 28 12:02:59 2014	(r45882)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml	Tue Oct 28 20:15:02 2014	(r45883)
@@ -953,6 +953,24 @@ GSSAPI_NONE_CONFIGURE_ON=	--without-gssa
 	    run-time dependency.</entry>
 	</row>
 
+	<row xml:id="uses-python">
+	  <entry><literal>python</literal></entry>
+	  <entry>(none),
+        <literal><replaceable>X.Y</replaceable></literal>,
+	    <literal><replaceable>X.Y+</replaceable></literal>,
+        <literal><replaceable>-X.Y</replaceable></literal>,
+        <literal><replaceable>X.Y-Z.A</replaceable></literal>,
+        <literal>build</literal>,
+	    <literal>run</literal>
+      </entry>
+	  <entry>Uses <application>Python</application>. A supported
+	    version or version range can be specified. If Python is
+	    only needed at build or run time, it can be set as a build
+	    or run dependency with <literal>build</literal> or
+	    <literal>run</literal>. See <xref linkend="using-python"/>
+            for more information.</entry>
+	</row>
+
 	<row xml:id="uses-qmail">
 	  <entry><literal>qmail</literal></entry>