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.10
retrieving revision 1.47
diff -u -p -r1.10 -r1.47
--- pkgsrc/mk/pgsql.buildlink3.mk	2005/05/12 22:19:16	1.10
+++ pkgsrc/mk/pgsql.buildlink3.mk	2018/05/21 08:07:49	1.47
@@ -1,19 +1,38 @@
-# $NetBSD: pgsql.buildlink3.mk,v 1.10 2005/05/12 22:19:16 jlam Exp $
+# $NetBSD: pgsql.buildlink3.mk,v 1.47 2018/05/21 08:07:49 adam Exp $
+#
+# User-settable variables:
+#
+# PGSQL_VERSION_DEFAULT
+#
+# Package-settable variables:
+#
+# PGSQL_VERSIONS_ACCEPTED
+#
+# Variables set by this file:
+#
+# PG_LIB_EXT
+# PGSQL_TYPE
+# PGPKGSRCDIR
 
 .if !defined(PGVERSION_MK)
 PGVERSION_MK=	defined
 
+_VARGROUPS+=		pgsql
+_USER_VARS.pgsql=	PGSQL_VERSION_DEFAULT
+_PKG_VARS.pgsql=	PGSQL_VERSIONS_ACCEPTED
+_SYS_VARS.pgsql=	PG_LIB_EXT PGSQL_TYPE PGPKGSRCDIR
+
 .include "../../mk/bsd.prefs.mk"
 
-PGSQL_VERSION_DEFAULT?=		74
-PGSQL_VERSIONS_ACCEPTED?=	80 74 73
+PGSQL_VERSION_DEFAULT?=		95
+PGSQL_VERSIONS_ACCEPTED?=	10 96 95 94 93
 
 # transform the list into individual variables
 .for pv in ${PGSQL_VERSIONS_ACCEPTED}
 _PGSQL_VERSION_${pv}_OK=	yes
 .endfor
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 PG_LIB_EXT=dylib
 .else
 PG_LIB_EXT=so
@@ -21,25 +40,37 @@ PG_LIB_EXT=so
 
 # check what is installed
 .if ${OPSYS} == "Darwin"
-.if exists(${LOCALBASE}/lib/libecpg.5.0.dylib)
-_PGSQL_VERSION_80_INSTALLED=	yes
-.endif
-.if exists(${LOCALBASE}/lib/libecpg.4.1.dylib)
-_PGSQL_VERSION_74_INSTALLED=	yes
-.endif
-.if exists(${LOCALBASE}/lib/libecpg.3.dylib)
-_PGSQL_VERSION_73_INSTALLED=yes
-.endif
+.  if exists(${LOCALBASE}/lib/libecpg.6.10.dylib)
+_PGSQL_VERSION_10_INSTALLED=	yes
+.  endif
+.  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
 .else
-.if exists(${LOCALBASE}/lib/libecpg.so.5.0)
-_PGSQL_VERSION_80_INSTALLED=	yes
-.endif
-.if exists(${LOCALBASE}/lib/libecpg.so.4.1)
-_PGSQL_VERSION_74_INSTALLED=	yes
-.endif
-.if exists(${LOCALBASE}/lib/libecpg.so.3)
-_PGSQL_VERSION_73_INSTALLED=yes
-.endif
+.  if exists(${LOCALBASE}/lib/libecpg.so.6.10)
+_PGSQL_VERSION_10_INSTALLED=	yes
+.  endif
+.  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
 .endif
 
 # if a version is explicitely required, take it
@@ -76,25 +107,31 @@ _PGSQL_VERSION=	${PGSQL_VERSION_DEFAULT}
 _PGSQL_VERSION=	${_PGSQL_VERSION_FIRSTACCEPTED}
 .endif
 
-#
 # set variables for the version we decided to use:
-#
-.if ${_PGSQL_VERSION} == "80"
-PGSQL_TYPE=	postgresql80-client
-PGPKGSRCDIR=	../../databases/postgresql80-client
-.elif ${_PGSQL_VERSION} == "74"
-PGSQL_TYPE=	postgresql74-lib
-PGPKGSRCDIR=	../../databases/postgresql74-lib
-.elif ${_PGSQL_VERSION} == "73"
-PGSQL_TYPE=	postgresql73-lib
-PGPKGSRCDIR=	../../databases/postgresql73-lib
+.if ${_PGSQL_VERSION} == "10"
+PGSQL_TYPE=	postgresql10-client
+PGPKGSRCDIR=	../../databases/postgresql10-client
+.elif ${_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
 .else
 # force an error
 PGSQL_TYPE=		none
-PKG_SKIP_REASON+=	"${_PGSQL_VERSION} is not a valid package"
+PKG_FAIL_REASON+=	"${_PGSQL_VERSION} is not a valid package"
 .endif
 
 .include "${PGPKGSRCDIR}/buildlink3.mk"
 PGSQL_PREFIX=	${BUILDLINK_PREFIX.${PGSQL_TYPE}}
 
+PGSQL_VERSION=	${_PGSQL_VERSION}
+
 .endif	# PGVERSION_MK