Date: Sat, 26 May 2018 08:14:29 +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: r470884 - head/Mk/Uses Message-ID: <201805260814.w4Q8ETNW025214@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sat May 26 08:14:28 2018 New Revision: 470884 URL: https://svnweb.freebsd.org/changeset/ports/470884 Log: 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 Modified: head/Mk/Uses/kde.mk Modified: head/Mk/Uses/kde.mk ============================================================================== --- head/Mk/Uses/kde.mk Sat May 26 07:13:09 2018 (r470883) +++ head/Mk/Uses/kde.mk Sat May 26 08:14:28 2018 (r470884) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805260814.w4Q8ETNW025214>