Date: Fri, 1 Oct 1999 13:40:30 -0700 (PDT) From: jeremy@external.org To: freebsd-gnats-submit@freebsd.org Subject: ports/14080: CD #4 Distfiles location doesn't match bsd.port.mk Message-ID: <19991001204030.16CF015280@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19991001204030.16CF015280>