diff --git a/distrib/sets/listpkgs b/distrib/sets/listpkgs
index 3c062fc85828..274f02c9786a 100755
--- a/distrib/sets/listpkgs
+++ b/distrib/sets/listpkgs
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: listpkgs,v 1.7 2003/12/29 03:13:25 lukem Exp $
+# $NetBSD: listpkgs,v 1.8 2004/01/03 02:38:58 lukem Exp $
 #
 # List all packages in the given pkgset by parsing the list files.
 #
@@ -13,8 +13,8 @@ usage()
 {
 	cat 1>&2 <<USAGE
 Usage: ${0##*/} [-a arch] [-m machine] [-s setsdir] [-p prefix] setname
-	-a arch		set arch (e.g, m68k, mips, powerpc)	[$machine_arch]
-	-m machine	set machine (e.g, amiga, i386, macppc)	[$machine]
+	-a arch		set arch (e.g, m68k, mips, powerpc)	[$MACHINE_ARCH]
+	-m machine	set machine (e.g, amiga, i386, macppc)	[$MACHINE]
 	-s setsdir	directory to find sets			[$setsdir]
 	setname set to list packages for
 USAGE
@@ -25,11 +25,11 @@ USAGE
 while getopts a:m:s: ch; do
 	case ${ch} in
 	a)
-		machine_arch=${OPTARG}
-		machine_cpu=$(arch_to_cpu ${OPTARG})
+		MACHINE_ARCH=${OPTARG}
+		MACHINE_CPU=$(arch_to_cpu ${OPTARG})
 		;;
 	m)
-		machine=${OPTARG}
+		MACHINE=${OPTARG}
 		;;
 	s)
 		setsdir=${OPTARG}
diff --git a/distrib/sets/makeflist b/distrib/sets/makeflist
index 7cfab9ce5a82..68d6fb290127 100755
--- a/distrib/sets/makeflist
+++ b/distrib/sets/makeflist
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeflist,v 1.67 2003/12/29 03:13:25 lukem Exp $
+# $NetBSD: makeflist,v 1.68 2004/01/03 02:38:58 lukem Exp $
 #
 # Print out the files in some or all lists.
 # Usage: makeflist [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...]
@@ -17,8 +17,8 @@ Usage: ${0##*/} [-b] [-x] [-o] [-a arch] [-m machine] [-s setsdir]
 	-b		print netbsd + x11 lists
 	-x		print make x11 lists
 	-o		only match obsolete files
-	-a arch		set arch (e.g, m68k, mipseb, mipsel, powerpc) [$machine_arch]
-	-m machine	set machine (e.g, amiga, i386, macppc) [$machine]
+	-a arch		set arch (e.g, m68k, mipseb, mipsel, powerpc) [$MACHINE_ARCH]
+	-m machine	set machine (e.g, amiga, i386, macppc) [$MACHINE]
 	-s setsdir	directory to find sets [$setsdir]
 	[setname [...]]	sets to build [$lists]
 USAGE
@@ -38,11 +38,11 @@ while getopts bxoa:m:s: ch; do
 		obsolete=1
 		;;
 	a)
-		machine_arch=${OPTARG}
-		machine_cpu=$(arch_to_cpu ${OPTARG})
+		MACHINE_ARCH=${OPTARG}
+		MACHINE_CPU=$(arch_to_cpu ${OPTARG})
 		;;
 	m)
-		machine=${OPTARG}
+		MACHINE=${OPTARG}
 		;;
 	s)
 		setsdir=${OPTARG}
diff --git a/distrib/sets/makeobsolete b/distrib/sets/makeobsolete
index b31da772b16c..89c0d80354b3 100755
--- a/distrib/sets/makeobsolete
+++ b/distrib/sets/makeobsolete
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeobsolete,v 1.22 2003/12/29 03:13:25 lukem Exp $
+# $NetBSD: makeobsolete,v 1.23 2004/01/03 02:38:58 lukem Exp $
 #
 # Print out the obsolete files for a set
 # Usage: makeobsolete [-b] [-x] [-a arch] [-m machine] [-s setsdir] \
@@ -18,8 +18,8 @@ usage()
 Usage: ${0##*/} [-a arch] [-m machine] [-s setsdir] [setname ...]
 	-b		make netbsd + x11 lists
 	-x 		only make x11 lists
-	-a arch		set arch (e.g, m68k, mips, powerpc)	[$machine_arch]
-	-m machine	set machine (e.g, amiga, i386, macppc)	[$machine]
+	-a arch		set arch (e.g, m68k, mips, powerpc)	[$MACHINE_ARCH]
+	-m machine	set machine (e.g, amiga, i386, macppc)	[$MACHINE]
 	-s setsdir	directory to find sets	[$setd]
 	-t target	target directory [$target]
 	[setname ...] 	sets to build
@@ -36,11 +36,11 @@ while getopts bxa:m:s:t: ch; do
 		lists="$xlists"
 		;;
 	a)
-		machine_arch=${OPTARG}
-		machine_cpu=$(arch_to_cpu ${OPTARG})
+		MACHINE_ARCH=${OPTARG}
+		MACHINE_CPU=$(arch_to_cpu ${OPTARG})
 		;;
 	m)
-		machine=${OPTARG}
+		MACHINE=${OPTARG}
 		;;
 	s)
 		setsdir=${OPTARG}
diff --git a/distrib/sets/makeplist b/distrib/sets/makeplist
index 7e14a43ec944..7ed1827d3cf8 100755
--- a/distrib/sets/makeplist
+++ b/distrib/sets/makeplist
@@ -11,8 +11,8 @@ usage()
 {
 	cat 1>&2 <<USAGE
 Usage: ${0##*/} [-a arch] [-m machine] [-s setsdir] [-p prefix] setname pkgname
-	-a arch		set arch (e.g, m68k, mips, powerpc)	[$machine_arch]
-	-m machine	set machine (e.g, amiga, i386, macppc)	[$machine]
+	-a arch		set arch (e.g, m68k, mips, powerpc)	[$MACHINE_ARCH]
+	-m machine	set machine (e.g, amiga, i386, macppc)	[$MACHINE]
 	-s setsdir	directory to find sets			[$setsdir]
 	-p prefix	prefix for created plist		[$prefix]
 	setname pkgname	set and package to build plist for
@@ -24,11 +24,11 @@ USAGE
 while getopts a:m:ps: ch; do
 	case ${ch} in
 	a)
-		machine_arch=${OPTARG}
-		machine_cpu=$(arch_to_cpu ${OPTARG})
+		MACHINE_ARCH=${OPTARG}
+		MACHINE_CPU=$(arch_to_cpu ${OPTARG})
 		;;
 	m)
-		machine=${OPTARG}
+		MACHINE=${OPTARG}
 		;;
 	p)
 		prefix=${OPTARG}
diff --git a/distrib/sets/maketars b/distrib/sets/maketars
index 0493c9144aea..4bcc855d44c2 100755
--- a/distrib/sets/maketars
+++ b/distrib/sets/maketars
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: maketars,v 1.47 2003/12/29 03:13:25 lukem Exp $
+# $NetBSD: maketars,v 1.48 2004/01/03 02:38:58 lukem Exp $
 #
 # Make release tar files for some or all lists.  Usage:
 # maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@@ -38,8 +38,8 @@ Usage: ${prog} [-b] [-x] [-i idir] [-a arch] [-m machine] [-s setsdir]
 	-b		make netbsd + x11 lists
 	-x		only make x11 lists
 	-i idir		install sets to idir instead of creating tar files
-	-a arch		set arch (e.g, m68k, mipseb, mipsel, powerpc) [$machine_arch]
-	-m machine	set machine (e.g, amiga, i386, macppc) [$machine]
+	-a arch		set arch (e.g, m68k, mipseb, mipsel, powerpc) [$MACHINE_ARCH]
+	-m machine	set machine (e.g, amiga, i386, macppc) [$MACHINE]
 	-s setsdir	directory to find sets [$setsdir]
 	-M metalog	metalog file
 	-N etcdir	etc dir for metalog use [$dest/etc]
@@ -63,11 +63,11 @@ while getopts bxi:a:m:s:M:N:d:t: ch; do
 		installdir=${OPTARG}
 		;;
 	a)
-		machine_arch=${OPTARG}
-		machine_cpu=$(arch_to_cpu ${OPTARG})
+		MACHINE_ARCH=${OPTARG}
+		MACHINE_CPU=$(arch_to_cpu ${OPTARG})
 		;;
 	m)
-		machine=${OPTARG}
+		MACHINE=${OPTARG}
 		;;
 	s)
 		setsdir=${OPTARG}
@@ -147,7 +147,7 @@ for setname in $lists; do
 		fi
 		echo "Creating $out"
 	fi
-	${HOST_SH} $setsdir/makeflist -a $machine_arch -m $machine \
+	${HOST_SH} $setsdir/makeflist -a $MACHINE_ARCH -m $MACHINE \
 	    -s $setsdir $setname > $SDIR/flist.$setname
 	if [ -n "$metalog" ]; then
 		awk -f getdirs.awk $SDIR/flist.$setname | sort -u \
diff --git a/distrib/sets/sets.subr b/distrib/sets/sets.subr
index 66c132e0b955..3cf95906bddc 100644
--- a/distrib/sets/sets.subr
+++ b/distrib/sets/sets.subr
@@ -1,46 +1,42 @@
-#	$NetBSD: sets.subr,v 1.10 2003/12/29 20:54:58 jmc Exp $
+#	$NetBSD: sets.subr,v 1.11 2004/01/03 02:38:58 lukem Exp $
 #
 
 #
-# Set environment variables containing defaults for sets.subr
-# functions and callers:
+# The following variables contain defaults for sets.subr functions and callers:
 #	setsdir			path to src/distrib/sets
 #	nlists			list of base sets
 #	xlists			list of x11 sets
 #	obsolete		controls if obsolete files are selected instead
-#	have_gcc3		<bsd.own.mk> ${HAVE_GCC3}
 #	lkm			if != "no", enable LKM sets
-#	machine			<bsd.own.mk> ${MACHINE}
-#	machine_arch		<bsd.own.mk> ${MACHINE_ARCH}
-#	machine_cpu		<bsd.own.mk> ${MACHINE_CPU}
-#	mkkerberos		<bsd.own.mk> ${MKKERBEROS}
-#	mkkerberos4		<bsd.own.mk> ${MKKERBEROS4}
-#	mklint			<bsd.own.mk> ${MKLINT}
-#	object_fmt		<bsd.own.mk> ${OBJECT_FMT}
 #	shlib			shared library format (a.out, elf, or "")
 #	stlib			static library format (a.out, elf)
-#	toolchain_missing	<bsd.own.mk> ${TOOLCHAIN_MISSING}
-#	use_tools_toolchain	<bsd.own.mk> ${USE_TOOLS_TOOLCHAIN}
 #	x11_version		version of XF86 (3 or 4)
+#
+# The following <bsd.own.mk> variables are exported to the environment:
+#	MACHINE	
+#	MACHINE_ARCH
+#	MACHINE_CPU
+#	HAVE_GCC3
+#	TOOLCHAIN_MISSING
+#	OBJECT_FMT
+#	MKKERBEROS
+#	MKKERBEROS4
+#	MKLINT
+#	MKSENDMAIL
 
 oIFS=$IFS
 IFS="
 "
 for x in $(
-${MAKE:-make} -B -f- all <<EOF
+${MAKE:-make} -B -f- all <<'EOF'
 .include <bsd.own.mk>
 all:
-	@echo have_gcc3=\${HAVE_GCC3}
-	@echo machine=\${MACHINE}
-	@echo machine_arch=\${MACHINE_ARCH}
-	@echo machine_cpu=\${MACHINE_CPU}
-	@echo mkkerberos4=\${MKKERBEROS4}
-	@echo mkkerberos=\${MKKERBEROS}
-	@echo mklint=\${MKLINT}
-	@echo object_fmt=\${OBJECT_FMT}
-	@echo toolchain_missing=\${TOOLCHAIN_MISSING}
-	@echo use_tools_toolchain=\${USE_TOOLS_TOOLCHAIN}
-.if defined(USE_XF86_4) && (\${USE_XF86_4} != no)
+.for i in MACHINE MACHINE_ARCH MACHINE_CPU \
+		HAVE_GCC3 OBJECT_FMT TOOLCHAIN_MISSING \
+		MKKERBEROS MKKERBEROS4 MKLINT MKSENDMAIL
+	@echo "export $i=${$i}"
+.endfor
+.if defined(USE_XF86_4) && (${USE_XF86_4} != "no")
 	@echo x11_version=4
 .else
 	@echo x11_version=3
@@ -48,6 +44,7 @@ all:
 
 EOF
 ); do
+#	echo 1>&2 "DEBUG: read $x"
 	eval $x
 done
 IFS=$oIFS
@@ -61,17 +58,17 @@ case $x11_version in
 esac
 obsolete=0
 lkm=yes
-if [ "$machine" = "evbppc" ]; then
+if [ "${MACHINE}" = "evbppc" ]; then
 	lkm=no				# Turn off LKMs for some ports.
 fi
 # Determine lib type.
-if [ "$object_fmt" = "ELF" ]; then
+if [ "${OBJECT_FMT}" = "ELF" ]; then
 	shlib=elf
 else
 	shlib=aout
 fi
 stlib=$shlib
-if [ "$machine_cpu" = "sh3" -o "$machine_arch" = "m68000" ]; then
+if [ "${MACHINE_CPU}" = "sh3" -o "${MACHINE_ARCH}" = "m68000" ]; then
 	shlib=no			# Turn off shlibs for some ports.
 fi
 
@@ -83,7 +80,7 @@ fi
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-# 	# $NetBSD: sets.subr,v 1.10 2003/12/29 20:54:58 jmc Exp $
+# 	# $NetBSD: sets.subr,v 1.11 2004/01/03 02:38:58 lukem Exp $
 # 	.			base-sys-root	[keyword[,...]]
 # 	./altroot		base-sys-root
 # 	./bin			base-sys-root
@@ -100,9 +97,10 @@ fi
 # control if a record is printed; every keyword listed must be enabled
 # for the record to be printed.  The following keywords are available:
 #	dummy			dummy entry (ignored)
-#	kerberos4		<bsd.own.mk> ${MKKERBEROS4} != no
 #	kerberos		<bsd.own.mk> ${MKKERBEROS} != no
+#	kerberos4		<bsd.own.mk> ${MKKERBEROS4} != no
 #	lint			<bsd.own.mk> ${MKLINT} != no
+#	sendmail		<bsd.own.mk> ${MKSENDMAIL} != no
 #	obsolete		file is obsolete, and only printed if 
 #				${obsolete} != 0
 #
@@ -111,14 +109,10 @@ list_set_files()
 	for setname; do
 		list_set_lists $setname
 	done | xargs cat | \
-	env \
-	    MKKERBEROS4=${mkkerberos4} \
-	    MKKERBEROS=${mkkerberos} \
-	    MKLINT=${mklint} \
-	    awk -v obsolete=${obsolete} '
+	awk -v obsolete=${obsolete} '
 		BEGIN {
 			if (! obsolete) {
-				split("kerberos4 kerberos lint",
+				split("kerberos4 kerberos lint sendmail",
 				    needvars)
 				for (vi in needvars) {
 					nv = needvars[vi]
@@ -171,11 +165,11 @@ list_set_files()
 # For a given setname $set, the following files may be selected from
 # .../list/$set:
 #	mi
-#	ad.${machine_arch}
-# (or)	ad.${machine_cpu}
-#	ad.${machine_cpu}.shl
-#	md.${machine}.${machine_arch}
-# (or)	md.${machine}
+#	ad.${MACHINE_ARCH}
+# (or)	ad.${MACHINE_CPU}
+#	ad.${MACHINE_CPU}.shl
+#	md.${MACHINE}.${MACHINE_ARCH}
+# (or)	md.${MACHINE}
 #	stl.mi
 #	stl.stlib
 #	shl.mi
@@ -186,10 +180,10 @@ list_set_files()
 #	tc.mi
 #	tc.shl
 #	rescue.shl
-#	rescue.${machine}
-#	rescue.ad.${machine_arch}
-# (or)	rescue.ad.${machine_cpu}
-# 	rescue.ad.${machine_cpu}.shl
+#	rescue.${MACHINE}
+#	rescue.ad.${MACHINE_ARCH}
+# (or)	rescue.ad.${MACHINE_CPU}
+# 	rescue.ad.${MACHINE_CPU}.shl
 #
 # Environment:
 # 	shlib
@@ -201,24 +195,24 @@ list_set_lists()
 
 	setdir=$setsdir/lists/$setname
 	echo $setdir/mi
-	if [ "$machine" != "$machine_arch" ]; then
-		# Prefer an ad.${machine_arch} over an ad.${machine_cpu},
+	if [ "${MACHINE}" != "${MACHINE_ARCH}" ]; then
+		# Prefer an ad.${MACHINE_ARCH} over an ad.${MACHINE_CPU},
 		# since the arch-specific one will be more specific than
 		# the cpu-specific one.
-		if [ -f $setdir/ad.${machine_arch} ]; then
-			echo $setdir/ad.${machine_arch}
-		elif [ -f $setdir/ad.${machine_cpu} ]; then
-			echo $setdir/ad.${machine_cpu}
+		if [ -f $setdir/ad.${MACHINE_ARCH} ]; then
+			echo $setdir/ad.${MACHINE_ARCH}
+		elif [ -f $setdir/ad.${MACHINE_CPU} ]; then
+			echo $setdir/ad.${MACHINE_CPU}
 		fi
 		if [ "$shlib" != "no" -a \
-		     -f $setdir/ad.${machine_cpu}.shl ]; then
-			echo $setdir/ad.${machine_cpu}.shl
+		     -f $setdir/ad.${MACHINE_CPU}.shl ]; then
+			echo $setdir/ad.${MACHINE_CPU}.shl
 		fi
 	fi
-	if [ -f $setdir/md.${machine}.${machine_arch} ]; then
-		echo $setdir/md.${machine}.${machine_arch}
-	elif [ -f $setdir/md.${machine} ]; then
-		echo $setdir/md.${machine}
+	if [ -f $setdir/md.${MACHINE}.${MACHINE_ARCH} ]; then
+		echo $setdir/md.${MACHINE}.${MACHINE_ARCH}
+	elif [ -f $setdir/md.${MACHINE} ]; then
+		echo $setdir/md.${MACHINE}
 	fi
 	if [ -f $setdir/stl.mi ]; then
 		echo $setdir/stl.mi
@@ -239,8 +233,8 @@ list_set_lists()
 			echo $setdir/lkm.mi
 		fi
 	fi
-	if [ "$toolchain_missing" != "yes" ]; then
-		if [ "$have_gcc3" = "yes" ]; then
+	if [ "${TOOLCHAIN_MISSING}" != "yes" ]; then
+		if [ "${HAVE_GCC3}" = "yes" ]; then
 			if [ -f $setdir/gcc.mi ]; then
 				echo $setdir/gcc.mi
 			fi
@@ -264,29 +258,29 @@ list_set_lists()
 	if [ -f $setdir/rescue.mi ]; then
 		echo $setdir/rescue.mi
 	fi
-	if [ -f $setdir/rescue.${machine} ]; then
-		echo $setdir/rescue.${machine}
+	if [ -f $setdir/rescue.${MACHINE} ]; then
+		echo $setdir/rescue.${MACHINE}
 	fi
-	if [ "$machine" != "$machine_arch" ]; then
-		# Prefer a rescue.ad.${machine_arch} over a
-		# rescue.ad.${machine_cpu}, since the arch-
+	if [ "${MACHINE}" != "${MACHINE_ARCH}" ]; then
+		# Prefer a rescue.ad.${MACHINE_ARCH} over a
+		# rescue.ad.${MACHINE_CPU}, since the arch-
 		# specific one will be more specific than the
 		# cpu-specific one.
-		if [ -f $setdir/rescue.ad.${machine_arch} ]; then
-			echo $setdir/rescue.ad.${machine_arch}
-		elif [ -f $setdir/rescue.ad.${machine_cpu} ]; then
-			echo $setdir/rescue.ad.${machine_cpu}
+		if [ -f $setdir/rescue.ad.${MACHINE_ARCH} ]; then
+			echo $setdir/rescue.ad.${MACHINE_ARCH}
+		elif [ -f $setdir/rescue.ad.${MACHINE_CPU} ]; then
+			echo $setdir/rescue.ad.${MACHINE_CPU}
 		fi
 		if [ "$shlib" != "no" -a \
-		     -f $setdir/rescue.ad.${machine_cpu}.shl ]; then
-			echo $setdir/rescue.ad.${machine_cpu}.shl
+		     -f $setdir/rescue.ad.${MACHINE_CPU}.shl ]; then
+			echo $setdir/rescue.ad.${MACHINE_CPU}.shl
 		fi
 	fi
 }
 
 # arch_to_cpu mach
 #
-# Print the $MACHINE_CPU for $MACHINE_ARCH=mach,
+# Print the ${MACHINE_CPU} for ${MACHINE_ARCH}=mach,
 # as determined by <bsd.own.mk>.
 #
 arch_to_cpu()
diff --git a/distrib/sets/syspkgdeps b/distrib/sets/syspkgdeps
index 48591e063bb7..e309d90c1797 100755
--- a/distrib/sets/syspkgdeps
+++ b/distrib/sets/syspkgdeps
@@ -22,8 +22,8 @@ usage()
 {
 	cat 1>&2 <<USAGE
 Usage: ${0##*/} [-a arch] [-m machine] [-s setsdir] [-p prefix] setname [...]
-	-a arch		set arch (e.g, m68k, mips, powerpc)	[$machine_arch]
-	-m machine	set machine (e.g, amiga, i386, macppc)	[$machine]
+	-a arch		set arch (e.g, m68k, mips, powerpc)	[$MACHINE_ARCH]
+	-m machine	set machine (e.g, amiga, i386, macppc)	[$MACHINE]
 	-s setsdir	directory to find sets			[$setsdir]
 	-p prefix	prefix for created plist		[$prefix]
 	setname [...]	sets to find dependencies for
@@ -35,11 +35,11 @@ USAGE
 while getopts a:m:ps: ch; do
 	case ${ch} in
 	a)
-		machine_arch=${OPTARG}
-		machine_cpu=$(arch_to_cpu ${OPTARG})
+		MACHINE_ARCH=${OPTARG}
+		MACHINE_CPU=$(arch_to_cpu ${OPTARG})
 		;;
 	m)
-		machine=${OPTARG}
+		MACHINE=${OPTARG}
 		;;
 	p)
 		prefix=${OPTARG}