Index: head/databases/sfcgal/files/patch-CMakeLists.txt =================================================================== --- head/databases/sfcgal/files/patch-CMakeLists.txt (revision 540979) +++ head/databases/sfcgal/files/patch-CMakeLists.txt (nonexistent) @@ -1,24 +0,0 @@ ---- CMakeLists.txt.orig 2019-06-03 10:11:36 UTC -+++ CMakeLists.txt -@@ -2,6 +2,7 @@ cmake_minimum_required( VERSION 2.8 ) - project( SFCGAL ) - - set( CMAKE_DEBUG_POSTFIX "d" ) -+set(CMAKE_CXX_STANDARD 14) - - #---------------------------------------------------------------------------- - # build options -@@ -56,8 +57,12 @@ endif() - - # 4.3 minimal - # 4.13 recommended --find_package( CGAL 4.3 COMPONENTS Core REQUIRED ) -+find_package( CGAL COMPONENTS Core REQUIRED ) - message( STATUS "CGAL ${CGAL_VERSION} found" ) -+ -+if( "${CGAL_VERSION}" VERSION_GREATER_EQUAL "5.0.0") -+add_definitions( "-DCGAL_USE_GMPXX=1" ) -+endif() - - include_directories( ${CMAKE_BINARY_DIR}/include ) - Property changes on: head/databases/sfcgal/files/patch-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/sfcgal/files/patch-src_config.h.cmake =================================================================== --- head/databases/sfcgal/files/patch-src_config.h.cmake (revision 540979) +++ head/databases/sfcgal/files/patch-src_config.h.cmake (nonexistent) @@ -1,10 +0,0 @@ ---- src/config.h.cmake.orig 2019-06-03 10:11:36 UTC -+++ src/config.h.cmake -@@ -21,7 +21,6 @@ - #define _SFCGAL_CONFIG_H_ - - #define CGAL_DO_NOT_USE_BOOST_MP 1 --#define CGAL_DO_NOT_USE_GMPXX 1 - - #include - Property changes on: head/databases/sfcgal/files/patch-src_config.h.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/sfcgal/files/patch-src_CMakeLists.txt =================================================================== --- head/databases/sfcgal/files/patch-src_CMakeLists.txt (revision 540979) +++ head/databases/sfcgal/files/patch-src_CMakeLists.txt (nonexistent) @@ -1,13 +0,0 @@ ---- src/CMakeLists.txt.orig 2019-06-03 10:11:36 UTC -+++ src/CMakeLists.txt -@@ -47,6 +47,10 @@ set_target_properties( SFCGAL PROPERTIES VERSION ${SFC - - target_link_libraries( SFCGAL CGAL::CGAL CGAL::CGAL_Core) - -+if( "${CGAL_VERSION}" VERSION_GREATER_EQUAL "5.0.0") -+target_link_libraries( SFCGAL gmpxx ) -+endif() -+ - target_link_libraries( SFCGAL ${Boost_LIBRARIES} ) - - if ( ${Use_precompiled_headers} ) Property changes on: head/databases/sfcgal/files/patch-src_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/sfcgal/Makefile =================================================================== --- head/databases/sfcgal/Makefile (revision 540979) +++ head/databases/sfcgal/Makefile (revision 540980) @@ -1,29 +1,28 @@ # Created by: Loïc BARTOLETTI # $FreeBSD$ PORTNAME= sfcgal DISTVERSIONPREFIX= v -DISTVERSION= 1.3.7 -PORTREVISION= 3 +DISTVERSION= 1.3.8 CATEGORIES= databases math graphics MAINTAINER= lbartoletti@FreeBSD.org COMMENT= Wrapper library around CGAL for PostGIS LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cgal>0:math/cgal LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libgmp.so:math/gmp \ libmpfr.so:math/mpfr -USES= cmake compiler:c++14-lang libtool +USES= cmake compiler:c++14-lang USE_GITHUB= yes GH_ACCOUNT= Oslandia GH_PROJECT= SFCGAL USE_LDCONFIG= yes PLIST_SUB= SHL3=${PORTVERSION} SHL1=${PORTVERSION:R:R} .include Index: head/databases/sfcgal/distinfo =================================================================== --- head/databases/sfcgal/distinfo (revision 540979) +++ head/databases/sfcgal/distinfo (revision 540980) @@ -1,3 +1,3 @@ -TIMESTAMP = 1563903428 -SHA256 (Oslandia-SFCGAL-v1.3.7_GH0.tar.gz) = 30ea1af26cb2f572c628aae08dd1953d80a69d15e1cac225390904d91fce031b -SIZE (Oslandia-SFCGAL-v1.3.7_GH0.tar.gz) = 2473776 +TIMESTAMP = 1593440266 +SHA256 (Oslandia-SFCGAL-v1.3.8_GH0.tar.gz) = 5154bfc67a5e99d95cb653d70d2b9d9293d3deb3c8f18b938a33d68fec488a6d +SIZE (Oslandia-SFCGAL-v1.3.8_GH0.tar.gz) = 2480730 Index: head/databases/sfcgal/pkg-plist =================================================================== --- head/databases/sfcgal/pkg-plist (revision 540979) +++ head/databases/sfcgal/pkg-plist (revision 540980) @@ -1,109 +1,111 @@ bin/sfcgal-config include/SFCGAL/Coordinate.h include/SFCGAL/Envelope.h include/SFCGAL/Exception.h include/SFCGAL/Geometry.h include/SFCGAL/GeometryCollection.h include/SFCGAL/GeometryVisitor.h include/SFCGAL/Kernel.h include/SFCGAL/LineString.h include/SFCGAL/MultiLineString.h include/SFCGAL/MultiPoint.h include/SFCGAL/MultiPolygon.h include/SFCGAL/MultiSolid.h include/SFCGAL/Point.h include/SFCGAL/Polygon.h include/SFCGAL/PolyhedralSurface.h include/SFCGAL/PreparedGeometry.h include/SFCGAL/Solid.h include/SFCGAL/Surface.h include/SFCGAL/Transform.h include/SFCGAL/Triangle.h include/SFCGAL/TriangulatedSurface.h include/SFCGAL/Validity.h include/SFCGAL/algorithm/BoundaryVisitor.h include/SFCGAL/algorithm/ConsistentOrientationBuilder.h include/SFCGAL/algorithm/area.h include/SFCGAL/algorithm/collect.h include/SFCGAL/algorithm/collectionExtract.h include/SFCGAL/algorithm/collectionHomogenize.h include/SFCGAL/algorithm/collectionToMulti.h include/SFCGAL/algorithm/connection.h include/SFCGAL/algorithm/convexHull.h include/SFCGAL/algorithm/covers.h include/SFCGAL/algorithm/difference.h include/SFCGAL/algorithm/differencePrimitives.h include/SFCGAL/algorithm/distance.h include/SFCGAL/algorithm/distance3d.h include/SFCGAL/algorithm/extrude.h include/SFCGAL/algorithm/force2D.h include/SFCGAL/algorithm/force3D.h include/SFCGAL/algorithm/intersection.h include/SFCGAL/algorithm/intersects.h include/SFCGAL/algorithm/isValid.h include/SFCGAL/algorithm/length.h +include/SFCGAL/algorithm/lineSubstring.h include/SFCGAL/algorithm/minkowskiSum.h include/SFCGAL/algorithm/normal.h include/SFCGAL/algorithm/offset.h include/SFCGAL/algorithm/orientation.h include/SFCGAL/algorithm/plane.h include/SFCGAL/algorithm/straightSkeleton.h include/SFCGAL/algorithm/tesselate.h include/SFCGAL/algorithm/translate.h include/SFCGAL/algorithm/union.h include/SFCGAL/algorithm/volume.h include/SFCGAL/capi/sfcgal_c.h include/SFCGAL/config.h include/SFCGAL/detail/ComplexComparator.h include/SFCGAL/detail/EnvelopeVisitor.h include/SFCGAL/detail/ForceValidityVisitor.h include/SFCGAL/detail/GeometrySet.h include/SFCGAL/detail/GetPointsVisitor.h include/SFCGAL/detail/Interval.h include/SFCGAL/detail/Point_inside_polyhedron.h include/SFCGAL/detail/TestGeometry.h include/SFCGAL/detail/TypeForDimension.h include/SFCGAL/detail/algorithm/coversPoints.h include/SFCGAL/detail/generator/building.h include/SFCGAL/detail/generator/disc.h include/SFCGAL/detail/generator/hoch.h include/SFCGAL/detail/generator/sierpinski.h include/SFCGAL/detail/graph/Edge.h include/SFCGAL/detail/graph/GeometryGraph.h include/SFCGAL/detail/graph/GeometryGraphBuilder.h include/SFCGAL/detail/graph/Vertex.h include/SFCGAL/detail/graph/algorithm/isHalfEdge.h include/SFCGAL/detail/graph/algorithm/orientation.h include/SFCGAL/detail/io/OsgFactory.h include/SFCGAL/detail/io/Serialization.h include/SFCGAL/detail/io/WktReader.h include/SFCGAL/detail/io/WktWriter.h include/SFCGAL/detail/polygonSetToMultiPolygon.h include/SFCGAL/detail/tools/CharArrayBuffer.h include/SFCGAL/detail/tools/InputStreamReader.h include/SFCGAL/detail/tools/Log.h include/SFCGAL/detail/tools/Registry.h include/SFCGAL/detail/transform/AffineTransform2.h include/SFCGAL/detail/transform/AffineTransform3.h include/SFCGAL/detail/transform/Force2D.h include/SFCGAL/detail/transform/ForceOrderPoints.h include/SFCGAL/detail/transform/ForceZ.h include/SFCGAL/detail/transform/ForceZOrderPoints.h include/SFCGAL/detail/transform/RoundTransform.h include/SFCGAL/detail/triangulate/ConstraintDelaunayTriangulation.h include/SFCGAL/detail/triangulate/markDomains.h include/SFCGAL/detail/triangulate/triangulateInGeometrySet.h include/SFCGAL/detail/ublas.h include/SFCGAL/export.h include/SFCGAL/io/GeometryStreams.h include/SFCGAL/io/ewkt.h include/SFCGAL/io/osg.h include/SFCGAL/io/vtk.h include/SFCGAL/io/wkt.h include/SFCGAL/numeric.h include/SFCGAL/triangulate/triangulate2DZ.h include/SFCGAL/triangulate/triangulatePolygon.h include/SFCGAL/version.h lib/libSFCGAL.so lib/libSFCGAL.so.%%SHL1%% lib/libSFCGAL.so.%%SHL3%% +libdata/pkgconfig/sfcgal.pc