- Update to 2.1.4

PR:		198357
Submitted by:	Rainer Hurling<rhurlin@gwdg.de> (maintainer)

5 files changed, 72 insertions, 44 deletions

diff --git a/math/saga/Makefile b/math/saga/Makefile
index 3b256ad687cd..0467e8da60f8 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	saga
-PORTVERSION=	2.1.2
-PORTREVISION=	6
+PORTVERSION=	2.1.4
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -14,27 +13,26 @@ COMMENT=	System for Automated Geoscientific Analyses
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20
+BUILD_DEPENDS=	swig3.0:${PORTSDIR}/devel/swig30
 LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
 		libgdal.so:${PORTSDIR}/graphics/gdal \
 		libhpdf.so:${PORTSDIR}/print/libharu \
 		libjasper.so:${PORTSDIR}/graphics/jasper \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libodbc.so:${PORTSDIR}/databases/unixODBC \
-		liblas.so:${PORTSDIR}/devel/liblas \
+		liblas.so:${PORTSDIR}/devel/liblas12 \
 		libopencv_ml.so:${PORTSDIR}/graphics/opencv
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFIGURE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		--enable-python
-CONFIGURE_ENV=	SWIG="${LOCALBASE}/bin/swig2.0"
+CONFIGURE_ENV=	SWIG="${LOCALBASE}/bin/swig3.0"
 CFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -lopencv_contrib
-# Python no option any more, because it can't be turned off completely
 USE_LDCONFIG=	yes
 USE_WX=		3.0+
-USES=		compiler:gcc-c++11-lib iconv:wchar_t dos2unix libtool python:2
+USES=		autoreconf compiler:gcc-c++11-lib iconv:wchar_t dos2unix libtool python:2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WX_UNICODE=	yes
 
@@ -60,28 +58,28 @@ VIGRA_RUN_DEPENDS=	${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra
 
 .include <bsd.port.pre.mk>
 
+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/modules/garden/garden_3d_viewer/Makefile.am \
+		${WRKSRC}/src/modules/garden/garden_webservices/Makefile.am \
+		${WRKSRC}/src/modules/io/io_grid_image/Makefile.am \
+		${WRKSRC}/src/modules/io/io_shapes/Makefile.am \
+		${WRKSRC}/src/modules/pointcloud/pointcloud_tools/Makefile.am \
+		${WRKSRC}/src/modules/pointcloud/pointcloud_viewer/Makefile.am \
+		${WRKSRC}/src/modules/tin/tin_viewer/Makefile.am \
+		${WRKSRC}/src/modules/statistics/statistics_kriging/Makefile.am
+
 post-patch:
-	@${REINPLACE_CMD} -e's|wx-config |${WX_CONFIG} |g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/src/saga_core/saga_gui/Makefile.in \
-		${WRKSRC}/src/saga_core/saga_api/Makefile.in \
-		${WRKSRC}/src/saga_core/saga_cmd/Makefile.in \
-		${WRKSRC}/src/saga_core/saga_gdi/Makefile.in \
-		${WRKSRC}/src/modules/garden/garden_webservices/Makefile.in \
-		${WRKSRC}/src/modules/garden/garden_3d_viewer/Makefile.in \
-		${WRKSRC}/src/modules/io/io_shapes/Makefile.in \
-		${WRKSRC}/src/modules/io/io_grid_image/Makefile.in \
-		${WRKSRC}/src/modules/pointcloud/pointcloud_tools/Makefile.in \
-		${WRKSRC}/src/modules/pointcloud/pointcloud_viewer/Makefile.in \
-		${WRKSRC}/src/modules/tin/tin_viewer/Makefile.in \
-		${WRKSRC}/src/modules/statistics/statistics_kriging/Makefile.in
 	@${REINPLACE_CMD} -e 's|-lcv|-lopencv_core -lopencv_imgproc|g' \
-		${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile.in
-	@${REINPLACE_CMD} -e 's|lib_cv|lib_opencv_core|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-lcv |-lopencv_core |' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|\\n"), SAGA_VERSION)| (rev. 2121)\\n"), SAGA_VERSION)|' \
+		${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile.am
+	@${REINPLACE_CMD} -e 's|\[cv\]|\[opencv_core\]|' \
+		${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2316)" + "\\n"|' \
 		${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp
 .if ${ARCH} == "powerpc"
 	@${REINPLACE_CMD} -e 's|typedef unsigned long	DWORD;|typedef unsigned int	DWORD;|' \
@@ -91,13 +89,9 @@ post-patch:
 post-configure:
 	@${REINPLACE_CMD} -e 's|cd $$(pkgdatadir);|cd ${STAGEDIR}${DATADIR};|g' \
 		${WRKSRC}/src/saga_core/saga_gui/Makefile
-	@${REINPLACE_CMD} -e 's|mv saga_srs.txt saga_prj.srs|mv \
-		${STAGEDIR}${DATADIR}/saga_srs.txt \
-		${STAGEDIR}${DATADIR}/saga_prj.srs|g' \
+	@${REINPLACE_CMD} -e 's|mv saga_srs.txt saga_prj.srs|mv ${STAGEDIR}${DATADIR}/saga_srs.txt ${STAGEDIR}${DATADIR}/saga_prj.srs|g' \
 		${WRKSRC}/src/saga_core/saga_gui/Makefile
-	@${REINPLACE_CMD} -e 's|mv saga_dic.txt saga_prj.dic|mv \
-		${STAGEDIR}${DATADIR}/saga_dic.txt \
-		${STAGEDIR}${DATADIR}/saga_prj.dic|g' \
+	@${REINPLACE_CMD} -e 's|mv saga_dic.txt saga_prj.dic|mv ${STAGEDIR}${DATADIR}/saga_dic.txt ${STAGEDIR}${DATADIR}/saga_prj.dic|g' \
 		${WRKSRC}/src/saga_core/saga_gui/Makefile
 
 post-install:
@@ -106,11 +100,12 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.lng.txt ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.ger.txt ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR}
+	${CHMOD} -R a+rw ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \
+		${STAGEDIR}${PREFIX}/share/applications/
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_api-${PORTVERSION}.so
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_saga_api-${PORTVERSION}.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_gdi-${PORTVERSION}.so
-	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \
-		${STAGEDIR}${PREFIX}/share/applications/
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/saga/*.so
 # library helper files are not needed and cripple some math/qgis extensions
 	@${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la
diff --git a/math/saga/distinfo b/math/saga/distinfo
index 4ab537a622cb..9c31288777fd 100644
--- a/math/saga/distinfo
+++ b/math/saga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (saga_2.1.2.tar.gz) = 51885446f717191210c4b13f0c35a1c5194c9d696d4f9b8f594bc1014809b2f5
-SIZE (saga_2.1.2.tar.gz) = 3910510
+SHA256 (saga_2.1.4.tar.gz) = 694e4102f592f512c635328c40fdeff33493f74698d9466bb654baf3247e7b76
+SIZE (saga_2.1.4.tar.gz) = 3892039
diff --git a/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h b/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h
index 5d0089dd6d29..e12786350938 100644
--- a/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h
+++ b/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h
@@ -1,12 +1,12 @@
---- src/modules/imagery/imagery_opencv/opencv.h.orig	2014-01-14 11:27:53.000000000 +0100
-+++ src/modules/imagery/imagery_opencv/opencv.h	2014-01-14 11:28:44.000000000 +0100
-@@ -73,7 +73,8 @@
- #include "MLB_Interface.h"
+--- src/modules/imagery/imagery_opencv/opencv.h.orig	2014-09-02 12:47:18.000000000 +0200
++++ src/modules/imagery/imagery_opencv/opencv.h	2014-09-02 12:48:48.000000000 +0200
+@@ -74,7 +74,8 @@
  
  //---------------------------------------------------------
--#include <opencv/cv.h>
+ #include <opencv/cv.h>
+-
 +#include <opencv2/core/core_c.h>
 +#include <opencv2/imgproc/imgproc_c.h>
  
- 
  ///////////////////////////////////////////////////////////
+ //														 //
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
new file mode 100644
index 000000000000..32875c63a95f
--- /dev/null
+++ b/math/saga/files/patch-src__saga_core__saga_gui__dlg_about.cpp
@@ -0,0 +1,31 @@
+--- src/saga_core/saga_gui/dlg_about.cpp.orig	2014-09-04 20:46:26.000000000 +0200
++++ src/saga_core/saga_gui/dlg_about.cpp	2014-09-04 21:11:43.000000000 +0200
+@@ -65,6 +65,7 @@
+ #include <saga_api/clipper.hpp>
+ 
+ #include <wx/notebook.h>
++#include <wx/platform.h>
+ 
+ #include "helper.h"
+ 
+@@ -246,7 +247,19 @@
+ 		#elif	defined(__GNUWIN32__)
+ 			"Gnu-Win32 compiler"
+ 		#elif	defined(__GNUG__)
+-			"Gnu C++"
++			#if   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(__MWERKS__)
+ 			"CodeWarrior MetroWerks compiler"
+ 		#elif	defined(__SUNCC__)
diff --git a/math/saga/pkg-plist b/math/saga/pkg-plist
index ae6b4e1d8aa5..881d808b7554 100644
--- a/math/saga/pkg-plist
+++ b/math/saga/pkg-plist
@@ -57,7 +57,7 @@ lib/saga/libgrid_tools.so
 lib/saga/libgrid_visualisation.so
 lib/saga/libimagery_classification.so
 lib/saga/libimagery_opencv.so
-lib/saga/libimagery_rga.so
+lib/saga/libimagery_photogrammetry.so
 lib/saga/libimagery_segmentation.so
 lib/saga/libimagery_svm.so
 lib/saga/libimagery_tools.so
@@ -70,6 +70,7 @@ lib/saga/libio_grid_grib2.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
@@ -106,6 +107,7 @@ 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/pixmaps/saga.png
 %%DATADIR%%/saga.ger.txt