Date: Tue, 18 Oct 2005 18:18:04 +1000 (EST) From: Edwin Groothuis <edwin@mavetju.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/87605: [patch] bsd.port.mk - add IGNOREFILES variable Message-ID: <20051018081804.E7C00611E@k7.mavetju> Resent-Message-ID: <200510180820.j9I8KI9D015874@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 87605
>Category: ports
>Synopsis: [patch] bsd.port.mk - add IGNOREFILES variable
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 18 08:20:18 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Edwin Groothuis
>Release: FreeBSD 5.2.1-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #8: Wed Dec 15 16:58:01 EST 2004 edwin@k7.mavetju:/usr/src-5.2.1/sys/i386/compile/k7 i386
>Description:
With the improvement of the output of fetch-list (and the
addition of fetch-all-list), one problem showed up: Files which
are normally caught by IGNORE because they shouldn't be fetched
from websites (CD distributed files for example) are showing
up in the list:
$ make fetch-list
[ from master-site-override ]
http://k7.mavetju/distfiles//cxm-20050412.shar
http://k7.mavetju/distfiles//hcwPVRP2.sys
http://k7.mavetju/distfiles//pvr250-1.2.tar.gz
[ from master-sites ]
http://www.mavetju.org/download/adopted/cxm-20050412.shar
http://www.mavetju.org/download/adopted/hcwPVRP2.sys
http://www.mavetju.org/download/adopted/pvr250-1.2.tar.gz
[ from master-site-backup ]
ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/pvr250-1.2.tar.gz
ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/hcwPVRP2.sys
ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/cxm-20050412.shar
The file hcwPVRP2.sys shouldn't be fetched at all:
$ make fetch
===> pvr250-20050412_1 You need the file hcwPVRP2.sys from the CD coming w
With this patch, add hcwPVRP2.sys the variable NOFETCHFILES and it
overcomes this problem:
$ make fetch-list
http://k7.mavetju/distfiles//cxm-20050412.shar
http://k7.mavetju/distfiles//hcwPVRP2.sys
http://k7.mavetju/distfiles//pvr250-1.2.tar.gz
http://www.mavetju.org/download/adopted/cxm-20050412.shar
http://www.mavetju.org/download/adopted/pvr250-1.2.tar.gz
ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/cxm-20050412.shar
ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/pvr250-1.2.tar.gz
You would think, why does it still show up in the MASTER_SITE_OVERRIDE?
If you have a local pool of distfiles, all you have to do is store
the file there for your own happiness.
>How-To-Repeat:
>Fix:
This patch works against a bsd.port.mk patched with ports/86776
--- bsd.port.mk.orig Tue Oct 18 16:37:44 2005
+++ bsd.port.mk Tue Oct 18 17:35:51 2005
@@ -115,6 +115,9 @@
# subdirectory from FreeBSD mirror sites.
# ALLFILES - All of ${DISTFILES} and ${PATCHFILES}.
# IGNOREFILES - If set, don't perform checksum checks on these files.
+# NOFETCHFILES - If set, don't download these files from the ${MASTER_SITES}
+# or ${MASTER_SITE_BACKUP} (but do from
+# ${MASTER_SITE_OVERRIDE})
# EXTRACT_ONLY - If set, a subset of ${DISTFILES} you want to
# actually extract.
#
@@ -2427,6 +2430,8 @@
.endif
.endfor
+NOFETCHFILES?=
+
# Organize DISTFILES, PATCHFILES, _MASTER_SITES_ALL, _PATCH_SITES_ALL
# according to grouping rules (:something)
DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}
@@ -4141,6 +4146,11 @@
SORTED_MASTER_SITES_CMD_TMP="${SORTED_MASTER_SITES_DEFAULT_CMD}" ; \
fi ; \
for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \
+ if [ ! -z "`${ECHO_CMD} ${NOFETCHFILES} | ${GREP} -w $${file}`" ]; then \
+ if [ -z "`${ECHO_CMD} ${MASTER_SITE_OVERRIDE} | ${GREP} -w $${site}`" ]; then \
+ continue; \
+ fi; \
+ fi; \
DIR=${DIST_SUBDIR}; \
CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \
case $${file} in \
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051018081804.E7C00611E>