CVS commit: pkgsrc/mk

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Oct 24 19:52:35 UTC 2022

Modified Files:
        pkgsrc/mk: pgsql.buildlink3.mk

Log Message:
Handle PostgreSQL 15.x


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/mk/pgsql.buildlink3.mk

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

Modified files:

Index: pkgsrc/mk/pgsql.buildlink3.mk
diff -u pkgsrc/mk/pgsql.buildlink3.mk:1.59 pkgsrc/mk/pgsql.buildlink3.mk:1.60
--- pkgsrc/mk/pgsql.buildlink3.mk:1.59  Tue Jun 28 09:38:38 2022
+++ pkgsrc/mk/pgsql.buildlink3.mk       Mon Oct 24 19:52:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: pgsql.buildlink3.mk,v 1.59 2022/06/28 09:38:38 nia Exp $
+# $NetBSD: pgsql.buildlink3.mk,v 1.60 2022/10/24 19:52:35 adam Exp $
 #
 # User-settable variables:
 #
@@ -26,7 +26,7 @@ _SYS_VARS.pgsql=      PG_LIB_EXT PGSQL_TYPE P
 .include "../../mk/bsd.prefs.mk"
 
 PGSQL_VERSION_DEFAULT?=                14
-PGSQL_VERSIONS_ACCEPTED?=      14 13 12 11 10
+PGSQL_VERSIONS_ACCEPTED?=      15 14 13 12 11 10
 
 # transform the list into individual variables
 .for pv in ${PGSQL_VERSIONS_ACCEPTED}
@@ -41,6 +41,9 @@ PG_LIB_EXT=so
 
 # check what is installed
 .if ${OPSYS} == "Darwin"
+.  if exists(${LOCALBASE}/lib/libecpg.6.15.dylib)
+_PGSQL_VERSION_15_INSTALLED=   yes
+.  endif
 .  if exists(${LOCALBASE}/lib/libecpg.6.14.dylib)
 _PGSQL_VERSION_14_INSTALLED=   yes
 .  endif
@@ -57,6 +60,9 @@ _PGSQL_VERSION_11_INSTALLED=  yes
 _PGSQL_VERSION_10_INSTALLED=   yes
 .  endif
 .else
+.  if exists(${LOCALBASE}/lib/libecpg.so.6.15)
+_PGSQL_VERSION_15_INSTALLED=   yes
+.  endif
 .  if exists(${LOCALBASE}/lib/libecpg.so.6.14)
 _PGSQL_VERSION_14_INSTALLED=   yes
 .  endif
@@ -109,7 +115,10 @@ _PGSQL_VERSION=    ${_PGSQL_VERSION_FIRSTAC
 .endif
 
 # set variables for the version we decided to use:
-.if ${_PGSQL_VERSION} == "14"
+.if ${_PGSQL_VERSION} == "15"
+PGSQL_TYPE=    postgresql15-client
+PGPKGSRCDIR=   ../../databases/postgresql15-client
+.elif ${_PGSQL_VERSION} == "14"
 PGSQL_TYPE=    postgresql14-client
 PGPKGSRCDIR=   ../../databases/postgresql14-client
 .elif ${_PGSQL_VERSION} == "13"