Fixed pkglint warnings. The warnings are mostly quoting issues, for

example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in

    http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html

48 files changed, 145 insertions, 149 deletions

diff --git a/emulators/arnold/Makefile b/emulators/arnold/Makefile
index 079068bd6a4..d12dcb610e1 100644
--- a/emulators/arnold/Makefile
+++ b/emulators/arnold/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/03 21:40:13 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:10 rillig Exp $
 #
 
 DISTNAME=		arnsrc27012002
@@ -23,7 +23,7 @@ BUILD_TARGET=		arnold
 
 SHAREDIR=		${PREFIX}/share/arnold
 DOCDIR=			${PREFIX}/share/doc/arnold
-MAKE_ENV+=		SHAREDIR=${SHAREDIR}
+MAKE_ENV+=		SHAREDIR=${SHAREDIR:Q}
 INSTALLATION_DIRS=	bin
 
 do-install:
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 532459080e5..5abe64523d9 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:57 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:10 rillig Exp $
 
 DISTNAME=	atari800-1.3.6
 CATEGORIES=	emulators
@@ -22,7 +22,7 @@ GNU_CONFIGURE=		yes
 .include "options.mk"
 
 # override HOME to avoid picking up a bad ${HOME}/.atari800 during the build
-MAKE_FLAGS+=	HOME=${WRKSRC}
+MAKE_FLAGS+=	HOME=${WRKSRC:Q}
 
 post-extract:
 	@cd ${WRKDIR} && ${LOCALBASE}/bin/unzip -Lqo ${DISTDIR}/xf25.zip
diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile
index f8e5ca0a844..926decf678a 100644
--- a/emulators/compat12/Makefile
+++ b/emulators/compat12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/05/23 09:27:48 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:11 rillig Exp $
 #
 
 DISTNAME=		compat12-${MACHINE_ARCH}
@@ -20,10 +20,10 @@ USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
-FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG}
+FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
+FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
+FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
+FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -37,7 +37,7 @@ LOCALBASE=		/usr
 COMPAT_LIBDIR=		lib
 .endif
 
-PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR}
+PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile
index 76377a4e226..6b7a6605f7b 100644
--- a/emulators/compat13/Makefile
+++ b/emulators/compat13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/09/28 20:52:20 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:11 rillig Exp $
 #
 
 DISTNAME=		compat13-${MACHINE_ARCH}${PKGMINOR}
@@ -23,10 +23,10 @@ USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
-FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG}
+FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
+FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
+FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
+FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -46,7 +46,7 @@ PKGMINOR=	nb1
 PKGMINOR=
 .endif
 
-PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR}
+PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
diff --git a/emulators/compat14-crypto/Makefile b/emulators/compat14-crypto/Makefile
index fd936faee1d..2abb088618a 100644
--- a/emulators/compat14-crypto/Makefile
+++ b/emulators/compat14-crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/09/28 20:52:20 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:11 rillig Exp $
 #
 
 DISTNAME=		compat14-crypto-${MACHINE_ARCH}-${VERSION}
@@ -27,11 +27,11 @@ USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
-FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR}
-FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG}
+FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
+FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
+FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
+FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
+FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -47,7 +47,7 @@ COMPAT_LIBDIR=		lib
 COMPAT_XLIBDIR=		X11R6/lib
 .endif
 
-PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
+PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
 
 # note that the INSTALL_DATA for the lib*.so symlinks will copy the file, not the symlink.
 # FIXME.
diff --git a/emulators/compat14/Makefile b/emulators/compat14/Makefile
index 0b1fc882f25..24ecb8e4cc5 100644
--- a/emulators/compat14/Makefile
+++ b/emulators/compat14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/09/28 20:52:20 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:11 rillig Exp $
 #
 
 DISTNAME=		compat14-${MACHINE_ARCH}-${VERSION}
@@ -25,11 +25,11 @@ USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
-FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR}
-FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG}
+FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
+FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
+FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
+FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
+FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -45,7 +45,7 @@ COMPAT_LIBDIR=		lib
 COMPAT_XLIBDIR=		X11R6/lib
 .endif
 
-PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
+PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
 
 # note that the INSTALL_DATA for the lib*.so symlinks will copy the file, not the symlink.
 # FIXME.
diff --git a/emulators/compat16/Makefile b/emulators/compat16/Makefile
index 7eb3371577e..7998f78ffbe 100644
--- a/emulators/compat16/Makefile
+++ b/emulators/compat16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/10/23 15:09:30 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:11 rillig Exp $
 #
 
 DISTNAME=		compat16-${MACHINE_ARCH}-${VERSION}
@@ -22,7 +22,7 @@ SHLIB_HANDLING=		NO
 
 EMULSUBDIR=		emul/netbsd16
 
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR}
+PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${EMULSUBDIR}
diff --git a/emulators/darwin_lib/Makefile b/emulators/darwin_lib/Makefile
index 90250cd716e..28aaf8da6f1 100644
--- a/emulators/darwin_lib/Makefile
+++ b/emulators/darwin_lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/23 09:29:08 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:11 rillig Exp $
 
 DISTNAME=	darwin_lib-6.6.2
 CATEGORIES=	emulators
@@ -15,7 +15,7 @@ MAINTAINER=	abacau@yahoo.com.au
 HOMEPAGE=	http://www.opendarwin.org/
 COMMENT=	Darwin compatibility libraries (including X11)
 
-BUILD_DEPENDS=	rpm2pkg>=1.3:../../pkgtools/rpm2pkg
+BUILD_DEPENDS+=	rpm2pkg>=1.3:../../pkgtools/rpm2pkg
 
 ONLY_FOR_PLATFORM=	NetBSD-1.6Z*-powerpc NetBSD-1.6Z*-i386 \
 			NetBSD-[2-9]*-powerpc NetBSD-[2-9]*-i386
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index 36f15d7c3e7..a24341f52dd 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:11 rillig Exp $
 
 DISTNAME=	dosbox-0.63
 PKGREVISION=	1
@@ -12,7 +12,7 @@ COMMENT=	Multi-platform DOS emulator using SDL
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 
-SUBST_CLASSES=		fixme
+SUBST_CLASSES+=		fixme
 SUBST_STAGE.fixme=	post-patch
 SUBST_FILES.fixme=	docs/dosbox.1
 SUBST_SED.fixme=	-e s,/usr/share/,${PREFIX}/share/,g
diff --git a/emulators/doscmd/Makefile b/emulators/doscmd/Makefile
index b5183eb710a..a5e8ac6b55c 100644
--- a/emulators/doscmd/Makefile
+++ b/emulators/doscmd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:14:40 agc Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:11 rillig Exp $
 #
 
 DISTNAME=		doscmd-19960502-2
@@ -13,7 +13,7 @@ COMMENT=		MS-DOS emulator (NetBSD/i386 only)
 ONLY_FOR_PLATFORM=	NetBSD-1.[345]*-i386
 
 WRKSRC=			${WRKDIR}/doscmd
-MAKE_ENV=		X11BASE=${X11BASE}
+MAKE_ENV+=		X11BASE=${X11BASE:Q}
 
 MANCOMPRESSED_IF_MANZ=	yes
 
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index 496ec09131b..cea9b846ab8 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/16 06:57:50 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:11 rillig Exp $
 
 DISTNAME=	fMSX24.tar
 PKGNAME=	fmsx-2.4
@@ -27,7 +27,7 @@ DEFS+=		-DMITSHM -D${CUR_DEPTH} -DSOUND
 DEFS+=		-DSUN_AUDIO
 .endif
 
-MAKE_ENV=	DEFS="${DEFS}"
+MAKE_ENV+=	DEFS=${DEFS:Q}
 
 INSTALLATION_DIRS=	bin
 
diff --git a/emulators/gens/Makefile b/emulators/gens/Makefile
index 8a56b156a74..0f98a1f424c 100644
--- a/emulators/gens/Makefile
+++ b/emulators/gens/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:57 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:11 rillig Exp $
 #
 
 DISTNAME=		gens-rc3
@@ -14,7 +14,7 @@ COMMENT=		Sega Genesis emulator with Sega CD support
 BUILD_DEPENDS+=		nasm-[0-9]*:../../devel/nasm
 
 # contains i386 assembler sources
-ONLY_FOR_PLATFORM=	*-i386
+ONLY_FOR_PLATFORM=	*-*-i386
 
 WRKSRC=			${WRKDIR}/GensForLinux
 GNU_CONFIGURE=		yes
diff --git a/emulators/gpsim-oscilloscope/Makefile b/emulators/gpsim-oscilloscope/Makefile
index e81901d4290..390f0903079 100644
--- a/emulators/gpsim-oscilloscope/Makefile
+++ b/emulators/gpsim-oscilloscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/09/19 09:10:23 bouyer Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:11 rillig Exp $
 #
 
 DISTNAME=	oscilloscope-0.1.2
@@ -10,7 +10,6 @@ MAINTAINER=	bouyer@NetBSD.org
 COMMENT=	Oscilloscope module for gpsim
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 USE_LANGUAGES=	c c++
 
 USE_LIBTOOL=	YES
diff --git a/emulators/gpsim-ptyusart/Makefile b/emulators/gpsim-ptyusart/Makefile
index d35fe66e14d..a8d9146478d 100644
--- a/emulators/gpsim-ptyusart/Makefile
+++ b/emulators/gpsim-ptyusart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/09/19 09:10:23 bouyer Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:11 rillig Exp $
 #
 
 DISTNAME=	ptyusart-0.3.2
@@ -12,7 +12,6 @@ COMMENT=	Pseudo-tty module for gpsim
 ONLY_FOR_PLATFORM=      NetBSD-*-*
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 USE_LANGUAGES=	c c++
 
 USE_LIBTOOL=	YES
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index a0276129102..dd6fb1775d6 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/26 19:03:14 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:11 rillig Exp $
 #
 
 DISTNAME=	gxemul-0.3.7
@@ -23,7 +23,7 @@ do-install:
 .for f in README HISTORY BUGS TODO RELEASE LICENSE
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/${PKGBASE}
 .endfor
-	cd ${WRKSRC}/doc && ${PAX} -rwppm . ${PREFIX}/share/doc/${PKGBASE} 
+	cd ${WRKSRC}/doc && ${PAX} -rwppm . ${PREFIX}/share/doc/${PKGBASE}
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gxemul
 PKG_SUPPORTED_OPTIONS=	x11
@@ -33,7 +33,7 @@ PKG_SUGGESTED_OPTIONS=	x11
 
 .if !empty(PKG_OPTIONS:Mx11)
 GLOBAL_LDFLAGS=		-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
-SUBST_CLASSES=		x11
+SUBST_CLASSES+=		x11
 SUBST_STAGE.x11=	post-patch
 SUBST_FILES.x11=	configure
 SUBST_SED.x11=		-e "s|-L/usr/X11R6/lib|${GLOBAL_LDFLAGS}|g" \
diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index 28880c92266..20d3d358cba 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:58 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:11 rillig Exp $
 
 DISTNAME=		hercules-2.11
 PKGREVISION=		2
@@ -13,7 +13,7 @@ DEPENDS+=		hercules-images-[0-9]*:../../emulators/hercules-images
 
 USE_TOOLS+=		gmake
 MAKEFILE=		makefile
-MAKE_ENV+=		HOST_ARCH=${MACHINE_ARCH}
+MAKE_ENV+=		HOST_ARCH=${MACHINE_ARCH:Q}
 
 PTHREAD_OPTS+=		require
 
diff --git a/emulators/netbsd32_compat14/Makefile b/emulators/netbsd32_compat14/Makefile
index 48afb0fdb62..851beca791f 100644
--- a/emulators/netbsd32_compat14/Makefile
+++ b/emulators/netbsd32_compat14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/09/28 20:52:20 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:11 rillig Exp $
 #
 
 DISTNAME=		compat14-${MACHINE32_ARCH}-${VERSION}
@@ -33,11 +33,11 @@ USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
-FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR}
-FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG}
+FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
+FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
+FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
+FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
+FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -45,7 +45,7 @@ EMULSUBDIR=		emul/aout
 COMPAT_LIBDIR=		${EMULSUBDIR}/usr/lib
 COMPAT_XLIBDIR=		${EMULSUBDIR}/usr/X11R6/lib
 
-PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
+PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
diff --git a/emulators/netbsd32_compat15/Makefile b/emulators/netbsd32_compat15/Makefile
index 5ab6c76b18e..86b204d1509 100644
--- a/emulators/netbsd32_compat15/Makefile
+++ b/emulators/netbsd32_compat15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:21 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:11 rillig Exp $
 #
 
 .if ${MACHINE_ARCH} == "sparc64"
@@ -27,12 +27,12 @@ USE_PKGINSTALL=		YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
-FILES_SUBST+=		COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR}
-FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR}
-FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG}
+FILES_SUBST+=		COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR:Q}
+FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
+FILES_SUBST+=		COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
+FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
+FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
+FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -41,23 +41,23 @@ COMPAT_LIBDIR=		${EMULSUBDIR}/usr/lib
 COMPAT_LIBEXECDIR=	${EMULSUBDIR}/usr/libexec
 COMPAT_XLIBDIR=		${EMULSUBDIR}/usr/X11R6/lib
 
-PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
+PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q} COMPAT_LIBEXECDIR=${COMPAT_LIBEXECDIR:Q} COMPAT_XLIBDIR=${COMPAT_XLIBDIR:Q}
 
 # XXX using pax to copy symlinks properly.
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
-	(cd ${WRKDIR}/lib; pax -rwv lib*.so* ${PREFIX}/${COMPAT_LIBDIR}; \
+	(cd ${WRKDIR}/lib; ${PAX} -rwv lib*.so* ${PREFIX}/${COMPAT_LIBDIR}; \
 	 ${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_LIBDIR}/lib*.so*; \
 	 ${CHMOD} 555 ${PREFIX}/${COMPAT_LIBDIR}/lib*.so* )
 	if [ -d ${WRKDIR}/X11R6/lib ]; then \
 		${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_XLIBDIR}; \
-		(cd ${WRKDIR}/X11R6/lib; pax -rwv lib*.so* ${PREFIX}/${COMPAT_XLIBDIR}; \
+		(cd ${WRKDIR}/X11R6/lib; ${PAX} -rwv lib*.so* ${PREFIX}/${COMPAT_XLIBDIR}; \
 		 ${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_XLIBDIR}/lib*.so*; \
 		 ${CHMOD} 555 ${PREFIX}/${COMPAT_XLIBDIR}/lib*.so* ) \
 	fi
 	if [ -d ${WRKDIR}/libexec ]; then \
 		${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBEXECDIR}; \
-		(cd ${WRKDIR}/libexec; pax -rwv ld.*so ${PREFIX}/${COMPAT_LIBEXECDIR}; \
+		(cd ${WRKDIR}/libexec; ${PAX} -rwv ld.*so ${PREFIX}/${COMPAT_LIBEXECDIR}; \
 		 ${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/${COMPAT_LIBEXECDIR}/ld.*so; \
 		 ${CHMOD} 555 ${PREFIX}/${COMPAT_LIBEXECDIR}/ld.*so ) \
 	fi
diff --git a/emulators/netbsd32_compat16/Makefile b/emulators/netbsd32_compat16/Makefile
index ccd55d93f0f..d6c9834f127 100644
--- a/emulators/netbsd32_compat16/Makefile
+++ b/emulators/netbsd32_compat16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:21 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:11 rillig Exp $
 #
 
 .if ${MACHINE_ARCH} == "sparc64"
@@ -36,10 +36,10 @@ USE_PKGINSTALL= 	YES
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
-FILES_SUBST+=		COMPAT_EMULSUBDIR=${COMPAT_EMULSUBDIR}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG}
+FILES_SUBST+=		COMPAT_EMULSUBDIR=${COMPAT_EMULSUBDIR:Q}
+FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
+FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
+FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -48,16 +48,16 @@ COMPAT_LIBDIR=		${PREFIX}/${EMULSUBDIR}/usr/lib
 COMPAT_LIBEXECDIR=	${PREFIX}/${EMULSUBDIR}/usr/libexec
 COMPAT_XLIBDIR=		${PREFIX}/${EMULSUBDIR}/usr/X11R6/lib
 
-PLIST_SUBST+=		COMPAT_EMULSUBDIR=${EMULSUBDIR}
+PLIST_SUBST+=		COMPAT_EMULSUBDIR=${EMULSUBDIR:Q}
 
 # XXX using pax to copy symlinks properly.
 do-install:
 	${INSTALL_DATA_DIR} ${COMPAT_LIBDIR}
 	${INSTALL_DATA_DIR} ${COMPAT_XLIBDIR}
 	${INSTALL_DATA_DIR} ${COMPAT_LIBEXECDIR}
-	(cd ${WRKDIR}/usr/lib; pax -rwv lib*.so* i18n/lib*.so* ${COMPAT_LIBDIR})
-	(cd ${WRKDIR}/usr/X11R6/lib; pax -rwv lib*.so* ${COMPAT_XLIBDIR})
-	(cd ${WRKDIR}/usr/libexec; pax -rwv ld.*so ${COMPAT_LIBEXECDIR})
+	(cd ${WRKDIR}/usr/lib; ${PAX} -rwv lib*.so* i18n/lib*.so* ${COMPAT_LIBDIR})
+	(cd ${WRKDIR}/usr/X11R6/lib; ${PAX} -rwv lib*.so* ${COMPAT_XLIBDIR})
+	(cd ${WRKDIR}/usr/libexec; ${PAX} -rwv ld.*so ${COMPAT_LIBEXECDIR})
 	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} \
 		${COMPAT_LIBDIR}/lib*.so* ${COMPAT_LIBDIR}/i18n/lib*.so* \
 		${COMPAT_XLIBDIR}/lib*.so* ${COMPAT_LIBEXECDIR}/ld.*so
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 78996851ea8..97545909c75 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/27 12:04:04 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:11 rillig Exp $
 #
 
 DISTNAME=		openmsx-0.5.2
@@ -22,7 +22,7 @@ post-extract:
 	@${ECHO_MSG} "OPENMSX_STRIP:=true" > \
 		${WRKSRC}/build/flavour-pkgsrc.mk
 
-SUBST_CLASSES=		prefix
+SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	post-patch
 SUBST_FILES.prefix=	build/custom.mk
 SUBST_SED.prefix=	-e "s,/opt/openMSX,${PREFIX}/openmsx,"
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index 9e8999e33d6..65493ee8235 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:10 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:11 rillig Exp $
 #
 
 DISTNAME=	emulator_src_${POSE_VERSION}
@@ -36,7 +36,7 @@ USE_TOOLS+=	gmake perl
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-fltk=${BUILDLINK_PREFIX.fltk}
-CONFIGURE_ENV+=		PACKAGE_SKINS_DIR=${POSE_SKINS_DIR}
+CONFIGURE_ENV+=		PACKAGE_SKINS_DIR=${POSE_SKINS_DIR:Q}
 
 # Assumes too much about how to build va_list's from scratch
 NOT_FOR_PLATFORM=	*-*-powerpc
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index 3c4556bb419..00920e40f78 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:47 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:11 rillig Exp $
 
 DISTNAME=	pcemu1.01alpha
 PKGNAME=	pcemu-1.01a
@@ -10,14 +10,14 @@ MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/ \
 MAINTAINER=	eric@fox.phoenix.az.us
 COMMENT=	8086 PC emulator, by David Hedley
 
-MAKE_ENV+=	FILESDIR=${FILESDIR}
+MAKE_ENV+=	FILESDIR=${FILESDIR:Q}
 
 .include "../../mk/x11.buildlink3.mk"
 
 do-configure:
 	cd ${WRKSRC};							\
 		${MKDIR} ${WRKSRC}/bootstrap;				\
-		sh < ${FILESDIR}/bootstrap.shar
+		${SH} < ${FILESDIR}/bootstrap.shar
 
 post-configure:
 	${SED} -e 's|/usr/local|${PREFIX}|g' < ${WRKSRC}/bootstrap/help.txt > \
diff --git a/emulators/peace/Makefile b/emulators/peace/Makefile
index 3366414e035..5e55f99a76b 100644
--- a/emulators/peace/Makefile
+++ b/emulators/peace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/09 14:25:49 kent Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:12 rillig Exp $
 #
 PEACE_VERSION=	0.0.20050609
 DISTNAME=	peace-${PEACE_VERSION}
@@ -17,17 +17,17 @@ DEPENDS+=	icu>=2.4nb1:../../textproc/icu
 # DEPENDS+=	perl5:../../lang/perl5
 # DEPENDS+=	cross-i386-netbsdpe>=3.3:../../cross/i386-netbsdpe
 
-BUILD_DEPENDS=	cross-i386-netbsdpe>=3.3:../../cross/i386-netbsdpe
+BUILD_DEPENDS+=	cross-i386-netbsdpe>=3.3:../../cross/i386-netbsdpe
 BUILD_DEPENDS+=	w32api>=2.5:../../devel/w32api
 BUILD_DEPENDS+= x11-links-*:../../pkgtools/x11-links
 
 CPPFLAGS+=	-I${WRKDIR}/cross/i386-netbsdpe/include
-LDFLAGS=	-L${WRKSRC}/lib
+LDFLAGS+=	-L${WRKSRC}/lib
 PECOFFDIR=	${PREFIX}/emul/pecoff
-MAKE_FLAGS+=	PECOFFDIR=${PECOFFDIR} \
-		LOCALBASE=${LOCALBASE} \
-		CROSSBASE=${CROSSBASE} \
-		X11BASE=${X11BASE} \
+MAKE_FLAGS+=	PECOFFDIR=${PECOFFDIR:Q} \
+		LOCALBASE=${LOCALBASE:Q} \
+		CROSSBASE=${CROSSBASE:Q} \
+		X11BASE=${X11BASE:Q} \
 		CHECK_DEPENDENTS=NO
 MAKE_COMMAND=	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
 
diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile
index 65d74967f89..b99eaed3247 100644
--- a/emulators/pearpc/Makefile
+++ b/emulators/pearpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/27 16:21:17 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:12 rillig Exp $
 #
 
 DISTNAME=		pearpc-0.3.1
@@ -39,7 +39,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/ppccfg.example ${EGDIR}
 
-SUBST_CLASSES=		conf
+SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	post-patch
 SUBST_FILES.conf=	ppccfg.example
 SUBST_SED.conf=		-e "s|\"nvram\"|\"/tmp/nvram\"|"
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 2e0fff90312..2ae7cdf7509 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/11/17 14:21:02 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:12 rillig Exp $
 
 DISTNAME=		s9xs139
 PKGNAME=		snes9x-1.39
@@ -15,7 +15,7 @@ BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
 WRKSRC=			${WRKDIR}/release
 USE_TOOLS+=		gmake
-PTHREAD_OPTS=		require
+PTHREAD_OPTS+=		require
 INSTALLATION_DIRS=	bin
 
 do-install:
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 6a1f123c167..5fc99ef247e 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/06/16 06:57:51 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/05 20:50:12 rillig Exp $
 
 STELLA_VERSION=	1.4.1
 DISTNAME=	stella-${STELLA_VERSION}-src
@@ -27,7 +27,7 @@ BUILD_TARGET=	linux
 GCC_REQD+=	3.0
 .endif
 
-MAKE_ENV=	CXXFLAGS="${CXXFLAGS} -fno-rtti"
+MAKE_ENV+=	CXXFLAGS=${CXXFLAGS:Q}\ -fno-rtti
 
 DOCDIR=${PREFIX}/share/doc/html/stella
 DATADIR=${PREFIX}/share/stella
diff --git a/emulators/suse91_base/Makefile b/emulators/suse91_base/Makefile
index 86bd560c56f..2a92e987a7d 100644
--- a/emulators/suse91_base/Makefile
+++ b/emulators/suse91_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/11/06 14:52:43 salo Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:12 rillig Exp $
 
 DISTNAME=		suse_base-${SUSE_VERSION}
 PKGREVISION=		8
@@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-i386 NetBSD-3.99*-x86_64 \
 
 EXTRACT_ONLY=		# empty
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR} LINUX_LIB=${LINUX_LIB}
+PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q} LINUX_LIB=${LINUX_LIB:Q}
 
 .if exists(Makefile.${MACHINE_ARCH})
 .include "Makefile.${MACHINE_ARCH}"
diff --git a/emulators/suse91_glx/Makefile b/emulators/suse91_glx/Makefile
index a8af3294e1f..7f8adb3453c 100644
--- a/emulators/suse91_glx/Makefile
+++ b/emulators/suse91_glx/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2005/05/15 16:44:33 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:12 rillig Exp $
 
 DISTNAME=		suse_glx-${SUSE_VERSION}
-PKGREVISION=		# empty
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SUSE91}
 DISTFILES=		${RPMFILES}
diff --git a/emulators/suse91_gtk2/Makefile b/emulators/suse91_gtk2/Makefile
index 7ba775102af..5303cb4a2fd 100644
--- a/emulators/suse91_gtk2/Makefile
+++ b/emulators/suse91_gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/11/27 18:02:01 salo Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:12 rillig Exp $
 
 DISTNAME=		suse_gtk2-${SUSE_VERSION}
 PKGREVISION=		4
@@ -30,8 +30,8 @@ RPMFILES=		atk-1.4.1-124.${SUSE_ARCH}.rpm \
 			pango-1.2.5-170.${SUSE_ARCH}.rpm
 
 # Initialize gtk/pango modules.
-FILES_SUBST+=		EMULDIR=${EMULDIR}
-PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR}
+FILES_SUBST+=		EMULDIR=${EMULDIR:Q}
+PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
 INSTALL_EXTRA_TMPL+=	${PKGDIR}/INSTALL
 
 .include "../../emulators/suse91_linux/Makefile.common"
diff --git a/emulators/suse91_slang/Makefile b/emulators/suse91_slang/Makefile
index d23aa68a9a5..ddbf1b2bf2d 100644
--- a/emulators/suse91_slang/Makefile
+++ b/emulators/suse91_slang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/19 10:23:42 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:12 rillig Exp $
 
 DISTNAME=		suse_slang-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -23,5 +23,5 @@ post-install:
 	${LN} -sf ${PREFIX}/${EMULSUBDIR}/usr/lib/libslang-utf8.so.1 \
 		${PREFIX}/${EMULSUBDIR}/usr/lib/libslang.so.1
 
-.include "../suse91_linux/Makefile.common"
+.include "../../emulators/suse91_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse91_vmware/Makefile b/emulators/suse91_vmware/Makefile
index 9a32db0de03..8a65af42173 100644
--- a/emulators/suse91_vmware/Makefile
+++ b/emulators/suse91_vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:12 rillig Exp $
 
 DISTNAME=		suse_vmware-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST=		EMULSUBDIR=${EMULSUBDIR}
+PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
 
 RPMFILES=		grep-2.5.1-416.i586.rpm
 RPMIGNOREPATH=		usr
diff --git a/emulators/suse_devel/Makefile b/emulators/suse_devel/Makefile
index b02aa394380..a6d24a87bfb 100644
--- a/emulators/suse_devel/Makefile
+++ b/emulators/suse_devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/19 10:23:42 grant Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:12 rillig Exp $
 
 DISTNAME=		suse_devel-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -23,7 +23,7 @@ PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
 RPMFILES=		binutils.rpm cpp.rpm g77.rpm gcc.rpm gpp.rpm make.rpm
 
-.include "../suse_linux/arch.mk"
+.include "../../emulators/suse_linux/arch.mk"
 
 .if ${SUSE_ARCH} == "i386"
 RPMFILES+=      glibc-devel-2.2.4-78.${SUSE_ARCH}.rpm bin86.rpm
@@ -33,5 +33,5 @@ RPMFILES+=      glibc-devel-2.2.4-69.${SUSE_ARCH}.rpm
 RPMFILES+=      glibc.rpm
 .endif
 
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_fileutils/Makefile b/emulators/suse_fileutils/Makefile
index fb940f99d34..fd286a4d428 100644
--- a/emulators/suse_fileutils/Makefile
+++ b/emulators/suse_fileutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/07/19 10:23:42 grant Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:12 rillig Exp $
 
 DISTNAME=		suse_fileutils-${SUSE_VERSION}
 CATEGORIES=		emulators
@@ -20,5 +20,5 @@ PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
 RPMFILES=		fileutils.rpm
 
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_freetype2/Makefile b/emulators/suse_freetype2/Makefile
index 433a8da33b0..ac1c17e8107 100644
--- a/emulators/suse_freetype2/Makefile
+++ b/emulators/suse_freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/19 10:23:42 grant Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:12 rillig Exp $
 
 DISTNAME=		freetype2
 PKGNAME=		suse_${DISTNAME}-${SUSE_VERSION}
@@ -22,5 +22,5 @@ PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
 RPMFILES+=      	freetype2-2.0.4-52.${SUSE_ARCH}.rpm
 
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_linux/arch.mk b/emulators/suse_linux/arch.mk
index a995738943f..c643986048a 100644
--- a/emulators/suse_linux/arch.mk
+++ b/emulators/suse_linux/arch.mk
@@ -1,7 +1,7 @@
-# $NetBSD: arch.mk,v 1.1 2002/11/25 11:01:16 schmonz Exp $
+# $NetBSD: arch.mk,v 1.2 2005/12/05 20:50:12 rillig Exp $
 
-.ifndef SUSE_ARCH_MK
-SUSE_ARCH_MK=1
+.if !defined(SUSE_ARCH_MK)
+SUSE_ARCH_MK=	# defined
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/emulators/suse_linux/vars.mk b/emulators/suse_linux/vars.mk
index 8ed70cc071a..12270ff4f57 100644
--- a/emulators/suse_linux/vars.mk
+++ b/emulators/suse_linux/vars.mk
@@ -1,7 +1,7 @@
-# $NetBSD: vars.mk,v 1.1 2005/04/03 21:23:15 jdolecek Exp $
+# $NetBSD: vars.mk,v 1.2 2005/12/05 20:50:12 rillig Exp $
 
-.ifndef SUSE_VARS_MK
-SUSE_VARS_MK=1
+.if !defined(SUSE_VARS_MK)
+SUSE_VARS_MK=	# defined
 
 SUSE_VERSION=		7.3
 SUSE_DIR_PREFIX=	suse
diff --git a/emulators/suse_slang/Makefile b/emulators/suse_slang/Makefile
index 0ef4402f6cb..bf454b1fff9 100644
--- a/emulators/suse_slang/Makefile
+++ b/emulators/suse_slang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/19 10:23:42 grant Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:12 rillig Exp $
 
 DISTNAME=		slang
 PKGREVISION=		1
@@ -21,5 +21,5 @@ PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
 RPMFILES=		${DISTNAME}${EXTRACT_SUFX}
 
-.include "../suse_linux/Makefile.common"
+.include "../../emulators/suse_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/suse_vmware/Makefile b/emulators/suse_vmware/Makefile
index e79b2f60063..afa7e1b499d 100644
--- a/emulators/suse_vmware/Makefile
+++ b/emulators/suse_vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:45 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:12 rillig Exp $
 
 DISTNAME=		fileutils-4.1-154.i386
 PKGNAME=		suse_vmware-${SUSE_VERSION}
@@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM=      NetBSD-*-i386 FreeBSD-*-i386
 EXTRACT_ONLY=		# empty
 NO_BUILD=		YES
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-PLIST_SUBST=		EMULSUBDIR=${EMULSUBDIR}
+PLIST_SUBST+=		EMULSUBDIR=${EMULSUBDIR:Q}
 
 RPMFILES=		${DISTNAME}${EXTRACT_SUFX}
 RPMIGNOREPATH=		usr
diff --git a/emulators/tme/distinfo b/emulators/tme/distinfo
index 1da745e33e5..da750d3ada7 100644
--- a/emulators/tme/distinfo
+++ b/emulators/tme/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/07/27 07:29:26 skrll Exp $
+$NetBSD: distinfo,v 1.5 2005/12/05 20:50:12 rillig Exp $
 
 SHA1 (tme-0.4.tar.gz) = 7a1a2c6aa05527b11f81925e4931e7250f5be308
 RMD160 (tme-0.4.tar.gz) = a5b5ac56c8247f94cd96c92a04a6cb132ba92931
 Size (tme-0.4.tar.gz) = 1448981 bytes
-SHA1 (patch-aa) = 0f8cdd5efe8dab297d6369c7d6508bd1902c3bc2
+SHA1 (patch-aa) = 0fe6c37472caa876c253b9e8bb4e09cd278e5def
 SHA1 (patch-ac) = 885286eb6893d5af9769791805d054212b6d0db5
 SHA1 (patch-ad) = 3f5adbaa94e5b97ded14e9a05cce912ed01f406f
 SHA1 (patch-ae) = 2f472a55f5afd1c0079349ce49bd3eb251ea9d76
diff --git a/emulators/tme/patches/patch-aa b/emulators/tme/patches/patch-aa
index c02f761c36d..f1523dd5c06 100644
--- a/emulators/tme/patches/patch-aa
+++ b/emulators/tme/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/07/27 07:29:26 skrll Exp $
+$NetBSD: patch-aa,v 1.3 2005/12/05 20:50:12 rillig Exp $
 
 --- tme/threads.h.orig	2003-06-27 21:09:10.000000000 +0000
 +++ tme/threads.h
-@@ -41,6 +41,7 @@ _TME_RCSID("$Id: threads.h,v 1.6 2003/06
+@@ -41,6 +41,7 @@
  
  /* includes: */
  #include <errno.h>
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index 1cda943fd28..984a85392c5 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/06/01 20:08:00 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:12 rillig Exp $
 #
 
 DISTNAME=		twin-src-3.1.14
@@ -15,7 +15,7 @@ WRKSRC=			${WRKDIR}/twin
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		autoconf213 gmake
 BUILD_TARGET=		depend world
-CONFIGURE_ARGS=		--enable-debugger
+CONFIGURE_ARGS+=	--enable-debugger
 
 .include "../../mk/x11.buildlink3.mk"
 
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 3bc10861608..248908f5279 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2005/10/14 22:15:49 kristerw Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:12 rillig Exp $
 
 DISTNAME=	uae-0.8.25
-PKGNAME=	${DISTNAME}
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.freiburg.linux.de/~uae/bin/sources/develop/
 
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index ad641aa91e8..a15231c799a 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:51 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:12 rillig Exp $
 
 DISTNAME=	VMware-workstation-3.2.1-2242
 PKGNAME=	vmware-3.2.1pl1
@@ -95,5 +95,5 @@ post-install:
 	${ECHO} "xkeymap.usekeycodeMapIfXFree86 = true";		\
 	) > ${VMWARE_CFG_DIR}/config
 
-.include "../suse_linux/Makefile.application"
+.include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 76a618628c3..0265b9e6ae3 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2005/10/26 08:32:59 adam Exp $
+# $NetBSD: Makefile,v 1.94 2005/12/05 20:50:13 rillig Exp $
 
 DISTNAME=	wine-0.9
 CATEGORIES=	emulators
@@ -13,7 +13,7 @@ COMMENT=	Free implementation of Windows on Unix (still alpha)
 BUILD_DEPENDS+=	fontforge-[0-9]*:../../fonts/fontforge
 
 ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
-ONLY_FOR_PLATFORM+=	FreeBSD*-i386 Linux*-i386 SunOS*-i386 Darwin*-i386
+ONLY_FOR_PLATFORM+=	FreeBSD-*-i386 Linux-*-i386 SunOS-*-i386 Darwin-*-i386
 
 WRKSRC=		 	${WRKDIR}/${DISTNAME:S/W/w/}
 USE_LIBTOOL=		yes
@@ -30,7 +30,7 @@ REPLACE_PERL=		tools/winemaker tools/winedump/function_grep.pl
 # buildlink directory, so prepend all of the LDFLAGS necessary to link
 # against the libraries.
 #
-CONFIGURE_ENV+=		X_LIBS="${LDFLAGS}"
+CONFIGURE_ENV+=		X_LIBS=${LDFLAGS:M*:Q}
 CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\""
 LIBS+=			${LDFLAGS}
 
diff --git a/emulators/xbeeb/Makefile b/emulators/xbeeb/Makefile
index ccab5fd6617..7481ae747a2 100644
--- a/emulators/xbeeb/Makefile
+++ b/emulators/xbeeb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:51 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:13 rillig Exp $
 #
 
 DISTNAME=	xbeeb-0.3.6
@@ -18,7 +18,7 @@ MAN_PAGE=	${WRKDIR}/xbeeb.1
 
 XBEEBROOT=	share/xbeeb
 MESSAGE_SUBST+=	XBEEBROOT=${XBEEBROOT}
-PLIST_SUBST+=	XBEEBROOT=${XBEEBROOT}
+PLIST_SUBST+=	XBEEBROOT=${XBEEBROOT:Q}
 
 INSTALLATION_DIRS=	bin man/man1
 
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 2bcad6bf750..27aa8a2fafa 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2005/12/03 10:57:48 kristerw Exp $
+# $NetBSD: Makefile,v 1.139 2005/12/05 20:50:13 rillig Exp $
 #
 
 DISTNAME=		xmame-0.102
@@ -28,7 +28,7 @@ SPOOLDIR=		${VARBASE}/games/${TARGET}
 
 MAKE_FLAGS+=		TARGET="${TARGET:S/x//}"
 MAKE_FLAGS+=		LIBS="${LDFLAGS} ${LIBS}"
-MAKE_FLAGS+=		CFLAGS="${CFLAGS}"
+MAKE_FLAGS+=		CFLAGS=${CFLAGS:M*:Q}
 MAKE_FLAGS+=		X11INC= X11LIB=
 
 # Network support is broken since xmame-0.85
@@ -56,7 +56,7 @@ MAME_ARCH.DragonFly?=	dragonfly
 MAME_ARCH.${OPSYS}?=	generic
 .endif
 
-MAKE_FLAGS+=		DISPLAY_METHOD="${MAME_DISP_METHOD}"
+MAKE_FLAGS+=		DISPLAY_METHOD=${MAME_DISP_METHOD:Q}
 MAKE_FLAGS+=		MY_CPU="${MAME_CPU.${MACHINE_ARCH}}"
 MAKE_FLAGS+=		ARCH="${MAME_ARCH.${OPSYS}}"
 
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index 095e918efac..a045a76c80b 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2005/12/03 10:58:22 kristerw Exp $
+# $NetBSD: Makefile,v 1.79 2005/12/05 20:50:13 rillig Exp $
 #
 
 DISTNAME=		xmame-0.102
@@ -29,7 +29,7 @@ SPOOLDIR=		${VARBASE}/games/${TARGET}
 
 MAKE_FLAGS+=		TARGET="${TARGET:S/x//}"
 MAKE_FLAGS+=		LIBS="${LDFLAGS} ${LIBS}"
-MAKE_FLAGS+=		CFLAGS="${CFLAGS}"
+MAKE_FLAGS+=		CFLAGS=${CFLAGS:M*:Q}
 MAKE_FLAGS+=		X11INC= X11LIB=
 
 # Network support is broken since xmame-0.85
@@ -57,7 +57,7 @@ MAME_ARCH.DragonFly?=	dragonfly
 MAME_ARCH.${OPSYS}?=	generic
 .endif
 
-MAKE_FLAGS+=		DISPLAY_METHOD="${MAME_DISP_METHOD}"
+MAKE_FLAGS+=		DISPLAY_METHOD=${MAME_DISP_METHOD:Q}
 MAKE_FLAGS+=		MY_CPU="${MAME_CPU.${MACHINE_ARCH}}"
 MAKE_FLAGS+=		ARCH="${MAME_ARCH.${OPSYS}}"
 
diff --git a/emulators/z26/Makefile b/emulators/z26/Makefile
index 1234ec226a4..f342aa0fb7a 100644
--- a/emulators/z26/Makefile
+++ b/emulators/z26/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/21 03:49:56 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:13 rillig Exp $
 #
 
 DISTNAME=		z26v213
@@ -12,7 +12,7 @@ COMMENT=		Atari 2600 Emulator
 
 BUILD_DEPENDS+=		nasm-[0-9]*:../../devel/nasm
 
-ONLY_FOR_PLATFORM+=	*-i386
+ONLY_FOR_PLATFORM+=	*-*-i386
 
 WRKSRC=			${WRKDIR}/z26_snapshot-20040523
 USE_TOOLS+=		gmake perl