CVS commit: pkgsrc/geography/geos

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Jan  3 01:27:29 UTC 2021

Modified Files:
        pkgsrc/geography/geos: Makefile PLIST distinfo
        pkgsrc/geography/geos/patches: patch-ae
Removed Files:
        pkgsrc/geography/geos/patches: patch-capi_geos__ts__c.cpp

Log Message:
geogrpahy/geos: Update to 3.9.0

Upstream NEWS:

Changes in 3.9.0beta1
2020-11-27

- New things:
  - MaximumInscribedCircle and LargestEmptyCircle (JTS-530, Paul Ramsey)
  - CAPI: Fixed precision overlay operations (Sandro Santilli, Paul Ramsey)
  - CAPI: GEOSPreparedNearestPoints (#1007, Sandro Santilli)
  - CAPI: GEOSPreparedDistance (#1066, Sandro Santilli)
  - SimpleSTRTree spatial index implementation (Paul Ramsey)
  - Add support for pkg-config for GEOS C API (#1073, Mike Taves)

- Improvements:
  - Stack allocate segments in OverlapUnion (Paul Ramsey)
  - Improve performance of GEOSisValid (Dan Baston)
  - Update geos-config tool for consistency
    and escape paths (https://git.osgeo.org/gitea/geos/geos/pulls/99)
    changes mostly affect CMake MSVC builds (#1015, Mike Taves)
  - Testing on Rasberry Pi 32-bit (berrie) (#1017, Bruce Rindahl, Regina Obe)
  - Replace ttmath with JTS DD double-double implementation (Paul Ramsey)
  - Fix bug in DistanceOp for geometries with empty components (#1026, Paul Ramsey)
  - Remove undefined behaviour in CAPI (#1021, Greg Troxel)
  - Fix buffering issue (#1022, JTS-525, Paul Ramsey)
  - MinimumBoundingCircle.getMaximumDiameter fix (JTS-533, Paul Ramsey)

- Changes:
  - Drop SWIG bindings, including for Ruby and Python (#1076, Mike Taves)


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/geography/geos/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/geography/geos/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/geography/geos/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/geography/geos/patches/patch-ae
cvs rdiff -u -r1.6 -r0 \
    pkgsrc/geography/geos/patches/patch-capi_geos__ts__c.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/geos/Makefile
diff -u pkgsrc/geography/geos/Makefile:1.35 pkgsrc/geography/geos/Makefile:1.36
--- pkgsrc/geography/geos/Makefile:1.35 Wed Mar 11 12:52:06 2020
+++ pkgsrc/geography/geos/Makefile      Sun Jan  3 01:27:29 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2020/03/11 12:52:06 gdt Exp $
+# $NetBSD: Makefile,v 1.36 2021/01/03 01:27:29 gdt Exp $
 
-DISTNAME=      geos-3.8.1
+DISTNAME=      geos-3.9.0
 CATEGORIES=    geography
 MASTER_SITES=  http://download.osgeo.org/geos/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/geography/geos/PLIST
diff -u pkgsrc/geography/geos/PLIST:1.16 pkgsrc/geography/geos/PLIST:1.17
--- pkgsrc/geography/geos/PLIST:1.16    Wed Mar 11 12:52:06 2020
+++ pkgsrc/geography/geos/PLIST Sun Jan  3 01:27:29 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2020/03/11 12:52:06 gdt Exp $
+@comment $NetBSD: PLIST,v 1.17 2021/01/03 01:27:29 gdt Exp $
 bin/geos-config
 include/geos.h
 include/geos/algorithm/Angle.h
@@ -26,6 +26,8 @@ include/geos/algorithm/PointLocator.h
 include/geos/algorithm/RayCrossingCounter.h
 include/geos/algorithm/RayCrossingCounterDD.h
 include/geos/algorithm/RobustDeterminant.h
+include/geos/algorithm/construct/LargestEmptyCircle.h
+include/geos/algorithm/construct/MaximumInscribedCircle.h
 include/geos/algorithm/distance/DiscreteFrechetDistance.h
 include/geos/algorithm/distance/DiscreteHausdorffDistance.h
 include/geos/algorithm/distance/DistanceToPoint.h
@@ -33,24 +35,13 @@ include/geos/algorithm/distance/PointPai
 include/geos/algorithm/locate/IndexedPointInAreaLocator.h
 include/geos/algorithm/locate/PointOnGeometryLocator.h
 include/geos/algorithm/locate/SimplePointInAreaLocator.h
-include/geos/algorithm/ttmath/ttmath.h
-include/geos/algorithm/ttmath/ttmathbig.h
-include/geos/algorithm/ttmath/ttmathdec.h
-include/geos/algorithm/ttmath/ttmathint.h
-include/geos/algorithm/ttmath/ttmathmisc.h
-include/geos/algorithm/ttmath/ttmathobjects.h
-include/geos/algorithm/ttmath/ttmathparser.h
-include/geos/algorithm/ttmath/ttmaththreads.h
-include/geos/algorithm/ttmath/ttmathtypes.h
-include/geos/algorithm/ttmath/ttmathuint.h
-include/geos/algorithm/ttmath/ttmathuint_noasm.h
-include/geos/algorithm/ttmath/ttmathuint_x86.h
-include/geos/algorithm/ttmath/ttmathuint_x86_64.h
-include/geos/algorithm/ttmath/ttmathuint_x86_64_msvc.asm
 include/geos/constants.h
+include/geos/edgegraph/EdgeGraph.h
+include/geos/edgegraph/EdgeGraphBuilder.h
+include/geos/edgegraph/HalfEdge.h
+include/geos/edgegraph/MarkHalfEdge.h
 include/geos/export.h
 include/geos/geom.h
-include/geos/geom/BinaryOp.h
 include/geos/geom/Coordinate.h
 include/geos/geom/Coordinate.inl
 include/geos/geom/CoordinateArraySequence.h
@@ -73,6 +64,7 @@ include/geos/geom/GeometryComponentFilte
 include/geos/geom/GeometryFactory.h
 include/geos/geom/GeometryFactory.inl
 include/geos/geom/GeometryFilter.h
+include/geos/geom/HeuristicOverlay.h
 include/geos/geom/IntersectionMatrix.h
 include/geos/geom/LineSegment.h
 include/geos/geom/LineSegment.inl
@@ -86,20 +78,26 @@ include/geos/geom/MultiPolygon.h
 include/geos/geom/MultiPolygon.inl
 include/geos/geom/Point.h
 include/geos/geom/Polygon.h
+include/geos/geom/Position.h
 include/geos/geom/PrecisionModel.h
 include/geos/geom/PrecisionModel.inl
+include/geos/geom/Quadrant.h
+include/geos/geom/Quadrant.inl
 include/geos/geom/Triangle.h
 include/geos/geom/prep/AbstractPreparedPolygonContains.h
 include/geos/geom/prep/BasicPreparedGeometry.h
 include/geos/geom/prep/PreparedGeometry.h
 include/geos/geom/prep/PreparedGeometryFactory.h
 include/geos/geom/prep/PreparedLineString.h
+include/geos/geom/prep/PreparedLineStringDistance.h
 include/geos/geom/prep/PreparedLineStringIntersects.h
+include/geos/geom/prep/PreparedLineStringNearestPoints.h
 include/geos/geom/prep/PreparedPoint.h
 include/geos/geom/prep/PreparedPolygon.h
 include/geos/geom/prep/PreparedPolygonContains.h
 include/geos/geom/prep/PreparedPolygonContainsProperly.h
 include/geos/geom/prep/PreparedPolygonCovers.h
+include/geos/geom/prep/PreparedPolygonDistance.h
 include/geos/geom/prep/PreparedPolygonIntersects.h
 include/geos/geom/prep/PreparedPolygonPredicate.h
 include/geos/geom/util/ComponentCoordinateExtracter.h
@@ -115,8 +113,6 @@ include/geos/geom/util/PointExtracter.h
 include/geos/geom/util/PolygonExtracter.h
 include/geos/geom/util/ShortCircuitedGeometryVisitor.h
 include/geos/geom/util/SineStarFactory.h
-include/geos/geomUtil.h
-include/geos/geomgraph.h
 include/geos/geomgraph/Depth.h
 include/geos/geomgraph/Depth.inl
 include/geos/geomgraph/DirectedEdge.h
@@ -139,9 +135,6 @@ include/geos/geomgraph/Node.h
 include/geos/geomgraph/NodeFactory.h
 include/geos/geomgraph/NodeMap.h
 include/geos/geomgraph/PlanarGraph.h
-include/geos/geomgraph/Position.h
-include/geos/geomgraph/Quadrant.h
-include/geos/geomgraph/Quadrant.inl
 include/geos/geomgraph/TopologyLocation.h
 include/geos/geomgraph/TopologyLocation.inl
 include/geos/geomgraph/index/EdgeSetIntersector.h
@@ -156,8 +149,6 @@ include/geos/geomgraph/index/SimpleSweep
 include/geos/geomgraph/index/SweepLineEvent.h
 include/geos/geomgraph/index/SweepLineEventObj.h
 include/geos/geomgraph/index/SweepLineSegment.h
-include/geos/geomgraphindex.h
-include/geos/geosAlgorithm.h
 include/geos/index/ItemVisitor.h
 include/geos/index/SpatialIndex.h
 include/geos/index/bintree/Bintree.h
@@ -174,7 +165,9 @@ include/geos/index/intervalrtree/Interva
 include/geos/index/intervalrtree/IntervalRTreeLeafNode.h
 include/geos/index/intervalrtree/IntervalRTreeNode.h
 include/geos/index/intervalrtree/SortedPackedIntervalRTree.h
-include/geos/index/quadtree/DoubleBits.h
+include/geos/index/kdtree/KdNode.h
+include/geos/index/kdtree/KdNodeVisitor.h
+include/geos/index/kdtree/KdTree.h
 include/geos/index/quadtree/IntervalSize.h
 include/geos/index/quadtree/Key.h
 include/geos/index/quadtree/Node.h
@@ -192,17 +185,14 @@ include/geos/index/strtree/ItemBoundable
 include/geos/index/strtree/ItemDistance.h
 include/geos/index/strtree/SIRtree.h
 include/geos/index/strtree/STRtree.h
+include/geos/index/strtree/SimpleSTRdistance.h
+include/geos/index/strtree/SimpleSTRnode.h
+include/geos/index/strtree/SimpleSTRtree.h
 include/geos/index/sweepline/SweepLineEvent.h
 include/geos/index/sweepline/SweepLineIndex.h
 include/geos/index/sweepline/SweepLineInterval.h
 include/geos/index/sweepline/SweepLineOverlapAction.h
-include/geos/indexBintree.h
-include/geos/indexChain.h
-include/geos/indexQuadtree.h
-include/geos/indexStrtree.h
-include/geos/indexSweepline.h
 include/geos/inline.h
-include/geos/io.h
 include/geos/io/ByteOrderDataInStream.h
 include/geos/io/ByteOrderDataInStream.inl
 include/geos/io/ByteOrderValues.h
@@ -226,7 +216,8 @@ include/geos/linearref/LinearLocation.h
 include/geos/linearref/LocationIndexOfLine.h
 include/geos/linearref/LocationIndexOfPoint.h
 include/geos/linearref/LocationIndexedLine.h
-include/geos/noding.h
+include/geos/math/DD.h
+include/geos/namespaces.h
 include/geos/noding/BasicSegmentString.h
 include/geos/noding/BasicSegmentString.inl
 include/geos/noding/FastNodingValidator.h
@@ -256,21 +247,17 @@ include/geos/noding/SegmentString.h
 include/geos/noding/SegmentStringUtil.h
 include/geos/noding/SimpleNoder.h
 include/geos/noding/SinglePassNoder.h
+include/geos/noding/ValidatingNoder.h
+include/geos/noding/snap/SnappingIntersectionAdder.h
+include/geos/noding/snap/SnappingNoder.h
+include/geos/noding/snap/SnappingPointIndex.h
 include/geos/noding/snapround/HotPixel.h
 include/geos/noding/snapround/HotPixel.inl
+include/geos/noding/snapround/HotPixelIndex.h
 include/geos/noding/snapround/MCIndexPointSnapper.h
 include/geos/noding/snapround/MCIndexSnapRounder.h
-include/geos/noding/snapround/SimpleSnapRounder.h
-include/geos/nodingSnapround.h
-include/geos/opBuffer.h
-include/geos/opDistance.h
-include/geos/opLinemerge.h
-include/geos/opOverlay.h
-include/geos/opPolygonize.h
-include/geos/opPredicate.h
-include/geos/opRelate.h
-include/geos/opValid.h
-include/geos/operation.h
+include/geos/noding/snapround/SnapRoundingIntersectionAdder.h
+include/geos/noding/snapround/SnapRoundingNoder.h
 include/geos/operation/GeometryGraphOperation.h
 include/geos/operation/IsSimpleOp.h
 include/geos/operation/buffer/BufferBuilder.h
@@ -318,6 +305,34 @@ include/geos/operation/overlay/snap/Geom
 include/geos/operation/overlay/snap/LineStringSnapper.h
 include/geos/operation/overlay/snap/SnapIfNeededOverlayOp.h
 include/geos/operation/overlay/snap/SnapOverlayOp.h
+include/geos/operation/overlayng/Edge.h
+include/geos/operation/overlayng/EdgeKey.h
+include/geos/operation/overlayng/EdgeMerger.h
+include/geos/operation/overlayng/EdgeNodingBuilder.h
+include/geos/operation/overlayng/EdgeSourceInfo.h
+include/geos/operation/overlayng/ElevationModel.h
+include/geos/operation/overlayng/IndexedPointOnLineLocator.h
+include/geos/operation/overlayng/InputGeometry.h
+include/geos/operation/overlayng/IntersectionPointBuilder.h
+include/geos/operation/overlayng/LineBuilder.h
+include/geos/operation/overlayng/LineLimiter.h
+include/geos/operation/overlayng/MaximalEdgeRing.h
+include/geos/operation/overlayng/OverlayEdge.h
+include/geos/operation/overlayng/OverlayEdgeRing.h
+include/geos/operation/overlayng/OverlayGraph.h
+include/geos/operation/overlayng/OverlayLabel.h
+include/geos/operation/overlayng/OverlayLabeller.h
+include/geos/operation/overlayng/OverlayMixedPoints.h
+include/geos/operation/overlayng/OverlayNG.h
+include/geos/operation/overlayng/OverlayNGRobust.h
+include/geos/operation/overlayng/OverlayPoints.h
+include/geos/operation/overlayng/OverlayUtil.h
+include/geos/operation/overlayng/PolygonBuilder.h
+include/geos/operation/overlayng/PrecisionReducer.h
+include/geos/operation/overlayng/PrecisionUtil.h
+include/geos/operation/overlayng/RingClipper.h
+include/geos/operation/overlayng/RobustClipEnvelopeComputer.h
+include/geos/operation/overlayng/UnaryUnionNG.h
 include/geos/operation/polygonize/BuildArea.h
 include/geos/operation/polygonize/EdgeRing.h
 include/geos/operation/polygonize/HoleAssigner.h
@@ -344,8 +359,10 @@ include/geos/operation/union/GeometryLis
 include/geos/operation/union/OverlapUnion.h
 include/geos/operation/union/PointGeometryUnion.h
 include/geos/operation/union/UnaryUnionOp.h
+include/geos/operation/union/UnionStrategy.h
 include/geos/operation/valid/ConnectedInteriorTester.h
 include/geos/operation/valid/ConsistentAreaTester.h
+include/geos/operation/valid/IndexedNestedShellTester.h
 include/geos/operation/valid/IsValidOp.h
 include/geos/operation/valid/MakeValid.h
 include/geos/operation/valid/QuadtreeNestedRingTester.h
@@ -354,7 +371,6 @@ include/geos/operation/valid/RepeatedPoi
 include/geos/operation/valid/SimpleNestedRingTester.h
 include/geos/operation/valid/SweeplineNestedRingTester.h
 include/geos/operation/valid/TopologyValidationError.h
-include/geos/planargraph.h
 include/geos/planargraph/DirectedEdge.h
 include/geos/planargraph/DirectedEdgeStar.h
 include/geos/planargraph/Edge.h
@@ -364,7 +380,6 @@ include/geos/planargraph/NodeMap.h
 include/geos/planargraph/PlanarGraph.h
 include/geos/planargraph/Subgraph.h
 include/geos/planargraph/algorithm/ConnectedSubgraphFinder.h
-include/geos/precision.h
 include/geos/precision/CommonBits.h
 include/geos/precision/CommonBitsOp.h
 include/geos/precision/CommonBitsRemover.h
@@ -374,6 +389,9 @@ include/geos/precision/MinimumClearance.
 include/geos/precision/PrecisionReducerCoordinateOperation.h
 include/geos/precision/SimpleGeometryPrecisionReducer.h
 include/geos/profiler.h
+include/geos/shape/fractal/HilbertCode.h
+include/geos/shape/fractal/HilbertEncoder.h
+include/geos/shape/fractal/MortonCode.h
 include/geos/simplify/DouglasPeuckerLineSimplifier.h
 include/geos/simplify/DouglasPeuckerSimplifier.h
 include/geos/simplify/LineSegmentIndex.h
@@ -382,7 +400,6 @@ include/geos/simplify/TaggedLineString.h
 include/geos/simplify/TaggedLineStringSimplifier.h
 include/geos/simplify/TaggedLinesSimplifier.h
 include/geos/simplify/TopologyPreservingSimplifier.h
-include/geos/spatialIndex.h
 include/geos/triangulate/DelaunayTriangulationBuilder.h
 include/geos/triangulate/IncrementalDelaunayTriangulator.h
 include/geos/triangulate/VoronoiDiagramBuilder.h
@@ -390,6 +407,7 @@ include/geos/triangulate/quadedge/LastFo
 include/geos/triangulate/quadedge/LocateFailureException.h
 include/geos/triangulate/quadedge/QuadEdge.h
 include/geos/triangulate/quadedge/QuadEdgeLocator.h
+include/geos/triangulate/quadedge/QuadEdgeQuartet.h
 include/geos/triangulate/quadedge/QuadEdgeSubdivision.h
 include/geos/triangulate/quadedge/TrianglePredicate.h
 include/geos/triangulate/quadedge/TriangleVisitor.h
@@ -413,3 +431,4 @@ include/geos/version.h
 include/geos_c.h
 lib/libgeos.la
 lib/libgeos_c.la
+lib/pkgconfig/geos.pc

Index: pkgsrc/geography/geos/distinfo
diff -u pkgsrc/geography/geos/distinfo:1.34 pkgsrc/geography/geos/distinfo:1.35
--- pkgsrc/geography/geos/distinfo:1.34 Wed Mar 11 23:09:09 2020
+++ pkgsrc/geography/geos/distinfo      Sun Jan  3 01:27:29 2021
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.34 2020/03/11 23:09:09 gdt Exp $
+$NetBSD: distinfo,v 1.35 2021/01/03 01:27:29 gdt Exp $
 
-SHA1 (geos-3.8.1.tar.bz2) = dbd165752dd4c48d81a84aa51c99d04410d96c67
-RMD160 (geos-3.8.1.tar.bz2) = 16b9b4dba1c772c561bace8e3e7c514f78fd4037
-SHA512 (geos-3.8.1.tar.bz2) = 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
-Size (geos-3.8.1.tar.bz2) = 2505407 bytes
-SHA1 (patch-ae) = d566a7cc7fdbb29cb7f39d6e0e4adf525213f62c
-SHA1 (patch-capi_geos__ts__c.cpp) = af53a9eec1bc97bff34a7a32c003fa34c0d2ba43
+SHA1 (geos-3.9.0.tar.bz2) = 96fbbd6c8a44c0c9230e4c2daf70547a2a86abc0
+RMD160 (geos-3.9.0.tar.bz2) = f6bf886c240bc6d7fff6adb9d0fd10d00e02f915
+SHA512 (geos-3.9.0.tar.bz2) = 1081f2aa20e671450953f7bb53b17c703804a1c9f4987c9da0987ff24339af5811b2c8b79c8e438d04ca38e4d06164dc5a4206f266f7efc19af3f9d9ea8f71f8
+Size (geos-3.9.0.tar.bz2) = 4710957 bytes
+SHA1 (patch-ae) = 6e01fc79b51f29e2edd0d5d7f4875227bc3f2574

Index: pkgsrc/geography/geos/patches/patch-ae
diff -u pkgsrc/geography/geos/patches/patch-ae:1.7 pkgsrc/geography/geos/patches/patch-ae:1.8
--- pkgsrc/geography/geos/patches/patch-ae:1.7  Wed Mar 11 12:52:07 2020
+++ pkgsrc/geography/geos/patches/patch-ae      Sun Jan  3 01:27:29 2021
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.7 2020/03/11 12:52:07 gdt Exp $
+$NetBSD: patch-ae,v 1.8 2021/01/03 01:27: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  2019-10-03 17:32:04.000000000 +0000
+--- tools/geos-config.in.orig  2020-07-21 18:07:17.000000000 +0000
 +++ tools/geos-config.in
-@@ -58,7 +58,7 @@ case $1 in
-       echo -L@libdir@ -lgeos -lm
+@@ -67,7 +67,7 @@ while test $# -gt 0; do
+       echo -I${prefix}/include
        ;;
      --ldflags)
--      echo -L@libdir@
-+      echo -L@libdir@ @LDFLAGS@
+-      echo -L${libdir}
++      echo -L${libdir} @LDFLAGS@
        ;;
      --includes)
-       echo @prefix@/include
+       echo ${prefix}/include