From owner-freebsd-ports Fri Oct 1 11:31:43 1999 Delivered-To: freebsd-ports@freebsd.org Received: from mercury.jorsm.com (mercury.jorsm.com [207.112.128.9]) by hub.freebsd.org (Postfix) with ESMTP id B703315190; Fri, 1 Oct 1999 11:31:37 -0700 (PDT) (envelope-from jer@jorsm.com) Received: from localhost (jer@localhost) by mercury.jorsm.com (8.8.7/8.8.7) with SMTP id NAA06329; Fri, 1 Oct 1999 13:31:36 -0500 (CDT) Date: Fri, 1 Oct 1999 13:31:34 -0500 (CDT) From: Jeremy Shaffner To: freebsd-ports@freebsd.org Cc: freebsd-stable@freebsd.org Subject: Distfiles location Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org 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. --- Mk/bsd.port.mk.orig Thu Sep 30 20:05:00 1999 +++ Mk/bsd.port.mk Thu Sep 30 20:06:20 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 -=========================================================================- Jeremy Shaffner JORSM Internet, Regional Internet Services System Administrator 7 Area Codes in Chicagoland and NW Indiana jer@jorsm.com 100Mbps+ Connectivity, 56K-DS3, V.90, ISDN support@jorsm.com Quality Service, Affordable Prices http://www.jorsm.com Serving Gov, Biz, Indivds Since 1995 -=========================================================================- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message