Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Aug 2017 08:59:22 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r447090 - head/Mk
Message-ID:  <201708020859.v728xM0D027246@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708020859.v728xM0D027246>