Update to 3.4.2.

patches/patch-include-geos-platform.h.in was applied upstream in r3902
(trunk) and r3903 (branches/3.4).

Upstream NEWS:

Changes in 3.4.2
2013-08-25

- Bug fixes / improvements
  - Use a double for PrecisionModel scale, avoiding overflows
    should fix 32-bit regression failures (#652)
  - isnan workaround OS detection missing NetBSD, DragonFly, Sun nuance (#650)
  - Do not distribute platform.h and version.h, but install both (#601)
  - Non-standard ChangeLog file in 3.4.0 and 3.4.1 releases (#654)
  - new travis bot (#657)
  - accept multiple Nan representations (#656)

4 files changed, 8 insertions, 30 deletions

diff --git a/geography/geos/Makefile b/geography/geos/Makefile
index 6575e11f1e3..65c8fd65a38 100644
--- a/geography/geos/Makefile
+++ b/geography/geos/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2013/08/18 11:06:25 gdt Exp $
+# $NetBSD: Makefile,v 1.24 2013/08/30 16:37:38 gdt Exp $
 
-DISTNAME=	geos-3.4.1
+DISTNAME=	geos-3.4.2
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/geos/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/geography/geos/PLIST b/geography/geos/PLIST
index 183f8c521cc..d7158c9252c 100644
--- a/geography/geos/PLIST
+++ b/geography/geos/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2013/08/18 11:06:25 gdt Exp $
+@comment $NetBSD: PLIST,v 1.12 2013/08/30 16:37:38 gdt Exp $
 bin/geos-config
 include/geos.h
 include/geos/algorithm/Angle.h
@@ -316,6 +316,7 @@ 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/platform.h
 include/geos/planargraph.h
 include/geos/planargraph/DirectedEdge.h
 include/geos/planargraph/DirectedEdgeStar.h
@@ -374,4 +375,3 @@ 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 82fb2720663..ed85ce2bda5 100644
--- a/geography/geos/distinfo
+++ b/geography/geos/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.21 2013/08/18 11:06:25 gdt Exp $
+$NetBSD: distinfo,v 1.22 2013/08/30 16:37:38 gdt Exp $
 
-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 (geos-3.4.2.tar.bz2) = b8aceab04dd09f4113864f2d12015231bb318e9a
+RMD160 (geos-3.4.2.tar.bz2) = d847a07996b298f3c700e1ee25e3564adfbd20f5
+Size (geos-3.4.2.tar.bz2) = 1813726 bytes
 SHA1 (patch-ae) = 01ffd15e3562ff8fb191608dc12a2ee6918154b0
-SHA1 (patch-include-geos-platform.h.in) = b484e843f8c068c451f181f9623d2a9068779063
diff --git a/geography/geos/patches/patch-include-geos-platform.h.in b/geography/geos/patches/patch-include-geos-platform.h.in
deleted file mode 100644
index abfdab74d61..00000000000
--- a/geography/geos/patches/patch-include-geos-platform.h.in
+++ /dev/null
@@ -1,21 +0,0 @@
-$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	2013-08-11 04:23:47.000000000 +0000
-+++ include/geos/platform.h.in
-@@ -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__) ||	\
-+       (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)
- #  include <math.h>
- #  define ISNAN(x) (::isnan(x))
- # endif