Sat Jan 18 08:08:59 2014 UTC ()
treat python version depended PLIST handling with standard way.


(obache)
diff -r1.10 -r1.11 pkgsrc/www/py-genshi/Makefile
diff -r1.5 -r1.6 pkgsrc/www/py-genshi/PLIST
diff -r1.1 -r0 pkgsrc/www/py-genshi/PLIST.py2
diff -r1.1 -r0 pkgsrc/www/py-genshi/PLIST.py3
cvs diff -r1.10 -r1.11 pkgsrc/www/py-genshi/Makefile (expand / switch to unified diff)

--- pkgsrc/www/py-genshi/Makefile 2014/01/18 07:40:24 1.10
+++ pkgsrc/www/py-genshi/Makefile 2014/01/18 08:08:59 1.11
@@ -1,30 +1,22 @@ @@ -1,30 +1,22 @@
1# $NetBSD: Makefile,v 1.10 2014/01/18 07:40:24 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2014/01/18 08:08:59 obache Exp $
2 2
3DISTNAME= Genshi-0.7 3DISTNAME= Genshi-0.7
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5CATEGORIES= www python 5CATEGORIES= www python
6MASTER_SITES= http://ftp.edgewall.com/pub/genshi/ 6MASTER_SITES= http://ftp.edgewall.com/pub/genshi/
7 7
8MAINTAINER= obache@NetBSD.org 8MAINTAINER= obache@NetBSD.org
9HOMEPAGE= http://genshi.edgewall.org/ 9HOMEPAGE= http://genshi.edgewall.org/
10COMMENT= Python toolkit for generation of output for the web 10COMMENT= Python toolkit for generation of output for the web
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13DEPENDS+= ${PYPKGPREFIX}-babel>=0.8:../../devel/py-babel 13DEPENDS+= ${PYPKGPREFIX}-babel>=0.8:../../devel/py-babel
14DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 14DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
15 15
16USE_LANGUAGES= c 16USE_LANGUAGES= c
17 17
18.include "../../lang/python/pyversion.mk" 
19 
20.if ${PYPKGPREFIX} == "py33" 
21PLIST_SRC+= PLIST PLIST.py3 
22.else 
23PLIST_SRC+= PLIST PLIST.py2 
24.endif 
25 
26do-test: 18do-test:
27 ${RUN}cd ${WRKSRC};${PYTHONBIN} setup.py test 19 ${RUN}cd ${WRKSRC};${PYTHONBIN} setup.py test
28 20
29.include "../../lang/python/egg.mk" 21.include "../../lang/python/egg.mk"
30.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/www/py-genshi/PLIST (expand / switch to unified diff)

--- pkgsrc/www/py-genshi/PLIST 2014/01/18 07:40:24 1.5
+++ pkgsrc/www/py-genshi/PLIST 2014/01/18 08:08:59 1.6
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1@comment $NetBSD: PLIST,v 1.5 2014/01/18 07:40:24 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.6 2014/01/18 08:08:59 obache Exp $
2${PYSITELIB}/${EGG_INFODIR}/PKG-INFO 2${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
3${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt 3${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
4${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt 4${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
5${PYSITELIB}/${EGG_INFODIR}/entry_points.txt 5${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
6${PYSITELIB}/${EGG_INFODIR}/requires.txt 6${PYSITELIB}/${EGG_INFODIR}/requires.txt
7${PYSITELIB}/${EGG_INFODIR}/top_level.txt 7${PYSITELIB}/${EGG_INFODIR}/top_level.txt
8${PYSITELIB}/genshi/__init__.py 8${PYSITELIB}/genshi/__init__.py
9${PYSITELIB}/genshi/__init__.pyc 9${PYSITELIB}/genshi/__init__.pyc
10${PYSITELIB}/genshi/__init__.pyo 10${PYSITELIB}/genshi/__init__.pyo
 11${PLIST.py3x}${PYSITELIB}/genshi/_speedups.c
 12${PLIST.py2x}${PYSITELIB}/genshi/_speedups.so
11${PYSITELIB}/genshi/builder.py 13${PYSITELIB}/genshi/builder.py
12${PYSITELIB}/genshi/builder.pyc 14${PYSITELIB}/genshi/builder.pyc
13${PYSITELIB}/genshi/builder.pyo 15${PYSITELIB}/genshi/builder.pyo
14${PYSITELIB}/genshi/compat.py 16${PYSITELIB}/genshi/compat.py
15${PYSITELIB}/genshi/compat.pyc 17${PYSITELIB}/genshi/compat.pyc
16${PYSITELIB}/genshi/compat.pyo 18${PYSITELIB}/genshi/compat.pyo
17${PYSITELIB}/genshi/core.py 19${PYSITELIB}/genshi/core.py
18${PYSITELIB}/genshi/core.pyc 20${PYSITELIB}/genshi/core.pyc
19${PYSITELIB}/genshi/core.pyo 21${PYSITELIB}/genshi/core.pyo
20${PYSITELIB}/genshi/filters/__init__.py 22${PYSITELIB}/genshi/filters/__init__.py
21${PYSITELIB}/genshi/filters/__init__.pyc 23${PYSITELIB}/genshi/filters/__init__.pyc
22${PYSITELIB}/genshi/filters/__init__.pyo 24${PYSITELIB}/genshi/filters/__init__.pyo
23${PYSITELIB}/genshi/filters/html.py 25${PYSITELIB}/genshi/filters/html.py
@@ -100,26 +102,32 @@ ${PYSITELIB}/genshi/template/tests/inter @@ -100,26 +102,32 @@ ${PYSITELIB}/genshi/template/tests/inter
100${PYSITELIB}/genshi/template/tests/interpolation.pyo 102${PYSITELIB}/genshi/template/tests/interpolation.pyo
101${PYSITELIB}/genshi/template/tests/loader.py 103${PYSITELIB}/genshi/template/tests/loader.py
102${PYSITELIB}/genshi/template/tests/loader.pyc 104${PYSITELIB}/genshi/template/tests/loader.pyc
103${PYSITELIB}/genshi/template/tests/loader.pyo 105${PYSITELIB}/genshi/template/tests/loader.pyo
104${PYSITELIB}/genshi/template/tests/markup.py 106${PYSITELIB}/genshi/template/tests/markup.py
105${PYSITELIB}/genshi/template/tests/markup.pyc 107${PYSITELIB}/genshi/template/tests/markup.pyc
106${PYSITELIB}/genshi/template/tests/markup.pyo 108${PYSITELIB}/genshi/template/tests/markup.pyo
107${PYSITELIB}/genshi/template/tests/plugin.py 109${PYSITELIB}/genshi/template/tests/plugin.py
108${PYSITELIB}/genshi/template/tests/plugin.pyc 110${PYSITELIB}/genshi/template/tests/plugin.pyc
109${PYSITELIB}/genshi/template/tests/plugin.pyo 111${PYSITELIB}/genshi/template/tests/plugin.pyo
110${PYSITELIB}/genshi/template/tests/templates/__init__.py 112${PYSITELIB}/genshi/template/tests/templates/__init__.py
111${PYSITELIB}/genshi/template/tests/templates/__init__.pyc 113${PYSITELIB}/genshi/template/tests/templates/__init__.pyc
112${PYSITELIB}/genshi/template/tests/templates/__init__.pyo 114${PYSITELIB}/genshi/template/tests/templates/__init__.pyo
 115${PLIST.py3x}${PYSITELIB}/genshi/template/tests/templates/functions.html
 116${PLIST.py3x}${PYSITELIB}/genshi/template/tests/templates/functions.txt
 117${PLIST.py3x}${PYSITELIB}/genshi/template/tests/templates/new_syntax.txt
 118${PLIST.py3x}${PYSITELIB}/genshi/template/tests/templates/test.html
 119${PLIST.py3x}${PYSITELIB}/genshi/template/tests/templates/test.txt
 120${PLIST.py3x}${PYSITELIB}/genshi/template/tests/templates/test_no_doctype.html
113${PYSITELIB}/genshi/template/tests/text.py 121${PYSITELIB}/genshi/template/tests/text.py
114${PYSITELIB}/genshi/template/tests/text.pyc 122${PYSITELIB}/genshi/template/tests/text.pyc
115${PYSITELIB}/genshi/template/tests/text.pyo 123${PYSITELIB}/genshi/template/tests/text.pyo
116${PYSITELIB}/genshi/template/text.py 124${PYSITELIB}/genshi/template/text.py
117${PYSITELIB}/genshi/template/text.pyc 125${PYSITELIB}/genshi/template/text.pyc
118${PYSITELIB}/genshi/template/text.pyo 126${PYSITELIB}/genshi/template/text.pyo
119${PYSITELIB}/genshi/tests/__init__.py 127${PYSITELIB}/genshi/tests/__init__.py
120${PYSITELIB}/genshi/tests/__init__.pyc 128${PYSITELIB}/genshi/tests/__init__.pyc
121${PYSITELIB}/genshi/tests/__init__.pyo 129${PYSITELIB}/genshi/tests/__init__.pyo
122${PYSITELIB}/genshi/tests/builder.py 130${PYSITELIB}/genshi/tests/builder.py
123${PYSITELIB}/genshi/tests/builder.pyc 131${PYSITELIB}/genshi/tests/builder.pyc
124${PYSITELIB}/genshi/tests/builder.pyo 132${PYSITELIB}/genshi/tests/builder.pyo
125${PYSITELIB}/genshi/tests/core.py 133${PYSITELIB}/genshi/tests/core.py
File Deleted: pkgsrc/www/py-genshi/Attic/PLIST.py2
File Deleted: pkgsrc/www/py-genshi/Attic/PLIST.py3