Update to 2.2.2.

PostGIS 2.2.2
2016/03/22

 * Bug Fixes *

  - #3463, Fix crash on face-collapsing edge change
  - #3422, Improve ST_Split robustness on standard precision double
           systems (arm64, ppc64el, s390c, powerpc, ...)
  - #3427, Update spatial_ref_sys to EPSG version 8.8
  - #3433, ST_ClusterIntersecting incorrect for MultiPoints
  - #3435, ST_AsX3D fix rendering of concave geometries
  - #3436, memory handling mistake in ptarray_clone_deep
  - #3437, ST_ClusterIntersecting incorrect for MultiPoints
  - #3461, ST_GeomFromKML crashes Postgres when there are
           innerBoundaryIs and no outerBoundaryIs
  - #3429, upgrading to 2.3 or from 2.1 can cause loop/hang on some
           platforms
  - #3460, ST_ClusterWithin 'Tolerance not defined' error after upgrade
  - #3490, Raster data restore issues, materialized views
  		   Scripts postgis_proc_set_search_path.sql, rtpostgis_proc_set_search_path.sql
  		   refere to http://postgis.net/docs/manual-2.2/RT_FAQ.html#faq_raster_data_not_restore
  - #3426, failing POINT EMPTY tests on fun architectures

3 files changed, 17 insertions, 9 deletions

diff --git a/databases/postgresql-postgis2/Makefile b/databases/postgresql-postgis2/Makefile
index a612153f452..76e9957903d 100644
--- a/databases/postgresql-postgis2/Makefile
+++ b/databases/postgresql-postgis2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2016/03/13 21:40:22 fhajny Exp $
+# $NetBSD: Makefile,v 1.18 2016/04/11 12:22:02 gdt Exp $
 
-DISTNAME=	postgis-2.2.1
+DISTNAME=	postgis-2.2.2
 PKGNAME=	postgresql${PGSQL_VERSION}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	databases geography
 MASTER_SITES=	http://download.osgeo.org/postgis/source/
 
@@ -60,6 +59,7 @@ SUBST_STAGE.paths=	pre-configure
 INSTALLATION_DIRS=	${DOCDIR} ${DOCDIR}/images ${PKGMANDIR}/man1
 
 REPLACE_PERL+=		utils/postgis_restore.pl.in
+REPLACE_PERL+=		utils/create_spatial_ref_sys_config_dump.pl
 #MAKE_ENV+=		PERL5=${PERL5:Q}
 
 INSTALL_ENV+=		mkinstalldirs=${INSTALL_DATA_DIR:Q}
diff --git a/databases/postgresql-postgis2/PLIST b/databases/postgresql-postgis2/PLIST
index 25b97501060..3766a3b1f02 100644
--- a/databases/postgresql-postgis2/PLIST
+++ b/databases/postgresql-postgis2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/01/10 01:21:13 gdt Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/04/11 12:22:02 gdt Exp $
 bin/pgsql2shp
 bin/raster2pgsql
 bin/shp2pgsql
@@ -13,11 +13,13 @@ 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
@@ -47,6 +49,8 @@ share/postgresql/extension/postgis--2.1.7--${PKGVERSION}.sql
 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--${PKGVERSION}--${PKGVERSION}next.sql
 share/postgresql/extension/postgis--${PKGVERSION}.sql
 share/postgresql/extension/postgis--${PKGVERSION}next--${PKGVERSION}.sql
@@ -71,6 +75,8 @@ share/postgresql/extension/postgis_tiger_geocoder--2.1.7--${PKGVERSION}.sql
 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--${PKGVERSION}--${PKGVERSION}next.sql
 share/postgresql/extension/postgis_tiger_geocoder--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--${PKGVERSION}next--${PKGVERSION}.sql
@@ -96,6 +102,8 @@ share/postgresql/extension/postgis_topology--2.1.7--${PKGVERSION}.sql
 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--${PKGVERSION}--${PKGVERSION}next.sql
 share/postgresql/extension/postgis_topology--${PKGVERSION}.sql
 share/postgresql/extension/postgis_topology--${PKGVERSION}next--${PKGVERSION}.sql
diff --git a/databases/postgresql-postgis2/distinfo b/databases/postgresql-postgis2/distinfo
index 4909f2a253a..32062fb40cf 100644
--- a/databases/postgresql-postgis2/distinfo
+++ b/databases/postgresql-postgis2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2016/01/10 01:21:13 gdt Exp $
+$NetBSD: distinfo,v 1.8 2016/04/11 12:22:02 gdt Exp $
 
-SHA1 (postgis-2.2.1.tar.gz) = 615f86c34ed4431383432d34f4b6d558c71fb94f
-RMD160 (postgis-2.2.1.tar.gz) = 6e9574938ad6964e64b8fae0f9240b12234c6d23
-SHA512 (postgis-2.2.1.tar.gz) = e580fc6556e1d8e2ba36d62795650852d303ce4c935c8e538d14f0bf0f00c3c27dcb034c42dfafa0c8995eb0f28f71119c8ada4ceecaa8ca9897d0653552bb2f
-Size (postgis-2.2.1.tar.gz) = 10069889 bytes
+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 (patch-extensions_address__standardizer_Makefile.in) = e560e734b3652b5ae4c539af8f077754979f2f29
 SHA1 (patch-extensions_postgis_Makefile.in) = 30b67a57cd3999b7fe688fc65c4d8730ad0afaa8
 SHA1 (patch-extensions_postgis__topology_Makefile.in) = f1095e0a852d746027417d49a0c14bf00a5da00f