update to geos 3.5.0, tested in a bulk by ajacoutot@

This commit is contained in:
landry 2015-09-20 07:59:09 +00:00
parent 9555a4eb84
commit 09f8d8c829
5 changed files with 31 additions and 27 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.14 2014/08/27 08:28:29 landry Exp $
# $OpenBSD: Makefile,v 1.15 2015/09/20 07:59:09 landry Exp $
BROKEN-hppa = undefined reference to `std::auto_ptr<geos::geom::Envelope>::~auto_ptr()'
COMMENT= 2d geometry and topology engine
DISTNAME= geos-3.4.2
DISTNAME= geos-3.5.0
CATEGORIES= geo
SHARED_LIBS= geos 8.0 \
geos_c 4.1
SHARED_LIBS= geos 9.0 \
geos_c 4.2
# LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes

View File

@ -1,2 +1,2 @@
SHA256 (geos-3.4.2.tar.bz2) = Fei/334pCHqVe1asVD6pqAMhSBzvTU9jp7JolTrSbFM=
SIZE (geos-3.4.2.tar.bz2) = 1813726
SHA256 (geos-3.5.0.tar.bz2) = SZgrI7z6ZKUzM9qxNrguJTVO3rgG5aLi9biqmLHQrgI=
SIZE (geos-3.5.0.tar.bz2) = 1949397

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-include_geos_platform_h_in,v 1.2 2014/08/26 19:00:31 landry Exp $
http://trac.osgeo.org/geos/ticket/700
--- include/geos/platform.h.in.orig Sun Aug 25 17:10:32 2013
+++ include/geos/platform.h.in Sun Aug 24 11:08:54 2014
@@ -92,7 +92,7 @@ extern "C"
// sandro furieri: sanitizing MinGW32
# define ISNAN(x) (std::isnan(x))
# elif defined(__OSX__) || defined(__APPLE__) || \
- defined(__NetBSD__) || defined(__DragonFly__) || \
+ defined(__NetBSD__) || defined(__DragonFly__) || defined (__OpenBSD__) || \
(defined(__sun) && defined(__GNUC__))
// Hack for OS/X <cmath> incorrectly re-defining isnan() into oblivion.
// It does leave a version in std.

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2014/08/26 19:00:31 landry Exp $
--- src/Makefile.in.orig Sun Aug 25 17:10:43 2013
+++ src/Makefile.in Sun Aug 24 11:06:41 2014
@@ -342,8 +342,7 @@ lib_LTLIBRARIES = libgeos.la
$OpenBSD: patch-src_Makefile_in,v 1.3 2015/09/20 07:59:09 landry Exp $
--- src/Makefile.in.orig Mon Aug 17 00:22:04 2015
+++ src/Makefile.in Sat Sep 19 12:42:57 2015
@@ -457,8 +457,7 @@ lib_LTLIBRARIES = libgeos.la
# effort to determine this because depending programs should not be
# using the C++ library.
libgeos_la_LDFLAGS = \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2014/08/27 08:28:29 landry Exp $
@comment $OpenBSD: PLIST,v 1.11 2015/09/20 07:59:09 landry Exp $
bin/geos-config
include/geos/
include/geos.h
@ -285,6 +285,10 @@ 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/intersection/
include/geos/operation/intersection/Rectangle.h
include/geos/operation/intersection/RectangleIntersection.h
include/geos/operation/intersection/RectangleIntersectionBuilder.h
include/geos/operation/linemerge/
include/geos/operation/linemerge/EdgeString.h
include/geos/operation/linemerge/LineMergeDirectedEdge.h
@ -385,6 +389,7 @@ include/geos/timeval.h
include/geos/triangulate/
include/geos/triangulate/DelaunayTriangulationBuilder.h
include/geos/triangulate/IncrementalDelaunayTriangulator.h
include/geos/triangulate/VoronoiDiagramBuilder.h
include/geos/triangulate/quadedge/
include/geos/triangulate/quadedge/LastFoundQuadEdgeLocator.h
include/geos/triangulate/quadedge/LocateFailureException.h
@ -412,7 +417,6 @@ include/geos/util/UnsupportedOperationException.h
include/geos/util/math.h
include/geos/version.h
include/geos_c.h
lib/geos/
lib/libgeos.a
lib/libgeos.la
@lib lib/libgeos.so.${LIBgeos_VERSION}
@ -641,7 +645,10 @@ share/doc/geos/html/QuadtreeNestedRingTester_8h_source.html
share/doc/geos/html/Quadtree_8h_source.html
share/doc/geos/html/RayCrossingCounter_8h_source.html
share/doc/geos/html/RectangleContains_8h_source.html
share/doc/geos/html/RectangleIntersectionBuilder_8h_source.html
share/doc/geos/html/RectangleIntersection_8h_source.html
share/doc/geos/html/RectangleIntersects_8h_source.html
share/doc/geos/html/Rectangle_8h_source.html
share/doc/geos/html/RelateComputer_8h_source.html
share/doc/geos/html/RelateNodeFactory_8h_source.html
share/doc/geos/html/RelateNodeGraph_8h_source.html
@ -704,6 +711,7 @@ share/doc/geos/html/UnaryUnionOp_8h_source.html
share/doc/geos/html/UniqueCoordinateArrayFilter_8h_source.html
share/doc/geos/html/UnsupportedOperationException_8h_source.html
share/doc/geos/html/Vertex_8h_source.html
share/doc/geos/html/VoronoiDiagramBuilder_8h_source.html
share/doc/geos/html/WKBConstants_8h_source.html
share/doc/geos/html/WKBReader_8h_source.html
share/doc/geos/html/WKBWriter_8h_source.html
@ -1204,6 +1212,12 @@ share/doc/geos/html/classgeos_1_1operation_1_1geounion_1_1PointGeometryUnion-mem
share/doc/geos/html/classgeos_1_1operation_1_1geounion_1_1PointGeometryUnion.html
share/doc/geos/html/classgeos_1_1operation_1_1geounion_1_1UnaryUnionOp-members.html
share/doc/geos/html/classgeos_1_1operation_1_1geounion_1_1UnaryUnionOp.html
share/doc/geos/html/classgeos_1_1operation_1_1intersection_1_1Rectangle-members.html
share/doc/geos/html/classgeos_1_1operation_1_1intersection_1_1Rectangle.html
share/doc/geos/html/classgeos_1_1operation_1_1intersection_1_1RectangleIntersection-members.html
share/doc/geos/html/classgeos_1_1operation_1_1intersection_1_1RectangleIntersection.html
share/doc/geos/html/classgeos_1_1operation_1_1intersection_1_1RectangleIntersectionBuilder-members.html
share/doc/geos/html/classgeos_1_1operation_1_1intersection_1_1RectangleIntersectionBuilder.html
share/doc/geos/html/classgeos_1_1operation_1_1linemerge_1_1EdgeString-members.html
share/doc/geos/html/classgeos_1_1operation_1_1linemerge_1_1EdgeString.html
share/doc/geos/html/classgeos_1_1operation_1_1linemerge_1_1LineMergeDirectedEdge-members.html
@ -1362,6 +1376,8 @@ share/doc/geos/html/classgeos_1_1triangulate_1_1DelaunayTriangulationBuilder-mem
share/doc/geos/html/classgeos_1_1triangulate_1_1DelaunayTriangulationBuilder.html
share/doc/geos/html/classgeos_1_1triangulate_1_1IncrementalDelaunayTriangulator-members.html
share/doc/geos/html/classgeos_1_1triangulate_1_1IncrementalDelaunayTriangulator.html
share/doc/geos/html/classgeos_1_1triangulate_1_1VoronoiDiagramBuilder-members.html
share/doc/geos/html/classgeos_1_1triangulate_1_1VoronoiDiagramBuilder.html
share/doc/geos/html/classgeos_1_1triangulate_1_1quadedge_1_1LastFoundQuadEdgeLocator-members.html
share/doc/geos/html/classgeos_1_1triangulate_1_1quadedge_1_1LastFoundQuadEdgeLocator.html
share/doc/geos/html/classgeos_1_1triangulate_1_1quadedge_1_1LastFoundQuadEdgeLocator.png
@ -1412,6 +1428,7 @@ share/doc/geos/html/dir_0e3b37c82ffdfa0ddea472bb61fecadf.html
share/doc/geos/html/dir_186f3b7b99125ebe9657fdbd48be27fb.html
share/doc/geos/html/dir_266d7781c05ba74899fbd1b4ce8bcadf.html
share/doc/geos/html/dir_2c23d5540d2a668b0550fa40aa20e858.html
share/doc/geos/html/dir_2d35f9bf30fd7f2ba700dd48b1a1f158.html
share/doc/geos/html/dir_2f7e588ee14e7ebbdbeee368f114a6f5.html
share/doc/geos/html/dir_305cd355f6e9cdc9283d7e134fd1f764.html
share/doc/geos/html/dir_3097f3e3896e85a18a9a832172177de5.html
@ -1520,6 +1537,8 @@ share/doc/geos/html/functions_func_0x74.html
share/doc/geos/html/functions_func_0x75.html
share/doc/geos/html/functions_func_0x76.html
share/doc/geos/html/functions_func_0x77.html
share/doc/geos/html/functions_func_0x78.html
share/doc/geos/html/functions_func_0x79.html
share/doc/geos/html/functions_func_0x7a.html
share/doc/geos/html/functions_func_0x7e.html
share/doc/geos/html/functions_rela.html