Index: postgis23/Makefile
===================================================================
--- postgis23/Makefile
+++ postgis23/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgis
-PORTVERSION=	2.3.7
-PORTREVISION=	2
+PORTVERSION=	2.3.9
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	23
@@ -16,94 +15,51 @@
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libgeos.so:graphics/geos \
-		libjson-c.so:devel/json-c
+		libjson-c.so:devel/json-c \
+		libgdal.so:graphics/gdal
 
-CONFLICTS=	postgis20  postgis21 postgis22 postgis24 postgis
+USES=		alias gettext gmake gnome iconv:wchar_t libtool:keepla \
+		localbase perl5 pkgconfig pgsql:9.2-10 shebangfix
+USE_GNOME=	libxml2
+USE_LDCONFIG=	yes
+USE_PERL5=	build
 
-USES=		compiler:c++11-lang gettext gmake iconv:wchar_t libtool:keepla \
-		perl5 pgsql pkgconfig shebangfix
-LLD_UNSAFE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE}
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
 SHEBANG_FILES=	extensions/address_standardizer/*.pl raster/test/regress/*.pl \
 		raster/test/regress/loader/*.pl regress/run_test.pl \
 		utils/postgis_restore.pl.in utils/*.pl
-USE_GNOME=	libxml2
-USE_LDCONFIG=	yes
-USE_PERL5=	build
-WANT_PGSQL=	lib server
-
-OPTIONS_DEFINE=		LOADERGUI RASTER TOPOLOGY SFCGAL ADDRSTD
-OPTIONS_DEFAULT=	TOPOLOGY ADDRSTD SFCGAL
-NO_OPTIONS_SORT=	yes
-OPTIONS_SUB=		yes
+WANT_PGSQL=	server
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+OPTIONS_DEFINE=	ADDRSTD LOADERGUI SFCGAL TOPOLOGY
+OPTIONS_DEFAULT=ADDRSTD SFCGAL TOPOLOGY
+OPTIONS_SUB=	yes
 
 LOADERGUI_DESC=	Enable shp2pgsql-gui
-RASTER_DESC=	Raster support
 TOPOLOGY_DESC=	Topology support
 SFCGAL_DESC=	Enable sfcgal
 ADDRSTD_DESC=	Enable address standardizer
 
+CONFLICTS_INSTALL=	postgis20  postgis21 postgis22 postgis24 postgis25
+
 LOADERGUI_CONFIGURE_WITH=	gui
-LOADERGUI_USE=	GNOME=gtk20
-RASTER_USES=	alias
-RASTER_CONFIGURE_WITH=	raster
-RASTER_LIB_DEPENDS=		libgdal.so:graphics/gdal
-RASTER_CONFIGURE_ON=	--with-gdalconfig=${LOCALBASE}/bin/gdal-config
+LOADERGUI_USE=			GNOME=gtk20
 TOPOLOGY_CONFIGURE_WITH=	topology
-SFCGAL_LIB_DEPENDS=	libSFCGAL.so:databases/sfcgal
-SFCGAL_CONFIGURE_ON=	--with-sfcgal=${LOCALBASE}/bin/sfcgal-config
-SFCGAL_CONFIGURE_OFF=	--without-sfcgal
-SFCGAL_IMPLIES=		RASTER
-ADDRSTD_CONFIGURE_WITH=	address-standardizer
-ADDRSTD_IMPLIES=	RASTER
-ADDRSTD_LIB_DEPENDS=	libpcre.so:devel/pcre
-ADDRSTD_VARS=		WANT_PGSQL+=contrib
-
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.include <bsd.port.pre.mk>
+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
 
-post-patch:
-	@${GREP} -lR 'bin/bash' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e "s|/bin/bash|/bin/sh|"
-	@${GREP} -lR '/usr/bin/psql' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
-		-e "s|/usr/bin/psql|${LOCALBASE}/bin/pgsql|"
-	@${GREP} -lR '/usr/lib/postgresql/9.4/bin/psql' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
-		-e "s|/usr/lib/postgresql/9.4/bin/psql|${LOCALBASE}/bin/pgsql|"
-	@${GREP} -lR '/usr/share/postgresql/contrib' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
-		-e "s|/usr/share/postgresql/contrib|${LOCALBASE}/share/postgresql/contrib|"
-	@${GREP} -lR '/usr/share/postgresql/9.4/contrib' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
-		-e "s|/usr/share/postgresql/9.4/contrib|${LOCALBASE}/share/postgresql/contrib/postgis-2.3|"
-
-pre-configure:
-	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblwgeom-2.3.so.0.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
 	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
 	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
 	${MKDIR} ${STAGEDIR}${DATADIR}/utils
 	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/shp2pgsql
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pgsql2shp
-.if ${PORT_OPTIONS:MLOADERGUI}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/shp2pgsql-gui
-.else
-	${RM} ${STAGEDIR}${PREFIX}/bin/shp2pgsql-gui
-.endif
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblwgeom-2.3.so.0.0.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/postgis-2.3.so
-.if ${PORT_OPTIONS:MTOPOLOGY}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/postgis_topology-2.3.so
-.endif
-.if ${PORT_OPTIONS:MRASTER}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/raster2pgsql
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/rtpostgis-2.3.so
-.endif
-.if ${PORT_OPTIONS:MADDRSTD}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/address_standardizer-2.3.so
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: postgis23/distinfo
===================================================================
--- postgis23/distinfo
+++ postgis23/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523131124
-SHA256 (postgis-2.3.7.tar.gz) = bb3c39d42dc11188a14163add84ed8372d337dc5b345fac1a48b9ec97d0a8456
-SIZE (postgis-2.3.7.tar.gz) = 11347892
+TIMESTAMP = 1552658706
+SHA256 (postgis-2.3.9.tar.gz) = a411e15e937c4b3d64b76b273454ea4e1c65447605dbef69bc3ed6d590a28f69
+SIZE (postgis-2.3.9.tar.gz) = 11560931
Index: databases/postgis23/pkg-install
===================================================================
--- databases/postgis23/pkg-install
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-msg(){
- echo "
-  ======================= GEOS Support Notice ========================
-  In order to use the GEOS support, you may need to specially compile
-  your version of PostgreSQL to link the C++ runtime library.
-  To do this, invoke the PostgreSQL Makefile script this way:
-
-  on csh shell:
-
-  setenv LDFLAGS -lstdc++
-  make
-
-  on sh or bash shell:
-
-  export LDFLAGS=-lstdc++
-  make
-
-  The initial LDFLAGS variable is passed through to the Makefile and
-  adds the C++ library to the linking stage.
-
-  ====================================================================
-"
-if [ -n "${PACKAGE_BUILDING}" ]; then
-    sleep 10
-fi
-
-
-}
-
-case "$2" in
-    PRE-INSTALL)
-        msg ;;
-    MESSAGE)
-        msg ;;
-esac
Index: postgis23/pkg-plist
===================================================================
--- postgis23/pkg-plist
+++ postgis23/pkg-plist
@@ -1,5 +1,5 @@
 bin/pgsql2shp
-%%RASTER%%bin/raster2pgsql
+bin/raster2pgsql
 bin/shp2pgsql
 %%LOADERGUI%%bin/shp2pgsql-gui
 include/liblwgeom.h
@@ -12,7 +12,7 @@
 %%ADDRSTD%%lib/postgresql/address_standardizer-2.3.so
 lib/postgresql/postgis-2.3.so
 %%TOPOLOGY%%lib/postgresql/postgis_topology-2.3.so
-%%RASTER%%lib/postgresql/rtpostgis-2.3.so
+lib/postgresql/rtpostgis-2.3.so
 %%ADDRSTD%%share/doc/postgresql/extension/README.address_standardizer
 %%DATADIR%%/tiger_geocoder/README
 %%DATADIR%%/tiger_geocoder/create_geocode.bat
@@ -98,13 +98,13 @@
 share/postgresql/contrib/postgis-2.3/postgis_restore.pl
 share/postgresql/contrib/postgis-2.3/postgis_upgrade.sql
 share/postgresql/contrib/postgis-2.3/postgis_upgrade_for_extension.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/raster_comments.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/rtpostgis.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/rtpostgis_for_extension.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/rtpostgis_legacy.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/rtpostgis_proc_set_search_path.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/rtpostgis_upgrade.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/rtpostgis_upgrade_for_extension.sql
+share/postgresql/contrib/postgis-2.3/raster_comments.sql
+share/postgresql/contrib/postgis-2.3/rtpostgis.sql
+share/postgresql/contrib/postgis-2.3/rtpostgis_for_extension.sql
+share/postgresql/contrib/postgis-2.3/rtpostgis_legacy.sql
+share/postgresql/contrib/postgis-2.3/rtpostgis_proc_set_search_path.sql
+share/postgresql/contrib/postgis-2.3/rtpostgis_upgrade.sql
+share/postgresql/contrib/postgis-2.3/rtpostgis_upgrade_for_extension.sql
 %%SFCGAL%%share/postgresql/contrib/postgis-2.3/sfcgal.sql
 %%SFCGAL%%share/postgresql/contrib/postgis-2.3/sfcgal_comments.sql
 %%SFCGAL%%share/postgresql/contrib/postgis-2.3/sfcgal_upgrade.sql
@@ -114,7 +114,7 @@
 %%TOPOLOGY%%share/postgresql/contrib/postgis-2.3/topology_upgrade.sql
 share/postgresql/contrib/postgis-2.3/uninstall_legacy.sql
 share/postgresql/contrib/postgis-2.3/uninstall_postgis.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.3/uninstall_rtpostgis.sql
+share/postgresql/contrib/postgis-2.3/uninstall_rtpostgis.sql
 %%SFCGAL%%share/postgresql/contrib/postgis-2.3/uninstall_sfcgal.sql
 %%TOPOLOGY%%share/postgresql/contrib/postgis-2.3/uninstall_topology.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--1.0--%%PORTVERSION%%.sql
@@ -128,163 +128,175 @@
 %%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.control
 %%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.8--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.9--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis.control
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.0--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.1--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.2--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.3--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.4--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.5--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.6--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.7--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.0--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.1--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.2--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.3--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.4--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.5--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.6--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.7--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.8--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.9--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.0--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.1--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.2--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.3--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.4--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.5--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.6--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.7--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.0--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.1--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.2--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.3--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.4--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.5--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.6--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged--%%PORTVERSION%%.sql
-%%RASTER%%%%SFCGAL%%share/postgresql/extension/postgis_sfcgal.control
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.8--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.9--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--unpackaged--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder.control
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.0--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.1--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.2--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.3--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.4--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.5--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.6--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.7--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.0--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.1--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.2--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.3--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.4--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.5--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.6--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.7--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.8--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.9--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.0--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.1--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.2--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.3--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.4--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.5--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.6--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.7--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.0--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.1--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.2--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.3--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.4--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.5--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.6--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%dev--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql
-%%RASTER%%%%TOPOLOGY%%share/postgresql/extension/postgis_topology.control
+share/postgresql/extension/postgis--2.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.5--%%PORTVERSION%%.sql
+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--%%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--unpackaged--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis.control
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.6--%%PORTVERSION%%.sql
+%%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--%%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--unpackaged--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal.control
+share/postgresql/extension/postgis_tiger_geocoder--2.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.5--%%PORTVERSION%%.sql
+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--%%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--unpackaged--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder.control
+share/postgresql/extension/postgis_tiger_geocoder.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.6--%%PORTVERSION%%.sql
+%%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--%%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--unpackaged--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology.control
 %%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
Index: postgis24/Makefile
===================================================================
--- postgis24/Makefile
+++ postgis24/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgis
-PORTVERSION=	2.4.5
-PORTREVISION=	1
+PORTVERSION=	2.4.7
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	24
@@ -16,82 +15,51 @@
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libgeos.so:graphics/geos \
-		libjson-c.so:devel/json-c
+		libjson-c.so:devel/json-c \
+		libgdal.so:graphics/gdal
 
-CONFLICTS_INSTALL=	postgis20  postgis21 postgis22 postgis23 postgis
+USES=		alias gettext gmake gnome iconv:wchar_t libtool:keepla \
+		localbase perl5 pkgconfig pgsql:9.3-10 shebangfix
+USE_GNOME=	libxml2
+USE_LDCONFIG=	yes
+USE_PERL5=	build
 
-USES=		compiler:c++11-lang gettext gmake iconv:wchar_t libtool:keepla \
-		perl5 pgsql pkgconfig shebangfix
-LLD_UNSAFE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE}
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
 SHEBANG_FILES=	extensions/address_standardizer/*.pl raster/test/regress/*.pl \
 		raster/test/regress/loader/*.pl regress/run_test.pl \
 		utils/postgis_restore.pl.in utils/*.pl
-USE_GNOME=	libxml2
-USE_LDCONFIG=	yes
-USE_PERL5=	build
-WANT_PGSQL=	lib server
+WANT_PGSQL=	server
 
-OPTIONS_DEFINE=		LOADERGUI RASTER TOPOLOGY SFCGAL ADDRSTD
-OPTIONS_DEFAULT=	TOPOLOGY ADDRSTD SFCGAL
-OPTIONS_SUB=		yes
-
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+OPTIONS_DEFINE=	ADDRSTD LOADERGUI SFCGAL TOPOLOGY
+OPTIONS_DEFAULT=ADDRSTD SFCGAL TOPOLOGY
+OPTIONS_SUB=	yes
 
 LOADERGUI_DESC=	Enable shp2pgsql-gui
-RASTER_DESC=	Raster support
 TOPOLOGY_DESC=	Topology support
 SFCGAL_DESC=	Enable sfcgal
 ADDRSTD_DESC=	Enable address standardizer
 
+CONFLICTS_INSTALL=	postgis20  postgis21 postgis22 postgis23 postgis25
+
 LOADERGUI_CONFIGURE_WITH=	gui
-LOADERGUI_USE=	GNOME=gtk20
-RASTER_USES=	alias
-RASTER_CONFIGURE_WITH=	raster
-RASTER_LIB_DEPENDS=		libgdal.so:graphics/gdal
-RASTER_CONFIGURE_ON=	--with-gdalconfig=${LOCALBASE}/bin/gdal-config
+LOADERGUI_USE=			GNOME=gtk20
 TOPOLOGY_CONFIGURE_WITH=	topology
-SFCGAL_LIB_DEPENDS=	libSFCGAL.so:databases/sfcgal
-SFCGAL_CONFIGURE_ON=	--with-sfcgal=${LOCALBASE}/bin/sfcgal-config
-SFCGAL_CONFIGURE_OFF=	--without-sfcgal
-SFCGAL_IMPLIES=		RASTER
-ADDRSTD_CONFIGURE_WITH=	address-standardizer
-ADDRSTD_IMPLIES=	RASTER
-ADDRSTD_LIB_DEPENDS=	libpcre.so:devel/pcre
-ADDRSTD_VARS=		WANT_PGSQL+=contrib
-
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+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
 
-.include <bsd.port.pre.mk>
-
-pre-configure:
-	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblwgeom-2.4.so.0.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
 	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
 	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
 	${MKDIR} ${STAGEDIR}${DATADIR}/utils
 	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/shp2pgsql
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pgsql2shp
-.if ${PORT_OPTIONS:MLOADERGUI}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/shp2pgsql-gui
-.else
-	${RM} ${STAGEDIR}${PREFIX}/bin/shp2pgsql-gui
-.endif
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblwgeom-2.4.so.0.0.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/postgis-2.4.so
-.if ${PORT_OPTIONS:MTOPOLOGY}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/postgis_topology-2.4.so
-.endif
-.if ${PORT_OPTIONS:MRASTER}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/raster2pgsql
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/rtpostgis-2.4.so
-.endif
-.if ${PORT_OPTIONS:MADDRSTD}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/address_standardizer-2.4.so
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: postgis24/distinfo
===================================================================
--- postgis24/distinfo
+++ postgis24/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536867665
-SHA256 (postgis-2.4.5.tar.gz) = 2fe727dd7541859b5230f55c78885c605e0177676cbc18944ecb2779f8905d69
-SIZE (postgis-2.4.5.tar.gz) = 12613882
+TIMESTAMP = 1552660013
+SHA256 (postgis-2.4.7.tar.gz) = 4ede3cd1c11af7635fc242ba319a1fbdf3ff74a9f75c6536d0b5007fd1e69657
+SIZE (postgis-2.4.7.tar.gz) = 12831401
Index: databases/postgis24/pkg-install
===================================================================
--- databases/postgis24/pkg-install
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-msg(){
- echo "
-  ======================= GEOS Support Notice ========================
-  In order to use the GEOS support, you may need to specially compile
-  your version of PostgreSQL to link the C++ runtime library.
-  To do this, invoke the PostgreSQL Makefile script this way:
-
-  on csh shell:
-
-  setenv LDFLAGS -lstdc++
-  make
-
-  on sh or bash shell:
-
-  export LDFLAGS=-lstdc++
-  make
-
-  The initial LDFLAGS variable is passed through to the Makefile and
-  adds the C++ library to the linking stage.
-
-  ====================================================================
-"
-if [ -n "${PACKAGE_BUILDING}" ]; then
-    sleep 10
-fi
-
-
-}
-
-case "$2" in
-    PRE-INSTALL)
-        msg ;;
-    MESSAGE)
-        msg ;;
-esac
Index: postgis24/pkg-plist
===================================================================
--- postgis24/pkg-plist
+++ postgis24/pkg-plist
@@ -1,5 +1,5 @@
 bin/pgsql2shp
-%%RASTER%%bin/raster2pgsql
+bin/raster2pgsql
 bin/shp2pgsql
 %%LOADERGUI%%bin/shp2pgsql-gui
 include/liblwgeom.h
@@ -12,7 +12,7 @@
 %%ADDRSTD%%lib/postgresql/address_standardizer-2.4.so
 lib/postgresql/postgis-2.4.so
 %%TOPOLOGY%%lib/postgresql/postgis_topology-2.4.so
-%%RASTER%%lib/postgresql/rtpostgis-2.4.so
+lib/postgresql/rtpostgis-2.4.so
 %%ADDRSTD%%share/doc/postgresql/extension/README.address_standardizer
 %%DATADIR%%/tiger_geocoder/README
 %%DATADIR%%/tiger_geocoder/create_geocode.bat
@@ -99,13 +99,13 @@
 share/postgresql/contrib/postgis-2.4/postgis_restore.pl
 share/postgresql/contrib/postgis-2.4/postgis_upgrade.sql
 share/postgresql/contrib/postgis-2.4/postgis_upgrade_for_extension.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.4/raster_comments.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.4/rtpostgis.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.4/rtpostgis_for_extension.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.4/rtpostgis_legacy.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.4/rtpostgis_proc_set_search_path.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.4/rtpostgis_upgrade.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.4/rtpostgis_upgrade_for_extension.sql
+share/postgresql/contrib/postgis-2.4/raster_comments.sql
+share/postgresql/contrib/postgis-2.4/rtpostgis.sql
+share/postgresql/contrib/postgis-2.4/rtpostgis_for_extension.sql
+share/postgresql/contrib/postgis-2.4/rtpostgis_legacy.sql
+share/postgresql/contrib/postgis-2.4/rtpostgis_proc_set_search_path.sql
+share/postgresql/contrib/postgis-2.4/rtpostgis_upgrade.sql
+share/postgresql/contrib/postgis-2.4/rtpostgis_upgrade_for_extension.sql
 %%SFCGAL%%share/postgresql/contrib/postgis-2.4/sfcgal.sql
 %%SFCGAL%%share/postgresql/contrib/postgis-2.4/sfcgal_comments.sql
 %%SFCGAL%%share/postgresql/contrib/postgis-2.4/sfcgal_upgrade.sql
@@ -115,7 +115,7 @@
 %%TOPOLOGY%%share/postgresql/contrib/postgis-2.4/topology_upgrade.sql
 share/postgresql/contrib/postgis-2.4/uninstall_legacy.sql
 share/postgresql/contrib/postgis-2.4/uninstall_postgis.sql
-%%RASTER%%share/postgresql/contrib/postgis-2.4/uninstall_rtpostgis.sql
+share/postgresql/contrib/postgis-2.4/uninstall_rtpostgis.sql
 %%SFCGAL%%share/postgresql/contrib/postgis-2.4/uninstall_sfcgal.sql
 %%TOPOLOGY%%share/postgresql/contrib/postgis-2.4/uninstall_topology.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--1.0--%%PORTVERSION%%.sql
@@ -129,51 +129,56 @@
 %%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%next--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.control
 %%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.8--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.1.9--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.2.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.3.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.4.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.4.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.4.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.4.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--2.4.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis.control
+share/postgresql/extension/postgis--2.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.5--%%PORTVERSION%%.sql
+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.4.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.3--%%PORTVERSION%%.sql
+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--%%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--unpackaged--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis.control
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.0--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.1--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.2--%%PORTVERSION%%.sql
@@ -200,6 +205,7 @@
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.5--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.6--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.8--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.0--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.1--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.2--%%PORTVERSION%%.sql
@@ -208,63 +214,72 @@
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.5--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.6--%%PORTVERSION%%.sql
 %%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.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
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.3--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.4--%%PORTVERSION%%.sql
+%%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--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%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--unpackaged--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal.control
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.8--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.9--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.2.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.3.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.4.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.4.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.4.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.4.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.4.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--unpackaged--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder.control
-%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.5--%%PORTVERSION%%.sql
+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.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
+share/postgresql/extension/postgis_tiger_geocoder--2.4.3--%%PORTVERSION%%.sql
+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--%%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--unpackaged--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder.control
+share/postgresql/extension/postgis_tiger_geocoder.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.0--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.1--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.2--%%PORTVERSION%%.sql
@@ -291,6 +306,7 @@
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.5--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.6--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.8--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.0--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.1--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.2--%%PORTVERSION%%.sql
@@ -299,14 +315,18 @@
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.5--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.6--%%PORTVERSION%%.sql
 %%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.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
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.3--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.4--%%PORTVERSION%%.sql
+%%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--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%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--unpackaged--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology.control
Index: postgis25/Makefile
===================================================================
--- postgis25/Makefile
+++ postgis25/Makefile
@@ -42,6 +42,8 @@
 SFCGAL_DESC=	Enable sfcgal
 ADDRSTD_DESC=	Enable address standardizer
 
+CONFLICTS_INSTALL=	postgis20  postgis21 postgis22 postgis23 postgis24
+
 LOADERGUI_CONFIGURE_WITH=	gui
 LOADERGUI_USE=			GNOME=gtk20
 TOPOLOGY_CONFIGURE_WITH=	topology