Update to 3.7.0:

pkgsrc changes: revise comments about geos C vs C++ library linking in
light of unexpected libtool behavior (which defeats geos's scheme)

Upstream NEWS:

3.7.0 changes
2018-09-10
- New things:
  - CAPI: GEOSDistanceIndexed (#795, Dan Baston)
  - CAPI: GEOSCoordSeq_isCCW (#870, Dan Baston)
  - CAPI: GEOSGeom_getXMin, GEOSGeom_getXMax,
          GEOSGeom_getYMin, GEOSGeom_getYMax (#871, Dan Baston)
  - CAPI: GEOSFrechetDistance (#797, Shinichi SUGIYAMA)
  - CAPI: GEOSReverse (#872, Dan Baston)
  - CAPI: GEOSGeomGetZ (#581, J Smith)

- Improvements
  - Interruptible snap operation (Paul Ramsey)
  - Numerous packaging, doc, and build changes
    (Debian group: Bas Couwenberg, Francesco Paolo Lovergine)
    (NetBSD: Greg Troxel)
  - Allow static library with C API for CMake builds (#878, Dakota Hawkins)

- C++ API changes:
  - Require defining USE_UNSTABLE_GEOS_CPP_API for use without
    warnings.
  - Make C++11 required (Mateusz Loskot)
  - Use C++11 unique_ptr, nullptr, and override constructs
    (Mateusz Loskot)
  - C++11 standard delete on noncopyable
    (#851, Vicky Vergara)
  - Fix CommonBits::getBit to correctly handle i >= 32
    (#834, Kurt Schwehr)

6 files changed, 38 insertions, 49 deletions

diff --git a/geography/geos/Makefile b/geography/geos/Makefile
index 1e96ccb5eac..a205d36dbe9 100644
--- a/geography/geos/Makefile
+++ b/geography/geos/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2017/09/28 00:24:41 gdt Exp $
+# $NetBSD: Makefile,v 1.31 2018/09/11 16:13:29 gdt Exp $
 
-DISTNAME=	geos-3.6.2
+DISTNAME=	geos-3.7.0
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/geos/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,25 +11,26 @@ EXTRACT_SUFX=	.tar.bz2
 
 # According to the geos project (as documented in README), the C++
 # interface should not be directly used and other packages should not
-# link against it.  Therefore, pkgsrc will perform a recursive revbump
-# when the geos_c shlib version changes, and will generally ignore
-# geos shlib name changes.  However, people on the geos list dispute
-# this characterization.
-
-# The following packages either incorrectly (from the geos README
-# viewpoint) or suboptimally (from some comments on the list) link
-# directly against -lgeos and should be revbumped on every update (and
-# perhaps fixed not to use -lgeos):
+# link against it.  Therefore, in theory pkgsrc would perform a
+# recursive revbump when the libgeos_c.so version changes, and would
+# generally ignore libgeos.so shlib name changes.
+#
+# However, libtool explicitly adds dependency_libs, so packages that
+# intend to only depend on the C library end up being linked directly
+# to the C++ library also.  Thus, they need revbumping because of
+# libtools {bug or feature}.
+#
+# Packages that need revbumping because of libtool's baehvior:
 #   geography/gdal-lib
-#   geoggraph/osm2pgsql
-#     https://github.com/openstreetmap/osm2pgsql/issues/634
+# Packages that need revbumping because of direct use of the C++ lib:
+#   (none known)
 
 MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	https://trac.osgeo.org/geos
 COMMENT=	C++ port of the Java Topology Suite (JTS)
 LICENSE=	gnu-lgpl-v2.1
 
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++11
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/geography/geos/PLIST b/geography/geos/PLIST
index c068010127a..f590a8b068f 100644
--- a/geography/geos/PLIST
+++ b/geography/geos/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2017/09/28 00:24:41 gdt Exp $
+@comment $NetBSD: PLIST,v 1.15 2018/09/11 16:13:29 gdt Exp $
 bin/geos-config
 include/geos.h
 include/geos/algorithm/Angle.h
@@ -25,6 +25,7 @@ include/geos/algorithm/RayCrossingCounter.h
 include/geos/algorithm/RobustDeterminant.h
 include/geos/algorithm/SIRtreePointInRing.h
 include/geos/algorithm/SimplePointInRing.h
+include/geos/algorithm/distance/DiscreteFrechetDistance.h
 include/geos/algorithm/distance/DiscreteHausdorffDistance.h
 include/geos/algorithm/distance/DistanceToPoint.h
 include/geos/algorithm/distance/PointPairDistance.h
@@ -54,7 +55,6 @@ include/geos/geom/GeometryComponentFilter.h
 include/geos/geom/GeometryFactory.h
 include/geos/geom/GeometryFactory.inl
 include/geos/geom/GeometryFilter.h
-include/geos/geom/GeometryList.h
 include/geos/geom/IntersectionMatrix.h
 include/geos/geom/LineSegment.h
 include/geos/geom/LineSegment.inl
@@ -267,6 +267,7 @@ include/geos/operation/distance/DistanceOp.h
 include/geos/operation/distance/FacetSequence.h
 include/geos/operation/distance/FacetSequenceTreeBuilder.h
 include/geos/operation/distance/GeometryLocation.h
+include/geos/operation/distance/IndexedFacetDistance.h
 include/geos/operation/intersection/Rectangle.h
 include/geos/operation/intersection/RectangleIntersection.h
 include/geos/operation/intersection/RectangleIntersectionBuilder.h
diff --git a/geography/geos/buildlink3.mk b/geography/geos/buildlink3.mk
index 3cb345a69fb..54de248b112 100644
--- a/geography/geos/buildlink3.mk
+++ b/geography/geos/buildlink3.mk
@@ -1,10 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.11 2012/06/02 16:27:30 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/09/11 16:13:29 gdt Exp $
 
 BUILDLINK_TREE+=	geos
 
 .if !defined(GEOS_BUILDLINK3_MK)
 GEOS_BUILDLINK3_MK:=
 
+#USE_LANGUAGES+=	c++11
+
 BUILDLINK_API_DEPENDS.geos+=	geos>=2.2.3
 BUILDLINK_ABI_DEPENDS.geos+=	geos>=3.3.4
 BUILDLINK_PKGSRCDIR.geos?=	../../geography/geos
diff --git a/geography/geos/distinfo b/geography/geos/distinfo
index 186a0e73b99..fca3d57c052 100644
--- a/geography/geos/distinfo
+++ b/geography/geos/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2017/09/28 00:24:41 gdt Exp $
+$NetBSD: distinfo,v 1.28 2018/09/11 16:13:29 gdt Exp $
 
-SHA1 (geos-3.6.2.tar.bz2) = b9d0578c6b5308cf05a3dd8873802f9862c04291
-RMD160 (geos-3.6.2.tar.bz2) = 6efa217f1bfe5bb4a3de82e1899a97b3a8c90b9e
-SHA512 (geos-3.6.2.tar.bz2) = 515d8700b8a28282678e481faee355e3a43d7b70160472a63335b8d7225d9ba10437be782378f18f31a15288118126d411a2d862f01ce35d27c96f6bc0a73016
-Size (geos-3.6.2.tar.bz2) = 2030705 bytes
-SHA1 (patch-ae) = f4befa15f66a6e5b30dce57f0abb34af4c3264c8
-SHA1 (patch-capi_geos__ts__c.cpp) = 0c266de00722606bcb9637f21f5c3c458f12cb47
+SHA1 (geos-3.7.0.tar.bz2) = a42cfc1178784ebdf124c6537ee3158e5acac698
+RMD160 (geos-3.7.0.tar.bz2) = 3e3ea84b5b7e81f7e0c483bdbe3d7ad9417e2da9
+SHA512 (geos-3.7.0.tar.bz2) = fcca5e503efa32bb388376b2a06b9ca5c74fbcddba750cce6b3b4109eb2eb122058aead12b9462cdd881f425cd75d7241645ab344f25ce022bc0659954560742
+Size (geos-3.7.0.tar.bz2) = 2028814 bytes
+SHA1 (patch-ae) = bcc9e39928dca6c3e78326c0bfb7dcf96e4bcf10
+SHA1 (patch-capi_geos__ts__c.cpp) = bde78fc0ef30e0d75ccba5f89c6f62d957783d03
diff --git a/geography/geos/patches/patch-ae b/geography/geos/patches/patch-ae
index 4c1964228dd..e040a0e8114 100644
--- a/geography/geos/patches/patch-ae
+++ b/geography/geos/patches/patch-ae
@@ -1,33 +1,13 @@
-$NetBSD: patch-ae,v 1.5 2017/09/28 00:24:41 gdt Exp $
+$NetBSD: patch-ae,v 1.6 2018/09/11 16:13:29 gdt Exp $
 
 TODO: explain what's in LDFLAGS.
 TODO: explain why --libs has -L in the first place (vs --ldflags).
 TODO: report upstream.
 
---- tools/geos-config.in.orig	2016-11-22 10:49:08.000000000 +0000
+--- tools/geos-config.in.orig	2018-08-19 10:49:14.000000000 +0000
 +++ tools/geos-config.in
-@@ -43,22 +43,22 @@ case $1 in
-     --libs)
-       # TODO: make an alias for --clibs
-       # see http://trac.osgeo.org/geos/ticket/497
--      echo -L${libdir} -lgeos
-+      echo -L${libdir} @LDFLAGS@ -lgeos
-       ;;
-     --clibs)
--      echo -L${libdir} -lgeos_c
-+      echo -L${libdir} @LDFLAGS@ -lgeos_c
-       ;;
-     --cclibs)
--      echo -L${libdir} -lgeos
-+      echo -L${libdir} @LDFLAGS@ -lgeos
-       ;;
-     --static-clibs)
--      echo -L${libdir} -lgeos_c -lgeos -lm
-+      echo -L${libdir} @LDFLAGS@ -lgeos_c -lgeos -lm
-       ;;
-     --static-cclibs)
--      echo -L${libdir} -lgeos -lm
-+      echo -L${libdir} @LDFLAGS@ -lgeos -lm
+@@ -58,7 +58,7 @@ case $1 in
+       echo -L${libdir} -lgeos -lm
        ;;
      --ldflags)
 -      echo -L${libdir}
diff --git a/geography/geos/patches/patch-capi_geos__ts__c.cpp b/geography/geos/patches/patch-capi_geos__ts__c.cpp
index e2a7fa66cdc..56d52dac949 100644
--- a/geography/geos/patches/patch-capi_geos__ts__c.cpp
+++ b/geography/geos/patches/patch-capi_geos__ts__c.cpp
@@ -1,4 +1,9 @@
-$NetBSD: patch-capi_geos__ts__c.cpp,v 1.1 2015/09/08 18:48:04 joerg Exp $
+$NetBSD: patch-capi_geos__ts__c.cpp,v 1.2 2018/09/11 16:13:29 gdt Exp $
+
+\todo Document this patch.   It appears to be that passing non-POD types
+to variadic functions is UB.
+
+\todo File a bug upstream, if appropriate.
 
 --- capi/geos_ts_c.cpp.orig	2015-09-08 16:31:02.000000000 +0000
 +++ capi/geos_ts_c.cpp