pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics graphics/*: remove redundant :Q modifiers
details: https://anonhg.NetBSD.org/pkgsrc/rev/fa2af77bbdec
branches: trunk
changeset: 374045:fa2af77bbdec
user: rillig <rillig%pkgsrc.org@localhost>
date: Sun Jan 14 14:58:38 2018 +0000
description:
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.
diffstat:
graphics/AfterShotPro/Makefile | 4 ++--
graphics/MesaLib/builtin.mk | 4 ++--
graphics/aalib/Makefile | 6 +++---
graphics/blender/options.mk | 6 +++---
graphics/cal3d-examples/Makefile | 6 +++---
graphics/cambevao/Makefile | 4 ++--
graphics/cdlabelgen/Makefile | 6 +++---
graphics/cqcam/Makefile | 6 +++---
graphics/dx/Makefile | 4 ++--
graphics/fnlib/Makefile | 4 ++--
graphics/freetype2/builtin.mk | 4 ++--
graphics/gdk-pixbuf/Makefile.common | 4 ++--
graphics/glu/builtin.mk | 4 ++--
graphics/gmngview/Makefile | 4 ++--
graphics/imlib-gtk/Makefile | 4 ++--
graphics/imlib/Makefile | 4 ++--
graphics/libggi/Makefile | 4 ++--
graphics/libgii/Makefile | 4 ++--
graphics/magicpoint/Makefile | 8 ++++----
graphics/mpgtx/Makefile | 24 ++++++++++++------------
graphics/netpbm/Makefile | 6 +++---
graphics/php-gd/Makefile | 12 ++++++------
graphics/povray/Makefile | 4 ++--
graphics/ps2eps/Makefile | 12 ++++++------
graphics/py-gdchart/Makefile | 6 +++---
graphics/py-imagingtk/Makefile | 4 ++--
graphics/ruby-gd/Makefile | 6 +++---
graphics/ruby-opengl/Makefile | 4 ++--
graphics/s10sh/Makefile | 4 ++--
graphics/tuxpaint/Makefile | 4 ++--
graphics/urt/Makefile | 8 ++++----
graphics/vid/Makefile | 4 ++--
graphics/vtk-docs/Makefile | 8 ++++----
graphics/wmphoto/Makefile | 4 ++--
graphics/xv/Makefile | 6 +++---
graphics/zphoto/Makefile | 6 +++---
36 files changed, 106 insertions(+), 106 deletions(-)
diffs (truncated from 741 to 300 lines):
diff -r 521a360bbf8f -r fa2af77bbdec graphics/AfterShotPro/Makefile
--- a/graphics/AfterShotPro/Makefile Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/AfterShotPro/Makefile Sun Jan 14 14:58:38 2018 +0000
@@ -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 @@
.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}
diff -r 521a360bbf8f -r fa2af77bbdec graphics/MesaLib/builtin.mk
--- a/graphics/MesaLib/builtin.mk Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/MesaLib/builtin.mk Sun Jan 14 14:58:38 2018 +0000
@@ -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 @@
. 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; \
diff -r 521a360bbf8f -r fa2af77bbdec graphics/aalib/Makefile
--- a/graphics/aalib/Makefile Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/aalib/Makefile Sun Jan 14 14:58:38 2018 +0000
@@ -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 @@
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
diff -r 521a360bbf8f -r fa2af77bbdec graphics/blender/options.mk
--- a/graphics/blender/options.mk Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/blender/options.mk Sun Jan 14 14:58:38 2018 +0000
@@ -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 @@
.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 @@
.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
diff -r 521a360bbf8f -r fa2af77bbdec graphics/cal3d-examples/Makefile
--- a/graphics/cal3d-examples/Makefile Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/cal3d-examples/Makefile Sun Jan 14 14:58:38 2018 +0000
@@ -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 @@
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
diff -r 521a360bbf8f -r fa2af77bbdec graphics/cambevao/Makefile
--- a/graphics/cambevao/Makefile Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/cambevao/Makefile Sun Jan 14 14:58:38 2018 +0000
@@ -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 @@
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
diff -r 521a360bbf8f -r fa2af77bbdec graphics/cdlabelgen/Makefile
--- a/graphics/cdlabelgen/Makefile Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/cdlabelgen/Makefile Sun Jan 14 14:58:38 2018 +0000
@@ -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_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}
diff -r 521a360bbf8f -r fa2af77bbdec graphics/cqcam/Makefile
--- a/graphics/cqcam/Makefile Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/cqcam/Makefile Sun Jan 14 14:58:38 2018 +0000
@@ -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 @@
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
diff -r 521a360bbf8f -r fa2af77bbdec graphics/dx/Makefile
--- a/graphics/dx/Makefile Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/dx/Makefile Sun Jan 14 14:58:38 2018 +0000
@@ -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_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}
diff -r 521a360bbf8f -r fa2af77bbdec graphics/fnlib/Makefile
--- a/graphics/fnlib/Makefile Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/fnlib/Makefile Sun Jan 14 14:58:38 2018 +0000
@@ -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 @@
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
diff -r 521a360bbf8f -r fa2af77bbdec graphics/freetype2/builtin.mk
--- a/graphics/freetype2/builtin.mk Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/freetype2/builtin.mk Sun Jan 14 14:58:38 2018 +0000
@@ -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 @@
. 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; \
diff -r 521a360bbf8f -r fa2af77bbdec graphics/gdk-pixbuf/Makefile.common
--- a/graphics/gdk-pixbuf/Makefile.common Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/gdk-pixbuf/Makefile.common Sun Jan 14 14:58:38 2018 +0000
@@ -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 @@
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
diff -r 521a360bbf8f -r fa2af77bbdec graphics/glu/builtin.mk
--- a/graphics/glu/builtin.mk Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/glu/builtin.mk Sun Jan 14 14:58:38 2018 +0000
@@ -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 @@
. 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; \
diff -r 521a360bbf8f -r fa2af77bbdec graphics/gmngview/Makefile
--- a/graphics/gmngview/Makefile Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/gmngview/Makefile Sun Jan 14 14:58:38 2018 +0000
@@ -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 @@
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
diff -r 521a360bbf8f -r fa2af77bbdec graphics/imlib-gtk/Makefile
--- a/graphics/imlib-gtk/Makefile Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/imlib-gtk/Makefile Sun Jan 14 14:58:38 2018 +0000
@@ -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 @@
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
diff -r 521a360bbf8f -r fa2af77bbdec graphics/imlib/Makefile
--- a/graphics/imlib/Makefile Sun Jan 14 11:31:41 2018 +0000
+++ b/graphics/imlib/Makefile Sun Jan 14 14:58:38 2018 +0000
@@ -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 @@
CPPFLAGS+= -DENABLE_NLS
CONFIGURE_ENV+= ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
CONFIGURE_ENV+= X_LDFLAGS=${X_LDFLAGS:Q}
Home |
Main Index |
Thread Index |
Old Index