View | Details | Raw Unified | Return to bug 209204 | Differences between
and this patch

Collapse All | Expand All

(-)b/Mk/Uses/python.mk (-2 / +2 lines)
Lines 273-279 WARNING+= "PYTHON2_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=p Link Here
273 
WARNING+=      "PYTHON3_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python3=${PYTHON3_DEFAULT_VERSION:S/^python//} instead"
 273 
WARNING+=      "PYTHON3_DEFAULT_VERSION is defined, consider using DEFAULT_VERSIONS=python3=${PYTHON3_DEFAULT_VERSION:S/^python//} instead"
274 
.endif
 274 
.endif
275 
.if exists(${LOCALBASE}/bin/python)
 275 
.if exists(${_PYTHON_BASECMD}) && !defined(_PYTHON_DEFAULT_SET)
276 
.if !defined(_PYTHON_DEFAULT_VERSION)
 276 
.if !defined(_PYTHON_DEFAULT_VERSION)
277 
_PYTHON_DEFAULT_VERSION!=      (${LOCALBASE}/bin/python -c \
 277 
_PYTHON_DEFAULT_VERSION!=      (${LOCALBASE}/bin/python -c \
278 
               'import sys; print("%d.%d" % sys.version_info[:2])' 2> /dev/null \
 278 
               'import sys; print("%d.%d" % sys.version_info[:2])' 2> /dev/null \
Lines 286-292 WARNING+= "Your requested default python version ${PYTHON_DEFAULT} is different Link Here
286 
PYTHON_DEFAULT_VERSION=                python${_PYTHON_DEFAULT_VERSION}
 286 
PYTHON_DEFAULT_VERSION=                python${_PYTHON_DEFAULT_VERSION}
287 
.else
 287 
.else
288 
PYTHON_DEFAULT_VERSION=                python${PYTHON_DEFAULT}
 288 
PYTHON_DEFAULT_VERSION=                python${PYTHON_DEFAULT}
289 
.endif # exists(${LOCALBASE}/bin/python)
 289 
.endif # exists(${_PYTHON_BASECMD}) && !defined(_PYTHON_DEFAULT_SET)
290 
# Is only a meta-port version defined?
 290 
# Is only a meta-port version defined?
291 
.if ${PYTHON_DEFAULT_VERSION} == "python2"
 291 
.if ${PYTHON_DEFAULT_VERSION} == "python2"
(-)b/Mk/bsd.default-versions.mk (-1 / +5 lines)
Lines 54-60 PGSQL_DEFAULT?= 9.3 Link Here
54 
# Possible values: 5.5, 5.6, 7.0
 54 
# Possible values: 5.5, 5.6, 7.0
55 
PHP_DEFAULT?=          5.6
 55 
PHP_DEFAULT?=          5.6
56 
# Possible values: 2.7, 3.3, 3.4, 3.5
 56 
# Possible values: 2.7, 3.3, 3.4, 3.5
57 
PYTHON_DEFAULT?=       2.7
 57 
.if !defined(PYTHON_DEFAULT)
58 
PYTHON_DEFAULT=                2.7
59 
.else
60 
_PYTHON_DEFAULT_SET=   yes
61 
.endif # !defining(PYTHON_DEFAULT)
58 
# Possible values: 2.7
 62 
# Possible values: 2.7
59 
PYTHON2_DEFAULT?=      2.7
 63 
PYTHON2_DEFAULT?=      2.7
60 
# Possible values: 3.3, 3.4, 3.5
 64 
# Possible values: 3.3, 3.4, 3.5

Return to bug 209204