--- databases/postgis23/Makefile	
+++ databases/postgis23/Makefile	
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	postgis
 PORTVERSION=	2.3.10
+PORTREVISION=	1
 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,8 +32,8 @@ 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_DEFAULT=ADDRSTD SFCGAL TOPOLOGY
+OPTIONS_DEFINE=	ADDRSTD NLS LOADERGUI SFCGAL TOPOLOGY
+OPTIONS_DEFAULT=ADDRSTD NLS SFCGAL TOPOLOGY
 OPTIONS_SUB=	yes
 
 LOADERGUI_DESC=	Enable shp2pgsql-gui
@@ -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}