From owner-svn-ports-all@freebsd.org Fri Dec 23 22:07:06 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5AE2FC8ED7D; Fri, 23 Dec 2016 22:07:06 +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 mx1.freebsd.org (Postfix) with ESMTPS id F266E360; Fri, 23 Dec 2016 22:07:05 +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 uBNM755f060614; Fri, 23 Dec 2016 22:07:05 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBNM75Bx060613; Fri, 23 Dec 2016 22:07:05 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201612232207.uBNM75Bx060613@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 23 Dec 2016 22:07:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429287 - head/Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Dec 2016 22:07:06 -0000 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- 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-