Index: head/databases/sfcgal/Makefile =================================================================== --- head/databases/sfcgal/Makefile +++ head/databases/sfcgal/Makefile @@ -3,8 +3,7 @@ PORTNAME= sfcgal DISTVERSIONPREFIX= v -DISTVERSION= 1.3.7 -PORTREVISION= 3 +DISTVERSION= 1.3.8 CATEGORIES= databases math graphics MAINTAINER= lbartoletti@FreeBSD.org @@ -18,7 +17,7 @@ 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 Index: head/databases/sfcgal/distinfo =================================================================== --- head/databases/sfcgal/distinfo +++ head/databases/sfcgal/distinfo @@ -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/files/patch-CMakeLists.txt =================================================================== --- head/databases/sfcgal/files/patch-CMakeLists.txt +++ head/databases/sfcgal/files/patch-CMakeLists.txt @@ -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 ) - Index: head/databases/sfcgal/files/patch-src_CMakeLists.txt =================================================================== --- head/databases/sfcgal/files/patch-src_CMakeLists.txt +++ head/databases/sfcgal/files/patch-src_CMakeLists.txt @@ -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} ) Index: head/databases/sfcgal/files/patch-src_config.h.cmake =================================================================== --- head/databases/sfcgal/files/patch-src_config.h.cmake +++ head/databases/sfcgal/files/patch-src_config.h.cmake @@ -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 - Index: head/databases/sfcgal/pkg-plist =================================================================== --- head/databases/sfcgal/pkg-plist +++ head/databases/sfcgal/pkg-plist @@ -42,6 +42,7 @@ 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 @@ -107,3 +108,4 @@ lib/libSFCGAL.so lib/libSFCGAL.so.%%SHL1%% lib/libSFCGAL.so.%%SHL3%% +libdata/pkgconfig/sfcgal.pc