Date: Sun, 3 Mar 2019 10:52:39 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494493 - head/x11/plasma5-plasma-workspace Message-ID: <201903031052.x23Aqd83057832@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <peter.henderson@ieee.org> 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' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903031052.x23Aqd83057832>