svn commit: r391365 - in head/math/saga: . files
Thomas Zander
riggs at FreeBSD.org
Sun Jul 5 14:11:40 UTC 2015
Author: riggs
Date: Sun Jul 5 14:11:36 2015
New Revision: 391365
URL: https://svnweb.freebsd.org/changeset/ports/391365
Log:
- Update to upstream version 2.2.0
- Install icons
- Switch from ${CHMOD} in Makefile to @mode in pkg-plist
- Rework files/ dir using 'make makepatch'
PR: 201329
Submitted by: rhurlin at gwdg.de (maintainer)
Added:
head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv.h
- copied, changed from r391344, head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h
head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv__nnet.cpp
- copied, changed from r391344, head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv_net.cpp
head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv__nnet.h
- copied, changed from r391344, head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv_net.h
head/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp
- copied, changed from r391344, head/math/saga/files/patch-src__saga_core__saga_cmd__saga_cmd.cpp
head/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp
- copied, changed from r391344, head/math/saga/files/patch-src__saga_core__saga_gui__dlg_about.cpp
Deleted:
head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h
head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv_net.cpp
head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv_net.h
head/math/saga/files/patch-src__modules__io__io_shapes_las__las_export.cpp
head/math/saga/files/patch-src__saga_core__saga_cmd__saga_cmd.cpp
head/math/saga/files/patch-src__saga_core__saga_gui__dlg_about.cpp
Modified:
head/math/saga/Makefile
head/math/saga/distinfo
head/math/saga/pkg-plist
Modified: head/math/saga/Makefile
==============================================================================
--- head/math/saga/Makefile Sun Jul 5 13:59:38 2015 (r391364)
+++ head/math/saga/Makefile Sun Jul 5 14:11:36 2015 (r391365)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= saga
-PORTVERSION= 2.1.4
-PORTREVISION= 1
+PORTVERSION= 2.2.0
CATEGORIES= math
MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -40,6 +39,7 @@ WX_UNICODE= yes
DESKTOP_ENTRIES= "SAGA GIS" "${COMMENT}" "${DATADIR}/saga.png" \
"saga_gui" "Science;Geoscience;Math;" true
+INSTALLS_ICONS= yes
DOS2UNIX_GLOB= *.cpp *.h
PLIST_SUB= PORTVERSION=${PORTVERSION}
@@ -81,7 +81,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 r2316)" + "\\n"|' \
+ @${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2537)" + "\\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;|' \
@@ -102,7 +102,6 @@ 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
Modified: head/math/saga/distinfo
==============================================================================
--- head/math/saga/distinfo Sun Jul 5 13:59:38 2015 (r391364)
+++ head/math/saga/distinfo Sun Jul 5 14:11:36 2015 (r391365)
@@ -1,2 +1,2 @@
-SHA256 (saga_2.1.4.tar.gz) = 694e4102f592f512c635328c40fdeff33493f74698d9466bb654baf3247e7b76
-SIZE (saga_2.1.4.tar.gz) = 3892039
+SHA256 (saga_2.2.0.tar.gz) = 50b2e642331c817606bc954302e53757c4ffa6f6d6f468e12caeaaa7a182edaf
+SIZE (saga_2.2.0.tar.gz) = 3914509
Copied and modified: head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv.h (from r391344, head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h)
==============================================================================
--- head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h Sun Jul 5 04:33:53 2015 (r391344, copy source)
+++ head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv.h Sun Jul 5 14:11:36 2015 (r391365)
@@ -1,5 +1,5 @@
---- 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
+--- src/modules/imagery/imagery_opencv/opencv.h.orig 2015-02-26 07:51:59 UTC
++++ src/modules/imagery/imagery_opencv/opencv.h
@@ -74,7 +74,8 @@
//---------------------------------------------------------
Copied and modified: head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv__nnet.cpp (from r391344, head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv_net.cpp)
==============================================================================
--- head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv_net.cpp Sun Jul 5 04:33:53 2015 (r391344, copy source)
+++ head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv__nnet.cpp Sun Jul 5 14:11:36 2015 (r391365)
@@ -1,5 +1,5 @@
---- src/modules/imagery/imagery_opencv/opencv_nnet.cpp.orig 2013-10-24 19:04:27.000000000 +0200
-+++ src/modules/imagery/imagery_opencv/opencv_nnet.cpp 2013-10-24 19:06:05.000000000 +0200
+--- src/modules/imagery/imagery_opencv/opencv_nnet.cpp.orig 2015-02-26 07:51:59 UTC
++++ src/modules/imagery/imagery_opencv/opencv_nnet.cpp
@@ -60,8 +60,8 @@
//---------------------------------------------------------
Copied and modified: head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv__nnet.h (from r391344, head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv_net.h)
==============================================================================
--- head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv_net.h Sun Jul 5 04:33:53 2015 (r391344, copy source)
+++ head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv__nnet.h Sun Jul 5 14:11:36 2015 (r391365)
@@ -1,5 +1,5 @@
---- src/modules/imagery/imagery_opencv/opencv_nnet.h.orig 2013-10-24 19:07:03.000000000 +0200
-+++ src/modules/imagery/imagery_opencv/opencv_nnet.h 2013-10-24 19:08:34.000000000 +0200
+--- src/modules/imagery/imagery_opencv/opencv_nnet.h.orig 2015-02-26 07:51:59 UTC
++++ src/modules/imagery/imagery_opencv/opencv_nnet.h
@@ -64,8 +64,8 @@
//---------------------------------------------------------
Copied and modified: head/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp (from r391344, head/math/saga/files/patch-src__saga_core__saga_cmd__saga_cmd.cpp)
==============================================================================
--- head/math/saga/files/patch-src__saga_core__saga_cmd__saga_cmd.cpp Sun Jul 5 04:33:53 2015 (r391344, copy source)
+++ head/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp Sun Jul 5 14:11:36 2015 (r391365)
@@ -1,5 +1,5 @@
---- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2014-03-28 16:06:55.000000000 +0100
-+++ src/saga_core/saga_cmd/saga_cmd.cpp 2014-03-28 16:09:04.000000000 +0100
+--- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2015-02-26 07:51:10 UTC
++++ src/saga_core/saga_cmd/saga_cmd.cpp
@@ -65,6 +65,7 @@
#include <wx/app.h>
@@ -8,7 +8,7 @@
#include "callback.h"
-@@ -164,7 +165,7 @@
+@@ -164,7 +165,7 @@ _except(1)
//---------------------------------------------------------
bool Run(int argc, char *argv[])
{
Copied and modified: head/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp (from r391344, 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 Sun Jul 5 04:33:53 2015 (r391344, copy source)
+++ head/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp Sun Jul 5 14:11:36 2015 (r391365)
@@ -1,5 +1,5 @@
---- 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
+--- src/saga_core/saga_gui/dlg_about.cpp.orig 2015-04-30 11:42:32 UTC
++++ src/saga_core/saga_gui/dlg_about.cpp
@@ -65,6 +65,7 @@
#include <saga_api/clipper.hpp>
@@ -8,7 +8,7 @@
#include "helper.h"
-@@ -246,7 +247,19 @@
+@@ -246,7 +247,19 @@ wxString CDLG_About::_Get_Version(void)
#elif defined(__GNUWIN32__)
"Gnu-Win32 compiler"
#elif defined(__GNUG__)
@@ -19,7 +19,7 @@
+ "Gnu C++ 4.9"
+ #elif wxCHECK_GCC_VERSION(4,8)
+ "Gnu C++ 4.8"
-+ #elif wxCHECK_GCC_VERSION(4,7)
++ #elif wxCHECK_GCC_VERSION(4,7)
+ "Gnu C++ 4.7"
+ #elif wxCHECK_GCC_VERSION(4,6)
+ "Gnu C++ 4.6"
Modified: head/math/saga/pkg-plist
==============================================================================
--- head/math/saga/pkg-plist Sun Jul 5 13:59:38 2015 (r391364)
+++ head/math/saga/pkg-plist Sun Jul 5 14:11:36 2015 (r391365)
@@ -56,6 +56,7 @@ lib/saga/libgrid_spline.so
lib/saga/libgrid_tools.so
lib/saga/libgrid_visualisation.so
lib/saga/libimagery_classification.so
+lib/saga/libimagery_maxent.so
lib/saga/libimagery_opencv.so
lib/saga/libimagery_photogrammetry.so
lib/saga/libimagery_segmentation.so
@@ -110,9 +111,13 @@ man/man1/saga_gui.1.gz
share/appdata/saga.appdata.xml
share/applications/saga.desktop
share/pixmaps/saga.png
+ at mode 0777
+ at dir %%DATADIR%%
+ at mode 0666
%%DATADIR%%/saga.ger.txt
%%DATADIR%%/saga.lng.txt
+%%DATADIR%%/saga_tip.txt
+ at mode
%%DATADIR%%/saga.png
%%DATADIR%%/saga_prj.dic
%%DATADIR%%/saga_prj.srs
-%%DATADIR%%/saga_tip.txt
More information about the svn-ports-all
mailing list