<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c41c4ca1d75305331428ccf86627d76827b9bafc">https://github.com/macports/macports-ports/commit/c41c4ca1d75305331428ccf86627d76827b9bafc</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 c41c4ca  libkomparediff2: remove old conflict handler (#4467)
</span>c41c4ca is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c41c4ca1d75305331428ccf86627d76827b9bafc
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sat May 25 04:17:21 2019 -0500

<span style='display:block; white-space:pre;color:#404040;'>    libkomparediff2: remove old conflict handler (#4467)
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Present when port was split from kompare
</span><span style='display:block; white-space:pre;color:#404040;'>    in 73b0d2f516 over 5 years ago.
</span>---
 kde/libkomparediff2/Portfile | 9 ---------
 1 file changed, 9 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/libkomparediff2/Portfile b/kde/libkomparediff2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c380119..fd82c5a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/libkomparediff2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/libkomparediff2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,14 +27,5 @@ license_noconflict  openssl
</span> 
 depends_lib-append  port:kdelibs4
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    #Deactivate hack for when libkomparediff2 port has been separated from kompare
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[file exists ${prefix}/lib/libkomparediff2.4.dylib]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        && ![catch {set vers [lindex [registry_active kompare] 0]}] 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        && [vercmp [lindex $vers 1] 4.12.0] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            registry_deactivate_composite kompare "" [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> livecheck.url       ${kde4.mirror}
 livecheck.regex     (\\d+(\\.\\d+)+)
</pre><pre style='margin:0'>

</pre>