<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/744011aaff1a350e701f7fc46ed0b342e5e02429">https://github.com/macports/macports-ports/commit/744011aaff1a350e701f7fc46ed0b342e5e02429</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 744011aaff1 zeek: update to 7.0.5; zeek-devel: update to 7.1.0
</span>744011aaff1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 744011aaff1a350e701f7fc46ed0b342e5e02429
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Tue Jan 7 18:47:00 2025 -0600
<span style='display:block; white-space:pre;color:#404040;'> zeek: update to 7.0.5; zeek-devel: update to 7.1.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> always use default Python version to build (currently 3.13)
</span>---
net/zeek/Portfile | 77 +++++++++++++------------------------------------------
1 file changed, 18 insertions(+), 59 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zeek/Portfile b/net/zeek/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 399de4d9ef9..69ad8e8f411 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zeek/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/zeek/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.1
</span> PortGroup openssl 1.0
name zeek
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.0.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.0.5
</span> revision 0
categories net security
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,11 +21,9 @@ long_description {*}${description} Zeek is the new name for the long-establis
</span> homepage https://www.zeek.org/
master_sites https://download.zeek.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ae55bf07f25096ed0340131df0aab3bde48eb71f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a942ce9cb6850374edbdb34a997b26985103b01a85203c8b289a843f3e49e1b6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 60207979
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-openssl.branch 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 82e3eda2d3e5bd351f32ba65fbc145d7e752becf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e0e6e6f5d5b0402bb1ccd02ecee0ac5bd237d60c5095d71a146651c7f6721eb7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 95847393
</span>
subport ${name} {
conflicts ${name}-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,14 +32,19 @@ subport ${name} {
</span> subport ${name}-devel {
conflicts ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 7.0.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 7.1.0
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 82e3eda2d3e5bd351f32ba65fbc145d7e752becf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e0e6e6f5d5b0402bb1ccd02ecee0ac5bd237d60c5095d71a146651c7f6721eb7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 95847393
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 26d8ab13293cb46ca42413d5c89901b29b3c15d0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9a40199c5f6c97b4c79e968caa3a83742bf4fd45c293b21c9bfb3b632d4849c0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 95868119
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python.version 313
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python.branch [string index ${python.version} 0].[string range ${python.version} 1 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:flex \
port:swig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,11 +56,15 @@ depends_lib-append port:bison \
</span> port:libmaxminddb \
port:libpcap \
port:perl5 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python.version} \
</span> port:readline \
port:zlib
configure.args-append \
-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python${python.branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_CONFIG=${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}/config-${python.branch}-darwin/python-config.py \
</span> -DZEEK_ETC_INSTALL_DIR=${prefix}/etc/zeek \
-DZEEK_LOG_DIR=${prefix}/var/log/zeek \
-DZEEK_SPOOL_DIR=${prefix}/var/spool
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,55 +74,7 @@ variant universal {}
</span> compiler.cxx_standard 2017
# see https://trac.macports.org/ticket/60252
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms {darwin >= 19}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python310 python311 python312 python313 description {Build using Python 3.9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python3.9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_CONFIG=${frameworks_dir}/Python.framework/Versions/3.9/lib/python3.9/config-3.9-darwin/python-config.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 conflicts python39 python311 python312 python313 description {Build using Python 3.10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python3.10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_CONFIG=${frameworks_dir}/Python.framework/Versions/3.10/lib/python3.10/config-3.10-darwin/python-config.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python310
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python311 conflicts python39 python310 python312 python313 description {Build using Python 3.11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python3.11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_CONFIG=${frameworks_dir}/Python.framework/Versions/3.11/lib/python3.11/config-3.11-darwin/python-config.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python311
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python312 conflicts python39 python310 python311 python313 description {Build using Python 3.12} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python3.12 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_CONFIG=${frameworks_dir}/Python.framework/Versions/3.12/lib/python3.12/config-3.12-darwin/python-config.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python312
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python313 conflicts python39 python310 python311 python312 description {Build using Python 3.13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${prefix}/bin/python3.13 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_CONFIG=${frameworks_dir}/Python.framework/Versions/3.13/lib/python3.13/config-3.13-darwin/python-config.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python313
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311] && ![variant_isset python313]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- +python312
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin >= 19}
</span>
post-destroot {
delete {*}[glob ${destroot}${prefix}/etc/zeek/*.cfg]
</pre><pre style='margin:0'>
</pre>