CVS commit: pkgsrc/wm

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/wm
From: "Roland Illig" <rillig%netbsd.org@localhost>
Date: Sun, 24 Jul 2016 20:12:34 +0000

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jul 24 20:12:34 UTC 2016

Modified Files:
        pkgsrc/wm/aewm++: Makefile
        pkgsrc/wm/fvwm: Makefile
        pkgsrc/wm/icewm: Makefile.common
        pkgsrc/wm/oroborox: Makefile
        pkgsrc/wm/pwm: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/wm/aewm++/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/wm/fvwm/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/wm/icewm/Makefile.common
cvs rdiff -u -r1.46 -r1.47 pkgsrc/wm/oroborox/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/wm/pwm/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/aewm++/Makefile
diff -u pkgsrc/wm/aewm++/Makefile:1.15 pkgsrc/wm/aewm++/Makefile:1.16
--- pkgsrc/wm/aewm++/Makefile:1.15      Fri Mar 13 16:50:37 2015
+++ pkgsrc/wm/aewm++/Makefile   Sun Jul 24 20:12:34 2016
@@ -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 win
 
 USE_LANGUAGES= c c++
 
-INSTALL_MAKE_FLAGS=    PKGMANDIR=${PKGMANDIR:Q}
+INSTALL_MAKE_FLAGS=    PKGMANDIR=${PKGMANDIR}
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 

Index: pkgsrc/wm/fvwm/Makefile
diff -u pkgsrc/wm/fvwm/Makefile:1.34 pkgsrc/wm/fvwm/Makefile:1.35
--- pkgsrc/wm/fvwm/Makefile:1.34        Sat Jul  9 06:39:09 2016
+++ pkgsrc/wm/fvwm/Makefile     Sun Jul 24 20:12:34 2016
@@ -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/pixmap
 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=${C
 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"

Index: pkgsrc/wm/icewm/Makefile.common
diff -u pkgsrc/wm/icewm/Makefile.common:1.67 pkgsrc/wm/icewm/Makefile.common:1.68
--- pkgsrc/wm/icewm/Makefile.common:1.67        Sun Jan  5 12:29:33 2014
+++ pkgsrc/wm/icewm/Makefile.common     Sun Jul 24 20:12:34 2016
@@ -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)

Index: pkgsrc/wm/oroborox/Makefile
diff -u pkgsrc/wm/oroborox/Makefile:1.46 pkgsrc/wm/oroborox/Makefile:1.47
--- pkgsrc/wm/oroborox/Makefile:1.46    Sat Apr 25 14:24:59 2015
+++ pkgsrc/wm/oroborox/Makefile Sun Jul 24 20:12:34 2016
@@ -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"

Index: pkgsrc/wm/pwm/Makefile
diff -u pkgsrc/wm/pwm/Makefile:1.34 pkgsrc/wm/pwm/Makefile:1.35
--- pkgsrc/wm/pwm/Makefile:1.34 Sun Jan 17 15:19:41 2016
+++ pkgsrc/wm/pwm/Makefile      Sun Jul 24 20:12:34 2016
@@ -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

Prev by Date: CVS commit: pkgsrc/textproc/p5-iCal-Parser
Next by Date: CVS commit: pkgsrc/lang/java-vm-spec
Previous by Thread: CVS commit: pkgsrc/textproc/p5-iCal-Parser
Next by Thread: CVS commit: pkgsrc/lang/java-vm-spec
Indexes:

Home | Main Index | Thread Index | Old Index