 @@ -1,35 +1,35 @@
-#	$NetBSD: xorg-pkg-ver.mk,v 1.8 2015/08/09 10:09:07 aymeric Exp $
+#	$NetBSD: xorg-pkg-ver.mk,v 1.8.8.1 2018/06/09 15:35:37 martin Exp $
 # when including this make sure PROG is set so that $X11SRCDIR.$PROG
 # is a valid setting.  set XORG_PKG_VER_PROG if PROG is wrong.
 # set XORG_PKG_VER_CONFIG_PATH if "configure" at the top-level is wrong.
 XORG_PKG_VER_PROG?=	${PROG}
 XORG_PKG_VER_CONFIG_PATH?=	configure
 _XORG_PKG_CONFIGURE_PATH=	${X11SRCDIR.${XORG_PKG_VER_PROG}}/${XORG_PKG_VER_CONFIG_PATH}
 .if exists(${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure)
 XORG_PKG_PACKAGE_VERSION!= \
 	${TOOL_AWK} -F= '/^PACKAGE_VERSION=/ {			\
 	     match($$2, "([0-9]+\\.)+[0-9]+");			\
 	     version = substr($$2, RSTART, RLENGTH);		\
 	     print version;					\
 	     exit 0;						\
 	}' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
 .if !empty(XORG_PKG_PACKAGE_VERSION)
 CPPFLAGS+=	-DPACKAGE_VERSION=\"${XORG_PKG_PACKAGE_VERSION:Q}\"
-CPPFLAGS+=	-DVERSION=\"${XORG_PKG_PACKAGE_VERSION:Q}\"
+CPPFLAGS+=	-DVERSION=\"${XORG_PKG_PACKAGE_VERSION:q}\"
 .endif
 XORG_PKG_PACKAGE_STRING!= \
 	${TOOL_AWK} -F= '/^PACKAGE_STRING=/ {			\
 	     match($$2, "[-_a-zA-Z]+[ 	]+([0-9]+\\.)+[0-9]+");	\
 	     string = substr($$2, RSTART, RLENGTH);		\
 	     print string;					\
 	     exit 0;						\
 	}' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
 .if !empty(XORG_PKG_PACKAGE_STRING)
 CPPFLAGS+=	-DPACKAGE_STRING=\"${XORG_PKG_PACKAGE_STRING:Q}\"
 .endif

 @@ -1,43 +1,43 @@
-#	$NetBSD: Makefile.inc,v 1.3 2016/03/22 08:25:22 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.3.10.1 2018/06/09 15:35:38 martin Exp $
+#
 #	Configuration variables (default values are below):
+#
 #	S	must be set to the top of the 'sys' tree.
 #	RISCOSDST	may be set to the location of the directory where library
 #		objects are to be built.  Defaults to ${.OBJDIR}/lib/riscos.
 #	RISCOSMISCCPPFLAGS
 #		Miscellaneous cpp flags to be passed to the library's Makefile
 #		when building.
 #	RISCOSMISCMAKEFLAGS
 #		Miscellaneous flags to be passed to the library's Makefile when
 #		building.  See library's Makefile for more details about
 #		supported flags and their default values.
 # Default values:
 RISCOSDST?=		${.OBJDIR}/lib/riscos
 RISCOSDIR=		${S}/arch/acorn32/stand/lib
 RISCOSLIB=		${RISCOSDST}/libriscos.a
 RISCOSMAKE= \
 	cd ${RISCOSDIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
 	  MAKEOBJDIR=${RISCOSDST} ${MAKE} \
-	    CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
+	    CC=${CC:q} CFLAGS=${CFLAGS:q} \
-	    AS=${AS:Q} AFLAGS=${AFLAGS:Q} \
+	    AS=${AS:q} AFLAGS=${AFLAGS:q} \
-	    LD=${LD:Q} STRIP=${STRIP:Q} \
+	    LD=${LD:q} STRIP=${STRIP:q} \
-	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:Q} \
+	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \
-	    RISCOSCPPFLAGS=${CPPFLAGS:S@^-I.@-I../../.@g:Q} \
+	    RISCOSCPPFLAGS=${CPPFLAGS:S@^-I.@-I../../.@g:q} \
-	    RISCOSMISCCPPFLAGS=${RISCOSMISCCPPFLAGS:Q} \
+	    RISCOSMISCCPPFLAGS=${RISCOSMISCCPPFLAGS:q} \
 	    ${RISCOSMISCMAKEFLAGS}
 ${RISCOSLIB}:		.NOTMAIN .MAKE __always_make_riscoslib
 	@echo making sure the riscos library is up to date...
 	@${RISCOSMAKE} libriscos.a
 clean:			.NOTMAIN cleanriscoslib
 cleanriscoslib:		.NOTMAIN
 	@echo cleaning the riscos library objects
 	@if [ -d "${RISCOSDST}" ]; then ${RISCOSMAKE} clean; fi
 cleandir distclean:	.NOTMAIN cleandirriscoslib
 cleandirriscoslib:	.NOTMAIN

 @@ -1,37 +1,37 @@
-#	$NetBSD: Makefile.inc,v 1.9 2016/03/22 08:25:22 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.9.10.1 2018/06/09 15:35:38 martin Exp $
 #	$OpenBSD: Makefile.inc,v 1.4 2001/03/29 03:58:17 mickey Exp $
+#
 #	NOTE:	$S must correspond to the top of the 'sys' tree
 #		$HPPA must correspond to the top of hppa tree
 SPMATHDIR=	${HPPA}/spmath
 SPMATHDST?=	${.OBJDIR}/lib/spmath
 SPMATH=		${SPMATHDST}/spmath.o
 SPMATH_PROF=	${SPMATHDST}/spmath.po
 SPMATHMAKE= \
 	cd ${SPMATHDIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
 	  MAKEOBJDIR=${SPMATHDST} ${MAKE} \
-	    CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
+	    CC=${CC:q} CFLAGS=${CFLAGS:q} \
-	    SPMATHCPPFLAGS=${CPPFLAGS:S@^-I.@-I. -I../../.@g:Q} \
+	    SPMATHCPPFLAGS=${CPPFLAGS:S@^-I.@-I. -I../../.@g:q} \
-	    AS=${AS:Q} AFLAGS=${AFLAGS:Q} \
+	    AS=${AS:q} AFLAGS=${AFLAGS:q} \
-	    LD=${LD:Q} STRIP=${STRIP:Q} \
+	    LD=${LD:q} STRIP=${STRIP:q} \
-	    CPP=${CPP:Q} STRIP=${STRIP:Q} AR=${AR:Q} \
+	    CPP=${CPP:q} STRIP=${STRIP:q} AR=${AR:q} \
-	    NM=${NM:Q} LORDER=${LORDER:Q} \
+	    NM=${NM:q} LORDER=${LORDER:q} \
-	    XMACHINE=${MACHINE:Q} XMACHINE_ARCH=${MACHINE_ARCH:Q}
+	    XMACHINE=${MACHINE:q} XMACHINE_ARCH=${MACHINE_ARCH:q}
 ${SPMATH}:	.NOTMAIN .MAKE __always_make_spmath
 	@echo making sure the spmath library is up to date...
 	@${SPMATHMAKE} spmath.o
 ${SPMATH_PROF}:	.NOTMAIN .MAKE __always_make_spmath
 	@echo making sure the profiled spmath library is up to date...
 	@${SPMATHMAKE} spmath.po
 __CLEANSPMATH:	.NOTMAIN .MAKE __always_make_spmath
 	@echo cleaning the spmath library objects
 	@${SPMATHMAKE} clean

 @@ -1,45 +1,45 @@
-#	$NetBSD: Makefile.inc,v 1.16 2016/03/22 08:25:22 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.16.10.1 2018/06/09 15:35:37 martin Exp $
+#
 #	Configuration variables (default values are below):
+#
 #	S	must be set to the top of the 'sys' tree.
 #	I386DST	may be set to the location of the directory where library
 #		objects are to be built.  Defaults to ${.OBJDIR}/lib/i386.
 #	I386MISCCPPFLAGS
 #		Miscellaneous cpp flags to be passed to the library's Makefile
 #		when building.
 #	I386MISCMAKEFLAGS
 #		Miscellaneous flags to be passed to the library's Makefile when
 #		building.  See library's Makefile for more details about
 #		supported flags and their default values.
 # Default values:
 I386DST?=		${.OBJDIR}/lib/i386
 #I386DIR=		$S/arch/i386/stand/lib
 I386LIB=		${I386DST}/libi386.a
 CWARNFLAGS.clang+=	-Wno-tautological-compare
 I386MAKE= \
 	cd ${I386DIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
 	    MAKEOBJDIR=${I386DST} ${MAKE} \
-	    CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
+	    CC=${CC:q} CFLAGS=${CFLAGS:q} \
-	    AS=${AS:Q} AFLAGS=${AFLAGS:Q} \
+	    AS=${AS:q} AFLAGS=${AFLAGS:q} \
-	    LD=${LD:Q} STRIP=${STRIP:Q} \
+	    LD=${LD:q} STRIP=${STRIP:q} \
-	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:Q} \
+	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \
-	    I386CPPFLAGS=${CPPFLAGS:S@^-I.@-I../../.@g:Q} \
+	    I386CPPFLAGS=${CPPFLAGS:S@^-I.@-I../../.@g:q} \
-	    I386MISCCPPFLAGS=${I386MISCCPPFLAGS:Q} \
+	    I386MISCCPPFLAGS=${I386MISCCPPFLAGS:q} \
 	    ${I386MISCMAKEFLAGS}
 ${I386LIB}:		.NOTMAIN __always_make_i386lib
 	@echo making sure the i386 library is up to date...
 	@${I386MAKE} libi386.a
 clean:			.NOTMAIN cleani386lib
 cleani386lib:		.NOTMAIN
 	@echo cleaning the i386 library objects
 	@if [ -d "${I386DST}" ]; then ${I386MAKE} clean; fi
 cleandir distclean:	.NOTMAIN cleandiri386lib
 cleandiri386lib:	.NOTMAIN

 @@ -1,43 +1,43 @@
-#	$NetBSD: Makefile.inc,v 1.4 2016/03/22 08:25:22 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.4.10.1 2018/06/09 15:35:38 martin Exp $
+#
 #	Configuration variables (default values are below):
+#
 #	S	must be set to the top of the 'sys' tree.
 #	EFIDST	may be set to the location of the directory where library
 #		objects are to be built.  Defaults to ${.OBJDIR}/lib/efi.
 #	EFIMISCCPPFLAGS
 #		Miscellaneous cpp flags to be passed to the library's Makefile
 #		when building.
 #	EFIMISCMAKEFLAGS
 #		Miscellaneous flags to be passed to the library's Makefile when
 #		building.  See library's Makefile for more details about
 #		supported flags and their default values.
 # Default values:
 EFIDST?=		${.OBJDIR}/efi/libefi
 EFIDIR?=		$S/arch/ia64/stand/efi/libefi
 EFILIB=			${EFIDST}/libefi.a
 EFIMAKE= \
 	cd ${EFIDIR} && MAKEOBJDIRPREFIX= && unset MAKEOBJDIRPREFIX && \
 	    MAKEOBJDIR=${EFIDST} ${MAKE} \
-	    CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
+	    CC=${CC:q} CFLAGS=${CFLAGS:q} \
-	    AS=${AS:Q} AFLAGS=${AFLAGS:Q} \
+	    AS=${AS:q} AFLAGS=${AFLAGS:q} \
-	    LD=${LD:Q} STRIP=${STRIP:Q} \
+	    LD=${LD:q} STRIP=${STRIP:q} \
-	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:Q} \
+	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \
-	    EFICPPFLAGS=${CPPFLAGS:S@^-I.@-I../../.@g:Q} \
+	    EFICPPFLAGS=${CPPFLAGS:S@^-I.@-I../../.@g:q} \
-	    EFIMISCCPPFLAGS=${EFIMISCCPPFLAGS:Q} \
+	    EFIMISCCPPFLAGS=${EFIMISCCPPFLAGS:q} \
 	    ${EFIMISCMAKEFLAGS}
 ${EFILIB}:		.NOTMAIN __always_make_efilib
 	@echo making sure the efi library is up to date...
 	@${EFIMAKE} libefi.a
 clean:			.NOTMAIN cleanefilib
 cleanefilib:		.NOTMAIN
 	@echo cleaning the efi library objects
 	@if [ -d "${EFIDST}" ]; then ${EFIMAKE} clean; fi
 cleandir distclean:	.NOTMAIN cleandirefilib
 cleandirefilib:		.NOTMAIN

 @@ -1,54 +1,54 @@
-#	$NetBSD: Makefile.inc,v 1.20 2016/03/22 08:25:22 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.20.10.1 2018/06/09 15:35:38 martin Exp $
+#
 #	Configuration variables (default values are below):
+#
 #	S	must be set to the top of the 'sys' tree.
 #	FPSPDST	may be set to the location of the directory where library
 #		objects are to be built.  Defaults to ${.OBJDIR}/lib/kern.
 #	FPSP_AS	isn't there. We always build an object file.
 #	FPSPMISCCPPFLAGS
 #		Miscellaneous cpp flags to be passed to the library's Makefile
 #		when building.
 #	FPSPMISCMAKEFLAGS
 #		Miscellaneous flags to be passed to the library's Makefile when
 #		building.  See library's Makefile for more details about
 #		supported flags and their default values.
 # Default values:
 FPSPDST?=	${.OBJDIR}/lib/fpsp
 FPSPDOTDIR?= ../../.
-FPSPDIR=	${S:S@^.@${FPSPDOTDIR}@:Q}/arch/m68k/fpsp
+FPSPDIR=	${S:S@^.@${FPSPDOTDIR}@:q}/arch/m68k/fpsp
 FPSPOBJ=	${FPSPDST}/fpsp.o
 HAS_FPSP!=	grep '^\#define	FPSP	1$$' opt_fpsp.h || echo
 .if !empty(HAS_FPSP)
 FPSP=		${FPSPOBJ}
 .endif
-#	    CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
+#	    CC=${CC:q} CFLAGS=${CFLAGS:q} \
-#	    AS=${AS:Q} AFLAGS=${AFLAGS:Q} \
+#	    AS=${AS:q} AFLAGS=${AFLAGS:q} \
-#	    LD=${LD:Q} STRIP=${STRIP:Q} \
+#	    LD=${LD:q} STRIP=${STRIP:q} \
 FPSPMAKE= \
-	cd ${FPSPDST} && ${MAKE} -f ${FPSPDIR:Q}/Makefile \
+	cd ${FPSPDST} && ${MAKE} -f ${FPSPDIR:q}/Makefile \
-	    FPSPDIR=${FPSPDIR:Q} \
+	    FPSPDIR=${FPSPDIR:q} \
-	    CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
+	    CC=${CC:q} CFLAGS=${CFLAGS:q} \
-	    LD=${LD:Q} STRIP=${STRIP:Q} \
+	    LD=${LD:q} STRIP=${STRIP:q} \
 	    MACHINE=${MACHINE} \
-	    MACHINE_ARCH=${MACHINE_ARCH:Q} \
+	    MACHINE_ARCH=${MACHINE_ARCH:q} \
-	    FPSPCPPFLAGS=${CPPFLAGS:S@^-I.@-I${FPSPDOTDIR}@g:Q} \
+	    FPSPCPPFLAGS=${CPPFLAGS:S@^-I.@-I${FPSPDOTDIR}@g:q} \
-	    FPSPMISCCPPFLAGS=${FPSPMISCCPPFLAGS:Q} \
+	    FPSPMISCCPPFLAGS=${FPSPMISCCPPFLAGS:q} \
-	    FPSPDIR=${FPSPDIR:Q} \
+	    FPSPDIR=${FPSPDIR:q} \
 	    ${FPSPMISCMAKEFLAGS}
 ${FPSP}:		.NOTMAIN __always_make_fpsp
 	@echo making sure the 68040 FPSP is up to date...
 	@${FPSPMAKE} fpsp.o
 ${FPSPLIB_PROF}:	.NOTMAIN __always_make_fpsp
 	@echo making sure the profiled 68040 FPSP is up to date...
 	@${FPSPMAKE} fpsp.po
 clean:			.NOTMAIN cleanfpsp
 cleanfpsp:		.NOTMAIN __always_make_fpsp
 	@echo cleaning the 68040 FPSP objects

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.inc,v 1.22 2016/03/22 08:25:23 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.22.10.1 2018/06/09 15:35:37 martin Exp $
+#
 #	Configuration variables (default values are below):
+#
 #	S	must be set to the top of the 'sys' tree.
 #	COMPATDST
 #		may be set to the location of the directory where library
 #		objects are to be built.  Defaults to ${.OBJDIR}/lib/compat.
 #	COMPAT_AS
 #		may be set to 'obj' to build a object from the library's
 #		object files.  (Otherwise, a library will be built.)
 #		Defaults to 'library'.
 #	COMPATMISCMAKEFLAGS
 #		Miscellaneous flags to be passed to the library's Makefile when
 @@ -23,39 +23,39 @@ COMPATDOTDIR?= ../../.
 COMPATDIR=		${S:S@^.@${COMPATDOTDIR}@:Q}/compat/common
 .if (${COMPAT_AS} == "obj")
 COMPATLIB=		${COMPATDST}/libcompat.o
 COMPATLIB_PROF=	${COMPATDST}/libcompat.po
 .else
 COMPATLIB=		${COMPATDST}/libcompat.a
 COMPATLIB_PROF=	${COMPATDST}/libcompat_p.a
 .endif
 LIBCOMPATLNBN=	llib-lcompat.ln
 COMPATLIBLN=	${COMPATDST}/${LIBCOMPATLNBN}
 COMPATMAKE= \
-	cd ${COMPATDST} && ${MAKE} -f ${COMPATDIR:Q}/Makefile \
+	cd ${COMPATDST} && ${MAKE} -f ${COMPATDIR:q}/Makefile \
-	    COMPATDIR=${COMPATDIR:Q} \
+	    COMPATDIR=${COMPATDIR:q} \
-	    CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
+	    CC=${CC:q} CFLAGS=${CFLAGS:q} \
-	    AS=${AS:Q} AFLAGS=${AFLAGS:Q} \
+	    AS=${AS:q} AFLAGS=${AFLAGS:q} \
-	    AR=${AR:Q} NM=${NM:Q} \
+	    AR=${AR:q} NM=${NM:q} \
-	    LORDER=${LORDER:Q} \
+	    LORDER=${LORDER:q} \
-	    TSORT=${TSORT:Q} \
+	    TSORT=${TSORT:q} \
-	    RANLIB=${RANLIB:Q} \
+	    RANLIB=${RANLIB:q} \
-	    LD=${LD:Q} LDFLAGS=${LDFLAGS:Q} \
+	    LD=${LD:q} LDFLAGS=${LDFLAGS:q} \
-	    STRIP=${STRIP:Q} \
+	    STRIP=${STRIP:q} \
-	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:Q} \
+	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \
-	    COMPATCPPFLAGS=${CPPFLAGS:S@^-I.@-I${COMPATDOTDIR}@g:Q} \
+	    COMPATCPPFLAGS=${CPPFLAGS:S@^-I.@-I${COMPATDOTDIR}@g:q} \
-	    LINTFLAGS=${KERNLINTFLAGS:Q} \
+	    LINTFLAGS=${KERNLINTFLAGS:q} \
 	    ${COMPATMISCMAKEFLAGS}
 ${COMPATLIB}:		.NOTMAIN .MAKE __always_make_compatlib
 	@echo making sure the compat library is up to date...
 .if (${COMPAT_AS} == "library")
 	@${COMPATMAKE} libcompat.a
 .else
 	@${COMPATMAKE} libcompat.o
 .endif
 ${COMPATLIB_PROF}:	.NOTMAIN .MAKE __always_make_compatlib
 	@echo making sure the profiled compat library is up to date...
 .if (${COMPAT_AS} == "library")

 @@ -1,63 +1,63 @@
-#	$NetBSD: Makefile.inc,v 1.4 2017/01/24 11:09:14 nonaka Exp $
+#	$NetBSD: Makefile.inc,v 1.4.6.1 2018/06/09 15:35:37 martin Exp $
+#
 #	Configuration variables (default values are below):
+#
 #	S	must be set to the top of the 'sys' tree.
 #	GNUEFIDST	may be set to the location of the directory where library
 #		objects are to be built.  Defaults to ${.OBJDIR}/lib/gnuefi.
 #	GNUEFI_AS	may be set to 'obj' to build a object from the library's
 #		object files.  (Otherwise, a library will be built.)
 #		Defaults to 'library'.
 #	GNUEFIMISCCPPFLAGS
 #		Miscellaneous cpp flags to be passed to the library's Makefile
 #		when building.
 #	GNUEFIMISCMAKEFLAGS
 #		Miscellaneous flags to be passed to the library's Makefile when
 #		building.  See library's Makefile for more details about
 #		supported flags and their default values.
 # Default values:
 GNUEFIDST?=		${.OBJDIR}/lib/gnuefi
 GNUEFI_AS?=		library
 GNUEFIDOTDIR?= ../../.
 CWARNFLAGS.clang+=	-Wno-format-extra-args
-GNUEFIDIR=		${S:S@^.@${GNUEFIDOTDIR}@:Q}/lib/libgnuefi
+GNUEFIDIR=		${S:S@^.@${GNUEFIDOTDIR}@:q}/lib/libgnuefi
 .if (${GNUEFI_AS} == "obj")
 GNUEFILIB=		${GNUEFIDST}/libgnuefi.o
 GNUEFILIB_PROF=	${GNUEFIDST}/libgnuefi.po
 .else
 GNUEFILIB=		${GNUEFIDST}/libgnuefi.a
 GNUEFILIB_PROF=	${GNUEFIDST}/libgnuefi_p.a
 .endif
 ZLIBSRCDIR:=	${.PARSEDIR}/../../../common/dist/zlib
 GNUEFIMISCCPPFLAGS+=-I${ZLIBSRCDIR}
 GNUEFIMAKE= \
-	cd ${GNUEFIDST} && ${MAKE} -f ${GNUEFIDIR:Q}/Makefile \
+	cd ${GNUEFIDST} && ${MAKE} -f ${GNUEFIDIR:q}/Makefile \
-	    GNUEFIDIR=${GNUEFIDIR:Q} \
+	    GNUEFIDIR=${GNUEFIDIR:q} \
-	    CC=${CC:Q} CFLAGS=${CFLAGS:Q} CPUFLAGS= \
+	    CC=${CC:q} CFLAGS=${CFLAGS:q} CPUFLAGS= \
-	    AS=${AS:Q} AFLAGS=${AFLAGS:Q} \
+	    AS=${AS:q} AFLAGS=${AFLAGS:q} \
-	    LORDER=${LORDER:Q} \
+	    LORDER=${LORDER:q} \
-	    TSORT=${TSORT:Q} \
+	    TSORT=${TSORT:q} \
-	    LD=${LD:Q} STRIP=${STRIP:Q} \
+	    LD=${LD:q} STRIP=${STRIP:q} \
-	    AR=${AR:Q} NM=${NM:Q} \
+	    AR=${AR:q} NM=${NM:q} \
-	    RANLIB=${RANLIB:Q} SIZE=${SIZE:Q} \
+	    RANLIB=${RANLIB:q} SIZE=${SIZE:q} \
-	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:Q} \
+	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \
-	    GNUEFICPPFLAGS=${CPPFLAGS:S@^-I.@-I${GNUEFIDOTDIR}@g:Q} \
+	    GNUEFICPPFLAGS=${CPPFLAGS:S@^-I.@-I${GNUEFIDOTDIR}@g:q} \
-	    GNUEFIMISCCPPFLAGS=${GNUEFIMISCCPPFLAGS:Q} \
+	    GNUEFIMISCCPPFLAGS=${GNUEFIMISCCPPFLAGS:q} \
-	    LIBGNUEFI_ARCH=${LIBGNUEFI_ARCH:Q} \
+	    LIBGNUEFI_ARCH=${LIBGNUEFI_ARCH:q} \
 	    ${GNUEFIMISCMAKEFLAGS}
 ${GNUEFILIB}:		.NOTMAIN .MAKE __always_make_gnuefilib
 	@echo making sure the gnuefi library is up to date...
 .if (${GNUEFI_AS} == "library")
 	@${GNUEFIMAKE} libgnuefi.a
 .else
 	@${GNUEFIMAKE} libgnuefi.o
 .endif
 ${GNUEFILIB_PROF}:		.NOTMAIN .MAKE __always_make_gnuefilib
 	@echo making sure the profiled gnuefi library is up to date...
 .if (${GNUEFI_AS} == "library")

 @@ -1,64 +1,64 @@
-#	$NetBSD: Makefile.inc,v 1.44 2015/10/29 00:18:55 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.44.10.1 2018/06/09 15:35:38 martin Exp $
+#
 #	Configuration variables (default values are below):
+#
 #	S	must be set to the top of the 'sys' tree.
 #	KERNDST	may be set to the location of the directory where library
 #		objects are to be built.  Defaults to ${.OBJDIR}/lib/kern.
 #	KERN_AS	may be set to 'obj' to build a object from the library's
 #		object files.  (Otherwise, a library will be built.)
 #		Defaults to 'library'.
 #	KERNMISCCPPFLAGS
 #		Miscellaneous cpp flags to be passed to the library's Makefile
 #		when building.
 #	KERNMISCMAKEFLAGS
 #		Miscellaneous flags to be passed to the library's Makefile when
 #		building.  See library's Makefile for more details about
 #		supported flags and their default values.
 # Default values:
 KERNDST?=	${.OBJDIR}/lib/kern
 KERN_AS?=	library
 KERNDOTDIR?= ../../.
-KERNDIR=	${S:S@^.@${KERNDOTDIR}@:Q}/lib/libkern
+KERNDIR=	${S:S@^.@${KERNDOTDIR}@:q}/lib/libkern
 .if (${KERN_AS} == "obj")
 KERNLIB=	${KERNDST}/libkern.o
 KERNLIB_PROF=	${KERNDST}/libkern.po
 .else
 KERNLIB=	${KERNDST}/libkern.a
 KERNLIB_PROF=	${KERNDST}/libkern_p.a
 .endif
 LIBKERNLNBN=	llib-lkern.ln
 KERNLIBLN=	${KERNDST}/${LIBKERNLNBN}
 KERNMAKE= \
-	cd ${KERNDST} && ${MAKE} -f ${KERNDIR:Q}/Makefile \
+	cd ${KERNDST} && ${MAKE} -f ${KERNDIR:q}/Makefile \
-	    KERNDIR=${KERNDIR:Q} \
+	    KERNDIR=${KERNDIR:q} \
-	    CC=${CC:Q} CFLAGS=${CFLAGS:Q} CPUFLAGS= \
+	    CC=${CC:q} CFLAGS=${CFLAGS:q} CPUFLAGS= \
-	    AS=${AS:Q} AFLAGS=${AFLAGS:Q} \
+	    AS=${AS:q} AFLAGS=${AFLAGS:q} \
-	    LORDER=${LORDER:Q} \
+	    LORDER=${LORDER:q} \
-	    TSORT=${TSORT:Q} \
+	    TSORT=${TSORT:q} \
-	    LD=${LD:Q} STRIP=${STRIP:Q} \
+	    LD=${LD:q} STRIP=${STRIP:q} \
-	    AR=${AR:Q} NM=${NM:Q} \
+	    AR=${AR:q} NM=${NM:q} \
-	    RANLIB=${RANLIB:Q} SIZE=${SIZE:Q} \
+	    RANLIB=${RANLIB:q} SIZE=${SIZE:q} \
-	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:Q} \
+	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \
-	    KERNCPPFLAGS=${CPPFLAGS:S@^-I.@-I${KERNDOTDIR}@g:Q} \
+	    KERNCPPFLAGS=${CPPFLAGS:S@^-I.@-I${KERNDOTDIR}@g:q} \
-	    KERNMISCCPPFLAGS=${KERNMISCCPPFLAGS:Q} \
+	    KERNMISCCPPFLAGS=${KERNMISCCPPFLAGS:q} \
-	    LINTFLAGS=${KERNLINTFLAGS:Q} \
+	    LINTFLAGS=${KERNLINTFLAGS:q} \
-	    LIBKERN_ARCH=${LIBKERN_ARCH:Q} \
+	    LIBKERN_ARCH=${LIBKERN_ARCH:q} \
-	    COMMON_MACHINE_ARCH=${COMMON_MACHINE_ARCH:Q} \
+	    COMMON_MACHINE_ARCH=${COMMON_MACHINE_ARCH:q} \
 	    ${KERNMISCMAKEFLAGS}
 ${KERNLIB}:		.NOTMAIN .MAKE __always_make_kernlib
 	@echo making sure the kern library is up to date...
 .if (${KERN_AS} == "library")
 	@${KERNMAKE} libkern.a
 .else
 	@${KERNMAKE} libkern.o
 .endif
 ${KERNLIB_PROF}:	.NOTMAIN .MAKE __always_make_kernlib
 	@echo making sure the profiled kern library is up to date...
 .if (${KERN_AS} == "library")

 @@ -1,62 +1,62 @@
-#	$NetBSD: Makefile.inc,v 1.23 2016/03/22 08:25:23 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.23.10.1 2018/06/09 15:35:38 martin Exp $
+#
 #	Configuration variables (default values are below):
+#
 #	S	must be set to the top of the 'sys' tree.
 #	SADST	may be set to the location of the directory where library
 #		objects are to be built.  Defaults to ${.OBJDIR}/lib/sa.
 #	SA_AS	may be set to 'obj' to build a object from the library's
 #		object files.  (Otherwise, a library will be built.)
 #		Defaults to 'library'.
 #	SAMISCCPPFLAGS
 #		Miscellaneous cpp flags to be passed to the library's Makefile
 #		when building.
 #	SAMISCMAKEFLAGS
 #		Miscellaneous flags to be passed to the library's Makefile when
 #		building.  See library's Makefile for more details about
 #		supported flags and their default values.
 # Default values:
 SADST?=		${.OBJDIR}/lib/sa
 SA_AS?=		library
 SADOTDIR?= ../../.
 CWARNFLAGS.clang+=	-Wno-format-extra-args
-SADIR=		${S:S@^.@${SADOTDIR}@:Q}/lib/libsa
+SADIR=		${S:S@^.@${SADOTDIR}@:q}/lib/libsa
 .if (${SA_AS} == "obj")
 SALIB=		${SADST}/libsa.o
 SALIB_PROF=	${SADST}/libsa.po
 .else
 SALIB=		${SADST}/libsa.a
 SALIB_PROF=	${SADST}/libsa_p.a
 .endif
 ZLIBSRCDIR:=	${.PARSEDIR}/../../../common/dist/zlib
 SAMISCCPPFLAGS+=-I${ZLIBSRCDIR}
 SAMAKE= \
-	cd ${SADST} && ${MAKE} -f ${SADIR:Q}/Makefile \
+	cd ${SADST} && ${MAKE} -f ${SADIR:q}/Makefile \
-	    SADIR=${SADIR:Q} \
+	    SADIR=${SADIR:q} \
-	    CC=${CC:Q} CFLAGS=${CFLAGS:Q} CPUFLAGS= \
+	    CC=${CC:q} CFLAGS=${CFLAGS:q} CPUFLAGS= \
-	    AS=${AS:Q} AFLAGS=${AFLAGS:Q} \
+	    AS=${AS:q} AFLAGS=${AFLAGS:q} \
-	    LORDER=${LORDER:Q} \
+	    LORDER=${LORDER:q} \
-	    TSORT=${TSORT:Q} \
+	    TSORT=${TSORT:q} \
-	    LD=${LD:Q} STRIP=${STRIP:Q} \
+	    LD=${LD:q} STRIP=${STRIP:q} \
-	    AR=${AR:Q} NM=${NM:Q} \
+	    AR=${AR:q} NM=${NM:q} \
-	    RANLIB=${RANLIB:Q} SIZE=${SIZE:Q} \
+	    RANLIB=${RANLIB:q} SIZE=${SIZE:q} \
-	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:Q} \
+	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \
-	    SACPPFLAGS=${CPPFLAGS:S@^-I.@-I${SADOTDIR}@g:Q} \
+	    SACPPFLAGS=${CPPFLAGS:S@^-I.@-I${SADOTDIR}@g:q} \
-	    SAMISCCPPFLAGS=${SAMISCCPPFLAGS:Q} \
+	    SAMISCCPPFLAGS=${SAMISCCPPFLAGS:q} \
 	    ${SAMISCMAKEFLAGS}
 ${SALIB}:		.NOTMAIN .MAKE __always_make_salib
 	@echo making sure the sa library is up to date...
 .if (${SA_AS} == "library")
 	@${SAMAKE} libsa.a
 .else
 	@${SAMAKE} libsa.o
 .endif
 ${SALIB_PROF}:		.NOTMAIN .MAKE __always_make_salib
 	@echo making sure the profiled sa library is up to date...
 .if (${SA_AS} == "library")

 @@ -1,58 +1,58 @@
-#	$NetBSD: Makefile.inc,v 1.16 2016/03/22 08:25:23 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.16.10.1 2018/06/09 15:35:38 martin Exp $
+#
 #	Configuration variables (default values are below):
+#
 #	S	must be set to the top of the 'sys' tree.
 #	ZDST	may be set to the location of the directory where library
 #		objects are to be built.  Defaults to ${.OBJDIR}/lib/z.
 #	Z_AS	may be set to 'obj' to build a object from the library's
 #		object files.  (Otherwise, a library will be built.)
 #		Defaults to 'library'.
 #	ZMISCCPPFLAGS
 #		Miscellaneous cpp flags to be passed to the library's Makefile
 #		when building.
 #	ZMISCMAKEFLAGS
 #		Miscellaneous flags to be passed to the library's Makefile when
 #		building.  See library's Makefile for more details about
 #		supported flags and their default values.
 # Default values:
 ZDST?=		${.OBJDIR}/lib/z
 Z_AS?=		library
 ZDOTDIR?= ../../.
-ZDIR=		${S:S@^.@${ZDOTDIR}@:Q}/lib/libz
+ZDIR=		${S:S@^.@${ZDOTDIR}@:q}/lib/libz
 .if (${Z_AS} == "obj")
 ZLIB=		${ZDST}/libz.o
 ZLIB_PROF=	${ZDST}/libz.po
 .else
 ZLIB=		${ZDST}/libz.a
 ZLIB_PROF=	${ZDST}/libz_p.a
 .endif
 ZMAKE= \
-	cd ${ZDST} && ${MAKE} -f ${ZDIR:Q}/Makefile \
+	cd ${ZDST} && ${MAKE} -f ${ZDIR:q}/Makefile \
-	    ZDIR=${ZDIR:Q} \
+	    ZDIR=${ZDIR:q} \
-	    CC=${CC:Q} CFLAGS=${CFLAGS:Q} CPUFLAGS= \
+	    CC=${CC:q} CFLAGS=${CFLAGS:q} CPUFLAGS= \
-	    AS=${AS:Q} AFLAGS=${AFLAGS:Q} \
+	    AS=${AS:q} AFLAGS=${AFLAGS:q} \
-	    LORDER=${LORDER:Q} \
+	    LORDER=${LORDER:q} \
-	    TSORT=${TSORT:Q} \
+	    TSORT=${TSORT:q} \
-	    LD=${LD:Q} STRIP=${STRIP:Q} \
+	    LD=${LD:q} STRIP=${STRIP:q} \
-	    AR=${AR:Q} NM=${NM:Q} \
+	    AR=${AR:q} NM=${NM:q} \
-	    RANLIB=${RANLIB:Q} SIZE=${SIZE:Q} \
+	    RANLIB=${RANLIB:q} SIZE=${SIZE:q} \
-	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:Q} \
+	    MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:q} \
-	    ZCPPFLAGS=${CPPFLAGS:S@^-I.@-I${ZDOTDIR}@g:Q} \
+	    ZCPPFLAGS=${CPPFLAGS:S@^-I.@-I${ZDOTDIR}@g:q} \
-	    ZMISCCPPFLAGS=${ZMISCCPPFLAGS:Q} \
+	    ZMISCCPPFLAGS=${ZMISCCPPFLAGS:q} \
 	    ${ZMISCMAKEFLAGS}
 ${ZLIB}:		.NOTMAIN .MAKE __always_make_zlib
 	@echo making sure the z library is up to date...
 .if (${Z_AS} == "library")
 	@${ZMAKE} libz.a
 .else
 	@${ZMAKE} libz.o
 .endif
 ${ZLIB_PROF}:		.NOTMAIN .MAKE __always_make_zlib
 	@echo making sure the profiled z library is up to date...
 .if (${Z_AS} == "library")

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: make.1,v 1.266.4.1 2017/07/18 15:26:14 snj Exp $
+.\"	$NetBSD: make.1,v 1.266.4.2 2018/06/09 15:35:38 martin Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" 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
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 @@ -19,27 +19,27 @@
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd June 19, 2017
+.Dd June 9, 2018
 .Dt MAKE 1
 .Os
 .Sh NAME
 .Nm make
 .Nd maintain program dependencies
 .Sh SYNOPSIS
 .Nm
 .Op Fl BeikNnqrstWwX
 .Op Fl C Ar directory
 .Op Fl D Ar variable
 .Op Fl d Ar flags
 .Op Fl f Ar makefile
 .Op Fl I Ar directory
 @@ -1195,28 +1195,35 @@ all:
 	@echo "${RANDOM_LIST}"
 	@echo "${STATIC_RANDOM_LIST}"
 	@echo "${STATIC_RANDOM_LIST}"
 .Ed
 may produce output similar to:
 .Bd -literal -offset indent
 quattro due tre uno
 tre due quattro uno
 due uno quattro tre
 due uno quattro tre
 .Ed
 .It Cm \&:Q
 Quotes every shell meta-character in the variable, so that it can be passed
 safely to the shell.
 .It Cm \&:q
 Quotes every shell meta-character in the variable, and also doubles
 .Sq $
 characters so that it can be passed
 safely through recursive invocations of
 .Nm .
 This is equivalent to:
 .Sq \&:S/\e\&$/&&/g:Q .
 .It Cm \&:R
 Replaces each word in the variable with everything but its suffix.
 .It Cm \&:range[=count]
 The value is an integer sequence representing the words of the original
 value, or the supplied
 .Va count .
 .It Cm \&:gmtime[=utc]
 The value is a format string for
 .Xr strftime 3 ,
 using
 .Xr gmtime 3 .
 If a
 .Va utc

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.215.4.1 2018/06/07 15:59:27 martin Exp $	*/
+/*	$NetBSD: var.c,v 1.215.4.2 2018/06/09 15:35:38 martin Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * 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.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.215.4.1 2018/06/07 15:59:27 martin Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.215.4.2 2018/06/09 15:35:38 martin Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.215.4.1 2018/06/07 15:59:27 martin Exp $");
+__RCSID("$NetBSD: var.c,v 1.215.4.2 2018/06/09 15:35:38 martin Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * var.c --
  *	Variable-handling functions
+ *
  * Interface:
  *	Var_Set		    Set the value of a variable in the given
  *			    context. The variable is created if it doesn't
  *			    yet exist. The value and variable name need not
  *			    be preserved.
 @@ -315,27 +315,27 @@ static Boolean VarNoMatch(GNode *, Var_P
 			char *, Boolean, Buffer *, void *);
 #ifndef NO_REGEX
 static void VarREError(int, regex_t *, const char *);
 static Boolean VarRESubstitute(GNode *, Var_Parse_State *,
 			char *, Boolean, Buffer *, void *);
 #endif
 static Boolean VarSubstitute(GNode *, Var_Parse_State *,
 			char *, Boolean, Buffer *, void *);
 static Boolean VarLoopExpand(GNode *, Var_Parse_State *,
 			char *, Boolean, Buffer *, void *);
 static char *VarGetPattern(GNode *, Var_Parse_State *,
 			   int, const char **, int, int *, int *,
 			   VarPattern *);
-static char *VarQuote(char *);
+static char *VarQuote(char *, Boolean);
 static char *VarHash(char *);
 static char *VarModify(GNode *, Var_Parse_State *,
     const char *,
     Boolean (*)(GNode *, Var_Parse_State *, char *, Boolean, Buffer *, void *),
     void *);
 static char *VarOrder(const char *, const char);
 static char *VarUniq(const char *);
 static int VarWordCompare(const void *, const void *);
 static void VarPrintVar(void *);
 #define BROPEN	'{'
 #define BRCLOSE	'}'
 #define PROPEN	'('
 @@ -2305,58 +2305,59 @@ VarGetPattern(GNode *ctxt, Var_Parse_Sta
     *tstr = ++cp;
     *length = Buf_Size(&buf);
     rstr = Buf_Destroy(&buf, FALSE);
     if (DEBUG(VAR))
 	fprintf(debug_file, "Modifier pattern: \"%s\"\n", rstr);
     return rstr;
+}
 /*-
  *-----------------------------------------------------------------------
  * VarQuote --
  *	Quote shell meta-characters and space characters in the string
  *	if quoteDollar is set, also quote and double any '$' characters.
+ *
  * Results:
  *	The quoted string
+ *
  * Side Effects:
  *	None.
+ *
  *-----------------------------------------------------------------------
  */
 static char *
-VarQuote(char *str)
+VarQuote(char *str, Boolean quoteDollar)
+{
     Buffer  	  buf;
     const char	*newline;
     size_t nlen;
     if ((newline = Shell_GetNewline()) == NULL)
 	    newline = "\\\n";
     nlen = strlen(newline);
     Buf_Init(&buf, 0);
     for (; *str != '\0'; str++) {
 	if (*str == '\n') {
 	    Buf_AddBytes(&buf, nlen, newline);
 	    continue;
+	}
 	if (isspace((unsigned char)*str) || ismeta((unsigned char)*str))
 	    Buf_AddByte(&buf, '\\');
 	Buf_AddByte(&buf, *str);
-	if (*str == '$')
+	if (quoteDollar && *str == '$')
 	    Buf_AddBytes(&buf, 2, "\\$");
+    }
     str = Buf_Destroy(&buf, FALSE);
     if (DEBUG(VAR))
 	fprintf(debug_file, "QuoteMeta: [%s]\n", str);
     return str;
+}
 /*-
  *-----------------------------------------------------------------------
  * VarHash --
  *      Hash the string using the MurmurHash3 algorithm.
 @@ -3477,29 +3478,30 @@ ApplyModifiers(char *nstr, const char *t
 		    pattern.nsub = 10;
 		pattern.matches = bmake_malloc(pattern.nsub *
 					  sizeof(regmatch_t));
 		newStr = VarModify(ctxt, &tmpparsestate, nstr,
 				   VarRESubstitute,
 				   &pattern);
 		regfree(&pattern.re);
 		free(pattern.replace);
 		free(pattern.matches);
 		delim = '\0';
 		break;
+	    }
 #endif
 	case 'q':
 	case 'Q':
 	    if (tstr[1] == endc || tstr[1] == ':') {
-		newStr = VarQuote(nstr);
+		newStr = VarQuote(nstr, modifier == 'q');
 		cp = tstr + 1;
 		termc = *cp;
 		break;
+	    }
 	    goto default_case;
 	case 'T':
 	    if (tstr[1] == endc || tstr[1] == ':') {
 		newStr = VarModify(ctxt, &parsestate, nstr, VarTail,
 				   NULL);
 		cp = tstr + 1;
 		termc = *cp;
 		break;
+	    }

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.52 2015/05/05 21:51:09 sjg Exp $
+# $NetBSD: Makefile,v 1.52.8.1 2018/06/09 15:35:38 martin Exp $
+#
 # Unit tests for make(1)
 # The main targets are:
+#
 # all:	run all the tests
 # test:	run 'all', and compare to expected results
 # accept: move generated output to expected results
+#
 # Adding a test case.
 # Each feature should get its own set of tests in its own suitably
 # named makefile (*.mk), with its own set of expected results (*.exp),
 # and it should be added to the TESTNAMES list.
+#
 @@ -40,26 +40,27 @@ TESTNAMES= \
 	modorder \
 	modts \
 	modword \
 	order \
 	posix \
 	qequals \
 	sunshcmd \
 	sysv \
 	ternary \
 	unexport \
 	unexport-env \
 	varcmd \
 	varmisc \
 	varquote \
 	varshell
 # these tests were broken by referting POSIX chanegs
 STRICT_POSIX_TESTS = \
 	escape \
 	impsrc \
 	phony-end \
 	posix1 \
 	suffixes
 # Override make flags for certain tests
 flags.doterror=
 flags.order=-j1