[pkgsrc/trunk]: pkgsrc/wm Fixed pkglint warnings about unnecessary :Q modifie...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/wm Fixed pkglint warnings about unnecessary :Q modifie...
From: rillig <rillig%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 05:42:47 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/64ce59c44c9a
branches:  trunk
changeset: 350231:64ce59c44c9a
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jul 24 20:12:34 2016 +0000

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

diffstat:

 wm/aewm++/Makefile       |   4 ++--
 wm/fvwm/Makefile         |  32 ++++++++++++++++----------------
 wm/icewm/Makefile.common |   6 +++---
 wm/oroborox/Makefile     |  16 ++++++++--------
 wm/pwm/Makefile          |   4 ++--
 5 files changed, 31 insertions(+), 31 deletions(-)

diffs (154 lines):

diff -r f7d8025bfbd7 -r 64ce59c44c9a wm/aewm++/Makefile
--- a/wm/aewm++/Makefile        Sun Jul 24 20:04:10 2016 +0000
+++ b/wm/aewm++/Makefile        Sun Jul 24 20:12:34 2016 +0000
@@ -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 @@
 
 USE_LANGUAGES= c c++
 
-INSTALL_MAKE_FLAGS=    PKGMANDIR=${PKGMANDIR:Q}
+INSTALL_MAKE_FLAGS=    PKGMANDIR=${PKGMANDIR}
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
diff -r f7d8025bfbd7 -r 64ce59c44c9a wm/fvwm/Makefile
--- a/wm/fvwm/Makefile  Sun Jul 24 20:04:10 2016 +0000
+++ b/wm/fvwm/Makefile  Sun Jul 24 20:12:34 2016 +0000
@@ -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+=    ${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_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 -r f7d8025bfbd7 -r 64ce59c44c9a wm/icewm/Makefile.common
--- a/wm/icewm/Makefile.common  Sun Jul 24 20:04:10 2016 +0000
+++ b/wm/icewm/Makefile.common  Sun Jul 24 20:12:34 2016 +0000
@@ -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 @@
 
 .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 -r f7d8025bfbd7 -r 64ce59c44c9a wm/oroborox/Makefile
--- a/wm/oroborox/Makefile      Sun Jul 24 20:04:10 2016 +0000
+++ b/wm/oroborox/Makefile      Sun Jul 24 20:12:34 2016 +0000
@@ -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 @@
 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 -r f7d8025bfbd7 -r 64ce59c44c9a wm/pwm/Makefile
--- a/wm/pwm/Makefile   Sun Jul 24 20:04:10 2016 +0000
+++ b/wm/pwm/Makefile   Sun Jul 24 20:12:34 2016 +0000
@@ -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 @@
 USE_TOOLS+=    gmake
 
 CFLAGS+=       -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
-MAKE_FLAGS+=   MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}
+MAKE_FLAGS+=   MANDIR=${PREFIX}/${PKGMANDIR}
 
 PKG_SYSCONFSUBDIR=     pwm

Prev by Date: [pkgsrc/trunk]: pkgsrc/wm/spectrwm Fixed pkglint warnings about indentation.
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/p5-iCal-Parser Fixed pkglint warnings about v...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/wm/spectrwm Fixed pkglint warnings about indentation.
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/p5-iCal-Parser Fixed pkglint warnings about v...
Indexes:

Home | Main Index | Thread Index | Old Index