From owner-freebsd-ports  Sat Oct  2  1:46:33 1999
Delivered-To: freebsd-ports@freebsd.org
Received: from vader.cs.berkeley.edu (vader.CS.Berkeley.EDU [128.32.38.234])
	by hub.freebsd.org (Postfix) with ESMTP
	id 52D1014C48; Sat,  2 Oct 1999 01:46:29 -0700 (PDT)
	(envelope-from asami@stampede.cs.berkeley.edu)
Received: from silvia.hip.berkeley.edu (silvia [209.111.213.92])
	by vader.cs.berkeley.edu (8.9.3/8.9.3) with ESMTP id BAA19347;
	Sat, 2 Oct 1999 01:46:24 -0700 (PDT)
	(envelope-from asami@stampede.cs.berkeley.edu)
Received: (from asami@localhost) by silvia.hip.berkeley.edu (8.9.3/8.6.9) id BAA46558; Sat, 2 Oct 1999 01:46:18 -0700 (PDT)
To: John Reynolds~ <jreynold@sedona.ch.intel.com>
Cc: Jeremy Shaffner <jer@jorsm.com>, freebsd-ports@freebsd.org,
	jkh@freebsd.org
Subject: Re: Distfiles location
References: <Pine.BSF.3.95q.991001132933.17417D-100000@mercury.jorsm.com> <14325.6327.948569.217245@hip186.ch.intel.com>
From: asami@freebsd.org (Satoshi - Ports Wraith - Asami)
Date: 02 Oct 1999 01:46:15 -0700
In-Reply-To: John Reynolds~'s message of "Fri, 1 Oct 1999 13:25:27 -0700 (MST)"
Message-ID: <vqc670qp2ug.fsf@silvia.hip.berkeley.edu>
Lines: 33
X-Mailer: Gnus v5.7/Emacs 20.4
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

 * From: John Reynolds~ <jreynold@sedona.ch.intel.com>

 * [ On Friday, October 1, Jeremy Shaffner wrote: ]
 * > 
 * > Now that distfiles are on disk4 in /cdrom/distfiles instead of
 * > /cdrom/ports/distfiles, the bsd.port.mk can't fetch them if disk4 is
 * > mounted.
 * > 
 * 
 * I think your mailer wrapped lines. Try this:

Ouch.  Jordan, is this true?

 * --- bsd.port.mk.orig    Fri Oct  1 13:24:05 1999
 * +++ bsd.port.mk Fri Oct  1 13:23:51 1999
 * @@ -1007,9 +1007,9 @@
 *  # 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}
 * +.if exists(${CD_MOUNTPT}/distfiles)
 * +MASTER_SITES:= file:${CD_MOUNTPT}/distfiles/${DIST_SUBDIR}/ ${MASTER_SITES}
 * +PATCH_SITES:=  file:${CD_MOUNTPT}/distfiles/${DIST_SUBDIR}/ ${PATCH_SITES}
 *  .if defined(FETCH_SYMLINK_DISTFILES)
 *  FETCH_BEFORE_ARGS+=    -l
 *  .endif

Since we have old CDs floating around, I don't think we can change it
outright, but I can add both paths to try.

Satoshi


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