- Update from 2.2.2 (r2652) to 2.2.3 (r2737)

- Use other distfile naming scheme again
- Correct usage of wx-config for SAGA GIS module io_virtual
- Adjust naming scheme of patches via 'make makepatch'
- Update pkg-plist

PR:		    205491
Submitted by:   maintainer

5 files changed, 31 insertions, 12 deletions

diff --git a/math/saga/Makefile b/math/saga/Makefile
index d13238479e86..d110f16a0718 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	saga
-PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTVERSION=	2.2.3
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	rhurlin@gwdg.de
 COMMENT=	System for Automated Geoscientific Analyses
@@ -72,6 +72,7 @@ post-extract:
 		${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/io/io_virtual/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 \
@@ -82,7 +83,7 @@ post-patch:
 		${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 r2652)" + "\\n"|' \
+	@${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2737)" + "\\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;|' \
diff --git a/math/saga/distinfo b/math/saga/distinfo
index c4e6070218b0..e1101fa71481 100644
--- a/math/saga/distinfo
+++ b/math/saga/distinfo
@@ -1,2 +1,2 @@
-SHA256 (saga-2.2.2.tar.gz) = 031cd70b7ec248f32f955a9316aefc7f7ab283c5129c49aa4bd748717d20357e
-SIZE (saga-2.2.2.tar.gz) = 4034027
+SHA256 (saga_2.2.3.tar.gz) = f26591c097c8766df9db266bf50e1b38a5bebe0119b44a9b70ae793d0d8bade3
+SIZE (saga_2.2.3.tar.gz) = 4075266
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 8c7c2f8aaf5e..6a2b4d22be81 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,4 +1,4 @@
---- src/saga_core/saga_cmd/saga_cmd.cpp.orig	2015-02-26 07:51:10 UTC
+--- src/saga_core/saga_cmd/saga_cmd.cpp.orig	2015-12-21 09:38:29 UTC
 +++ src/saga_core/saga_cmd/saga_cmd.cpp
 @@ -65,6 +65,7 @@
  
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 005982193674..22e35a90e482 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,4 +1,4 @@
---- src/saga_core/saga_gui/dlg_about.cpp.orig	2015-04-30 11:42:32 UTC
+--- src/saga_core/saga_gui/dlg_about.cpp.orig	2015-12-21 09:38:29 UTC
 +++ src/saga_core/saga_gui/dlg_about.cpp
 @@ -65,6 +65,7 @@
  #include <saga_api/clipper.hpp>
@@ -8,12 +8,23 @@
  
  #include "helper.h"
  
-@@ -246,7 +247,19 @@ wxString CDLG_About::_Get_Version(void)
+@@ -188,7 +189,7 @@ wxString CDLG_About::_Get_Version(void)
+ 	s	+= "System for Automated Geoscientific Analyses\n";
+ 	s	+= "http://www.saga-gis.org\n";
+ 	s	+= "\n";
+-	s	+= "Version: " + wxString(SAGA_VERSION) + "\n";
++	s	+= "Version: " + wxString(SAGA_VERSION) + " (SVN r2737)" + "\n";
+ 
+ #ifdef _SAGA_MSW
+ 	#ifdef _WIN64
+@@ -264,7 +265,21 @@ wxString CDLG_About::_Get_Version(void)
  		#elif	defined(__GNUWIN32__)
  			"Gnu-Win32 compiler"
  		#elif	defined(__GNUG__)
 -			"Gnu C++"
-+			#if   wxCHECK_GCC_VERSION(5,0)
++			#if   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"
@@ -26,6 +37,6 @@
 +			#else
 +				"Gnu C++"
 +			#endif
- 		#elif	defined(__MWERKS__)
- 			"CodeWarrior MetroWerks compiler"
- 		#elif	defined(__SUNCC__)
+ 		#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"
diff --git a/math/saga/pkg-plist b/math/saga/pkg-plist
index 6a04486fe622..9fa447aba4e2 100644
--- a/math/saga/pkg-plist
+++ b/math/saga/pkg-plist
@@ -91,6 +91,7 @@ lib/saga/libsim_erosion.so
 lib/saga/libsim_fire_spreading.so
 lib/saga/libsim_hydrology.so
 lib/saga/libsim_ihacres.so
+lib/saga/libsim_qm_of_esp.so
 lib/saga/libsim_rivflow.so
 lib/saga/libstatistics_grid.so
 lib/saga/libstatistics_kriging.so
@@ -123,6 +124,11 @@ share/pixmaps/saga.png
 %%DATADIR%%/saga_prj.dic
 %%DATADIR%%/saga_prj.srs
 %%DATADIR%%/saga_tip.txt
+%%DATADIR%%/scripting/helper/make_arcsaga_toolboxes.bat
+%%DATADIR%%/scripting/helper/make_saga_release.bat
+%%DATADIR%%/scripting/helper/make_saga_snapshot.bat
+%%DATADIR%%/scripting/helper/make_tools_interface.bat
+%%DATADIR%%/scripting/helper/make_translation_files.bat
 %%DATADIR%%/scripting/python/examples/00_grid_create_dummy.py
 %%DATADIR%%/scripting/python/examples/01_grid_asc_to_saga.py
 %%DATADIR%%/scripting/python/examples/02_grid_morphometry.py
@@ -134,6 +140,7 @@ share/pixmaps/saga.png
 %%DATADIR%%/scripting/python/helpers/saga_cmd_param_interface/environment.py
 %%DATADIR%%/scripting/python/helpers/saga_cmd_param_interface/param_interface.py
 %%DATADIR%%/scripting/python/helpers/saga_cmd_param_interface/tools.py
+%%DATADIR%%/scripting/python/saga_python_api.txt
 %%DATADIR%%/scripting/python/test_data/test.mgrd
 %%DATADIR%%/scripting/python/test_data/test.sdat
 %%DATADIR%%/scripting/python/test_data/test.sgrd