[pkgsrc/trunk]: pkgsrc/mk/fetch Remove duplicate files from ${ALLFILES}. This...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c7d16283f78
branches:  trunk
changeset: 516196:6c7d16283f78
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Jul 17 02:13:11 2006 +0000

description:
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:

 mk/fetch/fetch.mk |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r 6f8b18f9a635 -r 6c7d16283f78 mk/fetch/fetch.mk
--- a/mk/fetch/fetch.mk Mon Jul 17 02:04:45 2006 +0000
+++ b/mk/fetch/fetch.mk Mon Jul 17 02:13:11 2006 +0000
@@ -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_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__}}