[pkgsrc/trunk]: pkgsrc/graphics/GraphicsMagick GraphicsMagick: commit missing...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1600d5ad49f8
branches:  trunk
changeset: 315374:1600d5ad49f8
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Nov 22 16:09:23 2018 +0000

description:
GraphicsMagick: commit missing patch, fix buildlink.mk

diffstat:

 graphics/GraphicsMagick/Makefile                |   4 +---
 graphics/GraphicsMagick/buildlink3.mk           |   9 ++-------
 graphics/GraphicsMagick/patches/patch-configure |  16 ++++++++++++++++
 3 files changed, 19 insertions(+), 10 deletions(-)

diffs (63 lines):

diff -r a96ca0760e73 -r 1600d5ad49f8 graphics/GraphicsMagick/Makefile
--- a/graphics/GraphicsMagick/Makefile  Thu Nov 22 15:51:45 2018 +0000
+++ b/graphics/GraphicsMagick/Makefile  Thu Nov 22 16:09:23 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2018/11/22 15:51:45 prlw1 Exp $
+# $NetBSD: Makefile,v 1.94 2018/11/22 16:09:23 adam Exp $
 
 .include "Makefile.common"
 
@@ -25,8 +25,6 @@
 PKGCONFIG_OVERRIDE+=   wand/GraphicsMagickWand.pc.in
 PKGCONFIG_OVERRIDE+=   Magick++/lib/GraphicsMagick++.pc.in
 
-CHECK_WRKREF_SKIP=     ${PREFIX}/lib/libGraphicsMagick.*
-
 TEST_TARGET=   check
 
 .include "options.mk"
diff -r a96ca0760e73 -r 1600d5ad49f8 graphics/GraphicsMagick/buildlink3.mk
--- a/graphics/GraphicsMagick/buildlink3.mk     Thu Nov 22 15:51:45 2018 +0000
+++ b/graphics/GraphicsMagick/buildlink3.mk     Thu Nov 22 16:09:23 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.42 2018/11/14 22:21:34 kleink Exp $
+# $NetBSD: buildlink3.mk,v 1.43 2018/11/22 16:09:23 adam Exp $
 
 BUILDLINK_TREE+=       GraphicsMagick
 
@@ -21,14 +21,9 @@
 .include "../../x11/libXext/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mbzip2)
 .include "../../archivers/bzip2/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mlzma)
 .include "../../archivers/xz/buildlink3.mk"
-.endif
-
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff -r a96ca0760e73 -r 1600d5ad49f8 graphics/GraphicsMagick/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/GraphicsMagick/patches/patch-configure   Thu Nov 22 16:09:23 2018 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure,v 1.3 2018/11/22 16:09:23 adam Exp $
+
+Do not save configure args; they reference workdir.
+
+--- configure.orig     2018-11-20 10:05:54.000000000 +0000
++++ configure
+@@ -30127,9 +30127,6 @@ MAGICK_API_LIBS=`echo $MAGICK_API_LIBS |
+ 
+ # Save configure/build parameters for later reference
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define GM_BUILD_CONFIGURE_ARGS "$0 ${ac_configure_args}"
+-_ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF