diff options
Diffstat (limited to 'geography/geos')
-rw-r--r-- | geography/geos/Makefile | 22 | ||||
-rw-r--r-- | geography/geos/PLIST | 70 | ||||
-rw-r--r-- | geography/geos/distinfo | 10 | ||||
-rw-r--r-- | geography/geos/patches/patch-ae | 10 |
4 files changed, 82 insertions, 30 deletions
diff --git a/geography/geos/Makefile b/geography/geos/Makefile index 9488ea2abcc..752d8e23653 100644 --- a/geography/geos/Makefile +++ b/geography/geos/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.37 2021/02/11 13:56:46 gdt Exp $ +# $NetBSD: Makefile,v 1.38 2021/10/21 00:25:16 gdt Exp $ -DISTNAME= geos-3.9.1 +DISTNAME= geos-3.10.0 CATEGORIES= geography MASTER_SITES= http://download.osgeo.org/geos/ EXTRACT_SUFX= .tar.bz2 @@ -33,10 +33,22 @@ COMMENT= C++ port of the Java Topology Suite (JTS) LICENSE= gnu-lgpl-v2.1 USE_LANGUAGES= c c++11 -USE_LIBTOOL= yes -USE_PKGLOCALEDIR= yes -GNU_CONFIGURE= yes +USE_CMAKE= yes +#PKG_DEBUG_LEVEL?= 1 +# cmake hides what it is doing; ask it to be like traditional builds. +MAKE_FLAGS+= VERBOSE=1 + +# Note that the new geos cmake build system is broken and misorders +# RPATH for tests, leading to testing the installed geos instead of +# the built geos. Reported upstream via email 202110, and probably +# it's a cmake bug. TEST_TARGET= check +# pthreads are used in tests only, to validate that the thread-safe +# API to geos, which is not threaded, works. In that API, callers +# provide context so that the library does not use internal state. +# For now, leave it out on the theory that it's found anyway, +# optimizing for the package not the tests. +#.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/geography/geos/PLIST b/geography/geos/PLIST index 2f53decc5b5..a39c975eaf0 100644 --- a/geography/geos/PLIST +++ b/geography/geos/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.17 2021/01/03 01:27:29 gdt Exp $ +@comment $NetBSD: PLIST,v 1.18 2021/10/21 00:25:16 gdt Exp $ bin/geos-config -include/geos.h +bin/geosop include/geos/algorithm/Angle.h include/geos/algorithm/Area.h include/geos/algorithm/BoundaryNodeRule.h include/geos/algorithm/CGAlgorithmsDD.h +include/geos/algorithm/CGAlgorithmsDD.inl include/geos/algorithm/CentralEndpointIntersector.h include/geos/algorithm/Centroid.h include/geos/algorithm/ConvexHull.h @@ -17,15 +18,18 @@ include/geos/algorithm/InteriorPointPoint.h include/geos/algorithm/Intersection.h include/geos/algorithm/Length.h include/geos/algorithm/LineIntersector.h +include/geos/algorithm/LineIntersector.inl include/geos/algorithm/MinimumBoundingCircle.h include/geos/algorithm/MinimumDiameter.h include/geos/algorithm/NotRepresentableException.h include/geos/algorithm/Orientation.h +include/geos/algorithm/PointInRing.h include/geos/algorithm/PointLocation.h include/geos/algorithm/PointLocator.h include/geos/algorithm/RayCrossingCounter.h include/geos/algorithm/RayCrossingCounterDD.h include/geos/algorithm/RobustDeterminant.h +include/geos/algorithm/SimplePointInRing.h include/geos/algorithm/construct/LargestEmptyCircle.h include/geos/algorithm/construct/MaximumInscribedCircle.h include/geos/algorithm/distance/DiscreteFrechetDistance.h @@ -107,8 +111,10 @@ include/geos/geom/util/GeometryCombiner.h include/geos/geom/util/GeometryEditor.h include/geos/geom/util/GeometryEditorOperation.h include/geos/geom/util/GeometryExtracter.h +include/geos/geom/util/GeometryFixer.h include/geos/geom/util/GeometryTransformer.h include/geos/geom/util/LinearComponentExtracter.h +include/geos/geom/util/NoOpGeometryOperation.h include/geos/geom/util/PointExtracter.h include/geos/geom/util/PolygonExtracter.h include/geos/geom/util/ShortCircuitedGeometryVisitor.h @@ -188,6 +194,10 @@ 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/strtree/TemplateSTRNode.h +include/geos/index/strtree/TemplateSTRNodePair.h +include/geos/index/strtree/TemplateSTRtree.h +include/geos/index/strtree/TemplateSTRtreeDistance.h include/geos/index/sweepline/SweepLineEvent.h include/geos/index/sweepline/SweepLineIndex.h include/geos/index/sweepline/SweepLineInterval.h @@ -197,6 +207,9 @@ include/geos/io/ByteOrderDataInStream.h include/geos/io/ByteOrderDataInStream.inl include/geos/io/ByteOrderValues.h include/geos/io/CLocalizer.h +include/geos/io/GeoJSON.h +include/geos/io/GeoJSONReader.h +include/geos/io/GeoJSONWriter.h include/geos/io/ParseException.h include/geos/io/StringTokenizer.h include/geos/io/WKBConstants.h @@ -231,8 +244,10 @@ include/geos/noding/MCIndexNoder.inl include/geos/noding/MCIndexSegmentSetMutualIntersector.h include/geos/noding/NodableSegmentString.h include/geos/noding/NodedSegmentString.h +include/geos/noding/NodedSegmentString.inl include/geos/noding/Noder.h include/geos/noding/NodingIntersectionFinder.h +include/geos/noding/NodingIntersectionFinder.inl include/geos/noding/NodingValidator.h include/geos/noding/Octant.h include/geos/noding/OrientedCoordinateArray.h @@ -240,6 +255,7 @@ include/geos/noding/ScaledNoder.h include/geos/noding/SegmentIntersectionDetector.h include/geos/noding/SegmentIntersector.h include/geos/noding/SegmentNode.h +include/geos/noding/SegmentNode.inl include/geos/noding/SegmentNodeList.h include/geos/noding/SegmentPointComparator.h include/geos/noding/SegmentSetMutualIntersector.h @@ -259,7 +275,6 @@ include/geos/noding/snapround/MCIndexSnapRounder.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 include/geos/operation/buffer/BufferInputLineSimplifier.h include/geos/operation/buffer/BufferOp.h @@ -290,23 +305,24 @@ include/geos/operation/linemerge/LineSequencer.h include/geos/operation/overlay/EdgeSetNoder.h include/geos/operation/overlay/ElevationMatrix.h include/geos/operation/overlay/ElevationMatrixCell.h -include/geos/operation/overlay/FuzzyPointLocator.h include/geos/operation/overlay/LineBuilder.h include/geos/operation/overlay/MaximalEdgeRing.h include/geos/operation/overlay/MinimalEdgeRing.h include/geos/operation/overlay/MinimalEdgeRing.inl -include/geos/operation/overlay/OffsetPointGenerator.h include/geos/operation/overlay/OverlayNodeFactory.h include/geos/operation/overlay/OverlayOp.h -include/geos/operation/overlay/OverlayResultValidator.h include/geos/operation/overlay/PointBuilder.h include/geos/operation/overlay/PolygonBuilder.h include/geos/operation/overlay/snap/GeometrySnapper.h include/geos/operation/overlay/snap/LineStringSnapper.h -include/geos/operation/overlay/snap/SnapIfNeededOverlayOp.h include/geos/operation/overlay/snap/SnapOverlayOp.h +include/geos/operation/overlay/validate/FuzzyPointLocator.h +include/geos/operation/overlay/validate/OffsetPointGenerator.h +include/geos/operation/overlay/validate/OverlayResultValidator.h include/geos/operation/overlayng/Edge.h +include/geos/operation/overlayng/Edge.inl include/geos/operation/overlayng/EdgeKey.h +include/geos/operation/overlayng/EdgeKey.inl include/geos/operation/overlayng/EdgeMerger.h include/geos/operation/overlayng/EdgeNodingBuilder.h include/geos/operation/overlayng/EdgeSourceInfo.h @@ -318,9 +334,11 @@ 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/OverlayEdge.inl include/geos/operation/overlayng/OverlayEdgeRing.h include/geos/operation/overlayng/OverlayGraph.h include/geos/operation/overlayng/OverlayLabel.h +include/geos/operation/overlayng/OverlayLabel.inl include/geos/operation/overlayng/OverlayLabeller.h include/geos/operation/overlayng/OverlayMixedPoints.h include/geos/operation/overlayng/OverlayNG.h @@ -353,23 +371,26 @@ include/geos/operation/relate/RelateNodeGraph.h include/geos/operation/relate/RelateOp.h include/geos/operation/sharedpaths/SharedPathsOp.h include/geos/operation/union/CascadedPolygonUnion.h -include/geos/operation/union/CascadedUnion.h include/geos/operation/union/CoverageUnion.h -include/geos/operation/union/GeometryListHolder.h 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/IndexedNestedHoleTester.h +include/geos/operation/valid/IndexedNestedPolygonTester.h +include/geos/operation/valid/IsSimpleOp.h include/geos/operation/valid/IsValidOp.h include/geos/operation/valid/MakeValid.h -include/geos/operation/valid/QuadtreeNestedRingTester.h +include/geos/operation/valid/PolygonIntersectionAnalyzer.h +include/geos/operation/valid/PolygonNode.h +include/geos/operation/valid/PolygonRing.h +include/geos/operation/valid/PolygonRingSelfNode.h +include/geos/operation/valid/PolygonRingTouch.h +include/geos/operation/valid/PolygonTopologyAnalyzer.h include/geos/operation/valid/RepeatedPointRemover.h include/geos/operation/valid/RepeatedPointTester.h -include/geos/operation/valid/SimpleNestedRingTester.h -include/geos/operation/valid/SweeplineNestedRingTester.h include/geos/operation/valid/TopologyValidationError.h include/geos/planargraph/DirectedEdge.h include/geos/planargraph/DirectedEdgeStar.h @@ -386,7 +407,9 @@ include/geos/precision/CommonBitsRemover.h include/geos/precision/EnhancedPrecisionOp.h include/geos/precision/GeometryPrecisionReducer.h include/geos/precision/MinimumClearance.h +include/geos/precision/PointwisePrecisionReducerTransformer.h include/geos/precision/PrecisionReducerCoordinateOperation.h +include/geos/precision/PrecisionReducerTransformer.h include/geos/precision/SimpleGeometryPrecisionReducer.h include/geos/profiler.h include/geos/shape/fractal/HilbertCode.h @@ -403,6 +426,12 @@ include/geos/simplify/TopologyPreservingSimplifier.h include/geos/triangulate/DelaunayTriangulationBuilder.h include/geos/triangulate/IncrementalDelaunayTriangulator.h include/geos/triangulate/VoronoiDiagramBuilder.h +include/geos/triangulate/polygon/ConstrainedDelaunayTriangulator.h +include/geos/triangulate/polygon/PolygonEarClipper.h +include/geos/triangulate/polygon/PolygonHoleJoiner.h +include/geos/triangulate/polygon/PolygonTriangulator.h +include/geos/triangulate/polygon/TriDelaunayImprover.h +include/geos/triangulate/polygon/VertexSequencePackedRtree.h include/geos/triangulate/quadedge/LastFoundQuadEdgeLocator.h include/geos/triangulate/quadedge/LocateFailureException.h include/geos/triangulate/quadedge/QuadEdge.h @@ -412,6 +441,10 @@ include/geos/triangulate/quadedge/QuadEdgeSubdivision.h include/geos/triangulate/quadedge/TrianglePredicate.h include/geos/triangulate/quadedge/TriangleVisitor.h include/geos/triangulate/quadedge/Vertex.h +include/geos/triangulate/tri/Tri.h +include/geos/triangulate/tri/TriEdge.h +include/geos/triangulate/tri/TriList.h +include/geos/triangulate/tri/TriangulationBuilder.h include/geos/unload.h include/geos/util.h include/geos/util/Assert.h @@ -429,6 +462,13 @@ include/geos/util/UnsupportedOperationException.h include/geos/util/math.h include/geos/version.h include/geos_c.h -lib/libgeos.la -lib/libgeos_c.la +lib/cmake/GEOS/geos-config-version.cmake +lib/cmake/GEOS/geos-config.cmake +lib/cmake/GEOS/geos-targets-release.cmake +lib/cmake/GEOS/geos-targets.cmake +lib/libgeos.so +lib/libgeos.so.3.10.0 +lib/libgeos_c.so +lib/libgeos_c.so.1 +lib/libgeos_c.so.1.16.0 lib/pkgconfig/geos.pc diff --git a/geography/geos/distinfo b/geography/geos/distinfo index 35b5b04b033..aa78668d16a 100644 --- a/geography/geos/distinfo +++ b/geography/geos/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.37 2021/10/07 14:09:24 nia Exp $ +$NetBSD: distinfo,v 1.38 2021/10/21 00:25:16 gdt Exp $ -RMD160 (geos-3.9.1.tar.bz2) = 490ed975d9918133788040c47c96f32b7812bdef -SHA512 (geos-3.9.1.tar.bz2) = 7ea131685cd110ec5e0cb7c214b52b75397371e75f011e1410b6770b6a48ca492a02337d86a7be35c852ef94604fe9d6f49634c79d4946df611aaa4f5cbaee28 -Size (geos-3.9.1.tar.bz2) = 4761372 bytes -SHA1 (patch-ae) = 6e01fc79b51f29e2edd0d5d7f4875227bc3f2574 +RMD160 (geos-3.10.0.tar.bz2) = f4aa787df96c2591ab9bf44f33b4107fafad29b6 +SHA512 (geos-3.10.0.tar.bz2) = 12657c6649bfbf6efa3232a054969c6229bb23fc16a7c72d6ca5fdb662e0d08e14bbcaa6944a17de8972b6c236608d94c870ead0b04fada2d2af3d42c238058e +Size (geos-3.10.0.tar.bz2) = 6799370 bytes +SHA1 (patch-ae) = 253ae5cf5c2705a80d89d996507e3e94f2a11296 diff --git a/geography/geos/patches/patch-ae b/geography/geos/patches/patch-ae index 278e6c4d792..79cb1eb1d88 100644 --- a/geography/geos/patches/patch-ae +++ b/geography/geos/patches/patch-ae @@ -1,17 +1,17 @@ -$NetBSD: patch-ae,v 1.8 2021/01/03 01:27:29 gdt Exp $ +$NetBSD: patch-ae,v 1.9 2021/10/21 00:25:16 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 2020-07-21 18:07:17.000000000 +0000 +--- tools/geos-config.in.orig 2021-09-30 20:14:04.000000000 +0000 +++ tools/geos-config.in -@@ -67,7 +67,7 @@ while test $# -gt 0; do - echo -I${prefix}/include +@@ -62,7 +62,7 @@ while test $# -gt 0; do + echo -I${includedir} ;; --ldflags) - echo -L${libdir} + echo -L${libdir} @LDFLAGS@ ;; --includes) - echo ${prefix}/include + echo ${includedir} |