<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f61673f0923a5d627dda1ef621ae1aeda6f5299d">https://github.com/macports/macports-ports/commit/f61673f0923a5d627dda1ef621ae1aeda6f5299d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f61673f0923a5d627dda1ef621ae1aeda6f5299d
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Fri Apr 12 05:24:56 2024 -0400

<span style='display:block; white-space:pre;color:#404040;'>    rspamd: Use vectorscan, add hyperscan variant
</span>---
 mail/rspamd/Portfile                     | 28 ++++++++++++++++++++++++----
 mail/rspamd/files/patch-OSDep_cmake.diff | 14 ++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/rspamd/Portfile b/mail/rspamd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9681d56499a..1c954519584 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/rspamd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/rspamd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup           github 1.0
</span> PortGroup           legacysupport 1.1
 
 github.setup        rspamd rspamd 3.8.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          mail
 license             BSD
 maintainers         nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@ depends_lib-append  port:fann \
</span>                     port:gd2 \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:gmime \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:hyperscan \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:vectorscan \
</span>                     path:lib/pkgconfig/icu-uc.pc:icu \
                     port:libevent \
                     port:libmagic \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,11 +74,31 @@ depends_lib-append  port:fann \
</span> depends_run-append  port:hiredis \
                     port:redis
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Match requirements of dependency hyperscan.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs     x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant hyperscan \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    description {Use hyperscan instead of vectorscan.} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${build_arch} ne {x86_64}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        known_fail  yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ui_error "hyperscan is only available \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                with the x86_64 architecture."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            error {unsupported platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:vectorscan \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:hyperscan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Match requirements of dependency vectorscan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs     arm64 x86_64
</span> compiler.cxx_standard 2020
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Please remove after this commit is merged:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/rspamd/rspamd/commit/db02d917d4a0d853938a02ce56b5c4d914fca50f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# diff -NaurB ./rspamd-orig ./rspamd-new | sed -E -e 's/\.\/rspamd-(orig|new)/\./g' | sed -E -e 's|/opt/local|@@PREFIX@@|g' > ~/Downloads/patch-OSDep_cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-OSDep_cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Previous issue note; see https://github.com/rspamd/rspamd/issues/2884
 # For issues with -DENABLE_PCRE2=ON, enable pcre jit debugging
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/rspamd/files/patch-OSDep_cmake.diff b/mail/rspamd/files/patch-OSDep_cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c0a6f552cfb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/rspamd/files/patch-OSDep_cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -NaurB ./cmake/OSDep.cmake ./cmake/OSDep.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./cmake/OSDep.cmake    2024-05-13 18:12:22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./cmake/OSDep.cmake    2024-05-13 18:12:08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ADD_COMPILE_OPTIONS(-D_BSD_SOURCE -DDARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -undefined dynamic_lookup")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     IF(ENABLE_LUAJIT MATCHES "ON")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        IF ("${ARCH}" STREQUAL "x86_64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     ENDIF(ENABLE_LUAJIT MATCHES "ON")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     MESSAGE(STATUS "Configuring for Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     SET(TAR "gnutar")
</span></pre><pre style='margin:0'>

</pre>