Fixed pkglint warnings about unnecessary :Q modifiers in directory names.

5 files changed, 31 insertions, 31 deletions

diff --git a/wm/aewm++/Makefile b/wm/aewm++/Makefile
index 7b0fd2125e7..01d8fe7b912 100644
--- a/wm/aewm++/Makefile
+++ b/wm/aewm++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/03/13 16:50:37 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2016/07/24 20:12:34 rillig Exp $
 #
 
 DISTNAME=	aewm++-1.0.24
@@ -13,7 +13,7 @@ COMMENT=	Fork of the popular minimal window manager aewm
 
 USE_LANGUAGES=	c c++
 
-INSTALL_MAKE_FLAGS=	PKGMANDIR=${PKGMANDIR:Q}
+INSTALL_MAKE_FLAGS=	PKGMANDIR=${PKGMANDIR}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile
index abfe7b403cd..2702c9c30e4 100644
--- a/wm/fvwm/Makefile
+++ b/wm/fvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2016/07/09 06:39:09 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2016/07/24 20:12:34 rillig Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
 PKGREVISION=	7
@@ -28,10 +28,10 @@ INSTALLATION_DIRS+=	lib/X11/fvwm2/pixmaps
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 CONFIGURE_ARGS+=	--without-gnome
-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX:Q}/lib/X11/fvwm2
-CONFIGURE_ARGS+=	--libexecdir=${PREFIX:Q}/lib/X11
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/lib/X11/fvwm2
+CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/lib/X11
 CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_PREFIX.libXpm:Q}/include
-CONFIGURE_ARGS+=	--with-imagepath=${PREFIX:Q}/lib/X11/fvwm2/pixmaps:${X11BASE:Q}/include/X11/bitmaps:${X11BASE:Q}/include/X11/pixmaps
+CONFIGURE_ARGS+=	--with-imagepath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11BASE}/include/X11/bitmaps:${X11BASE}/include/X11/pixmaps
 
 # We don't want to have CPP from the buildlink directory
 CONFIGURE_ENV+=		ac_cv_path_FVWM_CPP=${CPP:Q}
@@ -39,24 +39,24 @@ CONFIGURE_ENV+=		ac_cv_path_FVWM_CPP=${CPP:Q}
 CONFIGURE_ENV+=         ac_cv_path_PERL=${PERL5:Q}
 
 post-extract:
-	mkdir ${WRKDIR:Q}/icons
-	cd ${WRKDIR:Q}/icons && tar -xzf ${DISTDIR:Q}/fvwm_icons.tgz
+	mkdir ${WRKDIR}/icons
+	cd ${WRKDIR}/icons && tar -xzf ${DISTDIR}/fvwm_icons.tgz
 
 post-install:
 	${INSTALL_DATA} \
-		${WRKDIR:Q}/icons/fvwm_icons/*.xpm \
-		${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/pixmaps
+		${WRKDIR}/icons/fvwm_icons/*.xpm \
+		${DESTDIR}${PREFIX}/lib/X11/fvwm2/pixmaps
 	${INSTALL_DATA} \
-		${WRKSRC:Q}/sample.fvwmrc/decor_examples \
-		${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc-sample-* \
-		${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2
+		${WRKSRC}/sample.fvwmrc/decor_examples \
+		${WRKSRC}/sample.fvwmrc/system.fvwm2rc-sample-* \
+		${DESTDIR}${PREFIX}/lib/X11/fvwm2
 	${INSTALL_DATA} \
-		${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc \
-		${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example
-	if [ ! -f ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ]; then \
+		${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
+		${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example
+	if [ ! -f ${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ]; then \
 		${INSTALL_DATA} \
-			${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example \
-			${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ; \
+			${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example \
+			${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ; \
 	fi
 
 .include "options.mk"
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index 0fa64f7ca28..a521668dff6 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.67 2014/01/05 12:29:33 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.68 2016/07/24 20:12:34 rillig Exp $
 #
 # used by wm/icewm/Makefile
 # used by wm/icewm-imlib/Makefile
@@ -27,8 +27,8 @@ PKG_SYSCONFSUBDIR=	icewm
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--with-cfgdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-cfgdir=${PKG_SYSCONFDIR}
 .if ${X11_TYPE} != "native"
 .include "../../x11/libXinerama/buildlink3.mk"
 .elif !exists(${X11BASE}/include/X11/extensions/Xinerama.h)
diff --git a/wm/oroborox/Makefile b/wm/oroborox/Makefile
index 60fe827db7f..1f5424cd37c 100644
--- a/wm/oroborox/Makefile
+++ b/wm/oroborox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2015/04/25 14:24:59 tnn Exp $
+# $NetBSD: Makefile,v 1.47 2016/07/24 20:12:34 rillig Exp $
 #
 
 DISTNAME=	OroboROX-0.9.8
@@ -65,21 +65,21 @@ BUILD_TARGET=		OroboROX
 CONFIGURE_DIRS=		src
 
 pre-configure:
-	cd ${WRKSRC:Q}/src && autoconf
+	cd ${WRKSRC}/src && autoconf
 
 post-build:
-	@${ECHO} "#!/bin/sh" >> ${WRKDIR:Q}/oroborox
-	@${ECHO} ${PREFIX:Q}"/share/rox/OroboROX/AppRun \"\$$@\"" >> ${WRKDIR:Q}/oroborox
+	@${ECHO} "#!/bin/sh" >> ${WRKDIR}/oroborox
+	@${ECHO} ${PREFIX}"/share/rox/OroboROX/AppRun \"\$$@\"" >> ${WRKDIR}/oroborox
 
 INSTALLATION_DIRS=	bin libexec/rox share/rox/OroboROX
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/${PLATFORM:Q}/OroboROX ${DESTDIR:Q}${PREFIX:Q}/libexec/rox
-	cd ${WRKSRC:Q} && pax -rw	\
+	${INSTALL_PROGRAM} ${WRKSRC}/${PLATFORM:Q}/OroboROX ${DESTDIR}${PREFIX}/libexec/rox
+	cd ${WRKSRC} && pax -rw	\
 		-s ',^\./${PLATFORM}$$,,' -s ',^\./${PLATFORM}/.*,,'	\
 		-s ',^\./src$$,,' -s ',^\./src/.*,,'	\
-		. ${DESTDIR:Q}${PREFIX:Q}/share/rox/OroboROX
-	${INSTALL_SCRIPT} ${WRKDIR:Q}/oroborox ${DESTDIR:Q}${PREFIX:Q}/bin
+		. ${DESTDIR}${PREFIX}/share/rox/OroboROX
+	${INSTALL_SCRIPT} ${WRKDIR}/oroborox ${DESTDIR}${PREFIX}/bin
 
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile
index 9764929cc5c..020e2e47d43 100644
--- a/wm/pwm/Makefile
+++ b/wm/pwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2016/01/17 15:19:41 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2016/07/24 20:12:34 rillig Exp $
 #
 
 DISTNAME=	pwm-20060517
@@ -19,7 +19,7 @@ CONFLICTS+=	ion<=20040729nb2
 USE_TOOLS+=	gmake
 
 CFLAGS+=	-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
-MAKE_FLAGS+=	MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}
+MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}
 
 PKG_SYSCONFSUBDIR=	pwm