Changes 3.3.0:

- New things:
  - CAPI: GEOSBufferWithParams (allows single sided buffers)
  - CAPI: GEOSOffsetCurve deprecates GEOSSingleSidedBuffer
  - CAPI: GEOSUnaryUnion deprecates GEOSCascadedUnion
  - CAPI: GEOSisValidDetail: tell state, reason & location apart. allows
          passing flags.
  - CAPI: GEOSContext_setNoticeHandler_r, GEOSContext_setErrorHandler_r
  - CAPI: GEOSGeom_createEmptyPoint, GEOSGeom_createEmptyLineString
          GEOSGeom_createEmptyPolygon, GEOSGeom_createEmptyCollection
  - CAPI: GEOSGeom_extractUniquePoints
  - CAPI: GEOSGetGeometryN support for single geometries
  - CAPI: GEOSPolygonize_full to return all informations computed by
          the polygonizer
  - CAPI: GEOSOrientationIndex
  - CAPI: GEOSSharedPaths to find shared paths and their orientation
  - CAPI: GEOSSnap
  - CAPI: GEOSRelatePatternMatch
  - CAPI: GEOSCovers, GEOSCoveredBy
  - CAPI: GEOSRelateBoundaryNodeRule
  -  PHP: new PHP5 bindings based on CAPI
- Semantic C++ API changes:
  - Geometry inheritance chain changed to introduce Puntal, Lineal
    and Polygonal classes (virtual inheritance introduced)
  - Polygonizer::getInvalidRingLines retains ownership of vector elements
  - Geometry::isWithinDistance method is now const
  - Polygonizer::getCutEdges returns by const ref
  - Polygonizer::getDangles returns by const ref
  - Empty LinearRings are closed by definition
- Bug fixes / improvements
  - Fixed Geometry.distance() and DistanceOp to return 0.0 for empty inputs
  - Invalid compound geometries reported as valid
  - Return up to 15 digits of precision from GEOSisValidReason_t
  - CAPI: do not leak contexts when using the non-reentrant interface
  - Fix duplicated dangles returned by Polygonizer
  - Fix SnapIfNeededOverlayOp to throw the originating exception
  - Fixed LineMerger to skip lines with only a single unique coordinate
  - Fix NodedSegmentString to handle zero-length line segments correctly
    (via safeOctant)
  - Fixed buffer OffsetCurveSetBuilder to handle "flat" rings correctly
  - Added illegal state check in LineSegment::pointAlongOffset()
  - Improved performance of RectangleIntersects by always using
    segment-scanning and refining SegmentIntersectionTester
  - Reduce memory use in PreparedGeometry predicates
  - Fix infinite loop in RobustDeterminant with nan/inf input

4 files changed, 26 insertions, 13 deletions

diff --git a/geography/geos/Makefile b/geography/geos/Makefile
index f4a986a0546..e9efe680445 100644
--- a/geography/geos/Makefile
+++ b/geography/geos/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2011/02/15 09:19:29 adam Exp $
+# $NetBSD: Makefile,v 1.14 2011/06/16 09:24:05 adam Exp $
 
-DISTNAME=	geos-3.2.2
+DISTNAME=	geos-3.3.0
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/geos/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,10 +12,10 @@ LICENSE=	gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_PKGLOCALEDIR=	yes
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_LANGUAGES=		c c++
 
 TEST_TARGET=		check
 
diff --git a/geography/geos/PLIST b/geography/geos/PLIST
index 307a87f0b9c..7ad6473d358 100644
--- a/geography/geos/PLIST
+++ b/geography/geos/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/12/14 23:31:06 gdt Exp $
+@comment $NetBSD: PLIST,v 1.10 2011/06/16 09:24:05 adam Exp $
 bin/geos-config
 include/geos.h
 include/geos/algorithm/Angle.h
@@ -56,7 +56,6 @@ include/geos/geom/Dimension.h
 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
@@ -68,6 +67,7 @@ include/geos/geom/IntersectionMatrix.h
 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
@@ -77,8 +77,10 @@ include/geos/geom/MultiPolygon.h
 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
@@ -98,11 +100,13 @@ 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
@@ -216,6 +220,7 @@ include/geos/noding/SegmentIntersectionDetector.h
 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
@@ -227,7 +232,6 @@ 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
@@ -247,6 +251,8 @@ 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/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,7 +299,12 @@ 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/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
@@ -338,6 +349,8 @@ include/geos/util/CoordinateArrayFilter.h
 include/geos/util/GEOSException.h
 include/geos/util/GeometricShapeFactory.h
 include/geos/util/IllegalArgumentException.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
diff --git a/geography/geos/buildlink3.mk b/geography/geos/buildlink3.mk
index 0a99a32ce52..e5860ca7a78 100644
--- a/geography/geos/buildlink3.mk
+++ b/geography/geos/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/12/14 23:36:05 gdt Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2011/06/16 09:24:05 adam Exp $
 
 BUILDLINK_TREE+=	geos
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	geos
 GEOS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.geos+=	geos>=2.2.3
-BUILDLINK_ABI_DEPENDS.geos?=	geos>=3.2.0
+BUILDLINK_ABI_DEPENDS.geos+=	geos>=3.2.0
 BUILDLINK_PKGSRCDIR.geos?=	../../geography/geos
 .endif # GEOS_BUILDLINK3_MK
 
diff --git a/geography/geos/distinfo b/geography/geos/distinfo
index b919e4d98f9..e4de82dc70d 100644
--- a/geography/geos/distinfo
+++ b/geography/geos/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2010/04/20 18:35:29 zafer Exp $
+$NetBSD: distinfo,v 1.11 2011/06/16 09:24:05 adam Exp $
 
-SHA1 (geos-3.2.2.tar.bz2) = 6917d6d1d4e79f58d9f931bf351024709fabbc5a
-RMD160 (geos-3.2.2.tar.bz2) = 95342be083175f38c8c87b5682271253320f3d60
-Size (geos-3.2.2.tar.bz2) = 1664073 bytes
+SHA1 (geos-3.3.0.tar.bz2) = f6c6e3398d5c7bf389a0610a0d06896d76ad4480
+RMD160 (geos-3.3.0.tar.bz2) = 724f535739ec88607083b72452481b155297fd2b
+Size (geos-3.3.0.tar.bz2) = 1765056 bytes
 SHA1 (patch-ae) = b687857a95931a7f9a0dc5e1c2290db0e76f603e