svn commit: r408625 - head/Mk/Uses

[Max Khon]

Author: fjoe
Date: Wed Feb 10 12:18:20 2016
New Revision: 408625
URL: https://svnweb.freebsd.org/changeset/ports/408625

Log:
  Prefer installed version instead of insisting on using default version.
  
  PR:		200569

Modified:
  head/Mk/Uses/pgsql.mk

Modified: head/Mk/Uses/pgsql.mk
==============================================================================
--- head/Mk/Uses/pgsql.mk	Wed Feb 10 12:14:55 2016	(r408624)
+++ head/Mk/Uses/pgsql.mk	Wed Feb 10 12:18:20 2016	(r408625)
@@ -85,7 +85,7 @@ _WANT_PGSQL_VER?=	${pgsql_ARGS}
 .  endif
 
 # Try to match default version, otherwise just take the first version
-# that matches
+# that matches. Prefer the installed version if it matches
 .  if !empty(_WANT_PGSQL_VER)
 .    for version in ${_WANT_PGSQL_VER}
 .      if ${PGSQL_DEFAULT} == ${version}
@@ -93,6 +93,9 @@ PGSQL_VER=	${version}
 .      endif
 PGSQL_VER?=	${version}
 .    endfor
+.    if defined(_PGSQL_VER) && ${_WANT_PGSQL_VER:M${_PGSQL_VER}} == ${_PGSQL_VER}
+PGSQL_VER=	${_PGSQL_VER}
+.    endif
 .    if defined(_PGSQL_VER) && ${_PGSQL_VER} != ${PGSQL_VER}
 IGNORE?=	cannot install: the port wants postgresql-client version ${_WANT_PGSQL_VER} and you have version ${_PGSQL_VER} installed
 .    endif