pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/graphics



Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jan 14 14:58:41 UTC 2018

Modified Files:
        pkgsrc/graphics/AfterShotPro: Makefile
        pkgsrc/graphics/MesaLib: builtin.mk
        pkgsrc/graphics/aalib: Makefile
        pkgsrc/graphics/blender: options.mk
        pkgsrc/graphics/cal3d-examples: Makefile
        pkgsrc/graphics/cambevao: Makefile
        pkgsrc/graphics/cdlabelgen: Makefile
        pkgsrc/graphics/cqcam: Makefile
        pkgsrc/graphics/dx: Makefile
        pkgsrc/graphics/fnlib: Makefile
        pkgsrc/graphics/freetype2: builtin.mk
        pkgsrc/graphics/gdk-pixbuf: Makefile.common
        pkgsrc/graphics/glu: builtin.mk
        pkgsrc/graphics/gmngview: Makefile
        pkgsrc/graphics/imlib: Makefile
        pkgsrc/graphics/imlib-gtk: Makefile
        pkgsrc/graphics/libggi: Makefile
        pkgsrc/graphics/libgii: Makefile
        pkgsrc/graphics/magicpoint: Makefile
        pkgsrc/graphics/mpgtx: Makefile
        pkgsrc/graphics/netpbm: Makefile
        pkgsrc/graphics/php-gd: Makefile
        pkgsrc/graphics/povray: Makefile
        pkgsrc/graphics/ps2eps: Makefile
        pkgsrc/graphics/py-gdchart: Makefile
        pkgsrc/graphics/py-imagingtk: Makefile
        pkgsrc/graphics/ruby-gd: Makefile
        pkgsrc/graphics/ruby-opengl: Makefile
        pkgsrc/graphics/s10sh: Makefile
        pkgsrc/graphics/tuxpaint: Makefile
        pkgsrc/graphics/urt: Makefile
        pkgsrc/graphics/vid: Makefile
        pkgsrc/graphics/vtk-docs: Makefile
        pkgsrc/graphics/wmphoto: Makefile
        pkgsrc/graphics/xv: Makefile
        pkgsrc/graphics/zphoto: Makefile

Log Message:
graphics/*: remove redundant :Q modifiers

pkgsrc doesn't support PREFIX with spaces or other special characters.
Therefore it is not necessary to add the :Q modifier to this variable
and several others.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/AfterShotPro/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/MesaLib/builtin.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/aalib/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/blender/options.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/cal3d-examples/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/cambevao/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/graphics/cdlabelgen/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/cqcam/Makefile
cvs rdiff -u -r1.88 -r1.89 pkgsrc/graphics/dx/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/graphics/fnlib/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/freetype2/builtin.mk
cvs rdiff -u -r1.50 -r1.51 pkgsrc/graphics/gdk-pixbuf/Makefile.common
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/glu/builtin.mk
cvs rdiff -u -r1.50 -r1.51 pkgsrc/graphics/gmngview/Makefile
cvs rdiff -u -r1.125 -r1.126 pkgsrc/graphics/imlib/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/imlib-gtk/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/graphics/libggi/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/graphics/libgii/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/graphics/magicpoint/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/mpgtx/Makefile
cvs rdiff -u -r1.214 -r1.215 pkgsrc/graphics/netpbm/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/graphics/php-gd/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/graphics/povray/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/ps2eps/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/graphics/py-gdchart/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/py-imagingtk/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/graphics/ruby-gd/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/graphics/ruby-opengl/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/s10sh/Makefile
cvs rdiff -u -r1.89 -r1.90 pkgsrc/graphics/tuxpaint/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/graphics/urt/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/vid/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/vtk-docs/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/wmphoto/Makefile
cvs rdiff -u -r1.90 -r1.91 pkgsrc/graphics/xv/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/graphics/zphoto/Makefile

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

Modified files:

Index: pkgsrc/graphics/AfterShotPro/Makefile
diff -u pkgsrc/graphics/AfterShotPro/Makefile:1.4 pkgsrc/graphics/AfterShotPro/Makefile:1.5
--- pkgsrc/graphics/AfterShotPro/Makefile:1.4   Fri Mar 13 18:05:59 2015
+++ pkgsrc/graphics/AfterShotPro/Makefile       Sun Jan 14 14:58:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/03/13 18:05:59 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2018/01/14 14:58:38 rillig Exp $
 
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.corel.com/akdlm/6763/downloads/AfterShotPro/1/PF/
@@ -49,7 +49,7 @@ BROKEN=               Not supported for this emulatio
 .endif
 
 do-extract: ${WRKDIR}
-       ${RUN} cd ${WRKDIR} && ${AR} x ${_DISTDIR:Q}/${DISTNAME}${EXTRACT_SUFX} data.tar.gz
+       ${RUN} cd ${WRKDIR} && ${AR} x ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} data.tar.gz
        cd ${WRKSRC} && ${TAR} -xzpf data.tar.gz
        chmod go-w ${WRKSRC}
 

Index: pkgsrc/graphics/MesaLib/builtin.mk
diff -u pkgsrc/graphics/MesaLib/builtin.mk:1.20 pkgsrc/graphics/MesaLib/builtin.mk:1.21
--- pkgsrc/graphics/MesaLib/builtin.mk:1.20     Sat Mar 22 08:19:24 2014
+++ pkgsrc/graphics/MesaLib/builtin.mk  Sun Jan 14 14:58:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.20 2014/03/22 08:19:24 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.21 2018/01/14 14:58:38 rillig Exp $
 
 BUILTIN_PKG:=  MesaLib
 
@@ -57,7 +57,7 @@ USE_BUILTIN.MesaLib=  yes
 .      for dep in ${BUILDLINK_API_DEPENDS.MesaLib}
 .        if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS])
 USE_BUILTIN.MesaLib!=                                                  \
-       if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.MesaLib:Q}; then \
+       if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.MesaLib}; then \
                ${ECHO} yes;                                            \
        else                                                            \
                ${ECHO} no;                                             \

Index: pkgsrc/graphics/aalib/Makefile
diff -u pkgsrc/graphics/aalib/Makefile:1.27 pkgsrc/graphics/aalib/Makefile:1.28
--- pkgsrc/graphics/aalib/Makefile:1.27 Tue Aug 18 07:31:00 2015
+++ pkgsrc/graphics/aalib/Makefile      Sun Jan 14 14:58:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/08/18 07:31:00 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2018/01/14 14:58:38 rillig Exp $
 
 DISTNAME=      aalib-1.4rc5
 PKGNAME=       ${DISTNAME:S/rc5/.0.5/}
@@ -16,8 +16,8 @@ GNU_CONFIGURE=                yes
 USE_LIBTOOL=           yes
 INFO_FILES=            yes
 
-CONFIGURE_ENV+=                SLANG_PREFIX=${BUILDLINK_PREFIX.libslang:Q}
-CONFIGURE_ENV+=                NCURSES_PREFIX=${BUILDLINK_PREFIX.curses:Q}
+CONFIGURE_ENV+=                SLANG_PREFIX=${BUILDLINK_PREFIX.libslang}
+CONFIGURE_ENV+=                NCURSES_PREFIX=${BUILDLINK_PREFIX.curses}
 
 SUBST_CLASSES+=                malloc
 SUBST_STAGE.malloc=    pre-configure

Index: pkgsrc/graphics/blender/options.mk
diff -u pkgsrc/graphics/blender/options.mk:1.5 pkgsrc/graphics/blender/options.mk:1.6
--- pkgsrc/graphics/blender/options.mk:1.5      Mon Aug 15 19:26:18 2016
+++ pkgsrc/graphics/blender/options.mk  Sun Jan 14 14:58:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2016/08/15 19:26:18 ryoon Exp $
+# $NetBSD: options.mk,v 1.6 2018/01/14 14:58:38 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.blender
 PKG_SUPPORTED_OPTIONS=
@@ -16,7 +16,7 @@ CONFIGURE_ARGS+=      --disable-exppython
 .endif
 
 .if !empty(PKG_OPTIONS:Mogg)
-CONFIGURE_ARGS+=       --with-ogg=${PREFIX:Q}
+CONFIGURE_ARGS+=       --with-ogg=${PREFIX}
 .include "../../multimedia/libogg/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-ogg --disable-oggtest
@@ -30,7 +30,7 @@ CMAKE_OPTS+=  -DWITH_OPENAL:BOOL=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mvorbis)
-CONFIGURE_ARGS+=       --with-vorbis=${PREFIX:Q}
+CONFIGURE_ARGS+=       --with-vorbis=${PREFIX}
 .include "../../audio/libvorbis/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-vorbis --disable-vorbistest

Index: pkgsrc/graphics/cal3d-examples/Makefile
diff -u pkgsrc/graphics/cal3d-examples/Makefile:1.22 pkgsrc/graphics/cal3d-examples/Makefile:1.23
--- pkgsrc/graphics/cal3d-examples/Makefile:1.22        Wed Jan  3 00:36:10 2018
+++ pkgsrc/graphics/cal3d-examples/Makefile     Sun Jan 14 14:58:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2018/01/03 00:36:10 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2018/01/14 14:58:38 rillig Exp $
 #
 
 PKGNAME=               cal3d-examples-${CAL3D_VERSION}
@@ -14,8 +14,8 @@ LICENSE=      gnu-lgpl-v2.1
 
 USE_TOOLS+=            automake pax
 
-CONFIGURE_ARGS+=       --with-cal3d=${PREFIX:Q}
-CONFIGURE_ARGS+=       --with-glut=${BUILDLINK_PREFIX.glut:Q}
+CONFIGURE_ARGS+=       --with-cal3d=${PREFIX}
+CONFIGURE_ARGS+=       --with-glut=${BUILDLINK_PREFIX.glut}
 CONFIGURE_DIRS=                examples/cally \
                        examples/miniviewer_gl \
                        tools/converter

Index: pkgsrc/graphics/cambevao/Makefile
diff -u pkgsrc/graphics/cambevao/Makefile:1.23 pkgsrc/graphics/cambevao/Makefile:1.24
--- pkgsrc/graphics/cambevao/Makefile:1.23      Tue Aug  1 16:47:39 2017
+++ pkgsrc/graphics/cambevao/Makefile   Sun Jan 14 14:58:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2017/08/01 16:47:39 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2018/01/14 14:58:38 rillig Exp $
 #
 
 DISTNAME=              cambevao-2.2
@@ -11,7 +11,7 @@ MAINTAINER=           abs%NetBSD.org@localhost
 COMMENT=               Grabs jpg images from bktr and ov511+ based USB webcams
 LICENSE=               modified-bsd AND original-bsd
 
-MAKE_ENV+=             prefix=${PREFIX:Q}
+MAKE_ENV+=             prefix=${PREFIX}
 MAKE_FLAGS+=           INSTALL=${INSTALL_PROGRAM:Q}
 RCD_SCRIPTS=           cambevao
 RCD_SCRIPT_SRC.cambevao=       ${WRKSRC}/cambevao.rc.d

Index: pkgsrc/graphics/cdlabelgen/Makefile
diff -u pkgsrc/graphics/cdlabelgen/Makefile:1.33 pkgsrc/graphics/cdlabelgen/Makefile:1.34
--- pkgsrc/graphics/cdlabelgen/Makefile:1.33    Wed Aug 23 17:53:55 2017
+++ pkgsrc/graphics/cdlabelgen/Makefile Sun Jan 14 14:58:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2017/08/23 17:53:55 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2018/01/14 14:58:38 rillig Exp $
 
 DISTNAME=      cdlabelgen-4.3.0
 PKGREVISION=   2
@@ -14,8 +14,8 @@ USE_TOOLS+=   perl:run
 USE_LANGUAGES= # empty
 REPLACE_PERL+= cdlabelgen
 
-MAKE_FLAGS+=   BASE_DIR=${DESTDIR:Q}${PREFIX:Q}
-MAKE_FLAGS+=   MAN_DIR=${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR:Q}
+MAKE_FLAGS+=   BASE_DIR=${DESTDIR}${PREFIX}
+MAKE_FLAGS+=   MAN_DIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
 MAKE_FLAGS+=   INSTALL=${INSTALL_SCRIPT:Q}
 MAKE_FLAGS+=   INSTALL_FILE=${INSTALL_DATA:Q}
 MAKE_FLAGS+=   INSTALL_MAN=${INSTALL_MAN:Q}

Index: pkgsrc/graphics/cqcam/Makefile
diff -u pkgsrc/graphics/cqcam/Makefile:1.43 pkgsrc/graphics/cqcam/Makefile:1.44
--- pkgsrc/graphics/cqcam/Makefile:1.43 Thu Feb 25 13:37:47 2016
+++ pkgsrc/graphics/cqcam/Makefile      Sun Jan 14 14:58:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2016/02/25 13:37:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.44 2018/01/14 14:58:38 rillig Exp $
 #
 
 DISTNAME=              cqcam-0.91
@@ -26,8 +26,8 @@ CONFIGURE_ARGS+=      --without-xview
 USE_LANGUAGES=         c c++
 
 CONFIGURE_ENV+=                TCLCONFIG_SH=${TCLCONFIG_SH:Q}
-CONFIGURE_ARGS+=       --x-includes=${X11BASE:Q}/include
-CONFIGURE_ARGS+=       --x-libraries=${X11BASE:Q}/lib
+CONFIGURE_ARGS+=       --x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=       --x-libraries=${X11BASE}/lib
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 

Index: pkgsrc/graphics/dx/Makefile
diff -u pkgsrc/graphics/dx/Makefile:1.88 pkgsrc/graphics/dx/Makefile:1.89
--- pkgsrc/graphics/dx/Makefile:1.88    Mon Jan  1 21:18:31 2018
+++ pkgsrc/graphics/dx/Makefile Sun Jan 14 14:58:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2018/01/01 21:18:31 adam Exp $
+# $NetBSD: Makefile,v 1.89 2018/01/14 14:58:38 rillig Exp $
 
 DISTNAME=      dx-4.4.4
 PKGREVISION=   39
@@ -15,7 +15,7 @@ USE_LANGUAGES=                c c++
 USE_TOOLS+=            gmake lex yacc sh
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --without-javadx
-CONFIGURE_ENV+=                bsh_path=${TOOLS_SH:Q}
+CONFIGURE_ENV+=                bsh_path=${TOOLS_SH}
 
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=              ${EXPORT_SYMBOLS_LDFLAGS}

Index: pkgsrc/graphics/fnlib/Makefile
diff -u pkgsrc/graphics/fnlib/Makefile:1.53 pkgsrc/graphics/fnlib/Makefile:1.54
--- pkgsrc/graphics/fnlib/Makefile:1.53 Mon Sep  8 21:24:44 2014
+++ pkgsrc/graphics/fnlib/Makefile      Sun Jan 14 14:58:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2014/09/08 21:24:44 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2018/01/14 14:58:38 rillig Exp $
 
 DISTNAME=              fnlib-0.5
 PKGREVISION=           23
@@ -16,7 +16,7 @@ DIST_SUBDIR=          fnlib
 GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
 
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 EGDIR=                 ${PREFIX}/share/examples/fnlib
 CONF_FILES=            ${EGDIR}/fnrc ${PKG_SYSCONFDIR}/fnrc
 

Index: pkgsrc/graphics/freetype2/builtin.mk
diff -u pkgsrc/graphics/freetype2/builtin.mk:1.16 pkgsrc/graphics/freetype2/builtin.mk:1.17
--- pkgsrc/graphics/freetype2/builtin.mk:1.16   Thu Apr  7 10:02:13 2016
+++ pkgsrc/graphics/freetype2/builtin.mk        Sun Jan 14 14:58:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.16 2016/04/07 10:02:13 adam Exp $
+# $NetBSD: builtin.mk,v 1.17 2018/01/14 14:58:38 rillig Exp $
 
 BUILTIN_PKG:=  freetype2
 
@@ -57,7 +57,7 @@ USE_BUILTIN.freetype2=        yes
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.freetype2}
 .        if !empty(USE_BUILTIN.freetype2:M[yY][eE][sS])
 USE_BUILTIN.freetype2!=                                                        \
-       if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.freetype2:Q}; then \
+       if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.freetype2}; then \
                ${ECHO} yes;                                            \
        else                                                            \
                ${ECHO} no;                                             \

Index: pkgsrc/graphics/gdk-pixbuf/Makefile.common
diff -u pkgsrc/graphics/gdk-pixbuf/Makefile.common:1.50 pkgsrc/graphics/gdk-pixbuf/Makefile.common:1.51
--- pkgsrc/graphics/gdk-pixbuf/Makefile.common:1.50     Sun Jul 30 22:47:51 2017
+++ pkgsrc/graphics/gdk-pixbuf/Makefile.common  Sun Jan 14 14:58:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.50 2017/07/30 22:47:51 wiz Exp $
+# $NetBSD: Makefile.common,v 1.51 2018/01/14 14:58:38 rillig Exp $
 #
 # used by graphics/gdk-pixbuf/Makefile
 
@@ -18,7 +18,7 @@ USE_LIBTOOL=          YES
 GNU_CONFIGURE=         YES
 CONFIGURE_ENV+=                path_rgb_txt="${X11BASE}/lib/X11/rgb.txt"
 
-PLIST_SUBST+=          LOCALBASE=${LOCALBASE:Q}
+PLIST_SUBST+=          LOCALBASE=${LOCALBASE}
 
 DISTINFO_FILE=         ${.CURDIR}/../gdk-pixbuf/distinfo
 PATCHDIR=              ${.CURDIR}/../gdk-pixbuf/patches

Index: pkgsrc/graphics/glu/builtin.mk
diff -u pkgsrc/graphics/glu/builtin.mk:1.14 pkgsrc/graphics/glu/builtin.mk:1.15
--- pkgsrc/graphics/glu/builtin.mk:1.14 Mon Jun 17 05:27:50 2013
+++ pkgsrc/graphics/glu/builtin.mk      Sun Jan 14 14:58:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.14 2013/06/17 05:27:50 dholland Exp $
+# $NetBSD: builtin.mk,v 1.15 2018/01/14 14:58:39 rillig Exp $
 
 BUILTIN_PKG:=  glu
 
@@ -56,7 +56,7 @@ USE_BUILTIN.glu=      yes
 .      for dep in ${BUILDLINK_API_DEPENDS.glu}
 .        if !empty(USE_BUILTIN.glu:M[yY][eE][sS])
 USE_BUILTIN.glu!=                                                      \
-       if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.glu:Q}; then      \
+       if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.glu}; then        \
                ${ECHO} yes;                                            \
        else                                                            \
                ${ECHO} no;                                             \

Index: pkgsrc/graphics/gmngview/Makefile
diff -u pkgsrc/graphics/gmngview/Makefile:1.50 pkgsrc/graphics/gmngview/Makefile:1.51
--- pkgsrc/graphics/gmngview/Makefile:1.50      Sun Feb 12 06:25:27 2017
+++ pkgsrc/graphics/gmngview/Makefile   Sun Jan 14 14:58:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2017/02/12 06:25:27 ryoon Exp $
+# $NetBSD: Makefile,v 1.51 2018/01/14 14:58:39 rillig Exp $
 #
 
 DISTNAME=      libmng-1.0.10
@@ -12,7 +12,7 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Simple GTK-based MNG viewer
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}/contrib/gcc/gtk-mng-view
-MAKE_ENV+=     LIBMNG_PREFIX=${BUILDLINK_PREFIX.mng:Q}
+MAKE_ENV+=     LIBMNG_PREFIX=${BUILDLINK_PREFIX.mng}
 
 EXTRACT_ELEMENTS=      */contrib/gcc/gtk-mng*
 EXTRACT_USING=         bsdtar

Index: pkgsrc/graphics/imlib/Makefile
diff -u pkgsrc/graphics/imlib/Makefile:1.125 pkgsrc/graphics/imlib/Makefile:1.126
--- pkgsrc/graphics/imlib/Makefile:1.125        Tue Sep 26 10:27:02 2017
+++ pkgsrc/graphics/imlib/Makefile      Sun Jan 14 14:58:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.125 2017/09/26 10:27:02 wiz Exp $
+# $NetBSD: Makefile,v 1.126 2018/01/14 14:58:39 rillig Exp $
 
 DISTNAME=      imlib-1.9.15
 PKGREVISION=   20
@@ -21,7 +21,7 @@ UNLIMIT_RESOURCES=    datasize
 CPPFLAGS+=             -DENABLE_NLS
 CONFIGURE_ENV+=                ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
 CONFIGURE_ENV+=                X_LDFLAGS=${X_LDFLAGS:Q}
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --disable-shm
 
 PKG_SYSCONFSUBDIR=     imlib

Index: pkgsrc/graphics/imlib-gtk/Makefile
diff -u pkgsrc/graphics/imlib-gtk/Makefile:1.14 pkgsrc/graphics/imlib-gtk/Makefile:1.15
--- pkgsrc/graphics/imlib-gtk/Makefile:1.14     Tue Sep 26 10:27:03 2017
+++ pkgsrc/graphics/imlib-gtk/Makefile  Sun Jan 14 14:58:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/09/26 10:27:03 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2018/01/14 14:58:39 rillig Exp $
 
 DISTNAME=      imlib-1.9.15
 PKGNAME=       imlib-gtk-1.9.15
@@ -26,7 +26,7 @@ UNLIMIT_RESOURCES=    datasize
 CPPFLAGS+=             -DENABLE_NLS
 CONFIGURE_ENV+=                ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
 CONFIGURE_ENV+=                X_LDFLAGS=${X_LDFLAGS:Q}
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --disable-shm
 
 PKG_SYSCONFSUBDIR=     imlib

Index: pkgsrc/graphics/libggi/Makefile
diff -u pkgsrc/graphics/libggi/Makefile:1.57 pkgsrc/graphics/libggi/Makefile:1.58
--- pkgsrc/graphics/libggi/Makefile:1.57        Sun Dec 17 05:01:05 2017
+++ pkgsrc/graphics/libggi/Makefile     Sun Jan 14 14:58:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2017/12/17 05:01:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.58 2018/01/14 14:58:39 rillig Exp $
 #
 
 DISTNAME=      libggi-2.2.2.src
@@ -21,7 +21,7 @@ USE_LIBTOOL=          yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-debug
 CONFIGURE_ARGS+=       --with-x
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
 PKG_SYSCONFSUBDIR=     ggi
 EGDIR=                 ${PREFIX}/share/examples/ggi

Index: pkgsrc/graphics/libgii/Makefile
diff -u pkgsrc/graphics/libgii/Makefile:1.35 pkgsrc/graphics/libgii/Makefile:1.36
--- pkgsrc/graphics/libgii/Makefile:1.35        Thu Jan 19 18:52:12 2017
+++ pkgsrc/graphics/libgii/Makefile     Sun Jan 14 14:58:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2017/01/19 18:52:12 agc Exp $
+# $NetBSD: Makefile,v 1.36 2018/01/14 14:58:39 rillig Exp $
 
 DISTNAME=      libgii-1.0.2.src
 PKGREVISION=   1
@@ -18,7 +18,7 @@ TEST_TARGET=          check
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-x
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
 PKG_SYSCONFSUBDIR=     ggi
 EGDIR=                 ${PREFIX}/share/examples/ggi

Index: pkgsrc/graphics/magicpoint/Makefile
diff -u pkgsrc/graphics/magicpoint/Makefile:1.97 pkgsrc/graphics/magicpoint/Makefile:1.98
--- pkgsrc/graphics/magicpoint/Makefile:1.97    Sat Jul  9 06:38:22 2016
+++ pkgsrc/graphics/magicpoint/Makefile Sun Jan 14 14:58:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2016/07/09 06:38:22 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2018/01/14 14:58:39 rillig Exp $
 
 DISTNAME=              magicpoint-1.13a
 PKGREVISION=           28
@@ -23,9 +23,9 @@ USE_TOOLS+=           pkg-config
 CONFIGURE_ARGS+=       --enable-freetype-charset16
 CONFIGURE_ARGS+=       --enable-locale
 CONFIGURE_ARGS+=       --enable-gif
-CONFIGURE_ARGS+=       --with-searchpath=${BUILDLINK_DIR:Q}
-CONFIGURE_ENV+=                BUILDLINK_DIR=${BUILDLINK_DIR:Q}
-CONFIGURE_ENV+=                mgp_cv_path_perl=${TOOLS_PERL5:Q}
+CONFIGURE_ARGS+=       --with-searchpath=${BUILDLINK_DIR}
+CONFIGURE_ENV+=                BUILDLINK_DIR=${BUILDLINK_DIR}
+CONFIGURE_ENV+=                mgp_cv_path_perl=${TOOLS_PERL5}
 
 DOCDIR=                        share/doc/mgp
 EGDIR=                 share/examples/mgp

Index: pkgsrc/graphics/mpgtx/Makefile
diff -u pkgsrc/graphics/mpgtx/Makefile:1.16 pkgsrc/graphics/mpgtx/Makefile:1.17
--- pkgsrc/graphics/mpgtx/Makefile:1.16 Sat Oct  6 14:11:07 2012
+++ pkgsrc/graphics/mpgtx/Makefile      Sun Jan 14 14:58:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/06 14:11:07 asau Exp $
+# $NetBSD: Makefile,v 1.17 2018/01/14 14:58:39 rillig Exp $
 #
 
 DISTNAME=      mpgtx-1.3.1
@@ -10,8 +10,8 @@ HOMEPAGE=     http://mpgtx.sourceforge.net/
 COMMENT=       Split and join MPEG files in various ways
 
 HAS_CONFIGURE= yes
-CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}    \
-                       --manprefix=${PREFIX:Q}
+CONFIGURE_ARGS+=       --prefix=${PREFIX}      \
+                       --manprefix=${PREFIX}
 USE_LANGUAGES= c c++
 
 BUILD_TARGET=  mpgtx
@@ -21,18 +21,18 @@ MLINKS=             mpgcat.1 mpgjoin.1 mpginfo.1 mp
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC:Q}/mpgtx ${DESTDIR:Q}${PREFIX:Q}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/mpgtx ${DESTDIR}${PREFIX}/bin
 .for f in ${PLINKS}
-       ${LN} -f ${DESTDIR:Q}${PREFIX:Q}/bin/mpgtx \
-               ${DESTDIR:Q}${PREFIX:Q}/bin/${f}
+       ${LN} -f ${DESTDIR}${PREFIX}/bin/mpgtx \
+               ${DESTDIR}${PREFIX}/bin/${f}
 .endfor
-       ${INSTALL_MAN} ${WRKSRC:Q}/man/mpgtx.1 \
-               ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKSRC}/man/mpgtx.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .for f in ${MLINKS}
-       ${LN} -f ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/mpgtx.1 \
-               ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/${f}
+       ${LN} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/mpgtx.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
 .endfor
-       ${INSTALL_MAN} ${WRKSRC:Q}/man/tagmp3.1 \
-               ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKSRC}/man/tagmp3.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/netpbm/Makefile
diff -u pkgsrc/graphics/netpbm/Makefile:1.214 pkgsrc/graphics/netpbm/Makefile:1.215
--- pkgsrc/graphics/netpbm/Makefile:1.214       Mon Oct 16 15:35:41 2017
+++ pkgsrc/graphics/netpbm/Makefile     Sun Jan 14 14:58:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.214 2017/10/16 15:35:41 jperkin Exp $
+# $NetBSD: Makefile,v 1.215 2018/01/14 14:58:39 rillig Exp $
 
 DISTNAME=      netpbm-10.79.04
 CATEGORIES=    graphics
@@ -23,8 +23,8 @@ USE_FEATURES= snprintf
 
 INSTALL_TARGET=        install-dev install-run
 MAKE_ENV+=     INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \
-               pkgdir=${STAGEDIR:Q} MACHINE=${MACHINE:Q}
-MAKE_FLAGS+=   PKGMANDIR=${PKGMANDIR:Q}
+               pkgdir=${STAGEDIR} MACHINE=${MACHINE:Q}
+MAKE_FLAGS+=   PKGMANDIR=${PKGMANDIR}
 MAKE_FLAGS+=   CFLAGS_FOR_BUILD=${CFLAGS:Q}
 MAKE_FLAGS+=   LDFLAGS_FOR_BUILD=${LDFLAGS:Q}
 MAKE_FILE=     GNUmakefile

Index: pkgsrc/graphics/php-gd/Makefile
diff -u pkgsrc/graphics/php-gd/Makefile:1.41 pkgsrc/graphics/php-gd/Makefile:1.42
--- pkgsrc/graphics/php-gd/Makefile:1.41        Fri Oct 27 08:49:00 2017
+++ pkgsrc/graphics/php-gd/Makefile     Sun Jan 14 14:58:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2017/10/27 08:49:00 taca Exp $
+# $NetBSD: Makefile,v 1.42 2018/01/14 14:58:39 rillig Exp $
 
 MODNAME=               gd
 CATEGORIES+=           graphics
@@ -9,11 +9,11 @@ CONFLICTS=    php-gd-[0-9]*
 # XXX we use bundled GD so that extension is usable also by non-threaded
 # PHP, such as CLI/CGI version or ap-php on Apache 1.x.
 
-CONFIGURE_ARGS+=       --with-${MODNAME}=${BUILDLINK_DIR:Q}
-CONFIGURE_ARGS+=       --with-jpeg-dir=${BUILDLINK_DIR:Q}
-CONFIGURE_ARGS+=       --with-png-dir=${BUILDLINK_DIR:Q}
-CONFIGURE_ARGS+=       --with-zlib-dir=${BUILDLINK_DIR:Q}
-CONFIGURE_ARGS+=       --with-freetype-dir=${BUILDLINK_DIR:Q}
+CONFIGURE_ARGS+=       --with-${MODNAME}=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=       --with-jpeg-dir=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=       --with-png-dir=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=       --with-zlib-dir=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=       --with-freetype-dir=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=       --enable-${MODNAME}-native-ttf
 CONFIGURE_ARGS+=       --enable-${MODNAME}-jis-conv
 CONFIGURE_ARGS+=       --without-t1lib

Index: pkgsrc/graphics/povray/Makefile
diff -u pkgsrc/graphics/povray/Makefile:1.55 pkgsrc/graphics/povray/Makefile:1.56
--- pkgsrc/graphics/povray/Makefile:1.55        Thu Jan 19 18:52:13 2017
+++ pkgsrc/graphics/povray/Makefile     Sun Jan 14 14:58:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2017/01/19 18:52:13 agc Exp $
+# $NetBSD: Makefile,v 1.56 2018/01/14 14:58:39 rillig Exp $
 
 DISTNAME=      povray-3.6.1
 PKGREVISION=   15
@@ -18,7 +18,7 @@ USE_LANGUAGES=                c c++
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-optimiz
 CONFIGURE_ARGS+=       --enable-strip
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE:Q}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
 CONFIGURE_ENV+=                COMPILED_BY="The NetBSD Packages Collection"
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/graphics/ps2eps/Makefile
diff -u pkgsrc/graphics/ps2eps/Makefile:1.11 pkgsrc/graphics/ps2eps/Makefile:1.12
--- pkgsrc/graphics/ps2eps/Makefile:1.11        Wed Jul 12 09:02:04 2017
+++ pkgsrc/graphics/ps2eps/Makefile     Sun Jan 14 14:58:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/07/12 09:02:04 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2018/01/14 14:58:40 rillig Exp $
 
 DISTNAME=      ps2eps-1.68
 PKGREVISION=   5
@@ -19,12 +19,12 @@ REPLACE_PERL+=      bin/ps2eps
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
 
 do-build:
-       cd ${WRKSRC:Q}/src/C && ${CC} ${CFLAGS} ${LDFLAGS} -o bbox bbox.c
+       cd ${WRKSRC}/src/C && ${CC} ${CFLAGS} ${LDFLAGS} -o bbox bbox.c
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC:Q}/src/C/bbox ${DESTDIR:Q}${PREFIX:Q}/bin
-       ${INSTALL_SCRIPT} ${WRKSRC:Q}/bin/ps2eps ${DESTDIR:Q}${PREFIX:Q}/bin
-       ${INSTALL_MAN} ${WRKSRC:Q}/doc/man/man1/*.1 \
-               ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR:Q}/man1
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/C/bbox ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/bin/ps2eps ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/doc/man/man1/*.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/py-gdchart/Makefile
diff -u pkgsrc/graphics/py-gdchart/Makefile:1.45 pkgsrc/graphics/py-gdchart/Makefile:1.46
--- pkgsrc/graphics/py-gdchart/Makefile:1.45    Tue Feb 28 15:20:07 2017
+++ pkgsrc/graphics/py-gdchart/Makefile Sun Jan 14 14:58:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2017/02/28 15:20:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2018/01/14 14:58:40 rillig Exp $
 
 DISTNAME=      gdchart-py-0.6
 PKGNAME=       ${PYPKGPREFIX}-gdchart-0.6
@@ -15,8 +15,8 @@ MAKE_ENV+=    GD_INCLUDE=${LOCALBASE}/inclu
                GDCHART_INCLUDE=${LOCALBASE}/include \
                PYTHON_INCLUDE=${LOCALBASE}/${PYINC} \
                HAVE_LIBFREETYPE=1 \
-               LOCALBASE=${LOCALBASE:Q}
-PLIST_SUBST+=  PYPKGPREFIX=${PYPKGPREFIX:Q}
+               LOCALBASE=${LOCALBASE}
+PLIST_SUBST+=  PYPKGPREFIX=${PYPKGPREFIX}
 MODULE_FILES=  chart.py gdchart.so
 EXAMPLE_FILES= test.html test.py CHANGES
 EXAMPLE_DIR=   ${PREFIX}/share/examples/${PYPKGPREFIX}-gdchart

Index: pkgsrc/graphics/py-imagingtk/Makefile
diff -u pkgsrc/graphics/py-imagingtk/Makefile:1.39 pkgsrc/graphics/py-imagingtk/Makefile:1.40
--- pkgsrc/graphics/py-imagingtk/Makefile:1.39  Sun Jan  1 14:43:43 2017
+++ pkgsrc/graphics/py-imagingtk/Makefile       Sun Jan 14 14:58:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2017/01/01 14:43:43 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2018/01/14 14:58:40 rillig Exp $
 
 DISTNAME=      Imaging-1.1.7
 PKGNAME=       ${PYPKGPREFIX}-imagingtk-1.1.7
@@ -17,7 +17,7 @@ EGG_NAME=     ${DISTNAME:S/Imaging/PIL/}
 PY_NO_EGG=     yes # same egg installed by py-imaging
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # py-imaging
 
-PLIST_SUBST+=  PYPKGPREFIX=${PYPKGPREFIX:Q}
+PLIST_SUBST+=  PYPKGPREFIX=${PYPKGPREFIX}
 
 post-install:
        ${INSTALL_DATA_DIR} \

Index: pkgsrc/graphics/ruby-gd/Makefile
diff -u pkgsrc/graphics/ruby-gd/Makefile:1.49 pkgsrc/graphics/ruby-gd/Makefile:1.50
--- pkgsrc/graphics/ruby-gd/Makefile:1.49       Fri Jun  2 04:16:35 2017
+++ pkgsrc/graphics/ruby-gd/Makefile    Sun Jan 14 14:58:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2017/06/02 04:16:35 taca Exp $
+# $NetBSD: Makefile,v 1.50 2018/01/14 14:58:40 rillig Exp $
 
 DISTNAME=      ruby-gd-0.8.0
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
@@ -12,11 +12,11 @@ LICENSE=    ruby-license
 
 GEM_CLEANBUILD=        Makefile *.o GD.${RUBY_DLEXT} mkmf.log .*.time
 
-CONFIGURE_ARGS+=       --with-gd-dir=${BUILDLINK_PREFIX.gd:Q}
+CONFIGURE_ARGS+=       --with-gd-dir=${BUILDLINK_PREFIX.gd}
 CONFIGURE_ARGS+=       --with-jpeg
 CONFIGURE_ARGS+=       --with-jpeg-dir=${JPEGBASE:Q}
 CONFIGURE_ARGS+=       --with-freetype
-CONFIGURE_ARGS+=       --with-freetype-dir=${BUILDLINK_PREFIX.freetype2:Q}
+CONFIGURE_ARGS+=       --with-freetype-dir=${BUILDLINK_PREFIX.freetype2}
 CONFIGURE_ARGS+=       --enable-gd2_0
 CONFIGURE_ARGS+=       --with-ldflags=${COMPILER_RPATH_FLAG}${X11BASE}/lib
 

Index: pkgsrc/graphics/ruby-opengl/Makefile
diff -u pkgsrc/graphics/ruby-opengl/Makefile:1.34 pkgsrc/graphics/ruby-opengl/Makefile:1.35
--- pkgsrc/graphics/ruby-opengl/Makefile:1.34   Mon Sep  4 18:00:55 2017
+++ pkgsrc/graphics/ruby-opengl/Makefile        Sun Jan 14 14:58:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/09/04 18:00:55 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2018/01/14 14:58:40 rillig Exp $
 
 DISTNAME=      ruby-opengl-0.60.1
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
@@ -13,7 +13,7 @@ LICENSE=      mit
 DEPENDS+=      ${RUBY_PKGPREFIX}-mkrf>=0.2.0:../../devel/ruby-mkrf
 
 USE_RAKE=      YES
-MAKE_ENV+=     LDSHARED=${COMPILER_RPATH_FLAG:Q}${X11BASE:Q}/lib
+MAKE_ENV+=     LDSHARED=${COMPILER_RPATH_FLAG}${X11BASE}/lib
 
 pre-configure:
        ${FIND} ${WRKSRC} -type f -exec ${CHMOD} -x {} \;

Index: pkgsrc/graphics/s10sh/Makefile
diff -u pkgsrc/graphics/s10sh/Makefile:1.15 pkgsrc/graphics/s10sh/Makefile:1.16
--- pkgsrc/graphics/s10sh/Makefile:1.15 Mon Sep  4 18:00:56 2017
+++ pkgsrc/graphics/s10sh/Makefile      Sun Jan 14 14:58:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/09/04 18:00:56 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2018/01/14 14:58:40 rillig Exp $
 #
 
 DISTNAME=      s10sh-0.2.0
@@ -11,7 +11,7 @@ MAINTAINER=   drochner%NetBSD.org@localhost
 COMMENT=       USB/serial userspace driver for Canon PowerShot cameras
 
 HAS_CONFIGURE= yes
-CONFIGURE_ENV+=        LOCALBASE=${LOCALBASE:Q}
+CONFIGURE_ENV+=        LOCALBASE=${LOCALBASE}
 
 INSTALLATION_DIRS=     bin
 

Index: pkgsrc/graphics/tuxpaint/Makefile
diff -u pkgsrc/graphics/tuxpaint/Makefile:1.89 pkgsrc/graphics/tuxpaint/Makefile:1.90
--- pkgsrc/graphics/tuxpaint/Makefile:1.89      Mon Jan  1 18:16:36 2018
+++ pkgsrc/graphics/tuxpaint/Makefile   Sun Jan 14 14:58:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2018/01/01 18:16:36 rillig Exp $
+# $NetBSD: Makefile,v 1.90 2018/01/14 14:58:40 rillig Exp $
 
 DISTNAME=      tuxpaint-0.9.22
 PKGREVISION=   4
@@ -23,7 +23,7 @@ BROKEN_GETTEXT_DETECTION=     yes
 REPLACE_BASH=          src/tuxpaint-import.sh
 
 PKG_SYSCONFSUBDIR=     tuxpaint
-MAKE_FLAGS+=           CONFDIR=${PKG_SYSCONFDIR:Q}
+MAKE_FLAGS+=           CONFDIR=${PKG_SYSCONFDIR}
 MAKE_FLAGS+=           CP=${CP:Q}
 MAKE_FLAGS+=           CFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=           CPPFLAGS=${CPPFLAGS:Q}

Index: pkgsrc/graphics/urt/Makefile
diff -u pkgsrc/graphics/urt/Makefile:1.62 pkgsrc/graphics/urt/Makefile:1.63
--- pkgsrc/graphics/urt/Makefile:1.62   Mon Sep  8 21:24:45 2014
+++ pkgsrc/graphics/urt/Makefile        Sun Jan 14 14:58:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2014/09/08 21:24:45 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2018/01/14 14:58:40 rillig Exp $
 
 DISTNAME=      urt
 PKGNAME=       urt-3.1b1
@@ -37,11 +37,11 @@ SUBST_FILES.man=    config/urt
 SUBST_SED.man=         -e 's,^\(\#defpath MAN_DEST\).*,\1 ${PREFIX}/${PKGMANDIR},'
 
 post-install:
-       cd ${DESTDIR:Q}${PREFIX:Q}/share/doc/urt && \
+       cd ${DESTDIR}${PREFIX}/share/doc/urt && \
            pax -z -r -p m -s '/doc/./' -f ${DISTDIR}/urt-doc.tar.Z
-       cd ${DESTDIR:Q}${PREFIX:Q}/share/examples/urt && \
+       cd ${DESTDIR}${PREFIX}/share/examples/urt && \
            pax -z -r -p m -f ${DISTDIR}/urt-img.tar.Z
-       cd ${DESTDIR:Q}${PREFIX:Q} && \
+       cd ${DESTDIR}${PREFIX} && \
            chown -R ${ROOT_USER}:${ROOT_GROUP} share/doc/urt share/examples/urt && \
            find share/doc/urt share/examples/urt -type d -print | xargs chmod 755 && \
            find share/doc/urt share/examples/urt -type f -print | xargs chmod 444

Index: pkgsrc/graphics/vid/Makefile
diff -u pkgsrc/graphics/vid/Makefile:1.28 pkgsrc/graphics/vid/Makefile:1.29
--- pkgsrc/graphics/vid/Makefile:1.28   Wed Sep  6 10:40:30 2017
+++ pkgsrc/graphics/vid/Makefile        Sun Jan 14 14:58:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/09/06 10:40:30 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2018/01/14 14:58:40 rillig Exp $
 #
 
 DISTNAME=      vid-1.0.1
@@ -13,7 +13,7 @@ COMMENT=      Simple-minded image capture pro
 BUILD_TARGET=  vid
 
 DOCDIR=                share/doc/${PKGBASE}
-PLIST_SUBST+=  DOCDIR=${DOCDIR:Q}
+PLIST_SUBST+=  DOCDIR=${DOCDIR}
 
 INSTALLATION_DIRS=     bin
 

Index: pkgsrc/graphics/vtk-docs/Makefile
diff -u pkgsrc/graphics/vtk-docs/Makefile:1.7 pkgsrc/graphics/vtk-docs/Makefile:1.8
--- pkgsrc/graphics/vtk-docs/Makefile:1.7       Sat Oct  6 14:11:24 2012
+++ pkgsrc/graphics/vtk-docs/Makefile   Sun Jan 14 14:58:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/06 14:11:24 asau Exp $
+# $NetBSD: Makefile,v 1.8 2018/01/14 14:58:40 rillig Exp $
 #
 
 DISTNAME=      VTKDocHtml-4.2
@@ -11,10 +11,10 @@ NO_BUILD=   yes
 HTML_DIR=      share/doc/${PKGNAME}
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/${HTML_DIR:Q}
-       ${FIND} ${WRKSRC:Q} -type f -print | \
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${HTML_DIR}
+       ${FIND} ${WRKSRC} -type f -print | \
        while read f; do \
-               ${INSTALL_DATA} $$f ${DESTDIR}${PREFIX:Q}/${HTML_DIR:Q}; \
+               ${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/${HTML_DIR}; \
        done
 
 .include "../../graphics/vtk/Makefile.common"

Index: pkgsrc/graphics/wmphoto/Makefile
diff -u pkgsrc/graphics/wmphoto/Makefile:1.22 pkgsrc/graphics/wmphoto/Makefile:1.23
--- pkgsrc/graphics/wmphoto/Makefile:1.22       Sat Jul  4 16:18:36 2015
+++ pkgsrc/graphics/wmphoto/Makefile    Sun Jan 14 14:58:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2015/07/04 16:18:36 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2018/01/14 14:58:40 rillig Exp $
 #
 
 DISTNAME=      wmphoto-0.3a
@@ -12,7 +12,7 @@ COMMENT=      Dock-app that can show you a ph
 
 BUILD_DIRS=    wmphoto
 USE_TOOLS+=    gmake
-MAKE_ENV+=     X11BASE=${X11BASE:Q}
+MAKE_ENV+=     X11BASE=${X11BASE}
 
 INSTALLATION_DIRS+=    bin share/doc/wmphoto
 

Index: pkgsrc/graphics/xv/Makefile
diff -u pkgsrc/graphics/xv/Makefile:1.90 pkgsrc/graphics/xv/Makefile:1.91
--- pkgsrc/graphics/xv/Makefile:1.90    Sat Aug 13 23:40:38 2016
+++ pkgsrc/graphics/xv/Makefile Sun Jan 14 14:58:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2016/08/13 23:40:38 dholland Exp $
+# $NetBSD: Makefile,v 1.91 2018/01/14 14:58:40 rillig Exp $
 
 DISTNAME=      xv-3.10a
 PKGREVISION=   23
@@ -29,9 +29,9 @@ NO_SRC_ON_CDROM=      ${RESTRICTED}
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
 
-MAKEFLAGS+=    PREFIX=${PREFIX:Q}
+MAKEFLAGS+=    PREFIX=${PREFIX}
 MAKEFLAGS+=    PNGDIR=${BUILDLINK_PREFIX.png}
-CPPFLAGS+=     -DDOCDIR=\""${PREFIX:Q}/share/doc/xv"\"
+CPPFLAGS+=     -DDOCDIR=\""${PREFIX}/share/doc/xv"\"
 
 BUILD_TARGET=  depend all
 

Index: pkgsrc/graphics/zphoto/Makefile
diff -u pkgsrc/graphics/zphoto/Makefile:1.54 pkgsrc/graphics/zphoto/Makefile:1.55
--- pkgsrc/graphics/zphoto/Makefile:1.54        Thu Nov 23 17:19:58 2017
+++ pkgsrc/graphics/zphoto/Makefile     Sun Jan 14 14:58:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2017/11/23 17:19:58 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2018/01/14 14:58:41 rillig Exp $
 #
 
 DISTNAME=      zphoto-1.2
@@ -18,8 +18,8 @@ GNU_CONFIGURE=                yes
 USE_TOOLS+=            gmake perl
 USE_LANGUAGES=         c c++
 
-CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv:Q}
-CONFIGURE_ARGS+=       --with-libintl-prefix=${BUILDLINK_PREFIX.gettext-lib:Q}
+CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv}
+CONFIGURE_ARGS+=       --with-libintl-prefix=${BUILDLINK_PREFIX.gettext-lib}
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"



Home | Main Index | Thread Index | Old Index