diff --git databases/postgis23/Makefile databases/postgis23/Makefile
index 69ecd741095f..1ba508a377ea 100644
--- databases/postgis23/Makefile
+++ databases/postgis23/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	postgis
 PORTVERSION=	2.3.10
+PORTREVISION=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	23
@@ -18,7 +19,7 @@ LIB_DEPENDS=	libproj.so:graphics/proj \
 		libjson-c.so:devel/json-c \
 		libgdal.so:graphics/gdal
 
-USES=		alias gettext gmake gnome iconv:wchar_t libtool:keepla \
+USES=		alias gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:9.2-10 shebangfix
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
@@ -31,7 +32,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
 
@@ -40,16 +41,18 @@ TOPOLOGY_DESC=	Topology support
 SFCGAL_DESC=	Enable sfcgal
 ADDRSTD_DESC=	Enable address standardizer
 
-CONFLICTS_INSTALL=	postgis20 postgis21 postgis22 postgis24 postgis25
+CONFLICTS_INSTALL=	postgis20 postgis21 postgis22 postgis24 postgis25 postgis30
 
+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
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
diff --git databases/postgis24/Makefile databases/postgis24/Makefile
index 0f6352b374e4..b600ba4bb6b7 100644
--- databases/postgis24/Makefile
+++ databases/postgis24/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	postgis
 PORTVERSION=	2.4.8
+PORTREVISION=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	24
@@ -18,7 +19,7 @@ LIB_DEPENDS=	libproj.so:graphics/proj \
 		libjson-c.so:devel/json-c \
 		libgdal.so:graphics/gdal
 
-USES=		alias gettext gmake gnome iconv:wchar_t libtool:keepla \
+USES=		alias gmake gnome iconv:wchar_t libtool:keepla \
 		localbase perl5 pkgconfig pgsql:9.3-10 shebangfix
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
@@ -31,7 +32,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
 
@@ -40,16 +41,18 @@ TOPOLOGY_DESC=	Topology support
 SFCGAL_DESC=	Enable sfcgal
 ADDRSTD_DESC=	Enable address standardizer
 
-CONFLICTS_INSTALL=	postgis20 postgis21 postgis22 postgis23 postgis25
+CONFLICTS_INSTALL=	postgis20 postgis21 postgis22 postgis23 postgis25 postgis30
 
+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
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
diff --git databases/postgis25/Makefile databases/postgis25/Makefile
index ab98d4f8f779..70ee0d3493ee 100644
--- databases/postgis25/Makefile
+++ databases/postgis25/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	postgis
 PORTVERSION=	2.5.3
+PORTREVISION=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	25
@@ -18,9 +19,7 @@ LIB_DEPENDS=	libproj.so:graphics/proj \
 		libjson-c.so:devel/json-c \
 		libgdal.so:graphics/gdal
 
-CONFLICTS_INSTALL=	postgis20 postgis21 postgis22 postgis23 postgis24
-
-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
@@ -33,7 +32,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
 
@@ -42,14 +41,18 @@ TOPOLOGY_DESC=	Topology support
 SFCGAL_DESC=	Enable sfcgal
 ADDRSTD_DESC=	Enable address standardizer
 
+CONFLICTS_INSTALL=	postgis20 postgis21 postgis22 postgis23 postgis24 postgis30
+
+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
 
 VER=		${PORTVERSION:R}