Date: Fri, 23 Dec 2016 22:07:05 +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: r429287 - head/Mk/Uses Message-ID: <201612232207.uBNM75Bx060613@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Fri Dec 23 22:07:04 2016 New Revision: 429287 URL: https://svnweb.freebsd.org/changeset/ports/429287 Log: Add kde-applications to the supported kde-<categories> This adds kde-applications to categories that can be used to setup MASTER_SITES and such for kde ports. With that we are now ready to update KDE4 and look at importing at least some of the KF5 based aplications from the testing repo. Reviewed by: rakuco Approved by: rakuco (mentor) Differential Revision: https://reviews.freebsd.org/D8893 Modified: head/Mk/Uses/kde.mk Modified: head/Mk/Uses/kde.mk ============================================================================== --- head/Mk/Uses/kde.mk Fri Dec 23 20:50:10 2016 (r429286) +++ head/Mk/Uses/kde.mk Fri Dec 23 22:07:04 2016 (r429287) @@ -68,6 +68,13 @@ KDE4_BRANCH?= stable KDE_FRAMEWORKS_VERSION?= 5.29.0 KDE_FRAMEWORKS_BRANCH?= stable +# Current KDE applications. +KDE_APPLICATIONS_VERSION?= 16.12.0 +KDE_APPLICATIONS_BRANCH?= stable +# Upstream moves old software to Attic/. Specify the newest applications release there. +# Only the major version is used for the comparison. +_KDE_APPLICATIONS_ATTIC_VERSION= 15.12.3 + # Extended KDE universe applications. CALLIGRA_VERSION?= 2.9.11 CALLIGRA_BRANCH?= stable @@ -86,7 +93,7 @@ KDE_PREFIX= ${LOCALBASE} # === CATEGORIES HANDLING -- SETTING DEFAULT VALUES ============================ # Doing MASTER_SITES magic based on the category of the port -_KDE_CATEGORIES_SUPPORTED= kde-frameworks kde-kde4 +_KDE_CATEGORIES_SUPPORTED= kde-applications kde-frameworks kde-kde4 . for cat in ${_KDE_CATEGORIES_SUPPORTED} . if ${CATEGORIES:M${cat}} . if !defined(_KDE_CATEGORY) @@ -110,6 +117,20 @@ CPE_VENDOR?= kde PORTVERSION?= ${KDE4_VERSION} MASTER_SITES?= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src DIST_SUBDIR?= KDE/${KDE4_VERSION} +. elif ${_KDE_CATEGORY:Mkde-applications} +PORTVERSION?= ${KDE_APPLICATIONS_VERSION} +. if ${_KDE_VERSION:M4} +CONFLICTS_INSTALL?= ${PORTNAME}-kf5-* +. else +CONFLICTS_INSTALL?= kde4-${PORTNAME}-* ${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} +MASTER_SITES?= KDE/Attic/applications/${KDE_APPLICATIONS_VERSION}/src +. else +MASTER_SITES?= KDE/${KDE_APPLICATIONS_BRANCH}/applications/${KDE_APPLICATIONS_VERSION}/src +. endif +DIST_SUBDIR?= KDE/applications/${KDE_APPLICATIONS_VERSION} . elif ${_KDE_CATEGORY:Mkde-frameworks} PORTVERSION?= ${KDE_FRAMEWORKS_VERSION} PKGNAMEPREFIX?= kf5-
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612232207.uBNM75Bx060613>