<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/b17b69826713c95638934b05b535d59ad502313d">https://github.com/macports/macports-ports/commit/b17b69826713c95638934b05b535d59ad502313d</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 b17b6982671 zeek: use libmaxminddb, openssl PG
</span>b17b6982671 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b17b69826713c95638934b05b535d59ad502313d
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Tue Dec 28 09:41:28 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> zeek: use libmaxminddb, openssl PG
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> add python39 and python310 variants, default to python39
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64305
</span>---
net/zeek/Portfile | 36 +++++++++++++++++++++++++++---------
1 file changed, 27 insertions(+), 9 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 3fce8f06910..9fa7f0c7307 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;'>@@ -2,10 +2,11 @@
</span>
PortSystem 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
name zeek
version 4.1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories net security
platforms darwin
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,8 +27,9 @@ checksums rmd160 80bdd58785bd9237108d3b9d05cf12d37abc2b32 \
</span> sha256 8c0afc999a8dd1c1f677a5cf818479b99c2d527e679e1ef99fb1b03f989c0373 \
size 32348208
<span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgeoip \
</span> port:pkgconfig \
port:swig \
port:swig-python
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,8 +39,8 @@ depends_build-append \
</span> depends_lib-append port:bison \
port:curl \
port:libmagic \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmaxminddb \
</span> port:libpcap \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span> port:perl5 \
port:readline \
port:zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,25 +63,41 @@ platform darwin {
</span>
configure.args -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python38 description {Build using Python 3.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python38 python39 python310 description {Build using Python 3.7} {
</span> configure.args-append \
-DPYTHON_EXECUTABLE=${prefix}/bin/python3.7 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_CONFIG=${prefix}/Library/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin/python-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_CONFIG=${prefix}/Library/Frameworks/Python.framework/Versions/3.7/lib/python3.7/config-3.7m-darwin/python-config.py
</span> depends_lib-append \
port:python37
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python37 description {Build using Python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python37 python39 python310 description {Build using Python 3.8} {
</span> configure.args-append \
-DPYTHON_EXECUTABLE=${prefix}/bin/python3.8 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_CONFIG=${prefix}/Library/Frameworks/Python.framework/Versions/3.8/lib/python3.8/config-3.8-darwin/python-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_CONFIG=${prefix}/Library/Frameworks/Python.framework/Versions/3.8/lib/python3.8/config-3.8-darwin/python-config.py
</span> depends_lib-append \
port:python38
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python37] && ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python37 python38 python310 description {Build using Python 3.9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python3.9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_CONFIG=${prefix}/Library/Frameworks/Python.framework/Versions/3.9/lib/python3.9/config-3.9-darwin/python-config.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python39
</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;'>+variant python310 conflicts python37 python38 python39 description {Build using Python 3.10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python3.10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_CONFIG=${prefix}/Library/Frameworks/Python.framework/Versions/3.10/lib/python3.10/config-3.10-darwin/python-config.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python310
</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;'>+if {![variant_isset python37] && ![variant_isset python38] && ![variant_isset python310]} {
</span> default_variants \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- +python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +python39
</span> }
post-destroot {
</pre><pre style='margin:0'>
</pre>