diff options
| author | schmonz <schmonz> | 2006-07-17 02:13:11 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2006-07-17 02:13:11 +0000 |
| commit | 44bf6d6a9f7b24b2644349a1899cfb0d8d60d9be (patch) | |
| tree | 266c0d32922bdf4fce6a84df754c0f23a3992696 /mk/fetch | |
| parent | d4040133667933b8de141c31d74189fe5c474c94 (diff) | |
| download | pkgsrc-44bf6d6a9f7b24b2644349a1899cfb0d8d60d9be.tar.gz | |
Remove duplicate files from ${ALLFILES}. This doesn't affect the
"fetch" target, but it does affect the "checksum" target's shell
script, which errors out on the second occurrence of a file. The
shell script should perhaps also be fixed, but it seems sensible
regardless for ${ALLFILES} not to contain duplicate filenames. As
a side effect, the file list is sorted.
Regression found by building mail/qmail with the "qmail-netqmail"
option, which adds to PATCHFILES a file that's already in ${DISTFILES}.
Arguably this is gross, but it worked before, and now works again.
Tested on my usual pkg_comp(8) build of 200+ packages, with an
initially empty ${DISTDIR} and ${PACKAGES}. Thanks seb@ for the
more idiomatic make(1) construction.
Diffstat (limited to 'mk/fetch')
| -rw-r--r-- | mk/fetch/fetch.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk index 04724f2cf6c..eb8e72c2f77 100644 --- a/mk/fetch/fetch.mk +++ b/mk/fetch/fetch.mk @@ -1,4 +1,4 @@ -# $NetBSD: fetch.mk,v 1.8 2006/07/15 23:58:52 rillig Exp $ +# $NetBSD: fetch.mk,v 1.9 2006/07/17 02:13:11 schmonz Exp $ ###################################################################### ### fetch (PUBLIC) @@ -21,6 +21,7 @@ _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} MASTER_SITE_LOCAL?= ${MASTER_SITE_BACKUP:=LOCAL_PORTS/} ALLFILES?= ${DISTFILES} ${PATCHFILES} +ALLFILES:= ${ALLFILES:O:u} # remove duplicates CKSUMFILES?= ${ALLFILES} .for __tmp__ in ${IGNOREFILES} CKSUMFILES:= ${CKSUMFILES:N${__tmp__}} |