Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/build.sh,v
rcsdiff: /ftp/cvs/cvsroot/src/build.sh,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.171.4.1
retrieving revision 1.171.4.2
diff -u -p -r1.171.4.1 -r1.171.4.2
--- src/build.sh	2007/11/06 23:07:12	1.171.4.1
+++ src/build.sh	2008/01/09 01:19:18	1.171.4.2
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.171.4.1 2007/11/06 23:07:12 matt Exp $
+#	$NetBSD: build.sh,v 1.171.4.2 2008/01/09 01:19:18 matt Exp $
 #
 # Copyright (c) 2001-2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -337,7 +337,7 @@ getarch()
 		MACHINE_ARCH=powerpc64
 		;;
 
-	amigappc|bebox|evbppc|ibmnws|macppc|mvmeppc|ofppc|prep|sandpoint)
+	amigappc|bebox|evbppc|ibmnws|macppc|mvmeppc|ofppc|prep|rs6000|sandpoint)
 		MACHINE_ARCH=powerpc
 		;;
 
@@ -499,7 +499,7 @@ usage()
 	fi
 	cat <<_usage_
 
-Usage: ${progname} [-EnorUux] [-a arch] [-B buildid] [-C cddir] [-D dest]
+Usage: ${progname} [-EnorUux] [-a arch] [-B buildid] [-C cdextras] [-D dest]
 		[-j njob] [-M obj] [-m mach] [-N noisy] [-O obj] [-R release]
 		[-T tools] [-V var=[value]] [-w wrapper] [-X x11src] [-Z var]
 		operation [...]
@@ -525,13 +525,12 @@ Usage: ${progname} [-EnorUux] [-a arch] 
     syspkgs             Create syspkgs in RELEASEDIR/MACHINE/binary/syspkgs.
     iso-image           Create CD-ROM image in RELEASEDIR/iso.
     iso-image-source    Create CD-ROM image with source in RELEASEDIR/iso.
-    iso-dir=cddir       Add the contents of \`cddir' to a CD-ROM image.
     params              Display various make(1) parameters.
 
  Options:
     -a arch     Set MACHINE_ARCH to arch.  [Default: deduced from MACHINE]
     -B buildId  Set BUILDID to buildId.
-    -C cddir    Set CDEXTRA to cddir.
+    -C cdextras Set CDEXTRA to cdextras
     -D dest     Set DESTDIR to dest.  [Default: destdir.MACHINE]
     -E          Set "expert" mode; disables various safety checks.
                 Should not be used without expert knowledge of the build system.
@@ -1096,21 +1095,26 @@ createmakewrapper()
 	eval cat <<EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.171.4.1 2007/11/06 23:07:12 matt Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.171.4.2 2008/01/09 01:19:18 matt Exp $
 # with these arguments: ${_args}
 #
+
 EOF
-	for f in ${makeenv}; do
-		if eval "[ -z \"\${$f}\" -a \"\${${f}-X}\" = \"X\" ]"; then
-			eval echo "unset ${f}" ${makewrapout}
-		else
-			eval echo "${f}=\'\$$(echo ${f})\'\;\ export\ ${f}" ${makewrapout}
-		fi
-	done
+	{
+		for f in ${makeenv}; do
+			if eval "[ -z \"\${$f}\" -a \"\${${f}-X}\" = \"X\" ]"; then
+				eval echo "unset ${f}"
+			else
+				eval echo "${f}=\'\$$(echo ${f})\'\;\ export\ ${f}"
+			fi
+		done
 
-	eval cat <<EOF ${makewrapout}
+		eval cat <<EOF
 MAKEWRAPPERMACHINE=${makewrappermachine:-${MACHINE}}; export MAKEWRAPPERMACHINE
 USETOOLS=yes; export USETOOLS
+EOF
+	} | eval sort -u "${makewrapout}"
+	eval cat <<EOF "${makewrapout}"
 
 exec "\${TOOLDIR}/bin/${toolprefix}make" \${1+"\$@"}
 EOF