CVS commit: pkgsrc/mail/rspamd

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Sep  6 03:22:52 UTC 2023

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

Log Message:
rspamd: find lua, and fix PLIST for non-default PKG_SYSCONFDIR.


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/mail/rspamd/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/mail/rspamd/distinfo
cvs rdiff -u -r0 -r1.11 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/Makefile
diff -u pkgsrc/mail/rspamd/Makefile:1.91 pkgsrc/mail/rspamd/Makefile:1.92
--- pkgsrc/mail/rspamd/Makefile:1.91    Thu Aug 24 19:38:09 2023
+++ pkgsrc/mail/rspamd/Makefile Wed Sep  6 03:22:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2023/08/24 19:38:09 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2023/09/06 03:22:52 schmonz Exp $
 
 DISTNAME=      rspamd-3.6
 CATEGORIES=    mail
@@ -99,7 +99,7 @@ post-extract:
        ${FIND} ${WRKSRC}/conf -type f -exec ${CHMOD} ${DOCMODE} {} \;
 
 post-install:
-       ${MV} ${DESTDIR}${PREFIX}/etc/rspamd ${DESTDIR}${PREFIX}/share/examples/rspamd
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR} ${DESTDIR}${PREFIX}/share/examples/rspamd
 
 .include "../../devel/cmake/build.mk"
 .include "../../databases/hiredis/buildlink3.mk"

Index: pkgsrc/mail/rspamd/distinfo
diff -u pkgsrc/mail/rspamd/distinfo:1.48 pkgsrc/mail/rspamd/distinfo:1.49
--- pkgsrc/mail/rspamd/distinfo:1.48    Thu Aug 24 19:38:09 2023
+++ pkgsrc/mail/rspamd/distinfo Wed Sep  6 03:22:52 2023
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.48 2023/08/24 19:38:09 wiz Exp $
+$NetBSD: distinfo,v 1.49 2023/09/06 03:22:52 schmonz Exp $
 
 BLAKE2s (rspamd-3.6.tar.gz) = 1481638675a661812d45dddb806fada9dbc4f39e51653f7fa4485ccd759c0d68
 SHA512 (rspamd-3.6.tar.gz) = d99e2a60eec94eb39902454a8041eeb76f673c9f784849128766323a218d6c419755e0f8819e2a6921ca08c6a7d63660dc87bc911f808fb4a67d29e8fbfc571b
 Size (rspamd-3.6.tar.gz) = 5843907 bytes
+SHA1 (patch-CMakeLists.txt) = 1c91cf53edeb12e1a469cd02421e1eaee5061ab7
 SHA1 (patch-cmake_Toolset.cmake) = fbc4027fedb4261ce913701ebbb32d8395bc7783
 SHA1 (patch-contrib_doctest_doctest_doctest.h) = 5238cb9f837e1d8f402023ddc2f7d02dda3f67ab
 SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6

Added files:

Index: pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt:1.11
--- /dev/null   Wed Sep  6 03:22:52 2023
+++ pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt     Wed Sep  6 03:22:52 2023
@@ -0,0 +1,42 @@
+$NetBSD: patch-CMakeLists.txt,v 1.11 2023/09/06 03:22:52 schmonz Exp $
+
+Let pkg-config find pkgsrc-provided lua.
+
+--- CMakeLists.txt.orig        2023-08-03 13:56:19.000000000 +0000
++++ CMakeLists.txt
+@@ -157,7 +157,7 @@ ELSE (ENABLE_LUAJIT MATCHES "ON")
+             "include/lua53"
+             "include/lua"
+             ROOT ${LUA_ROOT}
+-            MODULES lua53
++            MODULES lua-5.3
+             OPTIONAL)
+ 
+     IF (NOT WITH_LIBLUA)
+@@ -170,7 +170,7 @@ ELSE (ENABLE_LUAJIT MATCHES "ON")
+                 "include/lua54"
+                 "include/lua"
+                 ROOT ${LUA_ROOT}
+-                MODULES lua54
++                MODULES lua-5.4
+                 OPTIONAL)
+         IF (NOT WITH_LIBLUA)
+             ProcessPackage(LIBLUA LIBRARY "lua"
+@@ -182,7 +182,7 @@ ELSE (ENABLE_LUAJIT MATCHES "ON")
+                     "include/lua52"
+                     "include/lua"
+                     ROOT ${LUA_ROOT}
+-                    MODULES lua52
++                    MODULES lua-5.2
+                     OPTIONAL)
+ 
+             IF (NOT WITH_LIBLUA)
+@@ -194,7 +194,7 @@ ELSE (ENABLE_LUAJIT MATCHES "ON")
+                         "include/lua51"
+                         "include/lua"
+                         ROOT ${LUA_ROOT}
+-                        MODULES lua51)
++                        MODULES lua-5.1)
+             ENDIF ()
+         ENDIF ()
+     ENDIF ()