Sat Dec 13 09:05:30 2014 UTC ()
devel/py-unittest2 support py3x now.


(obache)
diff -r1.18 -r1.19 pkgsrc/devel/py-Pyro/Makefile
diff -r1.16 -r1.17 pkgsrc/lang/python/versioned_dependencies.mk
cvs diff -r1.18 -r1.19 pkgsrc/devel/py-Pyro/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-Pyro/Makefile 2014/01/31 11:27:14 1.18
+++ pkgsrc/devel/py-Pyro/Makefile 2014/12/13 09:05:30 1.19
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: Makefile,v 1.18 2014/01/31 11:27:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2014/12/13 09:05:30 obache Exp $
2 2
3DISTNAME= Pyro4-4.22 3DISTNAME= Pyro4-4.22
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://pypi.python.org/packages/source/P/Pyro4/ 6MASTER_SITES= http://pypi.python.org/packages/source/P/Pyro4/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://pyro.sourceforge.net/ 9HOMEPAGE= http://pyro.sourceforge.net/
10COMMENT= Distributed Object Technology system in Python 10COMMENT= Distributed Object Technology system in Python
11LICENSE= mit 11LICENSE= mit
12 12
13DEPENDS+= ${PYPKGPREFIX}-serpent-[0-9]*:../../devel/py-serpent 13DEPENDS+= ${PYPKGPREFIX}-serpent-[0-9]*:../../devel/py-serpent
14 14
15# only needed for test 15# only needed for test
16#DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose 16#DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
17#PYTHON_VERSIONED_DEPENDENCIES=unittest2 17#DEPENDS+= ${PYPKGPREFIX}-unittest2-[0-9]*:../../devel/py-unittest2
18#.include "../../lang/python/versioned_dependencies.mk" 
19#DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage 18#DEPENDS+= ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
20do-test: 19do-test:
21 cd ${WRKSRC}/tests; ${PYTHONBIN} run_suite.py 20 cd ${WRKSRC}/tests; ${PYTHONBIN} run_suite.py
22 21
23.include "../../lang/python/egg.mk" 22.include "../../lang/python/egg.mk"
24.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/lang/python/versioned_dependencies.mk (expand / switch to unified diff)

--- pkgsrc/lang/python/versioned_dependencies.mk 2014/12/05 21:44:10 1.16
+++ pkgsrc/lang/python/versioned_dependencies.mk 2014/12/13 09:05:30 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: versioned_dependencies.mk,v 1.16 2014/12/05 21:44:10 rodent Exp $ 1# $NetBSD: versioned_dependencies.mk,v 1.17 2014/12/13 09:05:30 obache Exp $
2# 2#
3# This file determines which separate distribution of a Python 3# This file determines which separate distribution of a Python
4# package is used as dependency, depending on the Python version 4# package is used as dependency, depending on the Python version
5# used. 5# used.
6# 6#
7# === User-settable variables === 7# === User-settable variables ===
8# 8#
9# PYTHON_VERSIONED_DEPENDENCIES 9# PYTHON_VERSIONED_DEPENDENCIES
10# The Python package which should be added as a dependency. 10# The Python package which should be added as a dependency.
11# 11#
12# Possible values: dateutil 12# Possible values: dateutil
13# Default: (nothing) 13# Default: (nothing)
14# 14#
@@ -16,27 +16,26 @@ @@ -16,27 +16,26 @@
16.include "../../lang/python/pyversion.mk" 16.include "../../lang/python/pyversion.mk"
17 17
18_SUPPORTED_PACKAGES=# empty 18_SUPPORTED_PACKAGES=# empty
19_SUPPORTED_PACKAGES+=Pmw x11/py-Pmw x11/py-Pmw2 19_SUPPORTED_PACKAGES+=Pmw x11/py-Pmw x11/py-Pmw2
20_SUPPORTED_PACKAGES+=X textproc/py-X2 textproc/py-X 20_SUPPORTED_PACKAGES+=X textproc/py-X2 textproc/py-X
21_SUPPORTED_PACKAGES+=cairo graphics/py-cairo graphics/py-cairo3 21_SUPPORTED_PACKAGES+=cairo graphics/py-cairo graphics/py-cairo3
22_SUPPORTED_PACKAGES+=dateutil time/py-dateutil time/py-dateutil2 22_SUPPORTED_PACKAGES+=dateutil time/py-dateutil time/py-dateutil2
23_SUPPORTED_PACKAGES+=dns net/py-dns net/py-dns3 23_SUPPORTED_PACKAGES+=dns net/py-dns net/py-dns3
24_SUPPORTED_PACKAGES+=ephem math/py-ephem math/py-ephem3 24_SUPPORTED_PACKAGES+=ephem math/py-ephem math/py-ephem3
25_SUPPORTED_PACKAGES+=flup www/py-flup www/py-flup3 25_SUPPORTED_PACKAGES+=flup www/py-flup www/py-flup3
26_SUPPORTED_PACKAGES+=google-api-python-client www/py-google-api-python-client www/py-google-api-python-client-py3 26_SUPPORTED_PACKAGES+=google-api-python-client www/py-google-api-python-client www/py-google-api-python-client-py3
27_SUPPORTED_PACKAGES+=jsonlib textproc/py-jsonlib textproc/py-jsonlib3 27_SUPPORTED_PACKAGES+=jsonlib textproc/py-jsonlib textproc/py-jsonlib3
28_SUPPORTED_PACKAGES+=python-digest www/py-python-digest www/py-python3-digest 28_SUPPORTED_PACKAGES+=python-digest www/py-python-digest www/py-python3-digest
29_SUPPORTED_PACKAGES+=unittest2 devel/py-unittest2 devel/py-unittest2py3k 
30 29
31.for pattern in ${PYTHON_VERSIONED_DEPENDENCIES} 30.for pattern in ${PYTHON_VERSIONED_DEPENDENCIES}
32_PKG_MATCHED= no 31_PKG_MATCHED= no
33pkg:= ${pattern:C/:.*//} 32pkg:= ${pattern:C/:.*//}
34type:= ${pattern:C/[^:]*//} 33type:= ${pattern:C/[^:]*//}
35.for name py2dir py3dir in ${_SUPPORTED_PACKAGES} 34.for name py2dir py3dir in ${_SUPPORTED_PACKAGES}
36.if "${pkg}" == "${name}" 35.if "${pkg}" == "${name}"
37_PKG_MATCHED= yes 36_PKG_MATCHED= yes
38.if ${PYPKGPREFIX} == "py26" || ${PYPKGPREFIX} == "py27" 37.if ${PYPKGPREFIX} == "py26" || ${PYPKGPREFIX} == "py27"
39dir:= ${py2dir} 38dir:= ${py2dir}
40.else 39.else
41dir:= ${py3dir} 40dir:= ${py3dir}
42.endif 41.endif