diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-05-29 21:43:27 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-05-29 21:43:27 +0000 |
| commit | 8a130e97ca5e3ff02fa2173f0b53dd025a8c3072 (patch) | |
| tree | 4bce83a107d7a0b6358e3b3d8c8670f3e63aad35 /Mk/bsd.sites.mk | |
| parent | Update to 4.10.4. (diff) | |
Revert that bit from r387852, it was not needed, and breaks at least
devel/poudriere-devel
PR: 200528
Poked by: bdrewery
Pointy hat to: mat
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=387895
Diffstat (limited to 'Mk/bsd.sites.mk')
| -rw-r--r-- | Mk/bsd.sites.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index 88e551ba0e4e..7276f3e7bbee 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -603,7 +603,6 @@ GH_TAGNAME_SANITIZED= ${GH_TAGNAME:S,/,-,} # and extraction directory. GH_TAGNAME_EXTRACT= ${GH_TAGNAME_SANITIZED:C/^[vV]([0-9])/\1/} . endif -_GITHUB_REV= 0 . if defined(_GITHUB_MUST_SET_DISTNAME) # GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in twice . if ${GH_TAGNAME} != ${DISTVERSIONFULL} @@ -611,13 +610,14 @@ DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED} . else DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME_SANITIZED} . endif +. endif # This new scheme rerolls distfiles. Also ensure they are renamed to avoid # conflicts. Use _GITHUB_REV in case github changes their zipping or structure # which has happened before. +_GITHUB_REV= 0 . if ${MASTER_SITES:MGH} DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV} . endif -. endif .endif _GITHUB_EXTRACT_SUFX= .tar.gz # If there are non default groups |