summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--textproc/py-creole/Makefile38
-rw-r--r--textproc/py-creole/PLIST187
-rw-r--r--textproc/py-creole/distinfo9
-rw-r--r--textproc/py-creole/patches/patch-setup.py15
4 files changed, 205 insertions, 44 deletions
diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile
index ee87ad0182f..c76a9631406 100644
--- a/textproc/py-creole/Makefile
+++ b/textproc/py-creole/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2012/10/04 00:22:01 cheusov Exp $
+# $NetBSD: Makefile,v 1.5 2012/10/11 15:35:09 wen Exp $
#
-VERS= 0.2.5
+VERS= 1.0.5
DISTNAME= python-creole-${VERS}
PKGNAME= ${PYPKGPREFIX}-creole-${VERS}
-PKGREVISION= 1
EGG_NAME= python_creole-${VERS}
CATEGORIES= textproc www python
MASTER_SITES= http://pypi.python.org/packages/source/p/python-creole/
@@ -17,8 +16,41 @@ LICENSE= gnu-gpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
+DEPENDS+= ${PYPKGPREFIX}-docutils>=0:../../textproc/py-docutils
+DEPENDS+= ${PYPKGPREFIX}-textile>=0:../../textproc/py-textile
+
USE_LANGUAGES= #none
+SUBST_CLASSES+= env
+SUBST_SED.env= -e "s,\#! */usr/bin/env *python[0-9.]*,\#!${PYTHONBIN},"
+SUBST_MESSAGE.env= Fixing path to python.
+SUBST_STAGE.env= post-patch
+SUBST_FILES.env= creole/exceptions.py
+SUBST_FILES.env+= creole/html2creole/emitter.py
+SUBST_FILES.env+= creole/html2rest/emitter.py
+SUBST_FILES.env+= creole/html2textile/emitter.py
+SUBST_FILES.env+= creole/html_parser/parser.py
+SUBST_FILES.env+= creole/html_tools/deentity.py
+SUBST_FILES.env+= creole/html_tools/strip_html.py
+SUBST_FILES.env+= creole/html_tools/text_tools.py
+SUBST_FILES.env+= creole/rest2html/clean_writer.py
+SUBST_FILES.env+= creole/shared/base_emitter.py
+SUBST_FILES.env+= creole/shared/document_tree.py
+SUBST_FILES.env+= creole/shared/unknown_tags.py
+SUBST_FILES.env+= creole/tests/__init__.py
+SUBST_FILES.env+= creole/tests/all_tests.py
+SUBST_FILES.env+= creole/tests/test_creole2html.py
+SUBST_FILES.env+= creole/tests/test_cross_compare_all.py
+SUBST_FILES.env+= creole/tests/test_cross_compare_creole.py
+SUBST_FILES.env+= creole/tests/test_cross_compare_rest.py
+SUBST_FILES.env+= creole/tests/test_cross_compare_textile.py
+SUBST_FILES.env+= creole/tests/test_html2creole.py
+SUBST_FILES.env+= creole/tests/test_html2rest.py
+SUBST_FILES.env+= creole/tests/test_html2textile.py
+SUBST_FILES.env+= creole/tests/test_rest2html.py
+SUBST_FILES.env+= creole/tests/test_setup_utils.py
+SUBST_FILES.env+= creole/tests/test_utils.py
+
PYTHON_SELF_CONFLICT= yes
.include "../../lang/python/egg.mk"
diff --git a/textproc/py-creole/PLIST b/textproc/py-creole/PLIST
index a231d563546..46924dd9825 100644
--- a/textproc/py-creole/PLIST
+++ b/textproc/py-creole/PLIST
@@ -1,45 +1,158 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/11 13:01:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/10/11 15:35:09 wen Exp $
${PYSITELIB}/creole/__init__.py
${PYSITELIB}/creole/__init__.pyc
${PYSITELIB}/creole/__init__.pyo
-${PYSITELIB}/creole/creole2html.py
-${PYSITELIB}/creole/creole2html.pyc
-${PYSITELIB}/creole/creole2html.pyo
-${PYSITELIB}/creole/creole_parser.py
-${PYSITELIB}/creole/creole_parser.pyc
-${PYSITELIB}/creole/creole_parser.pyo
-${PYSITELIB}/creole/default_macros.py
-${PYSITELIB}/creole/default_macros.pyc
-${PYSITELIB}/creole/default_macros.pyo
-${PYSITELIB}/creole/html2creole.py
-${PYSITELIB}/creole/html2creole.pyc
-${PYSITELIB}/creole/html2creole.pyo
+${PYSITELIB}/creole/creole2html/__init__.py
+${PYSITELIB}/creole/creole2html/__init__.pyc
+${PYSITELIB}/creole/creole2html/__init__.pyo
+${PYSITELIB}/creole/creole2html/emitter.py
+${PYSITELIB}/creole/creole2html/emitter.pyc
+${PYSITELIB}/creole/creole2html/emitter.pyo
+${PYSITELIB}/creole/creole2html/parser.py
+${PYSITELIB}/creole/creole2html/parser.pyc
+${PYSITELIB}/creole/creole2html/parser.pyo
+${PYSITELIB}/creole/creole2html/rules.py
+${PYSITELIB}/creole/creole2html/rules.pyc
+${PYSITELIB}/creole/creole2html/rules.pyo
+${PYSITELIB}/creole/exceptions.py
+${PYSITELIB}/creole/exceptions.pyc
+${PYSITELIB}/creole/exceptions.pyo
+${PYSITELIB}/creole/html2creole/__init__.py
+${PYSITELIB}/creole/html2creole/__init__.pyc
+${PYSITELIB}/creole/html2creole/__init__.pyo
+${PYSITELIB}/creole/html2creole/emitter.py
+${PYSITELIB}/creole/html2creole/emitter.pyc
+${PYSITELIB}/creole/html2creole/emitter.pyo
+${PYSITELIB}/creole/html2rest/__init__.py
+${PYSITELIB}/creole/html2rest/__init__.pyc
+${PYSITELIB}/creole/html2rest/__init__.pyo
+${PYSITELIB}/creole/html2rest/emitter.py
+${PYSITELIB}/creole/html2rest/emitter.pyc
+${PYSITELIB}/creole/html2rest/emitter.pyo
+${PYSITELIB}/creole/html2textile/__init__.py
+${PYSITELIB}/creole/html2textile/__init__.pyc
+${PYSITELIB}/creole/html2textile/__init__.pyo
+${PYSITELIB}/creole/html2textile/emitter.py
+${PYSITELIB}/creole/html2textile/emitter.pyc
+${PYSITELIB}/creole/html2textile/emitter.pyo
+${PYSITELIB}/creole/html_parser/__init__.py
+${PYSITELIB}/creole/html_parser/__init__.pyc
+${PYSITELIB}/creole/html_parser/__init__.pyo
+${PYSITELIB}/creole/html_parser/config.py
+${PYSITELIB}/creole/html_parser/config.pyc
+${PYSITELIB}/creole/html_parser/config.pyo
+${PYSITELIB}/creole/html_parser/parser.py
+${PYSITELIB}/creole/html_parser/parser.pyc
+${PYSITELIB}/creole/html_parser/parser.pyo
+${PYSITELIB}/creole/html_tools/__init__.py
+${PYSITELIB}/creole/html_tools/__init__.pyc
+${PYSITELIB}/creole/html_tools/__init__.pyo
+${PYSITELIB}/creole/html_tools/deentity.py
+${PYSITELIB}/creole/html_tools/deentity.pyc
+${PYSITELIB}/creole/html_tools/deentity.pyo
+${PYSITELIB}/creole/html_tools/strip_html.py
+${PYSITELIB}/creole/html_tools/strip_html.pyc
+${PYSITELIB}/creole/html_tools/strip_html.pyo
+${PYSITELIB}/creole/html_tools/text_tools.py
+${PYSITELIB}/creole/html_tools/text_tools.pyc
+${PYSITELIB}/creole/html_tools/text_tools.pyo
+${PYSITELIB}/creole/py3compat.py
+${PYSITELIB}/creole/py3compat.pyc
+${PYSITELIB}/creole/py3compat.pyo
+${PYSITELIB}/creole/rest2html/__init__.py
+${PYSITELIB}/creole/rest2html/__init__.pyc
+${PYSITELIB}/creole/rest2html/__init__.pyo
+${PYSITELIB}/creole/rest2html/clean_writer.py
+${PYSITELIB}/creole/rest2html/clean_writer.pyc
+${PYSITELIB}/creole/rest2html/clean_writer.pyo
+${PYSITELIB}/creole/setup_utils.py
+${PYSITELIB}/creole/setup_utils.pyc
+${PYSITELIB}/creole/setup_utils.pyo
+${PYSITELIB}/creole/shared/HTMLParsercompat.py
+${PYSITELIB}/creole/shared/HTMLParsercompat.pyc
+${PYSITELIB}/creole/shared/HTMLParsercompat.pyo
+${PYSITELIB}/creole/shared/__init__.py
+${PYSITELIB}/creole/shared/__init__.pyc
+${PYSITELIB}/creole/shared/__init__.pyo
+${PYSITELIB}/creole/shared/base_emitter.py
+${PYSITELIB}/creole/shared/base_emitter.pyc
+${PYSITELIB}/creole/shared/base_emitter.pyo
+${PYSITELIB}/creole/shared/document_tree.py
+${PYSITELIB}/creole/shared/document_tree.pyc
+${PYSITELIB}/creole/shared/document_tree.pyo
+${PYSITELIB}/creole/shared/example_macros.py
+${PYSITELIB}/creole/shared/example_macros.pyc
+${PYSITELIB}/creole/shared/example_macros.pyo
+${PYSITELIB}/creole/shared/html_parser.py
+${PYSITELIB}/creole/shared/html_parser.pyc
+${PYSITELIB}/creole/shared/html_parser.pyo
+${PYSITELIB}/creole/shared/markup_table.py
+${PYSITELIB}/creole/shared/markup_table.pyc
+${PYSITELIB}/creole/shared/markup_table.pyo
+${PYSITELIB}/creole/shared/unknown_tags.py
+${PYSITELIB}/creole/shared/unknown_tags.pyc
+${PYSITELIB}/creole/shared/unknown_tags.pyo
+${PYSITELIB}/creole/shared/utils.py
+${PYSITELIB}/creole/shared/utils.pyc
+${PYSITELIB}/creole/shared/utils.pyo
+${PYSITELIB}/creole/tests/__init__.py
+${PYSITELIB}/creole/tests/__init__.pyc
+${PYSITELIB}/creole/tests/__init__.pyo
+${PYSITELIB}/creole/tests/all_tests.py
+${PYSITELIB}/creole/tests/all_tests.pyc
+${PYSITELIB}/creole/tests/all_tests.pyo
+${PYSITELIB}/creole/tests/test_README.creole
+${PYSITELIB}/creole/tests/test_TODOs.py
+${PYSITELIB}/creole/tests/test_TODOs.pyc
+${PYSITELIB}/creole/tests/test_TODOs.pyo
+${PYSITELIB}/creole/tests/test_creole2html.py
+${PYSITELIB}/creole/tests/test_creole2html.pyc
+${PYSITELIB}/creole/tests/test_creole2html.pyo
+${PYSITELIB}/creole/tests/test_cross_compare_all.py
+${PYSITELIB}/creole/tests/test_cross_compare_all.pyc
+${PYSITELIB}/creole/tests/test_cross_compare_all.pyo
+${PYSITELIB}/creole/tests/test_cross_compare_creole.py
+${PYSITELIB}/creole/tests/test_cross_compare_creole.pyc
+${PYSITELIB}/creole/tests/test_cross_compare_creole.pyo
+${PYSITELIB}/creole/tests/test_cross_compare_rest.py
+${PYSITELIB}/creole/tests/test_cross_compare_rest.pyc
+${PYSITELIB}/creole/tests/test_cross_compare_rest.pyo
+${PYSITELIB}/creole/tests/test_cross_compare_textile.py
+${PYSITELIB}/creole/tests/test_cross_compare_textile.pyc
+${PYSITELIB}/creole/tests/test_cross_compare_textile.pyo
+${PYSITELIB}/creole/tests/test_html2creole.py
+${PYSITELIB}/creole/tests/test_html2creole.pyc
+${PYSITELIB}/creole/tests/test_html2creole.pyo
+${PYSITELIB}/creole/tests/test_html2rest.py
+${PYSITELIB}/creole/tests/test_html2rest.pyc
+${PYSITELIB}/creole/tests/test_html2rest.pyo
+${PYSITELIB}/creole/tests/test_html2textile.py
+${PYSITELIB}/creole/tests/test_html2textile.pyc
+${PYSITELIB}/creole/tests/test_html2textile.pyo
+${PYSITELIB}/creole/tests/test_macros.py
+${PYSITELIB}/creole/tests/test_macros.pyc
+${PYSITELIB}/creole/tests/test_macros.pyo
+${PYSITELIB}/creole/tests/test_rest2html.py
+${PYSITELIB}/creole/tests/test_rest2html.pyc
+${PYSITELIB}/creole/tests/test_rest2html.pyo
+${PYSITELIB}/creole/tests/test_setup_utils.py
+${PYSITELIB}/creole/tests/test_setup_utils.pyc
+${PYSITELIB}/creole/tests/test_setup_utils.pyo
+${PYSITELIB}/creole/tests/test_utils.py
+${PYSITELIB}/creole/tests/test_utils.pyc
+${PYSITELIB}/creole/tests/test_utils.pyo
+${PYSITELIB}/creole/tests/utils/__init__.py
+${PYSITELIB}/creole/tests/utils/__init__.pyc
+${PYSITELIB}/creole/tests/utils/__init__.pyo
+${PYSITELIB}/creole/tests/utils/base_unittest.py
+${PYSITELIB}/creole/tests/utils/base_unittest.pyc
+${PYSITELIB}/creole/tests/utils/base_unittest.pyo
+${PYSITELIB}/creole/tests/utils/utils.py
+${PYSITELIB}/creole/tests/utils/utils.pyc
+${PYSITELIB}/creole/tests/utils/utils.pyo
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
${PYSITELIB}/${EGG_INFODIR}/top_level.txt
${PYSITELIB}/${EGG_INFODIR}/zip-safe
-${PYSITELIB}/tests/__init__.py
-${PYSITELIB}/tests/__init__.pyc
-${PYSITELIB}/tests/__init__.pyo
-${PYSITELIB}/tests/run_all_tests.py
-${PYSITELIB}/tests/run_all_tests.pyc
-${PYSITELIB}/tests/run_all_tests.pyo
-${PYSITELIB}/tests/test_creole2html.py
-${PYSITELIB}/tests/test_creole2html.pyc
-${PYSITELIB}/tests/test_creole2html.pyo
-${PYSITELIB}/tests/test_cross_compare.py
-${PYSITELIB}/tests/test_cross_compare.pyc
-${PYSITELIB}/tests/test_cross_compare.pyo
-${PYSITELIB}/tests/test_html2creole.py
-${PYSITELIB}/tests/test_html2creole.pyc
-${PYSITELIB}/tests/test_html2creole.pyo
-${PYSITELIB}/tests/utils/__init__.py
-${PYSITELIB}/tests/utils/__init__.pyc
-${PYSITELIB}/tests/utils/__init__.pyo
-${PYSITELIB}/tests/utils/base_unittest.py
-${PYSITELIB}/tests/utils/base_unittest.pyc
-${PYSITELIB}/tests/utils/base_unittest.pyo
-${PYSITELIB}/tests/utils/utils.py
-${PYSITELIB}/tests/utils/utils.pyc
-${PYSITELIB}/tests/utils/utils.pyo
+share/doc/py-creole/README.creole
diff --git a/textproc/py-creole/distinfo b/textproc/py-creole/distinfo
index f2538025d40..d5b33991e79 100644
--- a/textproc/py-creole/distinfo
+++ b/textproc/py-creole/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/02/11 13:01:54 joerg Exp $
+$NetBSD: distinfo,v 1.2 2012/10/11 15:35:09 wen Exp $
-SHA1 (python-creole-0.2.5.tar.gz) = cdc05b235a1ec66153b4078b7cbfea2efebfa248
-RMD160 (python-creole-0.2.5.tar.gz) = 05f5e579a5b886402bd832ed64b3b66b5536641d
-Size (python-creole-0.2.5.tar.gz) = 31024 bytes
+SHA1 (python-creole-1.0.5.tar.gz) = fabef2732acdca81704f16f29222006d8b9e95a3
+RMD160 (python-creole-1.0.5.tar.gz) = c7079a6f46e2e726058944f12b204d9b174f32df
+Size (python-creole-1.0.5.tar.gz) = 66232 bytes
+SHA1 (patch-setup.py) = 87fedc68753bd108c6c87b0ce6d5187e3627371b
diff --git a/textproc/py-creole/patches/patch-setup.py b/textproc/py-creole/patches/patch-setup.py
new file mode 100644
index 00000000000..b9e3194fa7e
--- /dev/null
+++ b/textproc/py-creole/patches/patch-setup.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-setup.py,v 1.1 2012/10/11 15:35:09 wen Exp $
+
+Install README.creole into right directory.
+
+--- setup.py.orig 2012-10-11 06:13:34.000000000 +0000
++++ setup.py
+@@ -44,7 +44,7 @@ setup(
+ url='http://code.google.com/p/python-creole/',
+ packages=find_packages(),
+ include_package_data=True, # include package data under svn source control
+- data_files=[("", ["README.creole"])], # README used in unittest test_setup_utils.py
++ data_files=[("share/doc/py-creole", ["README.creole"])], # README used in unittest test_setup_utils.py
+ zip_safe=True, # http://packages.python.org/distribute/setuptools.html#setting-the-zip-safe-flag
+ keywords="creole markup creole2html html2creole rest2html html2rest html2textile",
+ classifiers=[