diff --git a/gis/liblas/Portfile b/gis/liblas/Portfile index b7420453a92..00431466d8f 100644 --- a/gis/liblas/Portfile +++ b/gis/liblas/Portfile @@ -5,19 +5,18 @@ PortGroup cmake 1.1 PortGroup github 1.0 PortGroup boost 1.0 -github.setup libLAS libLAS 62f3d57215ba1b074a84ff08a1539b69e69e38fb +github.setup libLAS libLAS 0756b73ed41211d1bb8d9b96c6767f2350d8fe2b github.tarball_from archive -version 1.8.1-20240917 +version 1.8.1-20251108 revision 0 -checksums rmd160 ff81bc0217cf795b8758fdccc78466a910684037 \ - sha256 1d5c42bbbb3068ddfaf51b6e8c9665fdc8870263ba071466e0c0981fd4173ed4 \ - size 10744315 +checksums rmd160 11a9be43477b7afba465f6cd62ec9e4a006bd169 \ + sha256 72d0e479c8381ad7f0a072082fab28b9ff5089b1e4fbaeca376cf0ae10be4b9a \ + size 10744329 name liblas license BSD categories gis maintainers nomaintainer -platforms darwin description LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset long_description \ @@ -31,8 +30,7 @@ homepage https://liblas.org/ compiler.cxx_standard \ 2014 -patchfiles patch-gt_wkt_srs_cpp.diff \ - patch-apps_CMakeLists.txt.diff +patchfiles patch-apps_CMakeLists.txt.diff post-patch { reinplace "s|c++11|c++14|g" CMakeLists.txt diff --git a/gis/liblas/files/no-rpath.patch b/gis/liblas/files/no-rpath.patch deleted file mode 100644 index 0e41e10cb88..00000000000 --- a/gis/liblas/files/no-rpath.patch +++ /dev/null @@ -1,33 +0,0 @@ -Don't use rpath. - -https://github.com/libLAS/libLAS/pull/185 ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -67,7 +67,6 @@ mark_as_advanced(CMAKE_VERBOSE_MAKEFILE) - - # Path to additional CMake modules - set(CMAKE_MODULE_PATH "${libLAS_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH}) --set(CMAKE_MACOSX_RPATH OFF) - - ############################################################################### - # General build settings ---- src/CMakeLists.txt.orig -+++ src/CMakeLists.txt -@@ -248,17 +248,6 @@ target_include_directories(las_c - $ - $) - --if (APPLE) -- set_target_properties( -- las_c -- PROPERTIES -- INSTALL_NAME_DIR "@rpath" BUILD_WITH_INSTALL_RPATH ON) -- set_target_properties( -- las -- PROPERTIES -- INSTALL_NAME_DIR "@rpath" BUILD_WITH_INSTALL_RPATH ON) --endif() -- - ############################################################################### - # Targets installation. The EXPORT clause specifies a depends target - # which packages up information about the libraries for diff --git a/gis/liblas/files/patch-gt_wkt_srs_cpp.diff b/gis/liblas/files/patch-gt_wkt_srs_cpp.diff deleted file mode 100644 index e78df7d5ba6..00000000000 --- a/gis/liblas/files/patch-gt_wkt_srs_cpp.diff +++ /dev/null @@ -1,31 +0,0 @@ -FixupOrdering was removed in gdal 2.5.0. - -https://github.com/libLAS/libLAS/issues/164 - -error: no member named 'FixupOrdering' in 'OGRSpatialReference' ---- src/gt_wkt_srs.cpp.orig 2020-05-08 15:45:31.000000000 -0500 -+++ src/gt_wkt_srs.cpp 2020-06-08 19:25:08.000000000 -0500 -@@ -299,7 +299,6 @@ - oSRS.SetFromUserInput(pszWKT); - oSRS.SetExtension( "PROJCS", "PROJ4", - "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs" ); -- oSRS.FixupOrdering(); - CPLFree(pszWKT); - pszWKT = NULL; - oSRS.exportToWkt(&pszWKT); -@@ -505,7 +504,6 @@ - { - char *pszWKT; - oSRS.morphFromESRI(); -- oSRS.FixupOrdering(); - if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE ) - return pszWKT; - } -@@ -1107,7 +1105,6 @@ - /* ==================================================================== */ - char *pszWKT; - -- oSRS.FixupOrdering(); - - if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE ) - return pszWKT;