<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/7d555f0747552ac32937bf52d161641e0c62f0c1">https://github.com/macports/macports-ports/commit/7d555f0747552ac32937bf52d161641e0c62f0c1</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 7d555f07475 gmic: remove conflict for opencv; deleted on 2022-05-21 See: https://github.com/macports/macports-ports/commit/9e86a0382276a34f96a77cb25114a53ae9ed0703 CC: @Schamschula
</span>7d555f07475 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7d555f0747552ac32937bf52d161641e0c62f0c1
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu Aug 11 11:26:18 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> gmic: remove conflict for opencv; deleted on 2022-05-21
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/commit/9e86a0382276a34f96a77cb25114a53ae9ed0703
</span><span style='display:block; white-space:pre;color:#404040;'> CC: @Schamschula
</span>---
science/gmic/Portfile | 4 ----
1 file changed, 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/Portfile b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8421f0217de..ce2385f1d38 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,6 @@
</span> PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup conflicts_build 1.0
</span>
if {${subport} eq "gmic-gimp" || ${subport} eq "gmic-qt"} {
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,9 +33,6 @@ long_description G'MIC stands for GREYC's Magic Image Converter. It is \
</span> homepage https://gmic.eu
master_sites https://gmic.eu/files/source/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# gmic will pick up include files from opencv, opencv3 does not conflict
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts_build opencv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> distfiles ${name}_${version}${extract.suffix}
checksums rmd160 f93d09831a7d16aa676c73046855cb8aae000f06 \
</pre><pre style='margin:0'>
</pre>