diff options
| author | tnn <tnn> | 2015-03-07 21:14:32 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-03-07 21:14:32 +0000 |
| commit | cb95b471df42d3e08fc966482f39631b16de0d01 (patch) | |
| tree | d18fff182a5a12ae373c933b891f03d5ed58e40d /mk/bsd.pkg.mk | |
| parent | 7b55ea402d8d4aede6c4a471de46cb41741d7b95 (diff) | |
| download | pkgsrc-cb95b471df42d3e08fc966482f39631b16de0d01.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/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 5f38185fa51..00a0a6cf88e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.2010 2015/03/07 14:17:51 tnn Exp $ +# $NetBSD: bsd.pkg.mk,v 1.2011 2015/03/07 21:14:32 tnn Exp $ # # This file is in the public domain. # @@ -96,12 +96,8 @@ MAINTAINER?= pkgsrc-users@NetBSD.org .endif PKGWILDCARD?= ${PKGBASE}-[0-9]* TOOL_DEPENDS?= # empty -.if defined(USE_GITHUB) && !empty(USE_GITHUB:M[yY][eE][sS]) && \ - defined(GH_COMMIT) && !empty(GH_COMMIT) -WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_COMMIT} -.elif defined(USE_GITHUB) && !empty(USE_GITHUB:M[yY][eE][sS]) && \ - defined(GH_TAGNAME) && !empty(GH_TAGNAME) -WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//} +.if defined(GITHUB_TAG) +WRKSRC?= ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG:C/^v//} .else WRKSRC?= ${WRKDIR}/${DISTNAME:U${PKGNAME_NOREV}} .endif |