diff options
| author | rillig <rillig@pkgsrc.org> | 2019-11-02 22:37:52 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-11-02 22:37:52 +0000 |
| commit | 32c30875cca2de4f6c7cded0af0c0d7f1d37ddb1 (patch) | |
| tree | 5badba5272b71ca0f2ae24092afab850b81c7059 | |
| parent | 2476b87659dab34be04553e56079d38facafe0ad (diff) | |
| download | pkgsrc-32c30875cca2de4f6c7cded0af0c0d7f1d37ddb1.tar.gz | |
graphics: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
114 files changed, 428 insertions, 428 deletions
diff --git a/graphics/AfterShotPro/Makefile b/graphics/AfterShotPro/Makefile index ab4a6022c73..82a710d6845 100644 --- a/graphics/AfterShotPro/Makefile +++ b/graphics/AfterShotPro/Makefile @@ -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/product/index.jsp?pid=prod4670071 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 diff --git a/graphics/Cenon/Makefile b/graphics/Cenon/Makefile index cb15b1d2d27..436e56851a3 100644 --- a/graphics/Cenon/Makefile +++ b/graphics/Cenon/Makefile @@ -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 diff --git a/graphics/GMT/Makefile b/graphics/GMT/Makefile index a51347cb278..3f9aba1194c 100644 --- a/graphics/GMT/Makefile +++ b/graphics/GMT/Makefile @@ -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: diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index b85f9a6ea81..a546cc71495 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -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 configuration files. 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 diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk index 93c4906971e..19ae9296ece 100644 --- a/graphics/ImageMagick/options.mk +++ b/graphics/ImageMagick/options.mk @@ -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" diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile index a915a575317..521da2057f4 100644 --- a/graphics/ImageMagick6/Makefile +++ b/graphics/ImageMagick6/Makefile @@ -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 configuration files. 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 diff --git a/graphics/ImageMagick6/options.mk b/graphics/ImageMagick6/options.mk index 4ef39daad14..6b3a3c5d720 100644 --- a/graphics/ImageMagick6/options.mk +++ b/graphics/ImageMagick6/options.mk @@ -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" diff --git a/graphics/aalib/options.mk b/graphics/aalib/options.mk index 5730959ef69..c39db834c31 100644 --- a/graphics/aalib/options.mk +++ b/graphics/aalib/options.mk @@ -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" diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile index db0a7f00618..9e238777bde 100644 --- a/graphics/agg/Makefile +++ b/graphics/agg/Makefile @@ -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 diff --git a/graphics/asymptote/Makefile b/graphics/asymptote/Makefile index 3a4c03be6d2..09ec329ff15 100644 --- a/graphics/asymptote/Makefile +++ b/graphics/asymptote/Makefile @@ -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 during build as of 2.38 GNU_CONFIGURE= yes INFO_FILES= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++ CONFIGURE_ARGS+= --enable-gc=system CONFIGURE_ARGS+= --infodir=${PREFIX}/info diff --git a/graphics/bktr2jpeg/Makefile b/graphics/bktr2jpeg/Makefile index 4c36f63120c..251067c7c41 100644 --- a/graphics/bktr2jpeg/Makefile +++ b/graphics/bktr2jpeg/Makefile @@ -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 /dev/bktr to file 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 diff --git a/graphics/cairo/options.mk b/graphics/cairo/options.mk index 20ed94faf7c..0833fe1dce3 100644 --- a/graphics/cairo/options.mk +++ b/graphics/cairo/options.mk @@ -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 diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile index 473c99bc2d3..9d23180e78e 100644 --- a/graphics/cal3d/Makefile +++ b/graphics/cal3d/Makefile @@ -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" diff --git a/graphics/cal3d/Makefile.common b/graphics/cal3d/Makefile.common index c71ae013af1..a461fb217fe 100644 --- a/graphics/cal3d/Makefile.common +++ b/graphics/cal3d/Makefile.common @@ -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/} CAL3D_VERSION= 0.9.1 -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://cal3d.sourceforge.net/ +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://cal3d.sourceforge.net/ COMMENT= Skeletal based 3d character animation library in C++ EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/cheese/Makefile b/graphics/cheese/Makefile index be33ff585e7..edd9ef63b73 100644 --- a/graphics/cheese/Makefile +++ b/graphics/cheese/Makefile @@ -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 and videos 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 diff --git a/graphics/cnxtview/Makefile b/graphics/cnxtview/Makefile index e3b52598b98..c7febfeef61 100644 --- a/graphics/cnxtview/Makefile +++ b/graphics/cnxtview/Makefile @@ -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.h> and <dev/usb/usb.h> USE_BSD_MAKEFILE= yes USE_TOOLS+= groff nroff -MAKE_ENV+= NOGCCERROR= +MAKE_ENV+= NOGCCERROR= INSTALLATION_DIRS+= bin diff --git a/graphics/comix/Makefile b/graphics/comix/Makefile index 6fb2fec0236..6418682b0ee 100644 --- a/graphics/comix/Makefile +++ b/graphics/comix/Makefile @@ -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: diff --git a/graphics/comix/options.mk b/graphics/comix/options.mk index 074caf0daf7..35caa8317d8 100644 --- a/graphics/comix/options.mk +++ b/graphics/comix/options.mk @@ -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" diff --git a/graphics/cpia2view/Makefile b/graphics/cpia2view/Makefile index c7bcd6e0f89..02c05b8da5e 100644 --- a/graphics/cpia2view/Makefile +++ b/graphics/cpia2view/Makefile @@ -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 diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 167c6fc1a14..0181b055b88 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -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" diff --git a/graphics/dia-python/Makefile b/graphics/dia-python/Makefile index 982b26cbe8a..43cb9aa3670 100644 --- a/graphics/dia-python/Makefile +++ b/graphics/dia-python/Makefile @@ -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 diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common index e1a11fd0381..326b5463bc3 100644 --- a/graphics/dia/Makefile.common +++ b/graphics/dia/Makefile.common @@ -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 diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 4fbd43eb43f..50351614d7b 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -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 diff --git a/graphics/dvipng/Makefile b/graphics/dvipng/Makefile index 148816b0837..b6275774818 100644 --- a/graphics/dvipng/Makefile +++ b/graphics/dvipng/Makefile @@ -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/projects/dvipng/ 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 diff --git a/graphics/dxsamples/Makefile b/graphics/dxsamples/Makefile index edef29da963..5e72bd50b14 100644 --- a/graphics/dxsamples/Makefile +++ b/graphics/dxsamples/Makefile @@ -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 Visualization Data Explorer 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" diff --git a/graphics/erlang-eimp/Makefile b/graphics/erlang-eimp/Makefile index 1410d8ff502..f4c2dfe60be 100644 --- a/graphics/erlang-eimp/Makefile +++ b/graphics/erlang-eimp/Makefile @@ -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:../../misc/erlang-p1_utils GNU_CONFIGURE= yes -LDFLAGS.SunOS+= -lnsl -lsocket +LDFLAGS.SunOS+= -lnsl -lsocket .include "../../graphics/gd/buildlink3.mk" .include "../../lang/erlang/module.mk" diff --git a/graphics/evas/Makefile.common b/graphics/evas/Makefile.common index c5c89767b75..87f7fc5b32c 100644 --- a/graphics/evas/Makefile.common +++ b/graphics/evas/Makefile.common @@ -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} diff --git a/graphics/exifprobe/Makefile b/graphics/exifprobe/Makefile index 352670cb213..672d8bea44a 100644 --- a/graphics/exifprobe/Makefile +++ b/graphics/exifprobe/Makefile @@ -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 -#HOMEPAGE= http://www.virtual-cafe.com/~dhh/tools.d/exifprobe.d/exifprobe.html -COMMENT= EXIF data extractor +MAINTAINER= pkgsrc-users@NetBSD.org +#HOMEPAGE= http://www.virtual-cafe.com/~dhh/tools.d/exifprobe.d/exifprobe.html +COMMENT= EXIF data extractor # byteorder.h problems MAKE_JOBS_SAFE= no diff --git a/graphics/extrema/Makefile b/graphics/extrema/Makefile index 9ef0d3afe6f..6b3b742182d 100644 --- a/graphics/extrema/Makefile +++ b/graphics/extrema/Makefile @@ -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/extrema/ 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" diff --git a/graphics/fbm/Makefile b/graphics/fbm/Makefile index d898ec43e6f..76b4a2f5747 100644 --- a/graphics/fbm/Makefile +++ b/graphics/fbm/Makefile @@ -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 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 diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile index 8317ecd21da..ee05e4eca65 100644 --- a/graphics/fotoxx/Makefile +++ b/graphics/fotoxx/Makefile @@ -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 diff --git a/graphics/frameworks/Makefile b/graphics/frameworks/Makefile index 1ffd52f52eb..7ed1d2c40c5 100644 --- a/graphics/frameworks/Makefile +++ b/graphics/frameworks/Makefile @@ -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 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 diff --git a/graphics/freeglut/buildlink3.mk b/graphics/freeglut/buildlink3.mk index 63f846374e3..a5d805ab38e 100644 --- a/graphics/freeglut/buildlink3.mk +++ b/graphics/freeglut/buildlink3.mk @@ -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: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: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 diff --git a/graphics/freeimage/Makefile b/graphics/freeimage/Makefile index 8fa5b1ae993..3f843f7ba17 100644 --- a/graphics/freeimage/Makefile +++ b/graphics/freeimage/Makefile @@ -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" diff --git a/graphics/freeimageplus/Makefile b/graphics/freeimageplus/Makefile index af4e11376da..7ba57f20d04 100644 --- a/graphics/freeimageplus/Makefile +++ b/graphics/freeimageplus/Makefile @@ -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/freeimage/distinfo 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" diff --git a/graphics/freetype2/builtin.mk b/graphics/freetype2/builtin.mk index 4b9ce9e6daa..f026298c55f 100644 --- a/graphics/freetype2/builtin.mk +++ b/graphics/freetype2/builtin.mk @@ -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+= freetype2>=2.1.3 . 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 diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 55d14c147f9..43451476ab9 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -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 diff --git a/graphics/gdk-pixbuf2-xlib/Makefile b/graphics/gdk-pixbuf2-xlib/Makefile index 29f0321641f..35f703aacb5 100644 --- a/graphics/gdk-pixbuf2-xlib/Makefile +++ b/graphics/gdk-pixbuf2-xlib/Makefile @@ -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}/* diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index 16595db76ff..aa36b45127a 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -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 diff --git a/graphics/gdk-pixbuf2/loaders.mk b/graphics/gdk-pixbuf2/loaders.mk index ab748a7a9b6..334c1d9cd9a 100644 --- a/graphics/gdk-pixbuf2/loaders.mk +++ b/graphics/gdk-pixbuf2/loaders.mk @@ -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 diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile index 85f5be7bd81..5ae31088d47 100644 --- a/graphics/gif2png/Makefile +++ b/graphics/gif2png/Makefile @@ -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 diff --git a/graphics/gimp-docs-en/Makefile.common b/graphics/gimp-docs-en/Makefile.common index 5cc8ceca980..c7f6ebc9c18 100644 --- a/graphics/gimp-docs-en/Makefile.common +++ b/graphics/gimp-docs-en/Makefile.common @@ -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" diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 9c034a47087..8b4d450d09a 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -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" diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile index 90ea5a797c1..e9a6697de6c 100644 --- a/graphics/gle/Makefile +++ b/graphics/gle/Makefile @@ -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" diff --git a/graphics/glu/builtin.mk b/graphics/glu/builtin.mk index 47d3b4af30a..160bf6d52eb 100644 --- a/graphics/glu/builtin.mk +++ b/graphics/glu/builtin.mk @@ -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 diff --git a/graphics/go-image/buildlink3.mk b/graphics/go-image/buildlink3.mk index ded8975c276..04921ac715c 100644 --- a/graphics/go-image/buildlink3.mk +++ b/graphics/go-image/buildlink3.mk @@ -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 diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 37d66e41913..af7ff8787e8 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -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" diff --git a/graphics/gpick/Makefile b/graphics/gpick/Makefile index ab535a0425d..0d5af05f7aa 100644 --- a/graphics/gpick/Makefile +++ b/graphics/gpick/Makefile @@ -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} diff --git a/graphics/graphite2/Makefile b/graphics/graphite2/Makefile index 4b0314f6b00..659426ffd56 100644 --- a/graphics/graphite2/Makefile +++ b/graphics/graphite2/Makefile @@ -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" diff --git a/graphics/gtkimageview/Makefile b/graphics/gtkimageview/Makefile index 3d7100aebe9..728de4ae57e 100644 --- a/graphics/gtkimageview/Makefile +++ b/graphics/gtkimageview/Makefile @@ -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 diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 2f85f23e5a0..26657517ec4 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -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.pal \ 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 diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 9eb05f1fa27..d1fa3bc63f0 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -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/Barcode/*.py 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" diff --git a/graphics/jpeg2ps/Makefile b/graphics/jpeg2ps/Makefile index a6cec78491e..8c40b248ee3 100644 --- a/graphics/jpeg2ps/Makefile +++ b/graphics/jpeg2ps/Makefile @@ -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/fileadmin/pdflib/products/more/jpeg2ps/ MAINTAINER= pkgsrc-users@NetBSD.org #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} diff --git a/graphics/libbpg/Makefile b/graphics/libbpg/Makefile index 2f62fa85a06..01b181f13df 100644 --- a/graphics/libbpg/Makefile +++ b/graphics/libbpg/Makefile @@ -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" diff --git a/graphics/libcaca/options.mk b/graphics/libcaca/options.mk index f8a36114884..bc4f9f64ca6 100644 --- a/graphics/libcaca/options.mk +++ b/graphics/libcaca/options.mk @@ -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 diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile index cd2b69abdac..91c0b9305b6 100644 --- a/graphics/libgdiplus/Makefile +++ b/graphics/libgdiplus/Makefile @@ -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-backend.pc.in 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 diff --git a/graphics/libjpeg-turbo/Makefile b/graphics/libjpeg-turbo/Makefile index 835dbce03bb..c650585d938 100644 --- a/graphics/libjpeg-turbo/Makefile +++ b/graphics/libjpeg-turbo/Makefile @@ -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 diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile index 3ed8f14eba6..5d593ce8bff 100644 --- a/graphics/libkdcraw/Makefile +++ b/graphics/libkdcraw/Makefile @@ -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:=applications/15.08.3/src/} .include "../../meta-pkgs/kde4/Makefile.kde4" -PKGCONFIG_OVERRIDE+= libkdcraw.pc.cmake +PKGCONFIG_OVERRIDE+= libkdcraw.pc.cmake .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile index 3c7747dc280..f6e09f49431 100644 --- a/graphics/libkexiv2/Makefile +++ b/graphics/libkexiv2/Makefile @@ -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:=applications/15.08.3/src/} .include "../../meta-pkgs/kde4/Makefile.kde4" -PKGCONFIG_OVERRIDE+= libkexiv2.pc.cmake +PKGCONFIG_OVERRIDE+= libkexiv2.pc.cmake .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile index ea14e5d3780..c0877c40765 100644 --- a/graphics/libkipi/Makefile +++ b/graphics/libkipi/Makefile @@ -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:=applications/15.08.3/src/} .include "../../meta-pkgs/kde4/Makefile.kde4" -PKGCONFIG_OVERRIDE+= libkipi.pc.cmake +PKGCONFIG_OVERRIDE+= libkipi.pc.cmake .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/graphics/libksane/Makefile b/graphics/libksane/Makefile index 0540e77e14d..77608cbcc03 100644 --- a/graphics/libksane/Makefile +++ b/graphics/libksane/Makefile @@ -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:=applications/15.08.3/src/} .include "../../meta-pkgs/kde4/Makefile.kde4" -PKGCONFIG_OVERRIDE+= libksane.pc.cmake +PKGCONFIG_OVERRIDE+= libksane.pc.cmake .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/graphics/libraw013/Makefile b/graphics/libraw013/Makefile index ab656194e4c..4e6d68d1d1a 100644 --- a/graphics/libraw013/Makefile +++ b/graphics/libraw013/Makefile @@ -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 @@ -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 diff --git a/graphics/librsvg/buildlink3.mk b/graphics/librsvg/buildlink3.mk index 6eedb777a57..6a3ae9fa5ba 100644 --- a/graphics/librsvg/buildlink3.mk +++ b/graphics/librsvg/buildlink3.mk @@ -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>=2.12.6nb1 .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" diff --git a/graphics/libscigraphica/Makefile b/graphics/libscigraphica/Makefile index 2de67e192f1..9378bdab1d6 100644 --- a/graphics/libscigraphica/Makefile +++ b/graphics/libscigraphica/Makefile @@ -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 diff --git a/graphics/libwmf/hacks.mk b/graphics/libwmf/hacks.mk index 99cb47af9ab..c9c98580d0d 100644 --- a/graphics/libwmf/hacks.mk +++ b/graphics/libwmf/hacks.mk @@ -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 diff --git a/graphics/magicpoint/options.mk b/graphics/magicpoint/options.mk index bc31190f179..5d1d4225101 100644 --- a/graphics/magicpoint/options.mk +++ b/graphics/magicpoint/options.mk @@ -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 diff --git a/graphics/mpgtx/Makefile b/graphics/mpgtx/Makefile index 87f1498ebf7..a2ee8291377 100644 --- a/graphics/mpgtx/Makefile +++ b/graphics/mpgtx/Makefile @@ -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 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 diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile index f94b139b7a7..75adcf48dcc 100644 --- a/graphics/mypaint/Makefile +++ b/graphics/mypaint/Makefile @@ -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 diff --git a/graphics/ncview/Makefile b/graphics/ncview/Makefile index 36f6d05368d..7f27c12f923 100644 --- a/graphics/ncview/Makefile +++ b/graphics/ncview/Makefile @@ -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 HOMEPAGE= http://meteora.ucsd.edu/~pierce/ncview_home_page.html diff --git a/graphics/nvtv/Makefile b/graphics/nvtv/Makefile index 6c384aa4b18..c08282c7364 100644 --- a/graphics/nvtv/Makefile +++ b/graphics/nvtv/Makefile @@ -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 settings on NVidia cards 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 diff --git a/graphics/oxygen-icons/Makefile b/graphics/oxygen-icons/Makefile index fbf5c6e4f2d..111e1ee2529 100644 --- a/graphics/oxygen-icons/Makefile +++ b/graphics/oxygen-icons/Makefile @@ -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++ diff --git a/graphics/p5-GDGraph-boxplot/Makefile b/graphics/p5-GDGraph-boxplot/Makefile index 827ea0801c6..312f0664fb6 100644 --- a/graphics/p5-GDGraph-boxplot/Makefile +++ b/graphics/p5-GDGraph-boxplot/Makefile @@ -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/GDGraph-boxplot 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 diff --git a/graphics/p5-clutter/Makefile b/graphics/p5-clutter/Makefile index a76dafad0f7..85107747986 100644 --- a/graphics/p5-clutter/Makefile +++ b/graphics/p5-clutter/Makefile @@ -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 series of the Clutter toolkit 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 diff --git a/graphics/paper-icon-theme/Makefile b/graphics/paper-icon-theme/Makefile index af8dcd6f35c..a3d2c143f93 100644 --- a/graphics/paper-icon-theme/Makefile +++ b/graphics/paper-icon-theme/Makefile @@ -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" diff --git a/graphics/png/hacks.mk b/graphics/png/hacks.mk index 81486c5ab64..e99efac8033 100644 --- a/graphics/png/hacks.mk +++ b/graphics/png/hacks.mk @@ -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 diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile index 905cb25de90..e3b68c866c4 100644 --- a/graphics/povray/Makefile +++ b/graphics/povray/Makefile @@ -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 diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 919641be547..e4379b4581c 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -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 diff --git a/graphics/py-chart/Makefile b/graphics/py-chart/Makefile index 1e57ff56e6b..d25cc58f723 100644 --- a/graphics/py-chart/Makefile +++ b/graphics/py-chart/Makefile @@ -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/PyChart 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" diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile index a6979b97f1d..b55fc246fc5 100644 --- a/graphics/py-goocanvas/Makefile +++ b/graphics/py-goocanvas/Makefile @@ -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" diff --git a/graphics/py-gtkglext/Makefile b/graphics/py-gtkglext/Makefile index 4f0ba0262dc..9f2bac408e6 100644 --- a/graphics/py-gtkglext/Makefile +++ b/graphics/py-gtkglext/Makefile @@ -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 diff --git a/graphics/py-leather/Makefile b/graphics/py-leather/Makefile index c34930610dd..81a439ac697 100644 --- a/graphics/py-leather/Makefile +++ b/graphics/py-leather/Makefile @@ -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 -HOMEPAGE= https://leather.readthedocs.io/ -COMMENT= Python charting library for those who need charts now -LICENSE= mit +MAINTAINER= pkgsrc-users@NetBSD.org +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" diff --git a/graphics/py-mcomix/Makefile b/graphics/py-mcomix/Makefile index 6930c057234..0016f06b73d 100644 --- a/graphics/py-mcomix/Makefile +++ b/graphics/py-mcomix/Makefile @@ -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:../../databases/py-sqlite3 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 diff --git a/graphics/py-openexr/Makefile b/graphics/py-openexr/Makefile index ecc5e4b680b..47a5a8f083c 100644 --- a/graphics/py-openexr/Makefile +++ b/graphics/py-openexr/Makefile @@ -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" diff --git a/graphics/py-piddle/Makefile b/graphics/py-piddle/Makefile index c1ac2367dfe..629e7ce580f 100644 --- a/graphics/py-piddle/Makefile +++ b/graphics/py-piddle/Makefile @@ -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 Little Else USE_LANGUAGES= # empty -PYTHON_VERSIONS_ACCEPTED= 27 +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-pycha/Makefile b/graphics/py-pycha/Makefile index 85590c69eed..965643ea0ae 100644 --- a/graphics/py-pycha/Makefile +++ b/graphics/py-pycha/Makefile @@ -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/pycha/} MAINTAINER= pkgsrc-users@NetBSD.org 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" diff --git a/graphics/py-uniconvertor/Makefile b/graphics/py-uniconvertor/Makefile index 45006f11425..0ddddd5ba17 100644 --- a/graphics/py-uniconvertor/Makefile +++ b/graphics/py-uniconvertor/Makefile @@ -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" diff --git a/graphics/qimageblitz/Makefile b/graphics/qimageblitz/Makefile index 882a1deedfa..1c9a3e0dfe7 100644 --- a/graphics/qimageblitz/Makefile +++ b/graphics/qimageblitz/Makefile @@ -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 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 diff --git a/graphics/qore-glut-module/Makefile b/graphics/qore-glut-module/Makefile index a956ae5c3e3..962d7a76b7c 100644 --- a/graphics/qore-glut-module/Makefile +++ b/graphics/qore-glut-module/Makefile @@ -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" diff --git a/graphics/qore-glut-module/options.mk b/graphics/qore-glut-module/options.mk index dd12adf3218..fb00778811d 100644 --- a/graphics/qore-glut-module/options.mk +++ b/graphics/qore-glut-module/options.mk @@ -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 diff --git a/graphics/qore-opengl-module/Makefile b/graphics/qore-opengl-module/Makefile index c51f370de14..d7a4fe18fdb 100644 --- a/graphics/qore-opengl-module/Makefile +++ b/graphics/qore-opengl-module/Makefile @@ -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: diff --git a/graphics/qore-opengl-module/options.mk b/graphics/qore-opengl-module/options.mk index d6771f3f4d4..cd0f7ac0721 100644 --- a/graphics/qore-opengl-module/options.mk +++ b/graphics/qore-opengl-module/options.mk @@ -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 diff --git a/graphics/qvplay/Makefile b/graphics/qvplay/Makefile index ae985861c73..4b8744f7002 100644 --- a/graphics/qvplay/Makefile +++ b/graphics/qvplay/Makefile @@ -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/~xg2k-hys/index-e.html 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 diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile index 78c4c555c9d..973fc7d8aef 100644 --- a/graphics/rayshade/Makefile +++ b/graphics/rayshade/Makefile @@ -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 diff --git a/graphics/refocus-it/Makefile b/graphics/refocus-it/Makefile index 170df063de8..01a5869b05f 100644 --- a/graphics/refocus-it/Makefile +++ b/graphics/refocus-it/Makefile @@ -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 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" diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile index 0c595b50e91..cb4877795cd 100644 --- a/graphics/ruby-imlib2/Makefile +++ b/graphics/ruby-imlib2/Makefile @@ -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 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} diff --git a/graphics/ruby-oily_png/Makefile b/graphics/ruby-oily_png/Makefile index e7141431ff0..f9dd441edac 100644 --- a/graphics/ruby-oily_png/Makefile +++ b/graphics/ruby-oily_png/Makefile @@ -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/chunky_png/wiki 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" diff --git a/graphics/scidavis/Makefile b/graphics/scidavis/Makefile index badc8fe1230..c2e1ca7c36b 100644 --- a/graphics/scidavis/Makefile +++ b/graphics/scidavis/Makefile @@ -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 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 diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile index 34eada6713a..5786dfad334 100644 --- a/graphics/skencil/Makefile +++ b/graphics/skencil/Makefile @@ -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]*:../../x11/py-Tk 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 diff --git a/graphics/spcaview/Makefile b/graphics/spcaview/Makefile index 88b89b8cc5d..98c1fa62979 100644 --- a/graphics/spcaview/Makefile +++ b/graphics/spcaview/Makefile @@ -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 diff --git a/graphics/tango-icon-theme/Makefile b/graphics/tango-icon-theme/Makefile index 4074de00fa4..b6c2cca95c5 100644 --- a/graphics/tango-icon-theme/Makefile +++ b/graphics/tango-icon-theme/Makefile @@ -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 diff --git a/graphics/tex-pictex-doc/Makefile b/graphics/tex-pictex-doc/Makefile index 4c283b1b956..5a46e0bb48c 100644 --- a/graphics/tex-pictex-doc/Makefile +++ b/graphics/tex-pictex-doc/Makefile @@ -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 -HOMEPAGE= http://ctan.org/pkg/pictex +HOMEPAGE= http://ctan.org/pkg/pictex COMMENT= Documentation for tex-pictex LICENSE= lppl-1.3c diff --git a/graphics/tex-tkz-base/Makefile b/graphics/tex-tkz-base/Makefile index d6536d979a7..d9d1e05ab90 100644 --- a/graphics/tex-tkz-base/Makefile +++ b/graphics/tex-tkz-base/Makefile @@ -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" diff --git a/graphics/tex-tkz-fct/Makefile b/graphics/tex-tkz-fct/Makefile index b7dca3e914a..11a47e979a3 100644 --- a/graphics/tex-tkz-fct/Makefile +++ b/graphics/tex-tkz-fct/Makefile @@ -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" diff --git a/graphics/tgif/hacks.mk b/graphics/tgif/hacks.mk index 0bce6d8c661..c4098f3654c 100644 --- a/graphics/tgif/hacks.mk +++ b/graphics/tgif/hacks.mk @@ -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 diff --git a/graphics/tuxpaint-stamps/Makefile b/graphics/tuxpaint-stamps/Makefile index ebc9f4485f1..9e0f88d7ad4 100644 --- a/graphics/tuxpaint-stamps/Makefile +++ b/graphics/tuxpaint-stamps/Makefile @@ -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: diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile index 604f98e00cc..9f0a8038bad 100644 --- a/graphics/urt/Makefile +++ b/graphics/urt/Makefile @@ -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 HOMEPAGE= http://www.cs.utah.edu/gdc/projects/urt/ @@ -17,21 +17,21 @@ COMMENT= Toolkit and library for raster image processing 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},' diff --git a/graphics/vtk/Makefile.vtkdist b/graphics/vtk/Makefile.vtkdist index 4fa0a488a58..23df1350782 100644 --- a/graphics/vtk/Makefile.vtkdist +++ b/graphics/vtk/Makefile.vtkdist @@ -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 \ diff --git a/graphics/wm-icons/Makefile b/graphics/wm-icons/Makefile index 83c54c6a5f0..cf46c43b983 100644 --- a/graphics/wm-icons/Makefile +++ b/graphics/wm-icons/Makefile @@ -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" diff --git a/graphics/xdot/Makefile b/graphics/xdot/Makefile index b5ad69fa46f..9535222969c 100644 --- a/graphics/xdot/Makefile +++ b/graphics/xdot/Makefile @@ -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: diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index c938762ce8d..5146ab10da0 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -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" diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile index 000e9d43df9..e09813d57b1 100644 --- a/graphics/xmorph/Makefile +++ b/graphics/xmorph/Makefile @@ -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 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 diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index 5006071de30..73bcb2442a8 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -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.net/ 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 diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index a2b58d76955..12f9f20aca5 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -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 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" diff --git a/graphics/zphoto/options.mk b/graphics/zphoto/options.mk index a45598d470a..b57b131ef92 100644 --- a/graphics/zphoto/options.mk +++ b/graphics/zphoto/options.mk @@ -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 |