From owner-freebsd-ports@FreeBSD.ORG  Wed Jan  7 00:01:34 2015
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@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 A419B169
 for <freebsd-ports@freebsd.org>; Wed,  7 Jan 2015 00:01:34 +0000 (UTC)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 (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 89B4E645A4
 for <freebsd-ports@freebsd.org>; Wed,  7 Jan 2015 00:01:34 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id t0701YT1015051
 for <freebsd-ports@freebsd.org>; Wed, 7 Jan 2015 00:01:34 GMT
 (envelope-from bdrewery@freefall.freebsd.org)
Received: (from bdrewery@localhost)
 by freefall.freebsd.org (8.14.9/8.14.9/Submit) id t0701YBE015048
 for freebsd-ports@freebsd.org; Wed, 7 Jan 2015 00:01:34 GMT
 (envelope-from bdrewery)
Received: (qmail 71866 invoked from network); 6 Jan 2015 18:01:33 -0600
Received: from unknown (HELO ?10.10.1.139?) (freebsd@shatow.net@10.10.1.139)
 by sweb.xzibition.com with ESMTPA; 6 Jan 2015 18:01:33 -0600
Message-ID: <54AC7761.9050305@FreeBSD.org>
Date: Tue, 06 Jan 2015 18:01:37 -0600
From: Bryan Drewery <bdrewery@FreeBSD.org>
Organization: FreeBSD
User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64;
 rv:31.0) Gecko/20100101 Thunderbird/31.3.0
MIME-Version: 1.0
To: Ben Woods <woodsb02@gmail.com>, freebsd-ports@freebsd.org
Subject: Re: Combining GitHub and regular MASTER_SITES for multiple DISTFILES
References: <CAOc73CC1eqn-KoF13obCFaKX-wt-DLzyzXnCsC9YrripndaszA@mail.gmail.com>
In-Reply-To: <CAOc73CC1eqn-KoF13obCFaKX-wt-DLzyzXnCsC9YrripndaszA@mail.gmail.com>
OpenPGP: id=6E4697CF;
	url=http://www.shatow.net/bryan/bryan2.asc
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports/>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2015 00:01:34 -0000

On 1/4/2015 8:49 AM, Ben Woods wrote:
> I am trying to create a new port, where the main source code should be
> retrieved from GitHub, and a secondary piece of source code should be
> retrieved from an FTP site.
> 
> The USE_GITHUB port magic does not work for the primary source code if the
> MASTER_SITES and DISTFILES variables are also specified in the Makefile for
> the secondary source code. The result is that only the secondary code is
> downloaded and extracted. Using += for the MASTER_SITES and DISTFILES
> assignment does not fix the issue.
> 
> Is there a way that these can be used together for this propose?
> 
> Regards,
> Ben
> 
> 

See ports-mgmt/poudriere Makefile.

Use 'GH' in MASTER_SITES for the USE_GITHUB source:

MASTER_SITES=   LOCAL/bdrewery/${PORTNAME}/ \
                http://mirror.shatow.net/freebsd/${PORTNAME}/ \
                GH

You can use whatever order you wish.

-- 
Regards,
Bryan Drewery