svn commit: r449664 - head/Mk/Uses

Antoine Brodin antoine at FreeBSD.org
Mon Sep 11 18:32:18 UTC 2017


Author: antoine
Date: Mon Sep 11 18:32:17 2017
New Revision: 449664
URL: https://svnweb.freebsd.org/changeset/ports/449664

Log:
  When using tcl:someversion+, prefer the default version over the highest
  one if none is installed
  
  With hat:	portmgr

Modified:
  head/Mk/Uses/tcl.mk

Modified: head/Mk/Uses/tcl.mk
==============================================================================
--- head/Mk/Uses/tcl.mk	Mon Sep 11 18:09:37 2017	(r449663)
+++ head/Mk/Uses/tcl.mk	Mon Sep 11 18:32:17 2017	(r449664)
@@ -144,9 +144,13 @@ _TCLTK_WANTED_VERSION:=	${_v}
 .endfor
 
 #
-# If we couldn't find any wanted version installed, depend on the highest one.
+# If we couldn't find any wanted version installed, depend on the default or the highest one.
 .if !defined(_TCLTK_WANTED_VERSION)
+.  if ${_TCLTK_WANTED_VERSIONS:M${_TCLTK_DEFAULT_VERSION}}
+_TCLTK_WANTED_VERSION:=	${_TCLTK_DEFAULT_VERSION}
+.  else
 _TCLTK_WANTED_VERSION:= ${_TCLTK_HIGHEST_VERSION}
+.  endif
 .endif
 
 #


More information about the svn-ports-all mailing list