- clean up SDIR (temporary directory) creation

- improve munging of NetBSD.dist and METALOG into metalog, using mtree to
  "cleanup" / "merge" entries, and don't sort the result.
  relies upon mtree to not change the order (see below)
- use (newly added) join.awk to output lines in metalog that are listed
  in flist.${set}.  join.awk doesn't require either file to be sorted
  (unlike join(1)), which is required because we want to retain the
  order of the metalog, because certain entries in the metalog (such
  as hard links) make assumptions about the permissions of earlier entries.
  this should fix [toolchain/16207]

distrib/sets/join.awk

@@ -0,0 +1,53 @@
+#	$NetBSD: join.awk,v 1.1 2002/04/13 12:47:10 lukem Exp $
+#
+# Copyright (c) 2002 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Luke Mewburn of Wasabi Systems.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# join.awk F1 F2
+#	Similar to join(1), this reads a list of words from F1
+#	and outputs lines in F2 with a first word that is in F1.
+#	Neither file needs to be sorted
+
+BEGIN \
+{
+	if (ARGC != 3) {
+		printf("Usage: join file1 file2\n") >"/dev/stderr";
+		exit 1;
+	}
+	while ( (getline < ARGV[1]) > 0)
+		words[$1]++;
+	delete ARGV[1];
+}
+
+$1 in words { print; }

distrib/sets/maketars

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: maketars,v 1.22 2002/04/08 17:18:23 tron Exp $
+# $NetBSD: maketars,v 1.23 2002/04/13 12:47:10 lukem Exp $
 #
 # Make release tar files for some or all lists.  Usage:
 # maketars [-b] [-x] [-a arch] [-m machine] [-s setsdir]
@@ -103,18 +103,19 @@ SDIR_SERIAL=0
 while true; do
 	SDIR=${SDIR_BASE}.${SDIR_SERIAL}
 	mkdir -m 0700 ${SDIR} && break
-    SDIR_SERIAL=`expr ${SDIR_SERIAL} + 1`
+	SDIR_SERIAL=$((${SDIR_SERIAL} + 1))
 done    
 
 trap "/bin/rm -rf $SDIR ; exit 0" 0 2 3 13		# EXIT INT QUIT PIPE
 
 if [ -n "$metalog" ]; then
 	echo "parsing $metalog"
-	${MTREE} -D -k all -N ${DESTDIR}/etc \
-	    -f ${DESTDIR}/etc/mtree/NetBSD.dist | \
-	    sed -e 's,\(.*\) \(\..*\),\2 \1,' > $SDIR/metadirs
-	sed -e "s,^\.$dest,.," < $metalog > $SDIR/metafiles
-	cat $SDIR/metadirs $SDIR/metafiles | sort -u > $SDIR/metalog
+	(
+		cat ${DESTDIR}/etc/mtree/NetBSD.dist
+		echo "/unset all"
+		sed -e "s,^\.$dest,.," < $metalog
+	) | ${MTREE} -D -k all -N ${DESTDIR}/etc | \
+	    sed -e 's,\(.*\) \(\..*\),\2 \1,' > $SDIR/metalog
 fi
 
 GZIP=-9			# for pax -z
@@ -129,8 +130,10 @@ for setname in $lists; do
 	if [ -n "$metalog" ]; then
 		awk -f getdirs.awk $SDIR/flist.$setname | sort -u \
 		    > $SDIR/flist.full
-		echo "/set uname=root gname=wheel" > $SDIR/plist.$setname
-		join $SDIR/flist.full $SDIR/metalog >> $SDIR/plist.$setname
+		(
+			echo "/set uname=root gname=wheel"
+			awk -f join.awk $SDIR/flist.full $SDIR/metalog
+		) > $SDIR/plist.$setname
 	else
 		mv $SDIR/flist.$setname $SDIR/plist.$setname
 	fi