<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/ca49a770d0183b56d2697c3eaec151e4f7abca62">https://github.com/macports/macports-ports/commit/ca49a770d0183b56d2697c3eaec151e4f7abca62</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ca49a770d0183b56d2697c3eaec151e4f7abca62
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon May 16 14:07:17 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    glib2/glib2-devel: add conflict against glib2-upstream
</span>---
 devel/glib2-devel/Portfile | 2 +-
 devel/glib2/Portfile       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2-devel/Portfile b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 06ed12a7c53..2a2f4faf576 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup                   muniversal 1.0
</span> # Please keep the glib2 and glib2-devel ports as similar as possible.
 
 name                        glib2-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts                   glib2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts                   glib2 glib2-upstream
</span> set my_name                 glib
 version                     2.66.8
 revision                    0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glib2/Portfile b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 877c06730e7..bdf4612db34 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup                   muniversal 1.0
</span> # Please keep the glib2 and glib2-devel ports as similar as possible.
 
 name                        glib2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts                   glib2-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts                   glib2-devel glib2-upstream
</span> set my_name                 glib
 version                     2.64.6
 revision                    2
</pre><pre style='margin:0'>

</pre>