From owner-svn-ports-all@freebsd.org Tue Mar 1 20:22:47 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 3A32BABD880; Tue, 1 Mar 2016 20:22:47 +0000 (UTC) (envelope-from mat@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 E6DA2152F; Tue, 1 Mar 2016 20:22:46 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u21KMjVs011361; Tue, 1 Mar 2016 20:22:45 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u21KMjRR011359; Tue, 1 Mar 2016 20:22:45 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201603012022.u21KMjRR011359@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 1 Mar 2016 20:22:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409898 - in head: . Mk 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.20 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: Tue, 01 Mar 2016 20:22:47 -0000 Author: mat Date: Tue Mar 1 20:22:45 2016 New Revision: 409898 URL: https://svnweb.freebsd.org/changeset/ports/409898 Log: Introduce GH_TUPLE. GH_TUPLE allows one to put all the GH_{ACCOUNT,PROJECT,TAGNAME} into one variable, in the form of account:project:tagname[:group]. It is helpful when there are many submodules. PR: 204772 With hat: portmgr Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D4514 Modified: head/CHANGES head/Mk/bsd.sites.mk Modified: head/CHANGES ============================================================================== --- head/CHANGES Tue Mar 1 19:50:34 2016 (r409897) +++ head/CHANGES Tue Mar 1 20:22:45 2016 (r409898) @@ -10,6 +10,15 @@ in the release notes and/or placed into All ports committers are allowed to commit to this file. +20160301: +AUTHOR: mat@FreeBSD.org + + Introduce GH_TUPLE. + + GH_TUPLE allows one to put all the GH_{ACCOUNT,PROJECT,TAGNAME} into one + variable, in the form of account:project:tagname[:group]. It is helpful when + there are many submodules. + 20160207: AUTHOR: kwm@FreeBSD.org Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Tue Mar 1 19:50:34 2016 (r409897) +++ head/Mk/bsd.sites.mk Tue Mar 1 20:22:45 2016 (r409898) @@ -517,6 +517,7 @@ MASTER_SITE_GENTOO+= \ # Using the name of a branch here is incorrect. It is # possible to do GH_TAGNAME= GIT_HASH to do a snapshot. # default: ${DISTVERSION} +# GH_TUPLE - above shortened to account:project:tagname[:group] # .if defined(USE_GITHUB) . if defined(GH_TAGNAME) && ${GH_TAGNAME} == master @@ -524,6 +525,11 @@ IGNORE?= Using master as GH_TAGNAME is i Must use a tag or commit hash so the upstream does \ not "reroll" as soon as the branch is updated . endif +. if defined(GH_TUPLE) +GH_ACCOUNT+= ${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:]*)?)@\1\4@} +GH_PROJECT+= ${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:]*)?)@\2\4@} +GH_TAGNAME+= ${GH_TUPLE:C@^([^:]*):([^:]*):([^:]*)((:[^:]*)?)@\3\4@} +. endif # We are cheating and using backend URLS for Github here. See ports/194898 # comment #15 for explanation as to why and how to deal with it if it breaks. MASTER_SITE_GITHUB+= https://codeload.github.com/%SUBDIR%