Date: Tue, 20 Aug 2013 09:50:01 GMT From: Rainer Hurling <rhurlin@gwdg.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/181422: [PATCH] graphics/geos: update to 3.4.1 Message-ID: <201308200950.r7K9o1QM099386@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/181422; it has been noted by GNATS. From: Rainer Hurling <rhurlin@gwdg.de> To: bug-followup@FreeBSD.org, rhurlin@gwdg.de Cc: Subject: Re: ports/181422: [PATCH] graphics/geos: update to 3.4.1 Date: Tue, 20 Aug 2013 11:19:27 +0200 This is a multi-part message in MIME format. --------------070205030001090102050306 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit I just tested some more ports with updated graphics/geos and had some trouble with missing file 'platform.h'. For example converters/osm2pgsql is complaining about 'geos/platform.h' not found, when trying to use 'include/geos/geom/Coordinate.h'. For some reason graphics/geos 3.4.1 does generate the file platform.h, but does not install it. As a workaround I added a patch under 'files', which brings in platform.h the hard way in 'include/geos/Makefile.in'. The following patch should contain the complete patchset again for updating from version 3.3.8 to 3.4.1. --------------070205030001090102050306 Content-Type: text/plain; charset=UTF-8; name="patch_geos_3.3.8-3.4.1_2.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch_geos_3.3.8-3.4.1_2.txt" diff -Naur geos.orig/Makefile geos/Makefile --- geos.orig/Makefile 2013-06-20 20:19:36.000000000 +0200 +++ geos/Makefile 2013-08-20 08:47:05.000000000 +0200 @@ -2,7 +2,7 @@ # $FreeBSD: head/graphics/geos/Makefile 314479 2013-03-17 18:29:38Z beech $ PORTNAME= geos -PORTVERSION= 3.3.8 +PORTVERSION= 3.4.1 CATEGORIES= graphics geography MASTER_SITES= http://download.osgeo.org/geos/ diff -Naur geos.orig/distinfo geos/distinfo --- geos.orig/distinfo 2013-06-20 20:19:36.000000000 +0200 +++ geos/distinfo 2013-08-20 07:51:46.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (geos-3.3.8.tar.bz2) = ebecd4d1a71bcc28e5e883296cd8c52a80d5596335e74728f320989734fa503b -SIZE (geos-3.3.8.tar.bz2) = 1820064 +SHA256 (geos-3.4.1.tar.bz2) = d07ac375f3edd12425d6ce5a96db9739d5ff358cbdf60c6804f7a9e565af8ff2 +SIZE (geos-3.4.1.tar.bz2) = 1813303 diff -Naur geos.orig/files/patch-include__geos__Makefile.in geos/files/patch-include__geos__Makefile.in --- geos.orig/files/patch-include__geos__Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ geos/files/patch-include__geos__Makefile.in 2013-08-20 11:03:14.000000000 +0200 @@ -0,0 +1,10 @@ +--- include/geos/Makefile.in.orig 2013-08-17 16:08:12.000000000 +0200 ++++ include/geos/Makefile.in 2013-08-20 11:01:36.000000000 +0200 +@@ -338,6 +338,7 @@ + opRelate.h \ + opValid.h \ + planargraph.h \ ++ platform.h \ + precision.h \ + profiler.h \ + spatialIndex.h \ diff -Naur geos.orig/pkg-plist geos/pkg-plist --- geos.orig/pkg-plist 2013-06-20 20:19:36.000000000 +0200 +++ geos/pkg-plist 2013-08-20 11:04:23.000000000 +0200 @@ -4,25 +4,17 @@ include/geos/algorithm/BoundaryNodeRule.h include/geos/algorithm/CGAlgorithms.h include/geos/algorithm/CentralEndpointIntersector.h +include/geos/algorithm/Centroid.h include/geos/algorithm/CentroidArea.h include/geos/algorithm/CentroidLine.h include/geos/algorithm/CentroidPoint.h include/geos/algorithm/ConvexHull.h include/geos/algorithm/ConvexHull.inl -include/geos/algorithm/ExtractLineByLocation.h include/geos/algorithm/HCoordinate.h include/geos/algorithm/InteriorPointArea.h include/geos/algorithm/InteriorPointLine.h include/geos/algorithm/InteriorPointPoint.h -include/geos/algorithm/LengthIndexOfPoint.h -include/geos/algorithm/LengthIndexedLine.h -include/geos/algorithm/LengthLocationMap.h include/geos/algorithm/LineIntersector.h -include/geos/algorithm/LinearGeometryBuilder.h -include/geos/algorithm/LinearIterator.h -include/geos/algorithm/LinearLocation.h -include/geos/algorithm/LocationIndexOfLine.h -include/geos/algorithm/LocationIndexOfPoint.h include/geos/algorithm/MCPointInRing.h include/geos/algorithm/MinimumDiameter.h include/geos/algorithm/NotRepresentableException.h @@ -198,10 +190,21 @@ include/geos/io/WKTReader.inl include/geos/io/WKTWriter.h include/geos/io/Writer.h +include/geos/linearref/ExtractLineByLocation.h +include/geos/linearref/LengthIndexOfPoint.h +include/geos/linearref/LengthIndexedLine.h +include/geos/linearref/LengthLocationMap.h +include/geos/linearref/LinearGeometryBuilder.h +include/geos/linearref/LinearIterator.h +include/geos/linearref/LinearLocation.h +include/geos/linearref/LocationIndexOfLine.h +include/geos/linearref/LocationIndexOfPoint.h +include/geos/linearref/LocationIndexedLine.h include/geos/noding.h include/geos/noding/BasicSegmentString.h include/geos/noding/FastNodingValidator.h include/geos/noding/FastSegmentSetIntersectionFinder.h +include/geos/noding/GeometryNoder.h include/geos/noding/IntersectionAdder.h include/geos/noding/IntersectionFinderAdder.h include/geos/noding/IteratedNoder.h @@ -222,7 +225,6 @@ include/geos/noding/SegmentPointComparator.h include/geos/noding/SegmentSetMutualIntersector.h include/geos/noding/SegmentString.h -include/geos/noding/SegmentString.inl include/geos/noding/SegmentStringUtil.h include/geos/noding/SimpleNoder.h include/geos/noding/SingleInteriorIntersectionFinder.h @@ -245,6 +247,7 @@ include/geos/operation/GeometryGraphOperation.h include/geos/operation/IsSimpleOp.h include/geos/operation/buffer/BufferBuilder.h +include/geos/operation/buffer/BufferInputLineSimplifier.h include/geos/operation/buffer/BufferOp.h include/geos/operation/buffer/BufferParameters.h include/geos/operation/buffer/BufferSubgraph.h @@ -328,6 +331,8 @@ include/geos/precision/CommonBitsOp.h include/geos/precision/CommonBitsRemover.h include/geos/precision/EnhancedPrecisionOp.h +include/geos/precision/GeometryPrecisionReducer.h +include/geos/precision/PrecisionReducerCoordinateOperation.h include/geos/precision/SimpleGeometryPrecisionReducer.h include/geos/profiler.h include/geos/simplify/DouglasPeuckerLineSimplifier.h @@ -340,6 +345,16 @@ include/geos/simplify/TopologyPreservingSimplifier.h include/geos/spatialIndex.h include/geos/timeval.h +include/geos/triangulate/DelaunayTriangulationBuilder.h +include/geos/triangulate/IncrementalDelaunayTriangulator.h +include/geos/triangulate/quadedge/LastFoundQuadEdgeLocator.h +include/geos/triangulate/quadedge/LocateFailureException.h +include/geos/triangulate/quadedge/QuadEdge.h +include/geos/triangulate/quadedge/QuadEdgeLocator.h +include/geos/triangulate/quadedge/QuadEdgeSubdivision.h +include/geos/triangulate/quadedge/TrianglePredicate.h +include/geos/triangulate/quadedge/TriangleVisitor.h +include/geos/triangulate/quadedge/Vertex.h include/geos/unload.h include/geos/util.h include/geos/util/Assert.h @@ -349,6 +364,7 @@ include/geos/util/GeometricShapeFactory.h include/geos/util/IllegalArgumentException.h include/geos/util/IllegalStateException.h +include/geos/util/Interrupt.h include/geos/util/Machine.h include/geos/util/TopologyException.h include/geos/util/UniqueCoordinateArrayFilter.h @@ -356,7 +372,7 @@ include/geos/util/math.h include/geos/version.h include/geos_c.h -lib/libgeos-3.3.8.so +lib/libgeos-3.4.1.so lib/libgeos.a lib/libgeos.la lib/libgeos.so @@ -364,9 +380,11 @@ lib/libgeos_c.a lib/libgeos_c.la lib/libgeos_c.so -lib/libgeos_c.so.8 +lib/libgeos_c.so.9 @dirrmtry lib/geos @dirrm include/geos/util +@dirrm include/geos/triangulate/quadedge +@dirrm include/geos/triangulate @dirrm include/geos/simplify @dirrm include/geos/precision @dirrm include/geos/planargraph/algorithm @@ -385,6 +403,7 @@ @dirrm include/geos/operation @dirrm include/geos/noding/snapround @dirrm include/geos/noding +@dirrm include/geos/linearref @dirrm include/geos/io @dirrm include/geos/index/sweepline @dirrm include/geos/index/strtree --------------070205030001090102050306--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308200950.r7K9o1QM099386>