postgis: Update to 3.0.3

Packaging changes: make bl3 refer to PGSQL_VERSION, not 12, reverting
an earlier change labeled "revbump" which does not make sense for such
a change.

Upstream changes: bugfixes

5 files changed, 17 insertions, 11 deletions

diff --git a/databases/postgresql-postgis2/DESCR b/databases/postgresql-postgis2/DESCR
index 7533bf82849..0beee2d45a7 100644
--- a/databases/postgresql-postgis2/DESCR
+++ b/databases/postgresql-postgis2/DESCR
@@ -14,3 +14,6 @@ PostGIS/PostgreSQL includes the following functionality:
 * PostgreSQL JDBC extension objects corresponding to the geometries
 * Support for OGC access functions as defined by the Simple Features
   Specification
+
+The package is postgis2 for historical reasons; this is currently
+PostGIS 3 and intends to track the most recent stable release.
diff --git a/databases/postgresql-postgis2/Makefile b/databases/postgresql-postgis2/Makefile
index 658f1ba0705..8910b0e8882 100644
--- a/databases/postgresql-postgis2/Makefile
+++ b/databases/postgresql-postgis2/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.83 2020/11/05 09:06:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.84 2020/11/25 01:04:53 gdt 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
 # no other changes will be needed.
 MAJOR=		3.0
-DISTNAME=	postgis-${MAJOR}.2
+DISTNAME=	postgis-${MAJOR}.3
 PKGNAME=	postgresql${PGSQL_VERSION}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 
diff --git a/databases/postgresql-postgis2/PLIST b/databases/postgresql-postgis2/PLIST
index 04cc9bb83d1..a0ef3d1cccf 100644
--- a/databases/postgresql-postgis2/PLIST
+++ b/databases/postgresql-postgis2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2020/10/04 00:08:38 gdt Exp $
+@comment $NetBSD: PLIST,v 1.21 2020/11/25 01:04:53 gdt Exp $
 bin/pgsql2shp
 bin/raster2pgsql
 bin/shp2pgsql
@@ -84,6 +84,7 @@ share/postgresql/extension/postgis--2.5.4--${PKGVERSION}.sql
 share/postgresql/extension/postgis--2.5.5--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.0.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis--3.0.1--${PKGVERSION}.sql
+share/postgresql/extension/postgis--3.0.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
@@ -147,6 +148,7 @@ share/postgresql/extension/postgis_raster--2.5.4--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--2.5.5--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.0.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_raster--3.0.1--${PKGVERSION}.sql
+share/postgresql/extension/postgis_raster--3.0.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
@@ -210,6 +212,7 @@ share/postgresql/extension/postgis_tiger_geocoder--2.5.4--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.5--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.0.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.0.1--${PKGVERSION}.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.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
@@ -273,6 +276,7 @@ share/postgresql/extension/postgis_topology--2.5.4--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--2.5.5--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.0.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--3.0.1--${PKGVERSION}.sql
+share/postgresql/extension/postgis_topology--3.0.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
diff --git a/databases/postgresql-postgis2/buildlink3.mk b/databases/postgresql-postgis2/buildlink3.mk
index d5831db47e8..199ad7186dd 100644
--- a/databases/postgresql-postgis2/buildlink3.mk
+++ b/databases/postgresql-postgis2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2020/11/05 09:06:45 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2020/11/25 01:04:53 gdt 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?=	postgresql12-postgis>=3.0.2nb1
+BUILDLINK_ABI_DEPENDS.postgresql-postgis?=	postgresql${PGSQL_VERSION}-postgis>=3.0.2nb1
 BUILDLINK_PKGSRCDIR.postgresql-postgis?=	../../databases/postgresql-postgis2
 
 PGSQL_VERSIONS_ACCEPTED=	10 96 95
diff --git a/databases/postgresql-postgis2/distinfo b/databases/postgresql-postgis2/distinfo
index cd9b5b69b2c..9283a0c8507 100644
--- a/databases/postgresql-postgis2/distinfo
+++ b/databases/postgresql-postgis2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.21 2020/10/04 00:08:38 gdt Exp $
+$NetBSD: distinfo,v 1.22 2020/11/25 01:04:53 gdt Exp $
 
-SHA1 (postgis-3.0.2.tar.gz) = 3a2fa02274504d9a6114c1bab0dcbf273d8b47a6
-RMD160 (postgis-3.0.2.tar.gz) = 943a38414ad29b6849402db2cce1523e7a96b7d6
-SHA512 (postgis-3.0.2.tar.gz) = 763d7818d195eca0b07d94a864b13da68e5734ae57b7c93c285dc2d0fa4a155715745e5da67e1a3bca49d8d4f89dc495ed3912c079722290ce9f220afca33f4d
-Size (postgis-3.0.2.tar.gz) = 16855299 bytes
+SHA1 (postgis-3.0.3.tar.gz) = f5b17388839eb5fc296efdc776c201c353414087
+RMD160 (postgis-3.0.3.tar.gz) = 39c8a4d8bbaba127223ff19a9ebe2b08a3b3c0d2
+SHA512 (postgis-3.0.3.tar.gz) = 478f0971e18c2a1bd651c9bf7b995236aad32fda037762505cf8ac9e67a4e40917436248c1e62827a1a6da96c15c4ae8d0b606d548fa080cdff453642b897115
+Size (postgis-3.0.3.tar.gz) = 16871696 bytes