<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/3c13e6e16778b1cb2b5c6f2ff8b850cbd5b14515">https://github.com/macports/macports-ports/commit/3c13e6e16778b1cb2b5c6f2ff8b850cbd5b14515</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 3c13e6e  zeek: disable python variants
</span>3c13e6e is described below

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

<span style='display:block; white-space:pre;color:#404040;'>    zeek: disable python variants
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://github.com/zeek/zeek/issues/815
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/60119
</span><span style='display:block; white-space:pre;color:#404040;'>    Download unified tarball, rather than GitHub release.
</span>---
 net/zeek/Portfile | 55 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 27 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 f266e67..d1f580b 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;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> PortGroup           github 1.0
 
 github.setup        zeek zeek 3.0.1 v
<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          net security
 platforms           darwin
 maintainers         {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,37 +18,18 @@ long_description    ${description} Zeek is the new name for the long-established
</span>                     also often appears in the documentation and distributions.
 
 homepage            https://www.zeek.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        https://github.com/zeek/zeek/archive:zeek
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites        https://www.zeek.org/downloads/
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles           ${name}-${version}${extract.suffix}:zeek
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.type          git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # zeek uses numerous submodules that are not part of the base package
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    system -W ${worksrcpath} "git submodule update --init --recursive"
</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;'>-checksums           rmd160  d94d29d1854e7b7b4923e1231fa88d20bf79cc82 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  66e838c03c448429497626903683224a61ac76ab365f5f2c5a9a14e7c7ad993a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    13165585
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  304e761f3a896661ca1c27362c3ac4aa84e8921a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  79f4f3efd883c9c2960295778dc290372d10874380fd88450271652e829811d2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    29253371
</span> 
 depends_build       path:bin/cmake:cmake \
                     port:libgeoip \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:swig \
</span>                     port:swig-python
 
<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;'>-    set PythonBranch    37
</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;'>-    set PythonBranch    38
</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;'>-    set PythonBranch    38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> 
 # use the system-provided flex
 depends_lib-append  port:bison \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +39,6 @@ depends_lib-append  port:bison \
</span>                     port:libpcap \
                     path:lib/libssl.dylib:openssl \
                     port:perl5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:python${PythonBranch} \
</span>                     port:readline \
                     port:zlib
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +51,28 @@ configure.args      --enable-mobile-ipv6 \
</span>                     --conf-files-dir=${prefix}/etc/zeek \
                     --spooldir=${prefix}/var/spool/zeek \
                     --logdir=${prefix}/var/log/zeek \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --with-caf=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --with-caf=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --with-swig=${prefix}/bin/swig4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --disable-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#    Python build is currently broken see https://github.com/zeek/zeek/issues/815
</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;'>+#     configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#                     --disable-python
</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;'>+#     configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#                     --disable-python
</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    +python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span> 
 post-destroot {
     xinstall -d ${destroot}${prefix}/share/examples/${name}
</pre><pre style='margin:0'>

</pre>