From owner-freebsd-ports  Wed Jan 27 05:41:14 1999
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id FAA16007
          for freebsd-ports-outgoing; Wed, 27 Jan 1999 05:41:14 -0800 (PST)
          (envelope-from owner-freebsd-ports@FreeBSD.ORG)
Received: from vader.cs.berkeley.edu (vader.CS.Berkeley.EDU [128.32.38.234])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id FAA16002
          for <ports@FreeBSD.ORG>; Wed, 27 Jan 1999 05:41:11 -0800 (PST)
          (envelope-from asami@vader.cs.berkeley.edu)
Received: from silvia.hip.berkeley.edu (sji-ca13-237.ix.netcom.com [209.109.238.237]) by vader.cs.berkeley.edu (8.8.7/8.7.3) with ESMTP id FAA01790; Wed, 27 Jan 1999 05:41:09 -0800 (PST)
Received: (from asami@localhost) by silvia.hip.berkeley.edu (8.9.1/8.6.9) id FAA65870; Wed, 27 Jan 1999 05:41:06 -0800 (PST)
Date: Wed, 27 Jan 1999 05:41:06 -0800 (PST)
Message-Id: <199901271341.FAA65870@silvia.hip.berkeley.edu>
To: fenner@parc.xerox.com
CC: ports@FreeBSD.ORG, fenner@parc.xerox.com
In-reply-to: <199901270752.XAA21526@mango.parc.xerox.com> (message from Bill
	Fenner on Tue, 26 Jan 1999 23:52:00 PST)
Subject: Re: ${MASTER_SITE_GNU} reorganization
From: asami@FreeBSD.ORG (Satoshi Asami)
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

 * devel/prc-tools:	Tries to fetch multiple tools (like gcc and
 * 			binutils) from ${MASTER_SITE_GNU}; now that
 * 			these are in subdirectories, this doesn't
 * 			work.

 * I don't have any brilliant ideas for prc-tools or crosssco.  The one

Will something like this work?

===
Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.303
diff -u -r1.303 bsd.port.mk
--- bsd.port.mk	1999/01/26 03:58:58	1.303
+++ bsd.port.mk	1999/01/27 13:34:44
@@ -842,13 +842,19 @@
 MASTER_SITES?=
 PATCH_SITES?=
 
-# To avoid double-slashes
+# Default
 MASTER_SITE_SUBDIR?=	.
 PATCH_SITE_SUBDIR?=	.
 
 # Substitute subdirectory names
-MASTER_SITES:=	${MASTER_SITES:S/%SUBDIR%/${MASTER_SITE_SUBDIR}/}
-PATCH_SITES:=	${PATCH_SITES:S/%SUBDIR%/${PATCH_SITE_SUBDIR}/}
+.for dir in ${MASTER_SITE_SUBDIR}
+MASTER_SITES_TMP+=	${MASTER_SITES:S^%SUBDIR%^${dir}^}
+.endfor
+MASTER_SITES:=	${MASTER_SITES_TMP}
+.for dir in ${PATCH_SITE_SUBDIR}
+PATCH_SITES_TMP+=	${PATCH_SITES:S^%SUBDIR%^${dir}^}
+.endfor
+PATCH_SITES:=	${PATCH_SITES_TMP}
 
 # The primary backup site.
 MASTER_SITE_BACKUP?=	\
Index: devel/crosssco/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/crosssco/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	1998/10/10 04:25:03	1.5
+++ Makefile	1999/01/27 13:19:17
@@ -11,6 +11,7 @@
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cygnus.com/pub/newlib/	\
 		${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	binutils gcc
 DISTFILES=	newlib-1.8.1.tar.gz	\
 		binutils-2.8.1.tar.gz	\
 		${DISTNAME}.tar.gz
===

Granted, it's very noisy while fetch tries all the possibilities but
there are only a couple that need this anyway.

Satoshi

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message