Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Dec 1998 21:38:11 +0000
From:      dmlb@ragnet.demon.co.uk
To:        FreeBSD-gnats-submit@FreeBSD.ORG
Cc:        dmlb@ragnet.demon.co.uk
Subject:   ports/9107: Addition to bsd.port.mk for searching multiple CD-ROMs for distfiles
Message-ID:  <E0zqOe3-0007TM-00@ragnet.demon.co.uk>

next in thread | raw e-mail | index | archive | help

>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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E0zqOe3-0007TM-00>