If we're passing through MAKEFLAGS variables whose values may contain

spaces, use the :Q modifier instead of double-quoting the value.  This
avoids breakage when executing the just-in-time su targets.

33 files changed, 95 insertions, 95 deletions

diff --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk
index 846101198d6..b0f74472f65 100644
--- a/archivers/bzip2/buildlink3.mk
+++ b/archivers/bzip2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BZIP2_BUILDLINK3_MK:=	${BZIP2_BUILDLINK3_MK}+
@@ -23,7 +23,7 @@ BUILDLINK_IS_BUILTIN.bzip2!=						\
 		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.bzip2="${BUILDLINK_IS_BUILTIN.bzip2}"
+MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.bzip2=${BUILDLINK_IS_BUILTIN.bzip2}
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -56,7 +56,7 @@ BUILDLINK_USE_BUILTIN.bzip2=	NO
 .      endif
 .    endfor
 .  endif
-MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.bzip2="${BUILDLINK_USE_BUILTIN.bzip2}"
+MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.bzip2=${BUILDLINK_USE_BUILTIN.bzip2}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.bzip2:M[nN][oO])
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk
index d1353edd5c1..5af6e87eac3 100644
--- a/converters/libiconv/buildlink3.mk
+++ b/converters/libiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ICONV_BUILDLINK3_MK:=	${ICONV_BUILDLINK3_MK}+
@@ -46,7 +46,7 @@ BUILDLINK_USE_BUILTIN.iconv=	NO
 .      endif
 .    endfor
 .  endif
-MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.iconv="${BUILDLINK_USE_BUILTIN.iconv}"
+MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.iconv=${BUILDLINK_USE_BUILTIN.iconv}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO])
diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk
index ead05325e46..417761f2d92 100644
--- a/databases/db/buildlink3.mk
+++ b/databases/db/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB2_BUILDLINK3_MK:=	${DB2_BUILDLINK3_MK}+
@@ -29,7 +29,7 @@ BUILDLINK_INCDIRS.db?=		include/db1
 BUILDLINK_TRANSFORM+=		l:db:db1
 .    endif
 .  endif
-MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.db="${BUILDLINK_USE_BUILTIN.db}"
+MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.db=${BUILDLINK_USE_BUILTIN.db}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.db:M[nN][oO])
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index a68b22b3727..bc37adcf8c2 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/01/20 14:11:50 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2004/02/06 19:04:24 jlam Exp $
 
 PKGNAME=	${PYPKGPREFIX}-postgresql-3.3
 PKGREVISION=	2
@@ -17,7 +17,7 @@ CONFIGURE_ENV+=		PYTHON="${PYTHONBIN}"
 
 MAKEFILE=		GNUmakefile
 MAKE_ENV+=		INSTALLED_LIBPQ=1
-MAKEFLAGS+=		PYTHON_VERSION="${PYVERSSUFFIX}"
+MAKEFLAGS+=		PYTHON_VERSION=${PYVERSSUFFIX}
 
 PY_PATCHPLIST=		yes
 PLIST_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX}
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index c5aad2b4866..41bf075902a 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=	${BINUTILS_BUILDLINK3_MK}+
@@ -54,7 +54,7 @@ BUILDLINK_USE_BUILTIN.binutils=	NO
 .    endfor
 .  endif
 MAKEFLAGS+=	\
-	BUILDLINK_USE_BUILTIN.binutils="${BUILDLINK_USE_BUILTIN.binutils}"
+	BUILDLINK_USE_BUILTIN.binutils=${BUILDLINK_USE_BUILTIN.binutils}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.binutils:M[nN][oO])
diff --git a/devel/cpuflags/files/cpuflags.mk b/devel/cpuflags/files/cpuflags.mk
index 5e155a785bc..5ab5c7539a2 100644
--- a/devel/cpuflags/files/cpuflags.mk
+++ b/devel/cpuflags/files/cpuflags.mk
@@ -1,4 +1,4 @@
-# $Id: cpuflags.mk,v 1.13 2004/01/21 00:54:08 abs Exp $
+# $Id: cpuflags.mk,v 1.14 2004/02/06 19:04:24 jlam Exp $
 # Makefile include fragment to simplify use of cpuflags in pkgsrc
 # abs@netbsd.org - freely distributable, no warrenties, stick no bills.
 
@@ -25,7 +25,7 @@ CPU_DIR!=echo ${CPU_FLAGS} | sed 's/ //'
 .endif
 
 .if !defined(MAKEFLAGS) || empty(MAKEFLAGS:MCPU_FLAGS)
-MAKEFLAGS+=CPU_FLAGS="${CPU_FLAGS}" CPU_DIR="${CPU_DIR}" 	# For sub makes
+MAKEFLAGS+=CPU_FLAGS=${CPU_FLAGS:Q} CPU_DIR=${CPU_DIR:Q} 	# For sub makes
 .endif
 
 .ifdef BSD_PKG_MK			# Try to catch various package opts
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index 2373f69c7b2..2ca37327a86 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GETTEXT_BUILDLINK3_MK:=	${GETTEXT_BUILDLINK3_MK}+
@@ -65,7 +65,7 @@ BUILDLINK_USE_BUILTIN.gettext=	NO
 .    endfor
 .  endif
 MAKEFLAGS+=	\
-	BUILDLINK_USE_BUILTIN.gettext="${BUILDLINK_USE_BUILTIN.gettext}"
+	BUILDLINK_USE_BUILTIN.gettext=${BUILDLINK_USE_BUILTIN.gettext}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.gettext:M[nN][oO])
@@ -110,7 +110,7 @@ _BLNK_LIBINTL_FOUND!=	\
 	else								\
 		${ECHO} "YES";						\
 	fi
-MAKEFLAGS+=	_BLNK_LIBINTL_FOUND="${_BLNK_LIBINTL_FOUND}"
+MAKEFLAGS+=	_BLNK_LIBINTL_FOUND=${_BLNK_LIBINTL_FOUND}
 .    endif
 .    if ${_BLNK_LIBINTL_FOUND} == "YES"
 _BLNK_LIBINTL=		-lintl
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk
index 92ebf9e53f8..b37bf5c1ce4 100644
--- a/devel/ncurses/buildlink3.mk
+++ b/devel/ncurses/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NCURSES_BUILDLINK3_MK:=	${NCURSES_BUILDLINK3_MK}+
@@ -20,7 +20,7 @@ _BLNK_LIBNCURSES_FOUND!=	\
 	else								\
 		${ECHO} "YES";						\
 	fi
-MAKEFLAGS+=	_BLNK_LIBNCURSES_FOUND="${_BLNK_LIBNCURSES_FOUND}"
+MAKEFLAGS+=	_BLNK_LIBNCURSES_FOUND=${_BLNK_LIBNCURSES_FOUND}
 .endif
 
 _NCURSES_H=	/usr/include/curses.h
@@ -37,7 +37,7 @@ BUILDLINK_IS_BUILTIN.ncurses!=						\
 		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.ncurses="${BUILDLINK_IS_BUILTIN.ncurses}"
+MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.ncurses=${BUILDLINK_IS_BUILTIN.ncurses}
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -107,7 +107,7 @@ BUILDLINK_USE_BUILTIN.ncurses!=						\
 .    endfor
 .  endif
 MAKEFLAGS+=	\
-	BUILDLINK_USE_BUILTIN.ncurses="${BUILDLINK_USE_BUILTIN.ncurses}"
+	BUILDLINK_USE_BUILTIN.ncurses=${BUILDLINK_USE_BUILTIN.ncurses}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.ncurses:M[nN][oO])
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index fd19e15c227..f7d8eaa74a7 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:24 jlam Exp $
 #
 # Optionally define USE_GNU_READLINE to force use of GNU readline.
 #
@@ -57,7 +57,7 @@ BUILDLINK_USE_BUILTIN.readline=	NO
 .    endfor
 .  endif
 MAKEFLAGS+=	\
-	BUILDLINK_USE_BUILTIN.readline="${BUILDLINK_USE_BUILTIN.readline}"
+	BUILDLINK_USE_BUILTIN.readline=${BUILDLINK_USE_BUILTIN.readline}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.readline:M[nN][oO])
@@ -75,7 +75,7 @@ _BLNK_LIBEDIT_FOUND!=	\
 	else								\
 		${ECHO} "YES";						\
 	fi
-MAKEFLAGS+=	_BLNK_LIBEDIT_FOUND="${_BLNK_LIBEDIT_FOUND}"
+MAKEFLAGS+=	_BLNK_LIBEDIT_FOUND=${_BLNK_LIBEDIT_FOUND}
 .    endif
 .    if ${_BLNK_LIBEDIT_FOUND} == "YES"
 BUILDLINK_TRANSFORM+=		l:history:edit
diff --git a/devel/zlib/buildlink2.mk b/devel/zlib/buildlink2.mk
index 9f2e35b843a..90cbd93d28c 100644
--- a/devel/zlib/buildlink2.mk
+++ b/devel/zlib/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.11 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.12 2004/02/06 19:04:24 jlam Exp $
 
 .if !defined(ZLIB_BUILDLINK2_MK)
 ZLIB_BUILDLINK2_MK=	# defined
@@ -74,7 +74,7 @@ BUILDLINK_USE_BUILTIN.zlib!=	\
 		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.zlib="${BUILDLINK_USE_BUILTIN.zlib}"
+MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.zlib=${BUILDLINK_USE_BUILTIN.zlib}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.zlib:M[nN][oO])
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk
index fad9c1c33b5..a8a54e96104 100644
--- a/devel/zlib/buildlink3.mk
+++ b/devel/zlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ZLIB_BUILDLINK3_MK:=	${ZLIB_BUILDLINK3_MK}+
@@ -87,7 +87,7 @@ BUILDLINK_USE_BUILTIN.zlib!=	\
 .      endif
 .    endfor
 .  endif
-MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.zlib="${BUILDLINK_USE_BUILTIN.zlib}"
+MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.zlib=${BUILDLINK_USE_BUILTIN.zlib}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.zlib:M[nN][oO])
diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index 14b8973a042..4bc7455e11f 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2004/02/06 19:04:24 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
@@ -28,7 +28,7 @@ BUILDLINK_IS_BUILTIN.MesaLib!=						\
 		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.MesaLib="${BUILDLINK_IS_BUILTIN.MesaLib}"
+MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.MesaLib=${BUILDLINK_IS_BUILTIN.MesaLib}
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -65,7 +65,7 @@ BUILDLINK_USE_BUILTIN.MesaLib!=	\
 .    endfor
 .  endif
 MAKEFLAGS+=	\
-	BUILDLINK_USE_BUILTIN.MesaLib="${BUILDLINK_USE_BUILTIN.MesaLib}"
+	BUILDLINK_USE_BUILTIN.MesaLib=${BUILDLINK_USE_BUILTIN.MesaLib}
 .endif	# BUILDLINK_USE_BUILTIN.MesaLib
 
 .if !empty(BUILDLINK_USE_BUILTIN.MesaLib:M[nN][oO])
diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk
index b70f41163ba..a1ce749efc7 100644
--- a/graphics/freetype2/buildlink3.mk
+++ b/graphics/freetype2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2004/02/06 19:04:25 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE2_BUILDLINK3_MK:=	${FREETYPE2_BUILDLINK3_MK}+
@@ -28,7 +28,7 @@ BUILDLINK_IS_BUILTIN.freetype2!=					\
 	fi
 .  endif
 MAKEFLAGS+=	\
-	BUILDLINK_IS_BUILTIN.freetype2="${BUILDLINK_IS_BUILTIN.freetype2}"
+	BUILDLINK_IS_BUILTIN.freetype2=${BUILDLINK_IS_BUILTIN.freetype2}
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -71,7 +71,7 @@ BUILDLINK_USE_BUILTIN.freetype2!=	\
 .    endfor
 .  endif
 MAKEFLAGS+=	\
-	BUILDLINK_USE_BUILTIN.freetype2="${BUILDLINK_USE_BUILTIN.freetype2}"
+	BUILDLINK_USE_BUILTIN.freetype2=${BUILDLINK_USE_BUILTIN.freetype2}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.freetype2:M[nN][oO])
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index 0575a372d98..052341ec1a3 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2004/02/06 19:04:25 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLU_BUILDLINK3_MK:=	${GLU_BUILDLINK3_MK}+
@@ -28,7 +28,7 @@ BUILDLINK_IS_BUILTIN.glu!=						\
 		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.glu="${BUILDLINK_IS_BUILTIN.glu}"
+MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.glu=${BUILDLINK_IS_BUILTIN.glu}
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -64,7 +64,7 @@ BUILDLINK_USE_BUILTIN.glu!=	\
 .      endif
 .    endfor
 .  endif
-MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.glu="${BUILDLINK_USE_BUILTIN.glu}"
+MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.glu=${BUILDLINK_USE_BUILTIN.glu}
 .endif	# BUILDLINK_USE_BUILTIN.glu
 
 .if !empty(BUILDLINK_USE_BUILTIN.glu:M[nN][oO])
diff --git a/graphics/xpm/buildlink3.mk b/graphics/xpm/buildlink3.mk
index 4a38458f9d2..e556f1fcd2c 100644
--- a/graphics/xpm/buildlink3.mk
+++ b/graphics/xpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/01/24 03:12:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/02/06 19:04:25 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XPM_BUILDLINK3_MK:=	${XPM_BUILDLINK3_MK}+
@@ -39,7 +39,7 @@ BUILDLINK_IS_BUILTIN.xpm!=						\
 BUILDLINK_IS_BUILTIN.xpm=	NO
 .    endif
 .  endif
-MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.xpm="${BUILDLINK_IS_BUILTIN.xpm}"
+MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.xpm=${BUILDLINK_IS_BUILTIN.xpm}
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.xpm:M[yY][eE][sS])
@@ -76,7 +76,7 @@ BUILDLINK_USE_BUILTIN.xpm!=	\
 .      endif
 .    endfor
 .  endif
-MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.xpm="${BUILDLINK_USE_BUILTIN.xpm}"
+MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.xpm=${BUILDLINK_USE_BUILTIN.xpm}
 .endif	# BUILDLINK_USE_BUILTIN.xpm
 
 .if !empty(BUILDLINK_USE_BUILTIN.xpm:M[nN][oO])
diff --git a/lang/gcc3-c/Makefile.common b/lang/gcc3-c/Makefile.common
index b50dc5361cf..189c7e8156a 100644
--- a/lang/gcc3-c/Makefile.common
+++ b/lang/gcc3-c/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2004/02/06 02:49:54 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/02/06 19:04:25 jlam Exp $
 
 GCC_VERSION=	3.3.2
 DISTNAME=	gcc-${GCC_VERSION}
@@ -69,7 +69,7 @@ AS_VERSION!=	${AS} --version | ${AWK} '{				\
 		}'
 USE_BINUTILS!=	${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO
 .    endif
-MAKEFLAGS+=	USE_BINUTILS="${USE_BINUTILS}"
+MAKEFLAGS+=	USE_BINUTILS=${USE_BINUTILS}
 .  endif
 .endif
 
diff --git a/lang/perl5/buildlink2.mk b/lang/perl5/buildlink2.mk
index 6074c678e05..6e709de4325 100644
--- a/lang/perl5/buildlink2.mk
+++ b/lang/perl5/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.10 2004/01/19 23:50:20 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2004/02/06 19:04:25 jlam Exp $
 
 .if !defined(PERL5_BUILDLINK2_MK)
 PERL5_BUILDLINK2_MK=  # defined
@@ -39,26 +39,26 @@ _PERL5_PREFIX!=		\
 	eval `${PERL5} -V:prefix 2>/dev/null`; ${ECHO} $$prefix
 _PERL5_SITEPREFIX!=	\
 	eval `${PERL5} -V:siteprefix 2>/dev/null`; ${ECHO} $$siteprefix
-MAKEFLAGS+=	_PERL5_PREFIX="${_PERL5_PREFIX}"
-MAKEFLAGS+=	_PERL5_SITEPREFIX="${_PERL5_SITEPREFIX}"
+MAKEFLAGS+=	_PERL5_PREFIX=${_PERL5_PREFIX:Q}
+MAKEFLAGS+=	_PERL5_SITEPREFIX=${_PERL5_SITEPREFIX:Q}
 
 .    for _var_ in ${_PERL5_SITEVARS}
 PERL5_SUB_${_var_}!=	\
 	eval `${PERL5} -V:${_PERL5_SITEVAR.${_var_}} 2>/dev/null`;	\
 	${ECHO} $${${_PERL5_SITEVAR.${_var_}}} |			\
 	${SED} -e "s,^${_PERL5_SITEPREFIX}/,,"
-MAKEFLAGS+=	PERL5_SUB_${_var_}="${PERL5_SUB_${_var_}}"
+MAKEFLAGS+=	PERL5_SUB_${_var_}=${PERL5_SUB_${_var_}:Q}
 .    endfor
 PERL5_SUB_INSTALLARCHLIB!=	\
 	eval `${PERL5} -V:installarchlib 2>/dev/null`;			\
 	${ECHO} $$installarchlib |					\
 	${SED} -e "s,^${_PERL5_PREFIX}/,,"
-MAKEFLAGS+=	PERL5_SUB_INSTALLARCHLIB="${PERL5_SUB_INSTALLARCHLIB}"
+MAKEFLAGS+=	PERL5_SUB_INSTALLARCHLIB=${PERL5_SUB_INSTALLARCHLIB:Q}
 PERL5_SUB_INSTALLSCRIPT!=	\
 	eval `${PERL5} -V:installscript 2>/dev/null`;			\
 	${ECHO} $$installscript |					\
 	${SED} -e "s,^${_PERL5_PREFIX}/,,"
-MAKEFLAGS+=	PERL5_SUB_INSTALLSCRIPT="${PERL5_SUB_INSTALLSCRIPT}"
+MAKEFLAGS+=	PERL5_SUB_INSTALLSCRIPT=${PERL5_SUB_INSTALLSCRIPT:Q}
 .  endif
 
 BUILDLINK_FILES.perl=							\
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index a21424b3487..17b4d4f6e46 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/01/24 03:26:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/06 19:04:25 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
@@ -43,26 +43,26 @@ _PERL5_PREFIX!=		\
 	eval `${PERL5} -V:prefix 2>/dev/null`; ${ECHO} $$prefix
 _PERL5_SITEPREFIX!=	\
 	eval `${PERL5} -V:siteprefix 2>/dev/null`; ${ECHO} $$siteprefix
-MAKEFLAGS+=	_PERL5_PREFIX="${_PERL5_PREFIX}"
-MAKEFLAGS+=	_PERL5_SITEPREFIX="${_PERL5_SITEPREFIX}"
+MAKEFLAGS+=	_PERL5_PREFIX=${_PERL5_PREFIX:Q}
+MAKEFLAGS+=	_PERL5_SITEPREFIX=${_PERL5_SITEPREFIX:Q}
 
 .      for _var_ in ${_PERL5_SITEVARS}
 PERL5_SUB_${_var_}!=	\
 	eval `${PERL5} -V:${_PERL5_SITEVAR.${_var_}} 2>/dev/null`;	\
 	${ECHO} $${${_PERL5_SITEVAR.${_var_}}} |			\
 	${SED} -e "s,^${_PERL5_SITEPREFIX}/,,"
-MAKEFLAGS+=	PERL5_SUB_${_var_}="${PERL5_SUB_${_var_}}"
+MAKEFLAGS+=	PERL5_SUB_${_var_}=${PERL5_SUB_${_var_}:Q}
 .      endfor
 PERL5_SUB_INSTALLARCHLIB!=	\
 	eval `${PERL5} -V:installarchlib 2>/dev/null`;			\
 	${ECHO} $$installarchlib |					\
 	${SED} -e "s,^${_PERL5_PREFIX}/,,"
-MAKEFLAGS+=	PERL5_SUB_INSTALLARCHLIB="${PERL5_SUB_INSTALLARCHLIB}"
+MAKEFLAGS+=	PERL5_SUB_INSTALLARCHLIB=${PERL5_SUB_INSTALLARCHLIB:Q}
 PERL5_SUB_INSTALLSCRIPT!=	\
 	eval `${PERL5} -V:installscript 2>/dev/null`;			\
 	${ECHO} $$installscript |					\
 	${SED} -e "s,^${_PERL5_PREFIX}/,,"
-MAKEFLAGS+=	PERL5_SUB_INSTALLSCRIPT="${PERL5_SUB_INSTALLSCRIPT}"
+MAKEFLAGS+=	PERL5_SUB_INSTALLSCRIPT=${PERL5_SUB_INSTALLSCRIPT:Q}
 .    endif
 .    if ${PKG_INSTALLATION_TYPE} == "overwrite"
 #
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index 20b0c9d3a97..77f8ffc84e0 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/02/05 08:45:31 uebayasi Exp $
+# $NetBSD: Makefile,v 1.34 2004/02/06 19:04:25 jlam Exp $
 
 # The following two variables should have empty values unless we're
 # building a perl snapshot or release candidate.
@@ -170,7 +170,7 @@ _GCC_IS_AT_LEAST_3_3!=	\
 	else								\
 		${ECHO} "NO";						\
 	fi
-MAKEFLAGS+=	_GCC_IS_AT_LEAST_3_3="${_GCC_IS_AT_LEAST_3_3}"
+MAKEFLAGS+=	_GCC_IS_AT_LEAST_3_3=${_GCC_IS_AT_LEAST_3_3}
 .  endif
 .  if !empty(_GCC_IS_AT_LEAST_3_3:M[nN][oO])
 #
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 3dfdbda988d..9a3568c1f85 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.149 2004/02/06 04:37:02 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.150 2004/02/06 19:04:25 jlam Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -29,7 +29,7 @@ _MAKE:=	${_dir_}/${MAKE}
 .    endif
 .  endfor
 .  if !empty(_MAKE:M/*)
-MAKEFLAGS+=	_MAKE="${_MAKE}"
+MAKEFLAGS+=	_MAKE=${_MAKE:Q}
 .  endif
 .endif
 MAKE:=	${_MAKE}
@@ -370,7 +370,7 @@ MAKEFLAGS+=		DIGEST=${DIGEST}
 DIGEST_VERSION=		20010301
 .elif !defined(DIGEST_VERSION)
 DIGEST_VERSION!= 	${DIGEST} -V 2>/dev/null
-MAKEFLAGS+=		DIGEST_VERSION="${DIGEST_VERSION}"
+MAKEFLAGS+=		DIGEST_VERSION=${DIGEST_VERSION}
 .endif
 
 # This is the package database directory for the default view.
@@ -421,7 +421,7 @@ PKG_BEST_EXISTS?=	${PKG_ADMIN} -b -d ${_PKG_DBDIR} -S lsbest
 
 .ifndef PKGTOOLS_VERSION
 PKGTOOLS_VERSION!=	${PKG_INFO_CMD} -V 2>/dev/null || echo 20010302
-MAKEFLAGS+=		PKGTOOLS_VERSION="${PKGTOOLS_VERSION}"
+MAKEFLAGS+=		PKGTOOLS_VERSION=${PKGTOOLS_VERSION}
 .endif
 
 USE_BUILDLINK2?=	no	# default to not using buildlink2
@@ -436,7 +436,7 @@ ZOULARIS_VERSION=	20000522
 .  else
 .    include "${ZOULARISBASE}/share/mk/zoularis.mk"
 .  endif
-MAKEFLAGS+=		ZOULARIS_VERSION="${ZOULARIS_VERSION}"
+MAKEFLAGS+=		ZOULARIS_VERSION=${ZOULARIS_VERSION}
 .endif
 
 _PKGSRCDIR?=		${.CURDIR:C|/[^/]*/[^/]*$||}
@@ -469,10 +469,10 @@ _HOSTNAME!=		${UNAME} -n
 MAKEFLAGS+=		_HOSTNAME=${_HOSTNAME}
 .  endif
 WRKDIR_BASENAME?=	work.${_HOSTNAME:C|\..*||}
-MAKEFLAGS+=		OBJHOSTNAME="${OBJHOSTNAME}"
+MAKEFLAGS+=		OBJHOSTNAME=${OBJHOSTNAME}
 .elif defined(OBJMACHINE)
 WRKDIR_BASENAME?=	work.${MACHINE_ARCH}
-MAKEFLAGS+=		OBJMACHINE="${OBJMACHINE}"
+MAKEFLAGS+=		OBJMACHINE=${OBJMACHINE}
 .else
 WRKDIR_BASENAME?=	work
 .endif
diff --git a/mk/endian.mk b/mk/endian.mk
index b0bbf3be871..341ac3966a0 100644
--- a/mk/endian.mk
+++ b/mk/endian.mk
@@ -1,4 +1,4 @@
-# $NetBSD: endian.mk,v 1.2 2002/08/14 02:38:25 grant Exp $
+# $NetBSD: endian.mk,v 1.3 2004/02/06 19:04:25 jlam Exp $
 #
 # Determine the endianness of the platform by checking header files.
 #
@@ -47,5 +47,5 @@ MACHINE_ENDIAN!=							\
 	4321)	${ECHO} big ;;						\
 	*)	${ECHO} unknown ;;					\
 	esac
-MAKEFLAGS+=	MACHINE_ENDIAN="${MACHINE_ENDIAN}"
+MAKEFLAGS+=	MACHINE_ENDIAN=${MACHINE_ENDIAN}
 .endif
diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index 34de23139cf..7c9a1f609ff 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -1,5 +1,5 @@
 #
-# $NetBSD: Makefile,v 1.25 2004/01/28 12:18:47 grant Exp $
+# $NetBSD: Makefile,v 1.26 2004/02/06 19:04:25 jlam Exp $
 #
 # FreeBSD Id: Makefile,v 1.12 1999/06/28 21:25:07 billf Exp
 #
@@ -37,7 +37,7 @@ MAKEFLAGS+=	INSTALL=${INSTALL}
 OWN_DIRS_PERMS=	${PKG_SYSCONFDIR}/ndc.d root other 700
 .endif
 
-MAKEFLAGS+=	PREFIX=${PREFIX}
+MAKEFLAGS+=	PREFIX=${PREFIX:Q}
 
 post-extract:
 	cd ${WRKDIR}/doc/man &&						\
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 80b34043ac3..9f0a85be06d 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2004/01/20 12:22:21 agc Exp $
+# $NetBSD: Makefile,v 1.113 2004/02/06 19:04:25 jlam Exp $
 
 DISTNAME=		samba-3.0.1
 PKGREVISION=		1
@@ -109,12 +109,12 @@ BUILD_DEFS+=		SAMBA_USE_LDAP_COMPAT
 .if !defined(MKTEMP)
 MKTEMP!=	${TYPE} mktemp 2>&1 | \
 		${AWK} '/not found/ { print "mktemp"; exit } { print $$3 }'
-MAKEFLAGS+=	MKTEMP="${MKTEMP}"
+MAKEFLAGS+=	MKTEMP=${MKTEMP:Q}
 .endif
 .if !defined(PWD_MKDB)
 PWD_MKDB!=	${TYPE} pwd_mkdb 2>&1 | \
 		${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }'
-MAKEFLAGS+=	PWD_MKDB="${PWD_MKDB}"
+MAKEFLAGS+=	PWD_MKDB=${PWD_MKDB:Q}
 .endif
 FILES_SUBST+=	MKTEMP=${MKTEMP:Q}
 FILES_SUBST+=	PWD_MKDB=${PWD_MKDB:Q}
diff --git a/net/samba2/Makefile b/net/samba2/Makefile
index e15603821e2..94d4d54b820 100644
--- a/net/samba2/Makefile
+++ b/net/samba2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/11 00:44:35 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/06 19:04:25 jlam Exp $
 
 .include "Makefile.common"
 PKGREVISION=		6
@@ -67,12 +67,12 @@ OWN_DIRS_PERMS=		${SAMBA_PRIVATE} ${ROOT_USER} ${ROOT_GROUP} 0500
 .if !defined(MKTEMP)
 MKTEMP!=	${TYPE} mktemp 2>&1 | \
 		${AWK} '/not found/ { print "mktemp"; exit } { print $$3 }'
-MAKEFLAGS+=	MKTEMP="${MKTEMP}"
+MAKEFLAGS+=	MKTEMP=${MKTEMP:Q}
 .endif
 .if !defined(PWD_MKDB)
 PWD_MKDB!=	${TYPE} pwd_mkdb 2>&1 | \
 		${AWK} '/not found/ { print "pwd_mkdb"; exit } { print $$3 }'
-MAKEFLAGS+=	PWD_MKDB="${PWD_MKDB}"
+MAKEFLAGS+=	PWD_MKDB=${PWD_MKDB:Q}
 .endif
 FILES_SUBST+=	MKTEMP=${MKTEMP:Q}
 FILES_SUBST+=	PWD_MKDB=${PWD_MKDB:Q}
diff --git a/pkgtools/gensolpkg/Makefile b/pkgtools/gensolpkg/Makefile
index 2b2100e2197..528b0ced330 100644
--- a/pkgtools/gensolpkg/Makefile
+++ b/pkgtools/gensolpkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/17 22:52:14 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/06 19:04:25 jlam Exp $
 #
 
 DISTNAME=	gensolpkg-1.10
@@ -12,7 +12,7 @@ COMMENT=	Utility to generate a Solaris package
 ONLY_FOR_PLATFORM=	SunOS-*-*	# uses Solaris pkgmk(1)
 
 MAKE_ENV+=	CPPFLAGS="" CC=${CC:Q}
-MAKEFLAGS+=	PREFIX=${PREFIX} ZOULARISBASE=${ZOULARISBASE}
+MAKEFLAGS+=	PREFIX=${PREFIX:Q} ZOULARISBASE=${ZOULARISBASE:Q}
 
 do-install:
 	cd ${WRKSRC} && ${MAKE} install PREFIX=${PREFIX}
diff --git a/print/texfamily/Makefile b/print/texfamily/Makefile
index d2c25e3feaa..e5ba1fdacae 100644
--- a/print/texfamily/Makefile
+++ b/print/texfamily/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 14:58:00 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/06 19:04:25 jlam Exp $
 
 DISTNAME=	TeXfamily-1.2.1
 PKGREVISION=	4
@@ -41,7 +41,7 @@ USE_GNU_TOOLS+=	make
 USE_X11=	yes
 PLIST_SUBST+=	MV="${MV}"
 CFLAGS+=	-Dunix
-MAKEFLAGS+=	PREFIX=${PREFIX}
+MAKEFLAGS+=	PREFIX=${PREFIX:Q}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${PREFIX} \
 		--enable-local-texmf=texmf.local \
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index 5c35e447df3..6e131e0a674 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:25 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HEIMDAL_BUILDLINK3_MK:=	${HEIMDAL_BUILDLINK3_MK}+
@@ -26,7 +26,7 @@ BUILDLINK_IS_BUILTIN.heimdal!=						\
 		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.heimdal="${BUILDLINK_IS_BUILTIN.heimdal}"
+MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.heimdal=${BUILDLINK_IS_BUILTIN.heimdal}
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -70,7 +70,7 @@ _HEIMDAL_VERSION?=	${_heimdal_version_}
 .        endfor
 .      endfor
 _HEIMDAL_VERSION?=	0.2t
-MAKEFLAGS+=	_HEIMDAL_VERSION="${_HEIMDAL_VERSION}"
+MAKEFLAGS+=	_HEIMDAL_VERSION=${_HEIMDAL_VERSION}
 .    endif
 
 _HEIMDAL_PKG=		heimdal-${_HEIMDAL_VERSION}
@@ -87,7 +87,7 @@ BUILDLINK_USE_BUILTIN.heimdal!=		\
 .    endfor
 .  endif
 MAKEFLAGS+=	\
-	BUILDLINK_USE_BUILTIN.heimdal="${BUILDLINK_USE_BUILTIN.heimdal}"
+	BUILDLINK_USE_BUILTIN.heimdal=${BUILDLINK_USE_BUILTIN.heimdal}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.heimdal:M[nN][oO])
diff --git a/security/openssl/buildlink2.mk b/security/openssl/buildlink2.mk
index af0ef8a53bb..1e1cf1cbfdb 100644
--- a/security/openssl/buildlink2.mk
+++ b/security/openssl/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.18 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.19 2004/02/06 19:04:25 jlam Exp $
 
 .if !defined(OPENSSL_BUILDLINK2_MK)
 OPENSSL_BUILDLINK2_MK=	# defined
@@ -110,7 +110,7 @@ _NEED_OPENSSL!=		\
 	else								\
 		${ECHO} "YES";						\
 	fi
-MAKEFLAGS+=	_NEED_OPENSSL="${_NEED_OPENSSL}"
+MAKEFLAGS+=	_NEED_OPENSSL=${_NEED_OPENSSL}
 .  endif   # !defined(_NEED_OPENSSL)
 .endif
 
@@ -121,7 +121,7 @@ _NEED_NEWER_OPENSSL!=	\
 	else								\
 		${ECHO} "YES";						\
 	fi
-MAKEFLAGS+=	_NEED_NEWER_OPENSSL="${_NEED_NEWER_OPENSSL}"
+MAKEFLAGS+=	_NEED_NEWER_OPENSSL=${_NEED_NEWER_OPENSSL}
 .endif
 
 .if (${_NEED_OPENSSL} == "YES") && (${_NEED_NEWER_OPENSSL} == "YES")
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index 72c2178647f..111b6655c69 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/02/06 19:04:25 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
@@ -122,7 +122,7 @@ BUILDLINK_USE_BUILTIN.openssl!=		\
 .    endfor
 .  endif
 MAKEFLAGS+=	\
-	BUILDLINK_USE_BUILTIN.openssl="${BUILDLINK_USE_BUILTIN.openssl}"
+	BUILDLINK_USE_BUILTIN.openssl=${BUILDLINK_USE_BUILTIN.openssl}
 .endif
 
 .if !defined(_NEED_NEWER_OPENSSL)
@@ -137,7 +137,7 @@ _NEED_NEWER_OPENSSL!=	\
 	fi
 .    endif
 .  endfor
-MAKEFLAGS+=	_NEED_NEWER_OPENSSL="${_NEED_NEWER_OPENSSL}"
+MAKEFLAGS+=	_NEED_NEWER_OPENSSL=${_NEED_NEWER_OPENSSL}
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.openssl:M[nN][oO]) && \
diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile
index a388f87244b..9b17a2583b3 100644
--- a/x11/XF86Setup/Makefile
+++ b/x11/XF86Setup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/01/20 12:28:26 agc Exp $
+# $NetBSD: Makefile,v 1.30 2004/02/06 19:04:25 jlam Exp $
 
 DISTNAME=		XF86Setup-3.3.6
 PKGREVISION=		1
@@ -25,7 +25,7 @@ USE_IMAKE=		yes
 
 .if !defined(X11_RELEASE) && !defined(CHECK_X11)
 X11_RELEASE!=	${MAKE} CHECK_X11=YES print-x11-release
-MAKEFLAGS+=	X11_RELEASE="${X11_RELEASE}"
+MAKEFLAGS+=	X11_RELEASE=${X11_RELEASE}
 .if (${X11_RELEASE} == "6.4")
 PKG_SKIP_REASON= "This package doesn't work with your X11 distribution."
 .endif
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk
index 32a89378d0b..e0408eb1281 100644
--- a/x11/Xrender/buildlink3.mk
+++ b/x11/Xrender/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2004/02/06 19:04:25 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRENDER_BUILDLINK3_MK:=	${XRENDER_BUILDLINK3_MK}+
@@ -26,7 +26,7 @@ BUILDLINK_IS_BUILTIN.Xrender!=						\
 		${ECHO} "NO";						\
 	fi
 .  endif
-MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.Xrender="${BUILDLINK_IS_BUILTIN.Xrender}"
+MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.Xrender=${BUILDLINK_IS_BUILTIN.Xrender}
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -67,7 +67,7 @@ BUILDLINK_USE_BUILTIN.Xrender!=		\
 .    endfor
 .  endif
 MAKEFLAGS+=	\
-	BUILDLINK_USE_BUILTIN.Xrender="${BUILDLINK_USE_BUILTIN.Xrender}"
+	BUILDLINK_USE_BUILTIN.Xrender=${BUILDLINK_USE_BUILTIN.Xrender}
 .endif	# BUILDLINK_USE_BUILTIN.Xrender
 
 .if !empty(BUILDLINK_USE_BUILTIN.Xrender:M[nN][oO])
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 7ac19ac7c14..10b72709282 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.69 2004/02/02 23:55:00 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.70 2004/02/06 19:04:25 jlam Exp $
 #
 
 DISTNAME=		xscreensaver-4.14
@@ -50,7 +50,7 @@ PLIST_SUBST+=		AVAILABLE=
 
 .ifndef (PERL_VERSION)
 PERL_VERSION!=		if [ -x ${PERL5} ]; then ${PERL5} -e 'print $$]'; else ${ECHO} "5.006"; fi
-MAKEFLAGS+=		PERL_VERSION="${PERL_VERSION}"
+MAKEFLAGS+=		PERL_VERSION=${PERL_VERSION}
 .endif
 
 .if (${OPSYS} == "NetBSD")
diff --git a/x11/xservers/Makefile b/x11/xservers/Makefile
index e6476975aad..3108757cac5 100644
--- a/x11/xservers/Makefile
+++ b/x11/xservers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/27 00:53:10 heinz Exp $#
+# $NetBSD: Makefile,v 1.14 2004/02/06 19:04:25 jlam Exp $#
 
 DISTNAME=	xservers-3.3.6.3
 CATEGORIES=	x11
@@ -17,7 +17,7 @@ USE_X11BASE=	YES
 
 .if !defined(X11_RELEASE) && !defined(CHECK_X11)
 X11_RELEASE!=	${MAKE} CHECK_X11=YES print-x11-release
-MAKEFLAGS+=	X11_RELEASE="${X11_RELEASE}"
+MAKEFLAGS+=	X11_RELEASE=${X11_RELEASE}
 .if (${X11_RELEASE} == "6.3")
 PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution"
 .endif