From owner-svn-ports-head@freebsd.org Fri May 25 21:12:11 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BC50EEF4844; Fri, 25 May 2018 21:12:11 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 715F874C76; Fri, 25 May 2018 21:12:11 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 529D9263C9; Fri, 25 May 2018 21:12:11 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4PLCB7C075132; Fri, 25 May 2018 21:12:11 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4PLCBSA075123; Fri, 25 May 2018 21:12:11 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201805252112.w4PLCBSA075123@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Fri, 25 May 2018 21:12:10 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head: sysutils/plasma5-kde-cli-tools x11/kde-runtime-kde4 X-SVN-Commit-Revision: 470866 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 May 2018 21:12:11 -0000 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 \