From 66bff4597690aa7465de13e8b07ee12c132470c6 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Mon, 4 Feb 2019 00:16:36 +0000 Subject: [PATCH] Update to 3.7.1 Changes: https://trac.osgeo.org/geos/browser/git/NEWS?rev=3.7 https://github.com/libgeos/geos/blob/3.7/NEWS PR: 235260 Exp-run by: antoine --- graphics/geos/Makefile | 8 ++++---- graphics/geos/distinfo | 6 +++--- graphics/geos/pkg-plist | 5 +++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile index c466a46846cd..1667181fe95f 100644 --- a/graphics/geos/Makefile +++ b/graphics/geos/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= geos -PORTVERSION= 3.6.3 -PORTREVISION= 1 +PORTVERSION= 3.7.1 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/geos/ \ LOCAL/sunpoet @@ -17,12 +16,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING OPTIONS_DEFINE= RUBY OPTIONS_SUB= yes +USES= compiler:c++11-lang gmake libtool tar:bzip2 + CONFIGURE_ARGS= ac_cv_path_SWIG=${LOCALBASE}/bin/swig3.0 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip TEST_TARGET= check USE_LDCONFIG= yes -USES= gmake libtool tar:bzip2 PLIST_SUB= PORTVERSION=${PORTVERSION} @@ -35,6 +35,6 @@ post-patch: @${REINPLACE_CMD} -e 's|-lstdc++||' ${WRKSRC}/tests/geostest/Makefile.in ${WRKSRC}/tests/thread/Makefile.in post-configure: - @${FIND} ${WRKSRC} -name Makefile -exec ${REINPLACE_CMD} -e '/CXXFLAGS = / s| -O2||' {} \; + @${FIND} ${WRKSRC} -name Makefile -exec ${REINPLACE_CMD} -e '/CXXFLAGS = / s| -O2||' {} + .include diff --git a/graphics/geos/distinfo b/graphics/geos/distinfo index 69dfeac05c25..9640bfb141c7 100644 --- a/graphics/geos/distinfo +++ b/graphics/geos/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1533566912 -SHA256 (geos-3.6.3.tar.bz2) = ab9eaa0a67f7068866ac1e4dbf717b0c49f96254d65e9ce23ed7af1cccbe3e4b -SIZE (geos-3.6.3.tar.bz2) = 1987528 +TIMESTAMP = 1546194104 +SHA256 (geos-3.7.1.tar.bz2) = 0006c7b49eaed016b9c5c6f872417a7d7dc022e069ddd683335793d905a8228c +SIZE (geos-3.7.1.tar.bz2) = 2055129 diff --git a/graphics/geos/pkg-plist b/graphics/geos/pkg-plist index df75b59fbd88..0785808b2e0e 100644 --- a/graphics/geos/pkg-plist +++ b/graphics/geos/pkg-plist @@ -24,6 +24,7 @@ include/geos/algorithm/RayCrossingCounter.h include/geos/algorithm/RobustDeterminant.h include/geos/algorithm/SIRtreePointInRing.h include/geos/algorithm/SimplePointInRing.h +include/geos/algorithm/distance/DiscreteFrechetDistance.h include/geos/algorithm/distance/DiscreteHausdorffDistance.h include/geos/algorithm/distance/DistanceToPoint.h include/geos/algorithm/distance/PointPairDistance.h @@ -53,7 +54,6 @@ include/geos/geom/GeometryComponentFilter.h include/geos/geom/GeometryFactory.h include/geos/geom/GeometryFactory.inl include/geos/geom/GeometryFilter.h -include/geos/geom/GeometryList.h include/geos/geom/IntersectionMatrix.h include/geos/geom/LineSegment.h include/geos/geom/LineSegment.inl @@ -266,6 +266,7 @@ include/geos/operation/distance/DistanceOp.h include/geos/operation/distance/FacetSequence.h include/geos/operation/distance/FacetSequenceTreeBuilder.h include/geos/operation/distance/GeometryLocation.h +include/geos/operation/distance/IndexedFacetDistance.h include/geos/operation/intersection/Rectangle.h include/geos/operation/intersection/RectangleIntersection.h include/geos/operation/intersection/RectangleIntersectionBuilder.h @@ -388,6 +389,6 @@ lib/libgeos.so lib/libgeos_c.a lib/libgeos_c.so lib/libgeos_c.so.1 -lib/libgeos_c.so.1.10.3 +lib/libgeos_c.so.1.11.1 %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/geos.a %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/geos.so