Received: by mail.netbsd.org (Postfix, from userid 605) id 0980184D52; Thu, 28 Sep 2017 00:24:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 90D2984D48 for ; Thu, 28 Sep 2017 00:24:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id AkbEiojZ83CI for ; Thu, 28 Sep 2017 00:24:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id D1FB384D25 for ; Thu, 28 Sep 2017 00:24:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C8A06FA9C; Thu, 28 Sep 2017 00:24:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_150655828179280" MIME-Version: 1.0 Date: Thu, 28 Sep 2017 00:24:41 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/geography/geos To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20170928002441.C8A06FA9C@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_150655828179280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Thu Sep 28 00:24:41 UTC 2017 Modified Files: pkgsrc/geography/geos: Makefile PLIST distinfo pkgsrc/geography/geos/patches: patch-ae Log Message: Update to 3.6.2 Changes in 3.6.2 2017-07-25 - Bug fixes / improvements - Fix exception in UnaryUnion of collection of touching polygons (#837) - Allow building against python 3 (#774) - Fix build with android-ndk and other compilers (#799) - Allows compiling with -Wpointer-bool-conversion (#638) - Fix unhandled exception on invalid fp operation (#811) - Fix overloaded virtual print in DirectedEdge* (#812) - AppVeyor CI build added (#813) - Clean up numerous MSVC warnings, notably C4275 and C4589 (#814) - Bump CMake version to 3.0.0 (#817) - Fix leaks in WKT parser (#830) Changes in 3.6.1 2016-12-24 - Bug fixes / improvements - Fix GEOSSTRtree_nearest_r signature and add implementation (#796) - Fix --static-clibs and --static-cclibs returns from geos-config - Fix WKB representation of empty polygon (#680). - Fix empty GEOSSimplify return on inner ring collapse (#741) Changes in 3.6.0 2016-10-25 - Important / Breaking Changes: - The PHP binding moved to its own repository: http://git.osgeo.org/gogs/geos/php-geos (#765) - New things: - CAPI: GEOSGeom_{get,set}UserData (Rashad Kanavath) - CAPI: GEOSGeom_{set,get}Precision (#713) - CAPI: GEOSMinimumRotatedRectangle and GEOSMinimumWidth (#729, Nyall Dawson) - CAPI: GEOSSTRtree_nearest (#768, Dan Baston) - CAPI: GEOSMinimumClearance and GEOSMinimumClearanceLine (#776, Dan Baston) - C++ API changes: - Automatic memory management for GeometryFactory objects To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 pkgsrc/geography/geos/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/geography/geos/PLIST cvs rdiff -u -r1.26 -r1.27 pkgsrc/geography/geos/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/geography/geos/patches/patch-ae Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_150655828179280 Content-Disposition: inline Content-Length: 6205 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/geography/geos/Makefile diff -u pkgsrc/geography/geos/Makefile:1.29 pkgsrc/geography/geos/Makefile:1.30 --- pkgsrc/geography/geos/Makefile:1.29 Sun Jan 22 23:44:47 2017 +++ pkgsrc/geography/geos/Makefile Thu Sep 28 00:24:41 2017 @@ -1,12 +1,6 @@ -# $NetBSD: Makefile,v 1.29 2017/01/22 23:44:47 gdt Exp $ +# $NetBSD: Makefile,v 1.30 2017/09/28 00:24:41 gdt Exp $ -# Do not update to 3.6, because there is serious ABI breakage which -# prevents osm2pgsql from working, and may well cause other programs -# to have issues. osm2pgsql plans to stop using geos, and it seems -# better to have slightly old geos in pkgsrc then to have a bunch of -# broken other programs. Please email me if you have a problem with -# this. -- gdt, 20170122 -DISTNAME= geos-3.5.1 +DISTNAME= geos-3.6.2 CATEGORIES= geography MASTER_SITES= http://download.osgeo.org/geos/ EXTRACT_SUFX= .tar.bz2 @@ -22,10 +16,10 @@ EXTRACT_SUFX= .tar.bz2 # geos shlib name changes. However, people on the geos list dispute # this characterization. -# The following packages either incorrectly (from the geos -# READMEviewpoint) or suboptimally (from some comments ont he list) -# link directly against -lgeos and should be revbumped on every update -# (and perhaps fixed not to use -lgeos): +# The following packages either incorrectly (from the geos README +# viewpoint) or suboptimally (from some comments on the list) link +# directly against -lgeos and should be revbumped on every update (and +# perhaps fixed not to use -lgeos): # geography/gdal-lib # geoggraph/osm2pgsql # https://github.com/openstreetmap/osm2pgsql/issues/634 Index: pkgsrc/geography/geos/PLIST diff -u pkgsrc/geography/geos/PLIST:1.13 pkgsrc/geography/geos/PLIST:1.14 --- pkgsrc/geography/geos/PLIST:1.13 Sun Sep 6 19:45:44 2015 +++ pkgsrc/geography/geos/PLIST Thu Sep 28 00:24:41 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2015/09/06 19:45:44 gdt Exp $ +@comment $NetBSD: PLIST,v 1.14 2017/09/28 00:24:41 gdt Exp $ bin/geos-config include/geos.h include/geos/algorithm/Angle.h @@ -163,8 +163,11 @@ include/geos/index/quadtree/Root.h include/geos/index/strtree/AbstractNode.h include/geos/index/strtree/AbstractSTRtree.h include/geos/index/strtree/Boundable.h +include/geos/index/strtree/BoundablePair.h +include/geos/index/strtree/GeometryItemDistance.h include/geos/index/strtree/Interval.h include/geos/index/strtree/ItemBoundable.h +include/geos/index/strtree/ItemDistance.h include/geos/index/strtree/SIRtree.h include/geos/index/strtree/STRtree.h include/geos/index/sweepline/SweepLineEvent.h @@ -261,6 +264,8 @@ include/geos/operation/buffer/SubgraphDe include/geos/operation/distance/ConnectedElementLocationFilter.h include/geos/operation/distance/ConnectedElementPointFilter.h 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/intersection/Rectangle.h include/geos/operation/intersection/RectangleIntersection.h @@ -336,6 +341,7 @@ include/geos/precision/CommonBitsOp.h include/geos/precision/CommonBitsRemover.h include/geos/precision/EnhancedPrecisionOp.h include/geos/precision/GeometryPrecisionReducer.h +include/geos/precision/MinimumClearance.h include/geos/precision/PrecisionReducerCoordinateOperation.h include/geos/precision/SimpleGeometryPrecisionReducer.h include/geos/profiler.h Index: pkgsrc/geography/geos/distinfo diff -u pkgsrc/geography/geos/distinfo:1.26 pkgsrc/geography/geos/distinfo:1.27 --- pkgsrc/geography/geos/distinfo:1.26 Tue Oct 25 23:31:39 2016 +++ pkgsrc/geography/geos/distinfo Thu Sep 28 00:24:41 2017 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.26 2016/10/25 23:31:39 gdt Exp $ +$NetBSD: distinfo,v 1.27 2017/09/28 00:24:41 gdt Exp $ -SHA1 (geos-3.5.1.tar.bz2) = 83373542335c2f20c22d5420ba01d99f645f0c61 -RMD160 (geos-3.5.1.tar.bz2) = fff59826bfeca3e6519caad3551522a67ad29cca -SHA512 (geos-3.5.1.tar.bz2) = 6a05dbb401b963a7721dc03b1649a18ff5d0ab74ba1cfa7c000429c99bba7fe75b3bdc3abfd0839a93ce99d7c6c301b252172a3f7bdb49a2413d8d065ea0fae7 -Size (geos-3.5.1.tar.bz2) = 1930928 bytes -SHA1 (patch-ae) = 01ffd15e3562ff8fb191608dc12a2ee6918154b0 +SHA1 (geos-3.6.2.tar.bz2) = b9d0578c6b5308cf05a3dd8873802f9862c04291 +RMD160 (geos-3.6.2.tar.bz2) = 6efa217f1bfe5bb4a3de82e1899a97b3a8c90b9e +SHA512 (geos-3.6.2.tar.bz2) = 515d8700b8a28282678e481faee355e3a43d7b70160472a63335b8d7225d9ba10437be782378f18f31a15288118126d411a2d862f01ce35d27c96f6bc0a73016 +Size (geos-3.6.2.tar.bz2) = 2030705 bytes +SHA1 (patch-ae) = f4befa15f66a6e5b30dce57f0abb34af4c3264c8 SHA1 (patch-capi_geos__ts__c.cpp) = 0c266de00722606bcb9637f21f5c3c458f12cb47 Index: pkgsrc/geography/geos/patches/patch-ae diff -u pkgsrc/geography/geos/patches/patch-ae:1.4 pkgsrc/geography/geos/patches/patch-ae:1.5 --- pkgsrc/geography/geos/patches/patch-ae:1.4 Sun Aug 18 11:06:25 2013 +++ pkgsrc/geography/geos/patches/patch-ae Thu Sep 28 00:24:41 2017 @@ -1,10 +1,10 @@ -$NetBSD: patch-ae,v 1.4 2013/08/18 11:06:25 gdt Exp $ +$NetBSD: patch-ae,v 1.5 2017/09/28 00:24:41 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 2013-08-11 04:23:41.000000000 +0000 +--- tools/geos-config.in.orig 2016-11-22 10:49:08.000000000 +0000 +++ tools/geos-config.in @@ -43,22 +43,22 @@ case $1 in --libs) @@ -22,16 +22,16 @@ TODO: report upstream. + echo -L${libdir} @LDFLAGS@ -lgeos ;; --static-clibs) -- echo -L${libdir} -lgeos_c -lgeos -m -+ echo -L${libdir} @LDFLAGS@ -lgeos_c -lgeos -m +- echo -L${libdir} -lgeos_c -lgeos -lm ++ echo -L${libdir} @LDFLAGS@ -lgeos_c -lgeos -lm ;; --static-cclibs) -- echo -L${libdir} -lgeos -m -+ echo -L${libdir} @LDFLAGS@ -lgeos -m +- echo -L${libdir} -lgeos -lm ++ echo -L${libdir} @LDFLAGS@ -lgeos -lm ;; --ldflags) - echo -L${libdir} -+ echo @LDFLAGS@ -L${libdir} ++ echo -L${libdir} @LDFLAGS@ ;; --includes) echo ${prefix}/include --_----------=_150655828179280--