mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-01 01:17:02 +00:00
Code Issues Releases Activity

Fix fetching x11-fonts/sourcesanspro-ttf from r381780; Don't modify GH_TAGNAME.

Browse Source 
Pointyhats to:	bdrewery
With hat:	portmgr
Reported by:	antoine
This commit is contained in:
Bryan Drewery 2015-03-20 22:32:00 +00:00
parent 52164ae2b5
commit 945a87d01c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=381782
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mk/bsd.port.mk
View File

@ -1354,7 +1354,7 @@ PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2}
PKGNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION}
DISTVERSIONFULL= ${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX}
.if defined(USE_GITHUB) && defined(GH_TAGNAME) && !defined(GH_COMMIT)
DISTNAME?= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME}
DISTNAME?= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED}
.else
DISTNAME?= ${PORTNAME}-${DISTVERSIONFULL}
.endif
@ -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}
WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_SANITIZED}
. else
WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${DISTVERSION}
. endif

4
Mk/bsd.sites.mk
View File

@ -558,7 +558,6 @@ GH_TAGNAME?= ${DISTVERSION}
. else
# Use full PREFIX/SUFFIX and converted DISTVERSION
GH_TAGNAME?= ${DISTVERSIONFULL}
GH_TAGNAME:= ${GH_TAGNAME:S,/,-,}
# 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.
@ -567,6 +566,9 @@ _GITHUB_REV= 0
DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV}
. endif
. endif
. if defined(GH_TAGNAME)
GH_TAGNAME_SANITIZED= ${GH_TAGNAME:S,/,-,}
. endif
.endif
.endif