svn commit: r381782 - head/Mk

[Bryan Drewery]

Author: bdrewery
Date: Fri Mar 20 22:32:00 2015
New Revision: 381782
URL: https://svnweb.freebsd.org/changeset/ports/381782
QAT: https://qat.redports.org/buildarchive/r381782/

Log:
  Fix fetching x11-fonts/sourcesanspro-ttf from r381780; Don't modify GH_TAGNAME.
  
  Pointyhats to:	bdrewery
  With hat:	portmgr
  Reported by:	antoine

Modified:
  head/Mk/bsd.port.mk
  head/Mk/bsd.sites.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri Mar 20 20:52:05 2015	(r381781)
+++ head/Mk/bsd.port.mk	Fri Mar 20 22:32:00 2015	(r381782)
@@ -1354,7 +1354,7 @@ PKGVERSION=	${PORTVERSION:C/[-_,]/./g}${
 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

Modified: head/Mk/bsd.sites.mk
==============================================================================
--- head/Mk/bsd.sites.mk	Fri Mar 20 20:52:05 2015	(r381781)
+++ head/Mk/bsd.sites.mk	Fri Mar 20 22:32:00 2015	(r381782)
@@ -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