Update to 3.4.1.

Changes in 3.4.1
2013-08-DD

- Bug fixes / improvements
  - Assertion failure snapping line to points of rectangle
    smaller than tolerance (#649)
  - Can't build using cmake with tar ball (#644)

Changes in 3.4.0
2013-08-11

- New things:
  - Delaunay Triangulation API (#487, #565, #570, #567)
  - Interruptibility API (C and C++)
  - CAPI: GEOSNode (#496) - PHP: Geometry->node
  - GeometryPrecisionReducer class (#496, #526)
  - BufferInputLineSimplifier header exposed (#548)
  - New Centroid class supporting mixed geometry components (#612)
  - io::Writer::reserve() method
  - CAPI: GEOSNearestPoints
  - Add --cclibs, --static-clibs and --static-cclibs to geos-config (#497)
  - Early bail out of overlay exception if input is invalid

- C++ API changes:
  - New noding::GeometryNoder class
  - Added BufferOp::setSingleSided
  - Signature of most functions taking a Label changed to take it
    by reference rather than pointer.
  - Signature of most functions taking an IntersectionMatrix changed
    to take it by reference rather than pointer.
  - GraphComponent::label is now a Label value (from a pointer)
  - NodedSegmentString takes ownership of CoordinateSenuence now
  - io::Writer's toString() returns by const ref, write() takes a const ref
  - Unify prototypes of WKTReader and WKBReader constructor (#310)
  - GeometryCollection::computeEnvelopInternal and
    GeometryCollection::compareToSameClass are marked virtual (#478)

- Bug fixes / improvements
  - A point interpolated from a line does not always intersect
    the same line (#323)
  - Port ConvexHull robustness fix from JTS-1.13 (#457)
  - Improve Overlay robustness by reducing input precision on topology
    exception and by refusing to accept unnoded output (#459)
  - Improve Buffer robustness by reducing input precision on topology
    exception (#605)
  - Mismatch segment sides in OffsetCurveBuilder (#633 )
  - Fixed Linear Referencing API to handle MultiLineStrings consistently
    by always using the lowest possible index value, and by trimming
    zero-length components from results (#323)
  - Fixed CMake configuration to set correct SOVERSION (current - age)
  - Fix EMPTY return from single-point lines and zero-length polygons (#612)
  - CMakeLists.txt, tools/geos_svn_revision_cmake.h.in: Add
	  geos_svn_revision.h generator to CMake config (#643)
	- Makefile.vc 'clean' step leaks obj files (#607)

5 files changed, 61 insertions, 32 deletions

diff --git a/geography/geos/Makefile b/geography/geos/Makefile
index 222e03f55e8..6575e11f1e3 100644
--- a/geography/geos/Makefile
+++ b/geography/geos/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2013/02/28 17:08:33 gdt Exp $
+# $NetBSD: Makefile,v 1.23 2013/08/18 11:06:25 gdt Exp $
 
-DISTNAME=	geos-3.3.8
+DISTNAME=	geos-3.4.1
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/geos/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/geography/geos/PLIST b/geography/geos/PLIST
index 7ad6473d358..183f8c521cc 100644
--- a/geography/geos/PLIST
+++ b/geography/geos/PLIST
@@ -1,29 +1,21 @@
-@comment $NetBSD: PLIST,v 1.10 2011/06/16 09:24:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2013/08/18 11:06:25 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/Centroid.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
@@ -199,10 +191,21 @@ 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
+include/geos/linearref/LengthIndexOfPoint.h
+include/geos/linearref/LengthIndexedLine.h
+include/geos/linearref/LengthLocationMap.h
+include/geos/linearref/LinearGeometryBuilder.h
+include/geos/linearref/LinearIterator.h
+include/geos/linearref/LinearLocation.h
+include/geos/linearref/LocationIndexOfLine.h
+include/geos/linearref/LocationIndexOfPoint.h
+include/geos/linearref/LocationIndexedLine.h
 include/geos/noding.h
 include/geos/noding/BasicSegmentString.h
 include/geos/noding/FastNodingValidator.h
 include/geos/noding/FastSegmentSetIntersectionFinder.h
+include/geos/noding/GeometryNoder.h
 include/geos/noding/IntersectionAdder.h
 include/geos/noding/IntersectionFinderAdder.h
 include/geos/noding/IteratedNoder.h
@@ -223,7 +226,6 @@ 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
 include/geos/noding/SegmentStringUtil.h
 include/geos/noding/SimpleNoder.h
 include/geos/noding/SingleInteriorIntersectionFinder.h
@@ -246,6 +248,7 @@ include/geos/operation.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
 include/geos/operation/buffer/BufferParameters.h
 include/geos/operation/buffer/BufferSubgraph.h
@@ -323,12 +326,13 @@ 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/GeometryPrecisionReducer.h
+include/geos/precision/PrecisionReducerCoordinateOperation.h
 include/geos/precision/SimpleGeometryPrecisionReducer.h
 include/geos/profiler.h
 include/geos/simplify/DouglasPeuckerLineSimplifier.h
@@ -341,6 +345,16 @@ include/geos/simplify/TaggedLinesSimplifier.h
 include/geos/simplify/TopologyPreservingSimplifier.h
 include/geos/spatialIndex.h
 include/geos/timeval.h
+include/geos/triangulate/DelaunayTriangulationBuilder.h
+include/geos/triangulate/IncrementalDelaunayTriangulator.h
+include/geos/triangulate/quadedge/LastFoundQuadEdgeLocator.h
+include/geos/triangulate/quadedge/LocateFailureException.h
+include/geos/triangulate/quadedge/QuadEdge.h
+include/geos/triangulate/quadedge/QuadEdgeLocator.h
+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/unload.h
 include/geos/util.h
 include/geos/util/Assert.h
@@ -350,6 +364,7 @@ include/geos/util/GEOSException.h
 include/geos/util/GeometricShapeFactory.h
 include/geos/util/IllegalArgumentException.h
 include/geos/util/IllegalStateException.h
+include/geos/util/Interrupt.h
 include/geos/util/Machine.h
 include/geos/util/TopologyException.h
 include/geos/util/UniqueCoordinateArrayFilter.h
@@ -359,3 +374,4 @@ include/geos/version.h
 include/geos_c.h
 lib/libgeos.la
 lib/libgeos_c.la
+@pkgdir lib/geos
diff --git a/geography/geos/distinfo b/geography/geos/distinfo
index 034d070e033..82fb2720663 100644
--- a/geography/geos/distinfo
+++ b/geography/geos/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.20 2013/02/28 17:08:33 gdt Exp $
+$NetBSD: distinfo,v 1.21 2013/08/18 11:06:25 gdt Exp $
 
-SHA1 (geos-3.3.8.tar.bz2) = 1743e09f37eb75d85283a684a5765c4f44d035fa
-RMD160 (geos-3.3.8.tar.bz2) = cb47808b3c80fa92ebee7dd6d9ef9c18499c5cd0
-Size (geos-3.3.8.tar.bz2) = 1820064 bytes
-SHA1 (patch-ae) = d568c8950a24b516c6fd58e401bbf19405a2d150
-SHA1 (patch-include-geos-platform.h.in) = 92bd5fc2421650ce4853dce85d8d2e6509aa64e9
+SHA1 (geos-3.4.1.tar.bz2) = 0fee633694049192726149f83c47fef4d73c7468
+RMD160 (geos-3.4.1.tar.bz2) = 70212cf36e558d10c69fc553e1a212230b0224b6
+Size (geos-3.4.1.tar.bz2) = 1813303 bytes
+SHA1 (patch-ae) = 01ffd15e3562ff8fb191608dc12a2ee6918154b0
+SHA1 (patch-include-geos-platform.h.in) = b484e843f8c068c451f181f9623d2a9068779063
diff --git a/geography/geos/patches/patch-ae b/geography/geos/patches/patch-ae
index ad1172a782f..458d3d5aa04 100644
--- a/geography/geos/patches/patch-ae
+++ b/geography/geos/patches/patch-ae
@@ -1,15 +1,15 @@
-$NetBSD: patch-ae,v 1.3 2012/01/08 18:37:33 gdt Exp $
+$NetBSD: patch-ae,v 1.4 2013/08/18 11:06:25 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	2011-12-12 09:57:21.000000000 +0000
+--- tools/geos-config.in.orig	2013-08-11 04:23:41.000000000 +0000
 +++ tools/geos-config.in
-@@ -38,13 +38,13 @@ case $1 in
-     echo -I${prefix}/include 
-       ;;
+@@ -43,22 +43,22 @@ case $1 in
      --libs)
+       # TODO: make an alias for --clibs
+       # see http://trac.osgeo.org/geos/ticket/497
 -      echo -L${libdir} -lgeos
 +      echo -L${libdir} @LDFLAGS@ -lgeos
        ;;
@@ -17,9 +17,21 @@ TODO: report upstream.
 -      echo -L${libdir} -lgeos_c
 +      echo -L${libdir} @LDFLAGS@ -lgeos_c
        ;;
+     --cclibs)
+-      echo -L${libdir} -lgeos
++      echo -L${libdir} @LDFLAGS@ -lgeos
+       ;;
+     --static-clibs)
+-      echo -L${libdir} -lgeos_c -lgeos -m
++      echo -L${libdir} @LDFLAGS@ -lgeos_c -lgeos -m
+       ;;
+     --static-cclibs)
+-      echo -L${libdir} -lgeos -m
++      echo -L${libdir} @LDFLAGS@ -lgeos -m
+       ;;
      --ldflags)
 -      echo -L${libdir}
-+      echo -L${libdir} @LDFLAGS@
++      echo @LDFLAGS@ -L${libdir}
        ;;
      --includes)
        echo ${prefix}/include
diff --git a/geography/geos/patches/patch-include-geos-platform.h.in b/geography/geos/patches/patch-include-geos-platform.h.in
index 9fb85d66142..abfdab74d61 100644
--- a/geography/geos/patches/patch-include-geos-platform.h.in
+++ b/geography/geos/patches/patch-include-geos-platform.h.in
@@ -1,20 +1,21 @@
-$NetBSD: patch-include-geos-platform.h.in,v 1.4 2012/03/12 09:46:06 fhajny Exp $
+$NetBSD: patch-include-geos-platform.h.in,v 1.5 2013/08/18 11:06:25 gdt Exp $
 
 Fix isnan definition on NetBSD, DragonFly and SunOS platforms.
---- include/geos/platform.h.in.orig	2011-09-17 15:42:58.000000000 +0000
+--- include/geos/platform.h.in.orig	2013-08-11 04:23:47.000000000 +0000
 +++ include/geos/platform.h.in
-@@ -91,11 +91,12 @@ extern "C"
- # elif defined(__MINGW32__)
+@@ -91,11 +91,13 @@ extern "C"
+ # elif defined(__MINGW32__) || defined(__CYGWIN__)
  // sandro furieri: sanitizing MinGW32
  #  define ISNAN(x) (std::isnan(x))
 -# elif defined(__OSX__) || defined(__APPLE__)
-+# elif defined(__OSX__) || defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__) || \
++# elif defined(__OSX__) || defined(__APPLE__) || \
++       defined(__NetBSD__) || defined(__DragonFly__) ||	\
 +       (defined(__sun) && defined(__GNUC__))
     // Hack for OS/X <cmath> incorrectly re-defining isnan() into oblivion.
     // It does leave a version in std.
  #  define ISNAN(x) (std::isnan(x))
 -# elif defined(__sun) || defined(__sun__)
-+# elif (defined(__sun) || defined(__sun__)) && defined(__SUNPRO_CC) 
++# elif (defined(__sun) || defined(__sun__)) && defined(__SUNPRO_CC)
  #  include <math.h>
  #  define ISNAN(x) (::isnan(x))
  # endif