Fixed warnings found by pkglint -Wall.

8 files changed, 92 insertions, 91 deletions

diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile
index 79f815b0710..5785ca24cc5 100644
--- a/print/LPRng-core/Makefile
+++ b/print/LPRng-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/02/05 23:10:35 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/02/17 08:10:44 martti Exp $
 
 DISTNAME=	LPRng-3.8.28
 PKGNAME=	LPRng-core-3.8.28
@@ -17,7 +17,7 @@ CONFLICTS+=		cups-[0-9]*
 
 USE_TOOLS+=		chgrp chown gmake
 USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LTCONFIG_OVERRIDE+=	${WRKSRC:Q}/ltconfig
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-lpd_perms_path=${LPD_PERMS_PATH:Q}
@@ -33,16 +33,16 @@ CONFIGURE_ENV+=		CHOWN=${TOOLS_CHOWN:Q}
 
 # Look for printer configuration files firstly in /etc, then ${PREFIX}/etc.
 #
-LPD_PERMS_PATH=		${PKG_SYSCONFDIR}/lpd/lpd.perms
-LPD_PRINTCAP_PATH=	${PKG_SYSCONFDIR}/printcap
-PRINTCAP_PATH=		${PKG_SYSCONFDIR}/printcap
-FILTER_DIR=		${PREFIX}/libexec/LPRng
-FILTER_LD_PATH=		/usr/lib:${PREFIX}/lib:/usr/local/lib
-FILTER_PATH=		${FILTER_DIR}:/sbin:/usr/sbin:/bin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin:/usr/local/sbin:/usr/local/bin
+LPD_PERMS_PATH=		${PKG_SYSCONFDIR:Q}/lpd/lpd.perms
+LPD_PRINTCAP_PATH=	${PKG_SYSCONFDIR:Q}/printcap
+PRINTCAP_PATH=		${PKG_SYSCONFDIR:Q}/printcap
+FILTER_DIR=		${PREFIX:Q}/libexec/LPRng
+FILTER_LD_PATH=		/usr/lib:${PREFIX:Q}/lib:/usr/local/lib
+FILTER_PATH=		${FILTER_DIR}:/sbin:/usr/sbin:/bin:/usr/bin:${PREFIX:Q}/sbin:${PREFIX:Q}/bin:/usr/local/sbin:/usr/local/bin
 
 MAKE_ENV+=		POSTINSTALL="NO"
 
-EXAMPLESDIR=	 	${PREFIX}/share/examples/LPRng
+EXAMPLESDIR=		${PREFIX:Q}/share/examples/LPRng
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 RCD_SCRIPTS=		LPRng
@@ -55,29 +55,29 @@ FILES_SUBST+=		MKDIR=${MKDIR:Q}
 FILES_SUBST+=		RM=${RM:Q}
 FILES_SUBST+=		TRUE=${TRUE:Q}
 FILES_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+FILES_SUBST_SED+=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
 
 pre-patch:
-	${MV} ${WRKSRC}/man/lpd.conf.n ${WRKSRC}/man/lpd.conf.n.in
+	${MV} ${WRKSRC:Q}/man/lpd.conf.n ${WRKSRC:Q}/man/lpd.conf.n.in
 
 post-configure:
-	${SED}	-e "s,@FILTER_LD_PATH@,${FILTER_LD_PATH},g" \
-		-e "s,@FILTER_PATH@,${FILTER_PATH},g" \
-		-e "s,@LPD_PRINTCAP_PATH@,${LPD_PRINTCAP_PATH},g" \
-		-e "s,@LPD_PERMS_PATH@,${LPD_PERMS_PATH},g" \
-		-e "s,@PRINTCAP_PATH@,${PRINTCAP_PATH},g" \
-		-e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g" \
-		< ${WRKSRC}/man/lpd.conf.n.in > ${WRKSRC}/man/lpd.conf.n
+	${SED}	-e "s,@FILTER_LD_PATH@,${FILTER_LD_PATH:Q},g" \
+		-e "s,@FILTER_PATH@,${FILTER_PATH:Q},g" \
+		-e "s,@LPD_PRINTCAP_PATH@,${LPD_PRINTCAP_PATH:Q},g" \
+		-e "s,@LPD_PERMS_PATH@,${LPD_PERMS_PATH:Q},g" \
+		-e "s,@PRINTCAP_PATH@,${PRINTCAP_PATH:Q},g" \
+		-e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR:Q},g" \
+		< ${WRKSRC:Q}/man/lpd.conf.n.in > ${WRKSRC:Q}/man/lpd.conf.n
 
 pre-install:
-	${SED}	-e "s,@PREFIX@,${PREFIX},g" \
-		< ${FILESDIR}/LPRng.sh > ${WRKDIR}/LPRng.sh
+	${SED}	-e "s,@PREFIX@,${PREFIX:Q},g" \
+		< ${FILESDIR:Q}/LPRng.sh > ${WRKDIR:Q}/LPRng.sh
 
 post-install:
-	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+	${INSTALL_DATA_DIR} ${EXAMPLESDIR:Q}
 	for file in lpd.conf lpd.perms printcap; do \
-		${INSTALL_DATA} ${WRKSRC}/$${file} \
-			${EXAMPLESDIR}/$${file}.example; \
+		${INSTALL_DATA} ${WRKSRC:Q}/$${file} \
+			${EXAMPLESDIR:Q}/$${file}.example; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/LPRng-doc/Makefile b/print/LPRng-doc/Makefile
index 588efbae911..d355639a8e9 100644
--- a/print/LPRng-doc/Makefile
+++ b/print/LPRng-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/16 05:38:00 martti Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/17 08:11:58 martti Exp $
 
 DISTNAME=	LPRng_DOC-3.6.13
 PKGNAME=	LPRng-doc-3.6.13
@@ -15,9 +15,10 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/LPRng
-	cd ${WRKDIR} && ${PAX} -O -zrf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-	cd ${WRKSRC} && \
-	    ${PAX} -rw *.dvi *.gif *.html *.ps *.txt ${PREFIX}/share/doc/LPRng
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/LPRng
+	cd ${WRKDIR:Q} && \
+	    ${PAX} -O -zrf ${DISTDIR:Q}/${DISTNAME:Q}${EXTRACT_SUFX:Q}
+	cd ${WRKSRC:Q} && \
+	    ${PAX} -rw *.dvi *.gif *.html *.ps *.txt ${PREFIX:Q}/share/doc/LPRng
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xenconsole/Makefile b/sysutils/xenconsole/Makefile
index 3087188c474..2270e6e9c53 100644
--- a/sysutils/xenconsole/Makefile
+++ b/sysutils/xenconsole/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/12/29 06:22:19 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/17 07:55:57 martti Exp $
 
 DISTNAME=	xenConsole-r0.15b1-1
 PKGNAME=	xenconsole-0.15b1.1
@@ -9,7 +9,7 @@ MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://ucck.sourceforge.net/xenConsole/
 COMMENT=	Console monitor for Xen
 
-WRKSRC=		${WRKDIR}/xenConsole
+WRKSRC=		${WRKDIR:Q}/xenConsole
 
 DEPENDS+=	p5-Config-IniFiles>=2.38:../../devel/p5-Config-IniFiles
 DEPENDS+=	p5-Curses-UI>=0.95:../../devel/p5-Curses-UI
@@ -24,34 +24,34 @@ DEPENDS+=	p5-Time-HiRes>=0:../../time/p5-Time-HiRes
 
 SUBST_CLASSES+=			xenconsole
 SUBST_STAGE.xenconsole=		pre-configure
-SUBST_MESSAGE.xenconsole=	"Fixing paths."
+SUBST_MESSAGE.xenconsole=	Fixing paths.
 SUBST_FILES.xenconsole=		xcon.pl xen_list.pm
-SUBST_SED.xenconsole=		-e "s,@PREFIX@,${PREFIX},g"
-SUBST_SED.xenconsole+=		-e "s,@LOCALBASE@,${LOCALBASE},g"
+SUBST_SED.xenconsole=		-e s,@PREFIX@,${PREFIX:Q},g
+SUBST_SED.xenconsole+=		-e s,@LOCALBASE@,${LOCALBASE:Q},g
 
-REPLACE_PERL=		xcon.pl xsnmp.pm
+REPLACE_PERL+=		xcon.pl xsnmp.pm
 
-EGDIR=			${PREFIX}/share/examples/xenconsole
-CONF_FILES=		${EGDIR}/xcon.ini ${PKG_SYSCONFDIR}/xcon.ini
+EGDIR=			${PREFIX:Q}/share/examples/xenconsole
+CONF_FILES=		${EGDIR:Q}/xcon.ini ${PKG_SYSCONFDIR:Q}/xcon.ini
 
 do-build:
-	${SED} -e "s,@PREFIX@,${PREFIX},g" \
-		< ${FILESDIR}/xcon.sh > ${WRKDIR}/xcon
+	${SED} -e "s,@PREFIX@,${PREFIX:Q},g" \
+		< ${FILESDIR:Q}/xcon.sh > ${WRKDIR:Q}/xcon
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/xenconsole
-	(cd ${WRKSRC} && ${PAX} -rw *.pm */*.pm ${PREFIX}/share/xenconsole)
-	${INSTALL_SCRIPT} ${WRKSRC}/xcon.pl ${PREFIX}/share/xenconsole/xcon
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/xenconsole
+	(cd ${WRKSRC:Q} && ${PAX} -rw *.pm */*.pm ${PREFIX:Q}/share/xenconsole)
+	${INSTALL_SCRIPT} ${WRKSRC:Q}/xcon.pl ${PREFIX:Q}/share/xenconsole/xcon
 
 	# Configuration file
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample-inifile ${EGDIR}/xcon.ini
+	${INSTALL_DATA_DIR} ${EGDIR:Q}
+	${INSTALL_DATA} ${WRKSRC:Q}/sample-inifile ${EGDIR:Q}/xcon.ini
 
 	# Documentation
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xenconsole
-	(cd ${WRKSRC} && ${PAX} -rw *.txt ${PREFIX}/share/doc/xenconsole)
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/xenconsole
+	(cd ${WRKSRC:Q} && ${PAX} -rw *.txt ${PREFIX:Q}/share/doc/xenconsole)
 
 	# Launcher script
-	${INSTALL_SCRIPT} ${WRKDIR}/xcon ${PREFIX}/bin/xcon
+	${INSTALL_SCRIPT} ${WRKDIR:Q}/xcon ${PREFIX:Q}/bin/xcon
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xenconsole/PLIST b/sysutils/xenconsole/PLIST
index 7367310ea42..47a218a8999 100644
--- a/sysutils/xenconsole/PLIST
+++ b/sysutils/xenconsole/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/13 18:36:00 martti Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/17 07:55:57 martti Exp $
 bin/xcon
-share/examples/xenconsole/xcon.ini
 share/doc/xenconsole/CHANGES.txt
 share/doc/xenconsole/README.txt
 share/doc/xenconsole/TODO.txt
+share/examples/xenconsole/xcon.ini
 share/xenconsole/colours.pm
 share/xenconsole/gothix/capstderr.pm
 share/xenconsole/gothix/cpusage.pm
diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index 36f38397f93..05568b2bf5d 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/02/05 23:11:13 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2006/02/17 08:00:00 martti Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
 PKGNAME=	fvwm2-${FVWM_VER}
@@ -27,48 +27,48 @@ PLIST_SUBST+=		FVWM_VER=${FVWM_VER:Q}
 
 EVAL_PREFIX+=		XPMDIR=xpm
 CONFIGURE_ARGS+=	--without-gnome
-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/lib/X11/fvwm2
-CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/lib/X11
-CONFIGURE_ARGS+=	--with-xpm-includes=${XPMDIR}/include
-CONFIGURE_ARGS+=	--with-imagepath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11BASE}/include/X11/bitmaps:${X11BASE}/include/X11/pixmaps
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX:Q}/lib/X11/fvwm2
+CONFIGURE_ARGS+=	--libexecdir=${PREFIX:Q}/lib/X11
+CONFIGURE_ARGS+=	--with-xpm-includes=${{XPMDIR:Q}/include
+CONFIGURE_ARGS+=	--with-imagepath=${PREFIX:Q}/lib/X11/fvwm2/pixmaps:${X11BASE:Q}/include/X11/bitmaps:${X11BASE:Q}/include/X11/pixmaps
 
 # We don't want to have CPP from the buildlink directory
 CONFIGURE_ENV+=		ac_cv_path_FVWM_CPP=${CPP:Q}
 
 post-extract:
-	${MKDIR} ${WRKDIR}/icons
-	cd ${WRKDIR}/icons && ${TAR} -xzf ${DISTDIR}/fvwm_icons.tgz
+	${MKDIR} ${WRKDIR:Q}/icons
+	cd ${WRKDIR:Q}/icons && ${TAR} -xzf ${DISTDIR:Q}/fvwm_icons.tgz
 
 post-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
+	@${INSTALL_DATA_DIR} ${PREFIX:Q}/lib/X11/fvwm2/pixmaps
 	${INSTALL_DATA} \
-		${WRKDIR}/icons/fvwm_icons/*.xpm \
-		${PREFIX}/lib/X11/fvwm2/pixmaps
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm2
+		${WRKDIR:Q}/icons/fvwm_icons/*.xpm \
+		${PREFIX:Q}/lib/X11/fvwm2/pixmaps
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/lib/X11/fvwm2
 	${INSTALL_DATA} \
-		${WRKSRC}/sample.fvwmrc/decor_examples \
-		${WRKSRC}/sample.fvwmrc/system.fvwm2rc-sample-* \
-		${PREFIX}/lib/X11/fvwm2
+		${WRKSRC:Q}/sample.fvwmrc/decor_examples \
+		${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc-sample-* \
+		${PREFIX:Q}/lib/X11/fvwm2
 	${INSTALL_DATA} \
-		${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
-		${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example
+		${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc \
+		${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example
 	${INSTALL_SCRIPT} \
-		${WRKSRC}/utils/fvwmrc_convert \
-		${PREFIX}/bin/fvwmrc_convert
-	if [ ! -f ${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ]; then \
+		${WRKSRC:Q}/utils/fvwmrc_convert \
+		${PREFIX:Q}/bin/fvwmrc_convert
+	if [ ! -f ${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ]; then \
 		${INSTALL_DATA} \
-			${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example \
-			${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ; \
+			${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example \
+			${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ; \
 	fi
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(FVWM2_USE_GTK) && ${FVWM2_USE_GTK} == "YES"
 .include "../../x11/gtk/buildlink3.mk"
-PLIST_SUBST+=	    GTK=""
+PLIST_SUBST+=		GTK=""
 .else
-PLIST_SUBST+=	    GTK="@comment "
-CONFIGURE_ARGS+=    --without-gtk-prefix
+PLIST_SUBST+=		GTK="@comment "
+CONFIGURE_ARGS+=	--without-gtk-prefix
 .endif
 
 .if defined(FVWM2_USE_RPLAY) && ${FVWM2_USE_RPLAY} == "YES"
diff --git a/www/jalbum/Makefile b/www/jalbum/Makefile
index eae6953f29d..e310fce720a 100644
--- a/www/jalbum/Makefile
+++ b/www/jalbum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:11:24 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/02/17 08:01:31 martti Exp $
 
 DISTNAME=		JAlbum6.2
 PKGNAME=		jalbum-6.2
@@ -15,17 +15,17 @@ DIST_SUBDIR=		${PKGNAME_NOREV}
 USE_JAVA=		run
 PKG_JVMS_ACCEPTED=	blackdown-jdk13 kaffe sun-jdk13 sun-jdk14 sun-jdk15
 
-WRKSRC=			${WRKDIR}/JAlbum
+WRKSRC=			${WRKDIR:Q}/JAlbum
 
 do-build:
-	${SED}	-e "s#@PKG_JAVA_HOME@#${PKG_JAVA_HOME}#g"	\
-		-e "s#@PREFIX@#${PREFIX}#g"			\
-		< ${FILESDIR}/jalbum > ${WRKDIR}/jalbum
+	${SED}	-e "s#@PKG_JAVA_HOME@#${PKG_JAVA_HOME:Q}#g"	\
+		-e "s#@PREFIX@#${PREFIX:Q}#g"			\
+		< ${FILESDIR:Q}/jalbum > ${WRKDIR:Q}/jalbum
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/jalbum ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/jalbum
-	(cd ${WRKDIR}/JAlbum && ${PAX} -rw * ${PREFIX}/share/jalbum)
+	${INSTALL_SCRIPT} ${WRKDIR:Q}/jalbum ${PREFIX:Q}/bin
+	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/jalbum
+	(cd ${WRKDIR:Q}/JAlbum && ${PAX} -rw * ${PREFIX:Q}/share/jalbum)
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce3/Makefile b/x11/xfce3/Makefile
index 4720cf1bb70..32268972d8c 100644
--- a/x11/xfce3/Makefile
+++ b/x11/xfce3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:11:46 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/17 08:04:34 martti Exp $
 
 DISTNAME=		xfce-3.8.18
 PKGREVISION=		6
@@ -23,9 +23,9 @@ GCC_REQD+=		2.95
 .endif
 
 CONFIGURE_ARGS+=	--without-included-gettext
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/share
-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
-CONFIGURE_ARGS+=	--enable-imlib=${BUILDLINK_PREFIX.imlib}
+CONFIGURE_ARGS+=	--datadir=${PREFIX:Q}/share
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX:Q}/etc
+CONFIGURE_ARGS+=	--enable-imlib=${BUILDLINK_PREFIX.imlib:Q}
 CONFIGURE_ARGS+=	--disable-libiconv
 CONFIGURE_ARGS+=	--disable-audiofile
 
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index f279512d96e..a4ec6f918bd 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.48 2006/02/05 23:11:49 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2006/02/17 08:02:57 martti Exp $
 #
 
-DISTNAME=       fvwm-${PKG_VERSION}
+DISTNAME=	fvwm-${PKG_VERSION}
 PKGNAME=	xpmroot-${PKG_VERSION}
 PKGREVISION=	1
 CATEGORIES=	x11
-MASTER_SITES=   ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
+MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 
 MAINTAINER=	martti@NetBSD.org
@@ -22,14 +22,14 @@ CONFIGURE_ARGS+=	--without-extras --disable-dmalloc --without-gnome
 INSTALLATION_DIRS=	bin man/man1
 
 do-build:
-	@(cd ${WRKSRC}/libs && \
+	@(cd ${WRKSRC:Q}/libs && \
 		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} all)
-	@(cd ${WRKSRC}/utils && \
+	@(cd ${WRKSRC:Q}/utils && \
 		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xpmroot)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/utils/xpmroot ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/utils/xpmroot.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC:Q}/utils/xpmroot ${PREFIX:Q}/bin
+	${INSTALL_MAN} ${WRKSRC:Q}/utils/xpmroot.1 ${PREFIX:Q}/man/man1
 
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"