svn commit: r364517 - head/Mk/Uses

[Marcus von Appen]

Author: mva
Date: Sun Aug 10 08:48:41 2014
New Revision: 364517
URL: http://svnweb.freebsd.org/changeset/ports/364517
QAT: https://qat.redports.org/buildarchive/r364517/

Log:
  - Only print the python version mismatch warning, if a dependency or user set
    PYTHON_VERSION explicitly. Otherwise, ports using a non-default version
    would always print the warning.
  
  With hat:	python@

Modified:
  head/Mk/Uses/python.mk

Modified: head/Mk/Uses/python.mk
==============================================================================
--- head/Mk/Uses/python.mk	Sun Aug 10 08:47:38 2014	(r364516)
+++ head/Mk/Uses/python.mk	Sun Aug 10 08:48:41 2014	(r364517)
@@ -397,7 +397,10 @@ _PYTHON_VERSION_NONSUPPORTED=	${_PYTHON_
 
 # If we have an unsupported version of Python, try another.
 .if defined(_PYTHON_VERSION_NONSUPPORTED)
-WARNING+=	"needs Python ${_PYTHON_VERSION_NONSUPPORTED}. But a port depending on this one specified ${_PYTHON_VERSION}"
+.if defined(PYTHON_VERSION) || defined(PYTHON_CMD)
+_PV:=		${_PYTHON_VERSION}	# preserve the specified python version
+WARNING+=	"needs Python ${_PYTHON_VERSION_NONSUPPORTED}. But a port depending on this one specified ${_PV}"
+.endif # defined(PYTHON_VERSION) || defined(PYTHON_CMD)
 .undef _PYTHON_VERSION
 .for ver in ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
 __VER=		${ver}