From owner-svn-ports-all@FreeBSD.ORG  Fri May 29 21:43:28 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6B40BADC;
 Fri, 29 May 2015 21:43:28 +0000 (UTC) (envelope-from mat@FreeBSD.org)
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 59EA11D01;
 Fri, 29 May 2015 21:43:28 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4TLhSM9016253;
 Fri, 29 May 2015 21:43:28 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4TLhSIM016252;
 Fri, 29 May 2015 21:43:28 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201505292143.t4TLhSIM016252@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Fri, 29 May 2015 21:43:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r387895 - 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: Fri, 29 May 2015 21:43:28 -0000

Author: mat
Date: Fri May 29 21:43:27 2015
New Revision: 387895
URL: https://svnweb.freebsd.org/changeset/ports/387895

Log:
  Revert that bit from r387852, it was not needed, and breaks at least
  devel/poudriere-devel
  
  PR:		200528
  Poked by:	bdrewery
  Pointy hat to:	mat
  Sponsored by:	Absolight

Modified:
  head/Mk/bsd.sites.mk

Modified: head/Mk/bsd.sites.mk
==============================================================================
--- head/Mk/bsd.sites.mk	Fri May 29 21:39:29 2015	(r387894)
+++ head/Mk/bsd.sites.mk	Fri May 29 21:43:27 2015	(r387895)
@@ -603,7 +603,6 @@ GH_TAGNAME_SANITIZED=	${GH_TAGNAME:S,/,-
 # and extraction directory.
 GH_TAGNAME_EXTRACT=	${GH_TAGNAME_SANITIZED:C/^[vV]([0-9])/\1/}
 .  endif 
-_GITHUB_REV=	0
 .  if defined(_GITHUB_MUST_SET_DISTNAME)
 # GH_TAGNAME defaults to DISTVERSIONFULL; Avoid adding DISTVERSIONFULL in twice
 .    if ${GH_TAGNAME} != ${DISTVERSIONFULL}
@@ -611,13 +610,14 @@ DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${
 .    else
 DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME_SANITIZED}
 .    endif
+.  endif
 # 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.
+_GITHUB_REV=	0
 .  if ${MASTER_SITES:MGH}
 DISTNAME:=	${DISTNAME}_GH${_GITHUB_REV}
 .  endif
-.  endif
 .endif
 _GITHUB_EXTRACT_SUFX=	.tar.gz
 # If there are non default groups