Update to 3.2.0:

Changes in 3.2.0

- Add Single-sided buffer operation
- JTS-1.10 sync ...
  - Drastically improved Buffer speed (20x for a case in testsuite)
  - Improved EdgeList duplicate edge finding
  - Added algorithm::distance package
  - Added algorithm::Angle class
  - Added algorithm::BoundaryNodeRule class
  - IsSimpleOp can now return non-simple location coordinate
  - DistanceOp can now check for 'within distance' predicate
    (earlier exit)
  - MultiPolygon::getBoundary always return MultiLineString, also
    when the result is the EMPTY geometry.
- Various bug and leak fixes, optimizations
- Replace MarkupSTL with tinyXML

3 files changed, 182 insertions, 12 deletions

diff --git a/geography/geos/Makefile b/geography/geos/Makefile
index 5a86812b70e..596b64f20f7 100644
--- a/geography/geos/Makefile
+++ b/geography/geos/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2009/03/20 18:57:18 gdt Exp $
+# $NetBSD: Makefile,v 1.11 2009/12/14 23:31:06 gdt Exp $
 #
 
-DISTNAME=		geos-3.1.0
-PKGREVISION=		1
+DISTNAME=		geos-3.2.0
 CATEGORIES=		geography
 MASTER_SITES=		http://download.osgeo.org/geos/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/geography/geos/PLIST b/geography/geos/PLIST
index f39cd4eb257..307a87f0b9c 100644
--- a/geography/geos/PLIST
+++ b/geography/geos/PLIST
@@ -1,8 +1,45 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 19:12:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/12/14 23:31:06 gdt Exp $
 bin/geos-config
 include/geos.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/ConvexHull.h
+include/geos/algorithm/ConvexHull.inl
+include/geos/algorithm/ExtractLineByLocation.h
+include/geos/algorithm/HCoordinate.h
+include/geos/algorithm/InteriorPointArea.h
+include/geos/algorithm/InteriorPointLine.h
+include/geos/algorithm/InteriorPointPoint.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/LocationIndexOfLine.h
+include/geos/algorithm/LocationIndexOfPoint.h
+include/geos/algorithm/MCPointInRing.h
+include/geos/algorithm/MinimumDiameter.h
+include/geos/algorithm/NotRepresentableException.h
+include/geos/algorithm/PointInRing.h
 include/geos/algorithm/PointLocator.h
+include/geos/algorithm/RayCrossingCounter.h
+include/geos/algorithm/RobustDeterminant.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
 include/geos/geom/Coordinate.h
@@ -14,6 +51,7 @@ include/geos/geom/CoordinateFilter.h
 include/geos/geom/CoordinateList.h
 include/geos/geom/CoordinateSequence.h
 include/geos/geom/CoordinateSequenceFactory.h
+include/geos/geom/CoordinateSequenceFilter.h
 include/geos/geom/Dimension.h
 include/geos/geom/Envelope.h
 include/geos/geom/Envelope.inl
@@ -41,6 +79,7 @@ include/geos/geom/Point.h
 include/geos/geom/Polygon.h
 include/geos/geom/PrecisionModel.h
 include/geos/geom/PrecisionModel.inl
+include/geos/geom/Triangle.h
 include/geos/geom/prep/AbstractPreparedPolygonContains.h
 include/geos/geom/prep/BasicPreparedGeometry.h
 include/geos/geom/prep/PreparedGeometry.h
@@ -66,15 +105,29 @@ include/geos/geom/util/PolygonExtracter.h
 include/geos/geom/util/ShortCircuitedGeometryVisitor.h
 include/geos/geomUtil.h
 include/geos/geomgraph.h
+include/geos/geomgraph/Depth.h
+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
 include/geos/geomgraph/EdgeEndStar.h
+include/geos/geomgraph/EdgeIntersection.h
+include/geos/geomgraph/EdgeIntersectionList.h
 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/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/TopologyLocation.h
 include/geos/geomgraph/index/EdgeSetIntersector.h
 include/geos/geomgraph/index/MonotoneChain.h
 include/geos/geomgraph/index/MonotoneChainEdge.h
@@ -92,9 +145,22 @@ include/geos/index/ItemVisitor.h
 include/geos/index/SpatialIndex.h
 include/geos/index/bintree/Bintree.h
 include/geos/index/bintree/Interval.h
+include/geos/index/bintree/Key.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
 include/geos/index/chain/MonotoneChainOverlapAction.h
 include/geos/index/chain/MonotoneChainSelectAction.h
+include/geos/index/intervalrtree/IntervalRTreeBranchNode.h
+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/quadtree/IntervalSize.h
+include/geos/index/quadtree/Key.h
+include/geos/index/quadtree/Node.h
 include/geos/index/quadtree/NodeBase.h
 include/geos/index/quadtree/Quadtree.h
 include/geos/index/quadtree/Root.h
@@ -102,8 +168,12 @@ include/geos/index/strtree/AbstractNode.h
 include/geos/index/strtree/AbstractSTRtree.h
 include/geos/index/strtree/Boundable.h
 include/geos/index/strtree/Interval.h
+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/indexBintree.h
 include/geos/indexChain.h
@@ -117,13 +187,48 @@ include/geos/io/ByteOrderDataInStream.inl
 include/geos/io/ByteOrderValues.h
 include/geos/io/CLocalizer.h
 include/geos/io/ParseException.h
+include/geos/io/StringTokenizer.h
 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/noding.h
+include/geos/noding/BasicSegmentString.h
+include/geos/noding/FastNodingValidator.h
+include/geos/noding/FastSegmentSetIntersectionFinder.h
+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/Noder.h
+include/geos/noding/NodingValidator.h
+include/geos/noding/Octant.h
+include/geos/noding/OrientedCoordinateArray.h
+include/geos/noding/ScaledNoder.h
+include/geos/noding/SegmentIntersectionDetector.h
+include/geos/noding/SegmentIntersector.h
+include/geos/noding/SegmentNode.h
+include/geos/noding/SegmentNodeList.h
+include/geos/noding/SegmentSetMutualIntersector.h
+include/geos/noding/SegmentString.h
+include/geos/noding/SegmentString.inl
+include/geos/noding/SegmentStringUtil.h
+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/MCIndexSnapRounder.inl
+include/geos/noding/snapround/SimpleSnapRounder.h
 include/geos/nodingSnapround.h
 include/geos/opBuffer.h
 include/geos/opDistance.h
@@ -134,44 +239,110 @@ include/geos/opPredicate.h
 include/geos/opRelate.h
 include/geos/opValid.h
 include/geos/operation.h
-include/geos/operation/EndpointInfo.h
 include/geos/operation/GeometryGraphOperation.h
 include/geos/operation/IsSimpleOp.h
+include/geos/operation/buffer/BufferBuilder.h
 include/geos/operation/buffer/BufferOp.h
+include/geos/operation/buffer/BufferParameters.h
+include/geos/operation/buffer/BufferSubgraph.h
 include/geos/operation/buffer/OffsetCurveBuilder.h
+include/geos/operation/buffer/OffsetCurveSetBuilder.h
+include/geos/operation/buffer/RightmostEdgeFinder.h
+include/geos/operation/buffer/SubgraphDepthLocater.h
+include/geos/operation/distance/ConnectedElementLocationFilter.h
+include/geos/operation/distance/ConnectedElementPointFilter.h
 include/geos/operation/distance/DistanceOp.h
+include/geos/operation/distance/GeometryLocation.h
+include/geos/operation/linemerge/EdgeString.h
+include/geos/operation/linemerge/LineMergeDirectedEdge.h
+include/geos/operation/linemerge/LineMergeEdge.h
 include/geos/operation/linemerge/LineMergeGraph.h
 include/geos/operation/linemerge/LineMerger.h
+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/polygonize/EdgeRing.h
+include/geos/operation/polygonize/PolygonizeDirectedEdge.h
+include/geos/operation/polygonize/PolygonizeEdge.h
+include/geos/operation/polygonize/PolygonizeGraph.h
 include/geos/operation/polygonize/Polygonizer.h
+include/geos/operation/predicate/RectangleContains.h
+include/geos/operation/predicate/RectangleIntersects.h
+include/geos/operation/predicate/SegmentIntersectionTester.h
+include/geos/operation/relate/EdgeEndBuilder.h
+include/geos/operation/relate/EdgeEndBundle.h
+include/geos/operation/relate/EdgeEndBundleStar.h
 include/geos/operation/relate/RelateComputer.h
+include/geos/operation/relate/RelateNode.h
+include/geos/operation/relate/RelateNodeFactory.h
+include/geos/operation/relate/RelateNodeGraph.h
 include/geos/operation/relate/RelateOp.h
 include/geos/operation/union/CascadedPolygonUnion.h
+include/geos/operation/valid/ConnectedInteriorTester.h
+include/geos/operation/valid/ConsistentAreaTester.h
 include/geos/operation/valid/IsValidOp.h
+include/geos/operation/valid/QuadtreeNestedRingTester.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.h
+include/geos/planargraph/DirectedEdge.h
+include/geos/planargraph/DirectedEdgeStar.h
+include/geos/planargraph/Edge.h
+include/geos/planargraph/GraphComponent.h
+include/geos/planargraph/Node.h
 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
 include/geos/precision/CommonBitsOp.h
 include/geos/precision/CommonBitsRemover.h
 include/geos/precision/EnhancedPrecisionOp.h
-include/geos/precision/GeometrySnapper.h
 include/geos/precision/SimpleGeometryPrecisionReducer.h
+include/geos/profiler.h
+include/geos/simplify/DouglasPeuckerLineSimplifier.h
 include/geos/simplify/DouglasPeuckerSimplifier.h
+include/geos/simplify/LineSegmentIndex.h
+include/geos/simplify/TaggedLineSegment.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
 include/geos/unload.h
 include/geos/util.h
+include/geos/util/Assert.h
+include/geos/util/AssertionFailedException.h
+include/geos/util/CoordinateArrayFilter.h
 include/geos/util/GEOSException.h
 include/geos/util/GeometricShapeFactory.h
 include/geos/util/IllegalArgumentException.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.la
 lib/libgeos_c.la
-@pkgdir include/geos/index/intervalrtree
-@pkgdir include/geos/algorithm/locate
diff --git a/geography/geos/distinfo b/geography/geos/distinfo
index b650f283aa0..9fd248a6f95 100644
--- a/geography/geos/distinfo
+++ b/geography/geos/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2009/03/18 19:41:45 gdt Exp $
+$NetBSD: distinfo,v 1.9 2009/12/14 23:31:06 gdt Exp $
 
-SHA1 (geos-3.1.0.tar.bz2) = a36b462e4afac91d7aacef9944bff0706ea64168
-RMD160 (geos-3.1.0.tar.bz2) = 45807500e8a46e5d31e9a3cc5245f1720cd2ae16
-Size (geos-3.1.0.tar.bz2) = 1200085 bytes
+SHA1 (geos-3.2.0.tar.bz2) = e6925763fb06fa6a7f358ede49bb89f96535b3ef
+RMD160 (geos-3.2.0.tar.bz2) = cdbd10d524164cd11b73a3af39ce15d021dfcaef
+Size (geos-3.2.0.tar.bz2) = 1627924 bytes
 SHA1 (patch-ae) = b687857a95931a7f9a0dc5e1c2290db0e76f603e