Update to 0.12

Also use ALTERNATIVES framework to allow concurrent installation under
multiple pythons.

Release 0.12 (2014-07-06)
=========================

* docs/ref/rst/directives.txt
  - Update "math" and "csv-table" descriptions.

* docutils/parsers/rst/directives/images.py
  - Fix [258] figwidth="image" generates unitless width value.

* docutils/parsers/rst/states.py
  - Improve error report when a non-ASCII character is specified as
    delimiter, quote or escape character under Python 2.
    Fixes [ 249 ] and [ 250 ].

* docutils/writers/html4css1/__init__.py
  - Don't add newline after inline math.
    Thanks to Yury G. Kudryashov for the patch.

* docutils/writers/latex2e/__init__.py
  - Fix [ 239 ] Latex writer glues paragraphs with figure floats.
  - Apply [ 116 ] by Kirill Smelkov. Don't hardcode \large for subtitle.

* docutils/writers/odf_odt/__init__.py
  - Apply patch by Jakub Wilk to fix bug [ 100 ].

* test/test_error_reporting.py
  - Fix [ 223 ] by removing redundant tests we do not have control over.

* test/test_nodes.py
  - Apply [ 115 ] respect fixed 2to3 string literal conversion behavior.

4 files changed, 38 insertions, 17 deletions

diff --git a/textproc/py-docutils/ALTERNATIVES b/textproc/py-docutils/ALTERNATIVES
new file mode 100644
index 00000000000..75b4eb95b56
--- /dev/null
+++ b/textproc/py-docutils/ALTERNATIVES
@@ -0,0 +1,11 @@
+bin/rst2html.py @PREFIX@/bin/rst2html-@PYVERSSUFFIX@.py
+bin/rst2latex.py @PREFIX@/bin/rst2latex-@PYVERSSUFFIX@.py
+bin/rst2man.py @PREFIX@/bin/rst2man-@PYVERSSUFFIX@.py
+bin/rst2odt.py @PREFIX@/bin/rst2odt-@PYVERSSUFFIX@.py
+bin/rst2odt_prepstyles.py @PREFIX@/bin/rst2odt_prepstyles-@PYVERSSUFFIX@.py
+bin/rst2pseudoxml.py @PREFIX@/bin/rst2pseudoxml-@PYVERSSUFFIX@.py
+bin/rst2s5.py @PREFIX@/bin/rst2s5-@PYVERSSUFFIX@.py
+bin/rst2xetex.py @PREFIX@/bin/rst2xetex-@PYVERSSUFFIX@.py
+bin/rst2xml.py @PREFIX@/bin/rst2xml-@PYVERSSUFFIX@.py
+bin/rstpep2html.py @PREFIX@/bin/rstpep2html-@PYVERSSUFFIX@.py
+
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 5dfcd0bc24c..0cf8111aa3a 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2014/01/25 10:30:24 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2015/02/24 11:03:05 markd Exp $
 
-DISTNAME=	docutils-0.11
+DISTNAME=	docutils-0.12
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=docutils/}
@@ -14,6 +14,8 @@ DEPENDS+=	${PYPKGPREFIX}-roman>=1.4:../../math/py-roman
 DEPENDS+=	${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
 
 USE_LANGUAGES=	#none
+PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
+FILES_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
 REPLACE_PYTHON+=	docutils/utils/code_analyzer.py
 REPLACE_PYTHON+=	docutils/utils/error_reporting.py
@@ -23,6 +25,14 @@ REPLACE_PYTHON+=	docutils/utils/punctuation_chars.py
 REPLACE_PYTHON+=	docutils/utils/smartquotes.py
 REPLACE_PYTHON+=	docutils/writers/xetex/__init__.py
 
+CMDS=	rst2html rst2latex rst2man rst2odt rst2odt_prepstyles rst2pseudoxml rst2s5
+CMDS+=	rst2xetex rst2xml rstpep2html
+
+post-install:
+	for f in ${CMDS}; do \
+	${MV} ${DESTDIR}${PREFIX}/bin/$$f.py ${DESTDIR}${PREFIX}/bin/$$f-${PYVERSSUFFIX}.py; \
+	done
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-docutils/PLIST b/textproc/py-docutils/PLIST
index 44165c232be..15e204e2f7e 100644
--- a/textproc/py-docutils/PLIST
+++ b/textproc/py-docutils/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.20 2013/07/28 12:47:46 wiz Exp $
-bin/rst2html.py
-bin/rst2latex.py
-bin/rst2man.py
-bin/rst2odt.py
-bin/rst2odt_prepstyles.py
-bin/rst2pseudoxml.py
-bin/rst2s5.py
-bin/rst2xetex.py
-bin/rst2xml.py
-bin/rstpep2html.py
+@comment $NetBSD: PLIST,v 1.21 2015/02/24 11:03:05 markd Exp $
+bin/rst2html-${PYVERSSUFFIX}.py
+bin/rst2latex-${PYVERSSUFFIX}.py
+bin/rst2man-${PYVERSSUFFIX}.py
+bin/rst2odt-${PYVERSSUFFIX}.py
+bin/rst2odt_prepstyles-${PYVERSSUFFIX}.py
+bin/rst2pseudoxml-${PYVERSSUFFIX}.py
+bin/rst2s5-${PYVERSSUFFIX}.py
+bin/rst2xetex-${PYVERSSUFFIX}.py
+bin/rst2xml-${PYVERSSUFFIX}.py
+bin/rstpep2html-${PYVERSSUFFIX}.py
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/docutils/__init__.py
 ${PYSITELIB}/docutils/__init__.pyc
diff --git a/textproc/py-docutils/distinfo b/textproc/py-docutils/distinfo
index 9e1a9648e47..528f9725040 100644
--- a/textproc/py-docutils/distinfo
+++ b/textproc/py-docutils/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2013/07/28 12:47:46 wiz Exp $
+$NetBSD: distinfo,v 1.18 2015/02/24 11:03:05 markd Exp $
 
-SHA1 (docutils-0.11.tar.gz) = 3894ebcbcbf8aa54ce7c3d2c8f05460544912d67
-RMD160 (docutils-0.11.tar.gz) = 73fa71348388f4c47c70d8894e7c154d48e0c1b2
-Size (docutils-0.11.tar.gz) = 1611755 bytes
+SHA1 (docutils-0.12.tar.gz) = 002450621b33c5690060345b0aac25bc2426d675
+RMD160 (docutils-0.12.tar.gz) = 1eb12ed88a334a154c8548f404ea82c7a65fa9ba
+Size (docutils-0.12.tar.gz) = 1618353 bytes