From 945a87d01c39b5614f0a771feb547ce8d5669fca Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 20 Mar 2015 22:32:00 +0000
Subject: [PATCH] Fix fetching x11-fonts/sourcesanspro-ttf from r381780; Don't
 modify GH_TAGNAME.

Pointyhats to:	bdrewery
With hat:	portmgr
Reported by:	antoine
---
 Mk/bsd.port.mk  | 4 ++--
 Mk/bsd.sites.mk | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 5e4831792fa4..46ecb1e01e8d 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -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
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index c8fc963ee8ca..9b33e4d67db9 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -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