4 files changed, 10 insertions, 20 deletions
diff --git a/www/py-genshi/Makefile b/www/py-genshi/Makefile
index 456538e790a..de75427c002 100644
--- a/www/py-genshi/Makefile
+++ b/www/py-genshi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/01/18 07:40:24 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2014/01/18 08:08:59 obache Exp $
 
 DISTNAME=	Genshi-0.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -15,14 +15,6 @@ DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 USE_LANGUAGES=	c
 
-.include "../../lang/python/pyversion.mk"
-
-.if ${PYPKGPREFIX} == "py33"
-PLIST_SRC+=	PLIST PLIST.py3
-.else
-PLIST_SRC+=	PLIST PLIST.py2
-.endif
-
 do-test:
 		${RUN}cd ${WRKSRC};${PYTHONBIN} setup.py test
 
diff --git a/www/py-genshi/PLIST b/www/py-genshi/PLIST
index 8c61c472b28..4fdccec6b1d 100644
--- a/www/py-genshi/PLIST
+++ b/www/py-genshi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/01/18 07:40:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/01/18 08:08:59 obache Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -8,6 +8,8 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/genshi/__init__.py
 ${PYSITELIB}/genshi/__init__.pyc
 ${PYSITELIB}/genshi/__init__.pyo
+${PLIST.py3x}${PYSITELIB}/genshi/_speedups.c
+${PLIST.py2x}${PYSITELIB}/genshi/_speedups.so
 ${PYSITELIB}/genshi/builder.py
 ${PYSITELIB}/genshi/builder.pyc
 ${PYSITELIB}/genshi/builder.pyo
@@ -110,6 +112,12 @@ ${PYSITELIB}/genshi/template/tests/plugin.pyo
 ${PYSITELIB}/genshi/template/tests/templates/__init__.py
 ${PYSITELIB}/genshi/template/tests/templates/__init__.pyc
 ${PYSITELIB}/genshi/template/tests/templates/__init__.pyo
+${PLIST.py3x}${PYSITELIB}/genshi/template/tests/templates/functions.html
+${PLIST.py3x}${PYSITELIB}/genshi/template/tests/templates/functions.txt
+${PLIST.py3x}${PYSITELIB}/genshi/template/tests/templates/new_syntax.txt
+${PLIST.py3x}${PYSITELIB}/genshi/template/tests/templates/test.html
+${PLIST.py3x}${PYSITELIB}/genshi/template/tests/templates/test.txt
+${PLIST.py3x}${PYSITELIB}/genshi/template/tests/templates/test_no_doctype.html
 ${PYSITELIB}/genshi/template/tests/text.py
 ${PYSITELIB}/genshi/template/tests/text.pyc
 ${PYSITELIB}/genshi/template/tests/text.pyo
diff --git a/www/py-genshi/PLIST.py2 b/www/py-genshi/PLIST.py2
deleted file mode 100644
index e6b371a0970..00000000000
--- a/www/py-genshi/PLIST.py2
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.py2,v 1.1 2014/01/18 07:40:24 wiz Exp $
-${PYSITELIB}/genshi/_speedups.so
diff --git a/www/py-genshi/PLIST.py3 b/www/py-genshi/PLIST.py3
deleted file mode 100644
index 90b6d3bafd6..00000000000
--- a/www/py-genshi/PLIST.py3
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.py3,v 1.1 2014/01/18 07:40:24 wiz Exp $
-${PYSITELIB}/genshi/_speedups.c
-${PYSITELIB}/genshi/template/tests/templates/functions.html
-${PYSITELIB}/genshi/template/tests/templates/functions.txt
-${PYSITELIB}/genshi/template/tests/templates/new_syntax.txt
-${PYSITELIB}/genshi/template/tests/templates/test.html
-${PYSITELIB}/genshi/template/tests/templates/test.txt
-${PYSITELIB}/genshi/template/tests/templates/test_no_doctype.html