- Update to 3.1.0

PR:		133107
Submitted by:	Wen Heping <wenheping@gmail.com>
Approved by:	maintainer

4 files changed, 26 insertions, 22 deletions

diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile
index 1745bd998499..146017692c2a 100644
--- a/graphics/geos/Makefile
+++ b/graphics/geos/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	geos
-PORTVERSION=	3.0.3
+PORTVERSION=	3.1.0
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/geos/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
diff --git a/graphics/geos/distinfo b/graphics/geos/distinfo
index 0a6c8385ae78..fb5533e9edce 100644
--- a/graphics/geos/distinfo
+++ b/graphics/geos/distinfo
@@ -1,3 +1,3 @@
-MD5 (geos-3.0.3.tar.bz2) = c6a1f4d82fa9219e7ee799c784347681
-SHA256 (geos-3.0.3.tar.bz2) = f33010a7757ff8e0260601597611dc5c70c7916b3bdcb8d7b82dfac52410b3df
-SIZE (geos-3.0.3.tar.bz2) = 1075288
+MD5 (geos-3.1.0.tar.bz2) = 1614dd3d0dc7acd2229cb12a40cb3373
+SHA256 (geos-3.1.0.tar.bz2) = c31aa52575f79e617e616f6a11d8ea636c1eb2d555f8ab2baee227c8322cf38a
+SIZE (geos-3.1.0.tar.bz2) = 1200085
diff --git a/graphics/geos/files/patch-source-headers-geos-precision-Makefile.in b/graphics/geos/files/patch-source-headers-geos-precision-Makefile.in
deleted file mode 100644
index 6c68d822c7e1..000000000000
--- a/graphics/geos/files/patch-source-headers-geos-precision-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- source/headers/geos/precision/Makefile.in.orig	2009-02-06 16:54:40.692917675 +0000
-+++ source/headers/geos/precision/Makefile.in	2009-02-06 16:55:07.121105056 +0000
-@@ -219,11 +219,11 @@
- 	CommonBitsOp.h				\
- 	CommonBitsRemover.h			\
- 	EnhancedPrecisionOp.h			\
-+	GeometrySnapper.h			\
- 	SimpleGeometryPrecisionReducer.h
- 
- noinst_HEADERS = \
- 	CommonBits.h				\
--	GeometrySnapper.h			\
- 	LineStringSnapper.h
- 
- all: all-am
diff --git a/graphics/geos/pkg-plist b/graphics/geos/pkg-plist
index 1825229a3b62..746a144f3f72 100644
--- a/graphics/geos/pkg-plist
+++ b/graphics/geos/pkg-plist
@@ -1,4 +1,3 @@
-bin/XMLTester
 bin/geos-config
 include/geos.h
 include/geos/algorithm/LineIntersector.h
@@ -41,6 +40,21 @@ include/geos/geom/Point.h
 include/geos/geom/Polygon.h
 include/geos/geom/PrecisionModel.h
 include/geos/geom/PrecisionModel.inl
+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/PreparedLineString.h
+include/geos/geom/prep/PreparedLineStringIntersects.h
+include/geos/geom/prep/PreparedPoint.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/GeometryEditor.h
 include/geos/geom/util/GeometryEditorOperation.h
@@ -90,6 +104,7 @@ include/geos/index/strtree/Interval.h
 include/geos/index/strtree/SIRtree.h
 include/geos/index/strtree/STRtree.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
@@ -162,12 +177,13 @@ lib/libgeos.so.0
 lib/libgeos_c.a
 lib/libgeos_c.la
 lib/libgeos_c.so
-lib/libgeos_c.so.5
+lib/libgeos_c.so.6
 @dirrm include/geos/util
 @dirrm include/geos/simplify
 @dirrm include/geos/precision
 @dirrm include/geos/planargraph
 @dirrm include/geos/operation/valid
+@dirrm include/geos/operation/union
 @dirrm include/geos/operation/relate
 @dirrm include/geos/operation/polygonize
 @dirrm include/geos/operation/overlay
@@ -176,15 +192,18 @@ lib/libgeos_c.so.5
 @dirrm include/geos/operation/buffer
 @dirrm include/geos/operation
 @dirrm include/geos/io
+@dirrm include/geos/algorithm/locate
+@dirrm include/geos/algorithm
 @dirrm include/geos/index/sweepline
 @dirrm include/geos/index/strtree
 @dirrm include/geos/index/quadtree
+@dirrm include/geos/index/intervalrtree
 @dirrm include/geos/index/chain
 @dirrm include/geos/index/bintree
 @dirrm include/geos/index
 @dirrm include/geos/geomgraph/index
 @dirrm include/geos/geomgraph
 @dirrm include/geos/geom/util
+@dirrm include/geos/geom/prep
 @dirrm include/geos/geom
-@dirrm include/geos/algorithm
 @dirrm include/geos