diff options
author | fredb <fredb@pkgsrc.org> | 2002-03-04 19:41:03 +0000 |
---|---|---|
committer | fredb <fredb@pkgsrc.org> | 2002-03-04 19:41:03 +0000 |
commit | 2f53857f2953490ab3cb2552a7d6cefe67b70c7e (patch) | |
tree | 81fb74e21b3de2fbc9c29841caa4eb46bf038535 /mk/bsd.pkg.subdir.mk | |
parent | 6c0548753f3ed5dbdd6b29b3a77cc5f78eeb7e08 (diff) | |
download | pkgsrc-2f53857f2953490ab3cb2552a7d6cefe67b70c7e.tar.gz |
Generalize the handling for packages where "fetch" and "fetch-list"
only emit a message and don't actually fetch anything. This allows
us to make the output of "fetch-list" for these packages consistent
with other packages.
While we're in here, integrate DYNAMIC_MASTER_SITES with the
${ORDERED_SITES} macro. The only functional change here is that
${MASTER_SITE_OVERRIDE} is now respected. Still to do -- something
appropriate for "fetch-list" for these packages, like sourcing
"getsites.sh" into the generated script. (Well, "package", but there
are two others that do something similar in their "Makefile".)
Also eliminate the misbegotten _FETCH_ALLFILES macro -- now that only
"fetch" uses it, move it's functionality directly under "do-fetch".
Diffstat (limited to 'mk/bsd.pkg.subdir.mk')
-rw-r--r-- | mk/bsd.pkg.subdir.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mk/bsd.pkg.subdir.mk b/mk/bsd.pkg.subdir.mk index b64fc7366ba..cf76fdaddbb 100644 --- a/mk/bsd.pkg.subdir.mk +++ b/mk/bsd.pkg.subdir.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.subdir.mk,v 1.46 2002/02/28 14:42:39 fredb Exp $ +# $NetBSD: bsd.pkg.subdir.mk,v 1.47 2002/03/04 19:41:05 fredb Exp $ # Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 # @@ -236,6 +236,7 @@ fetch-list: } \ /^[^#=]/ { FoundSomething = 1 } \ /^unsorted/ { gsub(/[[:space:]]+/, " \\\n\t") } \ + /^echo/ { gsub(/;[[:space:]]+/, "\n") } \ !/^=/ { block[c++] = $$0 } \ /^=/ { do_block() } \ END { do_block() } \ |