Update to 2.2.1.

(Passes make check on netbsd-6 i386 with pgsql 9.3.)

PostGIS 2.2.1
2016/01/06

 * Bug Fixes *

  - #2232, avoid accumulated error in SVG rounding
  - #3321, Fix performance regression in topology loading
  - #3329, Fix robustness regression in TopoGeo_addPoint
  - #3349, Fix installation path of postgis_topology scripts
  - #3351, set endnodes isolation on ST_RemoveIsoEdge
           (and lwt_RemIsoEdge)
  - #3355, geography ST_Segmentize has geometry bbox
  - #3359, Fix toTopoGeom loss of low-id primitives from
           TopoGeometry definition
  - #3360, _raster_constraint_info_scale invalid input syntax
  - #3375, crash in repeated point removal for collection(point)
  - #3378, Fix handling of hierarchical TopoGeometries
           in presence of multiple topologies
  - #3380, #3402, Decimate lines on topology load
  - #3388, #3410, Fix missing end-points in ST_Removepoints
  - #3389, Buffer overflow in lwgeom_to_geojson
  - #3390, Compilation under Alpine Linux 3.2
  			gives an error when compiling the postgis and postgis_topology extension
  - #3393, ST_Area NaN for some polygons
  - #3401, Improve ST_Split robustness on 32bit systems
  - #3404, ST_ClusterWithin crashes backend
  - #3407, Fix crash on splitting a face or an edge
           defining multiple TopoGeometry objects
  - #3411, Clustering functions not using spatial index
  - #3412, Improve robustness of snapping step in TopoGeo_addLinestring
  - #3415, Fix OSX 10.9 build under pkgsrc
  - Fix memory leak in lwt_ChangeEdgeGeom [liblwgeom]

3 files changed, 14 insertions, 14 deletions

diff --git a/databases/postgresql-postgis2/Makefile b/databases/postgresql-postgis2/Makefile
index f98420c79ec..94f7ccfacb1 100644
--- a/databases/postgresql-postgis2/Makefile
+++ b/databases/postgresql-postgis2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2016/01/06 10:46:51 adam Exp $
+# $NetBSD: Makefile,v 1.14 2016/01/10 01:21:13 gdt Exp $
 
-DISTNAME=	postgis-2.2.0
+DISTNAME=	postgis-2.2.1
 PKGNAME=	postgresql${PGSQL_VERSION}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	databases geography
diff --git a/databases/postgresql-postgis2/PLIST b/databases/postgresql-postgis2/PLIST
index 84b6c78aa1c..25b97501060 100644
--- a/databases/postgresql-postgis2/PLIST
+++ b/databases/postgresql-postgis2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/12/15 00:44:40 gdt Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/01/10 01:21:13 gdt Exp $
 bin/pgsql2shp
 bin/raster2pgsql
 bin/shp2pgsql
@@ -21,13 +21,13 @@ share/postgresql/contrib/postgis-2.2/rtpostgis_legacy.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_topology-2.2/topology.sql
-share/postgresql/contrib/postgis_topology-2.2/topology_upgrade.sql
-share/postgresql/contrib/postgis_topology-2.2/uninstall_topology.sql
+share/postgresql/contrib/postgis-2.2/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
@@ -46,10 +46,10 @@ share/postgresql/extension/postgis--2.1.6--${PKGVERSION}.sql
 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--${PKGVERSION}--${PKGVERSION}next.sql
 share/postgresql/extension/postgis--${PKGVERSION}.sql
 share/postgresql/extension/postgis--${PKGVERSION}next--${PKGVERSION}.sql
-share/postgresql/extension/postgis--${PKGVERSION}rc1--${PKGVERSION}.sql
 share/postgresql/extension/postgis--unpackaged--${PKGVERSION}.sql
 share/postgresql/extension/postgis.control
 share/postgresql/extension/postgis_tiger_geocoder--2.0.0--${PKGVERSION}.sql
@@ -70,10 +70,10 @@ share/postgresql/extension/postgis_tiger_geocoder--2.1.6--${PKGVERSION}.sql
 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--${PKGVERSION}--${PKGVERSION}next.sql
 share/postgresql/extension/postgis_tiger_geocoder--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--${PKGVERSION}next--${PKGVERSION}.sql
-share/postgresql/extension/postgis_tiger_geocoder--${PKGVERSION}rc1--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder--unpackaged--${PKGVERSION}.sql
 share/postgresql/extension/postgis_tiger_geocoder.control
 share/postgresql/extension/postgis_tiger_geocoder.sql
@@ -95,10 +95,10 @@ share/postgresql/extension/postgis_topology--2.1.6--${PKGVERSION}.sql
 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--${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--${PKGVERSION}rc1--${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 a7f9b437d05..4909f2a253a 100644
--- a/databases/postgresql-postgis2/distinfo
+++ b/databases/postgresql-postgis2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2015/12/15 00:44:40 gdt Exp $
+$NetBSD: distinfo,v 1.7 2016/01/10 01:21:13 gdt Exp $
 
-SHA1 (postgis-2.2.0.tar.gz) = 3af9a94fbae89fa900a51ae99951623f1fb10726
-RMD160 (postgis-2.2.0.tar.gz) = f2bf87fe7cfe1511c6c4219601ae8c8abb1b8359
-SHA512 (postgis-2.2.0.tar.gz) = e9954d5c4aa381536ae87c32bb37b166a7ede0f9b9fc96cfb300dc2350b9351f40870429f64e755c3371be692a1956f5f8ea21733b64aab490f42d2232ae5d8f
-Size (postgis-2.2.0.tar.gz) = 10164837 bytes
+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 (patch-extensions_address__standardizer_Makefile.in) = e560e734b3652b5ae4c539af8f077754979f2f29
 SHA1 (patch-extensions_postgis_Makefile.in) = 30b67a57cd3999b7fe688fc65c4d8730ad0afaa8
 SHA1 (patch-extensions_postgis__topology_Makefile.in) = f1095e0a852d746027417d49a0c14bf00a5da00f