From owner-svn-ports-head@freebsd.org Sun Mar 3 10:52:39 2019 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 D6FCA1505FFD; Sun, 3 Mar 2019 10:52:39 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7AD4A800E3; Sun, 3 Mar 2019 10:52:39 +0000 (UTC) (envelope-from tcberner@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 708411BACE; Sun, 3 Mar 2019 10:52:39 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x23AqdUx057833; Sun, 3 Mar 2019 10:52:39 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x23Aqd83057832; Sun, 3 Mar 2019 10:52:39 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201903031052.x23Aqd83057832@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 3 Mar 2019 10:52:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494493 - head/x11/plasma5-plasma-workspace X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/x11/plasma5-plasma-workspace X-SVN-Commit-Revision: 494493 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7AD4A800E3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 03 Mar 2019 10:52:40 -0000 Author: tcberner Date: Sun Mar 3 10:52:39 2019 New Revision: 494493 URL: https://svnweb.freebsd.org/changeset/ports/494493 Log: x11/plasma5-plasma-workspace: mark conflicting with old plasma5-plasma-desktop version A file was moved between packages between 5.14.x and 5.15.x. This hopefully helps portupgrade/portmaster to get the order right. PR: 236171 Reported by: Peter C B Henderson Modified: head/x11/plasma5-plasma-workspace/Makefile Modified: head/x11/plasma5-plasma-workspace/Makefile ============================================================================== --- head/x11/plasma5-plasma-workspace/Makefile Sun Mar 3 10:44:54 2019 (r494492) +++ head/x11/plasma5-plasma-workspace/Makefile Sun Mar 3 10:52:39 2019 (r494493) @@ -44,6 +44,9 @@ USE_XORG= ice sm x11 xau xcb xcomposite xext xfixes xf CMAKE_OFF= BUILD_TESTING +# In 5.15 a file was moved from x11/plasma5-plasma-desktop to x11/plasma5-plasma-workspace: +CONFLICTS_INSTALL= plasma5-plasma-desktop-5.14.* + post-patch: # set the paths in startkde ${REINPLACE_CMD} -e 's|%%KDE_PREFIX%%|${KDE_PREFIX}|g' \