Tue Feb 22 11:12:51 2011 UTC ()
Use function-style `print', for python3.


(obache)
diff -r1.84 -r1.85 pkgsrc/lang/python/pyversion.mk
cvs diff -r1.84 -r1.85 pkgsrc/lang/python/pyversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/python/pyversion.mk 2011/02/22 09:12:37 1.84
+++ pkgsrc/lang/python/pyversion.mk 2011/02/22 11:12:51 1.85
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: pyversion.mk,v 1.84 2011/02/22 09:12:37 obache Exp $ 1# $NetBSD: pyversion.mk,v 1.85 2011/02/22 11:12:51 obache Exp $
2 2
3# This file determines which Python version is used as a dependency for 3# This file determines which Python version is used as a dependency for
4# a package. 4# a package.
5# 5#
6# === User-settable variables === 6# === User-settable variables ===
7# 7#
8# PYTHON_VERSION_DEFAULT 8# PYTHON_VERSION_DEFAULT
9# The preferred Python version to use. 9# The preferred Python version to use.
10# 10#
11# Possible values: 24 25 26 27 11# Possible values: 24 25 26 27
12# Default: 26 12# Default: 26
13# 13#
14# === Package-settable variables === 14# === Package-settable variables ===
@@ -158,31 +158,31 @@ BUILDLINK_DEPMETHOD.python?= build @@ -158,31 +158,31 @@ BUILDLINK_DEPMETHOD.python?= build
158.if defined(PYPKGSRCDIR) 158.if defined(PYPKGSRCDIR)
159.include "${PYPKGSRCDIR}/buildlink3.mk" 159.include "${PYPKGSRCDIR}/buildlink3.mk"
160.endif 160.endif
161 161
162PYTHONBIN= ${LOCALBASE}/bin/python${PYVERSSUFFIX} 162PYTHONBIN= ${LOCALBASE}/bin/python${PYVERSSUFFIX}
163PYTHONCONFIG= ${LOCALBASE}/bin/python${PYVERSSUFFIX}-config 163PYTHONCONFIG= ${LOCALBASE}/bin/python${PYVERSSUFFIX}-config
164PY_COMPILE_ALL= \ 164PY_COMPILE_ALL= \
165 ${PYTHONBIN} ${PREFIX}/lib/python${PYVERSSUFFIX}/compileall.py -q 165 ${PYTHONBIN} ${PREFIX}/lib/python${PYVERSSUFFIX}/compileall.py -q
166PY_COMPILE_O_ALL= \ 166PY_COMPILE_O_ALL= \
167 ${PYTHONBIN} -O ${PREFIX}/lib/python${PYVERSSUFFIX}/compileall.py -q 167 ${PYTHONBIN} -O ${PREFIX}/lib/python${PYVERSSUFFIX}/compileall.py -q
168 168
169.if exists(${PYTHONBIN}) 169.if exists(${PYTHONBIN})
170PYINC!= ${PYTHONBIN} -c "import distutils.sysconfig; \ 170PYINC!= ${PYTHONBIN} -c "import distutils.sysconfig; \
171 print distutils.sysconfig.get_python_inc(0, \"\")" || ${ECHO} "" 171 print (distutils.sysconfig.get_python_inc(0, \"\"))" || ${ECHO} ""
172PYLIB!= ${PYTHONBIN} -c "import distutils.sysconfig; \ 172PYLIB!= ${PYTHONBIN} -c "import distutils.sysconfig; \
173 print distutils.sysconfig.get_python_lib(0, 1, \"\")" || ${ECHO} "" 173 print (distutils.sysconfig.get_python_lib(0, 1, \"\"))" || ${ECHO} ""
174PYSITELIB!= ${PYTHONBIN} -c "import distutils.sysconfig; \ 174PYSITELIB!= ${PYTHONBIN} -c "import distutils.sysconfig; \
175 print distutils.sysconfig.get_python_lib(0, 0, \"\")" || ${ECHO} "" 175 print (distutils.sysconfig.get_python_lib(0, 0, \"\"))" || ${ECHO} ""
176 176
177PRINT_PLIST_AWK+= /^${PYINC:S|/|\\/|g}/ \ 177PRINT_PLIST_AWK+= /^${PYINC:S|/|\\/|g}/ \
178 { gsub(/${PYINC:S|/|\\/|g}/, "$${PYINC}") } 178 { gsub(/${PYINC:S|/|\\/|g}/, "$${PYINC}") }
179PRINT_PLIST_AWK+= /^${PYSITELIB:S|/|\\/|g}/ \ 179PRINT_PLIST_AWK+= /^${PYSITELIB:S|/|\\/|g}/ \
180 { gsub(/${PYSITELIB:S|/|\\/|g}/, "$${PYSITELIB}") } 180 { gsub(/${PYSITELIB:S|/|\\/|g}/, "$${PYSITELIB}") }
181PRINT_PLIST_AWK+= /^${PYLIB:S|/|\\/|g}/ \ 181PRINT_PLIST_AWK+= /^${PYLIB:S|/|\\/|g}/ \
182 { gsub(/${PYLIB:S|/|\\/|g}/, "$${PYLIB}") } 182 { gsub(/${PYLIB:S|/|\\/|g}/, "$${PYLIB}") }
183.endif 183.endif
184 184
185ALL_ENV+= PYTHON=${PYTHONBIN} 185ALL_ENV+= PYTHON=${PYTHONBIN}
186.if defined(USE_CMAKE) 186.if defined(USE_CMAKE)
187# used by FindPythonInterp.cmake and FindPythonLibs.cmake 187# used by FindPythonInterp.cmake and FindPythonLibs.cmake
188CMAKE_ARGS+= -DPYVERSSUFFIX:STRING=${PYVERSSUFFIX} 188CMAKE_ARGS+= -DPYVERSSUFFIX:STRING=${PYVERSSUFFIX}