Import of pkgsrc-2016Q3

graphics/GraphicsMagick/Makefile

@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.70 2015/06/12 10:50:08 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2016/09/07 06:29:31 wiz Exp $
 
-PKGREVISION= 1
 .include "Makefile.common"
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -17,7 +16,7 @@ USE_FEATURES=		vsnprintf	# optional but recommended for security
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--with-modules=yes
-CONFIGURE_ARGS+=	--with-gs-font-dir=${URW_FONTS_DIR}/share/fonts/urw
+CONFIGURE_ARGS+=	--with-gs-font-dir=${LOCALBASE}/share/fonts/urw
 CONFIGURE_ARGS+=	--with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
 CONFIGURE_ARGS+=	--with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
 CONFIGURE_ARGS+=	--without-perl
@@ -28,9 +27,6 @@ PKGCONFIG_OVERRIDE+=	Magick++/lib/GraphicsMagick++.pc.in
 
 TEST_TARGET=	check
 
-FIND_PREFIX:=	URW_FONTS_DIR=urw-fonts
-.include "../../mk/find-prefix.mk"
-
 .include "options.mk"
 
 .include "../../devel/libltdl/buildlink3.mk"
@@ -39,6 +35,7 @@ FIND_PREFIX:=	URW_FONTS_DIR=urw-fonts
 .include "../../graphics/jbigkit/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"

graphics/GraphicsMagick/Makefile.common

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.11 2015/03/02 09:57:03 adam Exp $
-#
+# $NetBSD: Makefile.common,v 1.15 2016/09/07 06:29:31 wiz Exp $
+# used by graphics/GraphicsMagick/Makefile
 # used by graphics/p5-GraphicsMagick/Makefile
 
 GM_MAJOR_VER=	1.3
-GM_MINOR_VER=	21
+GM_MINOR_VER=	25
 DISTVERSION=	${GM_MAJOR_VER}.${GM_MINOR_VER}
 DISTNAME=	GraphicsMagick-${DISTVERSION}
 CATEGORIES=	graphics

graphics/GraphicsMagick/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2015/03/02 09:57:03 adam Exp $
+@comment $NetBSD: PLIST,v 1.24 2016/09/07 06:29:31 wiz Exp $
 bin/GraphicsMagick++-config
 bin/GraphicsMagick-config
 bin/GraphicsMagickWand-config
@@ -151,7 +151,6 @@ lib/${PKGNAME}/modules-Q8/coders/preview.la
 lib/${PKGNAME}/modules-Q8/coders/ps.la
 lib/${PKGNAME}/modules-Q8/coders/ps2.la
 lib/${PKGNAME}/modules-Q8/coders/ps3.la
-lib/${PKGNAME}/modules-Q8/coders/psd.la
 lib/${PKGNAME}/modules-Q8/coders/pwp.la
 lib/${PKGNAME}/modules-Q8/coders/rgb.la
 lib/${PKGNAME}/modules-Q8/coders/rla.la
@@ -176,6 +175,7 @@ lib/${PKGNAME}/modules-Q8/coders/vicar.la
 lib/${PKGNAME}/modules-Q8/coders/vid.la
 lib/${PKGNAME}/modules-Q8/coders/viff.la
 lib/${PKGNAME}/modules-Q8/coders/wbmp.la
+lib/${PKGNAME}/modules-Q8/coders/webp.la
 lib/${PKGNAME}/modules-Q8/coders/wmf.la
 lib/${PKGNAME}/modules-Q8/coders/wpg.la
 ${PLIST.x11}lib/${PKGNAME}/modules-Q8/coders/x.la
@@ -215,6 +215,8 @@ share/doc/GraphicsMagick/ChangeLog.2010
 share/doc/GraphicsMagick/ChangeLog.2011
 share/doc/GraphicsMagick/ChangeLog.2012
 share/doc/GraphicsMagick/ChangeLog.2013
+share/doc/GraphicsMagick/ChangeLog.2014
+share/doc/GraphicsMagick/ChangeLog.2015
 share/doc/GraphicsMagick/Copyright.txt
 share/doc/GraphicsMagick/NEWS.txt
 share/doc/GraphicsMagick/www/ChangeLog-2001.html
@@ -231,6 +233,7 @@ share/doc/GraphicsMagick/www/ChangeLog-2011.html
 share/doc/GraphicsMagick/www/ChangeLog-2012.html
 share/doc/GraphicsMagick/www/ChangeLog-2013.html
 share/doc/GraphicsMagick/www/ChangeLog-2014.html
+share/doc/GraphicsMagick/www/ChangeLog-2015.html
 share/doc/GraphicsMagick/www/Changelog.html
 share/doc/GraphicsMagick/www/Changes.html
 share/doc/GraphicsMagick/www/Copyright.html
@@ -364,6 +367,7 @@ share/doc/GraphicsMagick/www/programming.html
 share/doc/GraphicsMagick/www/project.html
 share/doc/GraphicsMagick/www/quantize.html
 share/doc/GraphicsMagick/www/reference.html
+share/doc/GraphicsMagick/www/security.html
 share/doc/GraphicsMagick/www/smile.c
 share/doc/GraphicsMagick/www/time.html
 share/doc/GraphicsMagick/www/tools.html

graphics/GraphicsMagick/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2014/02/12 23:17:58 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2016/03/05 11:27:47 jperkin Exp $
 
 BUILDLINK_TREE+=	GraphicsMagick
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	GraphicsMagick
 GRAPHICSMAGICK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.GraphicsMagick+=	GraphicsMagick>=1.3.12nb6
-BUILDLINK_ABI_DEPENDS.GraphicsMagick+=	GraphicsMagick>=1.3.19nb1
+BUILDLINK_ABI_DEPENDS.GraphicsMagick+=	GraphicsMagick>=1.3.23nb3
 BUILDLINK_PKGSRCDIR.GraphicsMagick?=	../../graphics/GraphicsMagick
 
 pkgbase := GraphicsMagick

graphics/GraphicsMagick/distinfo

@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.37 2015/03/02 09:57:03 adam Exp $
+$NetBSD: distinfo,v 1.42 2016/09/07 06:29:31 wiz Exp $
 
-SHA1 (GraphicsMagick-1.3.21.tar.xz) = bd3c543520b810999348e52d4abad6b59069f78b
-RMD160 (GraphicsMagick-1.3.21.tar.xz) = 3291684d741854fe5922bc6754a7457513233647
-Size (GraphicsMagick-1.3.21.tar.xz) = 5324264 bytes
+SHA1 (GraphicsMagick-1.3.25.tar.xz) = 0dcf4c1f6f3ead29147ea0392a148ce50cd64bb4
+RMD160 (GraphicsMagick-1.3.25.tar.xz) = 6a4e8c415c3d268a46f1327c819d7ec2afd9bc60
+SHA512 (GraphicsMagick-1.3.25.tar.xz) = d62d6aee96d7b8444f1aa206b0c5cbbed9511612cb71d667af072ea52b68dcd11088699debc58faacbb014ad83fb8c2b3e474220f506069f7b5d22f0340f8ef8
+Size (GraphicsMagick-1.3.25.tar.xz) = 5387880 bytes
+SHA1 (patch-config_delegates.mgk.in) = c7a38daeeccd12e19480d1222e400899da1d4153

graphics/GraphicsMagick/patches/patch-config_delegates.mgk.in

@@ -0,0 +1,17 @@
+$NetBSD: patch-config_delegates.mgk.in,v 1.1 2016/06/06 11:46:34 wiz Exp $
+
+Avoid tools directory in installed file.
+
+--- config/delegates.mgk.in.orig	2016-05-30 17:19:54.000000000 +0000
++++ config/delegates.mgk.in
+@@ -98,8 +98,8 @@
+   <!-- Read CMYK Postscript, EPS, and PDF  -->
+   <delegate decode="gs-cmyk" stealth="True" command='"@PSDelegate@" -q -dBATCH -dSAFER -dMaxBitmap=50000000 -dNOPAUSE -sDEVICE=@GSCMYKDevice@ -dTextAlphaBits=%u -dGraphicsAlphaBits=%u -r%s %s "-sOutputFile=%s" -- "%s" -c quit' />
+ 
+-  <delegate decode="hpg" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" && @MVDelegate@ -f `basename "%o"` "%o"' />
+-  <delegate decode="hpgl" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" && @MVDelegate@ -f `basename "%o"` "%o"' />
++  <delegate decode="hpg" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" && mv -f `basename "%o"` "%o"' />
++  <delegate decode="hpgl" command='"@HPGLDecodeDelegate@" -q -m eps -f `basename "%o"` "%i" && mv -f `basename "%o"` "%o"' />
+   <!-- Read HTML file  -->
+   <delegate decode="htm" command='"@HTMLDecodeDelegate@" -U -o "%o" "%i"' />
+   <!-- Read HTML file  -->