ports/171644: [bsd.sites.mk] Only add GH to MASTER_SITES if not already there

[Bryan Drewery]

>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:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 14 16:50:09 UTC 2012
>Closed-Date:
>Last-Modified:
>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:
>Unformatted: