diff options
| -rw-r--r-- | deskutils/kdeconnect-kde/Makefile | 1 | ||||
| -rw-r--r-- | devel/dragon/Makefile | 1 | ||||
| -rw-r--r-- | devel/kdesvn/Makefile | 1 | ||||
| -rw-r--r-- | devel/kdevelop/Makefile | 1 | ||||
| -rw-r--r-- | graphics/kphotoalbum/Makefile | 1 | ||||
| -rw-r--r-- | graphics/skanlite/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/filelight/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/kf5-baloo/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/plasma5-kde-cli-tools/Makefile | 1 | ||||
| -rw-r--r-- | www/choqok/Makefile | 1 | ||||
| -rw-r--r-- | x11-fm/krusader2/Makefile | 1 | ||||
| -rw-r--r-- | x11-themes/kf5-oxygen-icons5/Makefile | 1 |
12 files changed, 0 insertions, 16 deletions
diff --git a/deskutils/kdeconnect-kde/Makefile b/deskutils/kdeconnect-kde/Makefile index 12eeb9fb5ed0..14f36a440974 100644 --- a/deskutils/kdeconnect-kde/Makefile +++ b/deskutils/kdeconnect-kde/Makefile @@ -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 diff --git a/devel/dragon/Makefile b/devel/dragon/Makefile index 70b2610a5fcf..0e7621f427be 100644 --- a/devel/dragon/Makefile +++ b/devel/dragon/Makefile @@ -13,7 +13,6 @@ LICENSE= GPLv3 LIB_DEPENDS= liblfcbase.so:devel/lfcbase -CONFLICTS= dragon-kde4 GNU_CONFIGURE= yes PLIST_FILES= bin/dragon diff --git a/devel/kdesvn/Makefile b/devel/kdesvn/Makefile index 24e23aa559f3..6b2690800fa5 100644 --- a/devel/kdesvn/Makefile +++ b/devel/kdesvn/Makefile @@ -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 diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 81f2fc54ca02..23c9a5eb86c8 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -38,7 +38,6 @@ USE_KDE= archive attica auth bookmarks codecs completion config configwidgets \ 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 diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile index 0f99eeb37378..2b88cbda96fe 100644 --- a/graphics/kphotoalbum/Makefile +++ b/graphics/kphotoalbum/Makefile @@ -28,6 +28,5 @@ USE_QT= concurrent core dbus declarative gui location network phonon4 \ buildtools_build qmake_build SHEBANG_FILES= scripts/open-raw.pl scripts/kpa-backup.sh -CONFLICTS_INSTALL= ${PORTNAME}-kde4 .include <bsd.port.mk> diff --git a/graphics/skanlite/Makefile b/graphics/skanlite/Makefile index d7d2d761cb3b..add4e38545df 100644 --- a/graphics/skanlite/Makefile +++ b/graphics/skanlite/Makefile @@ -21,6 +21,5 @@ USE_KDE= ecm auth config configwidgets codecs completion \ USE_QT= buildtools_build qmake_build \ core concurrent dbus gui network widgets xml -CONFLICTS_INSTALL= skanlite-kde4 .include <bsd.port.mk> diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile index df476007f3c2..da6be6a0df88 100644 --- a/sysutils/filelight/Makefile +++ b/sysutils/filelight/Makefile @@ -10,7 +10,6 @@ COMMENT= Map of concentric segmented-rings representing file system 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 diff --git a/sysutils/kf5-baloo/Makefile b/sysutils/kf5-baloo/Makefile index d20c3c8d24f6..cc183987392d 100644 --- a/sysutils/kf5-baloo/Makefile +++ b/sysutils/kf5-baloo/Makefile @@ -17,9 +17,4 @@ USE_KDE= auth completion config coreaddons crash dbusaddons \ 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> diff --git a/sysutils/plasma5-kde-cli-tools/Makefile b/sysutils/plasma5-kde-cli-tools/Makefile index 59fa8b319dcb..03ed56abadf9 100644 --- a/sysutils/plasma5-kde-cli-tools/Makefile +++ b/sysutils/plasma5-kde-cli-tools/Makefile @@ -7,7 +7,6 @@ CATEGORIES= sysutils kde kde-plasma MAINTAINER= kde@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 \ diff --git a/www/choqok/Makefile b/www/choqok/Makefile index 2e05d54a03a4..e92470515c3e 100644 --- a/www/choqok/Makefile +++ b/www/choqok/Makefile @@ -29,6 +29,5 @@ USE_QT= concurrent core dbus gui network networkauth webkit widgets xml \ USE_LDCONFIG= yes -CONFLICTS_INSTALL= ${PORTNAME}-kde4 .include <bsd.port.mk> diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile index 88a3e6739a10..eea7bdc4bc85 100644 --- a/x11-fm/krusader2/Makefile +++ b/x11-fm/krusader2/Makefile @@ -12,7 +12,6 @@ COMMENT= Twin panel file manager for KDE, like midnight or norton commander 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 \ diff --git a/x11-themes/kf5-oxygen-icons5/Makefile b/x11-themes/kf5-oxygen-icons5/Makefile index 03713ac805e9..15b4c1893344 100644 --- a/x11-themes/kf5-oxygen-icons5/Makefile +++ b/x11-themes/kf5-oxygen-icons5/Makefile @@ -21,6 +21,5 @@ CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=TRUE \ NO_ARCH= yes -CONFLICTS_INSTALL= kde4-oxygen-icons-* .include <bsd.port.mk> |