<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/58f910d6d8332f310ecf12eba0b87bb337e9770b">https://github.com/macports/macports-ports/commit/58f910d6d8332f310ecf12eba0b87bb337e9770b</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 58f910d QtCurve-extra: remove old conflict handler
</span>58f910d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 58f910d6d8332f310ecf12eba0b87bb337e9770b
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sun Jun 2 01:39:18 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> QtCurve-extra: remove old conflict handler
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Was added in 16e4129c34 over 2 years ago.
</span>---
kde/qtcurve/Portfile | 10 ----------
1 file changed, 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/qtcurve/Portfile b/kde/qtcurve/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2052570..3d53821 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/qtcurve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/qtcurve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,16 +113,6 @@ subport ${name}-extra {
</span> xinstall -m 644 ${filespath}/QtCurveOSX.colors ${destroot}/${prefix}/share/apps/color-schemes/
xinstall -m 644 ${filespath}/OxygenOSXGraphite.colors ${destroot}/${prefix}/share/apps/color-schemes/
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # QtCurve-extra installs files that previously belonged to QtCurve
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set installed [lindex [registry_active qtcurve] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set _epoch [lindex $installed 5]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${_epoch} < 2} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Deactivating conflicting version of port:qtcurve"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite qtcurve "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {${subport} ne "${name}-extra"} {
</pre><pre style='margin:0'>
</pre>