From dc1b6b3b056aa21a28299622746f73df2f7739d3 Mon Sep 17 00:00:00 2001
From: Chris Rees <crees@FreeBSD.org>
Date: Wed, 14 Mar 2012 20:35:00 +0000
Subject: Fix version detection; choose default if WITH_PGSQL_VER is not
 defined

Feature safe:	yes
---
 Mk/bsd.database.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Mk/bsd.database.mk')

diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk
index 75f9016aba1f..abf3383ab9b0 100644
--- a/Mk/bsd.database.mk
+++ b/Mk/bsd.database.mk
@@ -212,9 +212,10 @@ _WANT_PGSQL_VER?=	${WANT_PGSQL_VER}
 .        if ${WITH_PGSQL_VER} == ${version}
 PGSQL_VER=	${WITH_PGSQL_VER}
 .        endif
-.      else
+.      elif ${DEFAULT_PGSQL_VER} == ${version}
 PGSQL_VER=	${version}
 .      endif
+PGSQL_VER?=	${version}
 .    endfor
 .    if empty(PGSQL_VER)
 IGNORE?=	cannot install: the port wants postgresql-client version ${WANT_PGSQL_VER} and you have version ${WITH_PGSQL_VER} installed or set in make.conf
-- 
cgit v1.2.3