From owner-svn-ports-head@freebsd.org  Wed Aug  2 08:59:23 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 1B5B5DCA91E;
 Wed,  2 Aug 2017 08:59: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 DDE7080CD4;
 Wed,  2 Aug 2017 08:59:22 +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 v728xMYa027247;
 Wed, 2 Aug 2017 08:59:22 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v728xM0D027246;
 Wed, 2 Aug 2017 08:59:22 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201708020859.v728xM0D027246@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: Wed, 2 Aug 2017 08:59:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r447090 - head/Mk
X-SVN-Group: ports-head
X-SVN-Commit-Author: mat
X-SVN-Commit-Paths: head/Mk
X-SVN-Commit-Revision: 447090
X-SVN-Commit-Repository: ports
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Aug 2017 08:59:23 -0000

Author: mat
Date: Wed Aug  2 08:59:21 2017
New Revision: 447090
URL: https://svnweb.freebsd.org/changeset/ports/447090

Log:
  Fix MASTER_SITE_ZI, you cannot use a shorthand in a shorthand.
  
  With the current code, if you use ZI, it will not expand LOCAL/ZI.  It
  would have worked if you use ${MASTER_SITE_ZI} everywhere though.  It'll
  end up trying to fetch from, literally, LOCAL/zi/some-file.tgz.
  
  Sponsored by:	Absolight

Modified:
  head/Mk/bsd.sites.mk   (contents, props changed)

Modified: head/Mk/bsd.sites.mk
==============================================================================
--- head/Mk/bsd.sites.mk	Wed Aug  2 08:50:35 2017	(r447089)
+++ head/Mk/bsd.sites.mk	Wed Aug  2 08:59:21 2017	(r447090)
@@ -1240,7 +1240,7 @@ MASTER_SITE_KERNEL_ORG+= \
 MASTER_SITE_ZI+= \
 	https://mirrors.rit.edu/zi/ \
 	https://blackened.zi0r.com/mirrors/ \
-	LOCAL/zi/
+	${MASTER_SITE_LOCAL:S/%SUBDIR%/zi/}
 .endif
 
 # Macro magic