<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/3fc786526f9484244ff1006c8e21888b837549dc">https://github.com/macports/macports-ports/commit/3fc786526f9484244ff1006c8e21888b837549dc</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 3fc7865  zeek: use cmake PortGroup
</span>3fc7865 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 3fc786526f9484244ff1006c8e21888b837549dc
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sat Feb 22 16:54:59 2020 -0600

<span style='display:block; white-space:pre;color:#404040;'>    zeek: use cmake PortGroup
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/60119
</span>---
 net/zeek/Portfile | 59 +++++++++++++++++++++----------------------------------
 1 file changed, 22 insertions(+), 37 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 d1f580b..f0569ef 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;'>@@ -1,10 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           cmake 1.1
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        zeek zeek 3.0.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name                zeek
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             3.0.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;'>@@ -25,7 +26,7 @@ checksums           rmd160  304e761f3a896661ca1c27362c3ac4aa84e8921a \
</span>                     sha256  79f4f3efd883c9c2960295778dc290372d10874380fd88450271652e829811d2 \
                     size    29253371
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build       path:bin/cmake:cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span>                     port:libgeoip \
                     port:swig \
                     port:swig-python
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,35 +45,23 @@ depends_lib-append  port:bison \
</span> 
 variant universal {}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append "${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args      --enable-mobile-ipv6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --conf-files-dir=${prefix}/etc/zeek \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --spooldir=${prefix}/var/spool/zeek \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --logdir=${prefix}/var/log/zeek \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --with-caf=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --with-swig=${prefix}/bin/swig4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --disable-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#    Python build is currently broken see https://github.com/zeek/zeek/issues/815
</span><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:#ffe0e0;'>-#     configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#                     --disable-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#     depends_lib-append  \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#                     port:python37
</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 python38 conflicts python37 description {Build using Python 3.8} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#     configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#                     --disable-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#     depends_lib-append  \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#                     port:python38
</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 python37] && ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#     default_variants    +python38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args      -DCAF_ROOT_DIR=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python38 description {Build using Python 3.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:python37
</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 python38 conflicts python37 description {Build using Python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:python38
</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]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    default_variants \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    +python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 post-destroot {
     xinstall -d ${destroot}${prefix}/share/examples/${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,10 +69,6 @@ post-destroot {
</span>     copy ${worksrcpath}/aux/zeekctl/etc/networks.cfg ${destroot}${prefix}/share/examples/${name}/
     copy ${worksrcpath}/aux/zeekctl/etc/zeekctl.cfg.in ${destroot}${prefix}/share/examples/${name}/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|/usr/bin/python|${prefix}/bin/python3.7|" ${destroot}${prefix}/bin/zeekctl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|/usr/bin/python|${prefix}/bin/python3.7|" ${destroot}${prefix}/bin/trace-summary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     xinstall -d ${destroot}${prefix}/Library/LaunchDaemons/
     copy ${filespath}/org.macports.zeek.plist ${destroot}${prefix}/Library/LaunchDaemons/
     reinplace "s|%%PREFIX%%|${prefix}|g" ${destroot}${prefix}/Library/LaunchDaemons/org.macports.zeek.plist
</pre><pre style='margin:0'>

</pre>