Attachment #194844 for bug #229060

Lines 1-8 Link Here

(-)Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= rspamd	3	PORTNAME= rspamd
4	PORTVERSION= 1.7.5	4	PORTVERSION= 1.7.7
5	PORTREVISION= 1
6	CATEGORIES= mail	5	CATEGORIES= mail
7		6
8	MAINTAINER= vsevolod@FreeBSD.org	7	MAINTAINER= vsevolod@FreeBSD.org

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1526660227	1	TIMESTAMP = 1530544752
2	SHA256 (vstakhov-rspamd-1.7.5_GH0.tar.gz) = 5aa2ff72cc74ea1fd220cd3a941745268666465be712c4d014a9fc937b7b1f5f	2	SHA256 (vstakhov-rspamd-1.7.7_GH0.tar.gz) = 8d494d2374cf3de786d452670118e4b5c764db3811920c9dc770880ad025787a
3	SIZE (vstakhov-rspamd-1.7.5_GH0.tar.gz) = 4494681	3	SIZE (vstakhov-rspamd-1.7.7_GH0.tar.gz) = 4534430




--- 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)




--- 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)




%%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

%%DATADIR%%/lib/lua_redis.lua
%%DATADIR%%/lib/lua_stat.lua
%%DATADIR%%/lib/lua_util.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/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

%%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

Return to bug 229060

Line 0 Link Here

(-)files/patch-contrib_lua-torch_torch7_lib_TH_CMakeLists.txt (+44 lines)
	1	--- contrib/lua-torch/torch7/lib/TH/CMakeLists.txt.orig 2018-06-16 00:02:13 UTC
	2	+++ contrib/lua-torch/torch7/lib/TH/CMakeLists.txt
	3	@@ -230,22 +230,26 @@ ELSE()
	4	ENDIF()
	5	ENDIF()
	6
	7	-FIND_PACKAGE(BLAS)
	8	-IF(BLAS_FOUND)
	9	- SET(USE_BLAS 1)
	10	- TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES})
	11	- IF(BLAS_INFO STREQUAL "mkl")
	12	- ADD_DEFINITIONS(-DTH_BLAS_MKL)
	13	- ELSEIF(BLAS_INFO STREQUAL "open")
	14	- ADD_DEFINITIONS(-DTH_BLAS_OPEN)
	15	- ENDIF()
	16	-ENDIF(BLAS_FOUND)
	17	+IF(WITH_BLAS)
	18	+ FIND_PACKAGE(BLAS)
	19	+ IF(BLAS_FOUND)
	20	+ SET(USE_BLAS 1)
	21	+ TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES})
	22	+ IF(BLAS_INFO STREQUAL "mkl")
	23	+ ADD_DEFINITIONS(-DTH_BLAS_MKL)
	24	+ ELSEIF(BLAS_INFO STREQUAL "open")
	25	+ ADD_DEFINITIONS(-DTH_BLAS_OPEN)
	26	+ ENDIF()
	27	+ ENDIF(BLAS_FOUND)
	28	+ENDIF(WITH_BLAS)
	29
	30	-FIND_PACKAGE(LAPACK)
	31	-IF(LAPACK_FOUND)
	32	- SET(USE_LAPACK 1)
	33	- TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES})
	34	-ENDIF(LAPACK_FOUND)
	35	+IF(WITH_LAPACK)
	36	+ FIND_PACKAGE(LAPACK)
	37	+ IF(LAPACK_FOUND)
	38	+ SET(USE_LAPACK 1)
	39	+ TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES})
	40	+ ENDIF(LAPACK_FOUND)
	41	+ENDIF(WITH_LAPACK)
	42
	43	IF (UNIX AND NOT APPLE)
	44	INCLUDE(CheckLibraryExists)

Lines 1-44 Link Here

(-)files/patch-contrib_torch_torch7_lib_TH_CMakeLists.txt (-44 lines)
1	--- contrib/torch/torch7/lib/TH/CMakeLists.txt.orig 2018-03-12 16:46:32 UTC
2	+++ contrib/torch/torch7/lib/TH/CMakeLists.txt
3	@@ -230,22 +230,26 @@ ELSE()
4	ENDIF()
5	ENDIF()
6
7	-FIND_PACKAGE(BLAS)
8	-IF(BLAS_FOUND)
9	- SET(USE_BLAS 1)
10	- TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES})
11	- IF(BLAS_INFO STREQUAL "mkl")
12	- ADD_DEFINITIONS(-DTH_BLAS_MKL)
13	- ELSEIF(BLAS_INFO STREQUAL "open")
14	- ADD_DEFINITIONS(-DTH_BLAS_OPEN)
15	- ENDIF()
16	-ENDIF(BLAS_FOUND)
17	+IF(WITH_BLAS)
18	+ FIND_PACKAGE(BLAS)
19	+ IF(BLAS_FOUND)
20	+ SET(USE_BLAS 1)
21	+ TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES})
22	+ IF(BLAS_INFO STREQUAL "mkl")
23	+ ADD_DEFINITIONS(-DTH_BLAS_MKL)
24	+ ELSEIF(BLAS_INFO STREQUAL "open")
25	+ ADD_DEFINITIONS(-DTH_BLAS_OPEN)
26	+ ENDIF()
27	+ ENDIF(BLAS_FOUND)
28	+ENDIF(WITH_BLAS)
29
30	-FIND_PACKAGE(LAPACK)
31	-IF(LAPACK_FOUND)
32	- SET(USE_LAPACK 1)
33	- TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES})
34	-ENDIF(LAPACK_FOUND)
35	+IF(WITH_LAPACK)
36	+ FIND_PACKAGE(LAPACK)
37	+ IF(LAPACK_FOUND)
38	+ SET(USE_LAPACK 1)
39	+ TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES})
40	+ ENDIF(LAPACK_FOUND)
41	+ENDIF(WITH_LAPACK)
42
43	IF (UNIX AND NOT APPLE)
44	INCLUDE(CheckLibraryExists)

Lines 158-163 Link Here

(-)pkg-plist (-5 / +7 lines)
158	%%DATADIR%%/languages/vi.json	158	%%DATADIR%%/languages/vi.json
159	%%DATADIR%%/languages/yi.json	159	%%DATADIR%%/languages/yi.json
160	%%DATADIR%%/languages/zh-CN.json	160	%%DATADIR%%/languages/zh-CN.json
		161	%%DATADIR%%/lib/ansicolors.lua
		162	%%DATADIR%%/lib/argparse.lua
161	%%DATADIR%%/lib/fun.lua	163	%%DATADIR%%/lib/fun.lua
162	%%DATADIR%%/lib/global_functions.lua	164	%%DATADIR%%/lib/global_functions.lua
163	%%DATADIR%%/lib/lua_auth_results.lua	165	%%DATADIR%%/lib/lua_auth_results.lua
Lines 169-185 Link Here
169	%%DATADIR%%/lib/lua_redis.lua	171	%%DATADIR%%/lib/lua_redis.lua
170	%%DATADIR%%/lib/lua_stat.lua	172	%%DATADIR%%/lib/lua_stat.lua
171	%%DATADIR%%/lib/lua_util.lua	173	%%DATADIR%%/lib/lua_util.lua
172	%%DATADIR%%/lib/rspamadm/ansicolors.lua	174	%%DATADIR%%/lib/plugins_stats.lua
		175	%%DATADIR%%/lib/rescore_utility.lua
173	%%DATADIR%%/lib/rspamadm/confighelp.lua	176	%%DATADIR%%/lib/rspamadm/confighelp.lua
174	%%DATADIR%%/lib/rspamadm/configwizard.lua	177	%%DATADIR%%/lib/rspamadm/configwizard.lua
175	%%DATADIR%%/lib/rspamadm/corpus_test.lua	178	%%DATADIR%%/lib/rspamadm/corpus_test.lua
176	%%DATADIR%%/lib/rspamadm/fuzzy_convert.lua	179	%%DATADIR%%/lib/rspamadm/fuzzy_convert.lua
177	%%DATADIR%%/lib/rspamadm/fuzzy_stat.lua	180	%%DATADIR%%/lib/rspamadm/fuzzy_stat.lua
178	%%DATADIR%%/lib/rspamadm/getopt.lua
179	%%DATADIR%%/lib/rspamadm/grep.lua	181	%%DATADIR%%/lib/rspamadm/grep.lua
180	%%DATADIR%%/lib/rspamadm/plugins_stats.lua	182	%%DATADIR%%/lib/rspamadm/mime.lua
		183	%%DATADIR%%/lib/rspamadm/keypair.lua
181	%%DATADIR%%/lib/rspamadm/rescore.lua	184	%%DATADIR%%/lib/rspamadm/rescore.lua
182	%%DATADIR%%/lib/rspamadm/rescore_utility.lua
183	%%DATADIR%%/lib/rspamadm/stat_convert.lua	185	%%DATADIR%%/lib/rspamadm/stat_convert.lua
184	%%TORCH%%%%DATADIR%%/lib/decisiontree/CartNode.lua	186	%%TORCH%%%%DATADIR%%/lib/decisiontree/CartNode.lua
185	%%TORCH%%%%DATADIR%%/lib/decisiontree/CartTrainer.lua	187	%%TORCH%%%%DATADIR%%/lib/decisiontree/CartTrainer.lua
Lines 518-526 Link Here
518	%%DATADIR%%/www/js/lib/footable.min.js	520	%%DATADIR%%/www/js/lib/footable.min.js
519	%%DATADIR%%/www/js/lib/humanize.min.js	521	%%DATADIR%%/www/js/lib/humanize.min.js
520	%%DATADIR%%/www/js/lib/jquery-3.3.1.min.js	522	%%DATADIR%%/www/js/lib/jquery-3.3.1.min.js
		523	%%DATADIR%%/www/js/lib/require.min.js
521	%%DATADIR%%/www/js/lib/visibility.min.js	524	%%DATADIR%%/www/js/lib/visibility.min.js
522	%%DATADIR%%/www/js/main.js	525	%%DATADIR%%/www/js/main.js
523	%%DATADIR%%/www/js/require.js
524	%%DATADIR%%/www/plugins.txt	526	%%DATADIR%%/www/plugins.txt
525	%%DATADIR%%/www/react-index.html	527	%%DATADIR%%/www/react-index.html
526	@owner nobody	528	@owner nobody