diff --git a/math/saga/Makefile b/math/saga/Makefile index 2bb3ddeb1268..d10355f3b672 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -1,108 +1,107 @@ PORTNAME= saga -PORTVERSION= 9.3.2 -PORTREVISION= 1 +PORTVERSION= 9.4.0 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} MAINTAINER= rhurlin@FreeBSD.org COMMENT= System for Automated Geoscientific Analyses WWW= http://www.saga-gis.org/en/index.html LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi .if !exists(/usr/include/omp.h) BROKEN= requires OpenMP support that is missing on this architecture .endif BUILD_DEPENDS= swig:devel/swig LIB_DEPENDS= libcurl.so:ftp/curl \ libfftw3.so:math/fftw3 \ libgdal.so:graphics/gdal \ libhdf5.so:science/hdf5 \ libhpdf.so:print/libharu \ libodbc.so:databases/unixODBC \ libopencv_core.so:graphics/opencv \ libpdalcpp.so:math/pdal \ libproj.so:graphics/proj \ libsvm.so:science/libsvm \ libsz.so:science/libaec \ libtiff.so:graphics/tiff RUN_DEPENDS:= swig:devel/swig USES= cmake compiler:c++17-lang desktop-file-utils dos2unix gnome \ iconv:wchar_t libtool localbase pkgconfig python DOS2UNIX_GLOB= *.cpp *.h USE_LDCONFIG= yes USE_WX= 3.2+ -GIT_TAGNAME= dbab6034ef8e +GIT_TAGNAME= 0c6bbea57 CMAKE_ARGS= -DSVM_INCLUDE:PATH=${LOCALBASE}/include/svm.h CMAKE_ON= CMAKE_VERBOSE_MAKEFILE CMAKE_ON+= WITH_DEV_TOOLS CMAKE_ON+= WITH_EXCERCISES CMAKE_ON+= WITH_LIFETIME_TRACKER CMAKE_ON+= WITH_MRMR CMAKE_ON+= WITH_SYSTEM_SVM CMAKE_ON+= WITH_TOOLS_HPDF CMAKE_ON+= WITH_TOOLS_OPENCV CMAKE_ON+= WITH_PYTHON_PKG CMAKE_ON+= WITH_TOOLS_PDAL CMAKE_ON+= WITH_TOOLS_POSTGRES CMAKE_ON+= WITH_TOOLS_PROJ CMAKE_OFF= WITH_CLIPPER_ONE CMAKE_OFF+= WITH_TOOLS_RIEGL SUB_FILES= pkg-message WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}-gis PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= PGSQL OPENMP VIGRA OPTIONS_DEFAULT= PGSQL VIGRA OPTIONS_DEFAULT_amd64= OPENMP OPTIONS_DEFAULT_i386= OPENMP OPTIONS_DEFAULT_powerpc64= OPENMP OPTIONS_DEFAULT_powerpc64le= OPENMP NO_OPTIONS_SORT= yes OPTIONS_SUB= yes OPENMP_DESC= Enable Multiprocessing (only amd64, i386 and powerpc64*) VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library OPENMP_CONFIGURE_ENABLE= openmp PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= postgresql VIGRA_BUILD_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra VIGRA_RUN_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra .include SUB_FILES= pkg-message post-patch: .if ${ARCH} == "powerpc" @${REINPLACE_CMD} -e 's|typedef unsigned long DWORD;|typedef unsigned int DWORD;|' \ ${WRKSRC}/src/saga_core/saga_api/api_core.h .endif @${REINPLACE_CMD} -e 's|GIT_TAGNAME|${GIT_TAGNAME}|g' \ ${WRKSRC}/src/saga_core/saga_gui/CMakeLists.txt \ ${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp @${REINPLACE_CMD} -e 's|-lgomp|-lomp|' \ ${WRKSRC}/src/accessories/templates/template4saga-tools/my_tool_library/Makefile post-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga*.txt ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR} ${RM} ${STAGEDIR}${DATADIR}/saga_dic.txt ${STAGEDIR}${DATADIR}/saga_srs.txt # Put accessories under share/saga, python/data already under site-packages/PySAGA ;) (cd ${WRKSRC}/src/accessories && ${RM} -R python) (cd ${WRKSRC}/src/accessories && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) ${RM} -R ${STAGEDIR}${DATADIR}/CMakeLists.txt ${RM} -R ${STAGEDIR}${DATADIR}/templates/template4saga-tools/my_tool_library/Makefile.bak # library helper files are not needed and cripple some math/qgis extensions @${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la .include diff --git a/math/saga/distinfo b/math/saga/distinfo index 2d6aa1c9fe49..9b76df56a4c8 100644 --- a/math/saga/distinfo +++ b/math/saga/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1710272993 -SHA256 (saga-9.3.2.tar.gz) = ef8d4ee82eda9b14a738e4e579d1748b39958624fbf6d148e3e10eb6936a3f64 -SIZE (saga-9.3.2.tar.gz) = 9110511 +TIMESTAMP = 1713242953 +SHA256 (saga-9.4.0.tar.gz) = df78e612b5f65e5c83b5dc7bebe533917a35b27c04d16683a461c7bd9cfa83e2 +SIZE (saga-9.4.0.tar.gz) = 9184622 diff --git a/math/saga/files/patch-cmake_modules_FindPDAL.cmake b/math/saga/files/patch-cmake_modules_FindPDAL.cmake deleted file mode 100644 index e6879b50383c..000000000000 --- a/math/saga/files/patch-cmake_modules_FindPDAL.cmake +++ /dev/null @@ -1,23 +0,0 @@ ---- cmake/modules/FindPDAL.cmake.orig 2024-02-22 20:36:47 UTC -+++ cmake/modules/FindPDAL.cmake -@@ -35,17 +35,10 @@ FIND_LIBRARY(PDAL_CPP_LIBRARY NAMES pdalcpp libpdalcpp - ) - FIND_LIBRARY(PDAL_CPP_LIBRARY NAMES pdalcpp libpdalcpp) - --FIND_LIBRARY(PDAL_UTIL_LIBRARY NAMES pdal_util libpdal_util PATHS -- "$ENV{LIB_DIR}/lib" -- c:/msys/local/lib -- NO_DEFAULT_PATH -- ) --FIND_LIBRARY(PDAL_UTIL_LIBRARY NAMES pdal_util libpdal_util) -- --IF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY) -+IF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY) - SET(PDAL_FOUND TRUE) -- SET(PDAL_LIBRARIES ${PDAL_CPP_LIBRARY} ${PDAL_UTIL_LIBRARY}) --ENDIF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY) -+ SET(PDAL_LIBRARIES ${PDAL_CPP_LIBRARY}) -+ENDIF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY) - - IF (PDAL_FOUND) - IF (NOT PDAL_FIND_QUIETLY) diff --git a/math/saga/files/patch-src_tools_io_io__pdal_CMakeLists.txt b/math/saga/files/patch-src_tools_io_io__pdal_CMakeLists.txt deleted file mode 100644 index bda10dfd1e8d..000000000000 --- a/math/saga/files/patch-src_tools_io_io__pdal_CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ ---- src/tools/io/io_pdal/CMakeLists.txt.orig 2024-02-22 20:37:05 UTC -+++ src/tools/io/io_pdal/CMakeLists.txt -@@ -9,11 +9,10 @@ if(WITH_TOOLS_PDAL) - endif() - find_path (PDAL_INCLUDE_DIR NAMES pdal/pdal.hpp PATHS "${LIB4SAGA}/include") - find_library(PDAL_LIBRARY_CPP NAMES pdalcpp libpdalcpp PATHS "${LIB4SAGA}/lib") -- find_library(PDAL_LIBRARY_UTIL NAMES pdal_util libpdal_util PATHS "${LIB4SAGA}/lib") -- mark_as_advanced(PDAL_INCLUDE_DIR PDAL_LIBRARY_CPP PDAL_LIBRARY_UTIL) -+ mark_as_advanced(PDAL_INCLUDE_DIR PDAL_LIBRARY_CPP) - include(FindPackageHandleStandardArgs) -- FIND_PACKAGE_HANDLE_STANDARD_ARGS(PDAL REQUIRED_VARS PDAL_LIBRARY_UTIL PDAL_LIBRARY_CPP PDAL_INCLUDE_DIR) -- set(PDAL_LIBRARIES ${PDAL_LIBRARY_CPP} ${PDAL_LIBRARY_UTIL} ws2_32) -+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PDAL REQUIRED_VARS PDAL_LIBRARY_CPP PDAL_INCLUDE_DIR) -+ set(PDAL_LIBRARIES ${PDAL_LIBRARY_CPP} ws2_32) - endif() - if(NOT PDAL_FOUND) - find_package(PDAL QUIET) # link PDAL library