Date: Wed, 26 Dec 2018 01:35:54 +0000 (UTC) From: Wen Heping <wen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488354 - in head/math/saga: . files Message-ID: <201812260135.wBQ1ZsF2047580@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wen Date: Wed Dec 26 01:35:54 2018 New Revision: 488354 URL: https://svnweb.freebsd.org/changeset/ports/488354 Log: - Update from 6.4.0 to 7.0.0 - Add ftp/curl as LIB_DEPENDS - Use OpenMP from within llvm60 also for i386 - Move some dirs for ${COPYTREE_SHARE} PR: 233408 Submitted by: rhurlin@gwdg.de(maintainer) Modified: head/math/saga/Makefile head/math/saga/distinfo head/math/saga/files/patch-configure head/math/saga/files/patch-configure.ac 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 head/math/saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h head/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp head/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h head/math/saga/files/pkg-message.in head/math/saga/pkg-plist Modified: head/math/saga/Makefile ============================================================================== --- head/math/saga/Makefile Tue Dec 25 23:36:51 2018 (r488353) +++ head/math/saga/Makefile Wed Dec 26 01:35:54 2018 (r488354) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= saga -PORTVERSION= 6.4.0 -PORTREVISION= 4 +PORTVERSION= 7.0.0 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} @@ -15,7 +14,8 @@ LICENSE_COMB= multi BUILD_DEPENDS= clang60:devel/llvm60 \ swig3.0:devel/swig30 -LIB_DEPENDS= libfftw3.so:math/fftw3 \ +LIB_DEPENDS= libcurl.so:ftp/curl \ + libfftw3.so:math/fftw3 \ libgdal.so:graphics/gdal \ libhpdf.so:print/libharu \ libjasper.so:graphics/jasper \ @@ -46,11 +46,16 @@ 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, NOT i386) +OPENMP_DESC= Enable Multiprocessing (only amd64 and i386) VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library +OPENMP_CONFIGURE_ENABLE= openmp +OPENMP_LDFLAGS= -L${LOCALBASE}/lib -lm +# Use OpenMP from lang/llvm60 +OPENMP_LDFLAGS+= -L${LOCALBASE}/llvm60/lib -lomp PGSQL_CONFIGURE_OFF= --with-postgresql=no PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE}/bin/pg_config PGSQL_USES= pgsql @@ -66,14 +71,6 @@ 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: @@ -121,9 +118,10 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR} ${RM} ${STAGEDIR}${DATADIR}/saga_dic.txt ${STAGEDIR}${DATADIR}/saga_srs.txt # toolchains dir was moved in r2805 (and followups r2810,r2811,r2820) - ${MKDIR} ${STAGEDIR}${DATADIR}/accessories - (cd ${WRKSRC}/src/accessories && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/accessories) + (cd ${WRKSRC}/src/accessories && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) + ${RM} -R ${STAGEDIR}${DATADIR}/CMakeLists.txt ${RM} -R ${STAGEDIR}${DATADIR}/accessories/toolchains + ${RM} -R ${STAGEDIR}${DATADIR}/templates/template4saga-tools/my_tool_library/Makefile.bak ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \ ${STAGEDIR}${PREFIX}/share/applications/ # library helper files are not needed and cripple some math/qgis extensions Modified: head/math/saga/distinfo ============================================================================== --- head/math/saga/distinfo Tue Dec 25 23:36:51 2018 (r488353) +++ head/math/saga/distinfo Wed Dec 26 01:35:54 2018 (r488354) @@ -1,3 +1,3 @@ -TIMESTAMP = 1530197655 -SHA256 (saga-6.4.0.tar.gz) = 9c3db7089278d50631171526d63398bb56417956623eb62b20143878dadd1490 -SIZE (saga-6.4.0.tar.gz) = 4603077 +TIMESTAMP = 1542872258 +SHA256 (saga-7.0.0.tar.gz) = b30418eb60c28324536011c0331a4da14f8f3881ddf2ac240e35944229fdc592 +SIZE (saga-7.0.0.tar.gz) = 4646132 Modified: head/math/saga/files/patch-configure ============================================================================== --- head/math/saga/files/patch-configure Tue Dec 25 23:36:51 2018 (r488353) +++ head/math/saga/files/patch-configure Wed Dec 26 01:35:54 2018 (r488354) @@ -1,6 +1,6 @@ ---- configure.orig 2017-12-21 10:57:30 UTC +--- configure.orig 2018-10-05 11:27:46 UTC +++ configure -@@ -16235,13 +16235,13 @@ if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes; then +@@ -16241,13 +16241,13 @@ if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes; then FFTWFOUND=1 fi Modified: head/math/saga/files/patch-configure.ac ============================================================================== --- head/math/saga/files/patch-configure.ac Tue Dec 25 23:36:51 2018 (r488353) +++ head/math/saga/files/patch-configure.ac Wed Dec 26 01:35:54 2018 (r488354) @@ -1,4 +1,4 @@ ---- configure.ac.orig 2018-06-26 18:36:29 UTC +--- configure.ac.orig 2018-11-22 07:53:05 UTC +++ configure.ac @@ -20,13 +20,13 @@ AC_PROG_LIBTOOL AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,) @@ -16,4 +16,4 @@ +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) - + LIBCURL_CHECK_CONFIG([yes], [7.7.2],,) Modified: 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 Tue Dec 25 23:36:51 2018 (r488353) +++ head/math/saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp Wed Dec 26 01:35:54 2018 (r488354) @@ -1,4 +1,4 @@ ---- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2018-05-01 09:07:11 UTC +--- src/saga_core/saga_cmd/saga_cmd.cpp.orig 2018-11-22 07:53:06 UTC +++ src/saga_core/saga_cmd/saga_cmd.cpp @@ -64,6 +64,7 @@ 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 Tue Dec 25 23:36:51 2018 (r488353) +++ head/math/saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp Wed Dec 26 01:35:54 2018 (r488354) @@ -1,4 +1,4 @@ ---- src/saga_core/saga_gui/dlg_about.cpp.orig 2018-05-01 09:07:11 UTC +--- src/saga_core/saga_gui/dlg_about.cpp.orig 2018-11-22 07:53:06 UTC +++ src/saga_core/saga_gui/dlg_about.cpp @@ -188,6 +188,7 @@ wxString CDLG_About::_Get_Version(void) s += "http://www.saga-gis.org\n"; @@ -8,12 +8,34 @@ #ifdef _SAGA_MSW #ifdef _WIN64 -@@ -263,7 +264,25 @@ wxString CDLG_About::_Get_Version(void) +@@ -263,7 +264,47 @@ wxString CDLG_About::_Get_Version(void) #elif defined(__GNUWIN32__) "Gnu-Win32 compiler" #elif defined(__GNUG__) - "Gnu C++" -+ #if wxCHECK_GCC_VERSION(5,3) ++ #if wxCHECK_GCC_VERSION(6,4) ++ "Gnu C++ 6.4" ++ #elif wxCHECK_GCC_VERSION(6,3) ++ "Gnu C++ 6.3" ++ #elif wxCHECK_GCC_VERSION(6,2) ++ "Gnu C++ 6.2" ++ #elif wxCHECK_GCC_VERSION(6,1) ++ "Gnu C++ 6.1" ++ #elif wxCHECK_GCC_VERSION(6,0) ++ "Gnu C++ 6.0" ++ #elif wxCHECK_GCC_VERSION(5,9) ++ "Gnu C++ 5.9" ++ #elif wxCHECK_GCC_VERSION(5,8) ++ "Gnu C++ 5.8" ++ #elif wxCHECK_GCC_VERSION(5,7) ++ "Gnu C++ 5.7" ++ #elif wxCHECK_GCC_VERSION(5,6) ++ "Gnu C++ 5.6" ++ #elif wxCHECK_GCC_VERSION(5,5) ++ "Gnu C++ 5.5" ++ #elif wxCHECK_GCC_VERSION(5,4) ++ "Gnu C++ 5.4" ++ #elif wxCHECK_GCC_VERSION(5,3) + "Gnu C++ 5.3" + #elif wxCHECK_GCC_VERSION(5,2) + "Gnu C++ 5.2" Modified: head/math/saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h ============================================================================== --- head/math/saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h Tue Dec 25 23:36:51 2018 (r488353) +++ head/math/saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h Wed Dec 26 01:35:54 2018 (r488354) @@ -1,4 +1,4 @@ ---- src/tools/imagery/imagery_opencv/opencv.h.orig 2018-05-01 09:07:11 UTC +--- src/tools/imagery/imagery_opencv/opencv.h.orig 2018-11-22 07:53:06 UTC +++ src/tools/imagery/imagery_opencv/opencv.h @@ -73,7 +73,8 @@ Modified: head/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp ============================================================================== --- head/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp Tue Dec 25 23:36:51 2018 (r488353) +++ head/math/saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp Wed Dec 26 01:35:54 2018 (r488354) @@ -1,4 +1,4 @@ ---- src/tools/imagery/imagery_svm/MLB_Interface.cpp.orig 2018-05-01 09:07:10 UTC +--- src/tools/imagery/imagery_svm/MLB_Interface.cpp.orig 2018-11-22 07:53:06 UTC +++ src/tools/imagery/imagery_svm/MLB_Interface.cpp @@ -61,7 +61,7 @@ #include "MLB_Interface.h" Modified: head/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h ============================================================================== --- head/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h Tue Dec 25 23:36:51 2018 (r488353) +++ head/math/saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h Wed Dec 26 01:35:54 2018 (r488354) @@ -1,4 +1,4 @@ ---- src/tools/imagery/imagery_svm/svm_grids.h.orig 2018-05-01 09:07:11 UTC +--- src/tools/imagery/imagery_svm/svm_grids.h.orig 2018-11-22 07:53:06 UTC +++ src/tools/imagery/imagery_svm/svm_grids.h @@ -72,7 +72,7 @@ #include "MLB_Interface.h" Modified: head/math/saga/files/pkg-message.in ============================================================================== --- head/math/saga/files/pkg-message.in Tue Dec 25 23:36:51 2018 (r488353) +++ head/math/saga/files/pkg-message.in Wed Dec 26 01:35:54 2018 (r488354) @@ -26,7 +26,7 @@ Predefined ToolChains are located at %%DATADIR%%/toolchains/ Python scripts with examples, helpers and test data reside at - %%DATADIR%%/accessories/python/ + %%DATADIR%%/python/ ###################################################################### Modified: head/math/saga/pkg-plist ============================================================================== --- head/math/saga/pkg-plist Tue Dec 25 23:36:51 2018 (r488353) +++ head/math/saga/pkg-plist Wed Dec 26 01:35:54 2018 (r488354) @@ -36,7 +36,7 @@ lib/libsaga_gdi.so %%PYTHON_SITELIBDIR%%/_saga_api.so %%PYTHON_SITELIBDIR%%/saga_api.py %%PYTHON_SITELIBDIR%%/saga_api.pyc -%%PYTHON_SITELIBDIR%%/saga_api.pyo +%%PYTHON_SITELIBDIR%%/saga_api.%%PYTHON_PYOEXTENSION%% lib/saga/libclimate_tools.so lib/saga/libcontrib_perego.so lib/saga/libdb_odbc.so @@ -113,7 +113,6 @@ lib/saga/libtin_tools.so lib/saga/libtin_viewer.so man/man1/saga_cmd.1.gz man/man1/saga_gui.1.gz -share/appdata/saga.appdata.xml share/applications/saga.desktop share/icons/hicolor/128x128/apps/saga.png share/icons/hicolor/16x16/apps/saga.png @@ -128,62 +127,65 @@ share/icons/hicolor/72x72/apps/saga.png share/icons/hicolor/80x80/apps/saga.png share/icons/hicolor/8x8/apps/saga.png share/icons/hicolor/96x96/apps/saga.png +share/metainfo/org.saga-gis.saga-gui.appdata.xml share/pixmaps/saga.png @mode 0777 @dir %%DATADIR%% @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 -%%DATADIR%%/accessories/helper/make_translation_files.bat -%%DATADIR%%/accessories/python/examples/00_grid_create_dummy.py -%%DATADIR%%/accessories/python/examples/01_grid_asc_to_saga.py -%%DATADIR%%/accessories/python/examples/02_grid_morphometry.py -%%DATADIR%%/accessories/python/examples/03_grid_difference.py -%%DATADIR%%/accessories/python/examples/04_grid_contour.py -%%DATADIR%%/accessories/python/examples/05_shp2xyz.py -%%DATADIR%%/accessories/python/examples/06_xyz2shp.py -%%DATADIR%%/accessories/python/helpers/print_version.py -%%DATADIR%%/accessories/python/helpers/saga_cmd_param_interface/environment.py -%%DATADIR%%/accessories/python/helpers/saga_cmd_param_interface/param_interface.py -%%DATADIR%%/accessories/python/helpers/saga_cmd_param_interface/tools.py -%%DATADIR%%/accessories/python/saga_python_api.txt -%%DATADIR%%/accessories/python/test_data/test.mgrd -%%DATADIR%%/accessories/python/test_data/test.sdat -%%DATADIR%%/accessories/python/test_data/test.sgrd -%%DATADIR%%/accessories/python/test_data/test_ascii.asc -%%DATADIR%%/accessories/python/test_data/test_pts.dbf -%%DATADIR%%/accessories/python/test_data/test_pts.mshp -%%DATADIR%%/accessories/python/test_data/test_pts.shp -%%DATADIR%%/accessories/python/test_data/test_pts.shx -%%DATADIR%%/accessories/python/test_data/test_pts_xyz.xyz -%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/Makefile -%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/Makefile.am -%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/TLB_Interface.cpp -%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/TLB_Interface.h -%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool.cpp -%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool.h -%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library.cbp -%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library.layout -%%DATADIR%%/accessories/templates/template4saga-tools/my_tool_library/my_tool_library_link2bin.vcxproj -%%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.vc14.sln -%%DATADIR%%/accessories/templates/template4saga-tools/my_tools_link2src.vc14.sln -%%DATADIR%%/accessories/templates/template4saga-tools/readme.txt +%%DATADIR%%/helper/make_arcsaga_toolboxes.bat +%%DATADIR%%/helper/make_python_api.bat +%%DATADIR%%/helper/make_python_api_x64.bat +%%DATADIR%%/helper/make_saga_release.bat +%%DATADIR%%/helper/make_saga_snapshot.bat +%%DATADIR%%/helper/make_tools_interface.bat +%%DATADIR%%/helper/make_translation_files.bat +@mode 0755 +%%DATADIR%%/python/examples/00_grid_create_dummy.py +%%DATADIR%%/python/examples/01_grid_asc_to_saga.py +%%DATADIR%%/python/examples/02_grid_morphometry.py +%%DATADIR%%/python/examples/03_grid_difference.py +%%DATADIR%%/python/examples/04_grid_contour.py +%%DATADIR%%/python/examples/05_shp2xyz.py +%%DATADIR%%/python/examples/06_xyz2shp.py +%%DATADIR%%/python/examples/07_grid_tpi.py +%%DATADIR%%/python/examples/saga_helper.py +%%DATADIR%%/python/helpers/print_version.py +%%DATADIR%%/python/helpers/saga_cmd_param_interface/environment.py +%%DATADIR%%/python/helpers/saga_cmd_param_interface/param_interface.py +%%DATADIR%%/python/helpers/saga_cmd_param_interface/tools.py +@mode 0666 +%%DATADIR%%/python/saga_python_api.txt +%%DATADIR%%/python/test_data/test.mgrd +%%DATADIR%%/python/test_data/test.sdat +%%DATADIR%%/python/test_data/test.sgrd +%%DATADIR%%/python/test_data/test_ascii.asc +%%DATADIR%%/python/test_data/test_pts.dbf +%%DATADIR%%/python/test_data/test_pts.mshp +%%DATADIR%%/python/test_data/test_pts.shp +%%DATADIR%%/python/test_data/test_pts.shx +%%DATADIR%%/python/test_data/test_pts_xyz.xyz %%DATADIR%%/saga.bra.txt %%DATADIR%%/saga.ger.txt %%DATADIR%%/saga.lng.txt -@mode %%DATADIR%%/saga.png %%DATADIR%%/saga_prj.dic %%DATADIR%%/saga_prj.srs %%DATADIR%%/saga_tip.txt +%%DATADIR%%/templates/template4saga-tools/my_tool_library/Makefile +%%DATADIR%%/templates/template4saga-tools/my_tool_library/Makefile.am +%%DATADIR%%/templates/template4saga-tools/my_tool_library/TLB_Interface.cpp +%%DATADIR%%/templates/template4saga-tools/my_tool_library/TLB_Interface.h +%%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool.cpp +%%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool.h +%%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library.cbp +%%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library.layout +%%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library_link2bin.vcxproj +%%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library_link2bin.vcxproj.filters +%%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library_link2src.vcxproj +%%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library_link2src.vcxproj.filters +%%DATADIR%%/templates/template4saga-tools/my_tools_link2bin.vc14.sln +%%DATADIR%%/templates/template4saga-tools/my_tools_link2src.vc14.sln +%%DATADIR%%/templates/template4saga-tools/readme.txt %%DATADIR%%/toolchains/climate.xml %%DATADIR%%/toolchains/cluster_terrain.xml %%DATADIR%%/toolchains/gc_filter_gaussian.xml @@ -194,6 +196,7 @@ share/pixmaps/saga.png %%DATADIR%%/toolchains/grid_filter.xml %%DATADIR%%/toolchains/grid_list_simple_filter.xml %%DATADIR%%/toolchains/grid_notch_filter.xml +%%DATADIR%%/toolchains/grid_statistics_for_directions.xml %%DATADIR%%/toolchains/gridding.xml %%DATADIR%%/toolchains/group_files.xml %%DATADIR%%/toolchains/imagery.xml @@ -202,6 +205,7 @@ share/pixmaps/saga.png %%DATADIR%%/toolchains/obia.xml %%DATADIR%%/toolchains/points_to_contour.xml %%DATADIR%%/toolchains/polygons_max_interior_circles.xml +%%DATADIR%%/toolchains/polygons_remove_from_boundary.xml %%DATADIR%%/toolchains/sieve_and_clump.xml %%DATADIR%%/toolchains/temperature_downscaling.xml %%DATADIR%%/toolchains/temperature_downscaling_bulk.xml @@ -212,3 +216,4 @@ share/pixmaps/saga.png %%DATADIR%%/toolchains/tta_tools.xml %%DATADIR%%/toolchains/twi.xml %%DATADIR%%/toolchains/upslope_height.xml +@mode
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812260135.wBQ1ZsF2047580>