From owner-svn-ports-head@FreeBSD.ORG  Fri Mar 20 22:32:01 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B5953FAD;
 Fri, 20 Mar 2015 22:32:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8670A7B2;
 Fri, 20 Mar 2015 22:32:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2KMW1Jp099905;
 Fri, 20 Mar 2015 22:32:01 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2KMW0cP099896;
 Fri, 20 Mar 2015 22:32:00 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201503202232.t2KMW0cP099896@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 20 Mar 2015 22:32:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r381782 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Mar 2015 22:32:01 -0000

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