16 files changed, 142 insertions, 105 deletions

diff --git a/math/saga/Makefile b/math/saga/Makefile
index f22186960c8c..03c61d9f3d93 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -2,8 +2,7 @@
 # $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}
 
@@ -13,12 +12,13 @@ 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 \
@@ -26,12 +26,11 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		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
@@ -39,19 +38,27 @@ 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
@@ -91,10 +98,13 @@ post-patch:
 	@${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:
diff --git a/math/saga/distinfo b/math/saga/distinfo
index 269ab5a3520b..073b339b6f6c 100644
--- a/math/saga/distinfo
+++ b/math/saga/distinfo
@@ -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
diff --git a/math/saga/files/patch-configure b/math/saga/files/patch-configure
new file mode 100644
index 000000000000..4e5eb1f73b09
--- /dev/null
+++ b/math/saga/files/patch-configure
@@ -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.  */
+ 
diff --git a/math/saga/files/patch-configure.ac b/math/saga/files/patch-configure.ac
index 2a6f5d62fa34..c40218f52a75 100644
--- a/math/saga/files/patch-configure.ac
+++ b/math/saga/files/patch-configure.ac
@@ -1,6 +1,13 @@
---- 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,,)
@@ -9,4 +16,3 @@
  PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1],[LIBDXFFOUND=0])
  PKG_CHECK_MODULES([HDF5],[hdf5],LIBHDF5FOUND=1,LIBHDF5FOUND=0)
  
-
diff --git a/math/saga/files/patch-git_6e14443b30ce b/math/saga/files/patch-git_6e14443b30ce
deleted file mode 100644
index 6c430baa4eaa..000000000000
--- a/math/saga/files/patch-git_6e14443b30ce
+++ /dev/null
@@ -1,66 +0,0 @@
-commit 6e14443b30ce2c8e284617840bc49e249c63afc1
-Author: oconrad <conrad@geowiss.uni-hamburg.de>
-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);
- 
diff --git a/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp b/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp
index c68bc210b837..80e7287ac0bc 100644
--- a/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp
+++ b/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp
@@ -1,14 +1,14 @@
---- 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 <wx/app.h>
  #include <wx/utils.h>
 +#include <clocale>
  
+ #include "config.h"
  #include "callback.h"
- 
-@@ -164,7 +165,7 @@ _except(1)
+@@ -168,7 +169,7 @@ _except(1)
  //---------------------------------------------------------
  bool		Run(int argc, char *argv[])
  {
diff --git a/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp b/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp
index b8ab1ed65f11..ff07feda7132 100644
--- a/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp
+++ b/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp
@@ -1,6 +1,6 @@
---- 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";
@@ -8,7 +8,7 @@
  
  #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__)
diff --git a/math/saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h b/math/saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h
index c2a034216589..168755fa8f53 100644
--- a/math/saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h
+++ b/math/saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h
@@ -1,6 +1,6 @@
---- 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 <opencv/cv.h>
diff --git a/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp b/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp
index 4fe93586c6f6..ef993017582c 100644
--- a/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp
+++ b/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp
@@ -1,6 +1,6 @@
---- 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)
diff --git a/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h b/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h
index 54edf9113405..4894957493ec 100644
--- a/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h
+++ b/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h
@@ -1,6 +1,6 @@
---- 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)
diff --git a/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp b/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp
index c78fc3f890a0..f7cf6c4f8e2d 100644
--- a/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp
+++ b/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp
@@ -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<wchar_t>}' 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<const wchar_t*>(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());
+ 	}
+ 
+ 	//-----------------------------------------------------
diff --git a/math/saga/files/patch-src_tools_io_io__shapes__las_Makefile.am b/math/saga/files/patch-src_tools_io_io__shapes__las_Makefile.am
new file mode 100644
index 000000000000..b7d311cbfb1d
--- /dev/null
+++ b/math/saga/files/patch-src_tools_io_io__shapes__las_Makefile.am
@@ -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)
diff --git a/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp b/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp
new file mode 100644
index 000000000000..b303869b87f1
--- /dev/null
+++ b/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp
@@ -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 <liblas/laspoint.hpp>
+-#include <liblas/laswriter.hpp>
+-#include <liblas/capi/las_version.h>
++#include <liblas12/laspoint.hpp>
++#include <liblas12/laswriter.hpp>
++#include <liblas12/capi/las_version.h>
+ #include <fstream>
+ #include <iostream>
+ #include <cstddef>
diff --git a/math/saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp b/math/saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp
new file mode 100644
index 000000000000..f8b5d812a60c
--- /dev/null
+++ b/math/saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp
@@ -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 <liblas/laspoint.hpp>
+-#include <liblas/lasreader.hpp>
+-#include <liblas/capi/las_version.h>
++#include <liblas12/laspoint.hpp>
++#include <liblas12/lasreader.hpp>
++#include <liblas12/capi/las_version.h>
+ #include <fstream>
+ #include <iostream>
+ 
diff --git a/math/saga/files/patch-src_tools_io_io__shapes__las_las__info.h b/math/saga/files/patch-src_tools_io_io__shapes__las_las__info.h
new file mode 100644
index 000000000000..1cad8c48fc8c
--- /dev/null
+++ b/math/saga/files/patch-src_tools_io_io__shapes__las_las__info.h
@@ -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 <liblas/laspoint.hpp>
+-#include <liblas/lasreader.hpp>
+-#include <liblas/capi/las_version.h>
++#include <liblas12/laspoint.hpp>
++#include <liblas12/lasreader.hpp>
++#include <liblas12/capi/las_version.h>
+ #include <fstream>
+ #include <iostream>
+ 
diff --git a/math/saga/pkg-plist b/math/saga/pkg-plist
index d66677b87008..72025f266608 100644
--- a/math/saga/pkg-plist
+++ b/math/saga/pkg-plist
@@ -184,7 +184,10 @@ share/pixmaps/saga.png
 %%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