svn commit: r544551 - in head: deskutils/kdeconnect-kde devel/dragon devel/kdesvn devel/kdevelop graphics/kphotoalbum graphics/skanlite sysutils/filelight sysutils/kf5-baloo sysutils/plasma5-kde-cl...
Tobias C. Berner
tcberner at FreeBSD.org
Sun Aug 9 08:53:44 UTC 2020
Author: tcberner
Date: Sun Aug 9 08:53:41 2020
New Revision: 544551
URL: https://svnweb.freebsd.org/changeset/ports/544551
Log:
Remove obsolete CONFLICTS on kde4 ports
- kde4 has been removed 2018-12-31, that's way back when.
Modified:
head/deskutils/kdeconnect-kde/Makefile
head/devel/dragon/Makefile
head/devel/kdesvn/Makefile
head/devel/kdevelop/Makefile
head/graphics/kphotoalbum/Makefile
head/graphics/skanlite/Makefile
head/sysutils/filelight/Makefile
head/sysutils/kf5-baloo/Makefile
head/sysutils/plasma5-kde-cli-tools/Makefile
head/www/choqok/Makefile
head/x11-fm/krusader2/Makefile
head/x11-themes/kf5-oxygen-icons5/Makefile
Modified: head/deskutils/kdeconnect-kde/Makefile
==============================================================================
--- head/deskutils/kdeconnect-kde/Makefile Sun Aug 9 08:45:17 2020 (r544550)
+++ head/deskutils/kdeconnect-kde/Makefile Sun Aug 9 08:53:41 2020 (r544551)
@@ -17,7 +17,6 @@ RUN_DEPENDS= sshpass:security/sshpass \
sshfs:sysutils/fusefs-sshfs \
kpeoplevcard>0:net/kpeoplevcard
-CONFLICTS_INSTALL= kdeconnect-kde-0.7* kdeconnect-kde-kde4-0.7.*
USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:5 \
pkgconfig qca qt:5 tar:xz xorg
Modified: head/devel/dragon/Makefile
==============================================================================
--- head/devel/dragon/Makefile Sun Aug 9 08:45:17 2020 (r544550)
+++ head/devel/dragon/Makefile Sun Aug 9 08:53:41 2020 (r544551)
@@ -13,7 +13,6 @@ LICENSE= GPLv3
LIB_DEPENDS= liblfcbase.so:devel/lfcbase
-CONFLICTS= dragon-kde4
GNU_CONFIGURE= yes
PLIST_FILES= bin/dragon
Modified: head/devel/kdesvn/Makefile
==============================================================================
--- head/devel/kdesvn/Makefile Sun Aug 9 08:45:17 2020 (r544550)
+++ head/devel/kdesvn/Makefile Sun Aug 9 08:53:41 2020 (r544551)
@@ -17,7 +17,6 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \
libgdbm.so:databases/gdbm \
libsvn_client-1.so:devel/subversion
-CONFLICTS_INSTALL= kdesvn-kde4 \
qsvn-[0-9]*
USES= bdb cmake compiler:c++11-lang kde:5 qt:5 tar:xz
Modified: head/devel/kdevelop/Makefile
==============================================================================
--- head/devel/kdevelop/Makefile Sun Aug 9 08:45:17 2020 (r544550)
+++ head/devel/kdevelop/Makefile Sun Aug 9 08:53:41 2020 (r544551)
@@ -38,7 +38,6 @@ USE_KDE= archive attica auth bookmarks codecs completi
widgetsaddons windowsystem xmlgui
USE_QT= concurrent core dbus declarative gui help network \
script sql widgets xml buildtools_build qmake_build
-CONFLICTS= kdevelop-kde4-4* kdevelop-4* kdevplatform-kde4-4* kdevplatform-4*
SHEBANG_FILES= kdevplatform/util/kdevplatform_shell_environment.sh \
kdevplatform/util/.zshrc
Modified: head/graphics/kphotoalbum/Makefile
==============================================================================
--- head/graphics/kphotoalbum/Makefile Sun Aug 9 08:45:17 2020 (r544550)
+++ head/graphics/kphotoalbum/Makefile Sun Aug 9 08:53:41 2020 (r544551)
@@ -28,6 +28,5 @@ USE_QT= concurrent core dbus declarative gui location
buildtools_build qmake_build
SHEBANG_FILES= scripts/open-raw.pl scripts/kpa-backup.sh
-CONFLICTS_INSTALL= ${PORTNAME}-kde4
.include <bsd.port.mk>
Modified: head/graphics/skanlite/Makefile
==============================================================================
--- head/graphics/skanlite/Makefile Sun Aug 9 08:45:17 2020 (r544550)
+++ head/graphics/skanlite/Makefile Sun Aug 9 08:53:41 2020 (r544551)
@@ -21,6 +21,5 @@ USE_KDE= ecm auth config configwidgets codecs completi
USE_QT= buildtools_build qmake_build \
core concurrent dbus gui network widgets xml
-CONFLICTS_INSTALL= skanlite-kde4
.include <bsd.port.mk>
Modified: head/sysutils/filelight/Makefile
==============================================================================
--- head/sysutils/filelight/Makefile Sun Aug 9 08:45:17 2020 (r544550)
+++ head/sysutils/filelight/Makefile Sun Aug 9 08:53:41 2020 (r544551)
@@ -10,7 +10,6 @@ COMMENT= Map of concentric segmented-rings representin
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
docbook-xml>0:textproc/docbook-xml
-CONFLICTS_INSTALL= ${PORTNAME}-kde4*
USES= cmake compiler:c++11-lang desktop-file-utils gettext \
kde:5 qt:5 tar:xz
Modified: head/sysutils/kf5-baloo/Makefile
==============================================================================
--- head/sysutils/kf5-baloo/Makefile Sun Aug 9 08:45:17 2020 (r544550)
+++ head/sysutils/kf5-baloo/Makefile Sun Aug 9 08:53:41 2020 (r544551)
@@ -17,9 +17,4 @@ USE_KDE= auth completion config coreaddons crash dbusa
USE_QT= buildtools_build concurrent core dbus declarative gui network qmake_build \
testlib widgets
-# Frameworks ports install localization files that conflict with some
-# KDE4 localization ports
-CONFLICTS_INSTALL= baloo-4.* \
- kde4-l10n-*
-
.include <bsd.port.mk>
Modified: head/sysutils/plasma5-kde-cli-tools/Makefile
==============================================================================
--- head/sysutils/plasma5-kde-cli-tools/Makefile Sun Aug 9 08:45:17 2020 (r544550)
+++ head/sysutils/plasma5-kde-cli-tools/Makefile Sun Aug 9 08:53:41 2020 (r544551)
@@ -7,7 +7,6 @@ CATEGORIES= sysutils kde kde-plasma
MAINTAINER= kde at FreeBSD.org
COMMENT= Plasma5 non-interactive system tools
-CONFLICTS_INSTALL= kde-runtime-kde4
USES= cmake compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz xorg
USE_KDE= activities auth bookmarks codecs completion config configwidgets \
Modified: head/www/choqok/Makefile
==============================================================================
--- head/www/choqok/Makefile Sun Aug 9 08:45:17 2020 (r544550)
+++ head/www/choqok/Makefile Sun Aug 9 08:53:41 2020 (r544551)
@@ -29,6 +29,5 @@ USE_QT= concurrent core dbus gui network networkauth
USE_LDCONFIG= yes
-CONFLICTS_INSTALL= ${PORTNAME}-kde4
.include <bsd.port.mk>
Modified: head/x11-fm/krusader2/Makefile
==============================================================================
--- head/x11-fm/krusader2/Makefile Sun Aug 9 08:45:17 2020 (r544550)
+++ head/x11-fm/krusader2/Makefile Sun Aug 9 08:53:41 2020 (r544551)
@@ -12,7 +12,6 @@ COMMENT= Twin panel file manager for KDE, like midnigh
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-CONFLICTS_INSTALL= krusader2-kde4
USES= cmake compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= archive auth auth bookmarks codecs completion config \
Modified: head/x11-themes/kf5-oxygen-icons5/Makefile
==============================================================================
--- head/x11-themes/kf5-oxygen-icons5/Makefile Sun Aug 9 08:45:17 2020 (r544550)
+++ head/x11-themes/kf5-oxygen-icons5/Makefile Sun Aug 9 08:53:41 2020 (r544551)
@@ -21,6 +21,5 @@ CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=TRUE
NO_ARCH= yes
-CONFLICTS_INSTALL= kde4-oxygen-icons-*
.include <bsd.port.mk>
More information about the svn-ports-head
mailing list