Attachment #192970 for bug #227901




# $FreeBSD: head/math/saga/Makefile 464084 2018-03-10 17:46:04Z gerald $

PORTNAME=	saga
PORTVERSION=	6.3.0
PORTREVISION=	3
CATEGORIES=	math
MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}


		libgdal.so:graphics/gdal \
		libhpdf.so:print/libharu \
		libjasper.so:graphics/jasper \
		liblas12.so:devel/liblas12 \
		libodbc.so:databases/unixODBC \
		libopencv_core.so:graphics/opencv-core \
		libopencv_ml.so:graphics/opencv \

		libtiff.so:graphics/tiff
RUN_DEPENDS:=	${BUILD_DEPENDS}

USES=		autoreconf compiler:c++11-lib desktop-file-utils dos2unix \
		iconv:wchar_t libtool localbase pkgconfig python:2

USE_LDCONFIG=	yes
USE_CXXSTD=	c++11
USE_WX=		3.0+
CONFIGURE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
		--enable-python --with-system-svm


SUB_FILES=	pkg-message

.if ${PORT_OPTIONS:MOPENMP} && (${ARCH} == amd64 || ${ARCH} == i386) && ${COMPILER_TYPE} == clang
# Enable OpenMP support with Clang 5.0.
BUILD_DEPENDS+=	clang50:devel/llvm50
LIB_DEPENDS+=	libomp.so:devel/openmp
CPP=		clang-cpp50
CC=		clang50
CXX=		clang++50
OPENMP_FLAGS+=	-L${LOCALBASE}/lib -lm -lomp
LDFLAGS+=	${OPENMP_FLAGS}
.endif

post-extract:
	@${REINPLACE_CMD} -e 's|wx-config |${WX_CONFIG} |g' \
		${WRKSRC}/configure.ac \

.endif
	@${REINPLACE_CMD} -e 's|PORTVERSION|${PORTVERSION}|' \
		${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp
.if ${PORT_OPTIONS:MOPENMP} && (${ARCH} == amd64 || ${ARCH} == i386) && ${COMPILER_TYPE} == clang
	@${REINPLACE_CMD} -e 's|-lgomp|-lomp|' ${WRKSRC}/configure.ac
.endif

post-configure:
	@${REINPLACE_CMD} -e 's|cd $$(pkgdatadir);|cd ${STAGEDIR}${DATADIR};|g' \

Lines 1-3 Link Here

(-)saga/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1511371377	1	TIMESTAMP = 1524468589
2	SHA256 (saga-6.1.0.tar.gz) = da5767d339c3a2cd9d5905a66251e44b8be7325aa10b673db7ea55a8d4bffe6e	2	SHA256 (saga-6.3.0.tar.gz) = bb4b99406e3a25cdaa12559904ce3272c449acb542bc0883b2755ce6508dd243
3	SIZE (saga-6.1.0.tar.gz) = 4574237	3	SIZE (saga-6.3.0.tar.gz) = 4583450




--- 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.  */
 

Lines 1-6 Link Here

(-)saga/files/patch-configure.ac (-3 / +9 lines)
1	--- configure.ac.orig 2016-08-23 13:23:41 UTC	1	--- configure.ac.orig 2018-04-23 07:44:48 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -26,7 +26,7 @@ AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOU	3	@@ -20,13 +20,13 @@ AC_PROG_LIBTOOL
		4	AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,)
		5	AC_CHECK_LIB([geotrans], [Set_Mercator_Coordinates])
		6	AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,)
		7	-AC_CHECK_LIB([las], [LAS_GetVersion], LASFOUND=1,,)
		8	+AC_CHECK_LIB([las12], [LAS_GetVersion], LASFOUND=1,,)
		9	AC_CHECK_LIB(hpdf, HPDF_Pages_New, HARUFOUND=1,,)
		10	AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC $libodbc$ library not found])
4	AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,)	11	AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,)
5	AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,)	12	AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,)
6	AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,)	13	AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,)
Lines 9-12 Link Here
9	PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1],[LIBDXFFOUND=0])	16	PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1],[LIBDXFFOUND=0])
10	PKG_CHECK_MODULES([HDF5],[hdf5],LIBHDF5FOUND=1,LIBHDF5FOUND=0)	17	PKG_CHECK_MODULES([HDF5],[hdf5],LIBHDF5FOUND=1,LIBHDF5FOUND=0)
11		18
12




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);
 

Lines 1-14 Link Here

(-)saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp (-4 / +4 lines)
1	--- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2016-06-29 05:55:46 UTC	1	--- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2018-05-01 09:07:11 UTC
2	+++ src/saga_core/saga_cmd/saga_cmd.cpp	2	+++ src/saga_core/saga_cmd/saga_cmd.cpp
3	@@ -65,6 +65,7 @@	3	@@ -64,6 +64,7 @@
4		4
5	#include <wx/app.h>	5	#include <wx/app.h>
6	#include <wx/utils.h>	6	#include <wx/utils.h>
7	+#include <clocale>	7	+#include <clocale>
8		8
		9	#include "config.h"
9	#include "callback.h"	10	#include "callback.h"
10		11	@@ -168,7 +169,7 @@ _except(1)
11	@@ -164,7 +165,7 @@ _except(1)
12	//---------------------------------------------------------	12	//---------------------------------------------------------
13	bool Run(int argc, char *argv[])	13	bool Run(int argc, char *argv[])
14	{	14	{

Lines 1-6 Link Here

(-)saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp (-3 / +3 lines)
1	--- src/saga_core/saga_gui/dlg_about.cpp.orig 2016-06-29 05:55:46 UTC	1	--- src/saga_core/saga_gui/dlg_about.cpp.orig 2018-05-01 09:07:11 UTC
2	+++ src/saga_core/saga_gui/dlg_about.cpp	2	+++ src/saga_core/saga_gui/dlg_about.cpp
3	@@ -189,6 +189,7 @@ wxString CDLG_About::_Get_Version(void)	3	@@ -188,6 +188,7 @@ wxString CDLG_About::_Get_Version(void)
4	s += "http://www.saga-gis.org\n";	4	s += "http://www.saga-gis.org\n";
5	s += "\n";	5	s += "\n";
6	s += "Version: " + wxString(SAGA_VERSION) + "\n";	6	s += "Version: " + wxString(SAGA_VERSION) + "\n";
Lines 8-14 Link Here
8		8
9	#ifdef _SAGA_MSW	9	#ifdef _SAGA_MSW
10	#ifdef _WIN64	10	#ifdef _WIN64
11	@@ -264,7 +265,25 @@ wxString CDLG_About::_Get_Version(void)	11	@@ -263,7 +264,25 @@ wxString CDLG_About::_Get_Version(void)
12	#elif defined(__GNUWIN32__)	12	#elif defined(__GNUWIN32__)
13	"Gnu-Win32 compiler"	13	"Gnu-Win32 compiler"
14	#elif defined(__GNUG__)	14	#elif defined(__GNUG__)

Lines 1-6 Link Here

(-)saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h (-2 / +2 lines)
1	--- src/tools/imagery/imagery_opencv/opencv.h.orig 2016-06-29 05:55:46 UTC	1	--- src/tools/imagery/imagery_opencv/opencv.h.orig 2018-05-01 09:07:11 UTC
2	+++ src/tools/imagery/imagery_opencv/opencv.h	2	+++ src/tools/imagery/imagery_opencv/opencv.h
3	@@ -74,7 +74,8 @@	3	@@ -73,7 +73,8 @@
4		4
5	//---------------------------------------------------------	5	//---------------------------------------------------------
6	#include <opencv/cv.h>	6	#include <opencv/cv.h>

Lines 1-6 Link Here

(-)saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp (-2 / +2 lines)
1	--- src/tools/imagery/imagery_svm/MLB_Interface.cpp.orig 2017-01-29 14:18:09 UTC	1	--- src/tools/imagery/imagery_svm/MLB_Interface.cpp.orig 2018-05-01 09:07:10 UTC
2	+++ src/tools/imagery/imagery_svm/MLB_Interface.cpp	2	+++ src/tools/imagery/imagery_svm/MLB_Interface.cpp
3	@@ -62,7 +62,7 @@	3	@@ -61,7 +61,7 @@
4	#include "MLB_Interface.h"	4	#include "MLB_Interface.h"
5		5
6	#if defined(SYSTEM_SVM)	6	#if defined(SYSTEM_SVM)

Lines 1-6 Link Here

(-)saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h (-2 / +2 lines)
1	--- src/tools/imagery/imagery_svm/svm_grids.h.orig 2017-01-29 14:18:09 UTC	1	--- src/tools/imagery/imagery_svm/svm_grids.h.orig 2018-05-01 09:07:11 UTC
2	+++ src/tools/imagery/imagery_svm/svm_grids.h	2	+++ src/tools/imagery/imagery_svm/svm_grids.h
3	@@ -73,7 +73,7 @@	3	@@ -72,7 +72,7 @@
4	#include "MLB_Interface.h"	4	#include "MLB_Interface.h"
5		5
6	#if defined(SYSTEM_SVM)	6	#if defined(SYSTEM_SVM)

Line 0 Link Here

(-)saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp (+11 lines)
	1	--- src/tools/io/io_grid_image/grid_to_kml.cpp.orig 2018-05-01 09:07:10 UTC
	2	+++ src/tools/io/io_grid_image/grid_to_kml.cpp
	3	@@ -582,7 +582,7 @@ bool CGrid_from_KML::Load_Overlay(const SG_Char *Dir,
	4	}
	5
	6	CSG_Data_Manager Data;
	7	- CSG_String FullPath = fn.GetFullPath().wc_str();
	8	+ CSG_String FullPath = static_cast<const wchar_t*>(fn.GetFullPath().wc_str());
	9
	10	if( !Data.Add(FullPath) \|\| !Data.Get_Grid_System(0) \|\| !Data.Get_Grid_System(0)->Get(0) )
	11	{

Line 0 Link Here

(-)saga/files/patch-src_tools_io_io__shapes__las_Makefile.am (+11 lines)
	1	--- src/tools/io/io_shapes_las/Makefile.am.orig 2016-11-17 08:03:02 UTC
	2	+++ src/tools/io/io_shapes_las/Makefile.am
	3	@@ -6,7 +6,7 @@ DBGFLAGS = -g -DDEBUG
	4	endif
	5
	6	if HAVE_LLAS
	7	-DEP_LIBS = -llas
	8	+DEP_LIBS = -llas12
	9	DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
	10	CXX_INCS = -I$(top_srcdir)/src/saga_core
	11	AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)




--- 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>




--- 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>
 




--- 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>
 

Lines 184-190 Link Here

(-)saga/pkg-plist (-1 / +4 lines)
184	%%DATADIR%%/saga_tip.txt	184	%%DATADIR%%/saga_tip.txt
185	%%DATADIR%%/toolchains/climate.xml	185	%%DATADIR%%/toolchains/climate.xml
186	%%DATADIR%%/toolchains/cluster_terrain.xml	186	%%DATADIR%%/toolchains/cluster_terrain.xml
187	%%DATADIR%%/toolchains/gc_simple_filter.xml	187	%%DATADIR%%/toolchains/gc_filter_gaussian.xml
		188	%%DATADIR%%/toolchains/gc_filter_laplacian.xml
		189	%%DATADIR%%/toolchains/gc_filter_rank.xml
		190	%%DATADIR%%/toolchains/gc_filter_simple.xml
188	%%DATADIR%%/toolchains/gc_tools.xml	191	%%DATADIR%%/toolchains/gc_tools.xml
189	%%DATADIR%%/toolchains/grid_filter.xml	192	%%DATADIR%%/toolchains/grid_filter.xml
190	%%DATADIR%%/toolchains/grid_list_simple_filter.xml	193	%%DATADIR%%/toolchains/grid_list_simple_filter.xml

Return to bug 227901

Lines 2-9 Link Here

(-)saga/Makefile (-6 / +19 lines)
2	# $FreeBSD: head/math/saga/Makefile 464084 2018-03-10 17:46:04Z gerald $	2	# $FreeBSD: head/math/saga/Makefile 464084 2018-03-10 17:46:04Z gerald $
3		3
4	PORTNAME= saga	4	PORTNAME= saga
5	PORTVERSION= 6.1.0	5	PORTVERSION= 6.3.0
6	PORTREVISION= 3
7	CATEGORIES= math	6	CATEGORIES= math
8	MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}	7	MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
9		8
Lines 18-24 Link Here
18	libgdal.so:graphics/gdal \	17	libgdal.so:graphics/gdal \
19	libhpdf.so:print/libharu \	18	libhpdf.so:print/libharu \
20	libjasper.so:graphics/jasper \	19	libjasper.so:graphics/jasper \
21	liblas.so:devel/liblas12 \	20	liblas12.so:devel/liblas12 \
22	libodbc.so:databases/unixODBC \	21	libodbc.so:databases/unixODBC \
23	libopencv_core.so:graphics/opencv-core \	22	libopencv_core.so:graphics/opencv-core \
24	libopencv_ml.so:graphics/opencv \	23	libopencv_ml.so:graphics/opencv \
Lines 28-37 Link Here
28	libtiff.so:graphics/tiff	27	libtiff.so:graphics/tiff
29	RUN_DEPENDS:= ${BUILD_DEPENDS}	28	RUN_DEPENDS:= ${BUILD_DEPENDS}
30		29
31	USES= autoreconf compiler:gcc-c++11-lib desktop-file-utils dos2unix \	30	USES= autoreconf compiler:c++11-lib desktop-file-utils dos2unix \
32	iconv:wchar_t libtool localbase pkgconfig python:2.7	31	iconv:wchar_t libtool localbase pkgconfig python:2
		32
33	USE_LDCONFIG= yes	33	USE_LDCONFIG= yes
34	USE_CXXSTD= c++11
35	USE_WX= 3.0+	34	USE_WX= 3.0+
36	CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \	35	CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
37	--enable-python --with-system-svm	36	--enable-python --with-system-svm
Lines 64-69 Link Here
64		63
65	SUB_FILES= pkg-message	64	SUB_FILES= pkg-message
66		65
		66	.if ${PORT_OPTIONS:MOPENMP} && (${ARCH} == amd64 \|\| ${ARCH} == i386) && ${COMPILER_TYPE} == clang
		67	# Enable OpenMP support with Clang 5.0.
		68	BUILD_DEPENDS+= clang50:devel/llvm50
		69	LIB_DEPENDS+= libomp.so:devel/openmp
		70	CPP= clang-cpp50
		71	CC= clang50
		72	CXX= clang++50
		73	OPENMP_FLAGS+= -L${LOCALBASE}/lib -lm -lomp
		74	LDFLAGS+= ${OPENMP_FLAGS}
		75	.endif
		76
67	post-extract:	77	post-extract:
68	@${REINPLACE_CMD} -e 's\|wx-config \|${WX_CONFIG} \|g' \	78	@${REINPLACE_CMD} -e 's\|wx-config \|${WX_CONFIG} \|g' \
69	${WRKSRC}/configure.ac \	79	${WRKSRC}/configure.ac \
Lines 90-95 Link Here
90	.endif	100	.endif
91	@${REINPLACE_CMD} -e 's\|PORTVERSION\|${PORTVERSION}\|' \	101	@${REINPLACE_CMD} -e 's\|PORTVERSION\|${PORTVERSION}\|' \
92	${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp	102	${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp
		103	.if ${PORT_OPTIONS:MOPENMP} && (${ARCH} == amd64 \|\| ${ARCH} == i386) && ${COMPILER_TYPE} == clang
		104	@${REINPLACE_CMD} -e 's\|-lgomp\|-lomp\|' ${WRKSRC}/configure.ac
		105	.endif
93		106
94	post-configure:	107	post-configure:
95	@${REINPLACE_CMD} -e 's\|cd $$(pkgdatadir);\|cd ${STAGEDIR}${DATADIR};\|g' \	108	@${REINPLACE_CMD} -e 's\|cd $$(pkgdatadir);\|cd ${STAGEDIR}${DATADIR};\|g' \

Line 0 Link Here

(-)saga/files/patch-configure (+19 lines)
	1	--- configure.orig 2017-12-21 10:57:30 UTC
	2	+++ configure
	3	@@ -16235,13 +16235,13 @@ if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes; then
	4	FFTWFOUND=1
	5	fi
	6
	7	-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LAS_GetVersion in -llas" >&5
	8	-$as_echo_n "checking for LAS_GetVersion in -llas... " >&6; }
	9	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LAS_GetVersion in -llas12" >&5
	10	+$as_echo_n "checking for LAS_GetVersion in -llas12... " >&6; }
	11	if ${ac_cv_lib_las_LAS_GetVersion+:} false; then :
	12	$as_echo_n "(cached) " >&6
	13	else
	14	ac_check_lib_save_LIBS=$LIBS
	15	-LIBS="-llas $LIBS"
	16	+LIBS="-llas12 $LIBS"
	17	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	18	/* end confdefs.h. */
	19

Lines 1-66 Link Here

(-)saga/files/patch-git_6e14443b30ce (-66 lines)
1	commit 6e14443b30ce2c8e284617840bc49e249c63afc1
2	Author: oconrad <conrad@geowiss.uni-hamburg.de>
3	Date: Fri Dec 8 10:16:47 2017 +0100
4
5	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
6	---
7	saga-gis/src/saga_core/saga_gui/wksp_tool.cpp \| 25 ++++++++-----------------
8	saga-gis/src/saga_core/saga_gui/wksp_tool.h \| 2 --
9	2 files changed, 8 insertions(+), 19 deletions(-)
10
11	--- src/saga_core/saga_gui/wksp_tool.cpp.orig 2017-09-01 15:57:36 UTC
12	+++ src/saga_core/saga_gui/wksp_tool.cpp
13	@@ -135,34 +135,25 @@ wxString CWKSP_Tool::Get_Name(void)
14	}
15
16	//---------------------------------------------------------
17	-wxString CWKSP_Tool::Get_File_Name(void)
18	-{
19	- return( m_pTool->Get_File_Name().c_str() );
20	-}
21	-
22	-//---------------------------------------------------------
23	wxString CWKSP_Tool::Get_Description(void)
24	{
25	//-----------------------------------------------------
26	- if( !Get_File_Name().IsEmpty() )
27	+ if( !m_pTool->Get_File_Name().is_Empty() )
28	{
29	+ CSG_String Lib_Name = SG_File_Get_Name(m_pTool->Get_File_Name(), false);
30	+ CSG_String File_Path = SG_File_Make_Path(SG_File_Get_Path(m_pTool->Get_File_Name()), Lib_Name, "");
31	+
32	+ File_Path = SG_File_Make_Path(File_Path, CSG_String::Format("%s_%02d", Lib_Name.c_str(), Get_Index()));
33	+
34	CSG_String Description;
35	CSG_File Stream;
36
37	- wxFileName FileName(Get_File_Name());
38	- FileName.AppendDir (FileName.GetName());
39	- FileName.SetName (wxString::Format("%s_%02d", FileName.GetName().c_str(), Get_Index()));
40	-
41	- FileName.SetExt ("html");
42	-
43	- if( Stream.Open(FileName.GetFullPath().wc_str(), SG_FILE_R) && Stream.Read(Description, Stream.Length()) )
44	+ if( SG_File_Set_Extension(File_Path, "html") && Stream.Open(File_Path, SG_FILE_R) && Stream.Read(Description, Stream.Length()) )
45	{
46	return( Description.c_str() );
47	}
48
49	- FileName.SetExt ("htm");
50	-
51	- if( Stream.Open(FileName.GetFullPath().wc_str(), SG_FILE_R) && Stream.Read(Description, Stream.Length()) )
52	+ if( SG_File_Set_Extension(File_Path, "htm" ) && Stream.Open(File_Path, SG_FILE_R) && Stream.Read(Description, Stream.Length()) )
53	{
54	return( Description.c_str() );
55	}
56	--- src/saga_core/saga_gui/wksp_tool.h.orig 2017-05-24 13:15:53 UTC
57	+++ src/saga_core/saga_gui/wksp_tool.h
58	@@ -103,8 +103,6 @@ class CWKSP_Tool : public CWKSP_Base_Item (public)
59	void Set_Menu_ID (int Menu_ID);
60	int Get_Menu_ID (void) { return( m_Menu_ID ); }
61
62	- wxString Get_File_Name (void);
63	-
64	bool is_Interactive (void);
65	bool is_Executing (void);
66

Line 0 Link Here

(-)saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp (+15 lines)
	1	--- src/tools/io/io_shapes_las/las_export.cpp.orig 2018-05-01 09:07:10 UTC
	2	+++ src/tools/io/io_shapes_las/las_export.cpp
	3	@@ -61,9 +61,9 @@
	4	//---------------------------------------------------------
	5	#include "las_export.h"
	6
	7	-#include <liblas/laspoint.hpp>
	8	-#include <liblas/laswriter.hpp>
	9	-#include <liblas/capi/las_version.h>
	10	+#include <liblas12/laspoint.hpp>
	11	+#include <liblas12/laswriter.hpp>
	12	+#include <liblas12/capi/las_version.h>
	13	#include <fstream>
	14	#include <iostream>
	15	#include <cstddef>

Line 0 Link Here

(-)saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp (+15 lines)
	1	--- src/tools/io/io_shapes_las/las_import.cpp.orig 2018-05-01 09:07:10 UTC
	2	+++ src/tools/io/io_shapes_las/las_import.cpp
	3	@@ -60,9 +60,9 @@
	4	//---------------------------------------------------------
	5	#include "las_import.h"
	6
	7	-#include <liblas/laspoint.hpp>
	8	-#include <liblas/lasreader.hpp>
	9	-#include <liblas/capi/las_version.h>
	10	+#include <liblas12/laspoint.hpp>
	11	+#include <liblas12/lasreader.hpp>
	12	+#include <liblas12/capi/las_version.h>
	13	#include <fstream>
	14	#include <iostream>
	15

Line 0 Link Here

(-)saga/files/patch-src_tools_io_io__shapes__las_las__info.h (+15 lines)
	1	--- src/tools/io/io_shapes_las/las_info.h.orig 2018-05-01 09:07:11 UTC
	2	+++ src/tools/io/io_shapes_las/las_info.h
	3	@@ -76,9 +76,9 @@
	4	//---------------------------------------------------------
	5	#include "MLB_Interface.h"
	6
	7	-#include <liblas/laspoint.hpp>
	8	-#include <liblas/lasreader.hpp>
	9	-#include <liblas/capi/las_version.h>
	10	+#include <liblas12/laspoint.hpp>
	11	+#include <liblas12/lasreader.hpp>
	12	+#include <liblas12/capi/las_version.h>
	13	#include <fstream>
	14	#include <iostream>
	15