- Update to 0.9.1

- Update maintainer address
- Create symlink for scripts (request by email)

Submitted by:	myself
Approved by:	miwi, rene (mentors)

4 files changed, 23 insertions, 49 deletions

diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 4a6a4a34b6ce..8b90a1d0d1bf 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -7,16 +7,25 @@
 #
 
 PORTNAME=	docutils
-PORTVERSION=	0.9
+PORTVERSION=	0.9.1
 CATEGORIES=	textproc python
 MASTER_SITES=	SF \
 		CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	duchateau.olivier@gmail.com
+MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Python Documentation Utilities
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
+BIN_SCRIPTS=	rst2html.py rst2s5.py rst2latex.py rst2xetex.py \
+	rst2man.py rst2xml.py rst2pseudoxml.py rstpep2html.py \
+	rst2odt.py rst2odt_prepstyles.py
+
+post-install:
+.for script in ${BIN_SCRIPTS}
+	@cd ${PREFIX}/bin && ${LN} -s ${script} ${script:C/\.py//}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/textproc/py-docutils/distinfo b/textproc/py-docutils/distinfo
index fd91b11bebcb..51d1522e3a3f 100644
--- a/textproc/py-docutils/distinfo
+++ b/textproc/py-docutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (docutils-0.9.tar.gz) = ff49bf77e9135490a73740d884b418ab8b982ad16ee52cfe796d059c592ea245
-SIZE (docutils-0.9.tar.gz) = 1534138
+SHA256 (docutils-0.9.1.tar.gz) = e89f187dbbc6674f839239c89fec44af9f18809b66a8a55a41b57b9ee2356994
+SIZE (docutils-0.9.1.tar.gz) = 1541437
diff --git a/textproc/py-docutils/files/patch-setup.py b/textproc/py-docutils/files/patch-setup.py
deleted file mode 100644
index 128a9a16a516..000000000000
--- a/textproc/py-docutils/files/patch-setup.py
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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
-@@ -89,6 +97,8 @@
- def do_setup():
-     kwargs = package_data.copy()
-     kwargs['classifiers'] = classifiers
-+    # 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}
-@@ -161,17 +171,7 @@
-                      ['docutils/writers/odf_odt/styles.odt']),
-                      ]
-                    + s5_theme_files),
--    'scripts' : ['tools/rst2html.py',
--                 'tools/rst2s5.py',
--                 'tools/rst2latex.py',
--                 'tools/rst2xetex.py',
--                 'tools/rst2man.py',
--                 'tools/rst2xml.py',
--                 'tools/rst2pseudoxml.py',
--                 'tools/rstpep2html.py',
--                 'tools/rst2odt.py',
--                 'tools/rst2odt_prepstyles.py',
--                 ],}
-+    'scripts' : glob.glob('tools/_scripts/*'),} 
- """Distutils setup parameters."""
- 
- classifiers = [
diff --git a/textproc/py-docutils/pkg-plist b/textproc/py-docutils/pkg-plist
index 89ba7a368bdd..e8f1803ad3c3 100644
--- a/textproc/py-docutils/pkg-plist
+++ b/textproc/py-docutils/pkg-plist
@@ -1,13 +1,23 @@
 bin/rst2html
+bin/rst2html.py
 bin/rst2latex
+bin/rst2latex.py
 bin/rst2man
+bin/rst2man.py
 bin/rst2odt
+bin/rst2odt.py
 bin/rst2odt_prepstyles
+bin/rst2odt_prepstyles.py
 bin/rst2pseudoxml
+bin/rst2pseudoxml.py
 bin/rst2s5
+bin/rst2s5.py
 bin/rst2xetex
+bin/rst2xetex.py
 bin/rst2xml
+bin/rst2xml.py
 bin/rstpep2html
+bin/rstpep2html.py
 %%PYTHON_SITELIBDIR%%/docutils/__init__.py
 %%PYTHON_SITELIBDIR%%/docutils/__init__.pyc
 %%PYTHON_SITELIBDIR%%/docutils/__init__.pyo