View | Details | Raw Unified | Return to bug 166226
Collapse All | Expand All

(-)Mk/bsd.python.mk (-7 / +7 lines)
Lines 264-270 Link Here
264
.if !defined(PYTHON_DEFAULT_VERSION)
268
.if !defined(PYTHON_DEFAULT_VERSION)
265
. if exists(${LOCALBASE}/bin/python)
269
. if exists(${LOCALBASE}/bin/python)
266
_PYTHON_DEFAULT_VERSION!=	(${LOCALBASE}/bin/python -c \
270
_PYTHON_DEFAULT_VERSION!=	(${LOCALBASE}/bin/python -c \
267
							'import sys; print sys.version[:3]' 2> /dev/null \
271
							'import sys; print(sys.version[:3])' 2> /dev/null \
268
							|| ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1
272
							|| ${ECHO_CMD} ${_PYTHON_PORTBRANCH}) | ${TAIL} -1
269
. else
273
. else
270
_PYTHON_DEFAULT_VERSION=	${_PYTHON_PORTBRANCH}
274
_PYTHON_DEFAULT_VERSION=	${_PYTHON_PORTBRANCH}
Lines 336-342 Link Here
336
PYTHON_VERSION?=	python${_PYTHON_VERSION}
340
PYTHON_VERSION?=	python${_PYTHON_VERSION}
337
PYTHON_CMD?=		${_PYTHON_CMD}
341
PYTHON_CMD?=		${_PYTHON_CMD}
338
.if !defined(PYTHONBASE)
342
.if !defined(PYTHONBASE)
339
PYTHONBASE!=		(${PYTHON_CMD} -c 'import sys; print sys.prefix' \
343
PYTHONBASE!=		(${PYTHON_CMD} -c 'import sys; print(sys.prefix)' \
340
						2> /dev/null || ${ECHO_CMD} ${LOCALBASE}) | ${TAIL} -1
344
						2> /dev/null || ${ECHO_CMD} ${LOCALBASE}) | ${TAIL} -1
341
.endif
345
.endif
342
DEPENDS_ARGS+=		PYTHON_VERSION=${PYTHON_VERSION}
346
DEPENDS_ARGS+=		PYTHON_VERSION=${PYTHON_VERSION}
Lines 345-352 Link Here
345
# should point to some other version we have installed, according to the port USE_PYTHON
349
# should point to some other version we have installed, according to the port USE_PYTHON
346
# specification
350
# specification
347
.if !defined(PYTHON_DEFAULT_PORTVERSION) || (${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION})
351
.if !defined(PYTHON_DEFAULT_PORTVERSION) || (${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION})
348
_PYTHON_PORTVERSION!=	(${PYTHON_CMD} -c 'import string, sys; \
352
_PYTHON_PORTVERSION!=	(${PYTHON_CMD} -c 'import sys; \
349
							print string.split(sys.version)[0].replace("b",".b")' 2> /dev/null) | ${TAIL} -1
353
							print(sys.version.split()[0].replace("b",".b"))' 2> /dev/null) | ${TAIL} -1
350
.if !defined(PYTHON_NO_DEPENDS) && !empty(_PYTHON_PORTVERSION)
354
.if !defined(PYTHON_NO_DEPENDS) && !empty(_PYTHON_PORTVERSION)
351
PYTHON_PORTVERSION=	${_PYTHON_PORTVERSION}
355
PYTHON_PORTVERSION=	${_PYTHON_PORTVERSION}
352
.endif
356
.endif
Lines 413-422 Link Here
413
PYTHON_PORTSDIR=	# empty
417
PYTHON_PORTSDIR=	# empty
414
PYTHON_NO_DEPENDS=	YES
418
PYTHON_NO_DEPENDS=	YES
415
PYTHON_REL!=		${PYTHON_CMD} -c 'import sys; h = "%x" % sys.hexversion; \
419
PYTHON_REL!=		${PYTHON_CMD} -c 'import sys; h = "%x" % sys.hexversion; \
416
						print h[0]+h[2]+h[4]'
420
						print(h[0]+h[2]+h[4])'
417
PYTHON_SUFFIX!=		${PYTHON_CMD} -c 'import sys; h = "%x" % sys.hexversion; \
421
PYTHON_SUFFIX!=		${PYTHON_CMD} -c 'import sys; h = "%x" % sys.hexversion; \
418
						print h[0]+h[2]'
422
						print(h[0]+h[2])'
419
PYTHON_VER!=		${PYTHON_CMD} -c 'import sys; print sys.version[:3]'
423
PYTHON_VER!=		${PYTHON_CMD} -c 'import sys; print(sys.version[:3])'
420
424
421
.else
425
.else
422
check-makevars::
426
check-makevars::

Return to bug 166226