<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/de2b333df0c23b9ae23d91de1d66189a02d5fb3a">https://github.com/macports/macports-ports/commit/de2b333df0c23b9ae23d91de1d66189a02d5fb3a</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 de2b333df0c sigil: add libzip coflict back
</span>de2b333df0c is described below

<span style='display:block; white-space:pre;color:#808000;'>commit de2b333df0c23b9ae23d91de1d66189a02d5fb3a
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Sun Aug 9 14:32:37 2020 -0400

<span style='display:block; white-space:pre;color:#404040;'>    sigil: add libzip coflict back
</span>---
 editors/sigil/Portfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/sigil/Portfile b/editors/sigil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5625ee98d8..3f6f0d885a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/sigil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/sigil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@
</span> 
 PortSystem              1.0
 PortGroup               cmake 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup               conflicts_build 1.0
</span> PortGroup               github 1.0
 PortGroup               qt5 1.0
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +11,7 @@ revision                0
</span> name                    sigil
 platforms               darwin
 categories              editors
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers             {@i0ntempest me.com:szf1234} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers             {i0ntempest @i0ntempest} openmaintainer
</span> license                 GPL-3+
 
 description             Sigil, the ePub editor
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +32,7 @@ depends_lib-append      port:hunspell \
</span>                         port:zlib
 
 patchfiles              pcre.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build         libzip
</span> compiler.cxx_standard   2011
 
 configure.args          -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF \
</pre><pre style='margin:0'>

</pre>