svn commit: r409898 - in head: . Mk

[Mathieu Arnold]

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 at 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 at 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%