 @@ -1,16 +1,16 @@
 #!/bin/sh
+#
-# $NetBSD: postinstall,v 1.76.2.1 2008/11/27 03:42:00 snj Exp $
+# $NetBSD: postinstall,v 1.76.2.2 2008/12/06 22:06:26 snj Exp $
+#
 # Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Luke Mewburn.
+#
 # 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
 @@ -582,26 +582,58 @@ contents_owner()
 			msg \
     "${_dir} and contents not all owned by ${_user}:${_grp}"
 			return 1
 		else
 			return 0
 		fi
 	elif [ "${_op}" = "fix" ]; then
 		find "${_dir}" \( \( ! -user "${_user}" \) -o \
 		\( ! -group "${_grp}" \) \) -a -print0 \
 		| xargs -0 chown "${_user}:${_grp}"
 	fi
+}
 # get_makevar var [var ...]
 #	Retrieve the value of a user-settable system make variable
 get_makevar()
+{
 	$SOURCEMODE || err 3 "get_makevar must be used in source mode"
 	[ $# -eq 0 ] && err 3 "USAGE: get_makevar var [var ...]"
 	for _var in "$@"; do
 		_value="$(echo '.include <bsd.own.mk>' | \
 		    ${MAKE:-make} -f - -V "${_var}")"
 		eval ${_var}=\"${_value}\"
 	done
+}
 # detect_x11
 #	Detect if X11 components should be analysed and set values of
 #	relevant variables.
 detect_x11()
+{
 	if $SOURCEMODE; then
 		get_makevar MKX11 X11ROOTDIR
 	else
 		if [ -f "${SRC_DIR}/etc/mtree/set.xetc" ]; then
 			MKX11=yes
 			X11ROOTDIR=/this/value/isnt/used/yet
 		else
 			MKX11=no
 			X11ROOTDIR=
 		fi
 	fi
+}
+#
 #	items
 #	-----
+#
+#
 #	bluetooth
+#
 additem bluetooth "bluetooth configuration is up to date"
 do_bluetooth()
+{
 	[ -n "$1" ] || err 3 "USAGE: do_bluetooth fix|check"
 @@ -889,58 +921,82 @@ do_postfix()
 	return ${failed}
+}
+#
 #	rc
+#
 additem rc "/etc/rc* and /etc/rc.d/ being up to date"
 do_rc()
+{
 	[ -n "$1" ] || err 3 "USAGE: do_rc  fix|check"
 	op="$1"
 	failed=0
 	generated_scripts=""
 	if [ "${MKX11}" != "no" ]; then
 		generated_scripts="${generated_scripts} xdm xfs"
 	fi
 	compare_dir "${op}" "${SRC_DIR}/etc" "${DEST_DIR}/etc" 644 \
 		rc rc.subr rc.shutdown
 	failed=$(( ${failed} + $? ))
 	if ! $SOURCEMODE; then
 		extra_scripts="${generated_scripts}"
 	else
 		extra_scripts=""
 	fi
 	compare_dir "${op}" "${SRC_DIR}/etc/rc.d" "${DEST_DIR}/etc/rc.d" 555 \
 		DAEMON LOGIN NETWORKING SERVERS \
 		accounting altqd amd apmd \
 		bootconf.sh bootparams btattach btconfig btdevctl bthcid \
 		ccd cgd cleartmp cron \
 		dhclient dhcpd dhcrelay dmesg downinterfaces envsys \
 		fsck ftp_proxy ftpd \
 		hostapd \
 		identd ifwatchd inetd ipfilter ipfs ipmon ipnat ipsec \
 		irdaattach iscsi_target isdnd \
 		kdc \
 		ldconfig lkm1 lkm2 lkm3 local lpd \
 		mixerctl mopd motd mountall mountcritlocal mountcritremote \
 		mountd moused mrouted \
 		named ndbootd network newsyslog nfsd nfslocking ntpd ntpdate \
 		perusertmp pf pf_boot pflogd poffd postfix powerd ppp pwcheck \
 		quota \
 		racoon rpcbind raidframe raidframeparity rarpd rbootd root \
 		route6d routed rtadvd rtclocaltime rtsold rwho \
 		savecore screenblank sdpd securelevel sshd \
 		staticroute swap1 swap2 sysctl sysdb syslogd \
 		timed tpctl ttys \
 		veriexec virecover wdogctl wpa_supplicant wscons wsmoused \
-		xdm xfs \
+		ypbind yppasswdd ypserv \
-		ypbind yppasswdd ypserv
+		${extra_scripts}
 	failed=$(( ${failed} + $? ))
 	if $SOURCEMODE && [ -n "${generated_scripts}" ]; then
 		# generate scripts
 		mkdir "${SCRATCHDIR}/rc"
 		for f in ${generated_scripts}; do
 			sed -e "s,@X11ROOTDIR@,${X11ROOTDIR},g" \
 			    < "${SRC_DIR}/etc/rc.d/${f}.in" \
 			    > "${SCRATCHDIR}/rc/${f}"
 		done
 		compare_dir "${op}" "${SCRATCHDIR}/rc" \
 		    "${DEST_DIR}/etc/rc.d" 555 \
 		    ${generated_scripts}
 		failed=$(( ${failed} + $? ))
 	fi
 		# check for obsolete rc.d files
 	for f in NETWORK btcontrol btuartd fsck.sh kerberos nfsiod servers \
 	    systemfs daemon gated login portmap sunndd xntpd; do
 		fd="/etc/rc.d/${f}"
 		[ -e "${DEST_DIR}${fd}" ] && echo "${fd}"
 	done | obsolete_paths "${op}"
 	failed=$(( ${failed} + $? ))
 		# check for obsolete rc.conf(5) variables
 	set --	amd amd_master \
 		btcontrol btcontrol_devices \
 		critical_filesystems critical_filesystems_beforenet \
 		defcorename \
 @@ -1418,26 +1474,28 @@ EOF
 	[ -n "${MACHINE}" ]	|| err 2 "\${MACHINE} is not defined"
 	[ -n "${MACHINE_ARCH}" ] || err 2 "\${MACHINE_ARCH} is not defined"
 	if ! $SOURCEMODE && ! [ -f "${SRC_DIR}/etc/mtree/set.etc" ]; then
 		err 2 "Files from the etc.tgz set are missing"
 	fi
 		# If directories are /, clear them, so various messages
 		# don't have leading "//".   However, this requires
 		# the use of ${foo:-/} to display the variables.
+		#
 	[ "${SRC_DIR}" = "/" ]	&& SRC_DIR=""
 	[ "${DEST_DIR}" = "/" ]	&& DEST_DIR=""
 	detect_x11
 	op="$1"
 	shift
 	case "${op}" in
 	diff)
 		op=check
 		DIFF_STYLE=n			# default style is RCS
 		OPTIND=1
 		while getopts bcenpuw ch; do
 			case "${ch}" in
 			c|e|n|u)
 				if [ "${DIFF_STYLE}" != "n" -a \
 				    "${DIFF_STYLE}" != "${ch}" ]; then