diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2018-05-25 21:12:10 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2018-05-25 21:12:10 +0000 |
| commit | 7af83a4d521d6a09fd604a3c46ec637bd5f21646 (patch) | |
| tree | 1299e21da1df085e80b8a863449f007dd03224c7 | |
| parent | Add py-folium 0.5.0 (diff) | |
Add CONFLICTS lines because both ports install manpage for kdesu
Reported by: se
Reviewed by: tcberner
Differential Revision: https://reviews.freebsd.org/D15571
Notes
Notes:
svn path=/head/; revision=470866
| -rw-r--r-- | sysutils/plasma5-kde-cli-tools/Makefile | 4 | ||||
| -rw-r--r-- | x11/kde-runtime-kde4/Makefile | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sysutils/plasma5-kde-cli-tools/Makefile b/sysutils/plasma5-kde-cli-tools/Makefile index ee2880d78bfa..88128e336ce6 100644 --- a/sysutils/plasma5-kde-cli-tools/Makefile +++ b/sysutils/plasma5-kde-cli-tools/Makefile @@ -5,7 +5,9 @@ DISTVERSION= ${KDE_PLASMA_VERSION} CATEGORIES= sysutils kde kde-plasma MAINTAINER= kde@FreeBSD.org -COMMENT= Plasma5 non-interactive system tools +COMMENT= Plasma5 non-interactive system tools + +CONFLICTS_INSTALL= kde-runtime-kde4 USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 tar:xz USE_KDE= activities auth bookmarks codecs completion config configwidgets \ diff --git a/x11/kde-runtime-kde4/Makefile b/x11/kde-runtime-kde4/Makefile index 6f0dc7de8479..e838283b4a6a 100644 --- a/x11/kde-runtime-kde4/Makefile +++ b/x11/kde-runtime-kde4/Makefile @@ -9,6 +9,8 @@ PKGNAMESUFFIX= -kde4 MAINTAINER= kde@FreeBSD.org COMMENT= Runtime components for KDE Plasma Desktop +CONFLICTS_INSTALL= plasma5-kde-cli-tools + LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libwebp.so:graphics/webp \ libslp.so:net/openslp \ |