Index: Makefile =================================================================== --- Makefile (revision 473719) +++ Makefile (working copy) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= rspamd -PORTVERSION= 1.7.5 -PORTREVISION= 1 +PORTVERSION= 1.7.7 CATEGORIES= mail MAINTAINER= vsevolod@FreeBSD.org Index: distinfo =================================================================== --- distinfo (revision 473719) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526660227 -SHA256 (vstakhov-rspamd-1.7.5_GH0.tar.gz) = 5aa2ff72cc74ea1fd220cd3a941745268666465be712c4d014a9fc937b7b1f5f -SIZE (vstakhov-rspamd-1.7.5_GH0.tar.gz) = 4494681 +TIMESTAMP = 1530544752 +SHA256 (vstakhov-rspamd-1.7.7_GH0.tar.gz) = 8d494d2374cf3de786d452670118e4b5c764db3811920c9dc770880ad025787a +SIZE (vstakhov-rspamd-1.7.7_GH0.tar.gz) = 4534430 Index: files/patch-contrib_lua-torch_torch7_lib_TH_CMakeLists.txt =================================================================== --- files/patch-contrib_lua-torch_torch7_lib_TH_CMakeLists.txt (nonexistent) +++ files/patch-contrib_lua-torch_torch7_lib_TH_CMakeLists.txt (working copy) @@ -0,0 +1,44 @@ +--- contrib/lua-torch/torch7/lib/TH/CMakeLists.txt.orig 2018-06-16 00:02:13 UTC ++++ contrib/lua-torch/torch7/lib/TH/CMakeLists.txt +@@ -230,22 +230,26 @@ ELSE() + ENDIF() + ENDIF() + +-FIND_PACKAGE(BLAS) +-IF(BLAS_FOUND) +- SET(USE_BLAS 1) +- TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES}) +- IF(BLAS_INFO STREQUAL "mkl") +- ADD_DEFINITIONS(-DTH_BLAS_MKL) +- ELSEIF(BLAS_INFO STREQUAL "open") +- ADD_DEFINITIONS(-DTH_BLAS_OPEN) +- ENDIF() +-ENDIF(BLAS_FOUND) ++IF(WITH_BLAS) ++ FIND_PACKAGE(BLAS) ++ IF(BLAS_FOUND) ++ SET(USE_BLAS 1) ++ TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES}) ++ IF(BLAS_INFO STREQUAL "mkl") ++ ADD_DEFINITIONS(-DTH_BLAS_MKL) ++ ELSEIF(BLAS_INFO STREQUAL "open") ++ ADD_DEFINITIONS(-DTH_BLAS_OPEN) ++ ENDIF() ++ ENDIF(BLAS_FOUND) ++ENDIF(WITH_BLAS) + +-FIND_PACKAGE(LAPACK) +-IF(LAPACK_FOUND) +- SET(USE_LAPACK 1) +- TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES}) +-ENDIF(LAPACK_FOUND) ++IF(WITH_LAPACK) ++ FIND_PACKAGE(LAPACK) ++ IF(LAPACK_FOUND) ++ SET(USE_LAPACK 1) ++ TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES}) ++ ENDIF(LAPACK_FOUND) ++ENDIF(WITH_LAPACK) + + IF (UNIX AND NOT APPLE) + INCLUDE(CheckLibraryExists) Index: files/patch-contrib_torch_torch7_lib_TH_CMakeLists.txt =================================================================== --- files/patch-contrib_torch_torch7_lib_TH_CMakeLists.txt (revision 473719) +++ files/patch-contrib_torch_torch7_lib_TH_CMakeLists.txt (nonexistent) @@ -1,44 +0,0 @@ ---- contrib/torch/torch7/lib/TH/CMakeLists.txt.orig 2018-03-12 16:46:32 UTC -+++ contrib/torch/torch7/lib/TH/CMakeLists.txt -@@ -230,22 +230,26 @@ ELSE() - ENDIF() - ENDIF() - --FIND_PACKAGE(BLAS) --IF(BLAS_FOUND) -- SET(USE_BLAS 1) -- TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES}) -- IF(BLAS_INFO STREQUAL "mkl") -- ADD_DEFINITIONS(-DTH_BLAS_MKL) -- ELSEIF(BLAS_INFO STREQUAL "open") -- ADD_DEFINITIONS(-DTH_BLAS_OPEN) -- ENDIF() --ENDIF(BLAS_FOUND) -+IF(WITH_BLAS) -+ FIND_PACKAGE(BLAS) -+ IF(BLAS_FOUND) -+ SET(USE_BLAS 1) -+ TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES}) -+ IF(BLAS_INFO STREQUAL "mkl") -+ ADD_DEFINITIONS(-DTH_BLAS_MKL) -+ ELSEIF(BLAS_INFO STREQUAL "open") -+ ADD_DEFINITIONS(-DTH_BLAS_OPEN) -+ ENDIF() -+ ENDIF(BLAS_FOUND) -+ENDIF(WITH_BLAS) - --FIND_PACKAGE(LAPACK) --IF(LAPACK_FOUND) -- SET(USE_LAPACK 1) -- TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES}) --ENDIF(LAPACK_FOUND) -+IF(WITH_LAPACK) -+ FIND_PACKAGE(LAPACK) -+ IF(LAPACK_FOUND) -+ SET(USE_LAPACK 1) -+ TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES}) -+ ENDIF(LAPACK_FOUND) -+ENDIF(WITH_LAPACK) - - IF (UNIX AND NOT APPLE) - INCLUDE(CheckLibraryExists) Index: pkg-plist =================================================================== --- pkg-plist (revision 473719) +++ pkg-plist (working copy) @@ -158,6 +158,8 @@ %%DATADIR%%/languages/vi.json %%DATADIR%%/languages/yi.json %%DATADIR%%/languages/zh-CN.json +%%DATADIR%%/lib/ansicolors.lua +%%DATADIR%%/lib/argparse.lua %%DATADIR%%/lib/fun.lua %%DATADIR%%/lib/global_functions.lua %%DATADIR%%/lib/lua_auth_results.lua @@ -169,17 +171,17 @@ %%DATADIR%%/lib/lua_redis.lua %%DATADIR%%/lib/lua_stat.lua %%DATADIR%%/lib/lua_util.lua -%%DATADIR%%/lib/rspamadm/ansicolors.lua +%%DATADIR%%/lib/plugins_stats.lua +%%DATADIR%%/lib/rescore_utility.lua %%DATADIR%%/lib/rspamadm/confighelp.lua %%DATADIR%%/lib/rspamadm/configwizard.lua %%DATADIR%%/lib/rspamadm/corpus_test.lua %%DATADIR%%/lib/rspamadm/fuzzy_convert.lua %%DATADIR%%/lib/rspamadm/fuzzy_stat.lua -%%DATADIR%%/lib/rspamadm/getopt.lua %%DATADIR%%/lib/rspamadm/grep.lua -%%DATADIR%%/lib/rspamadm/plugins_stats.lua +%%DATADIR%%/lib/rspamadm/mime.lua +%%DATADIR%%/lib/rspamadm/keypair.lua %%DATADIR%%/lib/rspamadm/rescore.lua -%%DATADIR%%/lib/rspamadm/rescore_utility.lua %%DATADIR%%/lib/rspamadm/stat_convert.lua %%TORCH%%%%DATADIR%%/lib/decisiontree/CartNode.lua %%TORCH%%%%DATADIR%%/lib/decisiontree/CartTrainer.lua @@ -518,9 +520,9 @@ %%DATADIR%%/www/js/lib/footable.min.js %%DATADIR%%/www/js/lib/humanize.min.js %%DATADIR%%/www/js/lib/jquery-3.3.1.min.js +%%DATADIR%%/www/js/lib/require.min.js %%DATADIR%%/www/js/lib/visibility.min.js %%DATADIR%%/www/js/main.js -%%DATADIR%%/www/js/require.js %%DATADIR%%/www/plugins.txt %%DATADIR%%/www/react-index.html @owner nobody