mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00
Code Issues Releases Activity

math/saga: update 6.3.0 -> 6.4.0, fix describe

Browse Source 
- Change from llvm50 to llvm60
- Use OpenMP from within llvm60 instead of devel/openmp
- disable OpenMP, if i386 is detected

PR:		229470, 229129
Submitted by:	Rainer Hurling <rhurlin@gwdg.de> (maintainer)
Reported by:	Uasyhiro KIMURA <yasu@utahime.org>
Reviewed by:	w.schwarzenfeld@utanet.at
Relnotes:	https://sourceforge.net/p/saga-gis/news/2018/06/saga-640-released/
This commit is contained in:
Kurt Jaeger 2018-07-03 07:07:50 +00:00
parent 780454f45b
commit 20f73e970b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=473802
6 changed files with 32 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
math/saga/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= saga
PORTVERSION= 6.3.0
PORTVERSION= 6.4.0
CATEGORIES= math
MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
@ -12,7 +12,7 @@ COMMENT= System for Automated Geoscientific Analyses
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
BUILD_DEPENDS= clang50:devel/llvm50 \
BUILD_DEPENDS= clang60:devel/llvm60 \
swig3.0:devel/swig30
LIB_DEPENDS= libfftw3.so:math/fftw3 \
libgdal.so:graphics/gdal \
@ -38,9 +38,6 @@ CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig3.0"
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CPP= clang-cpp50
CC= clang50
CXX= clang++50
INSTALLS_ICONS= yes
DOS2UNIX_GLOB= *.cpp *.h
PLIST_SUB= PORTVERSION=${PORTVERSION}
@ -48,17 +45,11 @@ PLIST_SUB= PORTVERSION=${PORTVERSION}
OPTIONS_DEFINE= PGSQL OPENMP VIGRA
OPTIONS_DEFAULT= PGSQL VIGRA
OPTIONS_DEFAULT_amd64= OPENMP
OPTIONS_DEFAULT_i386= OPENMP
NO_OPTIONS_SORT= yes
OPTIONS_SUB= yes
OPENMP_DESC= Enable Multiprocessing (only amd64 and i386)
OPENMP_DESC= Enable Multiprocessing (only amd64, NOT i386)
VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library
## TODO: OPENMP_?= Only for archs amd64 and i386
OPENMP_CONFIGURE_ENABLE= openmp
OPENMP_LIB_DEPENDS= libomp.so:devel/openmp
OPENMP_LDFLAGS= -L${LOCALBASE}/lib -lm -pthread
#OPENMP_EXTRA_PATCHES= ${PATCHDIR}/
PGSQL_CONFIGURE_OFF= --with-postgresql=no
PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE}/bin/pg_config
PGSQL_USES= pgsql
@ -69,6 +60,19 @@ INSTALL_TARGET= install-strip
.include <bsd.port.pre.mk>
# make describe needs them here
CPP= clang-cpp60
CC= clang60
CXX= clang++60
### TODO: OPENMP_?= NOT for other archs
.if ${OPSYS} == FreeBSD && ${ARCH} != i386
OPENMP_CONFIGURE_ENABLE= openmp
OPENMP_LDFLAGS= -L${LOCALBASE}/lib -lm -L${LOCALBASE}/llvm60/lib -lomp
.else
OPENMP_CONFIGURE_DISABLE= openmp
.endif
SUB_FILES= pkg-message
post-extract:
@ -99,7 +103,10 @@ post-patch:
${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp
post-patch-OPENMP-on:
@${REINPLACE_CMD} -e 's|-lgomp|-lomp|' ${WRKSRC}/configure.ac
@${REINPLACE_CMD} -e 's|-lgomp|-lomp|' \
${WRKSRC}/configure.ac \
${WRKSRC}/configure \
${WRKSRC}/src/accessories/templates/template4saga-tools/my_tool_library/Makefile
post-configure:
@${REINPLACE_CMD} -e 's|cd $$(pkgdatadir);|cd ${STAGEDIR}${DATADIR};|g' \

6
math/saga/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1524468589
SHA256 (saga-6.3.0.tar.gz) = bb4b99406e3a25cdaa12559904ce3272c449acb542bc0883b2755ce6508dd243
SIZE (saga-6.3.0.tar.gz) = 4583450
TIMESTAMP = 1530197655
SHA256 (saga-6.4.0.tar.gz) = 9c3db7089278d50631171526d63398bb56417956623eb62b20143878dadd1490
SIZE (saga-6.4.0.tar.gz) = 4603077

5
math/saga/files/patch-configure.ac
View File

@ -1,4 +1,4 @@
--- configure.ac.orig 2018-04-23 07:44:48 UTC
--- configure.ac.orig 2018-06-26 18:36:29 UTC
+++ configure.ac
@@ -20,13 +20,13 @@ AC_PROG_LIBTOOL
AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,)
@ -10,8 +10,9 @@
AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC \(libodbc\) library not found])
AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,)
AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,)
AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,)
-AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,)
-AC_CHECK_HEADER([libsvm/svm.h],[AC_CHECK_LIB([svm], [svm_get_svm_type], SVMFOUND=1,,)])
+AC_CHECK_LIB([omp], [omp_get_num_threads], GOMPFOUND=1,,)
+AC_CHECK_HEADER([svm.h],[AC_CHECK_LIB([svm], [svm_get_svm_type], SVMFOUND=1,,)])
PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1],[LIBDXFFOUND=0])
PKG_CHECK_MODULES([HDF5],[hdf5],LIBHDF5FOUND=1,LIBHDF5FOUND=0)

25
math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp
View File

@ -1,25 +0,0 @@
--- src/tools/io/io_grid_image/grid_to_kml.cpp.orig 2018-05-03 05:29:35 UTC
+++ src/tools/io/io_grid_image/grid_to_kml.cpp
@@ -504,7 +504,7 @@ bool CGrid_from_KML::On_Execute(void)
if( !KML.Load(&File) )
{
- Error_Fmt("%s [%s]", _TL("failed to load file"), File.wc_str());
+ Error_Fmt("%s [%s]", _TL("failed to load file"), File.wx_str());
return( false );
}
@@ -582,11 +582,11 @@ bool CGrid_from_KML::Load_Overlay(const SG_Char *Dir,
}
CSG_Data_Manager Data;
- CSG_String FullPath = fn.GetFullPath().wc_str();
+ CSG_String FullPath = fn.GetFullPath().wx_str();
if( !Data.Add(FullPath) || !Data.Get_Grid_System(0) || !Data.Get_Grid_System(0)->Get(0) )
{
- Error_Fmt("%s: %s", _TL("failed to load KML ground overlay icon"), fn.GetFullPath().wc_str());
+ Error_Fmt("%s: %s", _TL("failed to load KML ground overlay icon"), fn.GetFullPath().wx_str());
}
//-----------------------------------------------------

3
math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp
View File

@ -1,4 +1,4 @@
--- 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.orig 2018-06-19 12:39:11 UTC
+++ src/tools/io/io_shapes_las/las_export.cpp
@@ -61,9 +61,9 @@
//---------------------------------------------------------
@ -13,3 +13,4 @@
#include <fstream>
#include <iostream>
#include <cstddef>

6
math/saga/pkg-plist
View File

@ -134,6 +134,8 @@ share/pixmaps/saga.png
@mode 0666
%%DATADIR%%/accessories/CMakeLists.txt
%%DATADIR%%/accessories/helper/make_arcsaga_toolboxes.bat
%%DATADIR%%/accessories/helper/make_python_api.bat
%%DATADIR%%/accessories/helper/make_python_api_x64.bat
%%DATADIR%%/accessories/helper/make_saga_release.bat
%%DATADIR%%/accessories/helper/make_saga_snapshot.bat
%%DATADIR%%/accessories/helper/make_tools_interface.bat
@ -171,8 +173,8 @@ share/pixmaps/saga.png
%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library_link2bin.vcxproj.filters
%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library_link2src.vcxproj
%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library_link2src.vcxproj.filters
%%DATADIR%%/accessories/templates/template4saga-tools/my_tools_link2bin.vc10.sln
%%DATADIR%%/accessories/templates/template4saga-tools/my_tools_link2src.vc10.sln
%%DATADIR%%/accessories/templates/template4saga-tools/my_tools_link2bin.vc14.sln
%%DATADIR%%/accessories/templates/template4saga-tools/my_tools_link2src.vc14.sln
%%DATADIR%%/accessories/templates/template4saga-tools/readme.txt
%%DATADIR%%/saga.bra.txt
%%DATADIR%%/saga.ger.txt