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:           Sat Nov  2 22:38:06 UTC 2019

Modified Files:
        pkgsrc/graphics/AfterShotPro: Makefile
        pkgsrc/graphics/Cenon: Makefile
        pkgsrc/graphics/GMT: Makefile
        pkgsrc/graphics/ImageMagick: Makefile options.mk
        pkgsrc/graphics/ImageMagick6: Makefile options.mk
        pkgsrc/graphics/aalib: options.mk
        pkgsrc/graphics/agg: Makefile
        pkgsrc/graphics/asymptote: Makefile
        pkgsrc/graphics/bktr2jpeg: Makefile
        pkgsrc/graphics/cairo: options.mk
        pkgsrc/graphics/cal3d: Makefile Makefile.common
        pkgsrc/graphics/cheese: Makefile
        pkgsrc/graphics/cnxtview: Makefile
        pkgsrc/graphics/comix: Makefile options.mk
        pkgsrc/graphics/cpia2view: Makefile
        pkgsrc/graphics/darktable: Makefile
        pkgsrc/graphics/dia: Makefile.common
        pkgsrc/graphics/dia-python: Makefile
        pkgsrc/graphics/digikam: Makefile
        pkgsrc/graphics/dvipng: Makefile
        pkgsrc/graphics/dxsamples: Makefile
        pkgsrc/graphics/erlang-eimp: Makefile
        pkgsrc/graphics/evas: Makefile.common
        pkgsrc/graphics/exifprobe: Makefile
        pkgsrc/graphics/extrema: Makefile
        pkgsrc/graphics/fbm: Makefile
        pkgsrc/graphics/fotoxx: Makefile
        pkgsrc/graphics/frameworks: Makefile
        pkgsrc/graphics/freeglut: buildlink3.mk
        pkgsrc/graphics/freeimage: Makefile
        pkgsrc/graphics/freeimageplus: Makefile
        pkgsrc/graphics/freetype2: builtin.mk
        pkgsrc/graphics/gd: Makefile
        pkgsrc/graphics/gdk-pixbuf2: Makefile loaders.mk
        pkgsrc/graphics/gdk-pixbuf2-xlib: Makefile
        pkgsrc/graphics/gif2png: Makefile
        pkgsrc/graphics/gimp: Makefile
        pkgsrc/graphics/gimp-docs-en: Makefile.common
        pkgsrc/graphics/gle: Makefile
        pkgsrc/graphics/glu: builtin.mk
        pkgsrc/graphics/go-image: buildlink3.mk
        pkgsrc/graphics/gphoto2: Makefile
        pkgsrc/graphics/gpick: Makefile
        pkgsrc/graphics/graphite2: Makefile
        pkgsrc/graphics/gtkimageview: Makefile
        pkgsrc/graphics/imlib: Makefile
        pkgsrc/graphics/inkscape: Makefile
        pkgsrc/graphics/jpeg2ps: Makefile
        pkgsrc/graphics/libbpg: Makefile
        pkgsrc/graphics/libcaca: options.mk
        pkgsrc/graphics/libgdiplus: Makefile
        pkgsrc/graphics/libjpeg-turbo: Makefile
        pkgsrc/graphics/libkdcraw: Makefile
        pkgsrc/graphics/libkexiv2: Makefile
        pkgsrc/graphics/libkipi: Makefile
        pkgsrc/graphics/libksane: Makefile
        pkgsrc/graphics/libraw013: Makefile
        pkgsrc/graphics/librsvg: buildlink3.mk
        pkgsrc/graphics/libscigraphica: Makefile
        pkgsrc/graphics/libwmf: hacks.mk
        pkgsrc/graphics/magicpoint: options.mk
        pkgsrc/graphics/mpgtx: Makefile
        pkgsrc/graphics/mypaint: Makefile
        pkgsrc/graphics/ncview: Makefile
        pkgsrc/graphics/nvtv: Makefile
        pkgsrc/graphics/oxygen-icons: Makefile
        pkgsrc/graphics/p5-GDGraph-boxplot: Makefile
        pkgsrc/graphics/p5-clutter: Makefile
        pkgsrc/graphics/paper-icon-theme: Makefile
        pkgsrc/graphics/png: hacks.mk
        pkgsrc/graphics/povray: Makefile
        pkgsrc/graphics/pstoedit: Makefile
        pkgsrc/graphics/py-chart: Makefile
        pkgsrc/graphics/py-goocanvas: Makefile
        pkgsrc/graphics/py-gtkglext: Makefile
        pkgsrc/graphics/py-leather: Makefile
        pkgsrc/graphics/py-mcomix: Makefile
        pkgsrc/graphics/py-openexr: Makefile
        pkgsrc/graphics/py-piddle: Makefile
        pkgsrc/graphics/py-pycha: Makefile
        pkgsrc/graphics/py-uniconvertor: Makefile
        pkgsrc/graphics/qimageblitz: Makefile
        pkgsrc/graphics/qore-glut-module: Makefile options.mk
        pkgsrc/graphics/qore-opengl-module: Makefile options.mk
        pkgsrc/graphics/qvplay: Makefile
        pkgsrc/graphics/rayshade: Makefile
        pkgsrc/graphics/refocus-it: Makefile
        pkgsrc/graphics/ruby-imlib2: Makefile
        pkgsrc/graphics/ruby-oily_png: Makefile
        pkgsrc/graphics/scidavis: Makefile
        pkgsrc/graphics/skencil: Makefile
        pkgsrc/graphics/spcaview: Makefile
        pkgsrc/graphics/tango-icon-theme: Makefile
        pkgsrc/graphics/tex-pictex-doc: Makefile
        pkgsrc/graphics/tex-tkz-base: Makefile
        pkgsrc/graphics/tex-tkz-fct: Makefile
        pkgsrc/graphics/tgif: hacks.mk
        pkgsrc/graphics/tuxpaint-stamps: Makefile
        pkgsrc/graphics/urt: Makefile
        pkgsrc/graphics/vtk: Makefile.vtkdist
        pkgsrc/graphics/wm-icons: Makefile
        pkgsrc/graphics/xdot: Makefile
        pkgsrc/graphics/xfig: Makefile
        pkgsrc/graphics/xmorph: Makefile
        pkgsrc/graphics/xpaint: Makefile
        pkgsrc/graphics/xv: Makefile
        pkgsrc/graphics/zphoto: options.mk

Log Message:
graphics: align variable assignments

pkglint -Wall -F --only aligned --only indent -r

No manual corrections.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/AfterShotPro/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/graphics/Cenon/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/graphics/GMT/Makefile
cvs rdiff -u -r1.262 -r1.263 pkgsrc/graphics/ImageMagick/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/ImageMagick/options.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/ImageMagick6/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/ImageMagick6/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/aalib/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/agg/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/graphics/asymptote/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/bktr2jpeg/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/cairo/options.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/cal3d/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/cal3d/Makefile.common
cvs rdiff -u -r1.83 -r1.84 pkgsrc/graphics/cheese/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/cnxtview/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/graphics/comix/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/comix/options.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/graphics/cpia2view/Makefile
cvs rdiff -u -r1.103 -r1.104 pkgsrc/graphics/darktable/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/graphics/dia/Makefile.common
cvs rdiff -u -r1.59 -r1.60 pkgsrc/graphics/dia-python/Makefile
cvs rdiff -u -r1.142 -r1.143 pkgsrc/graphics/digikam/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/graphics/dvipng/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/graphics/dxsamples/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/erlang-eimp/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/evas/Makefile.common
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/exifprobe/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/extrema/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/fbm/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/graphics/fotoxx/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/graphics/frameworks/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/freeglut/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/freeimage/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/freeimageplus/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/freetype2/builtin.mk
cvs rdiff -u -r1.122 -r1.123 pkgsrc/graphics/gd/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/gdk-pixbuf2/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/gdk-pixbuf2/loaders.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/graphics/gdk-pixbuf2-xlib/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/graphics/gif2png/Makefile
cvs rdiff -u -r1.317 -r1.318 pkgsrc/graphics/gimp/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/gimp-docs-en/Makefile.common
cvs rdiff -u -r1.32 -r1.33 pkgsrc/graphics/gle/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/glu/builtin.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/go-image/buildlink3.mk
cvs rdiff -u -r1.63 -r1.64 pkgsrc/graphics/gphoto2/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/gpick/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/graphite2/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/graphics/gtkimageview/Makefile
cvs rdiff -u -r1.126 -r1.127 pkgsrc/graphics/imlib/Makefile
cvs rdiff -u -r1.195 -r1.196 pkgsrc/graphics/inkscape/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/jpeg2ps/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/libbpg/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/libcaca/options.mk
cvs rdiff -u -r1.79 -r1.80 pkgsrc/graphics/libgdiplus/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/libjpeg-turbo/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/graphics/libkdcraw/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/graphics/libkexiv2/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/graphics/libkipi/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/libksane/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/libraw013/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/graphics/librsvg/buildlink3.mk
cvs rdiff -u -r1.53 -r1.54 pkgsrc/graphics/libscigraphica/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/libwmf/hacks.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/magicpoint/options.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/mpgtx/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/graphics/mypaint/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/ncview/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/nvtv/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/graphics/oxygen-icons/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/p5-GDGraph-boxplot/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/graphics/p5-clutter/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/paper-icon-theme/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/png/hacks.mk
cvs rdiff -u -r1.56 -r1.57 pkgsrc/graphics/povray/Makefile
cvs rdiff -u -r1.99 -r1.100 pkgsrc/graphics/pstoedit/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/py-chart/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/graphics/py-goocanvas/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/graphics/py-gtkglext/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/py-leather/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/py-mcomix/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/py-openexr/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/py-piddle/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/py-pycha/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/py-uniconvertor/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/qimageblitz/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/qore-glut-module/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/qore-glut-module/options.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/qore-opengl-module/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/qore-opengl-module/options.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/qvplay/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/rayshade/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/refocus-it/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/graphics/ruby-imlib2/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/ruby-oily_png/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/graphics/scidavis/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/skencil/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/spcaview/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/graphics/tango-icon-theme/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/tex-pictex-doc/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/tex-tkz-base/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/tex-tkz-fct/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/tgif/hacks.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/tuxpaint-stamps/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/graphics/urt/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/vtk/Makefile.vtkdist
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/wm-icons/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/xdot/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/graphics/xfig/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/xmorph/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/graphics/xpaint/Makefile
cvs rdiff -u -r1.94 -r1.95 pkgsrc/graphics/xv/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/zphoto/options.mk

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.5 pkgsrc/graphics/AfterShotPro/Makefile:1.6
--- pkgsrc/graphics/AfterShotPro/Makefile:1.5   Sun Jan 14 14:58:38 2018
+++ pkgsrc/graphics/AfterShotPro/Makefile       Sat Nov  2 22:37:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/01/14 14:58:38 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 22:37:52 rillig Exp $
 
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.corel.com/akdlm/6763/downloads/AfterShotPro/1/PF/
@@ -9,11 +9,11 @@ HOMEPAGE=     http://www.corel.com/corel/pro
 COMMENT=       Photo management software
 LICENSE=       corel-license
 
-RESTRICTED=    Redistribution not permitted
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP=  ${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP=  ${RESTRICTED}
+RESTRICTED=            Redistribution not permitted
+NO_SRC_ON_CDROM=       ${RESTRICTED}
+NO_SRC_ON_FTP=         ${RESTRICTED}
+NO_BIN_ON_CDROM=       ${RESTRICTED}
+NO_BIN_ON_FTP=         ${RESTRICTED}
 
 WRKSRC=                ${WRKDIR}
 USE_LANGUAGES= # none

Index: pkgsrc/graphics/Cenon/Makefile
diff -u pkgsrc/graphics/Cenon/Makefile:1.35 pkgsrc/graphics/Cenon/Makefile:1.36
--- pkgsrc/graphics/Cenon/Makefile:1.35 Wed Apr  3 00:32:45 2019
+++ pkgsrc/graphics/Cenon/Makefile      Sat Nov  2 22:37:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2019/04/03 00:32:45 ryoon Exp $
+# $NetBSD: Makefile,v 1.36 2019/11/02 22:37:53 rillig Exp $
 #
 
 DISTNAME=              Cenon-3.9.6
@@ -20,7 +20,7 @@ NO_CONFIGURE=         yes
 INSTALLATION_DIRS+=    share/doc/Cenon
 INSTALLATION_DIRS+=    share/GNUstep/Library/Cenon
 
-FIX_GNUSTEP_INSTALLATION_DIR= yes
+FIX_GNUSTEP_INSTALLATION_DIR=          yes
 SUBST_FILES.gnustep_installation_dir+= GNUmakefile
 SUBST_FILES.gnustep_installation_dir+= GNUmakefile.postamble
 

Index: pkgsrc/graphics/GMT/Makefile
diff -u pkgsrc/graphics/GMT/Makefile:1.58 pkgsrc/graphics/GMT/Makefile:1.59
--- pkgsrc/graphics/GMT/Makefile:1.58   Thu Aug 22 12:23:16 2019
+++ pkgsrc/graphics/GMT/Makefile        Sat Nov  2 22:37:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2019/08/22 12:23:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.59 2019/11/02 22:37:53 rillig Exp $
 
 DISTNAME=      GMT4.1.4
 PKGNAME=       GMT-4.1.4
@@ -27,16 +27,16 @@ GNU_CONFIGURE=      yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pax
 
-CONFIGURE_ARGS+=--includedir=${PREFIX}/include/gmt
-CONFIGURE_ARGS+=--datadir=${PREFIX}/share/gmt
-CONFIGURE_ARGS+=--enable-eps
-CONFIGURE_ARGS+=--enable-netcdf=${BUILDLINK_PREFIX.netcdf}
-CONFIGURE_ARGS+=--enable-www=${PREFIX}/share/doc
-CONFIGURE_ARGS+=--enable-mansect=1
-CONFIGURE_ARGS+=--disable-mex
+CONFIGURE_ARGS+=       --includedir=${PREFIX}/include/gmt
+CONFIGURE_ARGS+=       --datadir=${PREFIX}/share/gmt
+CONFIGURE_ARGS+=       --enable-eps
+CONFIGURE_ARGS+=       --enable-netcdf=${BUILDLINK_PREFIX.netcdf}
+CONFIGURE_ARGS+=       --enable-www=${PREFIX}/share/doc
+CONFIGURE_ARGS+=       --enable-mansect=1
+CONFIGURE_ARGS+=       --disable-mex
 
 BUILD_TARGET=  all suppl
-INSTALL_TARGET= install-all
+INSTALL_TARGET=        install-all
 LIBS+=         ${X11_LDFLAGS} # XXX: LDFLAGS doesn't work
 
 post-extract:

Index: pkgsrc/graphics/ImageMagick/Makefile
diff -u pkgsrc/graphics/ImageMagick/Makefile:1.262 pkgsrc/graphics/ImageMagick/Makefile:1.263
--- pkgsrc/graphics/ImageMagick/Makefile:1.262  Sat Oct 12 20:55:58 2019
+++ pkgsrc/graphics/ImageMagick/Makefile        Sat Nov  2 22:37:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.262 2019/10/12 20:55:58 rillig Exp $
+# $NetBSD: Makefile,v 1.263 2019/11/02 22:37:53 rillig Exp $
 
 .include "Makefile.common"
 
@@ -43,17 +43,17 @@ CFLAGS+=            -O
 .endif
 
 PKG_SYSCONFSUBDIR=     ImageMagick-${IM_MAJOR_LIB_VER}
-EGDIR=         ${PREFIX}/share/examples/ImageMagick
-CONF_FILES+=   ${EGDIR}/colors.xml ${PKG_SYSCONFDIR}/colors.xml
-CONF_FILES+=   ${EGDIR}/delegates.xml ${PKG_SYSCONFDIR}/delegates.xml
-CONF_FILES+=   ${EGDIR}/log.xml ${PKG_SYSCONFDIR}/log.xml
-CONF_FILES+=   ${EGDIR}/mime.xml ${PKG_SYSCONFDIR}/mime.xml
-CONF_FILES+=   ${EGDIR}/policy.xml ${PKG_SYSCONFDIR}/policy.xml
-CONF_FILES+=   ${EGDIR}/thresholds.xml ${PKG_SYSCONFDIR}/thresholds.xml
-CONF_FILES+=   ${EGDIR}/type-dejavu.xml ${PKG_SYSCONFDIR}/type-dejavu.xml
-CONF_FILES+=   ${EGDIR}/type-ghostscript.xml ${PKG_SYSCONFDIR}/type-ghostscript.xml
-CONF_FILES+=   ${EGDIR}/type-windows.xml ${PKG_SYSCONFDIR}/type-windows.xml
-CONF_FILES+=   ${EGDIR}/type.xml ${PKG_SYSCONFDIR}/type.xml
+EGDIR=                 ${PREFIX}/share/examples/ImageMagick
+CONF_FILES+=           ${EGDIR}/colors.xml ${PKG_SYSCONFDIR}/colors.xml
+CONF_FILES+=           ${EGDIR}/delegates.xml ${PKG_SYSCONFDIR}/delegates.xml
+CONF_FILES+=           ${EGDIR}/log.xml ${PKG_SYSCONFDIR}/log.xml
+CONF_FILES+=           ${EGDIR}/mime.xml ${PKG_SYSCONFDIR}/mime.xml
+CONF_FILES+=           ${EGDIR}/policy.xml ${PKG_SYSCONFDIR}/policy.xml
+CONF_FILES+=           ${EGDIR}/thresholds.xml ${PKG_SYSCONFDIR}/thresholds.xml
+CONF_FILES+=           ${EGDIR}/type-dejavu.xml ${PKG_SYSCONFDIR}/type-dejavu.xml
+CONF_FILES+=           ${EGDIR}/type-ghostscript.xml ${PKG_SYSCONFDIR}/type-ghostscript.xml
+CONF_FILES+=           ${EGDIR}/type-windows.xml ${PKG_SYSCONFDIR}/type-windows.xml
+CONF_FILES+=           ${EGDIR}/type.xml ${PKG_SYSCONFDIR}/type.xml
 
 SUBST_CLASSES+=                fix-cfg
 SUBST_STAGE.fix-cfg=   pre-configure
@@ -67,11 +67,11 @@ SUBST_MESSAGE.fix-etc=      Handle configurat
 SUBST_FILES.fix-etc=   Makefile.in
 SUBST_SED.fix-etc=     -e 's,^configlibdir =.*,configlibdir = $$(DATA_DIR)/examples/ImageMagick,'
 
-SUBST_CLASSES+=                fix-tools
-SUBST_STAGE.fix-tools= pre-install
-SUBST_MESSAGE.fix-tools=Unwrapping tools path in delegate paths.
-SUBST_FILES.fix-tools= config/delegates.xml
-SUBST_SED.fix-tools=   -e 's,${TOOLS_DIR},,g'
+SUBST_CLASSES+=                        fix-tools
+SUBST_STAGE.fix-tools=         pre-install
+SUBST_MESSAGE.fix-tools=       Unwrapping tools path in delegate paths.
+SUBST_FILES.fix-tools=         config/delegates.xml
+SUBST_SED.fix-tools=           -e 's,${TOOLS_DIR},,g'
 
 SUBST_CLASSES+=                fix-pc
 SUBST_STAGE.fix-pc=    pre-configure

Index: pkgsrc/graphics/ImageMagick/options.mk
diff -u pkgsrc/graphics/ImageMagick/options.mk:1.19 pkgsrc/graphics/ImageMagick/options.mk:1.20
--- pkgsrc/graphics/ImageMagick/options.mk:1.19 Mon Dec  3 16:22:15 2018
+++ pkgsrc/graphics/ImageMagick/options.mk      Sat Nov  2 22:37:53 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.19 2018/12/03 16:22:15 jperkin Exp $
+# $NetBSD: options.mk,v 1.20 2019/11/02 22:37:53 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.ImageMagick
-PKG_SUPPORTED_OPTIONS= x11 jp2 djvu openexr wmf liblqr
-PKG_SUGGESTED_OPTIONS= x11 jp2 liblqr
+PKG_OPTIONS_VAR=               PKG_OPTIONS.ImageMagick
+PKG_SUPPORTED_OPTIONS=         x11 jp2 djvu openexr wmf liblqr
+PKG_SUGGESTED_OPTIONS=         x11 jp2 liblqr
 PKG_OPTIONS_LEGACY_OPTS+=      jasper:jp2
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/graphics/ImageMagick6/Makefile
diff -u pkgsrc/graphics/ImageMagick6/Makefile:1.26 pkgsrc/graphics/ImageMagick6/Makefile:1.27
--- pkgsrc/graphics/ImageMagick6/Makefile:1.26  Sun Aug 11 13:21:07 2019
+++ pkgsrc/graphics/ImageMagick6/Makefile       Sat Nov  2 22:37:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/08/11 13:21:07 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/02 22:37:53 rillig Exp $
 
 PKGREVISION=   11
 .include "Makefile.common"
@@ -91,11 +91,11 @@ SUBST_MESSAGE.fix-etc=      Handle configurat
 SUBST_FILES.fix-etc=   Makefile.in
 SUBST_SED.fix-etc=     -e 's,^configlibdir =.*,configlibdir = $$(DATA_DIR)/examples/ImageMagick6,'
 
-SUBST_CLASSES+=                fix-tools
-SUBST_STAGE.fix-tools= pre-install
-SUBST_MESSAGE.fix-tools=Unwrapping tools path in delegate paths.
-SUBST_FILES.fix-tools= config/delegates.xml
-SUBST_SED.fix-tools=   -e 's,${TOOLS_DIR},,g'
+SUBST_CLASSES+=                        fix-tools
+SUBST_STAGE.fix-tools=         pre-install
+SUBST_MESSAGE.fix-tools=       Unwrapping tools path in delegate paths.
+SUBST_FILES.fix-tools=         config/delegates.xml
+SUBST_SED.fix-tools=           -e 's,${TOOLS_DIR},,g'
 
 # failed to convert strong functions and variables: Invalid type identifier
 CTF_FILES_SKIP+=       lib/libMagickCore-6.Q16.so.5.0.0

Index: pkgsrc/graphics/ImageMagick6/options.mk
diff -u pkgsrc/graphics/ImageMagick6/options.mk:1.2 pkgsrc/graphics/ImageMagick6/options.mk:1.3
--- pkgsrc/graphics/ImageMagick6/options.mk:1.2 Mon Oct 30 14:44:05 2017
+++ pkgsrc/graphics/ImageMagick6/options.mk     Sat Nov  2 22:37:53 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2017/10/30 14:44:05 fhajny Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/02 22:37:53 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.ImageMagick
-PKG_SUPPORTED_OPTIONS= x11 jp2 djvu openexr wmf
-PKG_SUGGESTED_OPTIONS= x11 jp2
+PKG_OPTIONS_VAR=               PKG_OPTIONS.ImageMagick
+PKG_SUPPORTED_OPTIONS=         x11 jp2 djvu openexr wmf
+PKG_SUGGESTED_OPTIONS=         x11 jp2
 PKG_OPTIONS_LEGACY_OPTS+=      jasper:jp2
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/graphics/aalib/options.mk
diff -u pkgsrc/graphics/aalib/options.mk:1.3 pkgsrc/graphics/aalib/options.mk:1.4
--- pkgsrc/graphics/aalib/options.mk:1.3        Thu Oct 17 15:32:22 2013
+++ pkgsrc/graphics/aalib/options.mk    Sat Nov  2 22:37:53 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2013/10/17 15:32:22 roy Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/02 22:37:53 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.aalib
-PKG_SUPPORTED_OPTIONS= curses slang x11
-PKG_SUGGESTED_OPTIONS= curses x11
+PKG_OPTIONS_VAR=               PKG_OPTIONS.aalib
+PKG_SUPPORTED_OPTIONS=         curses slang x11
+PKG_SUGGESTED_OPTIONS=         curses x11
 PKG_OPTIONS_LEGACY_OPTS+=      ncurses:curses
 
 .include "../../mk/bsd.options.mk"

Index: pkgsrc/graphics/agg/Makefile
diff -u pkgsrc/graphics/agg/Makefile:1.12 pkgsrc/graphics/agg/Makefile:1.13
--- pkgsrc/graphics/agg/Makefile:1.12   Fri Dec 14 17:03:04 2018
+++ pkgsrc/graphics/agg/Makefile        Sat Nov  2 22:37:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/12/14 17:03:04 bsiegert Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 22:37:53 rillig Exp $
 #
 
 DISTNAME=      agg-2.5
@@ -11,12 +11,12 @@ HOMEPAGE=   http://www.antigrain.com/
 COMMENT=       High Quality Rendering Engine for C++
 LICENSE=       gnu-gpl-v2
 
-MAKE_JOBS_SAFE=                no
+MAKE_JOBS_SAFE=        no
 USE_TOOLS+=    gmake msgfmt pkg-config aclocal autoheader \
-            automake autoconf autoreconf
+               automake autoconf autoreconf
 USE_LANGUAGES= c c++
-USE_LIBTOOL=            yes
-GNU_CONFIGURE=          yes
+USE_LIBTOOL=   yes
+GNU_CONFIGURE= yes
 
 PKGCONFIG_OVERRIDE+=   libagg.pc.in
 

Index: pkgsrc/graphics/asymptote/Makefile
diff -u pkgsrc/graphics/asymptote/Makefile:1.30 pkgsrc/graphics/asymptote/Makefile:1.31
--- pkgsrc/graphics/asymptote/Makefile:1.30     Sun Aug 11 13:21:07 2019
+++ pkgsrc/graphics/asymptote/Makefile  Sat Nov  2 22:37:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/08/11 13:21:07 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/02 22:37:53 rillig Exp $
 
 DISTNAME=      asymptote-2.41
 PKGREVISION=   4
@@ -29,7 +29,7 @@ MAKE_JOBS_SAFE=               no # random failure dur
 
 GNU_CONFIGURE=         yes
 INFO_FILES=            yes
-USE_LANGUAGES=          c c++
+USE_LANGUAGES=         c c++
 
 CONFIGURE_ARGS+=       --enable-gc=system
 CONFIGURE_ARGS+=       --infodir=${PREFIX}/info

Index: pkgsrc/graphics/bktr2jpeg/Makefile
diff -u pkgsrc/graphics/bktr2jpeg/Makefile:1.13 pkgsrc/graphics/bktr2jpeg/Makefile:1.14
--- pkgsrc/graphics/bktr2jpeg/Makefile:1.13     Sat Oct  6 14:10:41 2012
+++ pkgsrc/graphics/bktr2jpeg/Makefile  Sat Nov  2 22:37:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/10/06 14:10:41 asau Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/02 22:37:54 rillig Exp $
 #
 
 DISTNAME=      bktr2jpeg-1.0
@@ -12,7 +12,7 @@ COMMENT=      Write jpeg image captured from 
 
 ONLY_FOR_PLATFORM=     NetBSD-*-* DragonFly-*-* FreeBSD-*-*
 
-MAKE_FLAGS+=   INSTALL=${INSTALL_PROGRAM:Q}
+MAKE_FLAGS+=           INSTALL=${INSTALL_PROGRAM:Q}
 INSTALL_MAKE_FLAGS=    PREFIX=${DESTDIR}${PREFIX}
 
 INSTALLATION_DIRS=     bin

Index: pkgsrc/graphics/cairo/options.mk
diff -u pkgsrc/graphics/cairo/options.mk:1.18 pkgsrc/graphics/cairo/options.mk:1.19
--- pkgsrc/graphics/cairo/options.mk:1.18       Wed Sep  4 13:17:33 2019
+++ pkgsrc/graphics/cairo/options.mk    Sat Nov  2 22:37:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2019/09/04 13:17:33 nia Exp $
+# $NetBSD: options.mk,v 1.19 2019/11/02 22:37:54 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.cairo
 PKG_SUPPORTED_OPTIONS= x11 xcb
@@ -25,7 +25,7 @@ PLIST.x11=            yes
 .  if !empty(PKG_OPTIONS:Mxcb)
 CONFIGURE_ARGS+=       --enable-xcb
 PLIST.xcb=             yes
-.  include "../../x11/libxcb/buildlink3.mk"
+.    include "../../x11/libxcb/buildlink3.mk"
 .  else
 CONFIGURE_ARGS+=       --disable-xcb
 .  endif

Index: pkgsrc/graphics/cal3d/Makefile
diff -u pkgsrc/graphics/cal3d/Makefile:1.11 pkgsrc/graphics/cal3d/Makefile:1.12
--- pkgsrc/graphics/cal3d/Makefile:1.11 Fri Aug 30 18:33:56 2019
+++ pkgsrc/graphics/cal3d/Makefile      Sat Nov  2 22:37:54 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2019/08/30 18:33:56 nia Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/02 22:37:54 rillig Exp $
 #
 
-PKGNAME=               cal3d-${CAL3D_VERSION}
+PKGNAME=       cal3d-${CAL3D_VERSION}
 PKGREVISION=   3
 
 .include "../../graphics/cal3d/Makefile.common"

Index: pkgsrc/graphics/cal3d/Makefile.common
diff -u pkgsrc/graphics/cal3d/Makefile.common:1.12 pkgsrc/graphics/cal3d/Makefile.common:1.13
--- pkgsrc/graphics/cal3d/Makefile.common:1.12  Wed Jul 18 00:06:18 2018
+++ pkgsrc/graphics/cal3d/Makefile.common       Sat Nov  2 22:37:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2018/07/18 00:06:18 joerg Exp $
+# $NetBSD: Makefile.common,v 1.13 2019/11/02 22:37:54 rillig Exp $
 #
 # used by graphics/cal3d/Makefile
 # used by graphics/cal3d-examples/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=           ${MASTER_SITE_SOURCEFORGE
 
 CAL3D_VERSION=         0.9.1
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://cal3d.sourceforge.net/
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://cal3d.sourceforge.net/
 COMMENT=       Skeletal based 3d character animation library in C++
 
 EXTRACT_SUFX=          .tar.bz2

Index: pkgsrc/graphics/cheese/Makefile
diff -u pkgsrc/graphics/cheese/Makefile:1.83 pkgsrc/graphics/cheese/Makefile:1.84
--- pkgsrc/graphics/cheese/Makefile:1.83        Sun Aug 11 13:21:07 2019
+++ pkgsrc/graphics/cheese/Makefile     Sat Nov  2 22:37:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2019/08/11 13:21:07 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2019/11/02 22:37:54 rillig Exp $
 
 DISTNAME=      cheese-2.26.3
 PKGREVISION=   66
@@ -11,14 +11,14 @@ COMMENT=    Use your webcam to take photos 
 LICENSE=       gnu-gpl-v2
 
 BUILD_DEPENDS+=        gettext-m4-[0-9]*:../../devel/gettext-m4
-DEPENDS+= gst-plugins0.10-theora>=0.10.1:../../multimedia/gst-plugins0.10-theora
-DEPENDS+= gst-plugins0.10-ogg>=0.10.1:../../multimedia/gst-plugins0.10-ogg
-DEPENDS+= gst-plugins0.10-vorbis>=0.10.1:../../audio/gst-plugins0.10-vorbis
+DEPENDS+=      gst-plugins0.10-theora>=0.10.1:../../multimedia/gst-plugins0.10-theora
+DEPENDS+=      gst-plugins0.10-ogg>=0.10.1:../../multimedia/gst-plugins0.10-ogg
+DEPENDS+=      gst-plugins0.10-vorbis>=0.10.1:../../audio/gst-plugins0.10-vorbis
 
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*) || !empty(MACHINE_PLATFORM:MLinux)
-DEPENDS+= gst-plugins0.10-v4l2>=0.10.10:../../multimedia/gst-plugins0.10-v4l2
+DEPENDS+=      gst-plugins0.10-v4l2>=0.10.10:../../multimedia/gst-plugins0.10-v4l2
 .endif
 
 GNU_CONFIGURE=         yes

Index: pkgsrc/graphics/cnxtview/Makefile
diff -u pkgsrc/graphics/cnxtview/Makefile:1.28 pkgsrc/graphics/cnxtview/Makefile:1.29
--- pkgsrc/graphics/cnxtview/Makefile:1.28      Mon Sep  8 21:24:44 2014
+++ pkgsrc/graphics/cnxtview/Makefile   Sat Nov  2 22:37:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/09/08 21:24:44 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/02 22:37:54 rillig Exp $
 
 DISTNAME=      cnxtutil-0.00-alpha
 PKGNAME=       cnxtview-0.00a
@@ -14,7 +14,7 @@ NOT_FOR_PLATFORM=     SunOS-*-*       # needs <err
 
 USE_BSD_MAKEFILE=      yes
 USE_TOOLS+=            groff nroff
-MAKE_ENV+=     NOGCCERROR=
+MAKE_ENV+=             NOGCCERROR=
 
 INSTALLATION_DIRS+=    bin
 

Index: pkgsrc/graphics/comix/Makefile
diff -u pkgsrc/graphics/comix/Makefile:1.67 pkgsrc/graphics/comix/Makefile:1.68
--- pkgsrc/graphics/comix/Makefile:1.67 Mon Sep  2 13:20:18 2019
+++ pkgsrc/graphics/comix/Makefile      Sat Nov  2 22:37:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2019/09/02 13:20:18 adam Exp $
+# $NetBSD: Makefile,v 1.68 2019/11/02 22:37:54 rillig Exp $
 
 DISTNAME=              comix-4.0.4
 PKGREVISION=           36
@@ -24,7 +24,7 @@ SUBST_FILES.install-path=     install.py
 SUBST_SED.install-path=                -e "s,share/man/man,${PKGMANDIR}/man,g"
 
 REPLACE_PYTHON=                        src/comix.py mime/comicthumb
-PYTHON_VERSIONS_ACCEPTED=       27 # py-imaging, py-gtk2
+PYTHON_VERSIONS_ACCEPTED=      27 # py-imaging, py-gtk2
 
 do-build:
 

Index: pkgsrc/graphics/comix/options.mk
diff -u pkgsrc/graphics/comix/options.mk:1.1 pkgsrc/graphics/comix/options.mk:1.2
--- pkgsrc/graphics/comix/options.mk:1.1        Wed Jan 27 10:24:08 2010
+++ pkgsrc/graphics/comix/options.mk    Sat Nov  2 22:37:54 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2010/01/27 10:24:08 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/02 22:37:54 rillig Exp $
 
-PKG_OPTIONS_VAR= PKG_OPTIONS.comix
-PKG_SUPPORTED_OPTIONS= gnome
-PKG_SUGGESTED_OPTIONS= gnome
+PKG_OPTIONS_VAR=       PKG_OPTIONS.comix
+PKG_SUPPORTED_OPTIONS= gnome
+PKG_SUGGESTED_OPTIONS= gnome
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/graphics/cpia2view/Makefile
diff -u pkgsrc/graphics/cpia2view/Makefile:1.29 pkgsrc/graphics/cpia2view/Makefile:1.30
--- pkgsrc/graphics/cpia2view/Makefile:1.29     Mon Sep  8 21:24:44 2014
+++ pkgsrc/graphics/cpia2view/Makefile  Sat Nov  2 22:37:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2014/09/08 21:24:44 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/02 22:37:54 rillig Exp $
 
 DISTNAME=      cpia2_driver-1.0
 PKGNAME=       cpia2view-0.03
@@ -7,8 +7,8 @@ CATEGORIES=     graphics x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=cpia2/}
 EXTRACT_SUFX=  .tgz
 
-PATCH_SITES=   http://home.384.jp/takam/bsd/
-PATCHFILES=    cpia2_driver-1.0-bsd-0.03.patch.gz
+PATCH_SITES=           http://home.384.jp/takam/bsd/
+PATCHFILES=            cpia2_driver-1.0-bsd-0.03.patch.gz
 PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/graphics/darktable/Makefile
diff -u pkgsrc/graphics/darktable/Makefile:1.103 pkgsrc/graphics/darktable/Makefile:1.104
--- pkgsrc/graphics/darktable/Makefile:1.103    Thu Aug 22 12:23:16 2019
+++ pkgsrc/graphics/darktable/Makefile  Sat Nov  2 22:37:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2019/08/22 12:23:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.104 2019/11/02 22:37:54 rillig Exp $
 
 DISTNAME=      darktable-2.6.0
 PKGREVISION=   7
@@ -31,12 +31,12 @@ CMAKE_ARGS+=        -Wno-dev
 CMAKE_ARGS+=   -DWITH_OPENMP=OFF
 CMAKE_ARGS+=   -DUSE_COLORD=OFF
 
-CONFIGURE_DIRS= ../pkgsrc_build
-CMAKE_ARG_PATH= ${WRKSRC}
+CONFIGURE_DIRS=        ../pkgsrc_build
+CMAKE_ARG_PATH=        ${WRKSRC}
 LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/darktable
 
 # NetBSD 6 libm is the first with exp2f(3)
-#NOT_FOR_PLATFORM= NetBSD-4*-* NetBSD-5.[0-8]*-*
+#NOT_FOR_PLATFORM=     NetBSD-4*-* NetBSD-5.[0-8]*-*
 
 # Hard-coded use of SSE2
 ONLY_FOR_PLATFORM=     *-*-i386 *-*-x86_64
@@ -57,12 +57,12 @@ CFLAGS.SunOS+=      -D__SUNOS__=1
 CFLAGS+=       -Wno-error=deprecated-declarations
 .endif
 
-CHECK_PORTABILITY_SKIP+= packaging/macosx/start
+CHECK_PORTABILITY_SKIP+=       packaging/macosx/start
 
 pre-configure:
        ${MKDIR} ${WRKDIR}/pkgsrc_build
 
-BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.14.1nb1
+BUILDLINK_API_DEPENDS.sqlite3+=        sqlite3>=3.7.14.1nb1
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"

Index: pkgsrc/graphics/dia/Makefile.common
diff -u pkgsrc/graphics/dia/Makefile.common:1.29 pkgsrc/graphics/dia/Makefile.common:1.30
--- pkgsrc/graphics/dia/Makefile.common:1.29    Tue Jun  9 08:55:22 2015
+++ pkgsrc/graphics/dia/Makefile.common Sat Nov  2 22:37:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2015/06/09 08:55:22 wiz Exp $
+# $NetBSD: Makefile.common,v 1.30 2019/11/02 22:37:55 rillig Exp $
 #
 # used by graphics/dia-python/Makefile
 
@@ -22,7 +22,7 @@ USE_LIBTOOL=          YES
 USE_PKGLOCALEDIR=      YES
 USE_LANGUAGES=         c c++
 
-CHECK_PORTABILITY_SKIP+= installer/macosx/dia
+CHECK_PORTABILITY_SKIP+=       installer/macosx/dia
 
 CONFIGURE_ARGS+=       --disable-emf
 CONFIGURE_ARGS+=       --without-python

Index: pkgsrc/graphics/dia-python/Makefile
diff -u pkgsrc/graphics/dia-python/Makefile:1.59 pkgsrc/graphics/dia-python/Makefile:1.60
--- pkgsrc/graphics/dia-python/Makefile:1.59    Mon Sep  2 13:20:17 2019
+++ pkgsrc/graphics/dia-python/Makefile Sat Nov  2 22:37:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2019/09/02 13:20:17 adam Exp $
+# $NetBSD: Makefile,v 1.60 2019/11/02 22:37:55 rillig Exp $
 
 DIA_SUBPKG=            -python
 PKGREVISION= 9
@@ -9,10 +9,10 @@ COMMENT+=             (Python plugin)
 CONFIGURE_ARGS:=       ${CONFIGURE_ARGS:S/--without-python/--with-python/g}
 CONFIGURE_ENV+=                PYTHON=${PYTHONBIN:Q}
 
-REPLACE_PYTHON=        po-checktrans.py
-REPLACE_PYTHON+=       plug-ins/python/gtkcons.py
-REPLACE_PYTHON+=       sheets/checktrans.py
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2
+REPLACE_PYTHON=                        po-checktrans.py
+REPLACE_PYTHON+=               plug-ins/python/gtkcons.py
+REPLACE_PYTHON+=               sheets/checktrans.py
+PYTHON_VERSIONS_ACCEPTED=      27 # py-gtk2
 
 BUILD_DIRS+=           plug-ins/python
 INSTALL_DIRS+=         plug-ins/python

Index: pkgsrc/graphics/digikam/Makefile
diff -u pkgsrc/graphics/digikam/Makefile:1.142 pkgsrc/graphics/digikam/Makefile:1.143
--- pkgsrc/graphics/digikam/Makefile:1.142      Thu Aug 22 12:23:17 2019
+++ pkgsrc/graphics/digikam/Makefile    Sat Nov  2 22:37:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.142 2019/08/22 12:23:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.143 2019/11/02 22:37:55 rillig Exp $
 
 DISTNAME=      digikam-4.13.0
 PKGREVISION=   18
@@ -18,7 +18,7 @@ USE_PKGLOCALEDIR=     yes
 USE_LANGUAGES=         c c++
 
 REPLACE_PERL=  core/data/scripts/digitaglinktree/digitaglinktree
-CMAKE_ARGS+=    -DMYSQLD_PATH:PATH=${BUILDLINK_PREFIX.mysql-server}/libexec
+CMAKE_ARGS+=   -DMYSQLD_PATH:PATH=${BUILDLINK_PREFIX.mysql-server}/libexec
 CMAKE_ARGS+=   -DENABLE_OPENCV3:BOOL=ON
 USE_TOOLS+=    gawk msgfmt perl:run pkg-config
 

Index: pkgsrc/graphics/dvipng/Makefile
diff -u pkgsrc/graphics/dvipng/Makefile:1.30 pkgsrc/graphics/dvipng/Makefile:1.31
--- pkgsrc/graphics/dvipng/Makefile:1.30        Mon Mar 12 11:16:40 2018
+++ pkgsrc/graphics/dvipng/Makefile     Sat Nov  2 22:37:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2018/03/12 11:16:40 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/02 22:37:55 rillig Exp $
 
 DISTNAME=      dvipng-1.15
 PKGREVISION=   5
@@ -11,7 +11,7 @@ HOMEPAGE=     http://savannah.nongnu.org/pro
 COMMENT=       Convert TeX DVI files to PNG or GIF
 LICENSE=       gnu-lgpl-v3
 
-GNU_CONFIGURE=         yes
+GNU_CONFIGURE= yes
 CFLAGS+=       -I${BUILDLINK_PREFIX.kpathsea}/lib
 
 BUILD_TARGET=          dvipng

Index: pkgsrc/graphics/dxsamples/Makefile
diff -u pkgsrc/graphics/dxsamples/Makefile:1.29 pkgsrc/graphics/dxsamples/Makefile:1.30
--- pkgsrc/graphics/dxsamples/Makefile:1.29     Tue Aug  1 17:40:12 2017
+++ pkgsrc/graphics/dxsamples/Makefile  Sat Nov  2 22:37:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2017/08/01 17:40:12 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/02 22:37:55 rillig Exp $
 
 DISTNAME=      dxsamples-4.4.0
 CATEGORIES=    graphics
@@ -10,8 +10,8 @@ COMMENT=      Sample data for Open Visualizat
 
 DEPENDS+=      dx-[0-9]*:../../graphics/dx
 
-GNU_CONFIGURE= yes
-USE_TOOLS+=    gmake makeinfo
+GNU_CONFIGURE=         yes
+USE_TOOLS+=            gmake makeinfo
 CONFIGURE_ARGS+=       MAKEINFO=${TOOLS_PATH.makeinfo}
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/erlang-eimp/Makefile
diff -u pkgsrc/graphics/erlang-eimp/Makefile:1.8 pkgsrc/graphics/erlang-eimp/Makefile:1.9
--- pkgsrc/graphics/erlang-eimp/Makefile:1.8    Sun Jul 14 15:55:06 2019
+++ pkgsrc/graphics/erlang-eimp/Makefile        Sat Nov  2 22:37:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/07/14 15:55:06 wiedi Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/02 22:37:55 rillig Exp $
 
 DISTNAME=      eimp-1.0.6
 PKGNAME=       erlang-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=     erlang-p1_utils>=1.0.12:../../
 
 GNU_CONFIGURE= yes
 
-LDFLAGS.SunOS+=     -lnsl -lsocket
+LDFLAGS.SunOS+=        -lnsl -lsocket
 
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../lang/erlang/module.mk"

Index: pkgsrc/graphics/evas/Makefile.common
diff -u pkgsrc/graphics/evas/Makefile.common:1.16 pkgsrc/graphics/evas/Makefile.common:1.17
--- pkgsrc/graphics/evas/Makefile.common:1.16   Fri Jul  5 08:53:20 2019
+++ pkgsrc/graphics/evas/Makefile.common        Sat Nov  2 22:37:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2019/07/05 08:53:20 nia Exp $
+# $NetBSD: Makefile.common,v 1.17 2019/11/02 22:37:55 rillig Exp $
 
 # used by graphics/evas-buffer/Makefile
 # used by graphics/evas-edb/Makefile
@@ -58,8 +58,8 @@ CONFIGURE_ARGS+=      --enable-cpu-altivec
 .endif
 
 # currently it is like it is
-MODULE_ARCH=   ${LOWER_OPSYS}-${MACHINE_ARCH}-${EVAS_VERSION}
-PLIST_SUBST=   MODULE_ARCH=${MODULE_ARCH}
-PRINT_PLIST_AWK+=        { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
+MODULE_ARCH=           ${LOWER_OPSYS}-${MACHINE_ARCH}-${EVAS_VERSION}
+PLIST_SUBST=           MODULE_ARCH=${MODULE_ARCH}
+PRINT_PLIST_AWK+=      { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
 
 MAKE_FLAGS+=   MODULE_ARCH=${MODULE_ARCH}

Index: pkgsrc/graphics/exifprobe/Makefile
diff -u pkgsrc/graphics/exifprobe/Makefile:1.7 pkgsrc/graphics/exifprobe/Makefile:1.8
--- pkgsrc/graphics/exifprobe/Makefile:1.7      Tue Aug  1 17:40:12 2017
+++ pkgsrc/graphics/exifprobe/Makefile  Sat Nov  2 22:37:55 2019
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.7 2017/08/01 17:40:12 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/02 22:37:55 rillig Exp $
 #
 
 DISTNAME=              exifprobe-2.0.1
 CATEGORIES=            graphics
 MASTER_SITES=          http://www.virtual-cafe.com/~dhh/tools.d/exifprobe.d/
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE= http://www.virtual-cafe.com/~dhh/tools.d/exifprobe.d/exifprobe.html
-COMMENT=               EXIF data extractor
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+#HOMEPAGE=     http://www.virtual-cafe.com/~dhh/tools.d/exifprobe.d/exifprobe.html
+COMMENT=       EXIF data extractor
 
 # byteorder.h problems
 MAKE_JOBS_SAFE=        no

Index: pkgsrc/graphics/extrema/Makefile
diff -u pkgsrc/graphics/extrema/Makefile:1.27 pkgsrc/graphics/extrema/Makefile:1.28
--- pkgsrc/graphics/extrema/Makefile:1.27       Mon Aug  1 04:03:48 2016
+++ pkgsrc/graphics/extrema/Makefile    Sat Nov  2 22:37:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2016/08/01 04:03:48 mef Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/02 22:37:56 rillig Exp $
 #
 
 DISTNAME=      extrema-4.4.5
@@ -10,10 +10,10 @@ HOMEPAGE=   http://exsitewebware.com/extre
 COMMENT=       Visualization and data analysis tool
 LICENSE=       gnu-gpl-v2
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-USE_LANGUAGES= c c++
-USE_TOOLS+=    gmake
+GNU_CONFIGURE=         yes
+USE_LIBTOOL=           yes
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            gmake
 CONFIGURE_ARGS+=       --with-wxGTK
 
 .include "../../mk/wxGTK.mk"

Index: pkgsrc/graphics/fbm/Makefile
diff -u pkgsrc/graphics/fbm/Makefile:1.12 pkgsrc/graphics/fbm/Makefile:1.13
--- pkgsrc/graphics/fbm/Makefile:1.12   Sat Oct  6 14:10:48 2012
+++ pkgsrc/graphics/fbm/Makefile        Sat Nov  2 22:37:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/06 14:10:48 asau Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 22:37:56 rillig Exp $
 
 DISTNAME=      fbm-1.2
 CATEGORIES=    graphics converters
@@ -8,7 +8,7 @@ EXTRACT_SUFX=   .tgz
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Fuzzy Pixmap Manipulation utilities
 
-WRKSRC=                ${WRKDIR}
+WRKSRC=                        ${WRKDIR}
 INSTALL_MAKE_FLAGS+=   BIN=${DESTDIR}${PREFIX}/bin/ \
                        MAN=${DESTDIR}${PREFIX}/${PKGMANDIR}/manl/
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/manl

Index: pkgsrc/graphics/fotoxx/Makefile
diff -u pkgsrc/graphics/fotoxx/Makefile:1.63 pkgsrc/graphics/fotoxx/Makefile:1.64
--- pkgsrc/graphics/fotoxx/Makefile:1.63        Sun Jul 21 22:24:57 2019
+++ pkgsrc/graphics/fotoxx/Makefile     Sat Nov  2 22:37:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2019/07/21 22:24:57 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2019/11/02 22:37:56 rillig Exp $
 #
 
 DISTNAME=      fotoxx-16.02.1
@@ -16,9 +16,9 @@ BUILD_DEFS+=  PKG_SYSCONFBASE
 PKG_SYSCONFSUBDIR=     xdg/menus
 
 # XXX work around misc/xdg-utils being completely broken
-XDG_CONFIG_DIRS="${DESTDIR}${PKG_SYSCONFBASE}/xdg"
-MAKE_ENV+=     XDG_CONFIG_DIRS="${XDG_CONFIG_DIRS}"
-MAKE_ENV+=     XDG_DATA_DIRS="${DESTDIR}${PREFIX}/share"
+XDG_CONFIG_DIRS=       "${DESTDIR}${PKG_SYSCONFBASE}/xdg"
+MAKE_ENV+=             XDG_CONFIG_DIRS="${XDG_CONFIG_DIRS}"
+MAKE_ENV+=             XDG_DATA_DIRS="${DESTDIR}${PREFIX}/share"
 
 OWN_DIRS+=     ${PREFIX}/share/desktop-directories
 

Index: pkgsrc/graphics/frameworks/Makefile
diff -u pkgsrc/graphics/frameworks/Makefile:1.38 pkgsrc/graphics/frameworks/Makefile:1.39
--- pkgsrc/graphics/frameworks/Makefile:1.38    Sun Jul 21 22:24:57 2019
+++ pkgsrc/graphics/frameworks/Makefile Sat Nov  2 22:37:56 2019
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.38 2019/07/21 22:24:57 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2019/11/02 22:37:56 rillig Exp $
 #
 
-DISTNAME=      frameworks-0.3.7
-PKGREVISION=   31
-CATEGORIES=    graphics
-MASTER_SITES=  http://frameworks.polycrystal.org/release/
+DISTNAME=              frameworks-0.3.7
+PKGREVISION=           31
+CATEGORIES=            graphics
+MASTER_SITES=          http://frameworks.polycrystal.org/release/
 SITES.frameworks.png=  http://frameworks.polycrystal.org/images/
-DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} frameworks.png
+DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} frameworks.png
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://frameworks.polycrystal.org/release/
@@ -20,7 +20,7 @@ SUBST_CLASSES=                xdg
 SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Fixing paths in xdg menu entries.
 SUBST_FILES.xdg=       frameworks.desktop
-SUBST_VARS.xdg=        PREFIX
+SUBST_VARS.xdg=                PREFIX
 
 INSTALLATION_DIRS=     share/applications share/icons/hicolor/48x48/apps
 

Index: pkgsrc/graphics/freeglut/buildlink3.mk
diff -u pkgsrc/graphics/freeglut/buildlink3.mk:1.14 pkgsrc/graphics/freeglut/buildlink3.mk:1.15
--- pkgsrc/graphics/freeglut/buildlink3.mk:1.14 Thu Oct  3 11:17:51 2019
+++ pkgsrc/graphics/freeglut/buildlink3.mk      Sat Nov  2 22:37:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2019/10/03 11:17:51 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2019/11/02 22:37:56 rillig Exp $
 
 BUILDLINK_TREE+=       freeglut
 
@@ -16,16 +16,16 @@ pkgbase:=   freeglut
 
 .include "../../mk/pkg-build-options.mk"
 
-.  if !empty(PKG_BUILD_OPTIONS.freeglut:Mwayland)
-.    include "../../devel/wayland/buildlink3.mk"
-. endif
-
-.  if !empty(PKG_BUILD_OPTIONS.freeglut:Mx11)
-.    include "../../x11/libXi/buildlink3.mk"
-.    include "../../x11/libXrandr/buildlink3.mk"
-.    include "../../x11/libXxf86vm/buildlink3.mk"
-.    include "../../x11/libX11/buildlink3.mk"
-. endif
+.if !empty(PKG_BUILD_OPTIONS.freeglut:Mwayland)
+.  include "../../devel/wayland/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.freeglut:Mx11)
+.  include "../../x11/libXi/buildlink3.mk"
+.  include "../../x11/libXrandr/buildlink3.mk"
+.  include "../../x11/libXxf86vm/buildlink3.mk"
+.  include "../../x11/libX11/buildlink3.mk"
+.endif
 .endif # FREEGLUT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -freeglut

Index: pkgsrc/graphics/freeimage/Makefile
diff -u pkgsrc/graphics/freeimage/Makefile:1.7 pkgsrc/graphics/freeimage/Makefile:1.8
--- pkgsrc/graphics/freeimage/Makefile:1.7      Wed Jul 18 00:06:18 2018
+++ pkgsrc/graphics/freeimage/Makefile  Sat Nov  2 22:37:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/07/18 00:06:18 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/02 22:37:56 rillig Exp $
 
 DISTNAME=      FreeImage3170
 PKGNAME=       freeimage-3.17.0
@@ -12,12 +12,12 @@ HOMEPAGE=   http://freeimage.sf.net/
 COMMENT=       Library for supporting PNG, BMP, JPEG, and TIFF
 LICENSE=       gnu-gpl-v2 OR gnu-gpl-v3 OR mpl-1.0
 
-USE_LANGUAGES+= c c++03
+USE_LANGUAGES+=        c c++03
 USE_TOOLS+=    gmake
 
 WRKSRC=                ${WRKDIR}/FreeImage
 
-INSTALLATION_DIRS+= include lib share/doc/${PKGBASE}
+INSTALLATION_DIRS+=    include lib share/doc/${PKGBASE}
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/Source/LibJXR/LICENCE \
@@ -39,6 +39,6 @@ post-install:
 
 PLIST_SUBST+=  PKGVERSION_NOREV=${PKGVERSION_NOREV}
 
-NOT_FOR_PLATFORM=Darwin-*-*
+NOT_FOR_PLATFORM=      Darwin-*-*
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/freeimageplus/Makefile
diff -u pkgsrc/graphics/freeimageplus/Makefile:1.3 pkgsrc/graphics/freeimageplus/Makefile:1.4
--- pkgsrc/graphics/freeimageplus/Makefile:1.3  Fri Aug 11 15:26:21 2017
+++ pkgsrc/graphics/freeimageplus/Makefile      Sat Nov  2 22:37:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/08/11 15:26:21 nros Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/02 22:37:56 rillig Exp $
 
 DISTNAME=      FreeImage3170
 PKGNAME=       freeimageplus-3.17.0
@@ -12,7 +12,7 @@ HOMEPAGE=     http://freeimage.sf.net/
 COMMENT=       Library for supporting PNG, BMP, JPEG, and TIFF - C++ Wrapper
 LICENSE=       gnu-gpl-v2 OR gnu-gpl-v3 OR mpl-1.0
 
-USE_LANGUAGES+= c c++
+USE_LANGUAGES+=        c c++
 USE_TOOLS+=    gmake
 MAKE_FILE=     Makefile.fip
 
@@ -23,7 +23,7 @@ DISTINFO_FILE=        ${.CURDIR}/../../graphics
 
 WRKSRC=                ${WRKDIR}/FreeImage
 
-INSTALLATION_DIRS+= include lib share/doc/${PKGBASE}
+INSTALLATION_DIRS+=    include lib share/doc/${PKGBASE}
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/Source/LibJXR/LICENCE \
@@ -45,6 +45,6 @@ post-install:
 
 PLIST_SUBST+=  PKGVERSION_NOREV=${PKGVERSION_NOREV}
 
-NOT_FOR_PLATFORM=Darwin-*-*
+NOT_FOR_PLATFORM=      Darwin-*-*
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/freetype2/builtin.mk
diff -u pkgsrc/graphics/freetype2/builtin.mk:1.18 pkgsrc/graphics/freetype2/builtin.mk:1.19
--- pkgsrc/graphics/freetype2/builtin.mk:1.18   Fri May  4 08:40:11 2018
+++ pkgsrc/graphics/freetype2/builtin.mk        Sat Nov  2 22:37:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.18 2018/05/04 08:40:11 adam Exp $
+# $NetBSD: builtin.mk,v 1.19 2019/11/02 22:37:56 rillig Exp $
 
 BUILTIN_PKG:=  freetype2
 
@@ -40,7 +40,7 @@ BUILTIN_VERSION.freetype2!=                                           \
                ${H_FREETYPE2}
 BUILTIN_PKG.freetype2= freetype2-${BUILTIN_VERSION.freetype2}
 .endif
-MAKEVARS+=     BUILTIN_PKG.freetype2
+MAKEVARS+=             BUILTIN_PKG.freetype2
 
 ###
 ### Determine whether we should use the built-in implementation if it
@@ -67,7 +67,7 @@ USE_BUILTIN.freetype2!=                                                       \
 .    endif
 .  endif  # PREFER.freetype2
 .endif
-MAKEVARS+=     USE_BUILTIN.freetype2
+MAKEVARS+=             USE_BUILTIN.freetype2
 
 ###
 ### The section below only applies if we are not including this file
@@ -85,13 +85,13 @@ BUILDLINK_API_DEPENDS.freetype2+=   freety
 .    if !empty(MACHINE_PLATFORM:MNetBSD-[67].*-*) && \
        (("${BUILTIN_VERSION.freetype2}" == "2.4.5") || \
        ("${BUILTIN_VERSION.freetype2}" == "2.5.3"))
-_FT2_VER_MAP.2.5.3=17.2.11
-_FT2_VER_MAP.2.4.5=13.0.7
-SUBST_CLASSES+=                fx-ft2-pc-version
-SUBST_STAGE.fx-ft2-pc-version= post-wrapper
-SUBST_MESSAGE.fx-ft2-pc-version=Fixes wrong module version in freetype2.pc
-SUBST_FILES.fx-ft2-pc-version= ${BUILDLINK_X11_DIR}/lib/pkgconfig/freetype2.pc
-SUBST_SED.fx-ft2-pc-version=   -e 's|^\(Version:\).*|\1 ${_FT2_VER_MAP.${BUILTIN_VERSION.freetype2}}|'
+_FT2_VER_MAP.2.5.3=                    17.2.11
+_FT2_VER_MAP.2.4.5=                    13.0.7
+SUBST_CLASSES+=                                fx-ft2-pc-version
+SUBST_STAGE.fx-ft2-pc-version=         post-wrapper
+SUBST_MESSAGE.fx-ft2-pc-version=       Fixes wrong module version in freetype2.pc
+SUBST_FILES.fx-ft2-pc-version=         ${BUILDLINK_X11_DIR}/lib/pkgconfig/freetype2.pc
+SUBST_SED.fx-ft2-pc-version=           -e 's|^\(Version:\).*|\1 ${_FT2_VER_MAP.${BUILTIN_VERSION.freetype2}}|'
 .    endif
 .  endif
 

Index: pkgsrc/graphics/gd/Makefile
diff -u pkgsrc/graphics/gd/Makefile:1.122 pkgsrc/graphics/gd/Makefile:1.123
--- pkgsrc/graphics/gd/Makefile:1.122   Sun Aug 11 13:21:08 2019
+++ pkgsrc/graphics/gd/Makefile Sat Nov  2 22:37:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2019/08/11 13:21:08 wiz Exp $
+# $NetBSD: Makefile,v 1.123 2019/11/02 22:37:57 rillig Exp $
 
 DISTNAME=      libgd-2.2.5
 PKGNAME=       ${DISTNAME:S/libgd/gd/}
@@ -7,8 +7,8 @@ CATEGORIES=     graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libgd/}
 EXTRACT_SUFX=  .tar.xz
 
-PATCH_SITES=   ${MASTER_SITE_GITHUB:=libgd/libgd/commit/}
-PATCHFILES=    4b1e18a00ce7c4b7e6919c3b3109a034393b805a.patch
+PATCH_SITES=           ${MASTER_SITE_GITHUB:=libgd/libgd/commit/}
+PATCHFILES=            4b1e18a00ce7c4b7e6919c3b3109a034393b805a.patch
 PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    adam%NetBSD.org@localhost

Index: pkgsrc/graphics/gdk-pixbuf2/Makefile
diff -u pkgsrc/graphics/gdk-pixbuf2/Makefile:1.43 pkgsrc/graphics/gdk-pixbuf2/Makefile:1.44
--- pkgsrc/graphics/gdk-pixbuf2/Makefile:1.43   Mon Oct  7 09:28:11 2019
+++ pkgsrc/graphics/gdk-pixbuf2/Makefile        Sat Nov  2 22:37:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/10/07 09:28:11 prlw1 Exp $
+# $NetBSD: Makefile,v 1.44 2019/11/02 22:37:57 rillig Exp $
 
 DISTNAME=      gdk-pixbuf-${PIXBUF2_VERSION}
 PKGNAME=       ${DISTNAME:S/pixbuf/pixbuf2/}
@@ -18,11 +18,11 @@ CONFLICTS+= gtk2+<2.22
 USE_TOOLS+=    gmake pkg-config xgettext
 MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf
 
-MESON_ARGS+=   -D installed_tests=false
-MESON_ARGS+=   -D x11=false
-MESON_ARGS+=   -D man=false
-PKGCONFIG_OVERRIDE_STAGE=pre-install
-PKGCONFIG_OVERRIDE=    output/meson-private/gdk-pixbuf-2.0.pc
+MESON_ARGS+=                   -D installed_tests=false
+MESON_ARGS+=                   -D x11=false
+MESON_ARGS+=                   -D man=false
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+PKGCONFIG_OVERRIDE=            output/meson-private/gdk-pixbuf-2.0.pc
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 

Index: pkgsrc/graphics/gdk-pixbuf2/loaders.mk
diff -u pkgsrc/graphics/gdk-pixbuf2/loaders.mk:1.3 pkgsrc/graphics/gdk-pixbuf2/loaders.mk:1.4
--- pkgsrc/graphics/gdk-pixbuf2/loaders.mk:1.3  Sat Sep 30 14:05:24 2017
+++ pkgsrc/graphics/gdk-pixbuf2/loaders.mk      Sat Nov  2 22:37:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: loaders.mk,v 1.3 2017/09/30 14:05:24 adam Exp $
+# $NetBSD: loaders.mk,v 1.4 2019/11/02 22:37:57 rillig Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GTK2 modules.  It takes care of rebuilding the corresponding databases at
@@ -12,11 +12,11 @@ BUILDLINK_PREFIX.gdk-pixbuf2=       ${PREFIX}
 .endif
 
 GDK_PIXBUF_QUERY_LOADERS= \
- ${BUILDLINK_PREFIX.gdk-pixbuf2}/bin/gdk-pixbuf-query-loaders
-GDK_PIXBUF_LOADERS_DB= \
- ${BUILDLINK_PREFIX.gdk-pixbuf2}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
-FILES_SUBST+=  GDK_PIXBUF_LOADERS_DB=${GDK_PIXBUF_LOADERS_DB:Q}
-FILES_SUBST+=  GDK_PIXBUF_QUERY_LOADERS=${GDK_PIXBUF_QUERY_LOADERS:Q}
+       ${BUILDLINK_PREFIX.gdk-pixbuf2}/bin/gdk-pixbuf-query-loaders
+GDK_PIXBUF_LOADERS_DB= \
+       ${BUILDLINK_PREFIX.gdk-pixbuf2}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
+FILES_SUBST+=          GDK_PIXBUF_LOADERS_DB=${GDK_PIXBUF_LOADERS_DB:Q}
+FILES_SUBST+=          GDK_PIXBUF_QUERY_LOADERS=${GDK_PIXBUF_QUERY_LOADERS:Q}
 INSTALL_TEMPLATES+=    ../../graphics/gdk-pixbuf2/files/loaders.tmpl
 DEINSTALL_TEMPLATES+=  ../../graphics/gdk-pixbuf2/files/loaders.tmpl
 

Index: pkgsrc/graphics/gdk-pixbuf2-xlib/Makefile
diff -u pkgsrc/graphics/gdk-pixbuf2-xlib/Makefile:1.25 pkgsrc/graphics/gdk-pixbuf2-xlib/Makefile:1.26
--- pkgsrc/graphics/gdk-pixbuf2-xlib/Makefile:1.25      Mon Oct  7 09:28:11 2019
+++ pkgsrc/graphics/gdk-pixbuf2-xlib/Makefile   Sat Nov  2 22:37:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/10/07 09:28:11 prlw1 Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/02 22:37:57 rillig Exp $
 
 DISTNAME=      gdk-pixbuf-${PIXBUF2_VERSION}
 PKGNAME=       gdk-pixbuf2-xlib-${PIXBUF2_VERSION}
@@ -21,10 +21,10 @@ CONFLICTS+= gtk2+<2.22
 USE_TOOLS+=    gmake pkg-config
 MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf
 
-MESON_ARGS+=   -D installed_tests=false
-MESON_ARGS+=   -D x11=true
-PKGCONFIG_OVERRIDE_STAGE=pre-install
-PKGCONFIG_OVERRIDE=    output/meson-private/gdk-pixbuf-xlib-2.0.pc
+MESON_ARGS+=                   -D installed_tests=false
+MESON_ARGS+=                   -D x11=true
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+PKGCONFIG_OVERRIDE=            output/meson-private/gdk-pixbuf-xlib-2.0.pc
 
 post-install:
        ${RM} -rf ${DESTDIR}${PREFIX}/*

Index: pkgsrc/graphics/gif2png/Makefile
diff -u pkgsrc/graphics/gif2png/Makefile:1.54 pkgsrc/graphics/gif2png/Makefile:1.55
--- pkgsrc/graphics/gif2png/Makefile:1.54       Thu Apr 25 07:32:57 2019
+++ pkgsrc/graphics/gif2png/Makefile    Sat Nov  2 22:37:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2019/04/25 07:32:57 maya Exp $
+# $NetBSD: Makefile,v 1.55 2019/11/02 22:37:57 rillig Exp $
 
 DISTNAME=      gif2png-2.5.11
 PKGREVISION=   2
@@ -12,7 +12,7 @@ LICENSE=      zlib
 
 REPLACE_PYTHON+=       web2png
 
-LDFLAGS=       ${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib
+LDFLAGS=               ${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib
 BUILD_MAKE_FLAGS=      LDFLAGS=${LDFLAGS:Q}
 INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX}
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1

Index: pkgsrc/graphics/gimp/Makefile
diff -u pkgsrc/graphics/gimp/Makefile:1.317 pkgsrc/graphics/gimp/Makefile:1.318
--- pkgsrc/graphics/gimp/Makefile:1.317 Sat Nov  2 14:06:44 2019
+++ pkgsrc/graphics/gimp/Makefile       Sat Nov  2 22:37:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.317 2019/11/02 14:06:44 nia Exp $
+# $NetBSD: Makefile,v 1.318 2019/11/02 22:37:57 rillig Exp $
 
 DISTNAME=      gimp-2.10.14
 CATEGORIES=    graphics
@@ -51,11 +51,11 @@ _TOOLS_USE_PKGSRC.xgettext= yes
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=              ${EXPORT_SYMBOLS_LDFLAGS}
 
-PLIST_VARS+=           remote
+PLIST_VARS+=   remote
 .if ${OPSYS} == "Darwin"
-PLIST_SUBST+=  GIMP_DEBUG_TOOL_DIR="bin"
+PLIST_SUBST+=  GIMP_DEBUG_TOOL_DIR="bin"
 .else
-PLIST_SUBST+=  GIMP_DEBUG_TOOL_DIR="libexec"
+PLIST_SUBST+=  GIMP_DEBUG_TOOL_DIR="libexec"
 .endif
 
 .include "options.mk"

Index: pkgsrc/graphics/gimp-docs-en/Makefile.common
diff -u pkgsrc/graphics/gimp-docs-en/Makefile.common:1.19 pkgsrc/graphics/gimp-docs-en/Makefile.common:1.20
--- pkgsrc/graphics/gimp-docs-en/Makefile.common:1.19   Mon Sep  2 13:20:17 2019
+++ pkgsrc/graphics/gimp-docs-en/Makefile.common        Sat Nov  2 22:37:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2019/09/02 13:20:17 adam Exp $
+# $NetBSD: Makefile.common,v 1.20 2019/11/02 22:37:57 rillig Exp $
 #
 # used by graphics/gimp-docs-de/Makefile
 # used by graphics/gimp-docs-en/Makefile
@@ -51,7 +51,7 @@ GNU_CONFIGURE=        yes
 
 USE_TOOLS+=    gmake msgfmt perl:build
 
-MAKE_ENV+=     DATDIR=${PREFIX}/share
+MAKE_ENV+=             DATDIR=${PREFIX}/share
 CONFIGURE_ARGS+=       --without-gimp
 
 .include "../../lang/python/tool.mk"

Index: pkgsrc/graphics/gle/Makefile
diff -u pkgsrc/graphics/gle/Makefile:1.32 pkgsrc/graphics/gle/Makefile:1.33
--- pkgsrc/graphics/gle/Makefile:1.32   Thu Jan 19 18:52:12 2017
+++ pkgsrc/graphics/gle/Makefile        Sat Nov  2 22:37:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2017/01/19 18:52:12 agc Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/02 22:37:57 rillig Exp $
 #
 
 DISTNAME=      gle-3.1.0
@@ -15,7 +15,7 @@ GNU_CONFIGURE=                YES
 USE_LIBTOOL=           YES
 LIBS+=                 -lXext
 
-BUILDLINK_DEPMETHOD.libXt?=      build
+BUILDLINK_DEPMETHOD.libXt?=    build
 
 # GLUT is used only by the examples, which aren't built or installed.
 #.include "../../graphics/glut/buildlink3.mk"

Index: pkgsrc/graphics/glu/builtin.mk
diff -u pkgsrc/graphics/glu/builtin.mk:1.16 pkgsrc/graphics/glu/builtin.mk:1.17
--- pkgsrc/graphics/glu/builtin.mk:1.16 Sun Sep  1 10:57:27 2019
+++ pkgsrc/graphics/glu/builtin.mk      Sat Nov  2 22:37:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.16 2019/09/01 10:57:27 nia Exp $
+# $NetBSD: builtin.mk,v 1.17 2019/11/02 22:37:58 rillig Exp $
 
 BUILTIN_PKG:=  glu
 
@@ -66,7 +66,7 @@ USE_BUILTIN.glu!=                                                     \
 .    endif
 .  endif  # PREFER.glu
 .endif
-MAKEVARS+=     USE_BUILTIN.glu
+MAKEVARS+=             USE_BUILTIN.glu
 
 ###
 ### The section below only applies if we are not including this file

Index: pkgsrc/graphics/go-image/buildlink3.mk
diff -u pkgsrc/graphics/go-image/buildlink3.mk:1.2 pkgsrc/graphics/go-image/buildlink3.mk:1.3
--- pkgsrc/graphics/go-image/buildlink3.mk:1.2  Sun Jan  7 13:04:14 2018
+++ pkgsrc/graphics/go-image/buildlink3.mk      Sat Nov  2 22:37:58 2019
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:14 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2019/11/02 22:37:58 rillig Exp $
 
 BUILDLINK_TREE+=       go-image
 
 .if !defined(GO_IMAGE_BUILDLINK3_MK)
 GO_IMAGE_BUILDLINK3_MK:=
 
-BUILDLINK_CONTENTS_FILTER.go-image= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-image?= build
+BUILDLINK_CONTENTS_FILTER.go-image=    ${EGREP} gopkg/
+BUILDLINK_DEPMETHOD.go-image?=         build
 
 BUILDLINK_API_DEPENDS.go-image+=       go-image>=20170405
 BUILDLINK_PKGSRCDIR.go-image?=         ../../graphics/go-image

Index: pkgsrc/graphics/gphoto2/Makefile
diff -u pkgsrc/graphics/gphoto2/Makefile:1.63 pkgsrc/graphics/gphoto2/Makefile:1.64
--- pkgsrc/graphics/gphoto2/Makefile:1.63       Tue Apr  3 06:14:54 2018
+++ pkgsrc/graphics/gphoto2/Makefile    Sat Nov  2 22:37:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2018/04/03 06:14:54 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2019/11/02 22:37:58 rillig Exp $
 
 DISTNAME=      gphoto2-2.5.8
 PKGREVISION=   1
@@ -20,7 +20,7 @@ GNU_CONFIGURE=                yes
 CONFIGURE_ARGS+=       --with-cdk-prefix=${BUILDLINK_PREFIX.cdk}
 CONFIGURE_ARGS+=       --with-jpeg-prefix=${JPEGBASE}
 
-CFLAGS.Darwin+= -D_DARWIN_C_SOURCE
+CFLAGS.Darwin+=        -D_DARWIN_C_SOURCE
 
 .include "../../devel/cdk/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"

Index: pkgsrc/graphics/gpick/Makefile
diff -u pkgsrc/graphics/gpick/Makefile:1.22 pkgsrc/graphics/gpick/Makefile:1.23
--- pkgsrc/graphics/gpick/Makefile:1.22 Mon Sep  2 13:20:17 2019
+++ pkgsrc/graphics/gpick/Makefile      Sat Nov  2 22:37:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/09/02 13:20:17 adam Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/02 22:37:58 rillig Exp $
 
 DISTNAME=      gpick-gpick-0.2.5
 PKGNAME=       ${DISTNAME:S/gpick-//}
@@ -14,7 +14,7 @@ LICENSE=      modified-bsd
 USE_LANGUAGES= c c++03
 USE_TOOLS+=    pkg-config
 
-PYTHON_VERSIONS_ACCEPTED=  27  # as of 0.2.5
+PYTHON_VERSIONS_ACCEPTED=      27      # as of 0.2.5
 
 SCONS_ARGS+=   DESTDIR=${DESTDIR}${PREFIX}
 SCONS_ARGS+=   PKGMANDIR=${PKGMANDIR}

Index: pkgsrc/graphics/graphite2/Makefile
diff -u pkgsrc/graphics/graphite2/Makefile:1.11 pkgsrc/graphics/graphite2/Makefile:1.12
--- pkgsrc/graphics/graphite2/Makefile:1.11     Wed Jul 17 09:45:13 2019
+++ pkgsrc/graphics/graphite2/Makefile  Sat Nov  2 22:37:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/07/17 09:45:13 nia Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/02 22:37:58 rillig Exp $
 
 DISTNAME=      graphite2-1.3.13
 CATEGORIES=    graphics
@@ -28,9 +28,9 @@ BUILDLINK_DEPMETHOD.freetype2?=       build
 
 # python and py-fonttools seem to be used only during test
 # uncomment the following to do so
-#TEST_TARGET=  test
+#TEST_TARGET=                  test
 #PYTHON_FOR_BUILD_ONLY?=       tool
 #.include "../../lang/python/tool.mk"
-#BUILD_DEPENDS+=       ${PYPKGPREFIX}-fonttools-[0-9]*:../../fonts/py-fonttools/
+#BUILD_DEPENDS+=               ${PYPKGPREFIX}-fonttools-[0-9]*:../../fonts/py-fonttools/
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/gtkimageview/Makefile
diff -u pkgsrc/graphics/gtkimageview/Makefile:1.44 pkgsrc/graphics/gtkimageview/Makefile:1.45
--- pkgsrc/graphics/gtkimageview/Makefile:1.44  Sun Jul 21 22:25:01 2019
+++ pkgsrc/graphics/gtkimageview/Makefile       Sat Nov  2 22:37:58 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2019/07/21 22:25:01 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2019/11/02 22:37:58 rillig Exp $
 
 DISTNAME=      gtkimageview-1.6.4
 PKGREVISION=   29
 CATEGORIES=    graphics
-#MASTER_SITES=         http://trac.bjourne.webfactional.com/chrome/common/releases/
+#MASTER_SITES= http://trac.bjourne.webfactional.com/chrome/common/releases/
 
 # This package has no NEWS, and it is very difficult to find the
 # summary of changes.  See

Index: pkgsrc/graphics/imlib/Makefile
diff -u pkgsrc/graphics/imlib/Makefile:1.126 pkgsrc/graphics/imlib/Makefile:1.127
--- pkgsrc/graphics/imlib/Makefile:1.126        Sun Jan 14 14:58:39 2018
+++ pkgsrc/graphics/imlib/Makefile      Sat Nov  2 22:37:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.126 2018/01/14 14:58:39 rillig Exp $
+# $NetBSD: Makefile,v 1.127 2019/11/02 22:37:58 rillig Exp $
 
 DISTNAME=      imlib-1.9.15
 PKGREVISION=   20
@@ -35,9 +35,9 @@ CONF_FILES+=          ${EGDIR}/im_palette-small.
 CONF_FILES+=           ${EGDIR}/im_palette-tiny.pal \
                        ${PKG_SYSCONFDIR}/im_palette-tiny.pal
 
-SUBST_CLASSES+=                imlib-config
+SUBST_CLASSES+=                        imlib-config
 SUBST_FILES.imlib-config=      imlib-config
-SUBST_SED.imlib-config=        -e 's,no --,${PREFIX}/bin/gtk-config --,'
+SUBST_SED.imlib-config=                -e 's,no --,${PREFIX}/bin/gtk-config --,'
 SUBST_STAGE.imlib-config=      post-configure
 
 # The following ensures that `imlib-config --libs' includes the correct

Index: pkgsrc/graphics/inkscape/Makefile
diff -u pkgsrc/graphics/inkscape/Makefile:1.195 pkgsrc/graphics/inkscape/Makefile:1.196
--- pkgsrc/graphics/inkscape/Makefile:1.195     Sat Oct 19 12:46:05 2019
+++ pkgsrc/graphics/inkscape/Makefile   Sat Nov  2 22:37:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.195 2019/10/19 12:46:05 nia Exp $
+# $NetBSD: Makefile,v 1.196 2019/11/02 22:37:58 rillig Exp $
 
 DISTNAME=      inkscape-0.92.4
 PKGREVISION=   7
@@ -66,10 +66,10 @@ REPLACE_PYTHON+=    share/extensions/Barcod
 REPLACE_PYTHON+=       share/extensions/ink2canvas/*.py
 REPLACE_PYTHON+=       share/extensions/test/*.test.py
 
-CHECK_INTERPRETER_SKIP+=share/inkscape/extensions/genpofiles.sh
-CHECK_INTERPRETER_SKIP+=share/inkscape/extensions/simplepath.rb
-CHECK_PORTABILITY_SKIP+=packaging/macosx/Resources/bin/inkscape
-CHECK_PORTABILITY_SKIP+=packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh
+CHECK_INTERPRETER_SKIP+=       share/inkscape/extensions/genpofiles.sh
+CHECK_INTERPRETER_SKIP+=       share/inkscape/extensions/simplepath.rb
+CHECK_PORTABILITY_SKIP+=       packaging/macosx/Resources/bin/inkscape
+CHECK_PORTABILITY_SKIP+=       packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh
 
 .include "options.mk"
 

Index: pkgsrc/graphics/jpeg2ps/Makefile
diff -u pkgsrc/graphics/jpeg2ps/Makefile:1.18 pkgsrc/graphics/jpeg2ps/Makefile:1.19
--- pkgsrc/graphics/jpeg2ps/Makefile:1.18       Wed Aug 16 20:45:39 2017
+++ pkgsrc/graphics/jpeg2ps/Makefile    Sat Nov  2 22:37:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2017/08/16 20:45:39 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/02 22:37:59 rillig Exp $
 #
 
 DISTNAME=      jpeg2ps-1.9
@@ -8,7 +8,7 @@ MASTER_SITES=   http://www.pdflib.com/file
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 #HOMEPAGE=     http://www.pdflib.com/download/free-software/jpeg2ps/
 COMMENT=       Convert jpeg images to PostScript level 2 or 3
-LICENSE=               jpeg2ps-license
+LICENSE=       jpeg2ps-license
 
 RESTRICTED=            may not be sold or bundled with any commercial package
 NO_SRC_ON_CDROM=       ${RESTRICTED}

Index: pkgsrc/graphics/libbpg/Makefile
diff -u pkgsrc/graphics/libbpg/Makefile:1.3 pkgsrc/graphics/libbpg/Makefile:1.4
--- pkgsrc/graphics/libbpg/Makefile:1.3 Thu May 23 19:23:02 2019
+++ pkgsrc/graphics/libbpg/Makefile     Sat Nov  2 22:37:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/05/23 19:23:02 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/02 22:37:59 rillig Exp $
 
 DISTNAME=      libbpg-0.9.2
 CATEGORIES=    graphics
@@ -14,10 +14,10 @@ USE_LANGUAGES+=     c c++
 
 AUTO_MKDIRS=   yes
 
-SUBST_CLASSES+= config
-SUBST_MESSAGE.config= config.h file substitutions
-SUBST_STAGE.config= pre-configure
-SUBST_FILES.config= config.h
+SUBST_CLASSES+=                config
+SUBST_MESSAGE.config=  config.h file substitutions
+SUBST_STAGE.config=    pre-configure
+SUBST_FILES.config=    config.h
 SUBST_VARS.config=     PREFIX
 
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/graphics/libcaca/options.mk
diff -u pkgsrc/graphics/libcaca/options.mk:1.5 pkgsrc/graphics/libcaca/options.mk:1.6
--- pkgsrc/graphics/libcaca/options.mk:1.5      Mon Feb 24 16:14:58 2014
+++ pkgsrc/graphics/libcaca/options.mk  Sat Nov  2 22:37:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2014/02/24 16:14:58 joerg Exp $
+# $NetBSD: options.mk,v 1.6 2019/11/02 22:37:59 rillig Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.libcaca
 PKG_SUPPORTED_OPTIONS=         imlib2
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=      --disable-slang
 CONFIGURE_ARGS+=       --enable-x11
 .  if ${X11_TYPE} == "modular"
 CONFIGURE_ARGS+=       --x-libraries=${BUILDLINK_PREFIX.libX11}/lib
-.endif
+.  endif
 .else
 CONFIGURE_ARGS+=       --disable-x11
 .endif

Index: pkgsrc/graphics/libgdiplus/Makefile
diff -u pkgsrc/graphics/libgdiplus/Makefile:1.79 pkgsrc/graphics/libgdiplus/Makefile:1.80
--- pkgsrc/graphics/libgdiplus/Makefile:1.79    Wed Sep 11 18:13:27 2019
+++ pkgsrc/graphics/libgdiplus/Makefile Sat Nov  2 22:37:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2019/09/11 18:13:27 nia Exp $
+# $NetBSD: Makefile,v 1.80 2019/11/02 22:37:59 rillig Exp $
 
 DISTNAME=      libgdiplus-6.0.2
 CATEGORIES=    graphics
@@ -19,8 +19,8 @@ PKGCONFIG_OVERRIDE+=  cairo/src/cairo-bac
 GNU_CONFIGURE=         yes
 
 BUILDLINK_API_DEPENDS.freetype2+=      freetype2>=2.1.5
-BUILDLINK_API_DEPENDS.Xft2+=   Xft2>=2.1.2
-BUILDLINK_API_DEPENDS.Xrender+=        Xrender>=0.8
+BUILDLINK_API_DEPENDS.Xft2+=           Xft2>=2.1.2
+BUILDLINK_API_DEPENDS.Xrender+=                Xrender>=0.8
 
 BUILDLINK_TRANSFORM+=          rm:-Werror
 

Index: pkgsrc/graphics/libjpeg-turbo/Makefile
diff -u pkgsrc/graphics/libjpeg-turbo/Makefile:1.15 pkgsrc/graphics/libjpeg-turbo/Makefile:1.16
--- pkgsrc/graphics/libjpeg-turbo/Makefile:1.15 Mon Aug 13 20:50:59 2018
+++ pkgsrc/graphics/libjpeg-turbo/Makefile      Sat Nov  2 22:37:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/08/13 20:50:59 gdt Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/02 22:37:59 rillig Exp $
 
 DISTNAME=      libjpeg-turbo-1.5.3
 CATEGORIES=    graphics
@@ -18,12 +18,12 @@ CONFLICTS=  jpeg-[0-9]*
 BUILD_DEPENDS+=        nasm-[0-9]*:../../devel/nasm
 .endif
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 # Ask for compatibility with jpeg 8, to get the highest ABI that
 # libjpeg-turbo supports.
-CONFIGURE_ARGS+= --with-jpeg8
-USE_LIBTOOL=   yes
-USE_LANGUAGES= c c++
+CONFIGURE_ARGS+=       --with-jpeg8
+USE_LIBTOOL=           yes
+USE_LANGUAGES=         c c++
 
 PKGCONFIG_OVERRIDE=    release/libturbojpeg.pc.in release/libjpeg.pc.in
 

Index: pkgsrc/graphics/libkdcraw/Makefile
diff -u pkgsrc/graphics/libkdcraw/Makefile:1.67 pkgsrc/graphics/libkdcraw/Makefile:1.68
--- pkgsrc/graphics/libkdcraw/Makefile:1.67     Thu Aug 22 12:23:20 2019
+++ pkgsrc/graphics/libkdcraw/Makefile  Sat Nov  2 22:37:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2019/08/22 12:23:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.68 2019/11/02 22:37:59 rillig Exp $
 
 DISTNAME=      libkdcraw-15.08.3
 PKGREVISION=   12
@@ -8,7 +8,7 @@ MASTER_SITES=   ${MASTER_SITE_KDE:=applica
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
-PKGCONFIG_OVERRIDE+=    libkdcraw.pc.cmake
+PKGCONFIG_OVERRIDE+=   libkdcraw.pc.cmake
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 

Index: pkgsrc/graphics/libkexiv2/Makefile
diff -u pkgsrc/graphics/libkexiv2/Makefile:1.73 pkgsrc/graphics/libkexiv2/Makefile:1.74
--- pkgsrc/graphics/libkexiv2/Makefile:1.73     Thu Aug 22 12:23:20 2019
+++ pkgsrc/graphics/libkexiv2/Makefile  Sat Nov  2 22:37:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2019/08/22 12:23:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.74 2019/11/02 22:37:59 rillig Exp $
 #
 
 DISTNAME=      libkexiv2-15.08.3
@@ -9,7 +9,7 @@ MASTER_SITES=   ${MASTER_SITE_KDE:=applica
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
-PKGCONFIG_OVERRIDE+=    libkexiv2.pc.cmake
+PKGCONFIG_OVERRIDE+=   libkexiv2.pc.cmake
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 

Index: pkgsrc/graphics/libkipi/Makefile
diff -u pkgsrc/graphics/libkipi/Makefile:1.79 pkgsrc/graphics/libkipi/Makefile:1.80
--- pkgsrc/graphics/libkipi/Makefile:1.79       Thu Aug 22 12:23:20 2019
+++ pkgsrc/graphics/libkipi/Makefile    Sat Nov  2 22:37:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2019/08/22 12:23:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.80 2019/11/02 22:37:59 rillig Exp $
 
 DISTNAME=      libkipi-15.08.3
 PKGREVISION=   9
@@ -8,7 +8,7 @@ MASTER_SITES=   ${MASTER_SITE_KDE:=applica
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
-PKGCONFIG_OVERRIDE+=    libkipi.pc.cmake
+PKGCONFIG_OVERRIDE+=   libkipi.pc.cmake
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 

Index: pkgsrc/graphics/libksane/Makefile
diff -u pkgsrc/graphics/libksane/Makefile:1.43 pkgsrc/graphics/libksane/Makefile:1.44
--- pkgsrc/graphics/libksane/Makefile:1.43      Thu Aug 22 12:23:20 2019
+++ pkgsrc/graphics/libksane/Makefile   Sat Nov  2 22:38:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/08/22 12:23:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.44 2019/11/02 22:38:00 rillig Exp $
 
 DISTNAME=      libksane-15.08.3
 PKGREVISION=   12
@@ -8,7 +8,7 @@ MASTER_SITES=   ${MASTER_SITE_KDE:=applica
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
-PKGCONFIG_OVERRIDE+=    libksane.pc.cmake
+PKGCONFIG_OVERRIDE+=   libksane.pc.cmake
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 

Index: pkgsrc/graphics/libraw013/Makefile
diff -u pkgsrc/graphics/libraw013/Makefile:1.4 pkgsrc/graphics/libraw013/Makefile:1.5
--- pkgsrc/graphics/libraw013/Makefile:1.4      Wed Jul 18 00:06:19 2018
+++ pkgsrc/graphics/libraw013/Makefile  Sat Nov  2 22:38:00 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/07/18 00:06:19 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/02 22:38:00 rillig Exp $
 #
 
-DISTNAME=              LibRaw-0.13.8
-PKGNAME=               ${DISTNAME:tl}
-CATEGORIES=            graphics
+DISTNAME=      LibRaw-0.13.8
+PKGNAME=       ${DISTNAME:tl}
+CATEGORIES=    graphics
 MASTER_SITES=  https://www.libraw.org/data/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -13,7 +13,7 @@ LICENSE=      gnu-lgpl-v2.1 OR cddl-1.0
 
 USE_LANGUAGES= c c++03
 GNU_CONFIGURE= yes
-USE_TOOLS+=            pkg-config gmake
+USE_TOOLS+=    pkg-config gmake
 USE_LIBTOOL=   yes
 MAKE_JOBS_SAFE=        no
 

Index: pkgsrc/graphics/librsvg/buildlink3.mk
diff -u pkgsrc/graphics/librsvg/buildlink3.mk:1.54 pkgsrc/graphics/librsvg/buildlink3.mk:1.55
--- pkgsrc/graphics/librsvg/buildlink3.mk:1.54  Fri Oct  4 13:40:08 2019
+++ pkgsrc/graphics/librsvg/buildlink3.mk       Sat Nov  2 22:38:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.54 2019/10/04 13:40:08 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.55 2019/11/02 22:38:00 rillig Exp $
 
 BUILDLINK_TREE+=       librsvg
 
@@ -12,15 +12,15 @@ BUILDLINK_API_DEPENDS.librsvg+=             librsvg
 .include "../../graphics/librsvg/available.mk"
 
 .if ${LIBRSVG_TYPE} == "rust"
-BUILDLINK_PKGSRCDIR.librsvg?=          ../../graphics/librsvg
-BUILDLINK_API_DEPENDS.librsvg+=                librsvg>=2.41
-BUILDLINK_ABI_DEPENDS.librsvg+=                librsvg>=2.44.14nb2
+BUILDLINK_PKGSRCDIR.librsvg?=  ../../graphics/librsvg
+BUILDLINK_API_DEPENDS.librsvg+=        librsvg>=2.41
+BUILDLINK_ABI_DEPENDS.librsvg+=        librsvg>=2.44.14nb2
 .elif ${LIBRSVG_TYPE} == "c"
-BUILDLINK_PKGSRCDIR.librsvg?=          ../../graphics/librsvg-c
-BUILDLINK_API_DEPENDS.librsvg+=                librsvg<2.41
-BUILDLINK_ABI_DEPENDS.librsvg+=                librsvg>=2.40.20nb4
+BUILDLINK_PKGSRCDIR.librsvg?=  ../../graphics/librsvg-c
+BUILDLINK_API_DEPENDS.librsvg+=        librsvg<2.41
+BUILDLINK_ABI_DEPENDS.librsvg+=        librsvg>=2.40.20nb4
 .else
-PKG_FAIL_REASON+=       "[graphics/librsvg/buildlink3.mk] Invalid value ${LIBRSVG_TYPE} for LIBRSVG_TYPE."
+PKG_FAIL_REASON+=              "[graphics/librsvg/buildlink3.mk] Invalid value ${LIBRSVG_TYPE} for LIBRSVG_TYPE."
 .endif
 
 .include "../../devel/pango/buildlink3.mk"

Index: pkgsrc/graphics/libscigraphica/Makefile
diff -u pkgsrc/graphics/libscigraphica/Makefile:1.53 pkgsrc/graphics/libscigraphica/Makefile:1.54
--- pkgsrc/graphics/libscigraphica/Makefile:1.53        Mon Sep  2 13:20:17 2019
+++ pkgsrc/graphics/libscigraphica/Makefile     Sat Nov  2 22:38:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2019/09/02 13:20:17 adam Exp $
+# $NetBSD: Makefile,v 1.54 2019/11/02 22:38:00 rillig Exp $
 
 DISTNAME=      libscigraphica-2.1.1
 PKGREVISION=   36
@@ -15,8 +15,8 @@ USE_LIBTOOL=          yes
 USE_TOOLS+=            pkg-config gmake intltool
 GNU_CONFIGURE=         yes
 
-PKGCONFIG_OVERRIDE+=   libscigraphica-2.0.pc.in
-PYTHON_VERSIONS_ACCEPTED=       27 # py-numarray
+PKGCONFIG_OVERRIDE+=           libscigraphica-2.0.pc.in
+PYTHON_VERSIONS_ACCEPTED=      27 # py-numarray
 
 pre-configure:
        ln -s ${PYTHONBIN} ${TOOLS_DIR}/bin/python

Index: pkgsrc/graphics/libwmf/hacks.mk
diff -u pkgsrc/graphics/libwmf/hacks.mk:1.2 pkgsrc/graphics/libwmf/hacks.mk:1.3
--- pkgsrc/graphics/libwmf/hacks.mk:1.2 Tue Oct 16 23:48:59 2007
+++ pkgsrc/graphics/libwmf/hacks.mk     Sat Nov  2 22:38:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2007/10/16 23:48:59 tnn Exp $
+# $NetBSD: hacks.mk,v 1.3 2019/11/02 22:38:00 rillig Exp $
 
 .if !defined(LIBEXIF_HACKS_MK)
 LIBEXIF_HACKS_MK=      # defined
@@ -10,7 +10,7 @@ LIBEXIF_HACKS_MK=     # defined
 .if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
 PKG_HACKS+=            sys_types_h-inttypes_h-conflict
 post-wrapper:
-               ${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
+       ${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
 # should match int8_t, int16_t, and int32_t (only)
 .endif
 

Index: pkgsrc/graphics/magicpoint/options.mk
diff -u pkgsrc/graphics/magicpoint/options.mk:1.2 pkgsrc/graphics/magicpoint/options.mk:1.3
--- pkgsrc/graphics/magicpoint/options.mk:1.2   Fri Feb 25 17:02:53 2011
+++ pkgsrc/graphics/magicpoint/options.mk       Sat Nov  2 22:38:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2011/02/25 17:02:53 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/02 22:38:00 rillig Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -28,9 +28,9 @@ CONFIGURE_ARGS+=      --disable-vflib
 
 .if !empty(PKG_OPTIONS:Mxft2)
 CONFIGURE_ARGS+=       --enable-xft2
-MGP_XFONT=     # empty
-MGP_TFONT=     % %
-MGP_VFONT=     % %
+MGP_XFONT=             # empty
+MGP_TFONT=             % %
+MGP_VFONT=             % %
 
 .include "../../x11/libXft/buildlink3.mk"
 .else

Index: pkgsrc/graphics/mpgtx/Makefile
diff -u pkgsrc/graphics/mpgtx/Makefile:1.17 pkgsrc/graphics/mpgtx/Makefile:1.18
--- pkgsrc/graphics/mpgtx/Makefile:1.17 Sun Jan 14 14:58:39 2018
+++ pkgsrc/graphics/mpgtx/Makefile      Sat Nov  2 22:38:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/01/14 14:58:39 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/02 22:38:00 rillig Exp $
 #
 
 DISTNAME=      mpgtx-1.3.1
@@ -9,10 +9,10 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://mpgtx.sourceforge.net/
 COMMENT=       Split and join MPEG files in various ways
 
-HAS_CONFIGURE= yes
+HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX}      \
                        --manprefix=${PREFIX}
-USE_LANGUAGES= c c++
+USE_LANGUAGES=         c c++
 
 BUILD_TARGET=  mpgtx
 PLINKS=                mpgjoin mpgcat mpgsplit mpginfo mpgdemux tagmp3

Index: pkgsrc/graphics/mypaint/Makefile
diff -u pkgsrc/graphics/mypaint/Makefile:1.41 pkgsrc/graphics/mypaint/Makefile:1.42
--- pkgsrc/graphics/mypaint/Makefile:1.41       Mon Sep  2 13:20:18 2019
+++ pkgsrc/graphics/mypaint/Makefile    Sat Nov  2 22:38:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2019/09/02 13:20:18 adam Exp $
+# $NetBSD: Makefile,v 1.42 2019/11/02 22:38:00 rillig Exp $
 
 DISTNAME=      mypaint-1.2.1
 PKGREVISION=   4
@@ -22,7 +22,7 @@ USE_LANGUAGES=        c c++
 
 USE_TOOLS+=    bash:run msgfmt pkg-config
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2
+PYTHON_VERSIONS_ACCEPTED=      27 # py-gtk2
 
 USE_PKGLOCALEDIR=      yes
 

Index: pkgsrc/graphics/ncview/Makefile
diff -u pkgsrc/graphics/ncview/Makefile:1.42 pkgsrc/graphics/ncview/Makefile:1.43
--- pkgsrc/graphics/ncview/Makefile:1.42        Thu Aug 22 12:23:21 2019
+++ pkgsrc/graphics/ncview/Makefile     Sat Nov  2 22:38:01 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2019/08/22 12:23:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2019/11/02 22:38:01 rillig Exp $
 
-DISTNAME=              ncview-1.92d
+DISTNAME=      ncview-1.92d
 PKGREVISION=   18
-CATEGORIES=            graphics
-MASTER_SITES=          ftp://cirrus.ucsd.edu/pub/ncview/
+CATEGORIES=    graphics
+MASTER_SITES=  ftp://cirrus.ucsd.edu/pub/ncview/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://meteora.ucsd.edu/~pierce/ncview_home_page.html

Index: pkgsrc/graphics/nvtv/Makefile
diff -u pkgsrc/graphics/nvtv/Makefile:1.43 pkgsrc/graphics/nvtv/Makefile:1.44
--- pkgsrc/graphics/nvtv/Makefile:1.43  Sun Jul 21 22:25:02 2019
+++ pkgsrc/graphics/nvtv/Makefile       Sat Nov  2 22:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/07/21 22:25:02 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2019/11/02 22:38:01 rillig Exp $
 
 DISTNAME=      nvtv-0.4.7
 PKGREVISION=   35
@@ -12,13 +12,13 @@ COMMENT=    Tool to manipulate TV-Out setti
 ONLY_FOR_PLATFORM=     *-*-i386        # uses iopl()
 ONLY_FOR_PLATFORM+=    *-*-x86_64      # may not build without some hacking
 NOT_FOR_PLATFORM+=     NetBSD-*-x86_64 # lack of x86_64_[gs]_set_ioperm.
-CONFLICTS=     nvtv-gtk2-[0-9]*
+CONFLICTS=             nvtv-gtk2-[0-9]*
 
 USE_TOOLS+=            pkg-config
 GNU_CONFIGURE=         YES
 RCD_SCRIPTS=           nvtvd
 
-INSTALLATION_DIRS+= share/doc/nvtv
+INSTALLATION_DIRS+=    share/doc/nvtv
 
 post-patch:
        ${CP} ${WRKSRC}/man/nvtv.1x ${WRKSRC}/man/nvtv.1

Index: pkgsrc/graphics/oxygen-icons/Makefile
diff -u pkgsrc/graphics/oxygen-icons/Makefile:1.34 pkgsrc/graphics/oxygen-icons/Makefile:1.35
--- pkgsrc/graphics/oxygen-icons/Makefile:1.34  Tue Aug 27 21:22:59 2019
+++ pkgsrc/graphics/oxygen-icons/Makefile       Sat Nov  2 22:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/08/27 21:22:59 markd Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/02 22:38:01 rillig Exp $
 
 DISTNAME=      oxygen-icons5-5.61.0
 PKGNAME=       ${DISTNAME:S/5//}
@@ -11,8 +11,8 @@ HOMEPAGE=     http://www.oxygen-icons.org/
 COMMENT=       Oxygen icon set for the KDE integrated X11 desktop
 LICENSE=       gnu-lgpl-v3
 
-BUILD_DEPENDS+= extra-cmake-modules>=5.61.0:../../devel/extra-cmake-modules
-TOOLS_DEPENDS.cmake= cmake>=3.0:../../devel/cmake
+BUILD_DEPENDS+=                extra-cmake-modules>=5.61.0:../../devel/extra-cmake-modules
+TOOLS_DEPENDS.cmake=   cmake>=3.0:../../devel/cmake
 
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++

Index: pkgsrc/graphics/p5-GDGraph-boxplot/Makefile
diff -u pkgsrc/graphics/p5-GDGraph-boxplot/Makefile:1.15 pkgsrc/graphics/p5-GDGraph-boxplot/Makefile:1.16
--- pkgsrc/graphics/p5-GDGraph-boxplot/Makefile:1.15    Sun Aug 11 13:21:13 2019
+++ pkgsrc/graphics/p5-GDGraph-boxplot/Makefile Sat Nov  2 22:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/08/11 13:21:13 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/02 22:38:01 rillig Exp $
 
 DISTNAME=      GDGraph-boxplot-1.00
 PKGNAME=       p5-${DISTNAME}
@@ -11,8 +11,8 @@ HOMEPAGE=     https://metacpan.org/release/G
 COMMENT=       Boxplot - Box and Whisker Graph Module for Perl 5
 LICENSE=       ${PERL5_LICENSE}
 
-DEPENDS+= p5-GDGraph>=1.30:../../graphics/p5-GDGraph
-DEPENDS+= p5-Statistics-Descriptive>=2.4:../../math/p5-Statistics-Descriptive
+DEPENDS+=      p5-GDGraph>=1.30:../../graphics/p5-GDGraph
+DEPENDS+=      p5-Statistics-Descriptive>=2.4:../../math/p5-Statistics-Descriptive
 
 PERL5_PACKLIST=                auto/GD/Graph/boxplot/.packlist
 

Index: pkgsrc/graphics/p5-clutter/Makefile
diff -u pkgsrc/graphics/p5-clutter/Makefile:1.41 pkgsrc/graphics/p5-clutter/Makefile:1.42
--- pkgsrc/graphics/p5-clutter/Makefile:1.41    Sun Aug 11 13:21:16 2019
+++ pkgsrc/graphics/p5-clutter/Makefile Sat Nov  2 22:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2019/08/11 13:21:16 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2019/11/02 22:38:01 rillig Exp $
 #
 
 DISTNAME=      Clutter-1.110
@@ -13,11 +13,11 @@ COMMENT=    Perl interface to the 1.x serie
 LICENSE=       gnu-lgpl-v2.1
 
 #BUILD_DEPENDS+=       {perl>=5.8.8,p5-ExtUtils-MakeMaker>=6.30}:../../devel/p5-ExtUtils-MakeMaker
-DEPENDS+=      p5-glib2>=1.253:../../devel/p5-glib2
-DEPENDS+=      p5-cairo-gobject>=1.000:../../graphics/p5-cairo-gobject
-DEPENDS+=      p5-Glib-Object-Introspection>=0.002:../../devel/p5-Glib-Object-Introspection
-DEPENDS+=      p5-pango>=1.220:../../devel/p5-pango
-DEPENDS+=      clutter>=1.0:../../graphics/clutter
+DEPENDS+=              p5-glib2>=1.253:../../devel/p5-glib2
+DEPENDS+=              p5-cairo-gobject>=1.000:../../graphics/p5-cairo-gobject
+DEPENDS+=              p5-Glib-Object-Introspection>=0.002:../../devel/p5-Glib-Object-Introspection
+DEPENDS+=              p5-pango>=1.220:../../devel/p5-pango
+DEPENDS+=              clutter>=1.0:../../graphics/clutter
 
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= # empty

Index: pkgsrc/graphics/paper-icon-theme/Makefile
diff -u pkgsrc/graphics/paper-icon-theme/Makefile:1.12 pkgsrc/graphics/paper-icon-theme/Makefile:1.13
--- pkgsrc/graphics/paper-icon-theme/Makefile:1.12      Sun Jul 21 22:25:03 2019
+++ pkgsrc/graphics/paper-icon-theme/Makefile   Sat Nov  2 22:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/07/21 22:25:03 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 22:38:01 rillig Exp $
 
 DISTNAME=      paper-icon-theme-1.3.2
 PKGREVISION=   10
@@ -22,7 +22,7 @@ SUBST_FILES.configure=        configure.ac
 SUBST_SED.configure=   -e 's,/usr/local,${PREFIX},'
 
 pre-configure:
-               cd ${WRKSRC} && ./autogen.sh
+       cd ${WRKSRC} && ./autogen.sh
 
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

Index: pkgsrc/graphics/png/hacks.mk
diff -u pkgsrc/graphics/png/hacks.mk:1.4 pkgsrc/graphics/png/hacks.mk:1.5
--- pkgsrc/graphics/png/hacks.mk:1.4    Mon Dec 15 11:46:35 2014
+++ pkgsrc/graphics/png/hacks.mk        Sat Nov  2 22:38:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.4 2014/12/15 11:46:35 jperkin Exp $
+# $NetBSD: hacks.mk,v 1.5 2019/11/02 22:38:01 rillig Exp $
 
 .if !defined(PNG_HACKS_MK)
 PNG_HACKS_MK=  defined
@@ -12,7 +12,7 @@ PNG_HACKS_MK= defined
 # XXX: is there any good way to replace the default -O2 with multiple args?
 #PKG_HACKS+=           optimisation
 #BUILDLINK_TRANSFORM+= opt:-O[2-9]*:-O2 -fno-ipa-sra
-CFLAGS+=-O2 -fno-ipa-sra
+CFLAGS+=               -O2 -fno-ipa-sra
 .endif
 
 .endif # PNG_HACKS_MK

Index: pkgsrc/graphics/povray/Makefile
diff -u pkgsrc/graphics/povray/Makefile:1.56 pkgsrc/graphics/povray/Makefile:1.57
--- pkgsrc/graphics/povray/Makefile:1.56        Sun Jan 14 14:58:39 2018
+++ pkgsrc/graphics/povray/Makefile     Sat Nov  2 22:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2018/01/14 14:58:39 rillig Exp $
+# $NetBSD: Makefile,v 1.57 2019/11/02 22:38:02 rillig Exp $
 
 DISTNAME=      povray-3.6.1
 PKGREVISION=   15
@@ -30,9 +30,9 @@ GCC_REQD+=    3.4
 PLIST_SUBST+=  POVRAY=povray-3.6
 
 PKG_SYSCONFSUBDIR=     povray/3.6
-EGDIR=         ${PREFIX}/share/examples/povray
-CONF_FILES=    ${EGDIR}/povray.conf ${PKG_SYSCONFDIR}/povray.conf
-CONF_FILES+=   ${EGDIR}/povray.ini ${PKG_SYSCONFDIR}/povray.ini
+EGDIR=                 ${PREFIX}/share/examples/povray
+CONF_FILES=            ${EGDIR}/povray.conf ${PKG_SYSCONFDIR}/povray.conf
+CONF_FILES+=           ${EGDIR}/povray.ini ${PKG_SYSCONFDIR}/povray.ini
 
 INSTALLATION_DIRS=     share/povray-3.6/scripts
 

Index: pkgsrc/graphics/pstoedit/Makefile
diff -u pkgsrc/graphics/pstoedit/Makefile:1.99 pkgsrc/graphics/pstoedit/Makefile:1.100
--- pkgsrc/graphics/pstoedit/Makefile:1.99      Sun Jul 21 22:25:03 2019
+++ pkgsrc/graphics/pstoedit/Makefile   Sat Nov  2 22:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2019/07/21 22:25:03 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2019/11/02 22:38:02 rillig Exp $
 
 DISTNAME=      pstoedit-3.70
 PKGREVISION=   15
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=      --without-emf
 CONFIGURE_ENV+=                CXXFLAGS="${CFLAGS} -Dunix"
 CONFIGURE_ENV+=                ac_cv_path_GS=${TOOLS_PATH.gs}
 
-GNU_CONFIGURE_LIBSUBDIR=pstoedit       # plugin dir -- unused for now
+GNU_CONFIGURE_LIBSUBDIR=       pstoedit        # plugin dir -- unused for now
 #BUILD_TARGET=
 
 LIBS.SunOS+=   -ldl

Index: pkgsrc/graphics/py-chart/Makefile
diff -u pkgsrc/graphics/py-chart/Makefile:1.10 pkgsrc/graphics/py-chart/Makefile:1.11
--- pkgsrc/graphics/py-chart/Makefile:1.10      Mon Sep  2 13:20:18 2019
+++ pkgsrc/graphics/py-chart/Makefile   Sat Nov  2 22:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/09/02 13:20:18 adam Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/02 22:38:02 rillig Exp $
 
 DISTNAME=      PyChart-1.39
 PKGNAME=       ${PYPKGPREFIX}-chart-1.39
@@ -10,7 +10,7 @@ HOMEPAGE=     https://wiki.python.org/moin/P
 COMMENT=       Create high quality Encapsulated Postscript, PDF, or PNG charts
 LICENSE=       gnu-gpl-v2
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/py-goocanvas/Makefile
diff -u pkgsrc/graphics/py-goocanvas/Makefile:1.54 pkgsrc/graphics/py-goocanvas/Makefile:1.55
--- pkgsrc/graphics/py-goocanvas/Makefile:1.54  Mon Sep  2 13:20:17 2019
+++ pkgsrc/graphics/py-goocanvas/Makefile       Sat Nov  2 22:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2019/09/02 13:20:17 adam Exp $
+# $NetBSD: Makefile,v 1.55 2019/11/02 22:38:02 rillig Exp $
 
 DISTNAME=      pygoocanvas-0.14.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+=  pygoocanvas.pc.in
 CONFIGURE_ARGS+=       --disable-docs
 
 PY_PATCHPLIST= yes
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
 
 .include "../../lang/python/pyversion.mk"
 

Index: pkgsrc/graphics/py-gtkglext/Makefile
diff -u pkgsrc/graphics/py-gtkglext/Makefile:1.52 pkgsrc/graphics/py-gtkglext/Makefile:1.53
--- pkgsrc/graphics/py-gtkglext/Makefile:1.52   Mon Sep  2 13:20:17 2019
+++ pkgsrc/graphics/py-gtkglext/Makefile        Sat Nov  2 22:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/09/02 13:20:17 adam Exp $
+# $NetBSD: Makefile,v 1.53 2019/11/02 22:38:02 rillig Exp $
 
 DISTNAME=      pygtkglext-1.1.0
 PKGNAME=       ${PYPKGPREFIX}-pygtkglext-1.1.0
@@ -16,7 +16,7 @@ CONFIGURE_ENV+=       PYTHON=${PYTHONBIN}
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config
 PYDISTUTILSPKG=        yes
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
 
 PKGCONFIG_OVERRIDE+=   pygtkglext.pc.in
 

Index: pkgsrc/graphics/py-leather/Makefile
diff -u pkgsrc/graphics/py-leather/Makefile:1.1 pkgsrc/graphics/py-leather/Makefile:1.2
--- pkgsrc/graphics/py-leather/Makefile:1.1     Sun Jul  7 09:38:40 2019
+++ pkgsrc/graphics/py-leather/Makefile Sat Nov  2 22:38:02 2019
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2019/07/07 09:38:40 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 22:38:02 rillig Exp $
 
-DISTNAME=               leather-0.3.3
-PKGNAME=                ${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=             python graphics
-MASTER_SITES=           ${MASTER_SITE_PYPI:=l/leather/}
+DISTNAME=              leather-0.3.3
+PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=            python graphics
+MASTER_SITES=          ${MASTER_SITE_PYPI:=l/leather/}
 
-MAINTAINER=             pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=               https://leather.readthedocs.io/
-COMMENT=                Python charting library for those who need charts now
-LICENSE=                mit
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=              https://leather.readthedocs.io/
+COMMENT=               Python charting library for those who need charts now
+LICENSE=               mit
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"

Index: pkgsrc/graphics/py-mcomix/Makefile
diff -u pkgsrc/graphics/py-mcomix/Makefile:1.17 pkgsrc/graphics/py-mcomix/Makefile:1.18
--- pkgsrc/graphics/py-mcomix/Makefile:1.17     Mon Sep  2 13:20:19 2019
+++ pkgsrc/graphics/py-mcomix/Makefile  Sat Nov  2 22:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/09/02 13:20:19 adam Exp $
+# $NetBSD: Makefile,v 1.18 2019/11/02 22:38:02 rillig Exp $
 
 DISTNAME=      mcomix-1.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -20,7 +20,7 @@ DEPENDS+=     ${PYPKGPREFIX}-sqlite3>=0:../.
 
 USE_LANGUAGES= # none
 
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
 EGG_NAME=      ${DISTNAME:S/01/1/}
 
 PYTHON_SELF_CONFLICT=  yes

Index: pkgsrc/graphics/py-openexr/Makefile
diff -u pkgsrc/graphics/py-openexr/Makefile:1.5 pkgsrc/graphics/py-openexr/Makefile:1.6
--- pkgsrc/graphics/py-openexr/Makefile:1.5     Wed Oct  3 10:42:56 2018
+++ pkgsrc/graphics/py-openexr/Makefile Sat Nov  2 22:38:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/10/03 10:42:56 adam Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/02 22:38:02 rillig Exp $
 
 DISTNAME=      OpenEXR-1.3.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -17,7 +17,7 @@ SUBST_MESSAGE.fix-path=       Fixing paths.
 SUBST_STAGE.fix-path=  pre-configure
 SUBST_FILES.fix-path=  setup.py
 SUBST_SED.fix-path=    -e 's,/usr/include/OpenEXR,${BUILDLINK_PREFIX.openexr}/include/OpenEXR,'
-SUBST_SED.fix-path+=    -e 's,/usr/local/lib,${BUILDLINK_PREFIX.openexr}/lib,'
+SUBST_SED.fix-path+=   -e 's,/usr/local/lib,${BUILDLINK_PREFIX.openexr}/lib,'
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"

Index: pkgsrc/graphics/py-piddle/Makefile
diff -u pkgsrc/graphics/py-piddle/Makefile:1.22 pkgsrc/graphics/py-piddle/Makefile:1.23
--- pkgsrc/graphics/py-piddle/Makefile:1.22     Mon Sep  2 13:20:16 2019
+++ pkgsrc/graphics/py-piddle/Makefile  Sat Nov  2 22:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/09/02 13:20:16 adam Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/02 22:38:03 rillig Exp $
 
 DISTNAME=      piddle-1.0.15
 PKGREVISION=   3
@@ -12,7 +12,7 @@ COMMENT=      Python Plug In Drawing, Does Li
 
 USE_LANGUAGES= # empty
 
-PYTHON_VERSIONS_ACCEPTED=       27
+PYTHON_VERSIONS_ACCEPTED=      27
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/py-pycha/Makefile
diff -u pkgsrc/graphics/py-pycha/Makefile:1.18 pkgsrc/graphics/py-pycha/Makefile:1.19
--- pkgsrc/graphics/py-pycha/Makefile:1.18      Mon Sep  2 13:20:17 2019
+++ pkgsrc/graphics/py-pycha/Makefile   Sat Nov  2 22:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/09/02 13:20:17 adam Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/02 22:38:03 rillig Exp $
 
 DISTNAME=      pycha-0.7.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -8,15 +8,15 @@ MASTER_SITES= ${MASTER_SITE_PYPI:=p/pych
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://bitbucket.org/lgs/pycha/
 COMMENT=       Library for making charts with Python
-LICENSE=       gnu-lgpl-v3
+LICENSE=       gnu-lgpl-v3
 
 DEPENDS+=      ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
 DEPENDS+=      ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
 USE_LANGUAGES= #none
 
-PYTHON_SELF_CONFLICT=  yes
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2
+PYTHON_SELF_CONFLICT=          yes
+PYTHON_VERSIONS_ACCEPTED=      27 # py-gtk2
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/py-uniconvertor/Makefile
diff -u pkgsrc/graphics/py-uniconvertor/Makefile:1.16 pkgsrc/graphics/py-uniconvertor/Makefile:1.17
--- pkgsrc/graphics/py-uniconvertor/Makefile:1.16       Mon Sep  2 13:20:18 2019
+++ pkgsrc/graphics/py-uniconvertor/Makefile    Sat Nov  2 22:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/09/02 13:20:18 adam Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 22:38:03 rillig Exp $
 
 DISTNAME=      uniconvertor-1.1.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,11 +13,11 @@ LICENSE=    gnu-lgpl-v2 AND gnu-gpl-v2
 
 DEPENDS+=      ${PYPKGPREFIX}-sk1libs-[0-9]*:../../graphics/py-sk1libs
 
-USE_LANGUAGES=         c
-PYDISTUTILSPKG=                yes
-PYTHON_SELF_CONFLICT=  yes
-PYTHON_VERSIONS_ACCEPTED=       27 # py-sk1libs
-REPLACE_PYTHON+=       src/__init__.py
+USE_LANGUAGES=                 c
+PYDISTUTILSPKG=                        yes
+PYTHON_SELF_CONFLICT=          yes
+PYTHON_VERSIONS_ACCEPTED=      27 # py-sk1libs
+REPLACE_PYTHON+=               src/__init__.py
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"

Index: pkgsrc/graphics/qimageblitz/Makefile
diff -u pkgsrc/graphics/qimageblitz/Makefile:1.28 pkgsrc/graphics/qimageblitz/Makefile:1.29
--- pkgsrc/graphics/qimageblitz/Makefile:1.28   Mon Mar 12 11:15:37 2018
+++ pkgsrc/graphics/qimageblitz/Makefile        Sat Nov  2 22:38:03 2019
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.28 2018/03/12 11:15:37 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2019/11/02 22:38:03 rillig Exp $
 
 DISTNAME=      qimageblitz-0.0.6
 PKGREVISION=   21
 CATEGORIES=    graphics
-MASTER_SITES=   ${MASTER_SITE_KDE:=qimageblitz/}
+MASTER_SITES=  ${MASTER_SITE_KDE:=qimageblitz/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://sourceforge.net/projects/qimageblitz
 COMMENT=       Interm graphical effect and filter library for KDE4.0
 
-USE_LANGUAGES+= c c++
-USE_CMAKE= yes
+USE_LANGUAGES+=        c c++
+USE_CMAKE=     yes
 
-#BUILD_MAKE_FLAGS+= VERBOSE=1
+#BUILD_MAKE_FLAGS+=    VERBOSE=1
 
 PKGCONFIG_OVERRIDE+=   blitz/qimageblitz.pc.cmake
 

Index: pkgsrc/graphics/qore-glut-module/Makefile
diff -u pkgsrc/graphics/qore-glut-module/Makefile:1.9 pkgsrc/graphics/qore-glut-module/Makefile:1.10
--- pkgsrc/graphics/qore-glut-module/Makefile:1.9       Fri Aug 30 17:01:34 2019
+++ pkgsrc/graphics/qore-glut-module/Makefile   Sat Nov  2 22:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/08/30 17:01:34 nia Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/02 22:38:03 rillig Exp $
 
 DISTNAME=      qore-glut-module-0.0.3
 PKGREVISION=   10
@@ -15,7 +15,7 @@ USE_LIBTOOL=  yes
 USE_LANGUAGES= c c++11
 PTHREAD_OPTS+= native
 
-CONFIGURE_ARGS+=--with-glut=${BUILDLINK_PREFIX.glut}
+CONFIGURE_ARGS+=       --with-glut=${BUILDLINK_PREFIX.glut}
 
 .include "options.mk"
 

Index: pkgsrc/graphics/qore-glut-module/options.mk
diff -u pkgsrc/graphics/qore-glut-module/options.mk:1.1 pkgsrc/graphics/qore-glut-module/options.mk:1.2
--- pkgsrc/graphics/qore-glut-module/options.mk:1.1     Tue Dec 30 15:58:20 2014
+++ pkgsrc/graphics/qore-glut-module/options.mk Sat Nov  2 22:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/12/30 15:58:20 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/02 22:38:03 rillig Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qore-glut-module
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=  debug
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=        --enable-debug
+CONFIGURE_ARGS+=       --enable-debug
 .else
-CONFIGURE_ARGS+=        --disable-debug
+CONFIGURE_ARGS+=       --disable-debug
 .endif

Index: pkgsrc/graphics/qore-opengl-module/Makefile
diff -u pkgsrc/graphics/qore-opengl-module/Makefile:1.8 pkgsrc/graphics/qore-opengl-module/Makefile:1.9
--- pkgsrc/graphics/qore-opengl-module/Makefile:1.8     Fri Jun  8 20:49:41 2018
+++ pkgsrc/graphics/qore-opengl-module/Makefile Sat Nov  2 22:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/06/08 20:49:41 nros Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/02 22:38:03 rillig Exp $
 
 DISTNAME=      qore-opengl-module-0.0.3
 PKGREVISION=   10
@@ -20,7 +20,7 @@ pre-configure:
        set -e; cd ${WRKSRC}; \
        aclocal; autoheader; automake -a --foreign -i; autoconf
 
-CONFIGURE_ARGS+=--with-opengl=${BUILDLINK_PREFIX.MesaLib}
+CONFIGURE_ARGS+=       --with-opengl=${BUILDLINK_PREFIX.MesaLib}
 
 INSTALLATION_DIRS+=     share/doc/${PKGBASE}
 post-install:

Index: pkgsrc/graphics/qore-opengl-module/options.mk
diff -u pkgsrc/graphics/qore-opengl-module/options.mk:1.1 pkgsrc/graphics/qore-opengl-module/options.mk:1.2
--- pkgsrc/graphics/qore-opengl-module/options.mk:1.1   Tue Dec 30 15:57:09 2014
+++ pkgsrc/graphics/qore-opengl-module/options.mk       Sat Nov  2 22:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/12/30 15:57:09 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/02 22:38:03 rillig Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qore-opengl-module
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=  debug
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=        --enable-debug
+CONFIGURE_ARGS+=       --enable-debug
 .else
-CONFIGURE_ARGS+=        --disable-debug
+CONFIGURE_ARGS+=       --disable-debug
 .endif

Index: pkgsrc/graphics/qvplay/Makefile
diff -u pkgsrc/graphics/qvplay/Makefile:1.16 pkgsrc/graphics/qvplay/Makefile:1.17
--- pkgsrc/graphics/qvplay/Makefile:1.16        Sun Mar  3 10:53:31 2013
+++ pkgsrc/graphics/qvplay/Makefile     Sat Nov  2 22:38:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/03/03 10:53:31 shattered Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/02 22:38:03 rillig Exp $
 #
 
 DISTNAME=      qvplay-0.95
@@ -10,14 +10,14 @@ HOMEPAGE=   http://www.asahi-net.or.jp/~xg
 COMMENT=       Software for use with CASIO QV digital cameras
 LICENSE=       generic-nonlicense
 
-RESTRICTED=    No permission to distribute
+RESTRICTED=            No permission to distribute
 NO_SRC_ON_FTP=         ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
 NO_SRC_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 
-WRKSRC=                ${WRKDIR}/QVplay095/src
-GNU_CONFIGURE= yes
+WRKSRC=                        ${WRKDIR}/QVplay095/src
+GNU_CONFIGURE=         yes
 CONFIGURE_HAS_MANDIR=  NO
 
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1

Index: pkgsrc/graphics/rayshade/Makefile
diff -u pkgsrc/graphics/rayshade/Makefile:1.39 pkgsrc/graphics/rayshade/Makefile:1.40
--- pkgsrc/graphics/rayshade/Makefile:1.39      Wed Jun  1 13:31:49 2016
+++ pkgsrc/graphics/rayshade/Makefile   Sat Nov  2 22:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2016/06/01 13:31:49 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/02 22:38:04 rillig Exp $
 
 DISTNAME=      rayshade.4.0.6
 PKGNAME=       rayshade-4.0.6
@@ -18,7 +18,7 @@ CONFIGURE_SCRIPT=     ./Configure
 USE_TOOLS+=            lex yacc
 BUILD_TARGET=
 INSTALLATION_DIRS=     bin lib share/doc/rayshade share/examples/rayshade
-WRKSRC=                ${WRKDIR}/rayshade.4.0
+WRKSRC=                        ${WRKDIR}/rayshade.4.0
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/rayshade/rayshade ${DESTDIR}${PREFIX}/bin

Index: pkgsrc/graphics/refocus-it/Makefile
diff -u pkgsrc/graphics/refocus-it/Makefile:1.15 pkgsrc/graphics/refocus-it/Makefile:1.16
--- pkgsrc/graphics/refocus-it/Makefile:1.15    Sat Oct  6 14:11:19 2012
+++ pkgsrc/graphics/refocus-it/Makefile Sat Nov  2 22:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/06 14:11:19 asau Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/02 22:38:04 rillig Exp $
 #
 
 DISTNAME=              refocus-it-2.0.0
@@ -10,11 +10,11 @@ MAINTAINER=         pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://refocus-it.sourceforge.net/
 COMMENT=               Refocus images
 
-GNU_CONFIGURE=         yes
+GNU_CONFIGURE=                 yes
 #just build the command line tool
-CONFIGURE_ARGS+=       --without-gimp
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            intltool msgfmt
+CONFIGURE_ARGS+=               --without-gimp
+USE_PKGLOCALEDIR=              yes
+USE_TOOLS+=                    intltool msgfmt
 BROKEN_GETTEXT_DETECTION=      yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/graphics/ruby-imlib2/Makefile
diff -u pkgsrc/graphics/ruby-imlib2/Makefile:1.36 pkgsrc/graphics/ruby-imlib2/Makefile:1.37
--- pkgsrc/graphics/ruby-imlib2/Makefile:1.36   Mon Sep  4 18:00:55 2017
+++ pkgsrc/graphics/ruby-imlib2/Makefile        Sat Nov  2 22:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2017/09/04 18:00:55 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/02 22:38:04 rillig Exp $
 
 DISTNAME=      imlib2-ruby-0.5.2
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
@@ -11,9 +11,9 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Imlib2 bindings for Ruby
 LICENSE=       mit
 
-GEM_CLEANBUILD=        Makefile *.o imlib2.${RUBY_DLEXT} mkmf.log .*.time
-OVERRIDE_GEMSPEC=      :name=imlib2-ruby
-BUILDLINK_API_DEPENDS.imlib2+=      imlib2>=1.2.0nb2
+GEM_CLEANBUILD=                        Makefile *.o imlib2.${RUBY_DLEXT} mkmf.log .*.time
+OVERRIDE_GEMSPEC=              :name=imlib2-ruby
+BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.2.0nb2
 
 pre-configure:
        ${CHMOD} -R g-w ${WRKSRC}

Index: pkgsrc/graphics/ruby-oily_png/Makefile
diff -u pkgsrc/graphics/ruby-oily_png/Makefile:1.7 pkgsrc/graphics/ruby-oily_png/Makefile:1.8
--- pkgsrc/graphics/ruby-oily_png/Makefile:1.7  Sat Oct 15 13:55:10 2016
+++ pkgsrc/graphics/ruby-oily_png/Makefile      Sat Nov  2 22:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/10/15 13:55:10 taca Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/02 22:38:04 rillig Exp $
 
 DISTNAME=      oily_png-1.2.1
 CATEGORIES=    graphics
@@ -8,7 +8,7 @@ HOMEPAGE=       https://github.com/wvanbergen/
 COMMENT=       Native mixin to speed up ChunkyPNG
 LICENSE=       mit
 
-DEPENDS+= ${RUBY_PKGPREFIX}-chunky_png>=1.3.1<1.4:../../graphics/ruby-chunky_png
+DEPENDS+=      ${RUBY_PKGPREFIX}-chunky_png>=1.3.1<1.4:../../graphics/ruby-chunky_png
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/scidavis/Makefile
diff -u pkgsrc/graphics/scidavis/Makefile:1.33 pkgsrc/graphics/scidavis/Makefile:1.34
--- pkgsrc/graphics/scidavis/Makefile:1.33      Thu Apr 25 07:32:59 2019
+++ pkgsrc/graphics/scidavis/Makefile   Sat Nov  2 22:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/04/25 07:32:59 maya Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/02 22:38:04 rillig Exp $
 #
 
 DISTNAME=      scidavis-0.2.4
@@ -11,8 +11,8 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://scidavis.sourceforge.net/
 COMMENT=       Data analysis and visualization package
 
-USE_LANGUAGES= c c++
-INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
+USE_LANGUAGES=         c c++
+INSTALL_MAKE_FLAGS+=   INSTALL_ROOT=${DESTDIR}
 
 do-configure:
        cd ${WRKSRC} && env ${CONFIGURE_ENV} ${QTDIR}/bin/qmake

Index: pkgsrc/graphics/skencil/Makefile
diff -u pkgsrc/graphics/skencil/Makefile:1.42 pkgsrc/graphics/skencil/Makefile:1.43
--- pkgsrc/graphics/skencil/Makefile:1.42       Mon Sep  2 13:20:16 2019
+++ pkgsrc/graphics/skencil/Makefile    Sat Nov  2 22:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2019/09/02 13:20:16 adam Exp $
+# $NetBSD: Makefile,v 1.43 2019/11/02 22:38:04 rillig Exp $
 
 DISTNAME=      skencil-0.6.17
 PKGREVISION=   15
@@ -13,8 +13,8 @@ DEPENDS+=     ${PYPKGPREFIX}-Tk-[0-9]*:../..
 
 USE_TOOLS+=    pax
 
-REPLACE_PYTHON= sk2ppm.py sk2ps.py skconvert.py skencil.py skshow.py
-PYTHON_VERSIONS_ACCEPTED=       27 # py-imaging
+REPLACE_PYTHON=        sk2ppm.py sk2ps.py skconvert.py skencil.py skshow.py
+PYTHON_VERSIONS_ACCEPTED= 27 # py-imaging
 
 SK_CONF_ARGS=  --imaging-include=${BUILDLINK_PREFIX.pyimaging}/${PYINC}/PIL
 SK_TKFLAGS=    -L${BUILDLINK_PREFIX.tk}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.tk}/lib -ltk -ltcl

Index: pkgsrc/graphics/spcaview/Makefile
diff -u pkgsrc/graphics/spcaview/Makefile:1.26 pkgsrc/graphics/spcaview/Makefile:1.27
--- pkgsrc/graphics/spcaview/Makefile:1.26      Mon Sep  4 18:00:56 2017
+++ pkgsrc/graphics/spcaview/Makefile   Sat Nov  2 22:38:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/09/04 18:00:56 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/02 22:38:04 rillig Exp $
 
 DISTNAME=      spca5xx-20060402
 PKGNAME=       spcaview-0.6b
@@ -6,8 +6,8 @@ PKGREVISION=    13
 CATEGORIES=    graphics x11
 MASTER_SITES=  http://mxhaard.free.fr/spca50x/Download/oldrelease/
 
-PATCH_SITES=   http://www.medias.ne.jp/~takam/bsd/
-PATCHFILES=    spca5xx-bsd-0.6b.patch.gz
+PATCH_SITES=           http://www.medias.ne.jp/~takam/bsd/
+PATCHFILES=            spca5xx-bsd-0.6b.patch.gz
 PATCH_DIST_STRIP=      -p3
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/graphics/tango-icon-theme/Makefile
diff -u pkgsrc/graphics/tango-icon-theme/Makefile:1.36 pkgsrc/graphics/tango-icon-theme/Makefile:1.37
--- pkgsrc/graphics/tango-icon-theme/Makefile:1.36      Sun Jul 21 22:25:05 2019
+++ pkgsrc/graphics/tango-icon-theme/Makefile   Sat Nov  2 22:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/07/21 22:25:05 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2019/11/02 22:38:05 rillig Exp $
 
 DISTNAME=      tango-icon-theme-0.8.90
 PKGREVISION=   33
@@ -13,7 +13,7 @@ LICENSE=      public-domain
 GNU_CONFIGURE= yes
 USE_TOOLS+=    gmake intltool pkg-config msgfmt
 
-BUILDLINK_DEPMETHOD.ImageMagick=       build
+BUILDLINK_DEPMETHOD.ImageMagick=               build
 BUILDLINK_API_DEPENDS.icon-naming-utils+=      icon-naming-utils>=0.8.90
 
 

Index: pkgsrc/graphics/tex-pictex-doc/Makefile
diff -u pkgsrc/graphics/tex-pictex-doc/Makefile:1.1 pkgsrc/graphics/tex-pictex-doc/Makefile:1.2
--- pkgsrc/graphics/tex-pictex-doc/Makefile:1.1 Tue May  5 14:40:41 2015
+++ pkgsrc/graphics/tex-pictex-doc/Makefile     Sat Nov  2 22:38:05 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/05/05 14:40:41 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 22:38:05 rillig Exp $
 
 DISTNAME=      pictex.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.1
 TEXLIVE_REV=   21943
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=       http://ctan.org/pkg/pictex
+HOMEPAGE=      http://ctan.org/pkg/pictex
 COMMENT=       Documentation for tex-pictex
 LICENSE=       lppl-1.3c
 

Index: pkgsrc/graphics/tex-tkz-base/Makefile
diff -u pkgsrc/graphics/tex-tkz-base/Makefile:1.3 pkgsrc/graphics/tex-tkz-base/Makefile:1.4
--- pkgsrc/graphics/tex-tkz-base/Makefile:1.3   Sat Jan 26 08:04:32 2019
+++ pkgsrc/graphics/tex-tkz-base/Makefile       Sat Nov  2 22:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/01/26 08:04:32 markd Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/02 22:38:05 rillig Exp $
 
 DISTNAME=      tkz-base
 PKGNAME=       tex-${DISTNAME}-1.16d
@@ -9,8 +9,8 @@ HOMEPAGE=       http://ctan.org/pkg/tkz-base
 COMMENT=       Tools for drawing with a cartesian coordinate system
 LICENSE=       lppl-1.3c
 
-DEPENDS+=       tex-numprint-[0-9]*:../../print/tex-numprint
-DEPENDS+=       tex-pgf-[0-9]*:../../print/tex-pgf
+DEPENDS+=      tex-numprint-[0-9]*:../../print/tex-numprint
+DEPENDS+=      tex-pgf-[0-9]*:../../print/tex-pgf
 
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/tex-tkz-fct/Makefile
diff -u pkgsrc/graphics/tex-tkz-fct/Makefile:1.1 pkgsrc/graphics/tex-tkz-fct/Makefile:1.2
--- pkgsrc/graphics/tex-tkz-fct/Makefile:1.1    Sun Oct 15 20:22:09 2017
+++ pkgsrc/graphics/tex-tkz-fct/Makefile        Sat Nov  2 22:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/10/15 20:22:09 markd Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 22:38:05 rillig Exp $
 
 DISTNAME=      tkz-fct
 PKGNAME=       tex-${DISTNAME}-1.16c
@@ -9,7 +9,7 @@ HOMEPAGE=       http://ctan.org/pkg/tkz-fct
 COMMENT=       Tools for drawing graphs of functions
 LICENSE=       lppl-1.3c
 
-DEPENDS+=       tex-tkz-base-[0-9]*:../../graphics/tex-tkz-base
+DEPENDS+=      tex-tkz-base-[0-9]*:../../graphics/tex-tkz-base
 
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/tgif/hacks.mk
diff -u pkgsrc/graphics/tgif/hacks.mk:1.3 pkgsrc/graphics/tgif/hacks.mk:1.4
--- pkgsrc/graphics/tgif/hacks.mk:1.3   Sat Apr  6 11:23:05 2013
+++ pkgsrc/graphics/tgif/hacks.mk       Sat Nov  2 22:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.3 2013/04/06 11:23:05 rodent Exp $
+# $NetBSD: hacks.mk,v 1.4 2019/11/02 22:38:05 rillig Exp $
 
 .if !defined(FOO_TGIF_MK)
 TGIF_HACKS_MK= defined
@@ -14,8 +14,8 @@ TGIF_HACKS_MK=        defined
 ### Work around by not optimizing
 
 .if !empty(PKGSRC_COMPILER:Msunpro)
-PKG_HACKS+=    optimisation
-BUILDLINK_TRANSFORM+= rm:-O[0-9]*
+PKG_HACKS+=            optimisation
+BUILDLINK_TRANSFORM+=  rm:-O[0-9]*
 .endif
 
 .endif  # TGIF_HACKS_MK

Index: pkgsrc/graphics/tuxpaint-stamps/Makefile
diff -u pkgsrc/graphics/tuxpaint-stamps/Makefile:1.19 pkgsrc/graphics/tuxpaint-stamps/Makefile:1.20
--- pkgsrc/graphics/tuxpaint-stamps/Makefile:1.19       Sun Sep  2 13:00:55 2018
+++ pkgsrc/graphics/tuxpaint-stamps/Makefile    Sat Nov  2 22:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/09/02 13:00:55 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/02 22:38:05 rillig Exp $
 
 DISTNAME=      tuxpaint-stamps-2018.09.01
 CATEGORIES=    graphics
@@ -12,7 +12,7 @@ LICENSE=      gnu-gpl-v2
 DEPENDS+=      tuxpaint>=0.9.13:../../graphics/tuxpaint
 CONFLICTS+=    tuxpaint<0.9.13
 
-INSTALL_TARGET=        install-all
+INSTALL_TARGET=                install-all
 INSTALL_MAKE_FLAGS+=   PREFIX=${DESTDIR}${PREFIX}
 
 post-install:

Index: pkgsrc/graphics/urt/Makefile
diff -u pkgsrc/graphics/urt/Makefile:1.63 pkgsrc/graphics/urt/Makefile:1.64
--- pkgsrc/graphics/urt/Makefile:1.63   Sun Jan 14 14:58:40 2018
+++ pkgsrc/graphics/urt/Makefile        Sat Nov  2 22:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2018/01/14 14:58:40 rillig Exp $
+# $NetBSD: Makefile,v 1.64 2019/11/02 22:38:05 rillig Exp $
 
 DISTNAME=      urt
 PKGNAME=       urt-3.1b1
@@ -7,9 +7,9 @@ CATEGORIES=     graphics
 MASTER_SITES=  ftp://ftp.iastate.edu/pub/utah-raster/
 DISTFILES=     urt-3.1b.tar.Z urt-doc.tar.Z urt-img.tar.Z
 
-PATCH_SITES=   http://www.funet.fi/pub/graphics/packages/urt/rel2/
-PATCHFILES=    urt-3.1b-3.1b1.patch
-PATCH_DIST_STRIP=-p1
+PATCH_SITES=           http://www.funet.fi/pub/graphics/packages/urt/rel2/
+PATCHFILES=            urt-3.1b-3.1b1.patch
+PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.cs.utah.edu/gdc/projects/urt/
@@ -17,21 +17,21 @@ COMMENT=    Toolkit and library for raster 
 
 EXTRACT_ONLY=  urt-3.1b.tar.Z
 
-WRKSRC=                ${WRKDIR}
-USE_LIBTOOL=   yes
-USE_TOOLS+=    pax
-CONFIGURE_SCRIPT=./Configure
+WRKSRC=                        ${WRKDIR}
+USE_LIBTOOL=           yes
+USE_TOOLS+=            pax
+CONFIGURE_SCRIPT=      ./Configure
 CONFIGURE_ARGS+=       config/urt
-HAS_CONFIGURE= yes
-MAKE_FILE=     makefile
-BUILD_TARGET=  # the default one
+HAS_CONFIGURE=         yes
+MAKE_FILE=             makefile
+BUILD_TARGET=          # the default one
 
 AUTO_MKDIRS=                   yes
 
 post-extract:
        chmod 644 ${WRKSRC}/man/man1/rletotarga.1
 
-SUBST_CLASSES+=        man
+SUBST_CLASSES+=                man
 SUBST_STAGE.man=       pre-configure
 SUBST_FILES.man=       config/urt
 SUBST_SED.man=         -e 's,^\(\#defpath MAN_DEST\).*,\1 ${PREFIX}/${PKGMANDIR},'

Index: pkgsrc/graphics/vtk/Makefile.vtkdist
diff -u pkgsrc/graphics/vtk/Makefile.vtkdist:1.10 pkgsrc/graphics/vtk/Makefile.vtkdist:1.11
--- pkgsrc/graphics/vtk/Makefile.vtkdist:1.10   Mon Jun 22 18:51:02 2015
+++ pkgsrc/graphics/vtk/Makefile.vtkdist        Sat Nov  2 22:38:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.vtkdist,v 1.10 2015/06/22 18:51:02 jperkin Exp $
+# $NetBSD: Makefile.vtkdist,v 1.11 2019/11/02 22:38:05 rillig Exp $
 
 .include "../../graphics/vtk/Makefile.common"
 
@@ -6,14 +6,14 @@
 VTKDIST_VERSION=       4.2.6
 DISTNAME=              VTK-4.2-LatestRelease
 DIST_SUBDIR=           VTK-4.2.6
-WRKSRC=                ${WRKDIR}/VTK
+WRKSRC=                        ${WRKDIR}/VTK
 
 DISTINFO_FILE=         ${.CURDIR}/../vtk/distinfo
 PATCHDIR=              ${.CURDIR}/../vtk/patches
 
 VTK_LIBDIR=    ${PREFIX}/lib/vtk
 
-VTK_CMAKE_OPT+= -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX:Q} \
+VTK_CMAKE_OPT+=        -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX:Q} \
        -DCMAKE_INSTALL_RPATH:STRING=${PREFIX:Q}/lib:${X11BASE:Q}/lib${LIBABISUFFIX:Q}:${VTK_LIBDIR:Q} \
        -DCMAKE_SKIP_BUILD_RPATH:BOOL=ON \
        -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \

Index: pkgsrc/graphics/wm-icons/Makefile
diff -u pkgsrc/graphics/wm-icons/Makefile:1.1 pkgsrc/graphics/wm-icons/Makefile:1.2
--- pkgsrc/graphics/wm-icons/Makefile:1.1       Mon Dec 28 15:08:54 2015
+++ pkgsrc/graphics/wm-icons/Makefile   Sat Nov  2 22:38:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/12/28 15:08:54 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/02 22:38:06 rillig Exp $
 
 DISTNAME=              wm-icons-0.4.0
 CATEGORIES=            graphics
@@ -13,6 +13,6 @@ LICENSE=              gnu-gpl-v2
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-all-sets
 
-INSTALLATION_DIRS+=     share/icons/wm-icons
+INSTALLATION_DIRS+=    share/icons/wm-icons
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/xdot/Makefile
diff -u pkgsrc/graphics/xdot/Makefile:1.12 pkgsrc/graphics/xdot/Makefile:1.13
--- pkgsrc/graphics/xdot/Makefile:1.12  Mon Sep  2 13:20:17 2019
+++ pkgsrc/graphics/xdot/Makefile       Sat Nov  2 22:38:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/09/02 13:20:17 adam Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 22:38:06 rillig Exp $
 
 DISTNAME=      xdot
 PKGNAME=       xdot-20121124
@@ -14,12 +14,12 @@ LICENSE=    gnu-lgpl-v3
 
 DEPENDS+=      ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
 
-WRKSRC=                ${WRKDIR}
-USE_LANGUAGES= # none
-DIST_SUBDIR=   ${PKGNAME_NOREV}
-REPLACE_PYTHON=        xdot.py
-PYTHON_VERSIONS_ACCEPTED=       27 # py-gtk2
-INSTALLATION_DIRS=     bin
+WRKSRC=                                ${WRKDIR}
+USE_LANGUAGES=                 # none
+DIST_SUBDIR=                   ${PKGNAME_NOREV}
+REPLACE_PYTHON=                        xdot.py
+PYTHON_VERSIONS_ACCEPTED=      27 # py-gtk2
+INSTALLATION_DIRS=             bin
 
 do-build:
 

Index: pkgsrc/graphics/xfig/Makefile
diff -u pkgsrc/graphics/xfig/Makefile:1.73 pkgsrc/graphics/xfig/Makefile:1.74
--- pkgsrc/graphics/xfig/Makefile:1.73  Fri Jun 21 13:15:07 2019
+++ pkgsrc/graphics/xfig/Makefile       Sat Nov  2 22:38:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2019/06/21 13:15:07 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2019/11/02 22:38:06 rillig Exp $
 
 DISTNAME=      xfig-3.2.6a
 PKGNAME=       ${DISTNAME:S/-full//}
@@ -17,7 +17,7 @@ XAW_TYPE?=            3d
 
 GNU_CONFIGURE=         yes
 
-CONFIGURE_ARGS+=       --with-appdefaultdir=${PREFIX}/lib/X11/app-defaults
+CONFIGURE_ARGS+=       --with-appdefaultdir=${PREFIX}/lib/X11/app-defaults
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/graphics/xmorph/Makefile
diff -u pkgsrc/graphics/xmorph/Makefile:1.12 pkgsrc/graphics/xmorph/Makefile:1.13
--- pkgsrc/graphics/xmorph/Makefile:1.12        Wed Mar 20 10:53:07 2019
+++ pkgsrc/graphics/xmorph/Makefile     Sat Nov  2 22:38:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/03/20 10:53:07 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/02 22:38:06 rillig Exp $
 
 DISTNAME=      xmorph_20060817
 PKGNAME=       xmorph-20060817
@@ -10,13 +10,13 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://xmorph.sourceforge.net/home/gourlay/public_html/Xmorph/
 COMMENT=       X program for image warping and dissolving
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-gtkmorph=no
-INFO_FILES=    yes
-USE_LANGUAGES= c c++ fortran77
-USE_LIBTOOL=   yes
-USE_TOOLS+=    msgfmt
-WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
+INFO_FILES=            yes
+USE_LANGUAGES=         c c++ fortran77
+USE_LIBTOOL=           yes
+USE_TOOLS+=            msgfmt
+WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
 
 LDFLAGS+=      ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib
 

Index: pkgsrc/graphics/xpaint/Makefile
diff -u pkgsrc/graphics/xpaint/Makefile:1.77 pkgsrc/graphics/xpaint/Makefile:1.78
--- pkgsrc/graphics/xpaint/Makefile:1.77        Thu May 23 19:23:02 2019
+++ pkgsrc/graphics/xpaint/Makefile     Sat Nov  2 22:38:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2019/05/23 19:23:02 rillig Exp $
+# $NetBSD: Makefile,v 1.78 2019/11/02 22:38:06 rillig Exp $
 
 DISTNAME=      xpaint-2.7.8.1
 PKGREVISION=   11
@@ -11,8 +11,8 @@ HOMEPAGE=     http://sf-xpaint.sourceforge.n
 COMMENT=       Simple paint program
 
 USE_IMAKE=     yes
-MAKE_ENV+=             XMKMF=${XMKMF:Q}
-MAKE_JOBS_SAFE=                NO
+MAKE_ENV+=     XMKMF=${XMKMF:Q}
+MAKE_JOBS_SAFE=        NO
 
 SUBST_CLASSES+=                foo
 SUBST_STAGE.foo=       pre-configure

Index: pkgsrc/graphics/xv/Makefile
diff -u pkgsrc/graphics/xv/Makefile:1.94 pkgsrc/graphics/xv/Makefile:1.95
--- pkgsrc/graphics/xv/Makefile:1.94    Thu May 23 19:23:02 2019
+++ pkgsrc/graphics/xv/Makefile Sat Nov  2 22:38:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2019/05/23 19:23:02 rillig Exp $
+# $NetBSD: Makefile,v 1.95 2019/11/02 22:38:06 rillig Exp $
 
 DISTNAME=      xv-3.10a
 PKGREVISION=   25
@@ -6,13 +6,13 @@ CATEGORIES=   graphics x11
 MASTER_SITES=  ftp://ftp.cis.upenn.edu/pub/xv/
 DISTFILES=     ${DEFAULT_DISTFILES} ${JUMBO_PATCHES}
 
-PATCHFILES=    ${JUMBO_PATCHES}
-JUMBO_PATCHES= xv-3.10a-jumbo-patches-20070520.tar.gz
+PATCHFILES=                            ${JUMBO_PATCHES}
+JUMBO_PATCHES=                         xv-3.10a-jumbo-patches-20070520.tar.gz
 PATCH_DIST_CAT.${JUMBO_PATCHES}=       ${CAT} ${WRKDIR}/*-patch-*
 PATCH_DIST_STRIP.${JUMBO_PATCHES}=     -p1
-SITES.${JUMBO_PATCHES}=        ${MASTER_SITE_SOURCEFORGE:=png-mng/}
-PATCHFILES+=   xv-3.10a-enhancements.20070520-20081216.diff
-PATCH_SITES=   http://www.gregroelofs.com/code/
+SITES.${JUMBO_PATCHES}=                        ${MASTER_SITE_SOURCEFORGE:=png-mng/}
+PATCHFILES+=                           xv-3.10a-enhancements.20070520-20081216.diff
+PATCH_SITES=                           http://www.gregroelofs.com/code/
 
 MAINTAINER=    tsutsui%NetBSD.org@localhost
 HOMEPAGE=      http://www.trilon.com/xv/
@@ -25,7 +25,7 @@ USE_IMAKE=    YES
 .include "options.mk"
 
 # See the end of README in work/xv-3.10a for details.
-RESTRICTED=    Distribution of modified copies and commercial distribution is not permitted.
+RESTRICTED=            Distribution of modified copies and commercial distribution is not permitted.
 NO_SRC_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
@@ -42,7 +42,7 @@ SUBST_VARS.gspath=    PREFIX
 SUBST_STAGE.gspath=    post-configure
 SUBST_MESSAGE.gspath=  Fixing path to ghostscript interpreter.
 
-INSTALLATION_DIRS+= share/doc/xv
+INSTALLATION_DIRS+=    share/doc/xv
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/graphics/zphoto/options.mk
diff -u pkgsrc/graphics/zphoto/options.mk:1.6 pkgsrc/graphics/zphoto/options.mk:1.7
--- pkgsrc/graphics/zphoto/options.mk:1.6       Sun Nov  1 13:25:27 2015
+++ pkgsrc/graphics/zphoto/options.mk   Sat Nov  2 22:38:06 2019
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.6 2015/11/01 13:25:27 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2019/11/02 22:38:06 rillig Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.zphoto
-PKG_SUPPORTED_OPTIONS= zip
+PKG_OPTIONS_VAR=               PKG_OPTIONS.zphoto
+PKG_SUPPORTED_OPTIONS=         zip
 PKG_OPTIONS_REQUIRED_GROUPS=   graphics
 PKG_OPTIONS_GROUP.graphics=    imlib2 imagemagick
-PKG_SUGGESTED_OPTIONS= imlib2
+PKG_SUGGESTED_OPTIONS=         imlib2
 PKG_OPTIONS_LEGACY_OPTS+=      magick:imagemagick
 
 .include "../../mk/bsd.options.mk"
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=      --disable-imlib2
 .endif
 
 .if !empty(PKG_OPTIONS:Mzip)
-USE_TOOLS+=    zip:run
+USE_TOOLS+=            zip:run
 .else
 CONFIGURE_ARGS+=       --disable-zip
 .endif



Home | Main Index | Thread Index | Old Index