From owner-freebsd-ports Wed Dec 16 13:40:04 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id NAA16220 for freebsd-ports-outgoing; Wed, 16 Dec 1998 13:40:04 -0800 (PST) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id NAA16161 for ; Wed, 16 Dec 1998 13:40:00 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from Unknown UID 563@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id NAA10148; Wed, 16 Dec 1998 13:40:01 -0800 (PST) Received: from post.mail.demon.net (post-12.mail.demon.net [194.217.242.41]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id NAA16130 for ; Wed, 16 Dec 1998 13:39:24 -0800 (PST) (envelope-from dmlb@ragnet.demon.co.uk) Received: from [158.152.46.40] (helo=ragnet.demon.co.uk) by post.mail.demon.net with smtp (Exim 2.054 #1) id 0zqOew-0006yC-00 for FreeBSD-gnats-submit@freebsd.org; Wed, 16 Dec 1998 21:39:06 +0000 Received: from dmlb by ragnet.demon.co.uk with local (Exim 1.82 #1) id 0zqOe3-0007TM-00; Wed, 16 Dec 1998 21:38:11 +0000 Message-Id: Date: Wed, 16 Dec 1998 21:38:11 +0000 From: dmlb@ragnet.demon.co.uk Reply-To: dmlb@ragnet.demon.co.uk To: FreeBSD-gnats-submit@FreeBSD.ORG Cc: dmlb@ragnet.demon.co.uk X-Send-Pr-Version: 3.2 Subject: ports/9107: Addition to bsd.port.mk for searching multiple CD-ROMs for distfiles Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 9107 >Category: ports >Synopsis: Addition to bsd.port.mk for searching multiple CD-ROMs for distfiles >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Dec 16 13:40:00 PST 1998 >Last-Modified: >Originator: Duncan Barclay >Organization: Fat chance! >Release: FreeBSD 3.0-RELEASE i386 >Environment: Comfortable room, PC and two CDROM drives. >Description: Distfiles for ports on more than one disk, some of us use spare two speed CDs to fill the case up and mount both sets of distfiles. >How-To-Repeat: Open the 2.2.7 CD four pack and see where the distfiles are. >Fix: Patch to bsd.port.mk to search a list of CD_MOUNTPTs. PS. Before I did this I found it useful to build a locate database of all the ports and packages so I know which CDs they are on. Index: bsd.port.mk =================================================================== RCS file: /ide0.e/ncvs/src/share/mk/bsd.port.mk,v retrieving revision 1.300 diff -u -r1.300 bsd.port.mk --- bsd.port.mk 1998/12/12 07:39:30 1.300 +++ bsd.port.mk 1998/12/16 21:30:44 @@ -347,7 +347,7 @@ # (default: see below). # # Note that the install target will automatically add manpages (see -# above) and also substitute special sequences of characters (delimited +D # by "%%") as defined in PLIST_SUB to generate ${TMPPLIST}. For # instance, "OSREL=${OSREL}" in PLIST_SUB causes all occurrences of # "%%OSREL%%" in ${PLIST} to be substituted by the value of OSREL. @@ -856,13 +856,16 @@ # Search CDROM first if mounted, symlink instead of copy if # FETCH_SYMLINK_DISTFILES is set CD_MOUNTPT?= /cdrom -.if exists(${CD_MOUNTPT}/ports/distfiles) -MASTER_SITES:= file:${CD_MOUNTPT}/ports/distfiles/${DIST_SUBDIR}/ ${MASTER_SITES} -PATCH_SITES:= file:${CD_MOUNTPT}/ports/distfiles/${DIST_SUBDIR}/ ${PATCH_SITES} +.for cdrom in ${CD_MOUNTPT} +.if exists(${cdrom}/ports/distfiles) +MASTER_SITES:= file:${cdrom}/ports/distfiles/${DIST_SUBDIR}/ ${MASTER_SITES} +PATCH_SITES:= file:${cdrom}/ports/distfiles/${DIST_SUBDIR}/ ${PATCH_SITES} .if defined(FETCH_SYMLINK_DISTFILES) FETCH_BEFORE_ARGS+= -l +.undef FETCH_SYMLINK_DISTFILES .endif .endif +.endfor # Derived names so that they're easily overridable. DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message