From owner-freebsd-hackers Tue Jan 6 11:28:38 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.7/8.8.7) id LAA12900 for hackers-outgoing; Tue, 6 Jan 1998 11:28:38 -0800 (PST) (envelope-from owner-freebsd-hackers@FreeBSD.ORG) Received: from TomQNX.tomqnx.com (ott-pm6-26.comnet.ca [206.75.140.186]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id LAA12805 for ; Tue, 6 Jan 1998 11:27:55 -0800 (PST) (envelope-from tom@tomqnx.com) Received: from tomqnx.com by TomQNX.tomqnx.com with esmtp (Smail3.2 #1) id m0xpcw1-000A10C; Tue, 6 Jan 1998 12:37:01 -0500 (EST) Message-ID: <34B26BBC.93BAE6EF@tomqnx.com> Date: Tue, 06 Jan 1998 12:37:00 -0500 From: Tom Torrance X-Mailer: Mozilla 4.04 [en] (X11; I; FreeBSD 2.2.5-STABLE i386) MIME-Version: 1.0 To: hackers@FreeBSD.ORG Subject: bsd.port.mk error Content-Type: multipart/mixed; boundary="------------9F31D763851D47CCFE3A16FF" Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk This is a multi-part message in MIME format. --------------9F31D763851D47CCFE3A16FF Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit There is a minor error in bsd.port.mk that makes it difficult to override the existance of a corrupt entry in the cdrom distfiles distribution and force a download of the (single) file. The attached patch fixes the problem. the 'tix' distribution was corrupt on my 2.2.5R cdroms. -- mailto:tomNO@SPAMtomqnx.com Tom Torrance 27 Dayton Cr., Nepean Ont., Canada K2H 7N8 My opinions are personal, and not those of my employer. --------------9F31D763851D47CCFE3A16FF Content-Type: text/plain; charset=us-ascii; name="bsd.port.mk.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="bsd.port.mk.patch" *** /usr/src/share/mk/bsd.port.mk Fri Jan 2 12:47:01 1998 --- bsd.port.mk Tue Jan 6 11:25:43 1998 *************** *** 620,627 **** # Search CDROM first if mounted, symlink instead of copy if # FETCH_SYMLINK_DISTFILES is set .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 .endif --- 620,627 ---- # Search CDROM first if mounted, symlink instead of copy if # FETCH_SYMLINK_DISTFILES is set .if exists(/cdrom/ports/distfiles) ! MASTER_SITES:= file:${PORTSDIR}/distfiles/${DIST_SUBDIR}/ ${MASTER_SITES} ! PATCH_SITES:= file:${PORTSDIR}/distfiles/${DIST_SUBDIR}/ ${PATCH_SITES} .if defined(FETCH_SYMLINK_DISTFILES) FETCH_BEFORE_ARGS+= -l .endif --------------9F31D763851D47CCFE3A16FF--