ports/158263: [UPDATE] graphics/geos: update from 3.2.2 to 3.3.0
Rainer Hurling
rhurlin at gwdg.de
Fri Jun 24 16:10:11 UTC 2011
>Number: 158263
>Category: ports
>Synopsis: [UPDATE] graphics/geos: update from 3.2.2 to 3.3.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 24 16:10:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Rainer Hurling
>Release: FreeBSD 9.0-CURRENT (amd64)
>Organization:
>Environment:
FreeBSD xxx.xxx.xxx 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Sat Jun 18 11:15:17 CEST 2011 xxx at xxx.xxx.xx:/usr/obj/usr/src/sys/XXX amd64
>Description:
graphics/geos in its newest version 3.3.0 from 2011/05/30 brings a lot of bug fixes, API changes and some new features.
GEOS is used for example by math/R, math/saga and graphics/qgis.
>How-To-Repeat:
>Fix:
The following patch should fix the port to update to newest version. This should work on all platforms (only testet on amd64 with 9.0-CURRENT):
Patch attached with submission follows:
diff -Naur geos.orig/Makefile geos/Makefile
--- geos.orig/Makefile 2010-12-04 09:07:54.000000000 +0100
+++ geos/Makefile 2011-06-24 17:14:43.000000000 +0200
@@ -2,11 +2,11 @@
# Date created: 19 December 2003
# Whom: Leonardo Martins <lmartins at nepe.eee.ufg.br>
#
-# $FreeBSD: ports/graphics/geos/Makefile,v 1.26 2010/12/04 07:31:57 ade Exp $
+# $FreeBSD$
#
PORTNAME= geos
-PORTVERSION= 3.2.2
+PORTVERSION= 3.3.0
CATEGORIES= graphics geography
MASTER_SITES= http://download.osgeo.org/geos/
@@ -20,7 +20,4 @@
USE_GMAKE= YES
USE_LDCONFIG= YES
-post-patch:
- @${REINPLACE_CMD} -e '/-release/d' ${WRKSRC}/source/Makefile.in
-
.include <bsd.port.mk>
diff -Naur geos.orig/distinfo geos/distinfo
--- geos.orig/distinfo 2010-11-09 19:51:48.000000000 +0100
+++ geos/distinfo 2011-06-24 17:13:49.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (geos-3.2.2.tar.bz2) = 24df7c2119936fe0bcaa66e0b05aa28a875e373095cc05ee7eff404330e3211c
-SIZE (geos-3.2.2.tar.bz2) = 1664073
+SHA256 (geos-3.3.0.tar.bz2) = 791355457910f1b16924d1b966e7d6e376273617c6c3694145f638432c38aba6
+SIZE (geos-3.3.0.tar.bz2) = 1765056
diff -Naur geos.orig/pkg-plist geos/pkg-plist
--- geos.orig/pkg-plist 2009-12-20 13:27:14.000000000 +0100
+++ geos/pkg-plist 2011-06-24 17:42:32.000000000 +0200
@@ -1,18 +1,12 @@
bin/geos-config
include/geos.h
-include/geos/algorithm/locate/IndexedPointInAreaLocator.h
-include/geos/algorithm/locate/PointOnGeometryLocator.h
-include/geos/algorithm/locate/SimplePointInAreaLocator.h
-include/geos/algorithm/distance/DiscreteHausdorffDistance.h
-include/geos/algorithm/distance/DistanceToPoint.h
-include/geos/algorithm/distance/PointPairDistance.h
include/geos/algorithm/Angle.h
include/geos/algorithm/BoundaryNodeRule.h
+include/geos/algorithm/CGAlgorithms.h
include/geos/algorithm/CentralEndpointIntersector.h
include/geos/algorithm/CentroidArea.h
include/geos/algorithm/CentroidLine.h
include/geos/algorithm/CentroidPoint.h
-include/geos/algorithm/CGAlgorithms.h
include/geos/algorithm/ConvexHull.h
include/geos/algorithm/ConvexHull.inl
include/geos/algorithm/ExtractLineByLocation.h
@@ -20,13 +14,13 @@
include/geos/algorithm/InteriorPointArea.h
include/geos/algorithm/InteriorPointLine.h
include/geos/algorithm/InteriorPointPoint.h
-include/geos/algorithm/LengthIndexedLine.h
include/geos/algorithm/LengthIndexOfPoint.h
+include/geos/algorithm/LengthIndexedLine.h
include/geos/algorithm/LengthLocationMap.h
+include/geos/algorithm/LineIntersector.h
include/geos/algorithm/LinearGeometryBuilder.h
include/geos/algorithm/LinearIterator.h
include/geos/algorithm/LinearLocation.h
-include/geos/algorithm/LineIntersector.h
include/geos/algorithm/LocationIndexOfLine.h
include/geos/algorithm/LocationIndexOfPoint.h
include/geos/algorithm/MCPointInRing.h
@@ -36,8 +30,14 @@
include/geos/algorithm/PointLocator.h
include/geos/algorithm/RayCrossingCounter.h
include/geos/algorithm/RobustDeterminant.h
-include/geos/algorithm/SimplePointInRing.h
include/geos/algorithm/SIRtreePointInRing.h
+include/geos/algorithm/SimplePointInRing.h
+include/geos/algorithm/distance/DiscreteHausdorffDistance.h
+include/geos/algorithm/distance/DistanceToPoint.h
+include/geos/algorithm/distance/PointPairDistance.h
+include/geos/algorithm/locate/IndexedPointInAreaLocator.h
+include/geos/algorithm/locate/PointOnGeometryLocator.h
+include/geos/algorithm/locate/SimplePointInAreaLocator.h
include/geos/export.h
include/geos/geom.h
include/geos/geom/BinaryOp.h
@@ -55,7 +55,6 @@
include/geos/geom/Envelope.h
include/geos/geom/Envelope.inl
include/geos/geom/Geometry.h
-include/geos/geom/Geometry.inl
include/geos/geom/GeometryCollection.h
include/geos/geom/GeometryCollection.inl
include/geos/geom/GeometryComponentFilter.h
@@ -67,6 +66,7 @@
include/geos/geom/LineSegment.h
include/geos/geom/LineSegment.inl
include/geos/geom/LineString.h
+include/geos/geom/Lineal.h
include/geos/geom/LinearRing.h
include/geos/geom/Location.h
include/geos/geom/MultiLineString.h
@@ -76,32 +76,36 @@
include/geos/geom/MultiPolygon.inl
include/geos/geom/Point.h
include/geos/geom/Polygon.h
+include/geos/geom/Polygonal.h
include/geos/geom/PrecisionModel.h
include/geos/geom/PrecisionModel.inl
+include/geos/geom/Puntal.h
include/geos/geom/Triangle.h
include/geos/geom/prep/AbstractPreparedPolygonContains.h
include/geos/geom/prep/BasicPreparedGeometry.h
-include/geos/geom/prep/PreparedGeometryFactory.h
include/geos/geom/prep/PreparedGeometry.h
+include/geos/geom/prep/PreparedGeometryFactory.h
include/geos/geom/prep/PreparedLineString.h
include/geos/geom/prep/PreparedLineStringIntersects.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/PreparedPolygon.h
include/geos/geom/prep/PreparedPolygonIntersects.h
include/geos/geom/prep/PreparedPolygonPredicate.h
include/geos/geom/util/ComponentCoordinateExtracter.h
-include/geos/geom/util/GeometryCombiner.h
include/geos/geom/util/CoordinateOperation.h
+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/GeometryTransformer.h
include/geos/geom/util/LinearComponentExtracter.h
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
@@ -145,8 +149,8 @@
include/geos/index/bintree/Bintree.h
include/geos/index/bintree/Interval.h
include/geos/index/bintree/Key.h
-include/geos/index/bintree/NodeBase.h
include/geos/index/bintree/Node.h
+include/geos/index/bintree/NodeBase.h
include/geos/index/bintree/Root.h
include/geos/index/chain/MonotoneChain.h
include/geos/index/chain/MonotoneChainBuilder.h
@@ -163,9 +167,6 @@
include/geos/index/quadtree/NodeBase.h
include/geos/index/quadtree/Quadtree.h
include/geos/index/quadtree/Root.h
-include/geos/index/sweepline/SweepLineEvent.h
-include/geos/index/sweepline/SweepLineIndex.h
-include/geos/index/sweepline/SweepLineInterval.h
include/geos/index/strtree/AbstractNode.h
include/geos/index/strtree/AbstractSTRtree.h
include/geos/index/strtree/Boundable.h
@@ -173,8 +174,10 @@
include/geos/index/strtree/ItemBoundable.h
include/geos/index/strtree/SIRtree.h
include/geos/index/strtree/STRtree.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/operation/union/CascadedPolygonUnion.h
include/geos/indexBintree.h
include/geos/indexChain.h
include/geos/indexQuadtree.h
@@ -196,13 +199,6 @@
include/geos/io/WKTWriter.h
include/geos/io/Writer.h
include/geos/noding.h
-include/geos/nodingSnapround.h
-include/geos/noding/snapround/HotPixel.h
-include/geos/noding/snapround/HotPixel.inl
-include/geos/noding/snapround/MCIndexPointSnapper.h
-include/geos/noding/snapround/MCIndexSnapRounder.h
-include/geos/noding/snapround/MCIndexSnapRounder.inl
-include/geos/noding/snapround/SimpleSnapRounder.h
include/geos/noding/BasicSegmentString.h
include/geos/noding/FastNodingValidator.h
include/geos/noding/FastSegmentSetIntersectionFinder.h
@@ -223,6 +219,7 @@
include/geos/noding/SegmentIntersector.h
include/geos/noding/SegmentNode.h
include/geos/noding/SegmentNodeList.h
+include/geos/noding/SegmentPointComparator.h
include/geos/noding/SegmentSetMutualIntersector.h
include/geos/noding/SegmentString.h
include/geos/noding/SegmentString.inl
@@ -230,6 +227,12 @@
include/geos/noding/SimpleNoder.h
include/geos/noding/SingleInteriorIntersectionFinder.h
include/geos/noding/SinglePassNoder.h
+include/geos/noding/snapround/HotPixel.h
+include/geos/noding/snapround/HotPixel.inl
+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
@@ -247,6 +250,8 @@
include/geos/operation/buffer/BufferSubgraph.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/SubgraphDepthLocater.h
include/geos/operation/distance/ConnectedElementLocationFilter.h
@@ -293,6 +298,12 @@
include/geos/operation/relate/RelateNodeFactory.h
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/GeometryListHolder.h
+include/geos/operation/union/PointGeometryUnion.h
+include/geos/operation/union/UnaryUnionOp.h
include/geos/operation/valid/ConnectedInteriorTester.h
include/geos/operation/valid/ConsistentAreaTester.h
include/geos/operation/valid/IsValidOp.h
@@ -302,7 +313,6 @@
include/geos/operation/valid/SweeplineNestedRingTester.h
include/geos/operation/valid/TopologyValidationError.h
include/geos/planargraph.h
-include/geos/planargraph/algorithm/ConnectedSubgraphFinder.h
include/geos/planargraph/DirectedEdge.h
include/geos/planargraph/DirectedEdgeStar.h
include/geos/planargraph/Edge.h
@@ -311,6 +321,7 @@
include/geos/planargraph/NodeMap.h
include/geos/planargraph/PlanarGraph.h
include/geos/planargraph/Subgraph.h
+include/geos/planargraph/algorithm/ConnectedSubgraphFinder.h
include/geos/platform.h
include/geos/precision.h
include/geos/precision/CommonBits.h
@@ -323,9 +334,9 @@
include/geos/simplify/DouglasPeuckerSimplifier.h
include/geos/simplify/LineSegmentIndex.h
include/geos/simplify/TaggedLineSegment.h
-include/geos/simplify/TaggedLinesSimplifier.h
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/timeval.h
@@ -337,20 +348,23 @@
include/geos/util/GEOSException.h
include/geos/util/GeometricShapeFactory.h
include/geos/util/IllegalArgumentException.h
-include/geos/util/math.h
+include/geos/util/IllegalStateException.h
+include/geos/util/Machine.h
include/geos/util/TopologyException.h
include/geos/util/UniqueCoordinateArrayFilter.h
include/geos/util/UnsupportedOperationException.h
+include/geos/util/math.h
include/geos/version.h
include/geos_c.h
+lib/libgeos-3.3.0.so
lib/libgeos.a
lib/libgeos.la
lib/libgeos.so
-lib/libgeos.so.0
lib/libgeos_c.a
lib/libgeos_c.la
lib/libgeos_c.so
-lib/libgeos_c.so.7
+lib/libgeos_c.so.8
+ at dirrm lib/geos
@dirrm include/geos/util
@dirrm include/geos/simplify
@dirrm include/geos/precision
@@ -358,6 +372,7 @@
@dirrm include/geos/planargraph
@dirrm include/geos/operation/valid
@dirrm include/geos/operation/union
+ at dirrm include/geos/operation/sharedpaths
@dirrm include/geos/operation/relate
@dirrm include/geos/operation/predicate
@dirrm include/geos/operation/polygonize
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list