svn commit: r418121 - in head/math/saga: . files

[Wen Heping]

Author: wen
Date: Wed Jul  6 08:36:18 2016
New Revision: 418121
URL: https://svnweb.freebsd.org/changeset/ports/418121

Log:
  - Update to 2.3.0
  
  PR:		210810
  Submitted by:	rhurlin at gwdg.de(maintainer)

Modified:
  head/math/saga/Makefile
  head/math/saga/distinfo
  head/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp
  head/math/saga/pkg-plist

Modified: head/math/saga/Makefile
==============================================================================
--- head/math/saga/Makefile	Wed Jul  6 08:06:56 2016	(r418120)
+++ head/math/saga/Makefile	Wed Jul  6 08:36:18 2016	(r418121)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	saga
-PORTVERSION=	2.2.7
+PORTVERSION=	2.3.0
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -14,14 +14,17 @@ LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	swig3.0:devel/swig30
-LIB_DEPENDS=	libproj.so:graphics/proj \
+LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 		libgdal.so:graphics/gdal \
 		libhpdf.so:print/libharu \
 		libjasper.so:graphics/jasper \
-		libtiff.so:graphics/tiff \
-		libodbc.so:databases/unixODBC \
 		liblas.so:devel/liblas12 \
-		libopencv_ml.so:graphics/opencv
+		libodbc.so:databases/unixODBC \
+		libopencv_ml.so:graphics/opencv \
+		libopencv_core.so:graphics/opencv-core \
+		libproj.so:graphics/proj \
+		libtbb.so:devel/tbb \
+		libtiff.so:graphics/tiff
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFIGURE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
@@ -78,8 +81,6 @@ post-extract:
 		${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile.am
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2893)" + "\\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;|' \
 		${WRKSRC}/src/saga_core/saga_api/api_core.h

Modified: head/math/saga/distinfo
==============================================================================
--- head/math/saga/distinfo	Wed Jul  6 08:06:56 2016	(r418120)
+++ head/math/saga/distinfo	Wed Jul  6 08:36:18 2016	(r418121)
@@ -1,2 +1,3 @@
-SHA256 (saga_2.2.7.tar.gz) = 6be4b844226bc48da4f2deb39bc732767b939e72b76506abf03f8170c54cb671
-SIZE (saga_2.2.7.tar.gz) = 4239415
+TIMESTAMP = 1467312794
+SHA256 (saga_2.3.0.tar.gz) = d1fd4fad55c7fe7e57f4ddb6f24ca7b732977c472766a3a2260bde5b3b31a21e
+SIZE (saga_2.3.0.tar.gz) = 4281156

Modified: 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	Wed Jul  6 08:06:56 2016	(r418120)
+++ head/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp	Wed Jul  6 08:36:18 2016	(r418121)
@@ -1,6 +1,14 @@
---- src/saga_core/saga_gui/dlg_about.cpp.orig	2016-02-28 15:31:41 UTC
+--- src/saga_core/saga_gui/dlg_about.cpp.orig	2016-06-29 05:55:46 UTC
 +++ src/saga_core/saga_gui/dlg_about.cpp
-@@ -264,7 +264,25 @@ wxString CDLG_About::_Get_Version(void)
+@@ -189,6 +189,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-2-3-0/tree/\n";
+ 
+ #ifdef _SAGA_MSW
+ 	#ifdef _WIN64
+@@ -264,7 +265,25 @@ wxString CDLG_About::_Get_Version(void)
  		#elif	defined(__GNUWIN32__)
  			"Gnu-Win32 compiler"
  		#elif	defined(__GNUG__)

Modified: head/math/saga/pkg-plist
==============================================================================
--- head/math/saga/pkg-plist	Wed Jul  6 08:06:56 2016	(r418120)
+++ head/math/saga/pkg-plist	Wed Jul  6 08:36:18 2016	(r418121)
@@ -115,6 +115,7 @@ 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