databases/postgis25, databases/postgis30: Update to latest versions

   - databases/postgis25
      -  Update to 2.5.4
      -  Add an option to NLS
      -  Move CONFLICTS_INSTALL (pet portlint)
    - databases/postigs30
      -  Update to 3.0.1

Changelog:
    - https://postgis.net/2020/02/28/postgis-2.5.4/
    - https://postgis.net/2020/02/20/postgis-3.0.1/

Approved by:	tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D24301

6 files changed, 68 insertions, 45 deletions

diff --git a/databases/postgis25/Makefile b/databases/postgis25/Makefile
index 2ba0c1211571..1958b0cb8902 100644
--- a/databases/postgis25/Makefile
+++ b/databases/postgis25/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgis
-PORTVERSION=	2.5.3
-PORTREVISION=	2
+PORTVERSION=	2.5.4
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	25
@@ -19,9 +18,7 @@ LIB_DEPENDS=	libproj.so:graphics/proj \
 		libjson-c.so:devel/json-c \
 		libgdal.so:graphics/gdal
 
-CONFLICTS_INSTALL=	postgis20 postgis21 postgis22 postgis23 postgis24 postgis30
-
-USES=		alias compiler gettext gmake gnome iconv:wchar_t libtool:keepla \
+USES=		alias compiler gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:9.4+ shebangfix
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
@@ -34,7 +31,7 @@ SHEBANG_FILES=	extensions/address_standardizer/*.pl raster/test/regress/*.pl \
 		utils/postgis_restore.pl.in utils/*.pl
 WANT_PGSQL=	server
 
-OPTIONS_DEFINE=	ADDRSTD LOADERGUI SFCGAL TOPOLOGY
+OPTIONS_DEFINE=	ADDRSTD LOADERGUI NLS SFCGAL TOPOLOGY
 OPTIONS_DEFAULT=ADDRSTD SFCGAL TOPOLOGY
 OPTIONS_SUB=	yes
 
@@ -43,14 +40,18 @@ TOPOLOGY_DESC=	Topology support
 SFCGAL_DESC=	Enable sfcgal
 ADDRSTD_DESC=	Enable address standardizer
 
+ADDRSTD_CONFIGURE_WITH=		address-standardizer
+ADDRSTD_LIB_DEPENDS=		libpcre.so:devel/pcre
+ADDRSTD_VARS=			WANT_PGSQL+=contrib
 LOADERGUI_CONFIGURE_WITH=	gui
 LOADERGUI_USE=			GNOME=gtk20
-TOPOLOGY_CONFIGURE_WITH=	topology
+NLS_CONFIGURE_WITH=		nls
+NLS_USES=			gettext
 SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
 SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
-ADDRSTD_CONFIGURE_WITH=		address-standardizer
-ADDRSTD_LIB_DEPENDS=		libpcre.so:devel/pcre
-ADDRSTD_VARS=			WANT_PGSQL+=contrib
+TOPOLOGY_CONFIGURE_WITH=	topology
+
+CONFLICTS_INSTALL=	postgis20 postgis21 postgis22 postgis23 postgis24 postgis30
 
 VER=		${PORTVERSION:R}
 
diff --git a/databases/postgis25/distinfo b/databases/postgis25/distinfo
index d6c714052d29..1a07061281ac 100644
--- a/databases/postgis25/distinfo
+++ b/databases/postgis25/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565896984
-SHA256 (postgis-2.5.3.tar.gz) = 72e8269d40f981e22fb2b78d3ff292338e69a4f5166e481a77b015e1d34e559a
-SIZE (postgis-2.5.3.tar.gz) = 16424752
+TIMESTAMP = 1586024296
+SHA256 (postgis-2.5.4.tar.gz) = 146d59351cf830e2a2a72fa14e700cd5eab6c18ad3e7c644f57c4cee7ed98bbe
+SIZE (postgis-2.5.4.tar.gz) = 15882033
diff --git a/databases/postgis25/pkg-plist b/databases/postgis25/pkg-plist
index cb8caa096dd3..8c3f84e7f192 100644
--- a/databases/postgis25/pkg-plist
+++ b/databases/postgis25/pkg-plist
@@ -170,9 +170,11 @@ share/postgresql/contrib/postgis-%%VER%%/uninstall_rtpostgis.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.0--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.1--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.3--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--ANY--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer.control
 %%ADDRSTD%%share/postgresql/extension/address_standardizer.sql
@@ -231,8 +233,10 @@ share/postgresql/extension/postgis--2.4.8--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.3--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--ANY--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
@@ -287,8 +291,10 @@ share/postgresql/extension/postgis.control
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.0--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.1--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.3--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--ANY--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged--%%PORTVERSION%%.sql
@@ -343,8 +349,10 @@ share/postgresql/extension/postgis_tiger_geocoder--2.4.8--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.3--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--ANY--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--unpackaged--%%PORTVERSION%%.sql
@@ -399,8 +407,10 @@ share/postgresql/extension/postgis_tiger_geocoder.control
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.0--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.1--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.3--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--ANY--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql
diff --git a/databases/postgis30/Makefile b/databases/postgis30/Makefile
index 8774c7629d4a..6362daabdeb3 100644
--- a/databases/postgis30/Makefile
+++ b/databases/postgis30/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgis
-PORTVERSION=	3.0.0
-PORTREVISION=	1
+PORTVERSION=	3.0.1
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	30
diff --git a/databases/postgis30/distinfo b/databases/postgis30/distinfo
index 8c62de5e0e4f..2acfb882f2e1 100644
--- a/databases/postgis30/distinfo
+++ b/databases/postgis30/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571549725
-SHA256 (postgis-3.0.0.tar.gz) = c06fd2cd5cea0119106ffe17a7235d893c2bbe6f4b63c8617c767630973ba594
-SIZE (postgis-3.0.0.tar.gz) = 17359802
+TIMESTAMP = 1585984119
+SHA256 (postgis-3.0.1.tar.gz) = 5a5432f95150d9bae9215c6d1c7bb354e060482a7c379daa9b8384e1d03e6353
+SIZE (postgis-3.0.1.tar.gz) = 16839923
diff --git a/databases/postgis30/pkg-plist b/databases/postgis30/pkg-plist
index 691e2f93e91c..2e6edf844515 100644
--- a/databases/postgis30/pkg-plist
+++ b/databases/postgis30/pkg-plist
@@ -71,6 +71,7 @@ lib/postgresql/postgis-3.so
 %%DATADIR%%/tiger_geocoder/utility/utmzone.sql
 %%DATADIR%%/utils/README
 %%DATADIR%%/utils/check_all_upgrades.sh
+%%DATADIR%%/utils/check_news.sh
 %%DATADIR%%/utils/create_extension_unpackage.pl
 %%DATADIR%%/utils/create_spatial_ref_sys_config_dump.pl
 %%DATADIR%%/utils/create_undef.pl
@@ -80,7 +81,7 @@ lib/postgresql/postgis-3.so
 %%DATADIR%%/utils/postgis_restore.pl
 %%DATADIR%%/utils/profile_intersects.pl
 %%DATADIR%%/utils/read_scripts_version.pl
-%%DATADIR%%/utils/svn_repo_revision.pl
+%%DATADIR%%/utils/repo_revision.pl
 %%DATADIR%%/utils/test_estimation.pl
 %%DATADIR%%/utils/test_geography_estimation.pl
 %%DATADIR%%/utils/test_geography_joinestimation.pl
@@ -166,13 +167,15 @@ share/postgresql/contrib/postgis-%%VER%%/uninstall_rtpostgis.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.2--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.3--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.0alpha4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.0beta1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.0rc1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.0rc2--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%alpha4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%beta1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%rc1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%rc2--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--ANY--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer.control
 %%ADDRSTD%%share/postgresql/extension/address_standardizer.sql
@@ -235,13 +238,15 @@ share/postgresql/extension/postgis--2.5.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.3--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.0alpha4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.0beta1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.0rc1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.0rc2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%alpha4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%beta1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%rc1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%rc2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--ANY--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis.control
@@ -299,13 +304,15 @@ share/postgresql/extension/postgis.control
 %%RASTER%%share/postgresql/extension/postgis_raster--2.5.2--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--2.5.3--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--2.5.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.0alpha4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.0beta1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.0rc1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.0rc2--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%alpha4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%beta1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%rc1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%rc2--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--ANY--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--unpackaged--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster.control
@@ -363,13 +370,15 @@ share/postgresql/extension/postgis.control
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.2--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.3--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.0alpha4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.0beta1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.0rc1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.0rc2--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%alpha4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%beta1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%rc1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%rc2--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--ANY--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal.control
@@ -427,13 +436,15 @@ share/postgresql/extension/postgis_tiger_geocoder--2.5.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.3--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.0alpha4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.0beta1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.0rc1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.0rc2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%alpha4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%beta1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%rc1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%rc2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--ANY--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--unpackaged--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder.control
@@ -491,13 +502,15 @@ share/postgresql/extension/postgis_tiger_geocoder.control
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.2--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.3--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.0alpha4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.0beta1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.0rc1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.0rc2--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%alpha4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%beta1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%rc1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%rc2--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--ANY--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology.control