CVS commit: pkgsrc/databases/postgresql-postgis2

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed May 31 13:30:12 UTC 2023

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

Log Message:
databases/postgresql-postgis2: Update to 3.3.3

Packaging changes:

  - Clean up bl3, and bump API to 3.0 from 2.0, just because it seems
    ridiculous to build against postgis 2 and likely won't work.
  - Adjust indentation because pkglint says so, but NFC.

Upstream NEWS: bugfixes


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 pkgsrc/databases/postgresql-postgis2/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/databases/postgresql-postgis2/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/databases/postgresql-postgis2/buildlink3.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/databases/postgresql-postgis2/distinfo

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.127 pkgsrc/databases/postgresql-postgis2/Makefile:1.128
--- pkgsrc/databases/postgresql-postgis2/Makefile:1.127 Sun May 28 17:04:31 2023
+++ pkgsrc/databases/postgresql-postgis2/Makefile       Wed May 31 13:30:12 2023
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.127 2023/05/28 17:04:31 wiz Exp $
+# $NetBSD: Makefile,v 1.128 2023/05/31 13:30:12 gdt Exp $
 
 # Note that the directory is still postgis2, for historical reasons.
 # It remains, due to inertia and the pain of renaming outweighing the
 # benefit.  So far it looks more likely than not that postgis will not
 # need to be versioned again soon.
 MAJOR=         3.3
-DISTNAME=      postgis-${MAJOR}.2
+DISTNAME=      postgis-${MAJOR}.3
 PKGNAME=       postgresql${PGSQL_VERSION}-${DISTNAME}
-PKGREVISION=   8
 CATEGORIES=    databases geography
 MASTER_SITES=  https://download.osgeo.org/postgis/source/
 
@@ -34,13 +33,13 @@ CONFLICTS=          postgis-[0-9]*
 # gmake complains about adding + to parent rule
 MAKE_JOBS_SAFE=                no
 
-USE_GCC_RUNTIME=       yes
-USE_LANGUAGES=         c c++ c99
-USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake lex pax perl pkg-config
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --enable-rpath
-CONFIGURE_ARGS+=       --datadir=${PREFIX}/share/postgresql/contrib
+USE_GCC_RUNTIME=               yes
+USE_LANGUAGES=                 c c++ c99
+USE_LIBTOOL=                   yes
+USE_TOOLS+=                    gmake lex pax perl pkg-config
+GNU_CONFIGURE=                 yes
+CONFIGURE_ARGS+=               --enable-rpath
+CONFIGURE_ARGS+=               --datadir=${PREFIX}/share/postgresql/contrib
 # Documented requirement is pgsql >= 11
 PGSQL_VERSIONS_ACCEPTED=       14 13 12 11
 

Index: pkgsrc/databases/postgresql-postgis2/PLIST
diff -u pkgsrc/databases/postgresql-postgis2/PLIST:1.32 pkgsrc/databases/postgresql-postgis2/PLIST:1.33
--- pkgsrc/databases/postgresql-postgis2/PLIST:1.32     Sun Nov 13 12:43:39 2022
+++ pkgsrc/databases/postgresql-postgis2/PLIST  Wed May 31 13:30:12 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2022/11/13 12:43:39 gdt Exp $
+@comment $NetBSD: PLIST,v 1.33 2023/05/31 13:30:12 gdt Exp $
 bin/pgsql2shp
 bin/pgtopo_export
 bin/pgtopo_import
@@ -99,6 +99,7 @@ share/postgresql/extension/address_stand
 share/postgresql/extension/address_standardizer--3.0.6--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--3.0.7--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--3.0.8--${PKGVERSION}.sql
+share/postgresql/extension/address_standardizer--3.0.9--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--3.1.0--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--3.1.1--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--3.1.2--${PKGVERSION}.sql
@@ -108,13 +109,16 @@ share/postgresql/extension/address_stand
 share/postgresql/extension/address_standardizer--3.1.6--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--3.1.7--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--3.1.8--${PKGVERSION}.sql
+share/postgresql/extension/address_standardizer--3.1.9--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--3.2.0--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--3.2.1--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--3.2.2--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--3.2.3--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--3.2.4--${PKGVERSION}.sql
+share/postgresql/extension/address_standardizer--3.2.5--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--3.3.0--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--3.3.1--${PKGVERSION}.sql
+share/postgresql/extension/address_standardizer--3.3.2--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--${PKGVERSION}--${PKGVERSION}next.sql
 share/postgresql/extension/address_standardizer--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer--${PKGVERSION}next--${PKGVERSION}.sql
@@ -189,6 +193,7 @@ share/postgresql/extension/address_stand
 share/postgresql/extension/address_standardizer_data_us--3.0.6--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--3.0.7--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--3.0.8--${PKGVERSION}.sql
+share/postgresql/extension/address_standardizer_data_us--3.0.9--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--3.1.0--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--3.1.1--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--3.1.2--${PKGVERSION}.sql
@@ -198,13 +203,16 @@ share/postgresql/extension/address_stand
 share/postgresql/extension/address_standardizer_data_us--3.1.6--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--3.1.7--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--3.1.8--${PKGVERSION}.sql
+share/postgresql/extension/address_standardizer_data_us--3.1.9--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--3.2.0--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--3.2.1--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--3.2.2--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--3.2.3--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--3.2.4--${PKGVERSION}.sql
+share/postgresql/extension/address_standardizer_data_us--3.2.5--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--3.3.0--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--3.3.1--${PKGVERSION}.sql
+share/postgresql/extension/address_standardizer_data_us--3.3.2--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--${PKGVERSION}--${PKGVERSION}next.sql
 share/postgresql/extension/address_standardizer_data_us--${PKGVERSION}.sql
 share/postgresql/extension/address_standardizer_data_us--${PKGVERSION}next--${PKGVERSION}.sql
@@ -279,6 +287,7 @@ share/postgresql/extension/postgis--3.0.
 share/postgresql/extension/postgis--3.0.6--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.0.7--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.0.8--${PKGVERSION}.sql
+share/postgresql/extension/postgis--3.0.9--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.1.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.1.1--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.1.2--${PKGVERSION}.sql
@@ -288,13 +297,16 @@ share/postgresql/extension/postgis--3.1.
 share/postgresql/extension/postgis--3.1.6--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.1.7--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.1.8--${PKGVERSION}.sql
+share/postgresql/extension/postgis--3.1.9--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.2.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.2.1--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.2.2--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.2.3--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.2.4--${PKGVERSION}.sql
+share/postgresql/extension/postgis--3.2.5--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.3.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.3.1--${PKGVERSION}.sql
+share/postgresql/extension/postgis--3.3.2--${PKGVERSION}.sql
 share/postgresql/extension/postgis--${PKGVERSION}--${PKGVERSION}next.sql
 share/postgresql/extension/postgis--${PKGVERSION}.sql
 share/postgresql/extension/postgis--${PKGVERSION}next--${PKGVERSION}.sql
@@ -371,6 +383,7 @@ share/postgresql/extension/postgis_raste
 share/postgresql/extension/postgis_raster--3.0.6--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.0.7--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.0.8--${PKGVERSION}.sql
+share/postgresql/extension/postgis_raster--3.0.9--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.1.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.1.1--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.1.2--${PKGVERSION}.sql
@@ -380,13 +393,16 @@ share/postgresql/extension/postgis_raste
 share/postgresql/extension/postgis_raster--3.1.6--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.1.7--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.1.8--${PKGVERSION}.sql
+share/postgresql/extension/postgis_raster--3.1.9--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.2.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.2.1--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.2.2--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.2.3--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.2.4--${PKGVERSION}.sql
+share/postgresql/extension/postgis_raster--3.2.5--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.3.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.3.1--${PKGVERSION}.sql
+share/postgresql/extension/postgis_raster--3.3.2--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--${PKGVERSION}--${PKGVERSION}next.sql
 share/postgresql/extension/postgis_raster--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--${PKGVERSION}next--${PKGVERSION}.sql
@@ -463,6 +479,7 @@ share/postgresql/extension/postgis_tiger
 share/postgresql/extension/postgis_tiger_geocoder--3.0.6--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.0.7--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.0.8--${PKGVERSION}.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.9--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.1.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.1.1--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.1.2--${PKGVERSION}.sql
@@ -472,13 +489,16 @@ share/postgresql/extension/postgis_tiger
 share/postgresql/extension/postgis_tiger_geocoder--3.1.6--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.1.7--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.1.8--${PKGVERSION}.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.9--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.2.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.2.1--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.2.2--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.2.3--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.2.4--${PKGVERSION}.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.5--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.3.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.3.1--${PKGVERSION}.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.3.2--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--${PKGVERSION}--${PKGVERSION}next.sql
 share/postgresql/extension/postgis_tiger_geocoder--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--${PKGVERSION}next--${PKGVERSION}.sql
@@ -554,6 +574,7 @@ share/postgresql/extension/postgis_topol
 share/postgresql/extension/postgis_topology--3.0.6--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.0.7--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.0.8--${PKGVERSION}.sql
+share/postgresql/extension/postgis_topology--3.0.9--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.1.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.1.1--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.1.2--${PKGVERSION}.sql
@@ -563,13 +584,16 @@ share/postgresql/extension/postgis_topol
 share/postgresql/extension/postgis_topology--3.1.6--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.1.7--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.1.8--${PKGVERSION}.sql
+share/postgresql/extension/postgis_topology--3.1.9--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.2.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.2.1--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.2.2--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.2.3--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.2.4--${PKGVERSION}.sql
+share/postgresql/extension/postgis_topology--3.2.5--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.3.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.3.1--${PKGVERSION}.sql
+share/postgresql/extension/postgis_topology--3.3.2--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--${PKGVERSION}--${PKGVERSION}next.sql
 share/postgresql/extension/postgis_topology--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--${PKGVERSION}next--${PKGVERSION}.sql

Index: pkgsrc/databases/postgresql-postgis2/buildlink3.mk
diff -u pkgsrc/databases/postgresql-postgis2/buildlink3.mk:1.25 pkgsrc/databases/postgresql-postgis2/buildlink3.mk:1.26
--- pkgsrc/databases/postgresql-postgis2/buildlink3.mk:1.25     Wed Apr 19 08:08:08 2023
+++ pkgsrc/databases/postgresql-postgis2/buildlink3.mk  Wed May 31 13:30:12 2023
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.25 2023/04/19 08:08:08 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2023/05/31 13:30:12 gdt Exp $
 
 BUILDLINK_TREE+=       postgresql-postgis
 
 .if !defined(POSTGRESQL_POSTGIS_BUILDLINK3_MK)
 POSTGRESQL_POSTGIS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.postgresql-postgis+=     postgresql${PGSQL_VERSION}-postgis>=2.0
-BUILDLINK_ABI_DEPENDS.postgresql-postgis?=     postgresql14-postgis>=3.3.2nb6
+BUILDLINK_API_DEPENDS.postgresql-postgis+=     postgresql${PGSQL_VERSION}-postgis>=3.0
+BUILDLINK_ABI_DEPENDS.postgresql-postgis?=     postgresql${PGSQL_VERSION}-postgis>=3.3.0
 BUILDLINK_PKGSRCDIR.postgresql-postgis?=       ../../databases/postgresql-postgis2
 
 .include "../../geography/geos/buildlink3.mk"

Index: pkgsrc/databases/postgresql-postgis2/distinfo
diff -u pkgsrc/databases/postgresql-postgis2/distinfo:1.35 pkgsrc/databases/postgresql-postgis2/distinfo:1.36
--- pkgsrc/databases/postgresql-postgis2/distinfo:1.35  Sun Nov 13 12:43:39 2022
+++ pkgsrc/databases/postgresql-postgis2/distinfo       Wed May 31 13:30:12 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.35 2022/11/13 12:43:39 gdt Exp $
+$NetBSD: distinfo,v 1.36 2023/05/31 13:30:12 gdt Exp $
 
-BLAKE2s (postgis-3.3.2.tar.gz) = 61e4ab6ee9c25123422b19ddb8481c15fdaa49c2c9a4a17fb5dbd2762e1cc268
-SHA512 (postgis-3.3.2.tar.gz) = 4dd129057598b032ba322c42888bb8ce14b9423bd450ef7a42fa22162f6b48e34b226f38480aa67fe2da85be2529b0822655855f9846b657bdd32f50256f4305
-Size (postgis-3.3.2.tar.gz) = 17793976 bytes
+BLAKE2s (postgis-3.3.3.tar.gz) = 4189f6a3c3951c8cbc9a3fcccc96622be4b7ea70fbaed21b21822f5f54611f53
+SHA512 (postgis-3.3.3.tar.gz) = 0025a8a5c6be7e18dfb97a6a04c468a9da2d6e99462d20eec7bddf4048b8f2fa1e8029be9f819950c910a6f89190e8295f10e8dab9b4885d03d3dbcce41380c2
+Size (postgis-3.3.3.tar.gz) = 17790503 bytes