Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/mk/pgsql.buildlink3.mk,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/mk/pgsql.buildlink3.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.33
retrieving revision 1.43
diff -u -p -r1.33 -r1.43
--- pkgsrc/mk/pgsql.buildlink3.mk	2012/08/02 03:53:19	1.33
+++ pkgsrc/mk/pgsql.buildlink3.mk	2016/10/30 08:57:12	1.43
@@ -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.43 2016/10/30 08:57:12 adam Exp $
 #
 # User-settable variables:
 #
@@ -13,7 +13,6 @@
 # PG_LIB_EXT
 # PGSQL_TYPE
 # PGPKGSRCDIR
-#
 
 .if !defined(PGVERSION_MK)
 PGVERSION_MK=	defined
@@ -25,8 +24,8 @@ _SYS_VARS.pgsql=	PG_LIB_EXT PGSQL_TYPE P
 
 .include "../../mk/bsd.prefs.mk"
 
-PGSQL_VERSION_DEFAULT?=		91
-PGSQL_VERSIONS_ACCEPTED?=	91 90 84 83
+PGSQL_VERSION_DEFAULT?=		95
+PGSQL_VERSIONS_ACCEPTED?=	96 95 94 93 92 91
 
 # transform the list into individual variables
 .for pv in ${PGSQL_VERSIONS_ACCEPTED}
@@ -41,6 +40,21 @@ PG_LIB_EXT=so
 
 # check what is installed
 .if ${OPSYS} == "Darwin"
+.  if exists(${LOCALBASE}/lib/libecpg.6.8.dylib)
+_PGSQL_VERSION_96_INSTALLED=	yes
+.  endif
+.  if exists(${LOCALBASE}/lib/libecpg.6.7.dylib)
+_PGSQL_VERSION_95_INSTALLED=	yes
+.  endif
+.  if exists(${LOCALBASE}/lib/libecpg.6.6.dylib)
+_PGSQL_VERSION_94_INSTALLED=	yes
+.  endif
+.  if exists(${LOCALBASE}/lib/libecpg.6.5.dylib)
+_PGSQL_VERSION_93_INSTALLED=	yes
+.  endif
+.  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
@@ -50,10 +64,22 @@ _PGSQL_VERSION_90_INSTALLED=	yes
 .  if exists(${LOCALBASE}/lib/libecpg.6.1.dylib)
 _PGSQL_VERSION_84_INSTALLED=	yes
 .  endif
-.  if exists(${LOCALBASE}/lib/libecpg.6.0.dylib)
-_PGSQL_VERSION_83_INSTALLED=	yes
-.  endif
 .else
+.  if exists(${LOCALBASE}/lib/libecpg.so.6.8)
+_PGSQL_VERSION_96_INSTALLED=	yes
+.  endif
+.  if exists(${LOCALBASE}/lib/libecpg.so.6.7)
+_PGSQL_VERSION_95_INSTALLED=	yes
+.  endif
+.  if exists(${LOCALBASE}/lib/libecpg.so.6.6)
+_PGSQL_VERSION_94_INSTALLED=	yes
+.  endif
+.  if exists(${LOCALBASE}/lib/libecpg.so.6.5)
+_PGSQL_VERSION_93_INSTALLED=	yes
+.  endif
+.  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
@@ -63,9 +89,6 @@ _PGSQL_VERSION_90_INSTALLED=	yes
 .  if exists(${LOCALBASE}/lib/libecpg.so.6.1)
 _PGSQL_VERSION_84_INSTALLED=	yes
 .  endif
-.  if exists(${LOCALBASE}/lib/libecpg.so.6.0)
-_PGSQL_VERSION_83_INSTALLED=	yes
-.  endif
 .endif
 
 # if a version is explicitely required, take it
@@ -102,21 +125,25 @@ _PGSQL_VERSION=	${PGSQL_VERSION_DEFAULT}
 _PGSQL_VERSION=	${_PGSQL_VERSION_FIRSTACCEPTED}
 .endif
 
-#
 # set variables for the version we decided to use:
-#
-.if ${_PGSQL_VERSION} == "91"
+.if ${_PGSQL_VERSION} == "96"
+PGSQL_TYPE=	postgresql96-client
+PGPKGSRCDIR=	../../databases/postgresql96-client
+.elif ${_PGSQL_VERSION} == "95"
+PGSQL_TYPE=	postgresql95-client
+PGPKGSRCDIR=	../../databases/postgresql95-client
+.elif ${_PGSQL_VERSION} == "94"
+PGSQL_TYPE=	postgresql94-client
+PGPKGSRCDIR=	../../databases/postgresql94-client
+.elif ${_PGSQL_VERSION} == "93"
+PGSQL_TYPE=	postgresql93-client
+PGPKGSRCDIR=	../../databases/postgresql93-client
+.elif ${_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"
-PGSQL_TYPE=	postgresql90-client
-PGPKGSRCDIR=	../../databases/postgresql90-client
-.elif ${_PGSQL_VERSION} == "84"
-PGSQL_TYPE=	postgresql84-client
-PGPKGSRCDIR=	../../databases/postgresql84-client
-.elif ${_PGSQL_VERSION} == "83"
-PGSQL_TYPE=	postgresql83-client
-PGPKGSRCDIR=	../../databases/postgresql83-client
 .else
 # force an error
 PGSQL_TYPE=		none