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

3 files changed, 44 insertions, 32 deletions

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