<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3d8b27c3e6f1a76eb0175b6a28fc91ba450647fc">https://github.com/macports/macports-ports/commit/3d8b27c3e6f1a76eb0175b6a28fc91ba450647fc</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 3d8b27c multiple ports: remove unknown conflicts (lint errors)
</span>3d8b27c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3d8b27c3e6f1a76eb0175b6a28fc91ba450647fc
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Thu Oct 5 16:48:05 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> multiple ports: remove unknown conflicts (lint errors)
</span>---
devel/dbus/Portfile | 1 -
emulators/hercules/Portfile | 1 -
graphics/libQGLViewer/Portfile | 2 --
kde/rkward/Portfile | 1 -
kde/skrooge/Portfile | 2 --
multimedia/VLC/Portfile | 4 ++--
net/hdhomerun/Portfile | 1 -
7 files changed, 2 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/dbus/Portfile b/devel/dbus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ee52351..8c87fb3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/dbus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/dbus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,6 @@ PortSystem 1.0
</span> PortGroup muniversal 1.0
name dbus
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts dbus-devel
</span> version 1.10.20
#revision 0
maintainers mcalhoun openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/hercules/Portfile b/emulators/hercules/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a6b741f..cbec179 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/hercules/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/hercules/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,6 @@ categories emulators
</span> platforms darwin
maintainers nomaintainer
license QPL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts hercules-devel
</span>
description The Hercules IBM Large Systems Emulator
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libQGLViewer/Portfile b/graphics/libQGLViewer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 00c2c26..6aa6f08 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libQGLViewer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libQGLViewer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,8 +29,6 @@ long_description libQGLViewer is a C++ library based on Qt that e
</span> to create complex applications, being fully customizable and \
easy to extend.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts libPyQGLViewer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> master_sites ${homepage}src/
checksums rmd160 242c5d3ac42ac878cc1ad0b5b7eaa5f434ef9e89 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/rkward/Portfile b/kde/rkward/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b8c1f6..a2f14bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/rkward/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/rkward/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,6 @@ name rkward
</span> version 0.6.5
revision 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts rkward-devel
</span> categories kde kde4 math science
maintainers hhu.de:meik.michalke kde.org:rkward-devel mk
license GPL-2+
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/skrooge/Portfile b/kde/skrooge/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d2084a5..1d8570c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/skrooge/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/skrooge/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +14,6 @@ long_description Personal finance management tool for KDE4, with the aim of b
</span> providing powerful functions such as reporting (including graphics), persistent \
Undo/Redo, encryption, and much more...
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts skrooge-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platforms darwin
license GPL-3
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/Portfile b/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b784e66..7e3b89a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ subport lib${name} {
</span> long_description libVLC is the core engine and the interface to the multimedia \
framework on which VLC media player is based. It allows developers \
to create a wide range of multimedia applications using the VLC features.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name} VLC-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name}
</span> homepage http://www.videolan.org/vlc/libvlc.html
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@ if {[tbool use_ffmpeg_VLC]} {
</span> }
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts lib${name} VLC-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts lib${name}
</span> }
# VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/hdhomerun/Portfile b/net/hdhomerun/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 293f5f6..3225a2a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/hdhomerun/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/hdhomerun/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,6 @@ master_sites http://download.silicondust.com/hdhomerun
</span>
if {${name} eq ${subport}} {
set firm_version 20150826
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name}-devel
</span> long_description Provides a library and utility program to access, configure and test \
HDHomeRun network tuner devices from SiliconDust. May also be used to \
upgrade firmware. Command line-driven and scriptable.
</pre><pre style='margin:0'>
</pre>