From fc190877e55413a14d285dcac043d2b76a6660f9 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 22 Feb 2000 14:07:09 +0000
Subject: [PATCH] Compute CKSUMFILES in two steps, use that to remove
 duplicates from ALLFILES as well...

---
 infrastructure/mk/bsd.port.mk | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk
index 59067b17df4..16000408876 100644
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.208 2000/02/22 09:27:52 turan Exp $$
+FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.209 2000/02/22 14:07:09 espie Exp $$
 #	$FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
 #	$NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
 #
@@ -847,13 +847,20 @@ ALLFILES+= ${SUPDISTFILES:C/:[0-9]$//}
 .  endif
 .endif
 
-# Build CKSUMFILES incrementally from ALLFILES, avoiding duplicates
 CKSUMFILES=
-.for __file in ${ALLFILES}
-.  if empty(CKSUMFILES:M${__file}) && (!defined(IGNOREFILES) || empty(IGNOREFILES:M${__file}))
-CKSUMFILES+= ${__file}
+# First, remove duplicates
+.for _file in ${ALLFILES}
+.  if empty(CKSUMFILES:M${_file})
+CKSUMFILES+=${_file}
 .  endif
 .endfor
+ALLFILES:=${CKSUMFILES}
+
+.if defined(IGNOREFILES)
+.  for _file in ${IGNOREFILES}
+CKSUMFILES:=${CKSUMFILES:N${_file}}
+.  endfor
+.endif
 
 # List of all files, with ${DIST_SUBDIR} in front.  Used for checksum.
 .if defined(DIST_SUBDIR)