aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2018-05-26 08:14:28 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2018-05-26 08:14:28 +0000
commit3499a0b700014df8fc2d7bce737ca6257160687f (patch)
tree6f8fabf54d1d3c03e54c489fedeed213b7c7cec8
parent1049990556cef5c14ea376e516a9d601ebb4493f (diff)
downloadports-3499a0b700014df8fc2d7bce737ca6257160687f.tar.gz
ports-3499a0b700014df8fc2d7bce737ca6257160687f.zip
kde.mk: fix and simplify the INSTALL_CONFLICTS for kde-applications
* kde:5 wrongly got a -4*, and did an unnecessary sub * only use PORTNAME for the kde:4 ones
Notes
Notes: svn path=/head/; revision=470884
-rw-r--r--Mk/Uses/kde.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 6125344d287e..4c400a5948c8 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -124,14 +124,14 @@ PORTVERSION?= ${KDE4_VERSION}
MASTER_SITES?= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
DIST_SUBDIR?= KDE/${KDE4_VERSION}
PKGNAMESUFFIX= -kde4
-CONFLICTS_INSTALL= ${PORTNAME:C/-kde4//}-4.*
+CONFLICTS_INSTALL= ${PORTNAME}
. elif ${_KDE_CATEGORY:Mkde-applications}
PORTVERSION?= ${KDE_APPLICATIONS_VERSION}
. if ${_KDE_VERSION:M4}
CONFLICTS_INSTALL?= ${PORTNAME}-[0-9]*
PKGNAMESUFFIX?= -kde4
. else
-CONFLICTS_INSTALL?= ${PORTNAME}-kde4-[0-9]*
+CONFLICTS_INSTALL?= ${PORTNAME}-kde4
. endif
# Decide where the file lies on KDE's servers: Check whether the file lies in Attic
. if ${KDE_APPLICATIONS_VERSION:R:R} <= ${_KDE_APPLICATIONS_ATTIC_VERSION:R:R}