CVS commit: pkgsrc/mail/rspamd

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Oct  7 00:04:40 UTC 2020

Modified Files:
        pkgsrc/mail/rspamd: distinfo
        pkgsrc/mail/rspamd/patches: patch-CMakeLists.txt

Log Message:
Find lua more reliably. Fixes at least macOS, still works on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/mail/rspamd/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/rspamd/distinfo
diff -u pkgsrc/mail/rspamd/distinfo:1.35 pkgsrc/mail/rspamd/distinfo:1.36
--- pkgsrc/mail/rspamd/distinfo:1.35    Sat Oct  3 16:49:27 2020
+++ pkgsrc/mail/rspamd/distinfo Wed Oct  7 00:04:40 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.35 2020/10/03 16:49:27 triaxx Exp $
+$NetBSD: distinfo,v 1.36 2020/10/07 00:04:40 schmonz Exp $
 
 SHA1 (rspamd-2.6.tar.gz) = 56622201f414de9d4f06f28e799b22bd699616a0
 RMD160 (rspamd-2.6.tar.gz) = 4e37802bdff8eaed12ec2d85438997d65e2fe861
 SHA512 (rspamd-2.6.tar.gz) = 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
 Size (rspamd-2.6.tar.gz) = 5079444 bytes
-SHA1 (patch-CMakeLists.txt) = b0b0dd855351acb68793d84896101e1c424b7ded
+SHA1 (patch-CMakeLists.txt) = 16f653a7bea23cd2440ebf730c5c7879af395f62
 SHA1 (patch-cmake_Toolset.cmake) = d4900720b85a8e3078c4fdaa76757fcbbd4f89bd
 SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6

Index: pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt
diff -u pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt:1.5 pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt:1.6
--- pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt:1.5 Sun Dec  8 09:32:05 2019
+++ pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt     Wed Oct  7 00:04:40 2020
@@ -1,10 +1,21 @@
-$NetBSD: patch-CMakeLists.txt,v 1.5 2019/12/08 09:32:05 triaxx Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.6 2020/10/07 00:04:40 schmonz Exp $
 
 For pkgsrc. Install config files to examples directory.
+Find lua more reliably.
 
---- CMakeLists.txt.orig        2019-11-19 17:31:43.000000000 +0000
+--- CMakeLists.txt.orig        2020-09-30 19:27:23.000000000 +0000
 +++ CMakeLists.txt
-@@ -641,9 +641,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$
+@@ -146,8 +146,7 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
+                       "include/lua53"
+                       "include/lua"
+                       ROOT ${LUA_ROOT}
+-                      MODULES lua53
+-                      OPTIONAL)
++                      MODULES lua-5.3)
+ 
+       IF (NOT WITH_LIBLUA)
+               ProcessPackage(LIBLUA LIBRARY   "lua"
+@@ -684,9 +683,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$
        "${CMAKE_SOURCE_DIR}/conf/*" )
  FOREACH(CONF_FILE ${CONF_FILES})
        GET_FILENAME_COMPONENT(_rp ${CONF_FILE} PATH)