Sync to HEAD.

26 files changed, 170 insertions, 87 deletions

diff --git a/mk/Darwin.pkg.dist b/mk/Darwin.pkg.dist
index d924b7aafaa..27da3a6e8df 100644
--- a/mk/Darwin.pkg.dist
+++ b/mk/Darwin.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: Darwin.pkg.dist,v 1.32.2.1 2003/07/24 09:25:54 jlam Exp $
+#	$NetBSD: Darwin.pkg.dist,v 1.32.2.2 2003/08/01 19:00:19 jlam Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/mk/Darwin.x11.dist b/mk/Darwin.x11.dist
index a76dfebfeb5..878f23306e6 100644
--- a/mk/Darwin.x11.dist
+++ b/mk/Darwin.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: Darwin.x11.dist,v 1.21.2.1 2003/07/24 09:25:55 jlam Exp $
+#     $NetBSD: Darwin.x11.dist,v 1.21.2.2 2003/08/01 19:00:20 jlam Exp $
 #     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 #
 
diff --git a/mk/FreeBSD.pkg.dist b/mk/FreeBSD.pkg.dist
index 40950882101..506ec2f7e67 100644
--- a/mk/FreeBSD.pkg.dist
+++ b/mk/FreeBSD.pkg.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: FreeBSD.pkg.dist,v 1.23.4.1 2003/07/24 09:25:55 jlam Exp $
+#	$NetBSD: FreeBSD.pkg.dist,v 1.23.4.2 2003/08/01 19:00:20 jlam Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/mk/IRIX.pkg.dist b/mk/IRIX.pkg.dist
index 4607c50b0a6..49aa4ddf547 100644
--- a/mk/IRIX.pkg.dist
+++ b/mk/IRIX.pkg.dist
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.pkg.dist,v 1.22.4.1 2003/07/24 09:25:55 jlam Exp $
+# $NetBSD: IRIX.pkg.dist,v 1.22.4.2 2003/08/01 19:00:20 jlam Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
diff --git a/mk/IRIX.x11.dist b/mk/IRIX.x11.dist
index 359d42a243b..24400475ffd 100644
--- a/mk/IRIX.x11.dist
+++ b/mk/IRIX.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: IRIX.x11.dist,v 1.1.4.1 2003/07/24 09:25:55 jlam Exp $
+#     $NetBSD: IRIX.x11.dist,v 1.1.4.2 2003/08/01 19:00:21 jlam Exp $
 #     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 #
 
diff --git a/mk/Linux.pkg.dist b/mk/Linux.pkg.dist
index 5a5d0cc582e..2262f0ab710 100644
--- a/mk/Linux.pkg.dist
+++ b/mk/Linux.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: Linux.pkg.dist,v 1.39.2.1 2003/07/24 09:25:55 jlam Exp $
+#	$NetBSD: Linux.pkg.dist,v 1.39.2.2 2003/08/01 19:00:21 jlam Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
diff --git a/mk/Linux.x11.dist b/mk/Linux.x11.dist
index 0a764c58e33..85798dac08b 100644
--- a/mk/Linux.x11.dist
+++ b/mk/Linux.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: Linux.x11.dist,v 1.27.2.1 2003/07/24 09:25:56 jlam Exp $
+#     $NetBSD: Linux.x11.dist,v 1.27.2.2 2003/08/01 19:00:22 jlam Exp $
 #     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 #
 
diff --git a/mk/NetBSD.pkg.dist b/mk/NetBSD.pkg.dist
index 2f564b2589d..fdf96957c3e 100644
--- a/mk/NetBSD.pkg.dist
+++ b/mk/NetBSD.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: NetBSD.pkg.dist,v 1.49.2.1 2003/07/24 09:25:56 jlam Exp $
+#	$NetBSD: NetBSD.pkg.dist,v 1.49.2.2 2003/08/01 19:00:22 jlam Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/mk/NetBSD.x11.dist b/mk/NetBSD.x11.dist
index a028b6d892d..33867e93bcc 100644
--- a/mk/NetBSD.x11.dist
+++ b/mk/NetBSD.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: NetBSD.x11.dist,v 1.28.2.1 2003/07/24 09:25:56 jlam Exp $
+#     $NetBSD: NetBSD.x11.dist,v 1.28.2.2 2003/08/01 19:00:23 jlam Exp $
 #     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 #
 
diff --git a/mk/OpenBSD.pkg.dist b/mk/OpenBSD.pkg.dist
index e3218ea8bf2..8d72bf8804f 100644
--- a/mk/OpenBSD.pkg.dist
+++ b/mk/OpenBSD.pkg.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: OpenBSD.pkg.dist,v 1.22.4.1 2003/07/24 09:25:56 jlam Exp $
+#	$NetBSD: OpenBSD.pkg.dist,v 1.22.4.2 2003/08/01 19:00:23 jlam Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/mk/OpenBSD.x11.dist b/mk/OpenBSD.x11.dist
index 23b7eaa883e..bca2165f7b3 100644
--- a/mk/OpenBSD.x11.dist
+++ b/mk/OpenBSD.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: OpenBSD.x11.dist,v 1.15.4.1 2003/07/24 09:25:56 jlam Exp $
+#     $NetBSD: OpenBSD.x11.dist,v 1.15.4.2 2003/08/01 19:00:23 jlam Exp $
 #  	OpenBSD: BSD.x11.dist,v 1.4 2002/06/09 06:15:15 todd Exp 
 #	FreeBSD: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 
diff --git a/mk/PKGVIEWS b/mk/PKGVIEWS
index 46150cbb029..2413da5f8b4 100644
--- a/mk/PKGVIEWS
+++ b/mk/PKGVIEWS
@@ -1,4 +1,4 @@
-$NetBSD: PKGVIEWS,v 1.1.2.6 2003/07/30 11:27:45 jlam Exp $
+$NetBSD: PKGVIEWS,v 1.1.2.7 2003/08/01 19:00:24 jlam Exp $
 
 Package views integration plan:
 ==============================
@@ -50,3 +50,18 @@ Possible problems:
     the true location of libraries and headers.  We need to think of
     a way to hide ${LOCALBASE} but not ${DEPOTBASE}/* from the package
     configure/build processes.
+
+Currently, we do the following transformations:
+
+	${LOCALBASE} --> ${BUILDLINK_DIR}
+	${X11BASE}   --> ${BUILDLINK_X11_DIR}
+
+We could change the rule to be filter out ${LOCALBASE}/* unless they
+match:
+
+	${LOCALBASE}/${DEPOT_SUBDIR}/${_pkg_}
+	${X11BASE}/${DEPOT_SUBDIR}/${_pkg_}
+
+for _pkg_ in ${BUILDLINK_PACKAGES}.  We only want to do this change
+for "pkgviews" packages, since "overwrite" packages will still work
+because "overwrite" packages ignore the existence of pkgviews.
diff --git a/mk/SunOS.pkg.dist b/mk/SunOS.pkg.dist
index 40aaaaf48a1..85b536c31ca 100644
--- a/mk/SunOS.pkg.dist
+++ b/mk/SunOS.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: SunOS.pkg.dist,v 1.44.2.1 2003/07/24 09:25:57 jlam Exp $
+#	$NetBSD: SunOS.pkg.dist,v 1.44.2.2 2003/08/01 19:00:25 jlam Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
diff --git a/mk/SunOS.x11.dist b/mk/SunOS.x11.dist
index a5b8887c558..632f3a932c2 100644
--- a/mk/SunOS.x11.dist
+++ b/mk/SunOS.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: SunOS.x11.dist,v 1.28.2.1 2003/07/24 09:25:57 jlam Exp $
+#     $NetBSD: SunOS.x11.dist,v 1.28.2.2 2003/08/01 19:00:25 jlam Exp $
 #     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 #
 
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index fceb9502a61..b17ae7b780d 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.160.2.3 2003/07/24 22:00:07 jlam Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.160.2.4 2003/08/01 19:00:26 jlam Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -608,6 +608,16 @@ ATERM_USE_GREEK?= NO
 # Possible: category/pkg
 # Default: not defined
 
+CANNA_GROUP?=	daemon
+# Used in the canna-server-bin package to specify the server group.
+# Possible: any group name
+# Default: daemon
+
+CANNA_USER?=	daemon
+# Used in the canna-server-bin package to specify the server user.
+# Possible: any user name
+# Default: daemon
+
 #CDRECORD_CONF= ${PKG_SYSCONFDIR}/cdrecord.conf
 # The location of the cdrtools/cdrecord configuration file. The
 # sysutils/cdrecord pkg issues a warning if the cdrtools default of
@@ -908,12 +918,6 @@ IRCD_HYBRID_USE_SYSLOG?=        NO
 # Possible: YES, NO
 # Default: NO
 
-IRCD_HYBRID_DPATH?=	/etc/ircd-hybrid/
-# Used by ircd-hybrid. Specify the directory pathname where the daemon expects
-# various configuration files.
-# Possible: any path, with a trailing `/'
-# Default: /etc/ircd-hybrid/
-
 IRCD_HYBRID_LPATH?=	/var/log/ircd-hybrid.log
 # Used by ircd-hybrid. Specify the pathname of the daemon logfile.
 # Note: only used if IRCD_HYBRID_USE_LOGFILE is "YES".
@@ -1181,6 +1185,12 @@ MOZILLA_USE_XFT?=	NO
 # Possible: YES, NO
 # Default: NO
 
+MPLAYER_DISABLE_DRIVERS?=
+# Whitespace separated list of output drivers that are not wanted in
+# mplayer/gmplayer's binary.
+# Possible: arts esd faad nas sdl
+# Default: empty
+
 MPLAYER_ENABLE_RUNTIME_CPU_DETECTION?= YES
 # Used by mplayer to enable runtime CPU detection -- this makes
 # binary packages work on different machines than the one compiled one,
@@ -1552,11 +1562,6 @@ RPM_DB_PREFIX?=	/var/pkg
 # Possible: empty, any number of theme-name-[0-9]*.*.tar.gz
 # Default: Set to include about 180 themes available on themes.freshmeat.net
 
-#SDL_USE_NAS=
-# Used in SDL package to enable use of the network audio system
-# Possible: defined, not defined
-# Default: not defined
-
 SDIST_PAWD?= pwd
 # If you are using amd you'll want to use pawd instead of pwd to derive
 # the current working directory.
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk
index 7419134a424..f6f25e2fa5b 100644
--- a/mk/bsd.pkg.install.mk
+++ b/mk/bsd.pkg.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.40.4.2 2003/07/29 20:34:17 jlam Exp $
+# $NetBSD: bsd.pkg.install.mk,v 1.40.4.3 2003/08/01 19:00:27 jlam Exp $
 #
 # This Makefile fragment is included by package Makefiles to use the common
 # INSTALL/DEINSTALL scripts.  To use this Makefile fragment, simply:
@@ -25,6 +25,11 @@ INSTALL_FILE=		${WRKDIR}/.INSTALL
 # install/deinstall logic.
 #
 _HEADER_TMPL?=		${.CURDIR}/../../mk/install/header
+.if !defined(HEADER_EXTRA_TMPL) && exists(${.CURDIR}/HEADER)
+HEADER_EXTRA_TMPL?=	${.CURDIR}/HEADER
+.else
+HEADER_EXTRA_TMPL?=	# empty
+.endif
 .if !defined(DEINSTALL_EXTRA_TMPL) && exists(${.CURDIR}/DEINSTALL)
 DEINSTALL_EXTRA_TMPL?=	${.CURDIR}/DEINSTALL
 .else
@@ -43,10 +48,12 @@ _FOOTER_TMPL?=		${.CURDIR}/../../mk/install/footer
 #	files that are concatenated to form the DEINSTALL/INSTALL scripts.
 #
 DEINSTALL_TEMPLATES=	${_HEADER_TMPL}
+DEINSTALL_TEMPLATES+=	${HEADER_EXTRA_TMPL}
 DEINSTALL_TEMPLATES+=	${DEINSTALL_EXTRA_TMPL}
 DEINSTALL_TEMPLATES+=	${DEINSTALL_TMPL}
 DEINSTALL_TEMPLATES+=	${_FOOTER_TMPL}
 INSTALL_TEMPLATES=	${_HEADER_TMPL}
+INSTALL_TEMPLATES+=	${HEADER_EXTRA_TMPL}
 INSTALL_TEMPLATES+=	${INSTALL_TMPL}
 INSTALL_TEMPLATES+=	${INSTALL_EXTRA_TMPL}
 INSTALL_TEMPLATES+=	${_FOOTER_TMPL}
@@ -321,26 +328,27 @@ install-rcd-scripts:	# do nothing
 
 .for _script_ in ${RCD_SCRIPTS}
 RCD_SCRIPT_SRC.${_script_}?=	${FILESDIR}/${_script_}.sh
+RCD_SCRIPT_WRK.${_script_}?=	${WRKDIR}/${_script_}
 
 .  if !empty(RCD_SCRIPT_SRC.${_script_})
 .    if exists(${RCD_SCRIPT_SRC.${_script_}})
-generate-rcd-scripts: ${WRKDIR}/${_script_}
-${WRKDIR}/${_script_}: ${RCD_SCRIPT_SRC.${_script_}}
+generate-rcd-scripts: ${RCD_SCRIPT_WRK.${_script_}}
+${RCD_SCRIPT_WRK.${_script_}}: ${RCD_SCRIPT_SRC.${_script_}}
 	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} |			\
 		${SED} ${FILES_SUBST_SED} > ${.TARGET}
 	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
 
 install-rcd-scripts: install-rcd-${_script_}
-install-rcd-${_script_}: ${WRKDIR}/${_script_}
+install-rcd-${_script_}: ${RCD_SCRIPT_WRK.${_script_}}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	if [ ! -d ${RCD_SCRIPTS_EXAMPLEDIR} ]; then			\
 		${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
 			-m 0755	${RCD_SCRIPTS_EXAMPLEDIR};		\
 	fi
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	if [ -f ${WRKDIR}/${_script_} ]; then				\
-		${INSTALL_SCRIPT} ${WRKDIR}/${_script_}			\
-			${RCD_SCRIPTS_EXAMPLEDIR};			\
+	if [ -f ${RCD_SCRIPT_WRK.${_script_}} ]; then			\
+		${INSTALL_SCRIPT} ${RCD_SCRIPT_WRK.${_script_}}		\
+			${RCD_SCRIPTS_EXAMPLEDIR}/${_script_};		\
 	fi
 .    endif
 .  endif
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index ff1af73b673..701b4d79908 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1216.2.14 2003/07/30 22:07:22 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1216.2.15 2003/08/01 19:00:28 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -30,6 +30,36 @@ MAKE_ENV+=	MAKECONF=/dev/null
 MAKE_ENV+=	USETOOLS="${USETOOLS}"
 .endif
 
+# This has to come first to avoid showing all BUILD_DEFS added by this
+# Makefile, which are usually not customizable.
+.PHONY: pre-fetch build-defs-message
+pre-fetch: build-defs-message
+.if !target(build-defs-message)
+build-defs-message: ${WRKDIR}
+.if defined(BUILD_DEFS) && !empty(BUILD_DEFS)
+.if !exists(${WRKDIR}/.bdm_done)
+	@${ECHO} "=========================================================================="
+	@${ECHO} "The following variables will affect the build process of this package,"
+	@${ECHO} "${PKGNAME}.  Their current value is shown below:"
+	@${ECHO} ""
+.  for var in ${BUILD_DEFS:O:u}
+.    if !defined(${var})
+	@${ECHO} "        * ${var} (not defined)"
+.    elif defined(${var}) && empty(${var})
+	@${ECHO} "        * ${var} (defined)"
+.    else
+	@${ECHO} "        * ${var} = ${${var}}"
+.    endif
+.  endfor
+	@${ECHO} ""
+	@${ECHO} "You may want to abort the process now with CTRL+C and change their value"
+	@${ECHO} "before continuing.  Be sure to run \`${MAKE} clean' after the changes."
+	@${ECHO} "=========================================================================="
+	@${TOUCH} ${WRKDIR}/.bdm_done
+.endif
+.endif
+.endif
+
 ##### Some NetBSD platforms permitted the user to set the binary format while
 ##### they were in the process of transitioning to ELF. Packages with BSD-style
 ##### make systems need this setting to be passed in.
@@ -551,7 +581,9 @@ PLIST_SUBST+=	PERL5_ARCHLIB=${PERL5_ARCHLIB:S/^${LOCALBASE}\///}
 .endif
 
 .if defined(USE_NEW_TEXINFO)
-.  if defined(INFO_FILES)
+INFO_FILES?=
+USE_MAKEINFO?=	no		# default to not using makeinfo
+.  if !empty(INFO_FILES) || empty(USE_MAKEINFO:M[nN][oO])
 .    include "../../mk/texinfo.mk"
 .  endif
 .endif
@@ -4202,10 +4234,10 @@ print-summary-data:
 	fi;
 	@${ECHO} "maintainer ${PKGPATH} ${MAINTAINER}"
 	@${ECHO} "categories ${PKGPATH} ${CATEGORIES}"
-	@if [ -f ${DESCR_SRC} ]; then					\
-		${ECHO}  "descr ${PKGPATH} ${DESCR_SRC}";		\
-	else								\
-		${ECHO}  "descr ${PKGPATH} /dev/null";			\
+	@if [ -f ${DESCR_SRC} ]; then						\
+		${ECHO}  "descr ${PKGPATH} ${DESCR_SRC:S;${_PKGSRCDIR}/;;g}";	\
+	else									\
+		${ECHO}  "descr ${PKGPATH} /dev/null";				\
 	fi
 	@${ECHO} "prefix ${PKGPATH} ${PREFIX}"
 .endif
@@ -4621,6 +4653,7 @@ depend:
 
 .PHONY: tags
 # Same goes for tags
+.PHONY: tags
 .if !target(tags)
 tags:
 .endif
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk
index 2b670bcbf85..9fac7583ed8 100644
--- a/mk/buildlink2/bsd.buildlink2.mk
+++ b/mk/buildlink2/bsd.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.90.4.4 2003/07/30 22:10:49 jlam Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.90.4.5 2003/08/01 19:00:34 jlam Exp $
 #
 # An example package buildlink2.mk file:
 #
@@ -1082,7 +1082,6 @@ ${BUILDLINK_DIR}/${_prog_}: ${_GNU_MISSING}
 .if defined(USE_NEW_TEXINFO)
 # install-info and makeinfo handling.
 #
-.if defined(INFO_FILES)
 # Create an install-info script that is a "no operation" command
 # as registration of info files is handled by the INSTALL script.
 CONFIGURE_ENV+=	INSTALL_INFO="${BUILDLINK_DIR}/bin/install-info"
@@ -1129,5 +1128,4 @@ ${BUILDLINK_DIR}/bin/makeinfo: ${_GNU_MISSING}
 	${ECHO} 'exit 1' >>  ${.TARGET}
 	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
 .  endif # USE_MAKEINFO
-.endif # INFO_FILES
 .endif # USE_NEW_TEXINFO
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index a072b8c229b..b5ade286a5d 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.bulk-pkg.mk,v 1.45 2003/07/11 23:54:32 grant Exp $
+#	$NetBSD: bsd.bulk-pkg.mk,v 1.45.2.1 2003/08/01 19:00:36 jlam Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org>
@@ -126,8 +126,8 @@ bulk-cache:
 	@${ECHO_MSG} "BULK> Sorting build order."
 	tsort ${DEPENDSTREEFILE} > ${ORDERFILE}
 	@${ECHO_MSG} "BULK> Generating up and down dependency files."
-	${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat -u ${DEPENDSTREEFILE} > ${SUPPORTSFILE}
-	${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat -d ${DEPENDSTREEFILE} > ${DEPENDSFILE}
+	${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat up ${DEPENDSTREEFILE} > ${SUPPORTSFILE}
+	${AWK} -f ${_PKGSRCDIR}/mk/bulk/tflat down ${DEPENDSTREEFILE} > ${DEPENDSFILE}
 	@${ECHO_MSG} "BULK> Generating package name <=> package directory cross reference file"
 	@${ECHO_MSG} "      (this may take a while)."
 	cd ${_PKGSRCDIR} && ${SH} mk/bulk/printindex ${BROKENFILE} > ${INDEXFILE}
diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox
index c77cd78a815..ca43e4a3a89 100755
--- a/mk/bulk/mksandbox
+++ b/mk/bulk/mksandbox
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.20 2003/05/06 17:42:03 jmmv Exp $
+# $NetBSD: mksandbox,v 1.20.4.1 2003/08/01 19:00:37 jlam Exp $
 #
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
@@ -43,7 +43,9 @@ pkgsrc=/usr/pkgsrc
 src=/usr/src
 
 kernel=""
-sandboxDirs="/bin /sbin /lib /libexec /usr/X11R6 /usr/bin /usr/games /usr/include /usr/lib /usr/libdata /usr/libexec /usr/lkm /usr/share /usr/sbin /var/mail"
+sandboxMountDirs="/bin /sbin /lib /libexec /usr/X11R6 /usr/bin /usr/games /usr/include /usr/lib /usr/libdata /usr/libexec /usr/lkm /usr/share /usr/sbin /var/mail"
+sandboxEmptyDirs="/var/run /var/log /var/spool/mqueue"
+sandboxEmptyFiles="/var/run/utmp /var/run/utmpx /var/log/wtmp /var/log/wtmpx"
 
 opsys=`uname -s`
 case "$opsys" in
@@ -99,7 +101,7 @@ SunOS)
 	mountprog=/sbin/mount
 	paxprog=/bin/pax
 	sedprog=/usr/xpg4/bin/sed
-	sandboxDirs="/bin /sbin /kernel /lib /proc /usr/X11R6 /usr/bin /usr/ccs /usr/games /usr/include /usr/lib /usr/openwin /usr/share /usr/sbin /usr/ucb /usr/xpg4 /var/mail"
+	sandboxMountDirs="/bin /sbin /kernel /lib /proc /usr/X11R6 /usr/bin /usr/ccs /usr/games /usr/include /usr/lib /usr/openwin /usr/share /usr/sbin /usr/ucb /usr/xpg4 /var/mail"
 	;;
 *)
 	echo "Unknown Operating System ($opsys) - good luck"
@@ -197,7 +199,7 @@ rm -f $sandbox/etc/localtime
 $cpprog /usr/share/zoneinfo/GMT $sandbox/etc/localtime
 
 echo "Make empty dirs upon which to mount the null mounts"
-for d in $sandboxDirs; do	
+for d in $sandboxMountDirs; do	
 	test -d $d || continue;
 	$mkdirprog $sandbox$d;
 	$mountprog $mountflags -r $d $sandbox$d;
@@ -213,13 +215,17 @@ $mkdirprog $sandbox/var/games
 $chownprog games:games $sandbox/var/games
 $chmodprog 2775 $sandbox/var/games
 
-echo "Making /var/run and /var/run/utmp(x) in $sandbox"
-$mkdirprog $sandbox/var/run
-cp /dev/null $sandbox/var/run/utmp
-cp /dev/null $sandbox/var/run/utmpx
+for d in $sandboxEmptyDirs; do
+	test -d $d || continue
+	echo "Making $d in $sandbox"
+	$mkdirprog $sandbox$d
+done
 
-echo "Making /var/spool/mqueue in $sandbox"
-$mkdirprog $sandbox/var/spool/mqueue
+for f in $sandboxEmptyFiles; do
+	test -f $f || continue
+	echo "Making $f in $sandbox"
+	$cpprog /dev/null $sandbox$f
+done
 
 echo "Mount $src from $sandbox"
 $mkdirprog $sandbox/usr/src
diff --git a/mk/bulk/tflat b/mk/bulk/tflat
index f1fd17424f2..5a25b298062 100755
--- a/mk/bulk/tflat
+++ b/mk/bulk/tflat
@@ -1,4 +1,4 @@
-# $NetBSD: tflat,v 1.9 2003/07/11 23:54:33 grant Exp $
+# $NetBSD: tflat,v 1.9.2.1 2003/08/01 19:00:38 jlam Exp $
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -42,11 +42,11 @@ BEGIN {
 		exit(1);
 	}
 
-	if ( ARGV[1] == "-u" ) {
+	if ( ARGV[1] == "up" ) {
 		up=1;
 	}
 	else{
-		if ( ARGV[1] == "-d" ) { up=0; }
+		if ( ARGV[1] == "down" ) { up=0; }
 		else{
 			printf("tflat: unknown option  \"%s\"\n",ARGV[1]);
 			usage();
@@ -177,10 +177,10 @@ function usage(){
 	printf("         packages which depend upon a given package or alternatively\n");
 	printf("         all packages which are depend upon by a given package.\n");
 	printf("\n");
-	printf("Usage:\ttflat -u|-d depfile\n");
+	printf("Usage:\ttflat up|down depfile\n");
 	printf("\n");
-	printf("Options:\t-d\tgo down the depends tree (ie \"foo depends on:\")\n");
-	printf("        \t-u\tgo up the depends tree (ie \"foo is depended on by:\")\n");
+	printf("Options:\tdown\tgo down the depends tree (ie \"foo depends on:\")\n");
+	printf("        \tup\tgo up the depends tree (ie \"foo is depended on by:\")\n");
 	printf("\n");
 	printf("Input file format is in the form\n");
 	printf("foo	bar\n");
@@ -194,8 +194,8 @@ function usage(){
 	printf("The typical use is:\n");
 	printf("cd /usr/pkgsrc\n");
 	printf("./mk/bulk/printdepends > .depends\n");
-	printf("./mk/bulk/tflat -u .depends > .supports\n");
-	printf("./mk/bulk/tflat -d .depends > .requires\n");
+	printf("./mk/bulk/tflat up .depends > .supports\n");
+	printf("./mk/bulk/tflat down .depends > .requires\n");
 	printf("\n");
 
 }
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index 1e815b8d33b..2f600292d40 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.49.2.1 2003/07/24 09:26:00 jlam Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.49.2.2 2003/08/01 19:00:31 jlam Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
diff --git a/mk/gcc.buildlink2.mk b/mk/gcc.buildlink2.mk
index 910e5c9881b..ea6dc578cdb 100644
--- a/mk/gcc.buildlink2.mk
+++ b/mk/gcc.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.buildlink2.mk,v 1.2.4.1 2003/07/24 09:26:00 jlam Exp $
+# $NetBSD: gcc.buildlink2.mk,v 1.2.4.2 2003/08/01 19:00:32 jlam Exp $
 #
 # USE_GCC2
 #	If defined, use gcc from lang/gcc.
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index 250e8cbb3d7..086cb14f5fb 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.14 2003/05/25 18:39:12 jlam Exp $
+# $NetBSD: java-vm.mk,v 1.14.4.1 2003/08/01 19:00:32 jlam Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -43,9 +43,9 @@ PKG_JVMS_ACCEPTED?=	${_PKG_JVMS}
 # Note: The wonka configuration is still under development
 #
 .if defined(USE_JAVA2) && !empty(USE_JAVA2:M[yY][eE][sS])
-_PKG_JVMS?=		sun-jdk13 sun-jdk14 blackdown-jdk13 wonka
+_PKG_JVMS?=		sun-jdk13 sun-jdk14 blackdown-jdk13 wonka jdk12 jdk13
 .else
-_PKG_JVMS?=		jdk sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe wonka
+_PKG_JVMS?=		jdk sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe wonka jdk12 jdk13
 .endif
 
 # To be deprecated: if PKG_JVM is explicitly set, then use it as the
@@ -78,6 +78,10 @@ _PKG_JVM_DEFAULT?=	kaffe
 # These lists are copied from the JVM package Makefiles.
 _ONLY_FOR_PLATFORMS.jdk= \
 	NetBSD-*-i386 Linux-*-i[3-6]86
+_ONLY_FOR_PLATFORMS.jdk12= \
+	NetBSD-1.[6-9]*-i386 NetBSD-2*-i386
+_ONLY_FOR_PLATFORMS.jdk13= \
+	NetBSD-1.[6-9]*-i386 NetBSD-2*-i386
 _ONLY_FOR_PLATFORMS.blackdown-jdk13= \
 	NetBSD-*-i386 NetBSD-*-powerpc NetBSD-*-sparc \
 	Linux-*-i[3-6]86 Linux-*-powerpc Linux-*-sparc
@@ -104,6 +108,8 @@ _PKG_JVMS_ACCEPTED+=	${PKG_JVMS_ACCEPTED:M${_jvm_}}
 .endfor
 
 _JAVA_PKGBASE.jdk=		jdk
+_JAVA_PKGBASE.jdk12=		jdk12
+_JAVA_PKGBASE.jdk13=		jdk13
 _JAVA_PKGBASE.sun-jdk13=	sun-jdk13
 _JAVA_PKGBASE.sun-jdk14=	sun-jdk14
 _JAVA_PKGBASE.blackdown-jdk13=	blackdown-jdk13
@@ -180,6 +186,8 @@ _PKG_JVM=		"none"
 .endif
 
 BUILDLINK_DEPENDS.jdk?=			jdk-[0-9]*
+BUILDLINK_DEPENDS.jdk12?=		jdk12-[0-9]*
+BUILDLINK_DEPENDS.jdk13?=		jdk13-[0-9]*
 BUILDLINK_DEPENDS.sun-jdk13?=		sun-jdk13-[0-9]*
 BUILDLINK_DEPENDS.sun-jre13?=		sun-jre13-[0-9]*
 BUILDLINK_DEPENDS.sun-jdk14?=		sun-jdk14-[0-9]*
@@ -190,6 +198,8 @@ BUILDLINK_DEPENDS.kaffe?=		kaffe-[0-9]*
 BUILDLINK_DEPENDS.wonka?=		wonka-[0-9]*
 
 _JRE.jdk=		jdk
+_JRE.jdk12=		jdk12
+_JRE.jdk13=		jdk13
 _JRE.sun-jdk13=		sun-jre13
 _JRE.sun-jdk14=		sun-jre14
 _JRE.blackdown-jdk13=	blackdown-jre13
@@ -202,6 +212,14 @@ _JAVA_BASE_CLASSES=	classes.zip
 _JDK_PKGSRCDIR=		../../lang/jdk
 _JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
 _JAVA_HOME_DEFAULT=	${LOCALBASE}/java/jdk-1.1.8
+.elif ${_PKG_JVM} == "jdk12"
+_JDK_PKGSRCDIR=		../../wip/jdk12
+_JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
+_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/jdk-1.2.2
+.elif ${_PKG_JVM} == "jdk13"
+_JDK_PKGSRCDIR=		../../wip/jdk13
+_JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
+_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/jdk-1.3.1
 .elif ${_PKG_JVM} == "sun-jdk13"
 _JDK_PKGSRCDIR=		../../lang/sun-jdk13
 _JRE_PKGSRCDIR=		../../lang/sun-jre13
diff --git a/mk/pthread.buildlink2.mk b/mk/pthread.buildlink2.mk
index f37cbecd0d5..83e9d6e130d 100644
--- a/mk/pthread.buildlink2.mk
+++ b/mk/pthread.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink2.mk,v 1.13.4.1 2003/07/24 09:26:01 jlam Exp $
+# $NetBSD: pthread.buildlink2.mk,v 1.13.4.2 2003/08/01 19:00:33 jlam Exp $
 #
 # The pthreads strategy for pkgsrc is to "bless" a particular pthread
 # package as the Official Pthread Replacement (OPR).  A package that uses
diff --git a/mk/texinfo.mk b/mk/texinfo.mk
index 932ee3aa016..768e22b8ee0 100644
--- a/mk/texinfo.mk
+++ b/mk/texinfo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texinfo.mk,v 1.14 2003/07/02 16:07:02 grant Exp $
+# $NetBSD: texinfo.mk,v 1.14.2.1 2003/08/01 19:00:33 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk when INFO_FILES and
 # USE_NEW_TEXINFO are defined.
@@ -12,11 +12,15 @@
 .if !defined(TEXINFO_MK)
 TEXINFO_MK=	# defined
 
+.include "../../mk/bsd.prefs.mk"
+
 #
 # This switch is here only until all packages are converted to use
 # the new framework.
 #
 .if defined(USE_NEW_TEXINFO)
+
+.if !empty(INFO_FILES)
 #
 # Handle install-info.
 # 
@@ -32,22 +36,22 @@ INFO_DIR?=	info
 # Does the system have the install-info command?
 # Any version will fit (really?).
 _INSTALL_INFO=
-.for _i_ in /usr/bin/install-info /sbin/install-info
-.  if exists(${_i_})
+.  for _i_ in /usr/bin/install-info /sbin/install-info
+.    if exists(${_i_})
 _INSTALL_INFO=			${_i_}
-.  endif
-.endfor
+.    endif
+.  endfor
 
 # If no install-info was found provide one with the pkg_install-info package.
 # And set INSTALL_INFO to the install-info command it provides.
-.if empty(_INSTALL_INFO)
+.  if empty(_INSTALL_INFO)
 _PKG_INSTALL_INFO_PREFIX_DEFAULT=	${LOCALBASE}
 DEPENDS+=	pkg_install-info-[0-9]*:../../pkgtools/pkg_install-info
 EVAL_PREFIX+=	_PKG_INSTALL_INFO_PREFIX=pkg_install-info
 INSTALL_INFO=	${_PKG_INSTALL_INFO_PREFIX}/bin/pkg_install-info
-.else
+.  else
 INSTALL_INFO=	${_INSTALL_INFO}
-.endif
+.  endif
 
 # Generate INSTALL/DEINSTALL scripts code for handling install-info.
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../mk/install/install-info
@@ -55,30 +59,26 @@ DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/../../mk/install/install-info
 FILES_SUBST+=		INFO_FILES=${INFO_FILES:Q}
 FILES_SUBST+=		INSTALL_INFO=${INSTALL_INFO:Q}
 FILES_SUBST+=		INFO_DIR=${INFO_DIR:Q}
+.endif # INFO_FILES
 
-# When not using buildlink2 set INSTALL_INFO in environment to ${ECHO}
+# When not using buildlink2 set INSTALL_INFO in environment to ${TRUE}
 # so the package build/install step does not register itself the info
 # files as this is the job of the INSTALL script.
-# WARNING: this is far from being failsafe.
-# When not using buildlink2 patch files so that install-info is _not_
-# run are likely to be needed.
+# This is far from being 100% robust but it is "Mostly Harmless"
+# when it fails to catch some install-info invocations.
 .if !empty(USE_BUILDLINK2:M[nN][oO])
 CONFIGURE_ENV+=		INSTALL_INFO="${TRUE}"
 MAKE_ENV+=		INSTALL_INFO="${TRUE}"
 .endif
 
+.if empty(USE_MAKEINFO:M[nN][oO])
 #
-# Handle makeinfo if requested.
+# Handle makeinfo.
 #
 
 # Minimum required version for the GNU makeinfo command.
 TEXINFO_REQD?=	3.12
 
-# By default makeinfo is not needed for building.
-USE_MAKEINFO?=		NO
-
-.if empty(USE_MAKEINFO:M[nN][oO])
-
 # Argument to specify maximum info files size for newer versions
 # of makeinfo. This argument is supported since makeinfo 4.1.
 _MAKEINFO_SPLIT_SIZE_ARG+=	--split-size=50000