From owner-svn-ports-all@freebsd.org  Mon Jun  6 15:25:23 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE81DB6D72C;
 Mon,  6 Jun 2016 15:25:23 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 7C72519B8;
 Mon,  6 Jun 2016 15:25:23 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u56FPMi6089384;
 Mon, 6 Jun 2016 15:25:22 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u56FPMGC089383;
 Mon, 6 Jun 2016 15:25:22 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201606061525.u56FPMGC089383@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 6 Jun 2016 15:25:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r416468 - head/Mk/Scripts
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.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jun 2016 15:25:23 -0000

Author: mat
Date: Mon Jun  6 15:25:22 2016
New Revision: 416468
URL: https://svnweb.freebsd.org/changeset/ports/416468

Log:
  Fix having the :DEFAULT MASTER_SITES entries ending up being there twice
  in the end.
  
  Sponsored by:	Absolight

Modified:
  head/Mk/Scripts/do-fetch.sh   (contents, props changed)

Modified: head/Mk/Scripts/do-fetch.sh
==============================================================================
--- head/Mk/Scripts/do-fetch.sh	Mon Jun  6 15:18:05 2016	(r416467)
+++ head/Mk/Scripts/do-fetch.sh	Mon Jun  6 15:25:22 2016	(r416468)
@@ -106,6 +106,8 @@ for _file in "${@}"; do
 			else
 				SORTED_MASTER_SITES_CMD_TMP="${dp_SORTED_PATCH_SITES_DEFAULT_CMD}"
 			fi
+			# Having this set when the next eval runs creates double entries.
+			unset _${dp_SITE_FLAVOR}_SITES_DEFAULT
 		fi
 		case ${dp_TARGET} in
 			fetch-list)