<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ca688085310efafb75a940a1120d39baf43373c7">https://github.com/macports/macports-ports/commit/ca688085310efafb75a940a1120d39baf43373c7</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 ca688085310 unifdef: add conflict to developer_cmds
</span>ca688085310 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ca688085310efafb75a940a1120d39baf43373c7
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Wed Aug 16 21:09:39 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> unifdef: add conflict to developer_cmds
</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/67970
</span>---
devel/developer_cmds/Portfile | 3 ++-
devel/unifdef/Portfile | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/developer_cmds/Portfile b/devel/developer_cmds/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e6d0d6b9bd..9609b2eaa18 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/developer_cmds/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/developer_cmds/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,8 @@ categories devel
</span> maintainers nomaintainer
# We install BSD ctags, conflicting with Exuberant Ctags.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts ctags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# unifdef and unifdefall is conflicting with unifdef port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts ctags unifdef
</span>
homepage http://opensource.apple.com/source/${name}/
master_sites http://opensource.apple.com/tarballs/${name}/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/unifdef/Portfile b/devel/unifdef/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b5e7cd90ff..6f798fe22ea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/unifdef/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/unifdef/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,6 +22,9 @@ checksums rmd160 7fb5bc894f540dd5ff5a966377b7b8e4a3610e95 \
</span> sha256 fba564a24db7b97ebe9329713ac970627b902e5e9e8b14e19e024eb6e278d10b \
size 87091
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# developer_cmds installs very old unifdef / unifdefall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts developer_cmds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot.args-append prefix=${prefix}
livecheck.type regex
</pre><pre style='margin:0'>
</pre>