- Update to 0.9

PR:		167606
Submitted by:	Maintainer

4 files changed, 31 insertions, 24 deletions

diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 30c18a762c13..4a6a4a34b6ce 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	docutils
-PORTVERSION=	0.8.1
+PORTVERSION=	0.9
 CATEGORIES=	textproc python
 MASTER_SITES=	SF \
 		CHEESESHOP
diff --git a/textproc/py-docutils/distinfo b/textproc/py-docutils/distinfo
index 9b7aee0384df..fd91b11bebcb 100644
--- a/textproc/py-docutils/distinfo
+++ b/textproc/py-docutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (docutils-0.8.1.tar.gz) = 5a3b776518257a59fefaf48ef1e0635bc1179f8cafb02a9cc84c9644bb25df71
-SIZE (docutils-0.8.1.tar.gz) = 1499832
+SHA256 (docutils-0.9.tar.gz) = ff49bf77e9135490a73740d884b418ab8b982ad16ee52cfe796d059c592ea245
+SIZE (docutils-0.9.tar.gz) = 1534138
diff --git a/textproc/py-docutils/files/patch-setup.py b/textproc/py-docutils/files/patch-setup.py
index 81bdb2f55c7e..128a9a16a516 100644
--- a/textproc/py-docutils/files/patch-setup.py
+++ b/textproc/py-docutils/files/patch-setup.py
@@ -1,39 +1,36 @@
---- setup.py.orig	2011-06-27 13:38:56.000000000 +0200
-+++ setup.py	2011-08-06 18:16:54.000000000 +0200
-@@ -22,6 +22,16 @@
+--- setup.py.orig	2011-12-20 17:39:10.000000000 +0100
++++ setup.py	2012-05-05 08:45:22.000000000 +0200
+@@ -22,6 +22,14 @@
      print ('system using your package manager.')
      sys.exit(1)
  
 +def rename_scripts(files):
 +    import shutil
-+
 +    if files:
 +        dirname = os.path.abspath(os.path.join('tools', '_scripts'))
 +        if not os.path.exists(dirname):
 +            os.makedirs(dirname)
 +            for file in files:
 +                shutil.copyfile(file, os.path.join(dirname, os.path.basename(file[:-3])))
-+
  
  if sys.version_info >= (3,):
      # copy-convert auxiliary python sources
-@@ -92,6 +102,8 @@
-     if extras:
-         kwargs['py_modules'] = extras
+@@ -89,6 +97,8 @@
+ def do_setup():
+     kwargs = package_data.copy()
      kwargs['classifiers'] = classifiers
-+    # Rename scripts files (without .py)
++    # Rename scripts files (without .py).
 +    rename_scripts(glob.glob('tools/rst*.py'))
      # Install data files properly.
      kwargs['cmdclass'] = {'build_data': build_data,
                            'install_data': smart_install_data}
-@@ -166,18 +178,7 @@
+@@ -161,17 +171,7 @@
                       ['docutils/writers/odf_odt/styles.odt']),
                       ]
                     + s5_theme_files),
 -    'scripts' : ['tools/rst2html.py',
 -                 'tools/rst2s5.py',
 -                 'tools/rst2latex.py',
--                 # 'tools/rst2newlatex.py',
 -                 'tools/rst2xetex.py',
 -                 'tools/rst2man.py',
 -                 'tools/rst2xml.py',
@@ -42,7 +39,7 @@
 -                 'tools/rst2odt.py',
 -                 'tools/rst2odt_prepstyles.py',
 -                 ],}
-+    'scripts' : glob.glob('tools/_scripts/*'),}
++    'scripts' : glob.glob('tools/_scripts/*'),} 
  """Distutils setup parameters."""
  
  classifiers = [
diff --git a/textproc/py-docutils/pkg-plist b/textproc/py-docutils/pkg-plist
index 5b39bdc6615a..89ba7a368bdd 100644
--- a/textproc/py-docutils/pkg-plist
+++ b/textproc/py-docutils/pkg-plist
@@ -110,9 +110,12 @@ bin/rstpep2html
 %%PYTHON_SITELIBDIR%%/docutils/math/math2html.py
 %%PYTHON_SITELIBDIR%%/docutils/math/math2html.pyc
 %%PYTHON_SITELIBDIR%%/docutils/math/math2html.pyo
-%%PYTHON_SITELIBDIR%%/docutils/math/unimathsymbols2tex.py
-%%PYTHON_SITELIBDIR%%/docutils/math/unimathsymbols2tex.pyc
-%%PYTHON_SITELIBDIR%%/docutils/math/unimathsymbols2tex.pyo
+%%PYTHON_SITELIBDIR%%/docutils/math/tex2unichar.py
+%%PYTHON_SITELIBDIR%%/docutils/math/tex2unichar.pyc
+%%PYTHON_SITELIBDIR%%/docutils/math/tex2unichar.pyo
+%%PYTHON_SITELIBDIR%%/docutils/math/unichar2tex.py
+%%PYTHON_SITELIBDIR%%/docutils/math/unichar2tex.pyc
+%%PYTHON_SITELIBDIR%%/docutils/math/unichar2tex.pyo
 %%PYTHON_SITELIBDIR%%/docutils/nodes.py
 %%PYTHON_SITELIBDIR%%/docutils/nodes.pyc
 %%PYTHON_SITELIBDIR%%/docutils/nodes.pyo
@@ -309,9 +312,18 @@ bin/rstpep2html
 %%PYTHON_SITELIBDIR%%/docutils/urischemes.py
 %%PYTHON_SITELIBDIR%%/docutils/urischemes.pyc
 %%PYTHON_SITELIBDIR%%/docutils/urischemes.pyo
-%%PYTHON_SITELIBDIR%%/docutils/utils.py
-%%PYTHON_SITELIBDIR%%/docutils/utils.pyc
-%%PYTHON_SITELIBDIR%%/docutils/utils.pyo
+%%PYTHON_SITELIBDIR%%/docutils/utils/__init__.py
+%%PYTHON_SITELIBDIR%%/docutils/utils/__init__.pyc
+%%PYTHON_SITELIBDIR%%/docutils/utils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/docutils/utils/code_analyzer.py
+%%PYTHON_SITELIBDIR%%/docutils/utils/code_analyzer.pyc
+%%PYTHON_SITELIBDIR%%/docutils/utils/code_analyzer.pyo
+%%PYTHON_SITELIBDIR%%/docutils/utils/punctuation_chars.py
+%%PYTHON_SITELIBDIR%%/docutils/utils/punctuation_chars.pyc
+%%PYTHON_SITELIBDIR%%/docutils/utils/punctuation_chars.pyo
+%%PYTHON_SITELIBDIR%%/docutils/utils/roman.py
+%%PYTHON_SITELIBDIR%%/docutils/utils/roman.pyc
+%%PYTHON_SITELIBDIR%%/docutils/utils/roman.pyo
 %%PYTHON_SITELIBDIR%%/docutils/writers/__init__.py
 %%PYTHON_SITELIBDIR%%/docutils/writers/__init__.pyc
 %%PYTHON_SITELIBDIR%%/docutils/writers/__init__.pyo
@@ -380,9 +392,6 @@ bin/rstpep2html
 %%PYTHON_SITELIBDIR%%/docutils/writers/xetex/__init__.py
 %%PYTHON_SITELIBDIR%%/docutils/writers/xetex/__init__.pyc
 %%PYTHON_SITELIBDIR%%/docutils/writers/xetex/__init__.pyo
-%%PYTHON_SITELIBDIR%%/roman.py
-%%PYTHON_SITELIBDIR%%/roman.pyc
-%%PYTHON_SITELIBDIR%%/roman.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/xetex
 @dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/s5_html/themes/small-white
 @dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/s5_html/themes/small-black
@@ -398,6 +407,7 @@ bin/rstpep2html
 @dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/latex2e
 @dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/html4css1
 @dirrm %%PYTHON_SITELIBDIR%%/docutils/writers
+@dirrm %%PYTHON_SITELIBDIR%%/docutils/utils
 @dirrm %%PYTHON_SITELIBDIR%%/docutils/transforms
 @dirrm %%PYTHON_SITELIBDIR%%/docutils/readers
 @dirrm %%PYTHON_SITELIBDIR%%/docutils/parsers/rst/languages