svn commit: r404479 - in head/Mk: Scripts Uses

[Antoine Brodin]

Author: antoine
Date: Fri Dec 25 21:55:34 2015
New Revision: 404479
URL: https://svnweb.freebsd.org/changeset/ports/404479

Log:
  Do not cache PYTHON_PORTVERSION, it is not invariant between ports

Modified:
  head/Mk/Scripts/functions.sh
  head/Mk/Uses/python.mk

Modified: head/Mk/Scripts/functions.sh
==============================================================================
--- head/Mk/Scripts/functions.sh	Fri Dec 25 21:55:05 2015	(r404478)
+++ head/Mk/Scripts/functions.sh	Fri Dec 25 21:55:34 2015	(r404479)
@@ -184,7 +184,6 @@ export_ports_env() {
 		OPSYS \
 		OSREL \
 		OSVERSION \
-		PYTHON_PORTVERSION \
 		PYTHONBASE \
 		UID \
 		_JAVA_OS_LIST_REGEXP \

Modified: head/Mk/Uses/python.mk
==============================================================================
--- head/Mk/Uses/python.mk	Fri Dec 25 21:55:05 2015	(r404478)
+++ head/Mk/Uses/python.mk	Fri Dec 25 21:55:34 2015	(r404479)
@@ -390,7 +390,6 @@ PYTHON_PORTSDIR=	${_PYTHON_RELPORTDIR}${
 .if !defined(PYTHON_PORTVERSION)
 PYTHON_PORTVERSION!=	${MAKE} -V PORTVERSION -C ${PYTHON_PORTSDIR}
 .endif
-_EXPORTED_VARS+=	PYTHON_PORTVERSION
 .endif
 # Create a 4 integer version string, prefixing 0 to the last token if
 # it's a single character. Only use the the first 3 tokens of