<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e8dbb03daed4cb482149b46a200b86b413fd92e0">https://github.com/macports/macports-ports/commit/e8dbb03daed4cb482149b46a200b86b413fd92e0</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 e8dbb03daed luajit, luajit-openresty: add conflicts
</span>e8dbb03daed is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e8dbb03daed4cb482149b46a200b86b413fd92e0
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Thu May 27 13:01:14 2021 +0000

<span style='display:block; white-space:pre;color:#404040;'>    luajit, luajit-openresty: add conflicts
</span>---
 lang/luajit-openresty/Portfile | 4 +++-
 lang/luajit/Portfile           | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/luajit-openresty/Portfile b/lang/luajit-openresty/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b906b6054e7..a64cf11b9f5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/luajit-openresty/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/luajit-openresty/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup           github 1.0
</span> 
 github.setup        openresty luajit2 2.1-20210510 v
 name                luajit-openresty
<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          lang
 platforms           darwin
 license             MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,6 +15,8 @@ maintainers         {l2dy @l2dy} openmaintainer
</span> description         OpenResty's maintained branch of LuaJIT
 long_description    ${description}. LuaJIT is a Just-In-Time Compiler for the Lua programming language.
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           luajit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums           rmd160  0c5a810087289b29d8d5832e5576c792a85b2a67 \
                     sha256  18707f58618830fd452fbb2a5fc9d8e84982c6d7778ed5c933ba02c75222c263 \
                     size    1106399
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/luajit/Portfile b/lang/luajit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 25b6fcc18e9..c75d77c4eeb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/luajit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/luajit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup           xcode_workaround 1.0
</span> 
 name                luajit
 version             2.1.0-beta3
<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          lang
 platforms           darwin
 license             BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,10 +15,11 @@ maintainers         nomaintainer
</span> 
 description         a Just-In-Time Compiler for Lua
 long_description    LuaJIT is a Just-In-Time Compiler for the Lua programming language.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage            https://luajit.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        ${homepage}/download
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           luajit-openresty
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites        ${homepage}/download
</span> distname            LuaJIT-${version}
 
 checksums           rmd160  5f41b0b6e3bfe1f1e033f7464171d474ca497235 \
</pre><pre style='margin:0'>

</pre>