<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/145449b9938b81432499d72987363cc6c1d9e5ed">https://github.com/macports/macports-ports/commit/145449b9938b81432499d72987363cc6c1d9e5ed</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 145449b kdemultimedia4 deps: remove old conflict handlers (#4463)
</span>145449b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 145449b9938b81432499d72987363cc6c1d9e5ed
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sat May 25 04:05:04 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> kdemultimedia4 deps: remove old conflict handlers (#4463)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Added when these ports were split from kdemultimedia4
</span><span style='display:block; white-space:pre;color:#404040;'> in 738fffd07b over 6 years ago.
</span>---
kde/dragon/Portfile | 9 ---------
kde/ffmpegthumbs/Portfile | 10 ----------
kde/juk/Portfile | 9 ---------
kde/libkcddb/Portfile | 9 ---------
kde/libkcompactdisc/Portfile | 9 ---------
kde/mplayerthumbs/Portfile | 9 ---------
6 files changed, 55 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/dragon/Portfile b/kde/dragon/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5cd3d75..621c3b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/dragon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/dragon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,14 +28,5 @@ if {![variant_isset docs]} {
</span> patchfiles-append patch-CMakeLists.txt.diff
}
<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 kdemultimedia4 port has been fragmented into small ports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${applications_dir}/KDE4/dragon.app/Contents/Info.plist]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && [vercmp [lindex $vers 1] 4.9.3] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite kdemultimedia4 "" [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+)+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/ffmpegthumbs/Portfile b/kde/ffmpegthumbs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bfc1f34..b411532 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/ffmpegthumbs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/ffmpegthumbs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,15 +35,5 @@ variant ffmpeg3 description "Update code to comply with functions of ffmpeg > 2.
</span>
default_variants +ffmpeg3
<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 kdemultimedia4 port has been fragmented into small ports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${prefix}/lib/kde4/ffmpegthumbs.so]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && [vercmp [lindex $vers 1] 4.9.3] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite kdemultimedia4 "" [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><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.url ${kde4.mirror}
livecheck.regex (\\d+(\\.\\d+)+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/juk/Portfile b/kde/juk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4811700..cddad4c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/juk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/juk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,14 +39,5 @@ pre-configure {
</span> ${worksrcpath}/CMakeLists.txt
}
<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 kdemultimedia4 port has been fragmented into small ports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${applications_dir}/KDE4/juk.app/Contents/Info.plist]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && [vercmp [lindex $vers 1] 4.9.3] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite kdemultimedia4 "" [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+)+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/libkcddb/Portfile b/kde/libkcddb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 644f1a4..e8b8707 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/libkcddb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/libkcddb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,14 +27,5 @@ if {![variant_isset docs]} {
</span> patchfiles-append patch-CMakeLists.txt.diff
}
<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 kdemultimedia4 port has been fragmented into small ports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${prefix}/include/libkcddb/cdinfo.h]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && [vercmp [lindex $vers 1] 4.9.3] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite kdemultimedia4 "" [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+)+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/libkcompactdisc/Portfile b/kde/libkcompactdisc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 76e2ad8..552ee31 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/libkcompactdisc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/libkcompactdisc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,14 +23,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 kdemultimedia4 port has been fragmented into small ports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${prefix}/include/libkcompactdisc/kcompactdisc.h]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && [vercmp [lindex $vers 1] 4.9.3] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite kdemultimedia4 "" [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+)+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/mplayerthumbs/Portfile b/kde/mplayerthumbs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3dd86ea..ab19091 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/mplayerthumbs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/mplayerthumbs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,14 +20,5 @@ checksums rmd160 9e6e28ce2ec0a67a4f0dc678413f570ffe555319 \
</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 kdemultimedia4 port has been fragmented into small ports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${applications_dir}/KDE4/mplayerthumbsconfig.app/Contents/Info.plist]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![catch {set vers [lindex [registry_active kdemultimedia4] 0]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && [vercmp [lindex $vers 1] 4.9.3] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite kdemultimedia4 "" [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>