svn commit: r473802 - in head/math/saga: . files
Kurt Jaeger
pi at FreeBSD.org
Tue Jul 3 07:07:52 UTC 2018
Author: pi
Date: Tue Jul 3 07:07:50 2018
New Revision: 473802
URL: https://svnweb.freebsd.org/changeset/ports/473802
Log:
math/saga: update 6.3.0 -> 6.4.0, fix describe
- 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 at gwdg.de> (maintainer)
Reported by: Uasyhiro KIMURA <yasu at utahime.org>
Reviewed by: w.schwarzenfeld at utanet.at
Relnotes: https://sourceforge.net/p/saga-gis/news/2018/06/saga-640-released/
Deleted:
head/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp
Modified:
head/math/saga/Makefile
head/math/saga/distinfo
head/math/saga/files/patch-configure.ac
head/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp
head/math/saga/pkg-plist
Modified: head/math/saga/Makefile
==============================================================================
--- head/math/saga/Makefile Tue Jul 3 06:31:39 2018 (r473801)
+++ head/math/saga/Makefile Tue Jul 3 07:07:50 2018 (r473802)
@@ -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' \
Modified: head/math/saga/distinfo
==============================================================================
--- head/math/saga/distinfo Tue Jul 3 06:31:39 2018 (r473801)
+++ head/math/saga/distinfo Tue Jul 3 07:07:50 2018 (r473802)
@@ -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
Modified: head/math/saga/files/patch-configure.ac
==============================================================================
--- head/math/saga/files/patch-configure.ac Tue Jul 3 06:31:39 2018 (r473801)
+++ head/math/saga/files/patch-configure.ac Tue Jul 3 07:07:50 2018 (r473802)
@@ -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)
Modified: head/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp
==============================================================================
--- head/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp Tue Jul 3 06:31:39 2018 (r473801)
+++ head/math/saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp Tue Jul 3 07:07:50 2018 (r473802)
@@ -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>
+
Modified: head/math/saga/pkg-plist
==============================================================================
--- head/math/saga/pkg-plist Tue Jul 3 06:31:39 2018 (r473801)
+++ head/math/saga/pkg-plist Tue Jul 3 07:07:50 2018 (r473802)
@@ -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
More information about the svn-ports-all
mailing list