2 files changed, 3 insertions, 79 deletions

diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile
index 5fb4c79d4b3e..35f05ba2be58 100644
--- a/textproc/py-genshi/Makefile
+++ b/textproc/py-genshi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Genshi
 PORTVERSION=	0.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 #PORTEPOCH=	0
 CATEGORIES=	textproc www python
 MASTER_SITES=	http://ftp.edgewall.com/pub/${PORTNAME:L}/ \
@@ -21,7 +21,7 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 
 PYEASYINSTALL_ARCHDEP=	yes
-PYDISTUTILS_INSTALLARGS=	-Z -O 1 -N -S ${PYTHONPREFIX_SITELIBDIR}/site-packages  -d ${PYTHONPREFIX_SITELIBDIR} ${WRKSRC}/dist/${PYEASYINSTALL_EGG}
+PYDISTUTILS_INSTALLARGS=	-O 1 -N -S ${PYTHONPREFIX_SITELIBDIR}/site-packages  -d ${PYTHONPREFIX_SITELIBDIR} ${WRKSRC}/dist/${PYEASYINSTALL_EGG}
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/textproc/py-genshi/pkg-plist b/textproc/py-genshi/pkg-plist
index 6306de3e6b0a..d23aa161495d 100644
--- a/textproc/py-genshi/pkg-plist
+++ b/textproc/py-genshi/pkg-plist
@@ -1,76 +1,5 @@
 @comment $FreeBSD$
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/_speedups.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/_speedups.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/_speedups.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/_speedups.so
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/builder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/builder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/builder.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/core.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/core.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/core.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/html.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/html.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/html.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/i18n.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/i18n.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/i18n.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/transform.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/transform.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters/transform.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/input.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/input.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/input.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/output.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/output.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/output.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/path.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/path.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/path.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/base.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/directives.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/directives.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/directives.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/eval.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/eval.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/eval.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/interpolation.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/interpolation.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/interpolation.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/loader.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/loader.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/loader.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/markup.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/markup.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/markup.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/plugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/plugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/plugin.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/text.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/text.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template/text.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/util.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/util.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/util.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 %%PORTDOCS%%%%DOCSDIR%%/2000ft.png
 %%PORTDOCS%%%%DOCSDIR%%/api/api-objects.txt
 %%PORTDOCS%%%%DOCSDIR%%/api/class-tree.html
@@ -312,8 +241,3 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/common
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/api
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/template
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi/filters
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/genshi
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%