From owner-svn-ports-head@FreeBSD.ORG  Wed Oct 10 18:20:22 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 75AE1E3C;
 Wed, 10 Oct 2012 18:20:22 +0000 (UTC)
 (envelope-from beat@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 5F2648FC0A;
 Wed, 10 Oct 2012 18:20:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9AIKMcc077269;
 Wed, 10 Oct 2012 18:20:22 GMT (envelope-from beat@svn.freebsd.org)
Received: (from beat@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9AIKM98077265;
 Wed, 10 Oct 2012 18:20:22 GMT (envelope-from beat@svn.freebsd.org)
Message-Id: <201210101820.q9AIKM98077265@svn.freebsd.org>
From: Beat Gaetzi <beat@FreeBSD.org>
Date: Wed, 10 Oct 2012 18:20:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305677 - 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.14
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: Wed, 10 Oct 2012 18:20:22 -0000
X-List-Received-Date: Wed, 10 Oct 2012 18:20:22 -0000

Author: beat
Date: Wed Oct 10 18:20:21 2012
New Revision: 305677
URL: http://svn.freebsd.org/changeset/ports/305677

Log:
  - Only add GH to MASTER_SITES if not already there [1]
  - Allow WRKSRC to be overridden when using USE_GITHUB [2]
  
  PR:		ports/171644 [1], ports/171688 [2]
  Submitted by:	bdrewery
  Reviewed by:	gahr
  Tested by:	Exp-run on pointyhat

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

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Oct 10 17:44:07 2012	(r305676)
+++ head/Mk/bsd.port.mk	Wed Oct 10 18:20:21 2012	(r305677)
@@ -1534,6 +1534,9 @@ check-makefile::
 _POSTMKINCLUDED=	yes
 
 WRKDIR?=		${WRKDIRPREFIX}${.CURDIR}/work
+.if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB)
+WRKSRC?=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
+.endif
 .if defined(NO_WRKSUBDIR)
 WRKSRC?=		${WRKDIR}
 .else

Modified: head/Mk/bsd.sites.mk
==============================================================================
--- head/Mk/bsd.sites.mk	Wed Oct 10 17:44:07 2012	(r305676)
+++ head/Mk/bsd.sites.mk	Wed Oct 10 18:20:21 2012	(r305677)
@@ -546,10 +546,11 @@ MASTER_SITE_GET_E+= \
 #            
 .if defined(USE_GITHUB)
 MASTER_SITE_GITHUB+= https://nodeload.github.com/%SUBDIR%
+.if !defined(MASTER_SITES) || !${MASTER_SITES:MGH}
 MASTER_SITES+=	GH
+.endif
 GH_PROJECT?=	${PORTNAME}
 GH_TAGNAME?=	${DISTVERSION}
-WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}
 .endif
 .endif