From bdrewery@FreeBSD.org  Fri Sep 14 16:44:39 2012
Return-Path: <bdrewery@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9FDB4106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 14 Sep 2012 16:44:39 +0000 (UTC)
	(envelope-from bdrewery@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 854F48FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 14 Sep 2012 16:44:39 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8EGiddK096070
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 14 Sep 2012 16:44:39 GMT
	(envelope-from bdrewery@freefall.freebsd.org)
Received: (from bdrewery@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8EGid7x096031
	for FreeBSD-gnats-submit@freebsd.org; Fri, 14 Sep 2012 16:44:39 GMT
	(envelope-from bdrewery)
Received: (qmail 42302 invoked from network); 14 Sep 2012 11:44:35 -0500
Received: from unknown (HELO test8.xzibition.com) (10.10.0.34)
  by sweb.xzibition.com with SMTP; 14 Sep 2012 11:44:35 -0500
Received: by test8.xzibition.com (sSMTP sendmail emulation); Fri, 14 Sep 2012 11:44:33 -0500
Message-Id: <201209141644.q8EGid7x096031@freefall.freebsd.org>
Date: Fri, 14 Sep 2012 11:44:33 -0500
From: Bryan Drewery <bdrewery@freebsd.org>
Reply-To: Bryan Drewery <bdrewery@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [bsd.sites.mk] Only add GH to MASTER_SITES if not already there
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         171644
>Category:       ports
>Synopsis:       [bsd.sites.mk] Only add GH to MASTER_SITES if not already there
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beat
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 14 16:50:09 UTC 2012
>Closed-Date:    Wed Oct 10 18:22:48 UTC 2012
>Last-Modified:  Wed Oct 10 18:22:48 UTC 2012
>Originator:     Bryan Drewery
>Release:        FreeBSD 8.3-RELEASE i386
>Organization:
>Environment:

	
>Description:
	When using USE_GITHUB, the GH template is always appended to MASTER_SITES. There are cases where I want it to be *first* and allow a backup mirror. This can be seen in ports-mgmt/portupgrade-devel
>How-To-Repeat:
	
>Fix:

	Patch fixes so GH is only added if not already present. See ports-mgmt/portupgrade for an example.

--- patch-bsd.sites.mk-GH-ordering.txt begins here ---
diff --git bsd.sites.mk bsd.sites.mk
index 192aa7a..6ed99f6 100644
--- bsd.sites.mk
+++ bsd.sites.mk
@@ -535,7 +535,9 @@ 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}
--- patch-bsd.sites.mk-GH-ordering.txt ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pgollucci 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Sep 14 16:50:21 UTC 2012 
Responsible-Changed-Why:  
bsd.sites.mk is pgollucci territory (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171644 
Responsible-Changed-From-To: pgollucci->portmgr 
Responsible-Changed-By: bdrewery 
Responsible-Changed-When: Fri Sep 14 11:54:51 CDT 2012 
Responsible-Changed-Why:  
Over to portmgr for exp-run 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171644 
Responsible-Changed-From-To: portmgr->beat 
Responsible-Changed-By: beat 
Responsible-Changed-When: Sun Oct 7 10:21:24 UTC 2012 
Responsible-Changed-Why:  
Take for exp-run. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171644 
State-Changed-From-To: open->closed 
State-Changed-By: beat 
State-Changed-When: Wed Oct 10 18:22:47 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171644 
>Unformatted:
