summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>1998-12-19 16:52:23 +0000
committerMarc Espie <espie@cvs.openbsd.org>1998-12-19 16:52:23 +0000
commite93b18a4c2cd4d243fc0e0cdba4d77400411d2cc (patch)
tree901dd271f8b672c09ada0ca4fa4d760f2e091615
parentb511c997037164c113af9b911ab6f8d6e7a432d9 (diff)
avoid aliasing between MASTER_SITES and PATCH_SITES, e.g.,
MASTER_SITES=some_sites PATCH_SITES=${MASTER_SITES} MASTER_SITE_SUBDIR=one_dir PATCH_SITE_SUBDIR=second_dir now works
-rw-r--r--share/mk/bsd.port.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index c58f8095297..568985f092d 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -1,6 +1,6 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4
-# $OpenBSD: bsd.port.mk,v 1.56 1998/12/18 12:00:46 form Exp $
+# $OpenBSD: bsd.port.mk,v 1.57 1998/12/19 16:52:22 espie Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@@ -31,7 +31,7 @@ NetBSD_MAINTAINER= agc@netbsd.org
# NEED_VERSION: we need at least this version of bsd.port.mk for this
# port to build
-FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.56 1998/12/18 12:00:46 form Exp $$
+FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.57 1998/12/19 16:52:22 espie Exp $$
.if defined(NEED_VERSION)
VERSION_REVISION=${FULL_REVISION:M[0-9]*.*}
@@ -781,8 +781,9 @@ MASTER_SITES?=
PATCH_SITES?=
# Substitute subdirectory names
-MASTER_SITES:= ${MASTER_SITES:S/%SUBDIR%/${MASTER_SITE_SUBDIR}/}
+_MASTER_SITES:= ${MASTER_SITES:S/%SUBDIR%/${MASTER_SITE_SUBDIR}/}
PATCH_SITES:= ${PATCH_SITES:S/%SUBDIR%/${PATCH_SITE_SUBDIR}/}
+MASTER_SITES:= ${_MASTER_SITES}
# Two backup master sites, First one at ftp.openbsd.org
#