here is an update to py-docutils to 0.4.
release notes available here:
http://docutils.sourceforge.net/RELEASE-NOTES.html#release-0-4-2006-01-09
i also fixed it so that `make regress' actually works. don't know
how that snuck through.
--ben
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/py-docutils/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile 30 Apr 2005 14:05:56 -0000 1.1.1.1
+++ Makefile 11 Mar 2006 00:16:35 -0000
@@ -2,7 +2,7 @@
COMMENT= "tools for converting plaintext documentation into other
formats"
-DISTNAME= docutils-0.3.7
+DISTNAME= docutils-0.4
PKGNAME= py-${DISTNAME}
CATEGORIES= textproc
@@ -21,11 +21,12 @@
MODULES= lang/python
pre-build:
- @cp ${WRKSRC}/tools/rst2html.py ${WRKSRC}/tools/rst2html
- @cp ${WRKSRC}/tools/rst2latex.py ${WRKSRC}/tools/rst2latex
+.for file in html s5 latex newlatex xml pseudoxml
+ @mv ${WRKSRC}/tools/rst2${file}{.py,}
+.endfor
do-regress: fake
- @cd ${WRKSRC}/test && ${MAKE_ENV} \
- PYTHONPATH=${WRKINST}${MODPY_SITEPKG} ${MODPY_BIN} ./alltests.py
+ @cd ${WRKSRC}/test && ${SETENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \
+ ${MODPY_BIN} ./alltests.py
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/py-docutils/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 30 Apr 2005 14:05:56 -0000 1.1.1.1
+++ distinfo 11 Mar 2006 00:16:35 -0000
@@ -1,4 +1,4 @@
-MD5 (docutils-0.3.7.tar.gz) = fdd192d62bf5aebac6258a7ae8af5123
-RMD160 (docutils-0.3.7.tar.gz) = 34e1b8e6a19cfefe1e097108bcedaff11f9fdb80
-SHA1 (docutils-0.3.7.tar.gz) = 49e67c5448a4dcb544dc2128b0b6f93808813190
-SIZE (docutils-0.3.7.tar.gz) = 625719
+MD5 (docutils-0.4.tar.gz) = 0fe7b42bb3c2aa3680fe30f9a5fbf712
+RMD160 (docutils-0.4.tar.gz) = f6a3c5bfb79ed08ce282bcaf3ded05bd2e3f95b5
+SHA1 (docutils-0.4.tar.gz) = 25498713e3757f5050763303fc901dc120357fb5
+SIZE (docutils-0.4.tar.gz) = 1237801
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/textproc/py-docutils/patches/patch-setup_py,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-setup_py
--- patches/patch-setup_py 30 Apr 2005 14:05:56 -0000 1.1.1.1
+++ patches/patch-setup_py 11 Mar 2006 00:16:35 -0000
@@ -1,21 +1,31 @@
$OpenBSD: patch-setup_py,v 1.1.1.1 2005/04/30 14:05:56 alek Exp $
---- setup.py.orig Thu Mar 31 10:00:29 2005
-+++ setup.py Thu Mar 31 10:00:55 2005
-@@ -42,7 +42,7 @@ what-you-see-is-what-you-get plaintext m
- 'docutils.readers', 'docutils.readers.python',
- 'docutils.transforms',
- 'docutils.writers',],
-- 'scripts' : ['tools/rst2html.py','tools/rst2latex.py'],}
-+ 'scripts' : ['tools/rst2html','tools/rst2latex'],}
+--- setup.py.orig Mon Jan 9 10:28:09 2006
++++ setup.py Fri Mar 10 15:50:13 2006
+@@ -76,12 +76,12 @@ what-you-see-is-what-you-get plaintext m
+ ('docutils/writers/s5_html/themes',
+ ['docutils/writers/s5_html/themes/README.txt']),]
+ + s5_theme_files),
+- 'scripts' : ['tools/rst2html.py',
+- 'tools/rst2s5.py',
+- 'tools/rst2latex.py',
+- 'tools/rst2newlatex.py',
+- 'tools/rst2xml.py',
+- 'tools/rst2pseudoxml.py'],}
++ 'scripts' : ['tools/rst2html',
++ 'tools/rst2s5',
++ 'tools/rst2latex',
++ 'tools/rst2newlatex',
++ 'tools/rst2xml',
++ 'tools/rst2pseudoxml'],}
"""Distutils setup parameters."""
classifiers = [
-@@ -84,6 +84,8 @@ List of (module name, minimum __version_
+@@ -123,6 +123,8 @@ List of (module name, minimum __version_
def get_extras():
extras = []
for module_name, version, attributes in extra_modules:
-+ if module_name == "roman":
-+ extras.append(module_name)
++ if module_name == "roman":
++ extras.append(module_name)
try:
module = __import__(module_name)
if version and module.__version__ < version:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/py-docutils/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 30 Apr 2005 14:05:56 -0000 1.1.1.1
+++ pkg/PLIST 11 Mar 2006 00:16:35 -0000
@@ -1,8 +1,10 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/04/30 14:05:56 alek Exp $
bin/rst2html
bin/rst2latex
-lib/python${MODPY_VERSION}/
-lib/python${MODPY_VERSION}/site-packages/
+bin/rst2newlatex
+bin/rst2pseudoxml
+bin/rst2s5
+bin/rst2xml
lib/python${MODPY_VERSION}/site-packages/docutils/
lib/python${MODPY_VERSION}/site-packages/docutils/__init__.py
lib/python${MODPY_VERSION}/site-packages/docutils/__init__.pyc
@@ -19,6 +21,8 @@
lib/python${MODPY_VERSION}/site-packages/docutils/languages/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/languages/af.py
lib/python${MODPY_VERSION}/site-packages/docutils/languages/af.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/languages/ca.py
+lib/python${MODPY_VERSION}/site-packages/docutils/languages/ca.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/languages/cs.py
lib/python${MODPY_VERSION}/site-packages/docutils/languages/cs.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/languages/de.py
@@ -35,6 +39,10 @@
lib/python${MODPY_VERSION}/site-packages/docutils/languages/fr.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/languages/it.py
lib/python${MODPY_VERSION}/site-packages/docutils/languages/it.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/languages/ja.py
+lib/python${MODPY_VERSION}/site-packages/docutils/languages/ja.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/languages/nl.py
+lib/python${MODPY_VERSION}/site-packages/docutils/languages/nl.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/languages/pt_br.py
lib/python${MODPY_VERSION}/site-packages/docutils/languages/pt_br.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/languages/ru.py
@@ -43,6 +51,8 @@
lib/python${MODPY_VERSION}/site-packages/docutils/languages/sk.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/languages/sv.py
lib/python${MODPY_VERSION}/site-packages/docutils/languages/sv.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/languages/zh_cn.py
+lib/python${MODPY_VERSION}/site-packages/docutils/languages/zh_cn.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/languages/zh_tw.py
lib/python${MODPY_VERSION}/site-packages/docutils/languages/zh_tw.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/nodes.py
@@ -50,6 +60,8 @@
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/__init__.py
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/null.py
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/null.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/__init__.py
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/__init__.pyc
@@ -72,11 +84,48 @@
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/directives/references.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/directives/tables.py
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/directives/tables.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/README.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isoamsa.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isoamsb.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isoamsc.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isoamsn.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isoamso.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isoamsr.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isobox.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isocyr1.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isocyr2.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isodia.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isogrk1.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isogrk2.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isogrk3.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isogrk4-wide.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isogrk4.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isolat1.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isolat2.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isomfrk-wide.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isomfrk.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isomopf-wide.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isomopf.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isomscr-wide.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isomscr.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isonum.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isopub.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/isotech.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/mmlalias.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/mmlextra-wide.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/mmlextra.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/s5defs.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/xhtml1-lat1.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/xhtml1-special.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/include/xhtml1-symbol.txt
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/__init__.py
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/af.py
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/af.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/ca.py
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/ca.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/cs.py
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/cs.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/de.py
@@ -93,6 +142,10 @@
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/fr.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/it.py
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/it.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/ja.py
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/ja.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/nl.py
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/nl.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/pt_br.py
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/pt_br.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/ru.py
@@ -101,6 +154,8 @@
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/sk.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/sv.py
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/sv.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/zh_cn.py
+lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/zh_cn.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/zh_tw.py
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/languages/zh_tw.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/parsers/rst/roles.py
@@ -112,6 +167,8 @@
lib/python${MODPY_VERSION}/site-packages/docutils/readers/
lib/python${MODPY_VERSION}/site-packages/docutils/readers/__init__.py
lib/python${MODPY_VERSION}/site-packages/docutils/readers/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/readers/doctree.py
+lib/python${MODPY_VERSION}/site-packages/docutils/readers/doctree.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/readers/pep.py
lib/python${MODPY_VERSION}/site-packages/docutils/readers/pep.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/readers/python/
@@ -142,6 +199,8 @@
lib/python${MODPY_VERSION}/site-packages/docutils/transforms/references.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/transforms/universal.py
lib/python${MODPY_VERSION}/site-packages/docutils/transforms/universal.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/transforms/writer_aux.py
+lib/python${MODPY_VERSION}/site-packages/docutils/transforms/writer_aux.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/urischemes.py
lib/python${MODPY_VERSION}/site-packages/docutils/urischemes.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/utils.py
@@ -151,13 +210,63 @@
lib/python${MODPY_VERSION}/site-packages/docutils/writers/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/docutils/writers/docutils_xml.py
lib/python${MODPY_VERSION}/site-packages/docutils/writers/docutils_xml.pyc
-lib/python${MODPY_VERSION}/site-packages/docutils/writers/html4css1.py
-lib/python${MODPY_VERSION}/site-packages/docutils/writers/html4css1.pyc
-lib/python${MODPY_VERSION}/site-packages/docutils/writers/latex2e.py
-lib/python${MODPY_VERSION}/site-packages/docutils/writers/latex2e.pyc
-lib/python${MODPY_VERSION}/site-packages/docutils/writers/pep_html.py
-lib/python${MODPY_VERSION}/site-packages/docutils/writers/pep_html.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/html4css1/
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/html4css1/__init__.py
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/html4css1/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/html4css1/html4css1.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/latex2e/
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/latex2e/__init__.py
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/latex2e/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/latex2e/latex2e.tex
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/newlatex2e/
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/newlatex2e/__init__.py
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/newlatex2e/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/newlatex2e/base.tex
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/newlatex2e/unicode_map.py
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/newlatex2e/unicode_map.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/null.py
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/null.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/pep_html/
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/pep_html/__init__.py
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/pep_html/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/pep_html/pep.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/pep_html/template.txt
lib/python${MODPY_VERSION}/site-packages/docutils/writers/pseudoxml.py
lib/python${MODPY_VERSION}/site-packages/docutils/writers/pseudoxml.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/__init__.py
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/README.txt
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/big-black/
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/big-black/__base__
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/big-black/framing.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/big-black/pretty.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/big-white/
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/big-white/framing.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/big-white/pretty.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/default/
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/default/blank.gif
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/default/framing.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/default/iepngfix.htc
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/default/opera.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/default/outline.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/default/pretty.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/default/print.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/default/s5-core.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/default/slides.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/default/slides.js
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/medium-black/
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/medium-black/__base__
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/medium-black/pretty.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/medium-white/
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/medium-white/framing.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/medium-white/pretty.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/small-black/
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/small-black/__base__
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/small-black/pretty.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/small-white/
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/small-white/framing.css
+lib/python${MODPY_VERSION}/site-packages/docutils/writers/s5_html/themes/small-white/pretty.css
lib/python${MODPY_VERSION}/site-packages/roman.py
lib/python${MODPY_VERSION}/site-packages/roman.pyc