diff --git a/databases/postgresql-postgis2/Makefile b/databases/postgresql-postgis2/Makefile
index c8a5367addef5..270841a9c7a8b 100644
--- a/databases/postgresql-postgis2/Makefile
+++ b/databases/postgresql-postgis2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2016/10/09 21:41:57 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2016/12/05 15:12:08 gdt Exp $
 
-DISTNAME=	postgis-2.2.2
+DISTNAME=	postgis-2.3.1
 PKGNAME=	postgresql${PGSQL_VERSION}-${DISTNAME}
-PKGREVISION=	3
 CATEGORIES=	databases geography
 MASTER_SITES=	http://download.osgeo.org/postgis/source/
 
diff --git a/databases/postgresql-postgis2/PLIST b/databases/postgresql-postgis2/PLIST
index 3766a3b1f0254..8214786e5cf96 100644
--- a/databases/postgresql-postgis2/PLIST
+++ b/databases/postgresql-postgis2/PLIST
@@ -1,35 +1,39 @@
-@comment $NetBSD: PLIST,v 1.7 2016/04/11 12:22:02 gdt Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/12/05 15:12:08 gdt Exp $
 bin/pgsql2shp
 bin/raster2pgsql
 bin/shp2pgsql
 include/liblwgeom.h
 include/liblwgeom_topo.h
 lib/liblwgeom.la
-lib/postgresql/postgis-2.2.so
-lib/postgresql/postgis_topology-2.2.so
-lib/postgresql/rtpostgis-2.2.so
-share/postgresql/contrib/postgis-2.2/legacy.sql
-share/postgresql/contrib/postgis-2.2/legacy_gist.sql
-share/postgresql/contrib/postgis-2.2/legacy_minimal.sql
-share/postgresql/contrib/postgis-2.2/postgis.sql
-share/postgresql/contrib/postgis-2.2/postgis_comments.sql
-share/postgresql/contrib/postgis-2.2/postgis_proc_set_search_path.sql
-share/postgresql/contrib/postgis-2.2/postgis_restore.pl
-share/postgresql/contrib/postgis-2.2/postgis_upgrade.sql
-share/postgresql/contrib/postgis-2.2/raster_comments.sql
-share/postgresql/contrib/postgis-2.2/rtpostgis.sql
-share/postgresql/contrib/postgis-2.2/rtpostgis_legacy.sql
-share/postgresql/contrib/postgis-2.2/rtpostgis_proc_set_search_path.sql
-share/postgresql/contrib/postgis-2.2/rtpostgis_upgrade.sql
-share/postgresql/contrib/postgis-2.2/sfcgal_comments.sql
-share/postgresql/contrib/postgis-2.2/spatial_ref_sys.sql
-share/postgresql/contrib/postgis-2.2/topology.sql
-share/postgresql/contrib/postgis-2.2/topology_comments.sql
-share/postgresql/contrib/postgis-2.2/topology_upgrade.sql
-share/postgresql/contrib/postgis-2.2/uninstall_legacy.sql
-share/postgresql/contrib/postgis-2.2/uninstall_postgis.sql
-share/postgresql/contrib/postgis-2.2/uninstall_rtpostgis.sql
-share/postgresql/contrib/postgis-2.2/uninstall_topology.sql
+lib/postgresql/postgis-2.3.so
+lib/postgresql/postgis_topology-2.3.so
+lib/postgresql/rtpostgis-2.3.so
+share/postgresql/contrib/postgis-2.3/legacy.sql
+share/postgresql/contrib/postgis-2.3/legacy_gist.sql
+share/postgresql/contrib/postgis-2.3/legacy_minimal.sql
+share/postgresql/contrib/postgis-2.3/postgis.sql
+share/postgresql/contrib/postgis-2.3/postgis_comments.sql
+share/postgresql/contrib/postgis-2.3/postgis_for_extension.sql
+share/postgresql/contrib/postgis-2.3/postgis_proc_set_search_path.sql
+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
+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
+share/postgresql/contrib/postgis-2.3/sfcgal_comments.sql
+share/postgresql/contrib/postgis-2.3/spatial_ref_sys.sql
+share/postgresql/contrib/postgis-2.3/topology.sql
+share/postgresql/contrib/postgis-2.3/topology_comments.sql
+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
+share/postgresql/contrib/postgis-2.3/uninstall_rtpostgis.sql
+share/postgresql/contrib/postgis-2.3/uninstall_topology.sql
 share/postgresql/extension/postgis--2.0.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis--2.0.1--${PKGVERSION}.sql
 share/postgresql/extension/postgis--2.0.2--${PKGVERSION}.sql
@@ -50,7 +54,10 @@ share/postgresql/extension/postgis--2.1.8--${PKGVERSION}.sql
 share/postgresql/extension/postgis--2.1.9--${PKGVERSION}.sql
 share/postgresql/extension/postgis--2.2.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis--2.2.1--${PKGVERSION}.sql
-share/postgresql/extension/postgis--${PKGVERSION}--${PKGVERSION}.sql
+share/postgresql/extension/postgis--2.2.2--${PKGVERSION}.sql
+share/postgresql/extension/postgis--2.2.3--${PKGVERSION}.sql
+share/postgresql/extension/postgis--2.2.4--${PKGVERSION}.sql
+share/postgresql/extension/postgis--2.3.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis--${PKGVERSION}--${PKGVERSION}next.sql
 share/postgresql/extension/postgis--${PKGVERSION}.sql
 share/postgresql/extension/postgis--${PKGVERSION}next--${PKGVERSION}.sql
@@ -76,7 +83,10 @@ share/postgresql/extension/postgis_tiger_geocoder--2.1.8--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.1.9--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.2.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.2.1--${PKGVERSION}.sql
-share/postgresql/extension/postgis_tiger_geocoder--${PKGVERSION}--${PKGVERSION}.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.2--${PKGVERSION}.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.3--${PKGVERSION}.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.4--${PKGVERSION}.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--${PKGVERSION}--${PKGVERSION}next.sql
 share/postgresql/extension/postgis_tiger_geocoder--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--${PKGVERSION}next--${PKGVERSION}.sql
@@ -103,10 +113,12 @@ share/postgresql/extension/postgis_topology--2.1.8--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--2.1.9--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--2.2.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--2.2.1--${PKGVERSION}.sql
-share/postgresql/extension/postgis_topology--${PKGVERSION}--${PKGVERSION}.sql
+share/postgresql/extension/postgis_topology--2.2.2--${PKGVERSION}.sql
+share/postgresql/extension/postgis_topology--2.2.3--${PKGVERSION}.sql
+share/postgresql/extension/postgis_topology--2.2.4--${PKGVERSION}.sql
+share/postgresql/extension/postgis_topology--2.3.0--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--${PKGVERSION}--${PKGVERSION}next.sql
 share/postgresql/extension/postgis_topology--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--${PKGVERSION}next--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--unpackaged--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology.control
-@pkgdir share/doc/postgis/images
diff --git a/databases/postgresql-postgis2/distinfo b/databases/postgresql-postgis2/distinfo
index 32062fb40cfe9..c58500031a4d4 100644
--- a/databases/postgresql-postgis2/distinfo
+++ b/databases/postgresql-postgis2/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.8 2016/04/11 12:22:02 gdt Exp $
+$NetBSD: distinfo,v 1.9 2016/12/05 15:12:08 gdt Exp $
 
-SHA1 (postgis-2.2.2.tar.gz) = f82fa96c4c73e8a94091b51f2e528a8146b03597
-RMD160 (postgis-2.2.2.tar.gz) = 1107540f50e163a998e34659922044d7801d336e
-SHA512 (postgis-2.2.2.tar.gz) = c5ad97abe52b7ec67e52a06e05e694099eaf2daacb7dc73c85dce71a61c269c755ec401f1077a1760cfb930ccd42fb1d34ebfb79990f52f5bc3aafa9db2e9ce4
-Size (postgis-2.2.2.tar.gz) = 10071528 bytes
+SHA1 (postgis-2.3.1.tar.gz) = c5ed6629ea050b5edfd3e4a75278c82d96a5aad1
+RMD160 (postgis-2.3.1.tar.gz) = af6a01053b65010ba95481cab335c000bf29de80
+SHA512 (postgis-2.3.1.tar.gz) = 28a78bce7d03af5b523efe583c2746c5101b201a5dcb4f3e4a59354313b9e7b632e9c8cb1a1e1eaba684f6e1a7d5c2c585a09315e8d0e45870a504daaa42c5e9
+Size (postgis-2.3.1.tar.gz) = 11335176 bytes
 SHA1 (patch-extensions_address__standardizer_Makefile.in) = e560e734b3652b5ae4c539af8f077754979f2f29
-SHA1 (patch-extensions_postgis_Makefile.in) = 30b67a57cd3999b7fe688fc65c4d8730ad0afaa8
 SHA1 (patch-extensions_postgis__topology_Makefile.in) = f1095e0a852d746027417d49a0c14bf00a5da00f
diff --git a/databases/postgresql-postgis2/patches/patch-extensions_postgis_Makefile.in b/databases/postgresql-postgis2/patches/patch-extensions_postgis_Makefile.in
deleted file mode 100644
index 7989833ea89ef..0000000000000
--- a/databases/postgresql-postgis2/patches/patch-extensions_postgis_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-extensions_postgis_Makefile.in,v 1.1 2015/12/15 00:44:40 gdt Exp $
-
-Use perl from autoconf rather than pgxs.  Reported upstream.
-
---- extensions/postgis/Makefile.in.orig	2014-06-27 07:35:32.000000000 +0000
-+++ extensions/postgis/Makefile.in
-@@ -48,7 +48,7 @@ sql/$(EXTENSION)--$(EXTVERSION).sql: sql
- 
- sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../postgis/postgis.sql ../../raster/rt_pg/rtpostgis.sql ../../utils/create_unpackaged.pl
- 	mkdir -p sql
--	cat ../../postgis/postgis.sql ../../raster/rt_pg/rtpostgis.sql | $(PERL) ../../utils/create_unpackaged.pl postgis > $@
-+	cat ../../postgis/postgis.sql ../../raster/rt_pg/rtpostgis.sql | @PERL@ ../../utils/create_unpackaged.pl postgis > $@
- 	
- #this is a cludge to allow upgrading from same SVN to same SVN
- sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: sql_bits/postgis_raster_upgrade_minor.sql