CVS commit: pkgsrc/databases/postgresql-postgis2

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue Dec 28 21:10:53 UTC 2021

Modified Files:
        pkgsrc/databases/postgresql-postgis2: Makefile buildlink3.mk

Log Message:
postgresql-postgis2: Add 14 as acceptable pgsql version

pkgsrc changes:
---------------
  * Add 14 to PGSQL_VERSION_ACCEPTABLE to fix a dependency failure of
    geography/mapserver with PostgreSQL 14.
  * Fix BUILDLINK_ABI_DEPENDS that contained a hardcoded dependency.
  * Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/databases/postgresql-postgis2/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/databases/postgresql-postgis2/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/databases/postgresql-postgis2/Makefile
diff -u pkgsrc/databases/postgresql-postgis2/Makefile:1.107 pkgsrc/databases/postgresql-postgis2/Makefile:1.108
--- pkgsrc/databases/postgresql-postgis2/Makefile:1.107 Sat Dec 18 15:13:02 2021
+++ pkgsrc/databases/postgresql-postgis2/Makefile       Tue Dec 28 21:10:53 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2021/12/18 15:13:02 gdt Exp $
+# $NetBSD: Makefile,v 1.108 2021/12/28 21:10:53 triaxx Exp $
 
 # Note that the directory is still postgis2, for historical reasons.
 # It remains, due to inertia, until there is a good basis to be sure
@@ -6,7 +6,7 @@
 MAJOR=         3.2
 DISTNAME=      postgis-${MAJOR}.0
 PKGNAME=       postgresql${PGSQL_VERSION}-${DISTNAME}
-#PKGREVISION=  0
+PKGREVISION=   1
 CATEGORIES=    databases geography
 MASTER_SITES=  https://download.osgeo.org/postgis/source/
 
@@ -16,7 +16,7 @@ COMMENT=      Spatial database capabilities f
 
 LICENSE=       gnu-gpl-v2
 
-PGSQL_VERSIONS_ACCEPTED?=      13 12 11 10 96
+PGSQL_VERSIONS_ACCEPTED?=      14 13 12 11 10 96
 DEPENDS+=              postgresql${PGSQL_VERSION}-server-[0-9]*:../../databases/postgresql${PGSQL_VERSION}-server
 
 BUILD_DEPENDS+=                docbook-xsl-[0-9]*:../../textproc/docbook-xsl

Index: pkgsrc/databases/postgresql-postgis2/buildlink3.mk
diff -u pkgsrc/databases/postgresql-postgis2/buildlink3.mk:1.18 pkgsrc/databases/postgresql-postgis2/buildlink3.mk:1.19
--- pkgsrc/databases/postgresql-postgis2/buildlink3.mk:1.18     Wed Dec  8 16:01:49 2021
+++ pkgsrc/databases/postgresql-postgis2/buildlink3.mk  Tue Dec 28 21:10:53 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2021/12/08 16:01:49 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2021/12/28 21:10:53 triaxx Exp $
 
 BUILDLINK_TREE+=       postgresql-postgis
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        postgresql-postgis
 POSTGRESQL_POSTGIS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.postgresql-postgis+=     postgresql${PGSQL_VERSION}-postgis>=2.0
-BUILDLINK_ABI_DEPENDS.postgresql-postgis?=     postgresql13-postgis>=3.1.4nb5
+BUILDLINK_ABI_DEPENDS.postgresql-postgis?=     postgresql${PGSQL_VERSION}-postgis>=3.1.4nb5
 BUILDLINK_PKGSRCDIR.postgresql-postgis?=       ../../databases/postgresql-postgis2
 
 .include "../../geography/geos/buildlink3.mk"