3 files changed, 77 insertions, 19 deletions

diff --git a/databases/postgis25/Makefile b/databases/postgis25/Makefile
index 8f62b5f8e103..ab98d4f8f779 100644
--- a/databases/postgis25/Makefile
+++ b/databases/postgis25/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgis
-PORTVERSION=	2.5.2
-PORTREVISION=	1
+PORTVERSION=	2.5.3
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	25
@@ -19,7 +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
+CONFLICTS_INSTALL=	postgis20 postgis21 postgis22 postgis23 postgis24
 
 USES=		alias compiler gettext gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:9.4+ shebangfix
diff --git a/databases/postgis25/distinfo b/databases/postgis25/distinfo
index f2e0f450d96e..d6c714052d29 100644
--- a/databases/postgis25/distinfo
+++ b/databases/postgis25/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552608005
-SHA256 (postgis-2.5.2.tar.gz) = b6cb286c5016029d984f8c440947bf9178da72e1f6f840ed639270e1c451db5e
-SIZE (postgis-2.5.2.tar.gz) = 16252761
+TIMESTAMP = 1565896984
+SHA256 (postgis-2.5.3.tar.gz) = 72e8269d40f981e22fb2b78d3ff292338e69a4f5166e481a77b015e1d34e559a
+SIZE (postgis-2.5.3.tar.gz) = 16424752
diff --git a/databases/postgis25/pkg-plist b/databases/postgis25/pkg-plist
index 6312de5f4a76..cb8caa096dd3 100644
--- a/databases/postgis25/pkg-plist
+++ b/databases/postgis25/pkg-plist
@@ -120,6 +120,57 @@ share/postgresql/contrib/postgis-%%VER%%/uninstall_rtpostgis.sql
 %%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/uninstall_sfcgal.sql
 %%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/uninstall_topology.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--1.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.8--%%PORTVERSION%%.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--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%%next--%%PORTVERSION%%.sql
@@ -167,6 +218,7 @@ share/postgresql/extension/postgis--2.3.6--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.3.7--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.3.8--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.3.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.10--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.2--%%PORTVERSION%%.sql
@@ -175,11 +227,12 @@ share/postgresql/extension/postgis--2.4.4--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.5--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.6--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%VER%%.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%VER%%.1--%%PORTVERSION%%.sql
+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--%%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
@@ -221,6 +274,7 @@ share/postgresql/extension/postgis.control
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.7--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.8--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.10--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.0--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.1--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.2--%%PORTVERSION%%.sql
@@ -229,11 +283,12 @@ share/postgresql/extension/postgis.control
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.5--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.6--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%VER%%.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%VER%%.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.8--%%PORTVERSION%%.sql
+%%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--%%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
@@ -275,6 +330,7 @@ share/postgresql/extension/postgis_tiger_geocoder--2.3.6--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.3.7--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.3.8--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.3.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.10--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.2--%%PORTVERSION%%.sql
@@ -283,11 +339,12 @@ share/postgresql/extension/postgis_tiger_geocoder--2.4.4--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.5--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.6--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%VER%%.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%VER%%.1--%%PORTVERSION%%.sql
+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--%%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
@@ -329,6 +386,7 @@ share/postgresql/extension/postgis_tiger_geocoder.control
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.7--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.8--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.10--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.0--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.1--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.2--%%PORTVERSION%%.sql
@@ -337,15 +395,17 @@ share/postgresql/extension/postgis_tiger_geocoder.control
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.5--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.6--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%VER%%.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%VER%%.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.8--%%PORTVERSION%%.sql
+%%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--%%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
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology.control
+%%LOADERGUI%%share/postgresql/icons/hicolor/8x8/apps/shp2pgsql-gui.png
 %%LOADERGUI%%share/postgresql/icons/hicolor/16x16/apps/shp2pgsql-gui.png
 %%LOADERGUI%%share/postgresql/icons/hicolor/22x22/apps/shp2pgsql-gui.png
 %%LOADERGUI%%share/postgresql/icons/hicolor/24x24/apps/shp2pgsql-gui.png
@@ -355,4 +415,3 @@ share/postgresql/extension/postgis_tiger_geocoder.control
 %%LOADERGUI%%share/postgresql/icons/hicolor/42x42/apps/shp2pgsql-gui.png
 %%LOADERGUI%%share/postgresql/icons/hicolor/48x48/apps/shp2pgsql-gui.png
 %%LOADERGUI%%share/postgresql/icons/hicolor/64x64/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/8x8/apps/shp2pgsql-gui.png