From owner-svn-ports-all@FreeBSD.ORG  Mon May  4 17:42:29 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 EE3B69F1;
 Mon,  4 May 2015 17:42:29 +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 DCB4E1D57;
 Mon,  4 May 2015 17:42:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t44HgTMl041694;
 Mon, 4 May 2015 17:42:29 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t44HgTbt041693;
 Mon, 4 May 2015 17:42:29 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201505041742.t44HgTbt041693@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: Mon, 4 May 2015 17:42:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r385420 - 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-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 May 2015 17:42:30 -0000

Author: bdrewery
Date: Mon May  4 17:42:29 2015
New Revision: 385420
URL: https://svnweb.freebsd.org/changeset/ports/385420

Log:
  USE_GITHUB: Fix WRKSRC to contain the full DISTVERSION prefix/suffx when GH_TAGNAME not set.
  
  The GH_TAGNAME-based GH_TAGNAME_EXTRACT is now always used for the new style
  USE_GITHUB WRKSRC default.
  
  This was not spotted before since all but 1 github ports were using 'v' as a
  prefix, where github already stripped it. So the default GH_PROJECT-DISTVERSION
  was fine. The other case was x11-fonts/sourcesanspro-ttf where
  GH_TAGNAME was defined to have the full DISTVERSION prefix/suffx.
  
  Tested against all current USE_GITHUB !GH_COMMIT ports.
  
  PR:		199913
  With hat:	portmgr
  Reported by:	jbeich

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon May  4 17:26:30 2015	(r385419)
+++ head/Mk/bsd.port.mk	Mon May  4 17:42:29 2015	(r385420)
@@ -1558,11 +1558,7 @@ WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/work
 .  if defined(GH_COMMIT)
 WRKSRC?=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
 .  else
-.    if defined(GH_TAGNAME)
 WRKSRC?=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
-.    else
-WRKSRC?=		${WRKDIR}/${GH_PROJECT}-${DISTVERSION}
-.    endif
 .  endif
 .endif
 .if defined(NO_WRKSUBDIR)