 @@ -64,26 +64,29 @@ FILES
      tools/         ``Reachover'' build structure for the host build tools.
                     This has a special method of determining out-of-date sta-
                     tus.
      bin/ ... usr.sbin/
                     Sources to the NetBSD userland (non-kernel) programs.  If
                     any of these directories are missing, they will be skipped
                     during the build.
      x11/           ``Reachover'' build structure for X11R6; the source is in
                     X11SRCDIR.
      extsrc/        ``Reachover'' build structure for externally added programs
                     and libraries; the source is in EXTSRCSRCDIR.
    Build tree layout
      The NetBSD build tree is described in hier(7), and the release layout is
      described in release(7).
 CONFIGURATION
    Environment variables
      Several environment variables control the behaviour of NetBSD builds.
      HOST_SH           Path name to a POSIX-compliant shell.  If this is not
                        set explicitly, then the default is set using heuris-
                        tics dependent on the host platform, or from the shell
                        under which build.sh is executed (if that can be deter-
                        mined), or using the first copy of sh found in PATH.
 @@ -154,26 +157,33 @@ CONFIGURATION
                  their default use of the host system's /usr/include,
                  /usr/lib, and so forth.  This pathname must be an absolute
                  path, and should not end with a slash (/) character.  (For
                  installation into the system's root directory, set DESTDIR to
                  an empty string, not to ``/'').  The directory must reside on
                  a file system which supports long file names and hard links.
                  Default: Empty string if USETOOLS is ``yes''; unset other-
                  wise.
                  Note: build.sh will provide a default of destdir.MACHINE (in
                  the top-level .OBJDIR) unless run in `expert' mode.
      EXTSRCSRCDIR
 		 Directory containing sources of externally added programs
 		 and libraries.  If specified, must be an absolute path.
                  Default: NETBSDRCDIR/../extsrc, if that exists; otherwise
                  /usr/extsrc.
      MAKECONF    The name of the make(1) configuration file.  Only settable in
                  the process environment.
                  Default: ``/etc/mk.conf''
      MAKEVERBOSE
                  Level of verbosity of status messages.  Supported values:
 No descriptive messages or commands executed by make(1)
                       are shown.
 Brief messages are shown describing what is being done,
                       but the actual commands executed by make(1) are not dis-
 @@ -202,26 +212,31 @@ CONFIGURATION
                  graphic code will be included in a build; provided for the
                  benefit of countries that do not allow strong cryptography.
                  Will not affect use of the standard low-security password
                  encryption system, crypt(3).
                  Default: ``yes''
      MKDOC       Can be set to ``yes'' or ``no''.  Indicates whether system
                  documentation destined for DESTDIR/usr/share/doc will be
                  installed during a build.
                  Default: ``yes''
      MKEXTSRC    Can be set to ``yes'' or ``no''.  Indicates whether extsrc is
                  built from EXTSRCSRCDIR.
                  Default: ``no''
      MKHTML      Can be set to ``yes'' or ``no''.  Indicates whether prefor-
                  matted HTML manual pages will be built and installed
                  Default: ``yes''
      MKHOSTOBJ   Can be set to ``yes'' or ``no''.  If set to ``yes'', then for
                  programs intended to be run on the compile host, the name,
                  release, and architecture of the host operating system will
                  be suffixed to the name of the object directory created by
                  ``make obj''.  (This allows multiple host systems to compile
                  NetBSD for a single target.)  If set to ``no'', then programs
                  built to be run on the compile host will use the same object
                  directory names as programs built to be run on the target.
 @@ -864,26 +879,33 @@ BUILDING
                tion, specified by wrapper.  This allows, for instance, to
                place the wrapper in PATH automatically.  Note that wrapper is
                the full name of the file, not just a directory name.  If a
                relative path is specified, it will be converted to an absolute
                path before being used.
      -X x11src
                Set the value of X11SRCDIR to x11src.  If a relative path is
                specified, it will be converted to an absolute path before
                being used.
      -x        Set MKX11=yes.
      -Y extsrcsrc
                Set the value of EXTSRCSRCDIR to extsrcsrc.  If a relative path is
                specified, it will be converted to an absolute path before
                being used.
      -y        Set MKEXTSRC=yes.
      -Z var    Unset ("zap") the environment variable var.  This is propagated
                to the nbmake wrapper.
    The "nbmake-MACHINE" wrapper script
      If using the build.sh script to build NetBSD, a nbmake-MACHINE script
      will be created in TOOLDIR/bin upon the first build to assist in building
      subtrees on a cross-compile host.
      nbmake-MACHINE can be invoked in lieu of make(1), and will instead call
      the up-to-date version of ``nbmake'' installed into TOOLDIR/bin with sev-
      eral key variables pre-set, including MACHINE, MACHINE_ARCH, and TOOLDIR.
      nbmake-MACHINE will also set variables specified with -V, and unset vari-
      ables specified with -Z.

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.274 2009/09/04 17:21:33 pooka Exp $
+#	$NetBSD: Makefile,v 1.275 2009/11/30 16:13:22 uebayasi Exp $
+#
 # This is the top-level makefile for building NetBSD. For an outline of
 # how to build a snapshot or release, as well as other release engineering
 # information, see http://www.NetBSD.org/developers/releng/index.html
+#
 # Not everything you can set or do is documented in this makefile. In
 # particular, you should review the files in /usr/share/mk (especially
 # bsd.README) for general information on building programs and writing
 # Makefiles within this structure, and see the comments in src/etc/Makefile
 # for further information on installation and release set options.
+#
 # Variables listed below can be set on the make command line (highest
 @@ -98,26 +98,27 @@
 #   do-sys-modules:  builds and installs kernel modules (used by rump binaries)
 #   do-ld.so:        builds and installs prerequisites from libexec/ld.*_so.
 #   do-compat-lib-csu: builds and installs prerequisites from compat/lib/csu
 #                    if ${MKCOMPAT} != "no".
 #   do-compat-libgcc: builds and installs prerequisites from
 #                    compat/gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and
 #                    compat/gnu/lib/libgcc${LIBGCC_EXT} if ${MKCOMPAT} != "no".
 #   do-compat-lib-libc: builds and installs prerequisites from compat/lib/libc
 #                    if ${MKCOMPAT} != "no".
 #   do-build:        builds and installs the entire system.
 #   do-x11:          builds and installs X11 if ${MKX11} != "no"; either
 #                    X11R7 from src/external/mit/xorg if ${X11FLAVOUR} == "Xorg"
 #                    or X11R6 from src/x11
 #   do-extsrc:       builds and installs extsrc if ${MKEXTSRC} != "no".
 #   do-obsolete:     installs the obsolete sets (for the postinstall-* targets).
+#
 .if ${.MAKEFLAGS:M${.CURDIR}/share/mk} == ""
 .MAKEFLAGS: -m ${.CURDIR}/share/mk
 .endif
+#
 # If _SRC_TOP_OBJ_ gets set here, we will end up with a directory that may
 # not be the top level objdir, because "make obj" can happen in the *middle*
 # of "make build" (long after <bsd.own.mk> is calculated it).  So, pre-set
 # _SRC_TOP_OBJ_ here so it will not be added to ${.MAKEOVERRIDES}.
+#
 @@ -242,26 +243,29 @@ BUILDTARGETS+=	do-lib do-gnu-lib do-exte
 BUILDTARGETS+=	do-sys-modules
 .endif
 BUILDTARGETS+=	do-sys-rump-dev-lib do-sys-rump-fs-lib do-sys-rump-net-lib
 .if ${MKCOMPAT} != "no"
 BUILDTARGETS+=	do-compat-lib-csu
 BUILDTARGETS+=	do-compat-libgcc
 BUILDTARGETS+=	do-compat-lib-libc
 .endif
 BUILDTARGETS+=	do-ld.so
 BUILDTARGETS+=	do-build
 .if ${MKX11} != "no"
 BUILDTARGETS+=	do-x11
 .endif
 .if ${MKEXTSRC} != "no"
 BUILDTARGETS+=	do-extsrc
 .endif
 BUILDTARGETS+=	do-obsolete
+#
 # Enforce proper ordering of some rules.
+#
 .ORDER:		${BUILDTARGETS}
 includes-lib:	.PHONY includes-include includes-sys
 includes-gnu:	.PHONY includes-lib
+#
 # Build the system and install into DESTDIR.
+#
 @@ -472,26 +476,34 @@ do-build: .PHONY .MAKE
 do-x11: .PHONY .MAKE
 .if ${MKX11} != "no"
 .if ${X11FLAVOUR} == "Xorg"
 	${MAKEDIRTARGET} external/mit/xorg build
 .else
 	${MAKEDIRTARGET} x11 build
 .endif
 .else
 	@echo "MKX11 is not enabled"
 	@false
 .endif
 do-extsrc: .PHONY .MAKE
 .if ${MKEXTSRC} != "no"
 	${MAKEDIRTARGET} extsrc build
 .else
 	@echo "MKEXTSRC is not enabled"
 	@false
 .endif
 do-obsolete: .PHONY .MAKE
 	${MAKEDIRTARGET} etc install-obsolete-lists
+#
 # Speedup stubs for some subtrees that don't need to run these rules.
 # (Tells <bsd.subdir.mk> not to recurse for them.)
+#
 .for dir in bin etc distrib games libexec regress sbin usr.sbin tools
 includes-${dir}: .PHONY
 	@true
 .endfor
 .for dir in etc distrib regress

 @@ -1,15 +1,15 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.221 2009/11/24 13:39:07 pooka Exp $
+#	$NetBSD: build.sh,v 1.222 2009/11/30 16:13:22 uebayasi Exp $
+#
 # Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Todd Vierling and 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
 @@ -540,27 +540,28 @@ resolvepath()
+}
 usage()
+{
 	if [ -n "$*" ]; then
 		echo ""
 		echo "${progname}: $*"
 	fi
 	cat <<_usage_
 Usage: ${progname} [-EnorUux] [-a arch] [-B buildid] [-C cdextras]
                 [-D dest] [-j njob] [-M obj] [-m mach] [-N noisy]
                 [-O obj] [-R release] [-S seed] [-T tools]
-                [-V var=[value]] [-w wrapper] [-X x11src] [-Z var]
+                [-V var=[value]] [-w wrapper] [-X x11src] [-Y extsrcsrc]
                 [-Z var]
                 operation [...]
  Build operations (all imply "obj" and "tools"):
     build               Run "make build".
     distribution        Run "make distribution" (includes DESTDIR/etc/ files).
     release             Run "make release" (includes kernels & distrib media).
  Other operations:
     help                Show this message and exit.
     makewrapper         Create ${toolprefix}make-\${MACHINE} wrapper and ${toolprefix}make.
                         Always performed.
     cleandir            Run "make cleandir".  [Default unless -u is used]
     obj                 Run "make obj".  [Default unless -o is used]
 @@ -608,35 +609,38 @@ Usage: ${progname} [-EnorUux] [-a arch]
     -r          Remove contents of TOOLDIR and DESTDIR before building.
     -S seed     Set BUILDSEED to seed.  [Default: NetBSD-majorversion]
     -T tools    Set TOOLDIR to tools.  If unset, and TOOLDIR is not set in
                 the environment, ${toolprefix}make will be (re)built unconditionally.
     -U          Set MKUNPRIVED=yes; build without requiring root privileges,
                 install from an UNPRIVED build with proper file permissions.
     -u          Set MKUPDATE=yes; do not run "make cleandir" first.
                 Without this, everything is rebuilt, including the tools.
     -V v=[val]  Set variable \`v' to \`val'.
     -w wrapper  Create ${toolprefix}make script as wrapper.
                 [Default: \${TOOLDIR}/bin/${toolprefix}make-\${MACHINE}]
     -X x11src   Set X11SRCDIR to x11src.  [Default: /usr/xsrc]
     -x          Set MKX11=yes; build X11 from X11SRCDIR
     -Y extsrcsrc
                 Set EXTSRCSRCDIR to extsrcsrc.  [Default: /usr/extsrc]
     -y          Set MKEXTSRC=yes; build extsrc from EXTSRCSRCDIR
     -Z v        Unset ("zap") variable \`v'.
 _usage_
 	exit 1
+}
 parseoptions()
+{
-	opts='a:B:C:D:Ehj:M:m:N:nO:oR:rS:T:UuV:w:xX:Z:'
+	opts='a:B:C:D:Ehj:M:m:N:nO:oR:rS:T:UuV:w:xX:yY:Z:'
 	opt_a=no
 	if type getopts >/dev/null 2>&1; then
 		# Use POSIX getopts.
+		#
 		getoptcmd='getopts ${opts} opt && opt=-${opt}'
 		optargcmd=':'
 		optremcmd='shift $((${OPTIND} -1))'
 	else
 		type getopt >/dev/null 2>&1 ||
 		    bomb "/bin/sh shell is too old; try ksh or bash"
 		# Use old-style getopt(1) (doesn't handle whitespace in args).
 @@ -787,26 +791,35 @@ parseoptions()
 			eval ${optargcmd}; resolvepath OPTARG
 			makewrapper="${OPTARG}"
 			;;
 		-X)
 			eval ${optargcmd}; resolvepath OPTARG
 			setmakeenv X11SRCDIR "${OPTARG}"
 			;;
 		-x)
 			setmakeenv MKX11 yes
 			;;
 		-Y)
 			eval ${optargcmd}; resolvepath OPTARG
 			setmakeenv EXTSRCSRCDIR "${OPTARG}"
 			;;
 		-y)
 			setmakeenv MKEXTSRC yes
 			;;
 		-Z)
 			eval ${optargcmd}
 		    # XXX: consider restricting which variables can be unset?
 			unsetmakeenv "${OPTARG}"
 			;;
 		--)
 			break
 			;;
 		-'?'|-h)
 			usage
 			;;
 @@ -1313,27 +1326,27 @@ createmakewrapper()
 	else
 		makewrapout=">>\${makewrapper}"
 	fi
 	case "${KSH_VERSION:-${SH_VERSION}}" in
 	*PD\ KSH*|*MIRBSD\ KSH*)
 		set +o braceexpand
 		;;
 	esac
 	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.221 2009/11/24 13:39:07 pooka Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.222 2009/11/30 16:13:22 uebayasi Exp $
 # with these arguments: ${_args}
+#
 EOF
+	{
 		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

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.70 2009/09/19 07:09:54 snj Exp $
+#	$NetBSD: Makefile,v 1.71 2009/11/30 16:13:23 uebayasi Exp $
 # The `all' target must appear before bsd.own.mk is pulled in.
 all:
 	@echo "Please understand what you are doing, first."
 	@false
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 GREP?= grep
 SETSCMD=	cd ${.CURDIR} && \
 		DESTDIR=${DESTDIR:Q} \
 		MACHINE=${MACHINE:Q} MACHINE_ARCH=${MACHINE_ARCH:Q} \
 @@ -16,32 +16,39 @@ SETSCMD=	cd ${.CURDIR} && \
 		CKSUM=${TOOL_CKSUM:Q} \
 		DB=${TOOL_DB:Q} \
 		HOST_SH=${HOST_SH:Q} \
 		MAKE=${MAKE:Q} \
 		MKTEMP=${TOOL_MKTEMP:Q} \
 		MTREE=${TOOL_MTREE:Q} \
 		PAX=${TOOL_PAX:Q} \
 		SED=${TOOL_SED:Q} \
 		TSORT=${TSORT:Q} \
 		${HOST_SH}
 MAKETARS_FLAGS=
 .if ${MKX11} != "no"
-MAKEFLIST_FLAGS=	-b
+MAKESRCTARS_X11_FLAGS=	-x ${X11SRCDIR}
-MAKESRCTARS_FLAGS=	-x ${X11SRCDIR} -N ${NETBSDSRCDIR}/etc
+.endif
-.else
+.if ${MKEXTSRC} != "no"
-MAKEFLIST_FLAGS=
+MAKESRCTARS_EXTSRC_FLAGS=	-y ${EXTSRCSRCDIR}
-MAKESRCTARS_FLAGS= 	-N ${NETBSDSRCDIR}/etc
+.endif
 .if ${MKX11} != "no"
 MAKEFLIST_X11_FLAGS=	,x
 .endif
 .if ${MKEXTSRC} != "no"
 MAKEFLIST_EXTSRC_FLAGS=	,ext
 .endif
 MAKEFLIST_FLAGS=	-L base${MAKEFLIST_X11_FLAGS}${MAKEFLIST_EXTSRC_FLAGS}
 MAKESRCTARS_FLAGS= 	-N ${NETBSDSRCDIR}/etc
 .if ${MAKEVERBOSE} < 2
 MAKETARS_FLAGS+=	-q
 MAKESRCTARS_FLAGS+= 	-q
 .endif
 .if !defined(MAKETARSETS)
 MAKETARSETS!= ${SETSCMD} ./makeflist -l ${MAKEFLIST_FLAGS}
 .endif
 print_have_gcc: .PHONY
 	@echo ${HAVE_GCC}
 @@ -112,26 +119,29 @@ clean_METALOG: .PHONY ${METALOG}.sanitis
+#
 # This target has debugging value only, really.
 makeflist: .PHONY .PRECIOUS check_DESTDIR
 	${SETSCMD} ./makeflist ${MAKEFLIST_FLAGS}
 checkflist: .PRECIOUS .PHONY check_DESTDIR sanitise_METALOG
 	${SETSCMD} ${.CURDIR}/checkflist \
 	    ${MAKEFLIST_FLAGS} ${CHECKFLIST_FLAGS} ${METALOG.unpriv}
 checkflist-x11: .PHONY check_DESTDIR
 	${SETSCMD} ./checkflist -x ${CHECKFLIST_FLAGS}
 checkflist-extsrc: .PHONY check_DESTDIR
 	${SETSCMD} ./checkflist -y ${CHECKFLIST_FLAGS}
 .if defined(DESTDIR) && ${DESTDIR} != ""
 checkflist_if_DESTDIR: checkflist
 .else
 checkflist_if_DESTDIR:
 .endif
+#
 # SET BUILDING TARGETS
+#
 TARDIR=		${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
 SOURCETARDIR=	${RELEASEDIR}/source/sets
 @@ -175,26 +185,27 @@ makesetfiles: .PHONY sanitise_METALOG
 do-${tar}: .PHONY sanitise_METALOG
 	${_MKMSG_CREATE} "${tar}.tgz"
 	${SETSCMD} ./maketars -d ${DESTDIR:S,^$,/,} ${MAKETARS_FLAGS} \
 	    ${METALOG.unpriv} \
 	    -N ${NETBSDSRCDIR}/etc -t ${TARDIR} ${tar} \
 	|| { rm -f ${TARDIR}/${tar}.tgz; false; }
 .endfor
 makesrctars: .PRECIOUS .PHONY check_RELEASEDIR
 	${_MKMSG_CREATE} "source tar files"
 	mkdir -p ${SOURCETARDIR}
 	${SETSCMD} ./makesrctars ${MAKESRCTARS_FLAGS} \
 	    ${MAKESRCTARS_X11_FLAGS} ${MAKESRCTARS_EXTSRC_FLAGS} \
 	    ${NETBSDSRCDIR} ${SOURCETARDIR}
 makesums: .PRECIOUS .PHONY check_RELEASEDIR .WAIT \
 		${MAKETARSETS:@.TARS.@do-sum-${.TARS.}@}
 	for i in MD5 SHA512; do \
 		mv ${TARDIR}/$$i.tmp ${TARDIR}/$$i; \
 	done
 .for tar in ${MAKETARSETS}
 do-sum-${tar}: .PHONY do-${tar}
 	${_MKMSG_CREATE} "${tar} checksums"
 	${MAKESUMS} -t ${TARDIR} ${tar}.tgz

 @@ -1,16 +1,16 @@
 #! /bin/sh --
+#
-#	$NetBSD: checkflist,v 1.34 2009/04/23 09:30:56 apb Exp $
+#	$NetBSD: checkflist,v 1.35 2009/11/30 16:13:23 uebayasi Exp $
+#
 # Verify output of makeflist against contents of ${DESTDIR} and ${metalog}.
 if [ -z "${DESTDIR}" ]; then
 	echo "DESTDIR must be set"
 	exit 1
 fi
 prog="${0##*/}"
 rundir="$(dirname "$0")" # ${0%/*} isn't good enough when there's no "/"
 . "${rundir}/sets.subr"
 SDIR="$(${MKTEMP} -d "/tmp/${prog}.XXXXXX")"
 @@ -24,49 +24,59 @@ cleanup()
 	fi
 	exit ${es}
+}
 trap cleanup 0 2 3 13		# EXIT INT QUIT PIPE
 origin=.
 xargs=""
 dargs=""
 metalog=
 allowextra=false
 allowmissing=false
 # handle args
-while getopts xbM:em ch; do
+while getopts xybL:M:em ch; do
 	case ${ch} in
 	x)
 		xargs="-x"
 		origin="./etc/X11 ./etc/fonts ./usr/X11R6"
 		;;
 	y)
 		xargs="-y"
 		origin="./etc/ext ./usr/ext"
 		;;
 	# backward compat
 	b)
 		xargs="-b"
 		;;
 	L)
 		xargs="-L ${OPTARG}"
 		;;
 	M)
 		metalog="${OPTARG}"
 		;;
 	e)
 		allowextra=true
 		;;
 	m)
 		allowmissing=true
 		;;
 	*)
 		cat 1>&2 <<USAGE
-Usage: ${prog} [-x|-b] [-M metalog] [-e] [-m]
+Usage: ${prog} [-x|-y|-b|-L lists] [-M metalog] [-e] [-m]
 	-x		check only x11 lists
 	-y		check only extsrc lists
 	-b		check netbsd + x11 lists
 	-L base,x,ext	check specified lists
 	-M metalog	metalog file
 	-e		extra files are not considered an error
 	-m		missing files are not considered an error
 USAGE
 		exit 1
 		;;
 	esac
 done
 shift $((${OPTIND} - 1))
+#
 # Exceptions to flist checking (all begin with "./"):
+#

 @@ -247,26 +247,27 @@ comp-util-sbin system development utilit
 comp-util-share reference files for programming utilities
 etc-amd-rc startup script for auto-mounter daemon
 etc-audio-rc startup script for audio mixer control utility
 etc-bind-etc configuration files for BIND DNS server
 etc-bind-rc startup script for BIND DNS server
 etc-bootserver-etc configuration files for diskless boot server utilities
 etc-bootserver-rc startup script for diskless boot server utilities
 etc-cron-log empty log file for cron(8)
 etc-cron-rc startup script for cron(8) command scheduler
 etc-cron-root root file system support for cron(8) command scheduler
 etc-dhclient-etc configuration files for DHCP dyanamic host configuration protocol client utilities
 etc-dhclient-rc startup script for DHCP dynamic host configuration protocol client
 etc-dhcpd-rc startup script for DHCP dynamic host configuration protocol daemon
 etc-extsrc-rc startup scripts for externally added programs
 etc-games-etc configuration file for games
 etc-games-scores empty score files for games
 etc-ipf-rc startup scripts for IP filter
 etc-isdn-rc startup script for ISDN (Integrated Services Digital Network) network connectivity utilities
 etc-krb5-rc startup script for the Kerberos V authentication service
 etc-lpr-etc configuration file for printing services
 etc-lpr-log empty log file for printing services
 etc-lpr-rc startup script for printing services
 etc-mail-etc configuration file for mail utilities
 etc-mailwrapper-etc configuration files for the mailwrapper(8) program for multiple mailer support
 etc-man-etc configuration files for the online manual pages
 etc-net-etc configuration files for networking
 etc-net-rc startup files for networking

 @@ -498,26 +498,27 @@ comp-util-sbin	system development utilit
 comp-util-share	reference files for programming utilities
 etc-amd-rc	startup script for auto-mounter daemon
 etc-audio-rc startup script for audio mixer control utility
 etc-bind-etc	configuration files for BIND DNS server
 etc-bind-rc	startup script for BIND DNS server
 etc-bootserver-etc	configuration files for diskless boot server utilities
 etc-bootserver-rc	startup script for diskless boot server utilities
 etc-cron-log	empty log file for cron(8)
 etc-cron-rc	startup script for cron(8) command scheduler
 etc-cron-root	root file system support for cron(8) command scheduler
 etc-dhclient-etc	configuration files for DHCP dyanamic host configuration protocol client utilities
 etc-dhclient-rc	startup script for DHCP dynamic host configuration protocol client
 etc-dhcpd-rc	startup script for DHCP dynamic host configuration protocol daemon
 etc-extsrc-rc	startup scripts for externally added programs
 etc-games-etc	configuration file for games
 etc-games-scores	empty score files for games
 etc-ipf-rc	startup script for IP filter
 etc-iscsi-etc	configuration files for the NetBSD iSCSI target
 etc-iscsi-rc	startup script for the NetBSD iSCSI target
 etc-isdn-rc	startup script for ISDN (Integrated Services Digital Network) network connectivity utilities
 etc-krb5-rc	startup script for the Kerberos V authentication service
 etc-lpr-etc	configuration file for printing services
 etc-lpr-log	empty log file for printing services
 etc-lpr-rc	startup script for printing services
 etc-mail-etc	configuration file for mail utilities
 etc-mailwrapper-etc	configuration files for the mailwrapper(8) program for multiple mailer support
 etc-man-etc	configuration files for the online manual pages

 @@ -1,50 +1,67 @@
 #!/bin/sh
+#
-# $NetBSD: makeflist,v 1.74 2006/01/04 13:40:23 apb Exp $
+# $NetBSD: makeflist,v 1.75 2009/11/30 16:13:23 uebayasi Exp $
+#
 # Print out the files in some or all lists.
 # Usage: makeflist [-bxlo] [-a arch] [-m machine] [-s setsdir] [setname ...]
+#
 rundir="$(dirname "$0")" # ${0%/*} isn't good enough when there's no "/"
 . "${rundir}/sets.subr"
 lists="${nlists}"
 usage()
+{
 	cat 1>&2 <<USAGE
-Usage: ${0##*/} [-bxlo] [-a arch] [-m machine] [-s setsdir] [setname [...]]
+Usage: ${0##*/} [-L base,x,ext] [-bxyo] [-a arch] [-m machine] [-s setsdir] [setname [...]]
 	-L base,x,ext	print specified lists
 	-b		print netbsd + x11 lists
 	-x		print make x11 lists
 	-y		print make extsrc lists
 	-l		just list the selected set names, not the contents
 	-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}]
 	-s setsdir	directory to find sets [${setsdir}]
 	[setname [...]]	sets to build [${lists}]
 USAGE
 	exit 1
+}
 # handle args
-while getopts bxloa:m:s: ch; do
+while getopts L:bxXloa:m:s: ch; do
 	case ${ch} in
 	L)
 		lists=$(
 			for _list in $( echo ${OPTARG} | tr , ' ' ); do
 				case $_list in
 				base)	echo "${nlists}" ;;
 				x)	echo "${xlists}" ;;
 				ext)	echo "${extlists}" ;;
 				esac
 			done
+		)
 		;;
 	# backward compat
 	b)
 		lists="${nlists} ${xlists}"
 		;;
 	x)
 		lists="${xlists}"
 		;;
 	y)
 		lists="${extlists}"
 		;;
 	l)
 		listonly=1
 		;;
 	o)
 		obsolete=1
 		;;
 	a)
 		MACHINE_ARCH="${OPTARG}"
 		MACHINE_CPU="$(arch_to_cpu "${OPTARG}")"
 		;;
 	m)
 		MACHINE="${OPTARG}"
 		;;

 @@ -1,51 +1,68 @@
 #!/bin/sh
+#
-# $NetBSD: makeobsolete,v 1.29 2006/01/28 19:01:23 apb Exp $
+# $NetBSD: makeobsolete,v 1.30 2009/11/30 16:13:23 uebayasi Exp $
+#
 # Print out the obsolete files for a set
 # Usage: makeobsolete [-b] [-x] [-a arch] [-m machine] [-s setsdir] \
 #    [-t target] [setname ...]
+#
 rundir="$(dirname "$0")" # ${0%/*} isn't good enough when there's no "/"
 . "${rundir}/sets.subr"
 lists="${nlists}"
 target=./dist
 obsolete=1
 usage()
+{
 	cat 1>&2 <<USAGE
 Usage: ${0##*/} [-a arch] [-m machine] [-s setsdir] [setname ...]
 	-L base,x,ext	make specified lists
 	-b		make netbsd + x11 lists
 	-x 		only make x11 lists
 	-y 		only make extsrc lists
 	-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
 USAGE
 	exit 1
+}
-while getopts bxa:m:s:t: ch; do
+while getopts L:bxya:m:s:t: ch; do
 	case ${ch} in
 	L)
 		lists=$(
 			for _list in $( echo ${OPTARG} | tr , ' ' ); do
 				case $_list in
 				base)	echo "${nlists}" ;;
 				x)	echo "${xlists}" ;;
 				ext)	echo "${extlists}" ;;
 				esac
 			done
+		)
 		;;
 	# backward compat
 	b)
-		lists="${xlists} ${nlists}"
+		lists="${nlists} ${xlists}"
 		;;
 	x)
 		lists="${xlists}"
 		;;
 	y)
 		lists="${extlists}"
 		;;
 	a)
 		MACHINE_ARCH="${OPTARG}"
 		MACHINE_CPU="$(arch_to_cpu "${OPTARG}")"
 		;;
 	m)
 		MACHINE="${OPTARG}"
 		;;
 	s)
 		setsdir="${OPTARG}"
 		;;
 	t)
 		target="${OPTARG}"
 		;;

 @@ -1,61 +1,65 @@
 #! /bin/sh
+#
-#	$NetBSD: makesrctars,v 1.37 2009/09/19 07:09:54 snj Exp $
+#	$NetBSD: makesrctars,v 1.38 2009/11/30 16:13:23 uebayasi Exp $
+#
 # makesrctars srcdir setdir
 #	Create source tarballs in setdir from the source under srcdir.
+#
 prog="${0##*/}"
 rundir="$(dirname "$0")" # ${0%/*} isn't good enough when there's no "/"
 . "${rundir}/sets.subr"
 # set defaults
 xsrcdir=
 quiet=false
 GZIP=-9n
 export GZIP
 usage()
+{
 	cat 1>&2 <<USAGE
-Usage: ${prog} [-N password/group dir] [-q] [-x xsrcdir] srcdir setdir
+Usage: ${prog} [-N password/group dir] [-q] [-x xsrcdir] [-y extsrcsrcdir] srcdir setdir
 	-N dir		location which contains master.passwd and group files
 			(defaults to \${srcdir}/etc)
 	-q		quiet operation
 	-x xsrcdir	build xsrc.tgz from xsrcdir
 	-y extsrcsrcdir	build extsrc.tgz from extsrcsrcdir
 	srcdir		location of sources
 	setdir		where to write the .tgz files to
 USAGE
 	exit 1
+}
 msg()
+{
 	$quiet || echo $*
+}
 # handle args
-while getopts N:qx: ch; do
+while getopts N:qx:y: ch; do
 	case ${ch} in
 	q)
 		quiet=true
 		;;
 	x)
 		xsrcdir="${OPTARG}"
 		;;
 	y)
 		extsrcsrcdir="${OPTARG}"
 		;;
 	N)
 		PASSWD="${OPTARG}"
 		;;
 	*)
 		usage
 		;;
 	esac
 done
 shift $((${OPTIND} - 1))
 if [ $# -ne 2 ]; then
 	usage
 fi
 @@ -122,19 +126,31 @@ makeset sharesrc share
 # create xsrc sets
+#
 if [ -n "${xsrcdir}" ]; then
 	if ! cd "${xsrcdir}"; then
 		echo >&2 "${prog}: can't chdir to ${xsrcdir}"
 		exit 1
 	fi
 	srcprefix=usr/xsrc
 	makeset xsrc .
 fi
 # create extsrc sets
+#
 if [ -n "${extsrcsrcdir}" ]; then
 	if ! cd "${extsrcsrcdir}"; then
 		echo >&2 "${prog}: can't chdir to ${extsrcsrcdir}"
 		exit 1
 	fi
 	srcprefix=usr/extsrc
 	makeset extsrc .
 fi
 msg "Creating checksum files"
 (cd "${setdir}"
 	${CKSUM} -a md5  *.tgz > MD5
 	${CKSUM} -a sha512 *.tgz > SHA512
+)
 exit 0

 @@ -1,80 +1,99 @@
 #!/bin/sh
+#
-# $NetBSD: maketars,v 1.69 2009/09/12 11:01:55 apb Exp $
+# $NetBSD: maketars,v 1.70 2009/11/30 16:13:23 uebayasi Exp $
+#
 # Make release tar files for some or all lists.  Usage:
 # maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
 #	[-M metalog] [-N etcdir] [-d destdir] [-t tardir] [setname ...]
+#
 # The default sets are "base comp etc games man misc tests text"
 # The X sets are "xbase xcomp xetc xfont xserver"
 # The extsrc sets are "extbase extcomp extetc"
+#
 # If '-i installdir' is given, copy the given sets to installdir
 # (using pax -rw ...) instead of creating tar files.
-# In this case, remove "etc" and "xetc" from the list of default sets.
+# In this case, remove "etc", "xetc", and "extetc" from the list of default sets.
+#
 prog="${0##*/}"
 rundir="$(dirname "$0")" # ${0%/*} isn't good enough when there's no "/"
 . "${rundir}/sets.subr"
 # set defaults
 lists="${nlists}"
 tars="${RELEASEDIR}"
 dest="${DESTDIR}"
 metalog=
 installdir=
 etcdir=
 setfilesonly=false
 quiet=false
 usage()
+{
 	cat 1>&2 <<USAGE
-Usage: ${prog} [-b] [-x] [-i idir] [-a arch] [-m machine] [-s setsdir] [-S]
+Usage: ${prog} [-L base,x,ext] [-b] [-x] [-y] [-i idir] [-a arch] [-m machine] [-s setsdir] [-S]
 	    [-M metalog] [-N etcdir] [-d dest] [-t targetdir] [setname ...]
 	-L base,x,ext	Make specified lists
 	-b		Make both netbsd and x11 lists
 	-x		Only make x11 lists
 		[Default: make netbsd lists]
 	-y		Only make extsrc lists
 		[Default: make netbsd 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}]
 	-q		Quiet operation
 	-s setsdir	Directory to find sets [${setsdir}]
 	-S		Exit after creating set files ${dest}/etc/mtree/set.*
 	-M metalog	metalog file
 	-N etcdir	etc dir for metalog use [${dest}/etc]
 	-d dest		\${DESTDIR}	[${dest}]
 	-t targetdir	\${RELEASEDIR}	[${tars}]
 	[setname ...]	Sets to build 	[${lists}]
 USAGE
 	exit 1
+}
 msg()
+{
 	$quiet || echo $*
+}
 # handle args
-while getopts bxi:a:m:qs:SM:N:d:t: ch; do
+while getopts L:bxyi:a:m:qs:SM:N:d:t: ch; do
 	case ${ch} in
 	L)
 		lists=$(
 			for _list in $( echo ${OPTARG} | tr , ' ' ); do
 				case $_list in
 				base)	echo "${nlists}" ;;
 				x)	echo "${xlists}" ;;
 				ext)	echo "${extlists}" ;;
 				esac
 			done
+		)
 		;;
 	# backward compat
 	b)
 		lists="${nlists} ${xlists}"
 		;;
 	x)
 		lists="${xlists}"
 		;;
 	y)
 		lists="${extlists}"
 		;;
 	i)
 		installdir="${OPTARG}"
 		;;
 	a)
 		MACHINE_ARCH="${OPTARG}"
 		MACHINE_CPU="$(arch_to_cpu "${OPTARG}")"
 		;;
 	m)
 		MACHINE="${OPTARG}"
 		;;
 	q)
 		quiet=true
 		;;
 @@ -92,28 +111,28 @@ while getopts bxi:a:m:qs:SM:N:d:t: ch; d
 		;;
 	d)
 		dest="${OPTARG}"
 		;;
 	t)
 		tars="${OPTARG}"
 		;;
 	*)
 		usage
 		;;
 	esac
 done
 shift $((${OPTIND} - 1))
-if [ -n "${installdir}" ]; then	# if -i, remove etc & xetc from the default list
+if [ -n "${installdir}" ]; then	# if -i, remove etc + xetc + extetc from the default list
-	lists="$(echo ${lists} | ${SED} -e 's/ etc / /;s/ xetc / /')"
+	lists="$(echo ${lists} | ${SED} -e 's/ etc / /;s/ xetc / /;s/ extetc / /')"
 fi
 if [ -n "$*" ]; then
 	lists="$*"
 fi
 if [ -z "${tars}" -a -z "${installdir}" ]; then
 	echo >&2 "${prog}: \${RELEASEDIR} must be set, or -i must be used"
 	exit 1
 fi
 if [ -z "${dest}" ]; then
 	echo >&2 "${prog}: \${DESTDIR} must be set"
 	exit 1

 @@ -1,21 +1,22 @@
-#	$NetBSD: sets.subr,v 1.91 2009/11/05 17:34:25 dyoung Exp $
+#	$NetBSD: sets.subr,v 1.92 2009/11/30 16:13:23 uebayasi Exp $
+#
+#
 # 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
 #	extlists		list of extsrc sets
 #	obsolete		controls if obsolete files are selected instead
 #	module			if != "no", enable MODULE sets
 #	shlib			shared library format (a.out, elf, or "")
 #	stlib			static library format (a.out, elf)
+#
 # The following <bsd.own.mk> variables are exported to the environment:
 #	MACHINE
 #	MACHINE_ARCH
 #	MACHINE_CPU
 #	HAVE_BINUTILS
 #	HAVE_GCC
 #	HAVE_GDB
 #	TOOLCHAIN_MISSING
 @@ -26,26 +27,27 @@ MKVARS="\
 	MKBFD		\
 	MKBINUTILS	\
 	MKCATPAGES	\
 	MKCOMPAT	\
 	MKCRYPTO	\
 	MKCRYPTO_IDEA	\
 	MKCRYPTO_MDC2	\
 	MKCRYPTO_RC5	\
 	MKCVS		\
 	MKDEBUG		\
 	MKDEBUGLIB	\
 	MKDOC		\
 	MKDYNAMICROOT	\
 	MKEXTSRC	\
 	MKGCC		\
 	MKGCCCMDS	\
 	MKGDB		\
 	MKHESIOD	\
 	MKHTML		\
 	MKINET6		\
 	MKINFO		\
 	MKIPFILTER	\
 	MKISCSI		\
 	MKKERBEROS	\
 	MKKMOD		\
 	MKLDAP		\
 	MKLINT		\
 @@ -215,41 +217,42 @@ stlib=$shlib
 # Now check for MKPIC or specials and turn off shlib if need be.
 if [ "${MKPIC}" = "no" ]; then
 	shlib=no
 fi
 if [ "${MACHINE_ARCH}" = "m68000" ]; then
 	shlib=no			# Turn off shlibs for some ports.
 fi
 if [ "$module" != "no" ]; then
 	nlists="base comp etc games man misc modules tests text"
 else
 	nlists="base comp etc games man misc tests text"
 fi
 xlists="xbase xcomp xetc xfont xserver"
 extlists="extbase extcomp extetc"
 OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh`
 MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules"
 SUBST="s#@MODULEDIR@#${MODULEDIR}#g"
 SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g"
 SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
+#
 # list_set_files setfile [...]
+#
 # Produce a packing list for setfile(s).
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
+#
-# 	# $NetBSD: sets.subr,v 1.91 2009/11/05 17:34:25 dyoung Exp $
+# 	# $NetBSD: sets.subr,v 1.92 2009/11/30 16:13:23 uebayasi Exp $
 # 	.			base-sys-root	[keyword[,...]]
 # 	./altroot		base-sys-root
 # 	./bin			base-sys-root
 # 	./bin/[			base-util-root
 # 	./bin/cat		base-util-root
 #		[...]
+#
 # A # in the first column marks a comment.
+#
 # If ${obsolete} != 0, only entries with an "obsolete" keyword will
 # be printed.  All other keywords must be present.
+#
 # The third field is an optional comma separated list of keywords to
 @@ -262,26 +265,27 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
 #	bfd			obsolete, use binutils.
 #	binutils		${MKBINUTILS} != no
 #	catpages		${MKCATPAGES} != no
 #	compat			${MKCOMPAT} != no
 #	crypto			${MKCRYPTO} != no
 #	crypto_idea		${MKCRYPTO_IDEA} != no
 #	crypto_mdc2		${MKCRYPTO_MDC2} != no
 #	crypto_rc5		${MKCRYPTO_RC5} != no
 #	cvs			${MKCVS} != no
 #	debug			${MKDEBUG} != no
 #	debuglib		${MKDEBUGLIB} != no
 #	doc			${MKDOC} != no
 #	dynamicroot		${MKDYNAMICROOT} != no
 #	extsrc			${MKEXTSRC} != no
 #	gcc			${MKGCC} != no
 #	gcccmds			${MKGCCCMDS} != no
 #	gdb			${MKGDB} != no
 #	hesiod			${MKHESIOD} != no
 #	html			${MKHTML} != no
 #	inet6			${MKINET6} != no
 #	info			${MKINFO} != no
 #	ipfilter		${MKIPFILTER} != no
 #	iscsi			${MKISCSI} != no
 #	kerberos		${MKKERBEROS} != no
 #	kmod			${MKKMOD} != no
 #	ldap			${MKLDAP} != no
 #	lint			${MKLINT} != no
 @@ -405,55 +409,63 @@ list_set_files()
 # list_set_lists setname
+#
 # Print to stdout a list of files, one filename per line, which
 # concatenate to create the packing list for setname. E.g.,
+#
 # 	.../lists/base/mi
 # 	.../lists/base/rescue.mi
 # 	.../lists/base/md.i386
 #		[...]
+#
 # For a given setname $set, the following files may be selected from
 # .../list/$set:
 #	mi
 #	mi.ext.*
 #	ad.${MACHINE_ARCH}
 # (or)	ad.${MACHINE_CPU}
 #	ad.${MACHINE_CPU}.shl
 #	md.${MACHINE}.${MACHINE_ARCH}
 # (or)	md.${MACHINE}
 #	stl.mi
-#	stl.stlib
+#	stl.${stlib}
 #	shl.mi
-#	shl.shlib
+#	shl.mi.ext.*
 #	shl.${shlib}
 #	shl.${shlib}.ext.*
 #	module.mi			if ${module} != no
 #	module.${MACHINE}		if ${module} != no
 #	module.ad.${MACHINE_ARCH}	if ${module} != no
 # (or)	module.ad.${MACHINE_CPU}	if ${module} != no
 #	rescue.shl
 #	rescue.${MACHINE}
 #	rescue.ad.${MACHINE_ARCH}
 # (or)	rescue.ad.${MACHINE_CPU}
 # 	rescue.ad.${MACHINE_CPU}.shl
+#
 # Environment:
 # 	shlib
 # 	stlib
+#
 list_set_lists()
+{
 	setname=$1
 	setdir=$setsdir/lists/$setname
 	echo $setdir/mi
 	for _extsrc_pkg in ${EXTSRCS}; do
 		if [ -f $setdir/mi.ext.${_extsrc_pkg} ]; then
 			echo $setdir/mi.ext.${_extsrc_pkg}
 		fi
 	done
 	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}
 		fi
 		if [ "$shlib" != "no" -a \
 		     -f $setdir/ad.${MACHINE_CPU}.shl ]; then
 			echo $setdir/ad.${MACHINE_CPU}.shl
 		fi
 @@ -463,29 +475,39 @@ list_set_lists()
 	elif [ -f $setdir/md.${MACHINE} ]; then
 		echo $setdir/md.${MACHINE}
 	fi
 	if [ -f $setdir/stl.mi ]; then
 		echo $setdir/stl.mi
 	fi
 	if [ -f $setdir/stl.${stlib} ]; then
 		echo $setdir/stl.${stlib}
 	fi
 	if [ "$shlib" != "no" ]; then
 		if [ -f $setdir/shl.mi ]; then
 			echo $setdir/shl.mi
 		fi
 		for _extsrc_pkg in ${EXTSRCS}; do
 			if [ -f $setdir/shl.mi.ext.${_extsrc_pkg} ]; then
 				echo $setdir/shl.mi.ext.${_extsrc_pkg}
 			fi
 		done
 		if [ -f $setdir/shl.${shlib} ]; then
 			echo $setdir/shl.${shlib}
 		fi
 		for _extsrc_pkg in ${EXTSRCS}; do
 			if [ -f $setdir/shl.${shlib}.ext.${_extsrc_pkg} ]; then
 				echo $setdir/shl.${shlib}.ext.${_extsrc_pkg}
 			fi
 		done
 	fi
 	if [ "$module" != "no" ]; then
 		if [ -f $setdir/module.mi ]; then
 			echo $setdir/module.mi
 		fi
 		if [ -f $setdir/module.${MACHINE} ]; then
 			echo $setdir/module.${MACHINE}
 		fi
 		if [ "${MACHINE}" != "${MACHINE_ARCH}" ]; then
 			# Prefer a module.ad.${MACHINE_ARCH} over a
 			# module.ad.${MACHINE_CPU}, since the arch-
 			# specific one will be more specific than the
 			# cpu-specific one.

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.373 2009/09/29 23:56:27 tsarna Exp $
+#	$NetBSD: Makefile,v 1.374 2009/11/30 16:13:22 uebayasi Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 # Environment variables without default values:
 #   DESTDIR must be set before anything in this file will work.
 #   RELEASEDIR is where the tarred up stuff for a snapshot or
 #	release will be placed.
+#
 # Environment variables with default values:
 #   LOCALTIME will set the default local time for the system you
 #	build; it determines what /etc/localtime is symlink'd to.
 #   KERNSRCDIR points to kernel source; it is set by default to ../sys,
 #	but can be overridden.
 #   KERNOBJDIR is the kernel build directory, it defaults to
 @@ -155,26 +155,29 @@ distribution: .PHONY .MAKE check_DESTDIR
 .if !defined(DISTRIBUTION_DONE)
 .if !defined(INSTALL_DONE)
 	${MAKEDIRTARGET} ${NETBSDSRCDIR} include _DISTRIB=
 	${MAKEDIRTARGET} ${NETBSDSRCDIR} install _DISTRIB=
 .endif	# !INSTALL_DONE
 	${MAKEDIRTARGET} . install-etc-files
 . if ${MKX11} != "no"
 .  if ${X11FLAVOUR} == "Xorg"
 	${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/mit/xorg distribution
 .  else
 	${MAKEDIRTARGET} ${NETBSDSRCDIR}/x11 distribution
 .  endif
 . endif
 . if ${MKEXTSRC} != "no"
 	${MAKEDIRTARGET} ${NETBSDSRCDIR}/extsrc distribution
 . endif
 	${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib/sets makesetfiles
 .endif	# !DISTRIBUTION_DONE
 CLEANFILES+=	MAKEDEV
 MAKEDEV: .EXEC
 	${_MKTARGET_CREATE}
 	MACHINE=${MACHINE:Q} MACHINE_ARCH=${MACHINE_ARCH:Q} \
 	    NETBSDSRCDIR=${NETBSDSRCDIR:Q} \
 	    ${TOOL_AWK} -f ${.CURDIR}/MAKEDEV.awk ${.CURDIR}/MAKEDEV.tmpl \
 	    > ${.TARGET}
 RELEASEVARS=	BSDOBJDIR BSDSRCDIR BUILDID \

 @@ -14,26 +14,27 @@ base-cron-bin base-sys-usr
 base-cron-root base-sys-root
 base-crypto-bin base-sys-usr
 base-crypto-examples base-sys-share
 base-crypto-root base-sys-root
 base-crypto-shlib base-sys-usr
 base-cxx-usr base-c-usr
 base-debug-bin base-sys-usr
 base-dhclient-root base-sys-root
 base-dhcpd-bin base-sys-share
 base-dhcpd-bin base-sys-usr
 base-dhcpd-examples base-sys-share
 base-efs-root base-sys-root
 base-ext2fs-root base-sys-root
 base-extsrc-root base-sys-root
 base-filecorefs-root base-sys-root
 base-fstab-examples base-sys-share
 base-games-root base-sys-root
 base-games-share base-sys-share
 base-games-usr base-sys-usr
 base-gnats-bin base-sys-usr
 base-gnats-share base-sys-share
 base-groff-font base-sys-share
 base-groff-share base-termcap-share
 base-hesiod-bin base-sys-usr
 base-htmldoc-share base-sys-share
 base-i18n-root base-sys-usr
 base-i18n-shlib base-i18n-root

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.README,v 1.259 2009/11/15 14:59:47 pgoyette Exp $
+#	$NetBSD: bsd.README,v 1.260 2009/11/30 16:13:23 uebayasi Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 This is the README file for the make "include" files for the NetBSD
 source tree.  The files are installed in /usr/share/mk, and are,
 by convention, named with the suffix ".mk".
 Note, this file is not intended to replace reading through the .mk
 files for anything tricky.
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 RANDOM THINGS WORTH KNOWING:
 @@ -153,26 +153,31 @@ MKDEBUG		If "no", don't build and instal
 MKDEBUGLIB	Build *_g.a debugging libraries, which are compiled
 		with -DDEBUG.
 		Default: no
 MKDOC		If "no", don't build or install the documentation.
 		Default: yes
 MKDYNAMICROOT	If "no", build programs in /bin and /sbin statically,
 		don't install certain libraries in /lib, and don't
 		install the shared linker into /libexec.
 		Default: yes
 MKEXTSRC        If not "no", 'make build' also descends into either src/extsrc
 		to cross-build programs and libraries externally added by
 		users, and automatically enables creation of those sets.
 		Default: no
 MKGCC		If "no", don't build gcc(1) or any of the GCC-related
 		libraries (libgcc, libobjc, libstdc++).
 		Default: yes
 MKGCCCMDS	If "no", don't build gcc(1), but do build the GCC-related
 		libraries (libgcc, libobjc, libstdc++).
 		Default: yes
 MKGDB		If "no", don't build gdb(1).
 		Default: yes
 MKHESIOD	If "no", disables building of Hesiod infrastructure
 		(libraries and support programs).

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.own.mk,v 1.597 2009/11/28 16:48:25 mbalmer Exp $
+#	$NetBSD: bsd.own.mk,v 1.598 2009/11/30 16:13:23 uebayasi Exp $
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
 MAKECONF?=	/etc/mk.conf
 .-include "${MAKECONF}"
+#
 # CPU model, derived from MACHINE_ARCH
+#
 MACHINE_CPU=	${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/}
+#
 @@ -508,27 +508,28 @@ NOPROFILE=	# defined
+#
 # The ia64 port is incomplete.
+#
 .if ${MACHINE_ARCH} == "ia64"
 MKLINT=		no
 MKGDB=		no
 .endif
+#
 # On the MIPS, all libs are compiled with ABIcalls (and are thus PIC),
 # not just shared libraries, so don't build the _pic version.
+#
-.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
+.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
     ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
 MKPICLIB:=	no
 .endif
+#
 # On VAX using ELF, all objects are PIC, not just shared libraries,
 # so don't build the _pic version.  Unless we are using GCC3 which
 # doesn't support PIC yet.
+#
 .if ${MACHINE_ARCH} == "vax"
 MKPICLIB=	no
 .endif
+#
 @@ -680,26 +681,27 @@ MKBINUTILS?=	${MKBFD}
 	MKPAM \
 	MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
 	MKSHARE MKSKEY MKSTATICLIB \
 	MKX11FONTS \
 	MKYP
 ${var}?=	yes
 .endfor
+#
 # MK* options which default to "no".
+#
 .for var in \
 	MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \
 	MKEXTSRC \
 	MKLVM \
 	MKMANDOC MKMANZ MKOBJDIRS \
 	MKPCC MKPCCCMDS \
 	MKSOFTFLOAT MKSTRIPIDENT \
 	MKUNPRIVED MKUPDATE MKX11
 ${var}?=no
 .endfor
+#
 # Do we default to XFree86 or Xorg for this platform?
+#
 .if ${MACHINE} == "alpha" || ${MACHINE} == "acorn32" || \
 	${MACHINE} == "amiga" || ${MACHINE} == "cats" || \
 @@ -922,26 +924,45 @@ X11SRCDIR.xf86-input-${_i}?=	${X11SRCDIR
 X11SRCDIR.xf86-video-${_v}?=	${X11SRCDIRMIT}/xf86-video-${_v}/dist
 .endfor
 .if ${X11FLAVOUR} == "Xorg"
 X11DRI?=			yes
 .endif
 X11DRI?=			no
 X11LOADABLE?=			yes
+#
 # Where extsrc sources are and where it is installed to.
+#
 .if !defined(EXTSRCSRCDIR)
 .if exists(${NETBSDSRCDIR}/../extsrc)
 EXTSRCSRCDIR!=		cd ${NETBSDSRCDIR}/../extsrc && pwd
 .else
 EXTSRCSRCDIR=		/usr/extsrc
 .endif
 .endif # !defined(EXTSRCSRCDIR)
 EXTSRCROOTDIR?=		/usr/ext
 EXTSRCBINDIR?=		${EXTSRCROOTDIR}/bin
 EXTSRCETCDIR?=		/etc/ext
 EXTSRCINCDIR?=		${EXTSRCROOTDIR}/include
 EXTSRCLIBDIR?=		${EXTSRCROOTDIR}/lib/ext
 EXTSRCMANDIR?=		${EXTSRCROOTDIR}/man
 EXTSRCUSRLIBDIR?=	${EXTSRCROOTDIR}/lib
+#
 # MAKEDIRTARGET dir target [extra make(1) params]
 #	run "cd $${dir} && ${MAKE} [params] $${target}", with a pretty message
+#
 MAKEDIRTARGET=\
 	@_makedirtarget() { \
 		dir="$$1"; shift; \
 		target="$$1"; shift; \
 		case "$${dir}" in \
 		/*)	this="$${dir}/"; \
 			real="$${dir}" ;; \
 		.)	this="${_THISDIR_}"; \
 			real="${.CURDIR}" ;; \
 		*)	this="${_THISDIR_}$${dir}/"; \

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.sys.mk,v 1.185 2009/11/12 14:30:34 tron Exp $
+#	$NetBSD: bsd.sys.mk,v 1.186 2009/11/30 16:13:23 uebayasi Exp $
+#
 # Build definitions used for NetBSD source tree builds.
 .if !defined(_BSD_SYS_MK_)
 _BSD_SYS_MK_=1
 .if defined(WARNS)
 .if ${WARNS} > 0
 CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
 #CFLAGS+=	-Wmissing-declarations -Wredundant-decls -Wnested-externs
 # Add -Wno-sign-compare.  -Wsign-compare is included in -Wall as of GCC 3.3,
 # but our sources aren't up for it yet. Also, add -Wno-traditional because
 # gcc includes #elif in the warnings, which is 'this code will not compile
 @@ -43,27 +43,28 @@ CXXFLAGS+=	-Wctor-dtor-privacy -Wnon-vir
 .if ${WARNS} > 3 && defined(HAVE_GCC) && ${HAVE_GCC} >= 3
 CFLAGS+=	-Wsign-compare
 CFLAGS+=	-std=gnu99
 .endif
 .endif
 CPPFLAGS+=	${AUDIT:D-D__AUDIT__}
 CFLAGS+=	${CWARNFLAGS} ${NOGCCERROR:D:U-Werror}
 LINTFLAGS+=	${DESTDIR:D-d ${DESTDIR}/usr/include}
 .if (${MACHINE_ARCH} == "alpha") || \
     (${MACHINE_ARCH} == "hppa") || \
     (${MACHINE_ARCH} == "ia64") || \
-    (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb")
+    (${MACHINE_ARCH} == "mipsel") || (${MACHINE_ARCH} == "mipseb") || \
     (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
 HAS_SSP=	no
 .else
 HAS_SSP=	yes
 .endif
 .if defined(USE_FORT) && (${USE_FORT} != "no")
 USE_SSP?=	yes
 .if !defined(KERNSRCDIR) && !defined(KERN) # not for kernels nor kern modules
 CPPFLAGS+=	-D_FORTIFY_SOURCE=2
 .endif
 .endif
 .if defined(USE_SSP) && (${USE_SSP} != "no") && (${BINDIR:Ux} != "/usr/mdec")

 @@ -1,29 +1,31 @@
-#	$NetBSD: Makefile,v 1.10 2009/11/19 19:57:40 drochner Exp $
+#	$NetBSD: Makefile,v 1.11 2009/11/30 16:13:22 uebayasi Exp $
 .include <bsd.own.mk>
 .if ${MKX11} != "no"
 . if ${X11FLAVOUR} == "Xorg"
 NETBSD_DIST_X11_FILE=	${.CURDIR}/NetBSD.dist.Xorg
 . else
 NETBSD_DIST_X11_FILE=	${.CURDIR}/NetBSD.dist.XFree86
 . endif
 .else
 NETBSD_DIST_X11_FILE=
 .endif
-NetBSD.dist:	NetBSD.dist.base ${NETBSD_DIST_X11_FILE}
+.if ${MKEXTSRC} != "no"
-	${TOOL_CAT} ${.CURDIR}/NetBSD.dist.base ${NETBSD_DIST_X11_FILE} > \
+NETBSD_DIST_EXTSRC_FILE=	${.CURDIR}/NetBSD.dist.extsrc
 .endif
 NetBSD.dist:	NetBSD.dist.base ${NETBSD_DIST_X11_FILE} ${NETBSD_DIST_EXTSRC_FILE}
 	${TOOL_CAT} ${.CURDIR}/NetBSD.dist.base ${NETBSD_DIST_X11_FILE} ${NETBSD_DIST_EXTSRC_FILE} > \
 	    ${.TARGET}
 CONFIGFILES=	NetBSD.dist special
 FILESDIR=	/etc/mtree
 # distrib-dirs --
 #	Populate $DESTDIR with directories needed by NetBSD
+#
 .if ${MKUNPRIVED} == "no"
 TOOL_MTREE.unpriv=
 .else
 TOOL_MTREE.unpriv=	-W
 .endif