1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-05 01:55:52 +00:00

Github's main archive link silently is converting tags starting with 'v' to

not have 'v' in the filename downloaded or the extraction directory. The
filename is not an issue since we force to use DISTNAME via the ?dummy trick
to fetch(1). Due to this though we must make the same replacement for tags
since we are not using their filename (which matches the extraction dir).

Incidentally this is working if DISTVERSIONPREFIX=v is used since that value
was not used in WRKSRC.

With hat:	portmgr
PR:		198869
This commit is contained in:
Bryan Drewery 2015-03-24 16:42:38 +00:00
parent 37709286d6
commit 0803843ae4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=382120
2 changed files with 4 additions and 1 deletions

View File

@ -1559,7 +1559,7 @@ WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work
WRKSRC?= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
. else
. if defined(GH_TAGNAME)
WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_SANITIZED}
WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
. else
WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${DISTVERSION}
. endif

View File

@ -568,6 +568,9 @@ DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV}
. endif
. if defined(GH_TAGNAME)
GH_TAGNAME_SANITIZED= ${GH_TAGNAME:S,/,-,}
# Github silently converts tags starting with v to not have v in the filename
# and extraction directory.
GH_TAGNAME_EXTRACT= ${GH_TAGNAME_SANITIZED:S/^v//}
. endif
.endif
.endif