USE_GITHUB: Fix WRKSRC to contain the full DISTVERSION prefix/suffx when GH_TAGNAME not set.
The GH_TAGNAME-based GH_TAGNAME_EXTRACT is now always used for the new style USE_GITHUB WRKSRC default. This was not spotted before since all but 1 github ports were using 'v' as a prefix, where github already stripped it. So the default GH_PROJECT-DISTVERSION was fine. The other case was x11-fonts/sourcesanspro-ttf where GH_TAGNAME was defined to have the full DISTVERSION prefix/suffx. Tested against all current USE_GITHUB !GH_COMMIT ports. PR: 199913 With hat: portmgr Reported by: jbeich
This commit is contained in:
parent
6dac8f0436
commit
007bf7a3d4
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=385420
1 changed files with 0 additions and 4 deletions
|
@ -1558,11 +1558,7 @@ WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
|
|||
. if defined(GH_COMMIT)
|
||||
WRKSRC?= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
|
||||
. else
|
||||
. if defined(GH_TAGNAME)
|
||||
WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
|
||||
. else
|
||||
WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${DISTVERSION}
|
||||
. endif
|
||||
. endif
|
||||
.endif
|
||||
.if defined(NO_WRKSUBDIR)
|
||||
|
|
Loading…
Reference in a new issue