mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-04 01:48:54 +00:00
Code Issues Releases Activity

Prefer installed version instead of insisting on using default version.

Browse Source 
PR:		200569
This commit is contained in:
Max Khon 2016-02-10 12:18:20 +00:00
parent 52f2b52d0f
commit 049382fc14
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=408625
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Mk/Uses/pgsql.mk
View File

@ -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