From owner-freebsd-ports  Fri Oct  1 13:50:13 1999
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 771F314D55
	for <freebsd-ports@FreeBSD.org>; Fri,  1 Oct 1999 13:50:11 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id NAA99849;
	Fri, 1 Oct 1999 13:50:10 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 16CF015280; Fri,  1 Oct 1999 13:40:30 -0700 (PDT)
Message-Id: <19991001204030.16CF015280@hub.freebsd.org>
Date: Fri,  1 Oct 1999 13:40:30 -0700 (PDT)
From: jeremy@external.org
To: freebsd-gnats-submit@freebsd.org
X-Send-Pr-Version: www-1.0
Subject: ports/14080: CD #4 Distfiles location doesn't match bsd.port.mk
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         14080
>Category:       ports
>Synopsis:       CD #4 Distfiles location doesn't match bsd.port.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct  1 13:50:00 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Jeremy Shaffner
>Release:        3.3-RELEASE
>Organization:
JORSM Internet
>Environment:
FreeBSD indigo.external.org 3.3-RELEASE FreeBSD 3.3-RELEASE #0: Thu Sep 16 23:40:35 GMT 1999     jkh@highwing.cdrom.com:/usr/src/sys/compile/GENERIC  i386

>Description:
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.
>How-To-Repeat:

>Fix:
If /distfiles is where they are meant to stay, then /usr/ports/Mk/bsd.port.mk needs to be changed:


--- 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



>Release-Note:
>Audit-Trail:
>Unformatted:


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