3 files changed, 95 insertions, 99 deletions

diff --git a/textproc/py-twistedLore/Makefile b/textproc/py-twistedLore/Makefile
index fd541da9bb65..71c26eb39f40 100644
--- a/textproc/py-twistedLore/Makefile
+++ b/textproc/py-twistedLore/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedLore
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.0
 CATEGORIES=	textproc python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Lore/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,12 +18,8 @@ COMMENT=	Documentation generator with HTML and LaTeX support
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-WRKSRC=		${WRKDIR}/TwistedLore-${PORTVERSION}
-
 USE_BZIP2=	yes
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
 
-PLIST_SUB+=	S=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}
-
 .include <bsd.port.mk>
diff --git a/textproc/py-twistedLore/distinfo b/textproc/py-twistedLore/distinfo
index 2b00097781e2..0db6c4c07408 100644
--- a/textproc/py-twistedLore/distinfo
+++ b/textproc/py-twistedLore/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedLore-0.2.0.tar.bz2) = 213569a86fc3d8558605e2847e6378b0
-SHA256 (TwistedLore-0.2.0.tar.bz2) = 7b4cac320680dc1f5c84b93021b7eaf7cd646ca63e3556c7360f53e0f3e3acf9
-SIZE (TwistedLore-0.2.0.tar.bz2) = 61194
+MD5 (TwistedLore-0.3.0.tar.bz2) = 3e1476bf25f420bcd76351a22630e7c3
+SHA256 (TwistedLore-0.3.0.tar.bz2) = c7d3f1c1154a4773052ec6f3e62794f0dc6ca90d86f98a2b2c3c3c45f4f8eab0
+SIZE (TwistedLore-0.3.0.tar.bz2) = 64407
diff --git a/textproc/py-twistedLore/pkg-plist b/textproc/py-twistedLore/pkg-plist
index 57f0231d7753..457caf46a988 100644
--- a/textproc/py-twistedLore/pkg-plist
+++ b/textproc/py-twistedLore/pkg-plist
@@ -1,93 +1,93 @@
 bin/bookify
 bin/lore
-%%S%%/twisted/lore/__init__.py
-%%S%%/twisted/lore/__init__.pyc
-%%S%%/twisted/lore/__init__.pyo
-%%S%%/twisted/lore/_version.py
-%%S%%/twisted/lore/_version.pyc
-%%S%%/twisted/lore/_version.pyo
-%%S%%/twisted/lore/default.py
-%%S%%/twisted/lore/default.pyc
-%%S%%/twisted/lore/default.pyo
-%%S%%/twisted/lore/docbook.py
-%%S%%/twisted/lore/docbook.pyc
-%%S%%/twisted/lore/docbook.pyo
-%%S%%/twisted/lore/htmlbook.py
-%%S%%/twisted/lore/htmlbook.pyc
-%%S%%/twisted/lore/htmlbook.pyo
-%%S%%/twisted/lore/indexer.py
-%%S%%/twisted/lore/indexer.pyc
-%%S%%/twisted/lore/indexer.pyo
-%%S%%/twisted/lore/latex.py
-%%S%%/twisted/lore/latex.pyc
-%%S%%/twisted/lore/latex.pyo
-%%S%%/twisted/lore/lint.py
-%%S%%/twisted/lore/lint.pyc
-%%S%%/twisted/lore/lint.pyo
-%%S%%/twisted/lore/lmath.py
-%%S%%/twisted/lore/lmath.pyc
-%%S%%/twisted/lore/lmath.pyo
-%%S%%/twisted/lore/man2lore.py
-%%S%%/twisted/lore/man2lore.pyc
-%%S%%/twisted/lore/man2lore.pyo
-%%S%%/twisted/lore/nevowlore.py
-%%S%%/twisted/lore/nevowlore.pyc
-%%S%%/twisted/lore/nevowlore.pyo
-%%S%%/twisted/lore/numberer.py
-%%S%%/twisted/lore/numberer.pyc
-%%S%%/twisted/lore/numberer.pyo
-%%S%%/twisted/lore/process.py
-%%S%%/twisted/lore/process.pyc
-%%S%%/twisted/lore/process.pyo
-%%S%%/twisted/lore/scripts/__init__.py
-%%S%%/twisted/lore/scripts/__init__.pyc
-%%S%%/twisted/lore/scripts/__init__.pyo
-%%S%%/twisted/lore/scripts/lore.py
-%%S%%/twisted/lore/scripts/lore.pyc
-%%S%%/twisted/lore/scripts/lore.pyo
-%%S%%/twisted/lore/slides.py
-%%S%%/twisted/lore/slides.pyc
-%%S%%/twisted/lore/slides.pyo
-%%S%%/twisted/lore/template.mgp
-%%S%%/twisted/lore/test/__init__.py
-%%S%%/twisted/lore/test/__init__.pyc
-%%S%%/twisted/lore/test/__init__.pyo
-%%S%%/twisted/lore/test/good_internal.xhtml
-%%S%%/twisted/lore/test/good_simple.xhtml
-%%S%%/twisted/lore/test/lore_index_file_out.html
-%%S%%/twisted/lore/test/lore_index_file_out_multiple.html
-%%S%%/twisted/lore/test/lore_index_file_unnumbered_multiple_out.html
-%%S%%/twisted/lore/test/lore_index_file_unnumbered_out.html
-%%S%%/twisted/lore/test/lore_index_test.xhtml
-%%S%%/twisted/lore/test/lore_index_test2.xhtml
-%%S%%/twisted/lore/test/lore_index_test3.xhtml
-%%S%%/twisted/lore/test/lore_index_test_out.html
-%%S%%/twisted/lore/test/lore_index_test_out2.html
-%%S%%/twisted/lore/test/lore_numbering_test.xhtml
-%%S%%/twisted/lore/test/lore_numbering_test_out.html
-%%S%%/twisted/lore/test/lore_numbering_test_out2.html
-%%S%%/twisted/lore/test/simple.html
-%%S%%/twisted/lore/test/simple.xhtml
-%%S%%/twisted/lore/test/simple1.xhtml
-%%S%%/twisted/lore/test/simple2.xhtml
-%%S%%/twisted/lore/test/simple3.html
-%%S%%/twisted/lore/test/simple3.xhtml
-%%S%%/twisted/lore/test/simple4.html
-%%S%%/twisted/lore/test/simple4.xhtml
-%%S%%/twisted/lore/test/simple4foo.xhtml
-%%S%%/twisted/lore/test/template.tpl
-%%S%%/twisted/lore/test/test_lore.py
-%%S%%/twisted/lore/test/test_lore.pyc
-%%S%%/twisted/lore/test/test_lore.pyo
-%%S%%/twisted/lore/texi.py
-%%S%%/twisted/lore/texi.pyc
-%%S%%/twisted/lore/texi.pyo
-%%S%%/twisted/lore/tree.py
-%%S%%/twisted/lore/tree.pyc
-%%S%%/twisted/lore/tree.pyo
-%%S%%/twisted/plugins/twisted_lore.py
-%%S%%/twisted/plugins/twisted_lore.pyc
-%%S%%/twisted/plugins/twisted_lore.pyo
-@dirrm %%S%%/twisted/lore/test
-@dirrm %%S%%/twisted/lore/scripts
-@dirrm %%S%%/twisted/lore
+%%PYTHON_SITELIBDIR%%/twisted/lore/__init__.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/__init__.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/_version.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/_version.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/_version.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/default.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/default.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/default.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/docbook.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/docbook.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/docbook.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/htmlbook.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/htmlbook.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/htmlbook.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/indexer.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/indexer.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/indexer.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/latex.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/latex.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/latex.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/lint.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/lint.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/lint.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/lmath.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/lmath.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/lmath.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/man2lore.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/man2lore.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/man2lore.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/nevowlore.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/nevowlore.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/nevowlore.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/numberer.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/numberer.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/numberer.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/process.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/process.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/process.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/scripts/__init__.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/scripts/__init__.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/scripts/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/scripts/lore.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/scripts/lore.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/scripts/lore.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/slides.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/slides.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/slides.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/template.mgp
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/__init__.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/__init__.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/good_internal.xhtml
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/good_simple.xhtml
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_file_out.html
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_file_out_multiple.html
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_file_unnumbered_multiple_out.html
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_file_unnumbered_out.html
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_test.xhtml
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_test2.xhtml
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_test3.xhtml
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_test_out.html
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_index_test_out2.html
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_numbering_test.xhtml
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_numbering_test_out.html
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/lore_numbering_test_out2.html
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple.html
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple.xhtml
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple1.xhtml
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple2.xhtml
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple3.html
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple3.xhtml
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple4.html
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple4.xhtml
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/simple4foo.xhtml
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/template.tpl
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_lore.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_lore.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/test/test_lore.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/texi.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/texi.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/texi.pyo
+%%PYTHON_SITELIBDIR%%/twisted/lore/tree.py
+%%PYTHON_SITELIBDIR%%/twisted/lore/tree.pyc
+%%PYTHON_SITELIBDIR%%/twisted/lore/tree.pyo
+%%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_lore.py
+%%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_lore.pyc
+%%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_lore.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/lore/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/lore/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/lore