diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile index d9c06b7182088..f93d7518989cb 100644 --- a/graphics/geos/Makefile +++ b/graphics/geos/Makefile @@ -1,10 +1,10 @@ # Created by: Leonardo Martins PORTNAME= geos -PORTVERSION= 3.10.3 +PORTVERSION= 3.11.0 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/geos/ \ - LOCAL/sunpoet + https://github.com/libgeos/geos/releases/download/${PORTVERSION}/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Geometry Engine, Open Source diff --git a/graphics/geos/distinfo b/graphics/geos/distinfo index f6dad5fc8600f..9c0c263e18219 100644 --- a/graphics/geos/distinfo +++ b/graphics/geos/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1654708318 -SHA256 (geos-3.10.3.tar.bz2) = 3c141b07d61958a758345d5f54e3c735834b2f4303edb9f67fb26914f0d44770 -SIZE (geos-3.10.3.tar.bz2) = 6720568 +TIMESTAMP = 1656702476 +SHA256 (geos-3.11.0.tar.bz2) = 79ab8cabf4aa8604d161557b52e3e4d84575acdc0d08cb09ab3f7aaefa4d858a +SIZE (geos-3.11.0.tar.bz2) = 6727294 diff --git a/graphics/geos/pkg-plist b/graphics/geos/pkg-plist index bab77fa5a51a9..59145169ee998 100644 --- a/graphics/geos/pkg-plist +++ b/graphics/geos/pkg-plist @@ -1,14 +1,13 @@ bin/geos-config bin/geosop +include/geos.h 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 -include/geos/algorithm/ConvexHull.inl include/geos/algorithm/Distance.h include/geos/algorithm/HCoordinate.h include/geos/algorithm/InteriorPointArea.h @@ -17,7 +16,6 @@ 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 @@ -35,6 +33,10 @@ include/geos/algorithm/distance/DiscreteFrechetDistance.h include/geos/algorithm/distance/DiscreteHausdorffDistance.h include/geos/algorithm/distance/DistanceToPoint.h include/geos/algorithm/distance/PointPairDistance.h +include/geos/algorithm/hull/ConcaveHull.h +include/geos/algorithm/hull/ConcaveHullOfPolygons.h +include/geos/algorithm/hull/HullTri.h +include/geos/algorithm/hull/HullTriangulation.h include/geos/algorithm/locate/IndexedPointInAreaLocator.h include/geos/algorithm/locate/PointOnGeometryLocator.h include/geos/algorithm/locate/SimplePointInAreaLocator.h @@ -46,10 +48,8 @@ include/geos/edgegraph/MarkHalfEdge.h include/geos/export.h include/geos/geom.h include/geos/geom/Coordinate.h -include/geos/geom/Coordinate.inl include/geos/geom/CoordinateArraySequence.h include/geos/geom/CoordinateArraySequenceFactory.h -include/geos/geom/CoordinateArraySequenceFactory.inl include/geos/geom/CoordinateFilter.h include/geos/geom/CoordinateList.h include/geos/geom/CoordinateSequence.h @@ -58,34 +58,26 @@ include/geos/geom/CoordinateSequenceFilter.h include/geos/geom/DefaultCoordinateSequenceFactory.h include/geos/geom/Dimension.h include/geos/geom/Envelope.h -include/geos/geom/Envelope.inl include/geos/geom/FixedSizeCoordinateSequence.h include/geos/geom/Geometry.h include/geos/geom/GeometryCollection.h -include/geos/geom/GeometryCollection.inl include/geos/geom/GeometryComponentFilter.h 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 include/geos/geom/LineString.h include/geos/geom/LinearRing.h include/geos/geom/Location.h include/geos/geom/MultiLineString.h -include/geos/geom/MultiLineString.inl include/geos/geom/MultiPoint.h 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 @@ -111,6 +103,7 @@ 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/GeometryMapper.h include/geos/geom/util/GeometryTransformer.h include/geos/geom/util/LinearComponentExtracter.h include/geos/geom/util/NoOpGeometryOperation.h @@ -119,9 +112,7 @@ include/geos/geom/util/PolygonExtracter.h include/geos/geom/util/ShortCircuitedGeometryVisitor.h include/geos/geom/util/SineStarFactory.h include/geos/geomgraph/Depth.h -include/geos/geomgraph/Depth.inl include/geos/geomgraph/DirectedEdge.h -include/geos/geomgraph/DirectedEdge.inl include/geos/geomgraph/DirectedEdgeStar.h include/geos/geomgraph/Edge.h include/geos/geomgraph/EdgeEnd.h @@ -132,22 +123,18 @@ include/geos/geomgraph/EdgeList.h include/geos/geomgraph/EdgeNodingValidator.h include/geos/geomgraph/EdgeRing.h include/geos/geomgraph/GeometryGraph.h -include/geos/geomgraph/GeometryGraph.inl include/geos/geomgraph/GraphComponent.h include/geos/geomgraph/Label.h -include/geos/geomgraph/Label.inl include/geos/geomgraph/Node.h include/geos/geomgraph/NodeFactory.h include/geos/geomgraph/NodeMap.h include/geos/geomgraph/PlanarGraph.h include/geos/geomgraph/TopologyLocation.h -include/geos/geomgraph/TopologyLocation.inl include/geos/geomgraph/index/EdgeSetIntersector.h include/geos/geomgraph/index/MonotoneChain.h include/geos/geomgraph/index/MonotoneChainEdge.h include/geos/geomgraph/index/MonotoneChainIndexer.h include/geos/geomgraph/index/SegmentIntersector.h -include/geos/geomgraph/index/SegmentIntersector.inl include/geos/geomgraph/index/SimpleEdgeSetIntersector.h include/geos/geomgraph/index/SimpleMCSweepLineIntersector.h include/geos/geomgraph/index/SimpleSweepLineIntersector.h @@ -156,6 +143,7 @@ include/geos/geomgraph/index/SweepLineEventObj.h include/geos/geomgraph/index/SweepLineSegment.h include/geos/index/ItemVisitor.h include/geos/index/SpatialIndex.h +include/geos/index/VertexSequencePackedRtree.h include/geos/index/bintree/Bintree.h include/geos/index/bintree/Interval.h include/geos/index/bintree/Key.h @@ -201,9 +189,7 @@ 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/inline.h 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 @@ -215,7 +201,6 @@ include/geos/io/WKBConstants.h include/geos/io/WKBReader.h include/geos/io/WKBWriter.h include/geos/io/WKTReader.h -include/geos/io/WKTReader.inl include/geos/io/WKTWriter.h include/geos/io/Writer.h include/geos/linearref/ExtractLineByLocation.h @@ -231,7 +216,6 @@ include/geos/linearref/LocationIndexedLine.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 include/geos/noding/FastSegmentSetIntersectionFinder.h include/geos/noding/GeometryNoder.h @@ -239,22 +223,19 @@ include/geos/noding/IntersectionAdder.h include/geos/noding/IntersectionFinderAdder.h include/geos/noding/IteratedNoder.h include/geos/noding/MCIndexNoder.h -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 include/geos/noding/ScaledNoder.h +include/geos/noding/SegmentExtractingNoder.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 @@ -267,7 +248,6 @@ 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 @@ -275,15 +255,17 @@ include/geos/noding/snapround/SnapRoundingIntersectionAdder.h include/geos/noding/snapround/SnapRoundingNoder.h include/geos/operation/GeometryGraphOperation.h include/geos/operation/buffer/BufferBuilder.h +include/geos/operation/buffer/BufferCurveSetBuilder.h include/geos/operation/buffer/BufferInputLineSimplifier.h include/geos/operation/buffer/BufferOp.h include/geos/operation/buffer/BufferParameters.h include/geos/operation/buffer/BufferSubgraph.h +include/geos/operation/buffer/OffsetCurve.h include/geos/operation/buffer/OffsetCurveBuilder.h -include/geos/operation/buffer/OffsetCurveSetBuilder.h include/geos/operation/buffer/OffsetSegmentGenerator.h include/geos/operation/buffer/OffsetSegmentString.h include/geos/operation/buffer/RightmostEdgeFinder.h +include/geos/operation/buffer/SegmentMCIndex.h include/geos/operation/buffer/SubgraphDepthLocater.h include/geos/operation/distance/ConnectedElementLocationFilter.h include/geos/operation/distance/ConnectedElementPointFilter.h @@ -307,7 +289,6 @@ include/geos/operation/overlay/ElevationMatrixCell.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/OverlayNodeFactory.h include/geos/operation/overlay/OverlayOp.h include/geos/operation/overlay/PointBuilder.h @@ -318,10 +299,9 @@ 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/CoverageUnion.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 @@ -333,11 +313,9 @@ 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 @@ -375,7 +353,6 @@ 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/IndexedNestedHoleTester.h include/geos/operation/valid/IndexedNestedPolygonTester.h @@ -417,6 +394,10 @@ include/geos/shape/fractal/MortonCode.h include/geos/simplify/DouglasPeuckerLineSimplifier.h include/geos/simplify/DouglasPeuckerSimplifier.h include/geos/simplify/LineSegmentIndex.h +include/geos/simplify/LinkedRing.h +include/geos/simplify/PolygonHullSimplifier.h +include/geos/simplify/RingHull.h +include/geos/simplify/RingHullIndex.h include/geos/simplify/TaggedLineSegment.h include/geos/simplify/TaggedLineString.h include/geos/simplify/TaggedLineStringSimplifier.h @@ -430,7 +411,6 @@ 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 @@ -471,5 +451,5 @@ lib/libgeos.so lib/libgeos.so.%%PORTVERSION%% lib/libgeos_c.so lib/libgeos_c.so.1 -lib/libgeos_c.so.1.16.1 +lib/libgeos_c.so.1.17.0 libdata/pkgconfig/geos.pc