<pre style='margin:0'>
Marko Käning (mkae) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/46c08de9b4faa3431cd08cdb15e0d3fd07970c82">https://github.com/macports/macports-ports/commit/46c08de9b4faa3431cd08cdb15e0d3fd07970c82</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 46c08de  qtcurve-extra: fix upgrade trouble
</span>46c08de is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 46c08de9b4faa3431cd08cdb15e0d3fd07970c82
</span>Author: Marko Käning <mk@macports.org>
AuthorDate: Wed Dec 14 00:20:39 2016 +0100

<span style='display:block; white-space:pre;color:#404040;'>    qtcurve-extra: fix upgrade trouble
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - pre-activate port deactivation hack to avoid trouble with overlapping files
</span><span style='display:block; white-space:pre;color:#404040;'>      from ports qtcurve and the new qtcurve-extra
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - move epoch 2 to top-level, so that it is present in all subports
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - change some capitalisations in comments in order to get it in line with ports
</span>---
 kde/qtcurve/Portfile | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 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 f206c26..dc3b50d 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;'>@@ -8,7 +8,7 @@ git.url             git://anongit.kde.org/qtcurve.git
</span> name                qtcurve
 set qtc_version     1.8.18
 if {${subport} eq "${name}-gtk2"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # the GTk2 branch barely evolves at all so QtCurve-gtk2 doesn't need to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # the GTk2 branch barely evolves at all so qtcurve-gtk2 doesn't need to
</span>     # be updated every time the Qt version is updated.
     git.branch      438553dfa702c43240257fe61935c9ab10563cc2
     version         ${qtc_version}.263
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,6 +16,7 @@ if {${subport} eq "${name}-gtk2"} {
</span>     git.branch      16eef6f91c3fe73ea7287e6dc66e87aaf91220d9
     version         ${qtc_version}.270
 }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch               2
</span> 
 
 description         A set of widget styles for Qt4/KDE4, Qt5/KF5 and/or GTk2 based apps.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +68,7 @@ subport ${name}-gtk2 {
</span>     long_description        The GTk2 version of the highly configurable QtCurve widget style for Qt
 
     post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # QtCurve-gtk2 has pure and optional runtime dependencies on KDE4 (and KF5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # qtcurve-gtk2 has pure and optional runtime dependencies on KDE4 (and KF5)
</span>         reinplace "s|kde4-config|${prefix}/bin/kde4-config|g" \
                             ${worksrcpath}/gtk2/style/qt_settings.cpp
     }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,7 +112,6 @@ subport ${name}-extra {
</span>                             configuration presets and colour palettes for QtCurve
     version                 ${qtc_version}
     revision                2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    epoch                   2
</span>     use_configure           no
     installs_libs           no
     supported_archs         noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,6 +131,16 @@ 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:#e0ffe0;'>+    pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # qtcurve-extra installs files that previously belonged to qtcurve
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {![catch {set installed [lindex [registry_active qtcurve] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set _epoch [lindex $installed 5]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {${_epoch} < 2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ui_debug "Deactivating conflicting version of port:qtcurve"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                registry_deactivate_composite qtcurve "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 if {${subport} ne "${name}-extra"} {
</pre><pre style='margin:0'>

</pre>