diff options
Diffstat (limited to 'mk/pgsql.buildlink3.mk')
| -rw-r--r-- | mk/pgsql.buildlink3.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/mk/pgsql.buildlink3.mk b/mk/pgsql.buildlink3.mk index d6c0707fc5f..224b72ba7a8 100644 --- a/mk/pgsql.buildlink3.mk +++ b/mk/pgsql.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: pgsql.buildlink3.mk,v 1.33 2012/08/02 03:53:19 asau Exp $ +# $NetBSD: pgsql.buildlink3.mk,v 1.34 2012/10/05 21:09:02 adam Exp $ # # User-settable variables: # @@ -13,7 +13,6 @@ # PG_LIB_EXT # PGSQL_TYPE # PGPKGSRCDIR -# .if !defined(PGVERSION_MK) PGVERSION_MK= defined @@ -26,7 +25,7 @@ _SYS_VARS.pgsql= PG_LIB_EXT PGSQL_TYPE PGPKGSRCDIR .include "../../mk/bsd.prefs.mk" PGSQL_VERSION_DEFAULT?= 91 -PGSQL_VERSIONS_ACCEPTED?= 91 90 84 83 +PGSQL_VERSIONS_ACCEPTED?= 92 91 90 84 83 # transform the list into individual variables .for pv in ${PGSQL_VERSIONS_ACCEPTED} @@ -41,6 +40,9 @@ PG_LIB_EXT=so # check what is installed .if ${OPSYS} == "Darwin" +. if exists(${LOCALBASE}/lib/libecpg.6.4.dylib) +_PGSQL_VERSION_92_INSTALLED= yes +. endif . if exists(${LOCALBASE}/lib/libecpg.6.3.dylib) _PGSQL_VERSION_91_INSTALLED= yes . endif @@ -54,6 +56,9 @@ _PGSQL_VERSION_84_INSTALLED= yes _PGSQL_VERSION_83_INSTALLED= yes . endif .else +. if exists(${LOCALBASE}/lib/libecpg.so.6.4) +_PGSQL_VERSION_92_INSTALLED= yes +. endif . if exists(${LOCALBASE}/lib/libecpg.so.6.3) _PGSQL_VERSION_91_INSTALLED= yes . endif @@ -105,7 +110,10 @@ _PGSQL_VERSION= ${_PGSQL_VERSION_FIRSTACCEPTED} # # set variables for the version we decided to use: # -.if ${_PGSQL_VERSION} == "91" +.if ${_PGSQL_VERSION} == "92" +PGSQL_TYPE= postgresql92-client +PGPKGSRCDIR= ../../databases/postgresql92-client +.elif ${_PGSQL_VERSION} == "91" PGSQL_TYPE= postgresql91-client PGPKGSRCDIR= ../../databases/postgresql91-client .elif ${_PGSQL_VERSION} == "90" |