Index: head/math/saga/Makefile =================================================================== --- head/math/saga/Makefile (revision 472648) +++ head/math/saga/Makefile (revision 472649) @@ -1,114 +1,124 @@ # Created by: Rainer Hurling # $FreeBSD$ PORTNAME= saga -PORTVERSION= 6.1.0 -PORTREVISION= 4 +PORTVERSION= 6.3.0 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} MAINTAINER= rhurlin@gwdg.de COMMENT= System for Automated Geoscientific Analyses LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -BUILD_DEPENDS= swig3.0:devel/swig30 +BUILD_DEPENDS= clang50:devel/llvm50 \ + swig3.0:devel/swig30 LIB_DEPENDS= libfftw3.so:math/fftw3 \ libgdal.so:graphics/gdal \ libhpdf.so:print/libharu \ libjasper.so:graphics/jasper \ - liblas.so:devel/liblas12 \ + liblas12.so:devel/liblas12 \ libodbc.so:databases/unixODBC \ libopencv_core.so:graphics/opencv-core \ libopencv_ml.so:graphics/opencv \ libproj.so:graphics/proj \ libsvm.so:science/libsvm \ libtbb.so:devel/tbb \ libtiff.so:graphics/tiff -RUN_DEPENDS:= ${BUILD_DEPENDS} +RUN_DEPENDS:= swig3.0:devel/swig30 -USES= autoreconf compiler:gcc-c++11-lib desktop-file-utils dos2unix \ +USES= autoreconf compiler:c++11-lib desktop-file-utils dos2unix \ iconv:wchar_t libtool localbase pkgconfig python:2.7 USE_LDCONFIG= yes -USE_CXXSTD= c++11 USE_WX= 3.0+ CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ --enable-python --with-system-svm CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig3.0" GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +CPP= clang-cpp50 +CC= clang50 +CXX= clang++50 INSTALLS_ICONS= yes DOS2UNIX_GLOB= *.cpp *.h PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= PGSQL OPENMP VIGRA -OPTIONS_DEFAULT= PGSQL OPENMP VIGRA +OPTIONS_DEFAULT= PGSQL VIGRA +OPTIONS_DEFAULT_amd64= OPENMP +OPTIONS_DEFAULT_i386= OPENMP NO_OPTIONS_SORT= yes OPTIONS_SUB= yes -OPENMP_DESC= Enable Multiprocessing +OPENMP_DESC= Enable Multiprocessing (only amd64 and i386) VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library +## TODO: OPENMP_?= Only for archs amd64 and i386 OPENMP_CONFIGURE_ENABLE= openmp -OPENMP_LDFLAGS= -pthread +OPENMP_LIB_DEPENDS= libomp.so:devel/openmp +OPENMP_LDFLAGS= -L${LOCALBASE}/lib -lm -pthread +#OPENMP_EXTRA_PATCHES= ${PATCHDIR}/ PGSQL_CONFIGURE_OFF= --with-postgresql=no PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE}/bin/pg_config PGSQL_USES= pgsql VIGRA_BUILD_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra VIGRA_RUN_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra INSTALL_TARGET= install-strip .include SUB_FILES= pkg-message post-extract: @${REINPLACE_CMD} -e 's|wx-config |${WX_CONFIG} |g' \ ${WRKSRC}/configure.ac \ ${WRKSRC}/src/saga_core/saga_api/Makefile.am \ ${WRKSRC}/src/saga_core/saga_cmd/Makefile.am \ ${WRKSRC}/src/saga_core/saga_gdi/Makefile.am \ ${WRKSRC}/src/saga_core/saga_gui/Makefile.am \ ${WRKSRC}/src/tools/garden/garden_3d_viewer/Makefile.am \ ${WRKSRC}/src/tools/garden/garden_webservices/Makefile.am \ ${WRKSRC}/src/tools/io/io_grid_image/Makefile.am \ ${WRKSRC}/src/tools/io/io_shapes/Makefile.am \ ${WRKSRC}/src/tools/io/io_virtual/Makefile.am \ ${WRKSRC}/src/tools/pointcloud/pointcloud_tools/Makefile.am \ ${WRKSRC}/src/tools/pointcloud/pointcloud_viewer/Makefile.am \ ${WRKSRC}/src/tools/statistics/statistics_kriging/Makefile.am \ ${WRKSRC}/src/tools/tin/tin_viewer/Makefile.am @${REINPLACE_CMD} -e 's|/usr/include/opencv|${LOCALBASE}/include/opencv ${LOCALBASE}/include|g' \ ${WRKSRC}/src/tools/imagery/imagery_opencv/Makefile.am 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|PORTVERSION|${PORTVERSION}|' \ ${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp +post-patch-OPENMP-on: + @${REINPLACE_CMD} -e 's|-lgomp|-lomp|' ${WRKSRC}/configure.ac + post-configure: @${REINPLACE_CMD} -e 's|cd $$(pkgdatadir);|cd ${STAGEDIR}${DATADIR};|g' \ ${WRKSRC}/src/saga_core/saga_gui/Makefile - @${REINPLACE_CMD} -e 's|^LDFLAGS = .*|& -lopencv_contrib|' \ + @${REINPLACE_CMD} -e 's|^LDFLAGS = .*|& -lopencv_core|' \ ${WRKSRC}/src/tools/imagery/imagery_opencv/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 # toolchains dir was moved in r2805 (and followups r2810,r2811,r2820) ${MKDIR} ${STAGEDIR}${DATADIR}/accessories (cd ${WRKSRC}/src/accessories && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/accessories) ${RM} -R ${STAGEDIR}${DATADIR}/accessories/toolchains ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \ ${STAGEDIR}${PREFIX}/share/applications/ # library helper files are not needed and cripple some math/qgis extensions @${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la .include Index: head/math/saga/distinfo =================================================================== --- head/math/saga/distinfo (revision 472648) +++ head/math/saga/distinfo (revision 472649) @@ -1,3 +1,3 @@ -TIMESTAMP = 1511371377 -SHA256 (saga-6.1.0.tar.gz) = da5767d339c3a2cd9d5905a66251e44b8be7325aa10b673db7ea55a8d4bffe6e -SIZE (saga-6.1.0.tar.gz) = 4574237 +TIMESTAMP = 1524468589 +SHA256 (saga-6.3.0.tar.gz) = bb4b99406e3a25cdaa12559904ce3272c449acb542bc0883b2755ce6508dd243 +SIZE (saga-6.3.0.tar.gz) = 4583450 Index: head/math/saga/files/patch-git_6e14443b30ce =================================================================== --- head/math/saga/files/patch-git_6e14443b30ce (revision 472648) +++ head/math/saga/files/patch-git_6e14443b30ce (nonexistent) @@ -1,66 +0,0 @@ -commit 6e14443b30ce2c8e284617840bc49e249c63afc1 -Author: oconrad -Date: Fri Dec 8 10:16:47 2017 +0100 - - saga_gui, loading tool description from file: wxgtk issue reported in [saga-gis-developer] SAGA GIS on FreeBSD: fails to build with wxgtk30 - 3.0.3.1 ---- - saga-gis/src/saga_core/saga_gui/wksp_tool.cpp | 25 ++++++++----------------- - saga-gis/src/saga_core/saga_gui/wksp_tool.h | 2 -- - 2 files changed, 8 insertions(+), 19 deletions(-) - ---- src/saga_core/saga_gui/wksp_tool.cpp.orig 2017-09-01 15:57:36 UTC -+++ src/saga_core/saga_gui/wksp_tool.cpp -@@ -135,34 +135,25 @@ wxString CWKSP_Tool::Get_Name(void) - } - - //--------------------------------------------------------- --wxString CWKSP_Tool::Get_File_Name(void) --{ -- return( m_pTool->Get_File_Name().c_str() ); --} -- --//--------------------------------------------------------- - wxString CWKSP_Tool::Get_Description(void) - { - //----------------------------------------------------- -- if( !Get_File_Name().IsEmpty() ) -+ if( !m_pTool->Get_File_Name().is_Empty() ) - { -+ CSG_String Lib_Name = SG_File_Get_Name(m_pTool->Get_File_Name(), false); -+ CSG_String File_Path = SG_File_Make_Path(SG_File_Get_Path(m_pTool->Get_File_Name()), Lib_Name, ""); -+ -+ File_Path = SG_File_Make_Path(File_Path, CSG_String::Format("%s_%02d", Lib_Name.c_str(), Get_Index())); -+ - CSG_String Description; - CSG_File Stream; - -- wxFileName FileName(Get_File_Name()); -- FileName.AppendDir (FileName.GetName()); -- FileName.SetName (wxString::Format("%s_%02d", FileName.GetName().c_str(), Get_Index())); -- -- FileName.SetExt ("html"); -- -- if( Stream.Open(FileName.GetFullPath().wc_str(), SG_FILE_R) && Stream.Read(Description, Stream.Length()) ) -+ if( SG_File_Set_Extension(File_Path, "html") && Stream.Open(File_Path, SG_FILE_R) && Stream.Read(Description, Stream.Length()) ) - { - return( Description.c_str() ); - } - -- FileName.SetExt ("htm"); -- -- if( Stream.Open(FileName.GetFullPath().wc_str(), SG_FILE_R) && Stream.Read(Description, Stream.Length()) ) -+ if( SG_File_Set_Extension(File_Path, "htm" ) && Stream.Open(File_Path, SG_FILE_R) && Stream.Read(Description, Stream.Length()) ) - { - return( Description.c_str() ); - } ---- src/saga_core/saga_gui/wksp_tool.h.orig 2017-05-24 13:15:53 UTC -+++ src/saga_core/saga_gui/wksp_tool.h -@@ -103,8 +103,6 @@ class CWKSP_Tool : public CWKSP_Base_Item (public) - void Set_Menu_ID (int Menu_ID); - int Get_Menu_ID (void) { return( m_Menu_ID ); } - -- wxString Get_File_Name (void); -- - bool is_Interactive (void); - bool is_Executing (void); - Property changes on: head/math/saga/files/patch-git_6e14443b30ce ___________________________________________________________________ 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/math/saga/files/patch-configure =================================================================== --- head/math/saga/files/patch-configure (nonexistent) +++ head/math/saga/files/patch-configure (revision 472649) @@ -0,0 +1,19 @@ +--- configure.orig 2017-12-21 10:57:30 UTC ++++ configure +@@ -16235,13 +16235,13 @@ if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes; then + FFTWFOUND=1 + fi + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LAS_GetVersion in -llas" >&5 +-$as_echo_n "checking for LAS_GetVersion in -llas... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LAS_GetVersion in -llas12" >&5 ++$as_echo_n "checking for LAS_GetVersion in -llas12... " >&6; } + if ${ac_cv_lib_las_LAS_GetVersion+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-llas $LIBS" ++LIBS="-llas12 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + Property changes on: head/math/saga/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/saga/files/patch-configure.ac =================================================================== --- head/math/saga/files/patch-configure.ac (revision 472648) +++ head/math/saga/files/patch-configure.ac (revision 472649) @@ -1,12 +1,18 @@ ---- configure.ac.orig 2016-08-23 13:23:41 UTC +--- configure.ac.orig 2018-04-23 07:44:48 UTC +++ configure.ac -@@ -26,7 +26,7 @@ AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOU +@@ -20,13 +20,13 @@ AC_PROG_LIBTOOL + AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,) + AC_CHECK_LIB([geotrans], [Set_Mercator_Coordinates]) + AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,) +-AC_CHECK_LIB([las], [LAS_GetVersion], LASFOUND=1,,) ++AC_CHECK_LIB([las12], [LAS_GetVersion], LASFOUND=1,,) + AC_CHECK_LIB(hpdf, HPDF_Pages_New, HARUFOUND=1,,) + AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC \(libodbc\) library not found]) AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,) AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,) AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,) -AC_CHECK_HEADER([libsvm/svm.h],[AC_CHECK_LIB([svm], [svm_get_svm_type], SVMFOUND=1,,)]) +AC_CHECK_HEADER([svm.h],[AC_CHECK_LIB([svm], [svm_get_svm_type], SVMFOUND=1,,)]) PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1],[LIBDXFFOUND=0]) PKG_CHECK_MODULES([HDF5],[hdf5],LIBHDF5FOUND=1,LIBHDF5FOUND=0) - Index: head/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp =================================================================== --- head/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp (revision 472648) +++ head/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp (revision 472649) @@ -1,19 +1,19 @@ ---- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2016-06-29 05:55:46 UTC +--- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2018-05-01 09:07:11 UTC +++ src/saga_core/saga_cmd/saga_cmd.cpp -@@ -65,6 +65,7 @@ +@@ -64,6 +64,7 @@ #include #include +#include + #include "config.h" #include "callback.h" - -@@ -164,7 +165,7 @@ _except(1) +@@ -168,7 +169,7 @@ _except(1) //--------------------------------------------------------- bool Run(int argc, char *argv[]) { - setlocale(LC_NUMERIC, "C"); + std::setlocale(LC_NUMERIC, "C"); SG_Set_UI_Callback(CMD_Get_Callback()); Index: head/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp =================================================================== --- head/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp (revision 472648) +++ head/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp (revision 472649) @@ -1,37 +1,37 @@ ---- src/saga_core/saga_gui/dlg_about.cpp.orig 2016-06-29 05:55:46 UTC +--- src/saga_core/saga_gui/dlg_about.cpp.orig 2018-05-01 09:07:11 UTC +++ src/saga_core/saga_gui/dlg_about.cpp -@@ -189,6 +189,7 @@ wxString CDLG_About::_Get_Version(void) +@@ -188,6 +188,7 @@ wxString CDLG_About::_Get_Version(void) s += "http://www.saga-gis.org\n"; s += "\n"; s += "Version: " + wxString(SAGA_VERSION) + "\n"; + s += "https://sourceforge.net/p/saga-gis/code/ci/release-PORTVERSION/tree/\n"; #ifdef _SAGA_MSW #ifdef _WIN64 -@@ -264,7 +265,25 @@ wxString CDLG_About::_Get_Version(void) +@@ -263,7 +264,25 @@ wxString CDLG_About::_Get_Version(void) #elif defined(__GNUWIN32__) "Gnu-Win32 compiler" #elif defined(__GNUG__) - "Gnu C++" + #if wxCHECK_GCC_VERSION(5,3) + "Gnu C++ 5.3" + #elif wxCHECK_GCC_VERSION(5,2) + "Gnu C++ 5.2" + #elif wxCHECK_GCC_VERSION(5,1) + "Gnu C++ 5.1" + #elif wxCHECK_GCC_VERSION(5,0) + "Gnu C++ 5.0" + #elif wxCHECK_GCC_VERSION(4,9) + "Gnu C++ 4.9" + #elif wxCHECK_GCC_VERSION(4,8) + "Gnu C++ 4.8" + #elif wxCHECK_GCC_VERSION(4,7) + "Gnu C++ 4.7" + #elif wxCHECK_GCC_VERSION(4,6) + "Gnu C++ 4.6" + #else + "Gnu C++" + #endif #elif defined(__VISUALC__) // The value of this macro corresponds to the compiler version: 1020 for 4.2 (the first supported version), 1100 for 5.0, 1200 for 6.0 and so on #if __VISUALC__ == 1020 "Microsoft Visual C++ 4.2" Index: head/math/saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h =================================================================== --- head/math/saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h (revision 472648) +++ head/math/saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h (revision 472649) @@ -1,12 +1,12 @@ ---- src/tools/imagery/imagery_opencv/opencv.h.orig 2016-06-29 05:55:46 UTC +--- src/tools/imagery/imagery_opencv/opencv.h.orig 2018-05-01 09:07:11 UTC +++ src/tools/imagery/imagery_opencv/opencv.h -@@ -74,7 +74,8 @@ +@@ -73,7 +73,8 @@ //--------------------------------------------------------- #include - +#include +#include /////////////////////////////////////////////////////////// // // Index: head/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp =================================================================== --- head/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp (revision 472648) +++ head/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp (revision 472649) @@ -1,11 +1,11 @@ ---- src/tools/imagery/imagery_svm/MLB_Interface.cpp.orig 2017-01-29 14:18:09 UTC +--- src/tools/imagery/imagery_svm/MLB_Interface.cpp.orig 2018-05-01 09:07:10 UTC +++ src/tools/imagery/imagery_svm/MLB_Interface.cpp -@@ -62,7 +62,7 @@ +@@ -61,7 +61,7 @@ #include "MLB_Interface.h" #if defined(SYSTEM_SVM) -#include +#include #else #include "svm/svm.h" #endif Index: head/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h =================================================================== --- head/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h (revision 472648) +++ head/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h (revision 472649) @@ -1,11 +1,11 @@ ---- src/tools/imagery/imagery_svm/svm_grids.h.orig 2017-01-29 14:18:09 UTC +--- src/tools/imagery/imagery_svm/svm_grids.h.orig 2018-05-01 09:07:11 UTC +++ src/tools/imagery/imagery_svm/svm_grids.h -@@ -73,7 +73,7 @@ +@@ -72,7 +72,7 @@ #include "MLB_Interface.h" #if defined(SYSTEM_SVM) -#include +#include #else #include "svm/svm.h" #endif Index: head/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp =================================================================== --- head/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp (revision 472648) +++ head/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp (revision 472649) @@ -1,16 +1,25 @@ -grid_to_kml.cpp: In member function 'bool CGrid_from_KML::Load_Overlay(const wchar_t*, const CSG_MetaData&)': -grid_to_kml.cpp:585:49: error: conversion from 'const wxScopedWCharBuffer {aka const wxScopedCharTypeBuffer}' to non-scalar type 'CSG_String' requested - CSG_String FullPath = fn.GetFullPath().wc_str(); - ~~~~~~~~~~~~~~~~~~~~~~~^~ - ---- src/tools/io/io_grid_image/grid_to_kml.cpp.orig 2017-06-21 13:50:57 UTC +--- src/tools/io/io_grid_image/grid_to_kml.cpp.orig 2018-05-03 05:29:35 UTC +++ src/tools/io/io_grid_image/grid_to_kml.cpp -@@ -582,7 +582,7 @@ bool CGrid_from_KML::Load_Overlay(const SG_Char *Dir, +@@ -504,7 +504,7 @@ bool CGrid_from_KML::On_Execute(void) + + if( !KML.Load(&File) ) + { +- Error_Fmt("%s [%s]", _TL("failed to load file"), File.wc_str()); ++ Error_Fmt("%s [%s]", _TL("failed to load file"), File.wx_str()); + + return( false ); } +@@ -582,11 +582,11 @@ bool CGrid_from_KML::Load_Overlay(const SG_Char *Dir, + } CSG_Data_Manager Data; - CSG_String FullPath = fn.GetFullPath().wc_str(); -+ CSG_String FullPath = static_cast(fn.GetFullPath().wc_str()); ++ CSG_String FullPath = fn.GetFullPath().wx_str(); if( !Data.Add(FullPath) || !Data.Get_Grid_System(0) || !Data.Get_Grid_System(0)->Get(0) ) { +- Error_Fmt("%s: %s", _TL("failed to load KML ground overlay icon"), fn.GetFullPath().wc_str()); ++ Error_Fmt("%s: %s", _TL("failed to load KML ground overlay icon"), fn.GetFullPath().wx_str()); + } + + //----------------------------------------------------- Index: head/math/saga/files/patch-src_tools_io_io__shapes__las_Makefile.am =================================================================== --- head/math/saga/files/patch-src_tools_io_io__shapes__las_Makefile.am (nonexistent) +++ head/math/saga/files/patch-src_tools_io_io__shapes__las_Makefile.am (revision 472649) @@ -0,0 +1,11 @@ +--- src/tools/io/io_shapes_las/Makefile.am.orig 2016-11-17 08:03:02 UTC ++++ src/tools/io/io_shapes_las/Makefile.am +@@ -6,7 +6,7 @@ DBGFLAGS = -g -DDEBUG + endif + + if HAVE_LLAS +-DEP_LIBS = -llas ++DEP_LIBS = -llas12 + DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE + CXX_INCS = -I$(top_srcdir)/src/saga_core + AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS) Property changes on: head/math/saga/files/patch-src_tools_io_io__shapes__las_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp =================================================================== --- head/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp (nonexistent) +++ head/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp (revision 472649) @@ -0,0 +1,15 @@ +--- src/tools/io/io_shapes_las/las_export.cpp.orig 2018-05-01 09:07:10 UTC ++++ src/tools/io/io_shapes_las/las_export.cpp +@@ -61,9 +61,9 @@ + //--------------------------------------------------------- + #include "las_export.h" + +-#include +-#include +-#include ++#include ++#include ++#include + #include + #include + #include Property changes on: head/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp =================================================================== --- head/math/saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp (nonexistent) +++ head/math/saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp (revision 472649) @@ -0,0 +1,15 @@ +--- src/tools/io/io_shapes_las/las_import.cpp.orig 2018-05-01 09:07:10 UTC ++++ src/tools/io/io_shapes_las/las_import.cpp +@@ -60,9 +60,9 @@ + //--------------------------------------------------------- + #include "las_import.h" + +-#include +-#include +-#include ++#include ++#include ++#include + #include + #include + Property changes on: head/math/saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/saga/files/patch-src_tools_io_io__shapes__las_las__info.h =================================================================== --- head/math/saga/files/patch-src_tools_io_io__shapes__las_las__info.h (nonexistent) +++ head/math/saga/files/patch-src_tools_io_io__shapes__las_las__info.h (revision 472649) @@ -0,0 +1,15 @@ +--- src/tools/io/io_shapes_las/las_info.h.orig 2018-05-01 09:07:11 UTC ++++ src/tools/io/io_shapes_las/las_info.h +@@ -76,9 +76,9 @@ + //--------------------------------------------------------- + #include "MLB_Interface.h" + +-#include +-#include +-#include ++#include ++#include ++#include + #include + #include + Property changes on: head/math/saga/files/patch-src_tools_io_io__shapes__las_las__info.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/saga/pkg-plist =================================================================== --- head/math/saga/pkg-plist (revision 472648) +++ head/math/saga/pkg-plist (revision 472649) @@ -1,209 +1,212 @@ bin/saga_cmd bin/saga_gui include/saga/saga_core/saga_api/api_core.h include/saga/saga_core/saga_api/data_manager.h include/saga/saga_core/saga_api/dataobject.h include/saga/saga_core/saga_api/datetime.h include/saga/saga_core/saga_api/geo_tools.h include/saga/saga_core/saga_api/grid.h include/saga/saga_core/saga_api/grid_pyramid.h include/saga/saga_core/saga_api/grids.h include/saga/saga_core/saga_api/mat_tools.h include/saga/saga_core/saga_api/metadata.h include/saga/saga_core/saga_api/parameters.h include/saga/saga_core/saga_api/pointcloud.h include/saga/saga_core/saga_api/saga_api.h include/saga/saga_core/saga_api/shapes.h include/saga/saga_core/saga_api/table.h include/saga/saga_core/saga_api/table_dbase.h include/saga/saga_core/saga_api/table_value.h include/saga/saga_core/saga_api/tin.h include/saga/saga_core/saga_api/tool.h include/saga/saga_core/saga_api/tool_library.h include/saga/saga_core/saga_gdi/3d_view.h include/saga/saga_core/saga_gdi/3d_view_tools.h include/saga/saga_core/saga_gdi/saga_gdi.h include/saga/saga_core/saga_gdi/sgdi_core.h include/saga/saga_core/saga_gdi/sgdi_diagram.h include/saga/saga_core/saga_gdi/sgdi_dialog.h include/saga/saga_core/saga_gdi/sgdi_helper.h lib/libsaga_api-%%PORTVERSION%%.so lib/libsaga_api.so lib/libsaga_gdi-%%PORTVERSION%%.so lib/libsaga_gdi.so %%PYTHON_SITELIBDIR%%/_saga_api-%%PORTVERSION%%.so %%PYTHON_SITELIBDIR%%/_saga_api.a %%PYTHON_SITELIBDIR%%/_saga_api.so %%PYTHON_SITELIBDIR%%/saga_api.py %%PYTHON_SITELIBDIR%%/saga_api.pyc %%PYTHON_SITELIBDIR%%/saga_api.%%PYTHON_PYOEXTENSION%% lib/saga/libclimate_tools.so lib/saga/libcontrib_perego.so lib/saga/libdb_odbc.so %%PGSQL%%lib/saga/libdb_pgsql.so lib/saga/libdocs_html.so lib/saga/libdocs_pdf.so lib/saga/libgarden_3d_viewer.so lib/saga/libgarden_fractals.so lib/saga/libgarden_games.so lib/saga/libgarden_learn_to_program.so lib/saga/libgarden_webservices.so lib/saga/libgrid_analysis.so lib/saga/libgrid_calculus.so lib/saga/libgrid_calculus_bsl.so lib/saga/libgrid_filter.so lib/saga/libgrid_gridding.so lib/saga/libgrid_spline.so lib/saga/libgrid_tools.so lib/saga/libgrid_visualisation.so lib/saga/libgrids_tools.so lib/saga/libimagery_classification.so lib/saga/libimagery_maxent.so lib/saga/libimagery_opencv.so lib/saga/libimagery_photogrammetry.so lib/saga/libimagery_segmentation.so lib/saga/libimagery_svm.so lib/saga/libimagery_tools.so %%VIGRA%%lib/saga/libimagery_vigra.so lib/saga/libio_esri_e00.so lib/saga/libio_gdal.so lib/saga/libio_gps.so lib/saga/libio_grid.so lib/saga/libio_grid_image.so lib/saga/libio_shapes.so lib/saga/libio_shapes_dxf.so lib/saga/libio_shapes_las.so lib/saga/libio_table.so lib/saga/libio_virtual.so lib/saga/libpj_georeference.so lib/saga/libpj_proj4.so lib/saga/libpointcloud_tools.so lib/saga/libpointcloud_viewer.so lib/saga/libshapes_grid.so lib/saga/libshapes_lines.so lib/saga/libshapes_points.so lib/saga/libshapes_polygons.so lib/saga/libshapes_tools.so lib/saga/libshapes_transect.so lib/saga/libsim_cellular_automata.so lib/saga/libsim_ecosystems_hugget.so lib/saga/libsim_erosion.so lib/saga/libsim_fire_spreading.so lib/saga/libsim_geomorphology.so lib/saga/libsim_hydrology.so lib/saga/libsim_ihacres.so lib/saga/libsim_landscape_evolution.so lib/saga/libsim_qm_of_esp.so lib/saga/libsim_rivflow.so lib/saga/libstatistics_grid.so lib/saga/libstatistics_kriging.so lib/saga/libstatistics_points.so lib/saga/libstatistics_regression.so lib/saga/libta_channels.so lib/saga/libta_compound.so lib/saga/libta_hydrology.so lib/saga/libta_lighting.so lib/saga/libta_morphometry.so lib/saga/libta_preprocessor.so lib/saga/libta_profiles.so lib/saga/libta_slope_stability.so lib/saga/libtable_calculus.so lib/saga/libtable_tools.so lib/saga/libtin_tools.so lib/saga/libtin_viewer.so man/man1/saga_cmd.1.gz man/man1/saga_gui.1.gz share/appdata/saga.appdata.xml share/applications/saga.desktop share/icons/hicolor/128x128/apps/saga.png share/icons/hicolor/16x16/apps/saga.png share/icons/hicolor/192x192/apps/saga.png share/icons/hicolor/22x22/apps/saga.png share/icons/hicolor/24x24/apps/saga.png share/icons/hicolor/256x256/apps/saga.png share/icons/hicolor/32x32/apps/saga.png share/icons/hicolor/48x48/apps/saga.png share/icons/hicolor/64x64/apps/saga.png share/icons/hicolor/72x72/apps/saga.png share/icons/hicolor/80x80/apps/saga.png share/icons/hicolor/8x8/apps/saga.png share/icons/hicolor/96x96/apps/saga.png share/pixmaps/saga.png @mode 0777 @dir %%DATADIR%% @mode 0666 %%DATADIR%%/accessories/CMakeLists.txt %%DATADIR%%/accessories/helper/make_arcsaga_toolboxes.bat %%DATADIR%%/accessories/helper/make_saga_release.bat %%DATADIR%%/accessories/helper/make_saga_snapshot.bat %%DATADIR%%/accessories/helper/make_tools_interface.bat %%DATADIR%%/accessories/helper/make_translation_files.bat %%DATADIR%%/accessories/python/examples/00_grid_create_dummy.py %%DATADIR%%/accessories/python/examples/01_grid_asc_to_saga.py %%DATADIR%%/accessories/python/examples/02_grid_morphometry.py %%DATADIR%%/accessories/python/examples/03_grid_difference.py %%DATADIR%%/accessories/python/examples/04_grid_contour.py %%DATADIR%%/accessories/python/examples/05_shp2xyz.py %%DATADIR%%/accessories/python/examples/06_xyz2shp.py %%DATADIR%%/accessories/python/helpers/print_version.py %%DATADIR%%/accessories/python/helpers/saga_cmd_param_interface/environment.py %%DATADIR%%/accessories/python/helpers/saga_cmd_param_interface/param_interface.py %%DATADIR%%/accessories/python/helpers/saga_cmd_param_interface/tools.py %%DATADIR%%/accessories/python/saga_python_api.txt %%DATADIR%%/accessories/python/test_data/test.mgrd %%DATADIR%%/accessories/python/test_data/test.sdat %%DATADIR%%/accessories/python/test_data/test.sgrd %%DATADIR%%/accessories/python/test_data/test_ascii.asc %%DATADIR%%/accessories/python/test_data/test_pts.dbf %%DATADIR%%/accessories/python/test_data/test_pts.mshp %%DATADIR%%/accessories/python/test_data/test_pts.shp %%DATADIR%%/accessories/python/test_data/test_pts.shx %%DATADIR%%/accessories/python/test_data/test_pts_xyz.xyz %%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/Makefile %%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/Makefile.am %%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/TLB_Interface.cpp %%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/TLB_Interface.h %%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool.cpp %%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool.h %%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library.cbp %%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library.layout %%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library_link2bin.vcxproj %%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library_link2bin.vcxproj.filters %%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library_link2src.vcxproj %%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library_link2src.vcxproj.filters %%DATADIR%%/accessories/templates/template4saga-tools/my_tools_link2bin.vc10.sln %%DATADIR%%/accessories/templates/template4saga-tools/my_tools_link2src.vc10.sln %%DATADIR%%/accessories/templates/template4saga-tools/readme.txt %%DATADIR%%/saga.bra.txt %%DATADIR%%/saga.ger.txt %%DATADIR%%/saga.lng.txt @mode %%DATADIR%%/saga.png %%DATADIR%%/saga_prj.dic %%DATADIR%%/saga_prj.srs %%DATADIR%%/saga_tip.txt %%DATADIR%%/toolchains/climate.xml %%DATADIR%%/toolchains/cluster_terrain.xml -%%DATADIR%%/toolchains/gc_simple_filter.xml +%%DATADIR%%/toolchains/gc_filter_gaussian.xml +%%DATADIR%%/toolchains/gc_filter_laplacian.xml +%%DATADIR%%/toolchains/gc_filter_rank.xml +%%DATADIR%%/toolchains/gc_filter_simple.xml %%DATADIR%%/toolchains/gc_tools.xml %%DATADIR%%/toolchains/grid_filter.xml %%DATADIR%%/toolchains/grid_list_simple_filter.xml %%DATADIR%%/toolchains/grid_notch_filter.xml %%DATADIR%%/toolchains/gridding.xml %%DATADIR%%/toolchains/group_files.xml %%DATADIR%%/toolchains/imagery.xml %%DATADIR%%/toolchains/imagery_lczc.xml %%DATADIR%%/toolchains/import_text_tables.xml %%DATADIR%%/toolchains/obia.xml %%DATADIR%%/toolchains/points_to_contour.xml %%DATADIR%%/toolchains/polygons_max_interior_circles.xml %%DATADIR%%/toolchains/sieve_and_clump.xml %%DATADIR%%/toolchains/temperature_downscaling.xml %%DATADIR%%/toolchains/temperature_downscaling_bulk.xml %%DATADIR%%/toolchains/terrain_analysis.xml %%DATADIR%%/toolchains/terrain_segmentation.xml %%DATADIR%%/toolchains/tta_LandCover.xml %%DATADIR%%/toolchains/tta_TravelTime.xml %%DATADIR%%/toolchains/tta_tools.xml %%DATADIR%%/toolchains/twi.xml %%DATADIR%%/toolchains/upslope_height.xml