Sat Nov 15 22:05:12 2008 UTC ()

Pull up following revision(s) (requested by mrg in ticket #64):
	distrib/sets/Makefile: revision 1.64
	external/mit/xorg/server/Makefile: revision 1.5
	share/mk/bsd.README: revision 1.237
	BUILDING: revision 1.79
	share/mk/bsd.x11.mk: revision 1.71
	share/mk/bsd.own.mk: revision 1.544
	usr.bin/ssh/Makefile.inc: revision 1.18
	distrib/sets/sets.subr: revision 1.72
	share/man/man5/mk.conf.5: revision 1.42
	doc/BUILDING.mdoc: revision 1.68
	etc/Makefile: revision 1.360
	Makefile: revision 1.263
- retire MKXORG from public use
- introduce X11FLAVOUR to choose src/x11 vs src/external/mit/xorg
  for the X11 to build if MKX11=yes is set.  it takes the values
  of either Xorg or XFree86.
- default to Xorg on alpha, i386, macppc, shark, sparc and sparc64
- remove MKXORG_WITH_XSRC_XSERVER, unused and never useful


(snj)

diff -r1.78 -r1.78.2.1 src/BUILDING
diff -r1.262 -r1.262.2.1 src/Makefile
diff -r1.63 -r1.63.2.1 src/distrib/sets/Makefile
diff -r1.71 -r1.71.2.1 src/distrib/sets/sets.subr
diff -r1.67 -r1.67.2.1 src/doc/BUILDING.mdoc
diff -r1.359 -r1.359.2.1 src/etc/Makefile
diff -r1.4 -r1.4.8.1 src/external/mit/xorg/server/Makefile
diff -r1.41 -r1.41.2.1 src/share/man/man5/mk.conf.5
diff -r1.236 -r1.236.2.1 src/share/mk/bsd.README
diff -r1.542 -r1.542.2.1 src/share/mk/bsd.own.mk
diff -r1.70 -r1.70.2.1 src/share/mk/bsd.x11.mk
diff -r1.17 -r1.17.2.1 src/usr.bin/ssh/Makefile.inc

--- src/BUILDING 2008/09/24 07:38:04	1.78
+++ src/BUILDING 2008/11/15 22:05:11	1.78.2.1

 @@ -295,38 +295,29 @@ CONFIGURATION
                  during the generation of the distribution tar files to ensure
                  that the appropriate file ownership is stored.
                  Default: ``no''
      MKUPDATE    Can be set to ``yes'' or ``no''.  Indicates whether all
                  install operations intended to write to DESTDIR will compare
                  file timestamps before installing, and skip the install phase
                  if the destination files are up-to-date.  This also has
                  implications on full builds (see next subsection).
                  Default: ``no''
-     MKX11       Can be set to ``yes'' or ``no''.  Indicates whether X11R6 is
+     MKX11       Can be set to ``yes'' or ``no''.  Indicates whether X11 is
                  built from X11SRCDIR.
                  Mutually exclusive to MKXORG != no.
                  Default: ``no''
      MKXORG      Can be set to ``yes'' or ``no''.  Indicates whether X11R7
                  (modular Xorg) is built from X11SRCDIR.
                  Mutually exclusive to MKX11 != no.
                  Default: ``no''
      TOOLDIR     Directory to hold the host tools, once built.  If specified,
                  must be an absolute path.  This directory should be unique to
                  a given host system and NetBSD source tree.  (However, multi-
                  ple targets may share the same TOOLDIR; the target-dependent
                  files have unique names.)  If unset, a default based on the
                  uname(1) information of the host platform will be created in
                  the .OBJDIR of src.
                  Default: Unset.
      USETOOLS    Indicates whether the tools specified by TOOLDIR should be
 @@ -348,26 +339,32 @@ CONFIGURATION
                         NetBSD source tree.
                  Default: ``yes'', unless TOOLCHAIN_MISSING is set to ``yes''.
                  USETOOLS is also set to ``no'' when using <bsd.*.mk> outside
                  the NetBSD source tree.
      X11SRCDIR   Directory containing the X11R6 source.  If specified, must be
                  an absolute path.  The main X11R6 source is found in
                  X11SRCDIR/xfree/xc.
                  Default: ``/usr/xsrc''
      X11FLAVOUR  The style of X11 cross-built, set to either ``Xorg'' or
                  ``XFree86''.
                  Default: ``Xorg'' on amd64, i386, macppc, shark, sparc and
                  sparc64 platforms, ``XFree86'' on everything else.
    "make" variables for full builds
      These variables only affect the top level ``Makefile'' and do not affect
      manually building subtrees of the NetBSD source code.
      INSTALLWORLDDIR  Location for the ``make installworld'' target to install
                       to.  If specified, must be an absolute path.
                       Default: ``/''
      MKOBJDIRS        Can be set to ``yes'' or ``no''.  Indicates whether
                       object directories will be created automatically (via a
                       ``make obj'' pass) at the start of a build.

--- src/Makefile 2008/10/27 22:32:51	1.262
+++ src/Makefile 2008/11/15 22:05:11	1.262.2.1

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.262 2008/10/27 22:32:51 mrg Exp $
+#	$NetBSD: Makefile,v 1.262.2.1 2008/11/15 22:05:11 snj 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
 @@ -93,29 +93,29 @@
 #   do-gnu-lib:      builds and installs prerequisites from gnu/lib.
 #   do-external-lib: builds and installs prerequisites from external/lib.
 #   do-sys-rump-fs-lib:  builds and installs prerequisites from sys/rump/fs/lib
 #   do-sys-rump-net-lib: builds and installs prerequisites from sys/rump/net/lib
 #   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; either
+#   do-x11:          builds and installs X11 if ${MKX11} != "no"; either
-#                    X11R7 from src/external/mit/xorg if ${MKXORG} != "no"
+#                    X11R7 from src/external/mit/xorg if ${X11FLAVOUR} == "Xorg"
-#                    or X11R6 from src/x11 if ${MKX11} != "no"
+#                    or X11R6 from src/x11
 #   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}.
+#
 @@ -232,27 +232,27 @@ BUILDTARGETS+=	do-libgcc
 .if ${MKPCC} != "no"
 BUILDTARGET+=	do-libpcc
 .endif
 BUILDTARGETS+=	do-lib-libc
 BUILDTARGETS+=	do-lib do-gnu-lib do-external-lib
 BUILDTARGETS+=	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" || ${MKXORG} != "no"
+.if ${MKX11} != "no"
 BUILDTARGETS+=	do-x11
 .endif
 BUILDTARGETS+=	do-obsolete
+#
 # Enforce proper ordering of some rules.
+#
 .ORDER:		${BUILDTARGETS}
 includes-lib:	.PHONY includes-include includes-sys
 includes-gnu:	.PHONY includes-lib
+#
 @@ -448,32 +448,34 @@ do-ld.so: .PHONY .MAKE
 	${MAKEDIRTARGET} libexec/ld.aout_so ${targ}
 .endif
 .if (${OBJECT_FMT} == "ELF")
 	${MAKEDIRTARGET} libexec/ld.elf_so ${targ}
 .endif
 .endfor
 do-build: .PHONY .MAKE
 .for targ in dependall install
 	${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no
 .endfor
 do-x11: .PHONY .MAKE
-.if ${MKXORG} != "no"
+.if ${MKX11} != "no"
 .if ${X11FLAVOUR} == "Xorg"
 	${MAKEDIRTARGET} external/mit/xorg build
-.elif ${MKX11} != "no"
+.else
 	${MAKEDIRTARGET} x11 build
 .endif
 .else
-	@echo "Neither MKX11 or MKXORG is enabled"
+	@echo "MKX11 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

--- src/distrib/sets/Makefile 2008/10/25 22:23:55	1.63
+++ src/distrib/sets/Makefile 2008/11/15 22:05:11	1.63.2.1

 @@ -1,41 +1,41 @@
-#	$NetBSD: Makefile,v 1.63 2008/10/25 22:23:55 apb Exp $
+#	$NetBSD: Makefile,v 1.63.2.1 2008/11/15 22:05:11 snj 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} \
 		AWK=${TOOL_AWK:Q} \
 		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" || ${MKXORG} != "no"
+.if ${MKX11} != "no"
 MAKEFLIST_FLAGS=	-b
 MAKESRCTARS_FLAGS=	-x ${X11SRCDIR} -N ${NETBSDSRCDIR}/etc
 .else
 MAKEFLIST_FLAGS=
 MAKESRCTARS_FLAGS= 	-N ${NETBSDSRCDIR}/etc
 .endif
 .if ${MAKEVERBOSE} != 2
 MAKETARS_FLAGS+=	-q
 MAKESRCTARS_FLAGS+= 	-q
 .endif
 .if !defined(MAKETARSETS)

--- src/distrib/sets/sets.subr 2008/10/26 07:31:00	1.71
+++ src/distrib/sets/sets.subr 2008/11/15 22:05:12	1.71.2.1

 @@ -1,14 +1,14 @@
-#	$NetBSD: sets.subr,v 1.71 2008/10/26 07:31:00 mrg Exp $
+#	$NetBSD: sets.subr,v 1.71.2.1 2008/11/15 22:05:12 snj 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
 #	obsolete		controls if obsolete files are selected instead
 #	lkm			if != "no", enable LKM 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:
 @@ -161,26 +161,34 @@ case "$(type printf)" in
 esac
 oIFS=$IFS
 IFS="
+"
 for x in $(
 ${MAKE} -B -f- all <<EOMAKE
 .include <bsd.own.mk>
 .if (\${MKMAN} == "no" || empty(MANINSTALL:Mmaninstall))
 MKMANPAGES=no
 .else
 MKMANPAGES=yes
 .endif
 .if \${MKX11} != "no"
 . if \${X11FLAVOUR} == "Xorg"
 MKXORG:=yes
 MKX11:=no
 . else
 MKXORG:=no
 . endif
 .endif
 all:
 .for i in MACHINE MACHINE_ARCH MACHINE_CPU \
 		HAVE_GCC HAVE_GDB OBJECT_FMT TOOLCHAIN_MISSING \
 		${MKVARS}
 	@echo "export \$i=\${\$i}"
 .endfor
 EOMAKE
 ); do
 #	echo 1>&2 "DEBUG: read $x"
 	eval $x
 done
 IFS=$oIFS
 @@ -211,27 +219,27 @@ fi
 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.71 2008/10/26 07:31:00 mrg Exp $
+# 	# $NetBSD: sets.subr,v 1.71.2.1 2008/11/15 22:05:12 snj 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
 @@ -270,28 +278,28 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
 #	manz			${MKMANZ} != no
 #	modular			${MKMODULAR} != no
 #	nls			${MKNLS} != no
 #	nvi			${MKNVI} != no
 #	pam			${MKPAM} != no
 #	pf			${MKPF} != no
 #	pic			${MKPIC} != no
 #	postfix			${MKPOSTFIX} != no
 #	profile			${MKPROFILE} != no
 #	puffs			${MKPUFFS} != no
 #	sendmail		${MKSENDMAIL} != no
 #	share			${MKSHARE} != no
 #	skey			${MKSKEY} != no
-#	x11			${MKX11} != no
+#	x11			${MKX11} != no && ${X11FLAVOUR} == "XFree86"
-#	xorg			${MKXORG} != no
+#	xorg			${MKX11} != no && ${X11FLAVOUR} == "XFree86"
 #	yp			${MKYP} != no
+#
 #	gcc=<n>			<n> = value of ${HAVE_GCC}
 #	gdb=<n>			<n> = value of ${HAVE_GDB}
+#
 #	use_inet6		${USE_INET6} != no
 #	use_kerberos		${USE_KERBEROS} != no
 #	use_yp			${USE_YP} != no
+#
 #	.cat			if ${MKMANZ} != "no" && ${MKCATPAGES} != "no"
 #				  automatically append ".gz" to the filename
+#
 #	.man			if ${MKMANZ} != "no" && ${MKMAN} != "no"

--- src/doc/BUILDING.mdoc 2008/09/24 07:36:52	1.67
+++ src/doc/BUILDING.mdoc 2008/11/15 22:05:12	1.67.2.1

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: BUILDING.mdoc,v 1.67 2008/09/24 07:36:52 apb Exp $
+.\"	$NetBSD: BUILDING.mdoc,v 1.67.2.1 2008/11/15 22:05:12 snj Exp $
 .\"
 .\" Copyright (c) 2001-2008 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
 @@ -539,40 +539,28 @@ that the appropriate file ownership is s
 .DFLTn
+.
 .It Sy MKUPDATE
 .YorN
 Indicates whether all install operations intended to write to
 .Sy DESTDIR
 will compare file timestamps before installing, and skip the install
 phase if the destination files are up-to-date.
 This also has implications on full builds (see next subsection).
 .DFLTn
+.
 .It Sy MKX11
 .YorN
-Indicates whether X11R6 is built from
+Indicates whether X11 is built from
 .Sy X11SRCDIR .
 .Pp
 Mutually exclusive to
 .Sy MKXORG != no .
 .DFLTn
 .It Sy MKXORG
 .YorN
 Indicates whether X11R7 (modular Xorg) is built from
 .Sy X11SRCDIR .
 .Pp
 Mutually exclusive to
 .Sy MKX11 != no .
 .DFLTn
+.
 .It Sy TOOLDIR
 Directory to hold the host tools, once built.
 If specified, must be an absolute path.
 This directory should be unique to a given host system and
 .Nx
 source tree.
 (However, multiple targets may share the same
 .Sy TOOLDIR ;
 the target-dependent files have unique names.)  If unset, a default based
 on the
 .Xr uname 1
 @@ -626,26 +614,37 @@ when using
 .Aq bsd.*.mk
 outside the
 .Nx
 source tree.
+.
 .It Sy X11SRCDIR
 Directory containing the X11R6 source.
 If specified, must be an absolute path.
 The main X11R6 source is found in
 .Sy X11SRCDIR Ns Pa /xfree/xc .
 .DFLT
 .Dq /usr/xsrc
+.
 .It Sy X11FLAVOUR
 The style of X11 cross-built, set to either
 .Dq Xorg
 or
 .Dq XFree86 .
 .DFLT
 .Dq Xorg
 on amd64, i386, macppc, shark, sparc and sparc64 platforms,
 .Dq XFree86
 on everything else.
+.
 .El
+.
 .Ss \*qmake\*q variables for full builds
 These variables only affect the top level
 .Dq Makefile
 and do not affect manually building subtrees of the
 .Nx
 source code.
+.
 .Bl -tag -width "INSTALLWORLDDIR"
+.
 .It Sy INSTALLWORLDDIR
 Location for the

--- src/etc/Makefile 2008/10/19 22:05:20	1.359
+++ src/etc/Makefile 2008/11/15 22:05:12	1.359.2.1

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.359 2008/10/19 22:05:20 apb Exp $
+#	$NetBSD: Makefile,v 1.359.2.1 2008/11/15 22:05:12 snj 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
 @@ -148,31 +148,33 @@ PWD_MKDB_ENDIAN=
 .endif
 # distribution --
 #	Build a distribution
+#
 distribution: .PHONY .MAKE check_DESTDIR distrib-dirs
 .if !defined(DISTRIBUTION_DONE)
 .if !defined(INSTALL_DONE)
 	${MAKEDIRTARGET} ${NETBSDSRCDIR} include _DISTRIB=
 	${MAKEDIRTARGET} ${NETBSDSRCDIR} install _DISTRIB=
 .endif	# !INSTALL_DONE
 	${MAKEDIRTARGET} . install-etc-files
-.if ${MKXORG} != "no"
+. if ${MKX11} != "no"
 .  if ${X11FLAVOUR} == "Xorg"
 	${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/mit/xorg distribution
-.elif ${MKX11} != "no"
+.  else
 	${MAKEDIRTARGET} ${NETBSDSRCDIR}/x11 distribution
-.endif
+.  endif
 . 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 \
 @@ -180,35 +182,35 @@ RELEASEVARS=	BSDOBJDIR BSDSRCDIR BUILDID
 		INSTALLWORLDDIR \
 		KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR \
 		MACHINE MACHINE_ARCH MAKE MAKECONF MAKEFLAGS \
 		MAKEOBJDIR MAKEOBJDIRPREFIX MAKEVERBOSE \
 		MKBFD MKCATPAGES \
 		MKCRYPTO MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKCVS \
 		MKDEBUG MKDEBUGLIB MKDOC MKDYNAMICROOT \
 		MKGCC MKGCCCMDS MKGDB \
 		MKHESIOD MKHOSTOBJ MKHTML MKIEEEFP MKINET6 MKINFO MKIPFILTER \
 		MKKERBEROS MKLDAP MKLINKLIB MKLINT \
 		MKMAN MKMANZ MKNLS MKNVI MKOBJ MKOBJDIRS \
 		MKPAM MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
 		MKSHARE MKSKEY MKSOFTFLOAT MKSTATICLIB \
-		MKUNPRIVED MKUPDATE MKX11 MKXORG MKYP \
+		MKUNPRIVED MKUPDATE MKX11 MKYP \
 		NBUILDJOBS NETBSDSRCDIR \
 		NOCLEANDIR NODISTRIBDIRS NOINCLUDES \
 		OBJMACHINE \
 		RELEASEDIR RELEASEMACHINEDIR TOOLCHAIN_MISSING TOOLDIR \
 		USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS USE_LDAP \
 		USE_PAM USE_SKEY USE_YP \
 		USETOOLS USR_OBJMACHINE \
-		X11SRCDIR
+		X11SRCDIR X11FLAVOUR
 params: .PHONY
 .for var in ${RELEASEVARS}
 .if defined(${var})
 	@printf "%20s = '%-s'\n" ${var} ${${var}:Q}
 .else
 	@printf "%20s = (undefined)\n" ${var}
 .endif
 .endfor
 CLEANFILES+=	etc-release
 etc-release: .EXEC .MAKE
 	${_MKTARGET_CREATE}
 @@ -347,33 +349,33 @@ install-etc-files: .PHONY .MAKE check_DE
 .if (${MKCRYPTO} != "no")
 	${MAKEDIRTARGET} ${NETBSDSRCDIR}/usr.bin/ssh configinstall
 .endif
 .if (${MKPOSTFIX} != "no")
 	${MAKEDIRTARGET} ${NETBSDSRCDIR}/gnu/usr.sbin/postfix configinstall
 .endif
 # install-obsolete-lists --
 #	Install var/db/obsolete set lists; this is performed by "make build"
+#
 OBSOLETE.dir=		${.OBJDIR}/obsolete.dir
 OBSOLETE.files=		base comp etc games man misc tests text
-.if ${MKX11} != "no" || ${MKXORG} != "no"
+.if ${MKX11} != "no"
 OBSOLETE.files+=	xbase xcomp xetc xfont xserver
 .endif
 install-obsolete-lists: .PHONY .MAKE
 	mkdir -p ${OBSOLETE.dir}
-.if ${MKX11} != "no" || ${MKXORG} != "no"
+.if ${MKX11} != "no"
 	(cd ${NETBSDSRCDIR}/distrib/sets && \
 	    MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -b -t ${OBSOLETE.dir})
 .else
 	(cd ${NETBSDSRCDIR}/distrib/sets && \
 	    MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -t ${OBSOLETE.dir})
 .endif
 .for file in ${OBSOLETE.files}
 	${_MKMSG_INSTALL} ${DESTDIR}/var/db/obsolete/${file}
 	${ETC_INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${OBSOLETE.dir}/${file} ${DESTDIR}/var/db/obsolete
 .endfor

--- src/external/mit/xorg/server/Makefile 2008/08/28 07:21:44	1.4
+++ src/external/mit/xorg/server/Makefile 2008/11/15 22:05:12	1.4.8.1

 @@ -1,13 +1,9 @@
-#	$NetBSD: Makefile,v 1.4 2008/08/28 07:21:44 mrg Exp $
+#	$NetBSD: Makefile,v 1.4.8.1 2008/11/15 22:05:12 snj Exp $
 # Makefile for modular-xorg-server and drivers
 .include <bsd.own.mk>
 .if ${MKXORG_WITH_XSRC_XSERVER} != "no"
 SUBDIR= ../../../../x11/Xserver
 .else
 SUBDIR=	xorg-server drivers
 .endif
 .include <bsd.subdir.mk>

--- src/share/man/man5/mk.conf.5 2008/09/10 11:16:41	1.41
+++ src/share/man/man5/mk.conf.5 2008/11/15 22:05:12	1.41.2.1

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: mk.conf.5,v 1.41 2008/09/10 11:16:41 joerg Exp $
+.\"	$NetBSD: mk.conf.5,v 1.41.2.1 2008/11/15 22:05:12 snj Exp $
 .\"
 .\"  Copyright (c) 1999-2003 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
 @@ -669,43 +669,35 @@ that the appropriate file ownership is s
 .DFLTn
+.
 .It Sy MKUPDATE
 .YorN
 Indicates whether all install operations intended to write to
 .Sy DESTDIR
 will compare file timestamps before installing, and skip the install
 phase if the destination files are up-to-date.
 This also has implications on full builds (see next subsection).
 .DFLTn
+.
 .It Sy MKX11
 .YorN
-Indicates whether X11R6 is built and installed
+Indicates whether X11 is built and installed
 (by descending into
-.Pa src/x11 ) .
+.Pa src/x11
-.DFLTn
+or
-.Pp
+.Pa src/external/mit/xorg
-This is mutually exclusive to
+depending on the value of
-.Sy MKXORG!=no .
+.Sy X11FLAVOUR ) .
 .It Sy MKXORG
 .YorN
 Indicates whether X11R7 is built and installed
 (by descending into
 .Pa src/external/mit/xorg ) .
 .DFLTn
 .Pp
 This is mutually exclusive to
 .Sy MKX11!=no .
+.
 .It Sy MKYP
 .YorN
 Indicates whether the YP (NIS) infrastructure
 (libraries and support programs) is built.
 .DFLTy
+.
 .It Sy OBJMACHINE
 If defined, creates objdirs of the form
 .Pa obj. Ns Sy MACHINE ,
 where
 .Sy MACHINE
 is the current architecture (as per
 @@ -877,26 +869,42 @@ This may cause build or runtime problems
 source tree.
 .El
 .DFLT
 .Dq yes
 if building all or part of a whole
 .Nx
 source tree (detected automatically);
 .Dq no
 otherwise (to preserve traditional semantics of the
 .Aq bsd.*.mk
 .Xr make 1
 include files).
+.
 .It Sy X11FLAVOUR
 Picks which X11 distribution to cross-build with
 .Nx .
 Set to either
 .Dq Xorg
 or
 .Dq XFree86 .
 Only relevant if
 .Sy MKX11!=no .
 .Pp
 .Em Default :
 .Dq Xorg
 on alpha, i386, macppc, shark, sparc and sparc64 platforms.
 .Dq XFree86
 on everything else.
+.
 .El
+.
 .Ss pkgsrc system variables
+.
 Please see the pkgsrc guide at
 .Pa http://www.netbsd.org/Documentation/pkgsrc/
 or
 .Pa pkgsrc/doc/pkgsrc.txt
 for more variables used internally by the package system and
 .Pa ${PKGSRCDIR}/mk/defaults/mk.conf
 for package-specific examples.
+.
 .Sh FILES

--- src/share/mk/bsd.README 2008/10/26 23:13:24	1.236
+++ src/share/mk/bsd.README 2008/11/15 22:05:12	1.236.2.1

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.README,v 1.236 2008/10/26 23:13:24 apb Exp $
+#	$NetBSD: bsd.README,v 1.236.2.1 2008/11/15 22:05:12 snj 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:
 @@ -322,36 +322,30 @@ MKSTATICLIB	If "no", don't build or inst
 		Default: yes
 MKUNPRIVED	If not "no", don't set the owner/group/mode when installing
 		files or directories, and keep a metadata log of what
 		the owner/group/mode should be.  This allows a
 		non-root "make install".
 		Default: no
 MKUPDATE 	If not "no", 'make install' only installs targets that are
 		more recently modified in the source directories that their
 		installed counterparts.
 		Default: no
-MKX11		If not "no", 'make build' also descends into src/x11
+MKX11		If not "no", depending on the value of ${X11FLAVOUR},
-		to cross-build X11R6 and automatically enables creation
+		'make build' also descends into either src/x11 (XFree86) or
-		of X sets.
+		src/external/mit/xorg (modular Xorg) to cross-build X11 and
-		Mutually exclusive to MKXORG!=no
+		automatically enables creation of X sets.
 		Default: no
 MKXORG		If not "no", 'make build' also descends into
 		src/external/mit/xorg to cross-build X11R7 (modular Xorg)
 		and automatically enables creation of X sets.
 		Mutually exclusive to MKX11!=no
 		Default: no
 MKYP		If "no", disables building of YP (NIS)
 		infrastructure (libraries and support programs).
 		Default: yes
 USE_HESIOD	If "no", disables building Hesiod support into
 		various system utilities/libraries that support it.
 		If ${MKHESIOD} is "no", USE_HESIOD will also be
 		forced to "no".
 USE_INET6	If "no", disables building INET6 (IPv6) support into
 		various system utilities/libraries that support it.
 @@ -381,26 +375,31 @@ USE_SKEY	If "no", disables building S/ke
 		support it.  If ${MKSKEY} is "no", USE_SKEY will
 		also be forced to "no".
 		Default: no
 USE_SSP		If "no", disables GCC stack protection code, which
 		detects stack overflows and aborts the program. This
 		imposes some performance penalty.
 		Default: no
 USE_YP		If "no", disables building YP (NIS) support into
 		various system utilities/libraries that support it.
 		If ${MKYP} is "no", USE_YP will also be forced to "no".
 X11FLAVOUR	Set to "Xorg" or "XFree86", depending on whether to build
 		XFree86 or modular Xorg.  Only matters if MKX11!=no.
 		Default: "yes" on amd64, i386, macppc, shark, sparc and
 		sparc64, "no" on everything else.
 COPTS.lib<lib>
 OBJCOPTS.lib<lib>
 LDADD.lib<lib>
 CPPFLAGS.lib<lib>
 CXXFLAGS.lib<lib>
 COPTS.<prog>
 OBJCCOPTS.<prog>
 LDADD.<prog>
 CPPFLAGS.<prog>
 CXXFLAGS.<prog>	These provide a way to specify additions to the associated
 		variables in a way that applies only to a particular library
 		or program.  <lib> corresponds to the LIB variable set in
 		the library's makefile.  <prog> corresponds to either PROG

--- src/share/mk/bsd.own.mk 2008/10/29 23:46:52	1.542
+++ src/share/mk/bsd.own.mk 2008/11/15 22:05:12	1.542.2.1

 @@ -1,14 +1,14 @@
-#	$NetBSD: bsd.own.mk,v 1.542 2008/10/29 23:46:52 macallan Exp $
+#	$NetBSD: bsd.own.mk,v 1.542.2.1 2008/11/15 22:05:12 snj 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/}
+#
 @@ -653,31 +653,42 @@ MKCOMPAT:=	no
 	MKSHARE MKSKEY MKSTATICLIB \
 	MKYP
 ${var}?=	yes
 .endfor
+#
 # MK* options which default to "no".
+#
 .for var in \
 	MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \
 	MKMANZ MKMODULAR MKOBJDIRS \
 	MKPCC MKPCCCMDS \
 	MKSOFTFLOAT MKSTRIPIDENT \
-	MKUNPRIVED MKUPDATE MKX11 MKXORG
+	MKUNPRIVED MKUPDATE MKX11
 ${var}?=no
 .endfor
+#
 # Do we default to XFree86 or Xorg for this platform?
+#
 .if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || \
     ${MACHINE} == "macppc" || ${MACHINE} == "shark" || \
     ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
 X11FLAVOUR?=	Xorg
 .else
 X11FLAVOUR?=	XFree86
 .endif
+#
 # Force some options off if their dependencies are off.
+#
 .if ${MKCRYPTO} == "no"
 MKKERBEROS:=	no
 .endif
 .if ${MKMAN} == "no"
 MKCATPAGES:=	no
 MKHTML:=	no
 .endif
 .if ${MKLINKLIB} == "no"
 @@ -776,27 +787,27 @@ ${var}?= yes
+#
 # USE_* options which default to "no".
+#
 #.for var in
 #${var}?= no
 #.endfor
+#
 # Where X11 sources are and where it is installed to.
+#
 X11SRCDIR?=		/usr/xsrc
 X11SRCDIR.xc?=		${X11SRCDIR}/xfree/xc
 X11SRCDIR.local?=	${X11SRCDIR}/local
-.if ${MKXORG} != "no"
+.if ${X11FLAVOUR} == "Xorg"
 X11ROOTDIR?=		/usr/X11R7
 .else
 X11ROOTDIR?=		/usr/X11R6
 .endif
 X11BINDIR?=		${X11ROOTDIR}/bin
 X11ETCDIR?=		/etc/X11
 X11FONTDIR?=		${X11ROOTDIR}/lib/X11/fonts
 X11INCDIR?=		${X11ROOTDIR}/include
 X11LIBDIR?=		${X11ROOTDIR}/lib/X11
 X11MANDIR?=		${X11ROOTDIR}/man
 X11USRLIBDIR?=		${X11ROOTDIR}/lib
+#
 @@ -850,30 +861,27 @@ X11SRCDIR.${_dir}?=		${X11SRCDIRMIT}/${_
 	keyboard mouse vmmouse void
 X11SRCDIR.xf86-input-${_i}?=	${X11SRCDIRMIT}/xf86-input-${_i}/dist
 .endfor
 .for _v in \
 	apm ark ast ati chips cirrus cyrix glint i128 i740 imstt intel \
 	mach64 mga neomagic nsc nv nvxbox r128 radeonhd rendition \
 	s3 s3virge savage \
 	siliconmotion sis sunffb suncg6 tdfx tga trident tseng vesa vga via \
 	vmware wsfb
 X11SRCDIR.xf86-video-${_v}?=	${X11SRCDIRMIT}/xf86-video-${_v}/dist
 .endfor
-# Default to no old Xserver builds for now
+.if ${X11FLAVOUR} == "Xorg"
 MKXORG_WITH_XSRC_XSERVER?=	no
 .if ${MKXORG} != no
 X11DRI?=			yes
 .endif
 X11DRI?=			no
 X11LOADABLE?=			yes
+#
 # MAKEDIRTARGET dir target [extra make(1) params]
 #	run "cd $${dir} && ${MAKE} [params] $${target}", with a pretty message
+#
 MAKEDIRTARGET=\
 	@_makedirtarget() { \

--- src/share/mk/bsd.x11.mk 2008/10/25 22:27:36	1.70
+++ src/share/mk/bsd.x11.mk 2008/11/15 22:05:12	1.70.2.1

 @@ -1,53 +1,43 @@
-#	$NetBSD: bsd.x11.mk,v 1.70 2008/10/25 22:27:36 apb Exp $
+#	$NetBSD: bsd.x11.mk,v 1.70.2.1 2008/11/15 22:05:12 snj Exp $
 .include <bsd.init.mk>
 .if make(depend) || make(all) || make(dependall)
 .if (${MKX11} != "no" && ${MKXORG} != "no")
 .BEGIN:
 	@echo
 	@echo "ERROR: \$$MKX11 and \$$MKXORG are mutually exclusive."
 	@echo
 	@false
 .endif
 .endif
 BINDIR=			${X11BINDIR}
 LIBDIR=			${X11USRLIBDIR}
 MANDIR=			${X11MANDIR}
 COPTS+=			-fno-strict-aliasing
 .if defined(USE_SSP) && (${USE_SSP} != "no")
 CPPFLAGS+=		-DNO_ALLOCA
 .endif
 X11FLAGS.VERSION=	-DOSMAJORVERSION=1 -DOSMINORVERSION=6		# XXX
 #	 THREADS_DEFINES
 X11FLAGS.THREADS=	-DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API \
 			-DXNO_MTSAFE_PWDAPI
 #	 CONNECTION_FLAGS
 X11FLAGS.CONNECTION=	-DTCPCONN -DUNIXCONN -DHAS_STICKY_DIR_BIT \
 			-DHAS_FCHOWN
 .if (${USE_INET6} != "no")
 X11FLAGS.CONNECTION+=	-DIPv6
 .endif
 #	 EXT_DEFINES
-.if ${MKXORG} != "no"
+.if ${X11FLAVOUR} == "Xorg"
 X11FLAGS.BASE_EXTENSION=	-DMITMISC -DXTEST -DXTRAP -DXSYNC -DXCMISC \
 				-DXRECORD -DMITSHM -DBIGREQS -DXF86VIDMODE \
 				-DXF86MISC -DDPMSExtension -DEVI \
 				-DSCREENSAVER -DXV -DXVMC -DGLXEXT \
 				-DFONTCACHE -DRES
 X11FLAGS.PERVASIVE_EXTENSION=	-DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP \
 				-DXCSECURITY -DTOGCUP -DXF86BIGFONT \
 				-DDPMSExtension -DPIXPRIV -DPANORAMIX \
 				-DRENDER -DRANDR -DXFIXES -DDAMAGE \
 				-DCOMPOSITE -DXEVIE
 X11FLAGS.EXTENSION=	${X11FLAGS.BASE_EXTENSION} \
 			${X11FLAGS.PERVASIVE_EXTENSION}
 @@ -121,27 +111,27 @@ X11FLAGS.EXTENSION+=	-D__GLX_ALIGN64
     ${MACHINE} == "macppc"	|| \
     ${MACHINE} == "netwinder"	|| \
     ${MACHINE} == "ofppc"	|| \
     ${MACHINE} == "sgimips"	|| \
     ${MACHINE} == "sparc64"	|| \
     ${MACHINE} == "sparc"	|| \
     ${MACHINE} == "shark"
 #	LOADABLE
 X11FLAGS.LOADABLE=	-DXFree86LOADER -DIN_MODULE -DXFree86Module \
 			-fno-merge-constants
 .endif
 # XXX FIX ME
-.if ${MKXORG} != "no"
+.if ${X11FLAVOUR} == "Xorg"
 XVENDORNAMESHORT=	'"X.Org"'
 XVENDORNAME=		'"The X.Org Foundation"'
 XORG_RELEASE=		'"Release 1.4.2"'
 __XKBDEFRULES__=	'"xorg"'
 XLOCALE.DEFINES=	-DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
 			-DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
 # XXX oh yeah, fix me later
 XORG_VERSION_CURRENT="(((1) * 10000000) + ((4) * 100000) + ((2) * 1000) + 0)"
 .endif
 PRINT_PACKAGE_VERSION=	awk '/^PACKAGE_VERSION=/ {			\
 				match($$1, "([0-9]+\\.)+[0-9]+");	\
 @@ -345,27 +335,27 @@ _X11MANTRANSFORM= \
 	__bindir__		${X11BINDIR} \
 	__drivermansuffix__	4 \
 	__filemansuffix__	5 \
 	__LIB_MAN_SUFFIX__	3 \
 	__libmansuffix__	3 \
 	__logdir__		/var/log \
 	__mandir__		${X11MANDIR} \
 	__miscmansuffix__	7 \
 	__oslibmansuffix__	3 \
 	__projectroot__		${X11ROOTDIR} \
 	${X11EXTRAMANTRANSFORMS}
 # Note the escaping trick for _X11MANTRANSFORM using % to replace spaces
-.if ${MKXORG} == "no"
+.if ${X11FLAVOUR} != "Xorg"
 X11VERSION=	"XFree86 4.5.0"
 X11MANCPP?=	yes
 _X11MANTRANSFORM+= \
 	__vendorversion__	${X11VERSION:C/ /%/gW}
 .else
 XORGVERSION=	'"X.Org 7.3nb20081014" "X Version 11"'
 X11MANCPP?=	no
 _X11MANTRANSFORM+= \
 	__vendorversion__	${XORGVERSION:C/ /%/gW} \
 	__XCONFIGFILE__		xorg.conf \
 	__xconfigfile__		xorg.conf \
 	__xorgversion__		${XORGVERSION:C/ /%/gW} \
 	__XSERVERNAME__		Xorg \

--- src/usr.bin/ssh/Attic/Makefile.inc 2008/10/27 08:27:04	1.17
+++ src/usr.bin/ssh/Attic/Makefile.inc 2008/11/15 22:05:12	1.17.2.1

 @@ -1,37 +1,37 @@
-#	$NetBSD: Makefile.inc,v 1.17 2008/10/27 08:27:04 hubertf Exp $
+#	$NetBSD: Makefile.inc,v 1.17.2.1 2008/11/15 22:05:12 snj Exp $
 .include <bsd.own.mk>
 USE_FORT?= yes	# network client/server
 SSHDIST?= ${NETBSDSRCDIR}/crypto/dist/ssh
 CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP -DHAVE_MMAP -DHAVE_OPENPTY
 .PATH: ${SSHDIST}
 LDADD+=	-lssh -lcrypto -lcrypt -lz
 DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBZ}
 .if (${USE_PAM} != "no")
 CPPFLAGS+=-DUSE_PAM
 .else	# USE_PAM == no
 .if (${USE_SKEY} != "no")
 CPPFLAGS+=-DSKEY
 .endif
 .endif	# USE_PAM == no
 .if (${USE_KERBEROS} != "no")
 CPPFLAGS+=-DGSSAPI -I${DESTDIR}/usr/include/gssapi
 CPPFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/krb5 -DHEIMDAL
 .endif
-.if (${MKXORG} != "no")
+.if ${X11FLAVOUR} == "Xorg"
 CPPFLAGS+=-DX11BASE=\"/usr/X11R7\"
 .endif
 CPPFLAGS+=-DSUPPORT_UTMP -DSUPPORT_UTMPX
 CPPFLAGS+=-DLIBWRAP
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
 .endif