diff options
| author | tnn <tnn> | 2015-03-07 21:14:32 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-03-07 21:14:32 +0000 |
| commit | 19bfb394673540258205cf60bf122c994b17902e (patch) | |
| tree | d18fff182a5a12ae373c933b891f03d5ed58e40d /mk/fetch/bsd.fetch-vars.mk | |
| parent | a955121b5773fd4d009ba8364ceea5129710566f (diff) | |
| download | pkgsrc-19bfb394673540258205cf60bf122c994b17902e.tar.gz | |
Address issues raised by agc@ to make the github master site handling
more pkgsrcesque.
1) turn _USE_GITHUB into an internal infrastructure variable
2) put back MASTER_SITES in packages' Makefiles.
3) encode the account in the master site URL, remove GH_ACCOUNT
4) rename GH_PROJECT to GITHUB_PROJECT
5) rename GH_TAGNAME to GITHUB_TAG and allow it to accept commit hash
as well as tag. GH_COMMIT is gone.
6) turn on this functionality when MASTER_SITES matches a predefined github
pattern instead of via explicit USE_GITHUB setting.
Diffstat (limited to 'mk/fetch/bsd.fetch-vars.mk')
| -rw-r--r-- | mk/fetch/bsd.fetch-vars.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/fetch/bsd.fetch-vars.mk b/mk/fetch/bsd.fetch-vars.mk index 0f13be2afaa..0eadd0b1776 100644 --- a/mk/fetch/bsd.fetch-vars.mk +++ b/mk/fetch/bsd.fetch-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.fetch-vars.mk,v 1.17 2015/03/07 14:17:52 tnn Exp $ +# $NetBSD: bsd.fetch-vars.mk,v 1.18 2015/03/07 21:14:32 tnn Exp $ # # This Makefile fragment is included separately by bsd.pkg.mk and # defines some variables which must be defined earlier than where @@ -37,8 +37,9 @@ _SYS_VARS.fetch= DEFAULT_DISTFILES _DISTDIR= ${DISTDIR}/${DIST_SUBDIR} .if defined(DISTNAME) && !empty(DISTNAME) -. if defined(GH_COMMIT) && !empty(GH_COMMIT) -DEFAULT_DISTFILES= ${DISTNAME}-${GH_COMMIT}${EXTRACT_SUFX} +. if defined(GITHUB_TAG) && !empty(GITHUB_TAG:M[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]*) +# if the github tag is a git hash (7 or more hex digits), encode it in the distfile name +DEFAULT_DISTFILES= ${DISTNAME}-${GITHUB_TAG}${EXTRACT_SUFX} . else DEFAULT_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} . endif |