Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 May 2018 21:12:10 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r470866 - in head: sysutils/plasma5-kde-cli-tools x11/kde-runtime-kde4
Message-ID:  <201805252112.w4PLCBSA075123@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adridg
Date: Fri May 25 21:12:10 2018
New Revision: 470866
URL: https://svnweb.freebsd.org/changeset/ports/470866

Log:
  Add CONFLICTS lines because both ports install manpage for kdesu
  
  Reported by:	se
  Reviewed by:	tcberner
  Differential Revision:	https://reviews.freebsd.org/D15571

Modified:
  head/sysutils/plasma5-kde-cli-tools/Makefile
  head/x11/kde-runtime-kde4/Makefile

Modified: head/sysutils/plasma5-kde-cli-tools/Makefile
==============================================================================
--- head/sysutils/plasma5-kde-cli-tools/Makefile	Fri May 25 21:06:16 2018	(r470865)
+++ head/sysutils/plasma5-kde-cli-tools/Makefile	Fri May 25 21:12:10 2018	(r470866)
@@ -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 \

Modified: head/x11/kde-runtime-kde4/Makefile
==============================================================================
--- head/x11/kde-runtime-kde4/Makefile	Fri May 25 21:06:16 2018	(r470865)
+++ head/x11/kde-runtime-kde4/Makefile	Fri May 25 21:12:10 2018	(r470866)
@@ -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 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805252112.w4PLCBSA075123>