CVS commit: pkgsrc/graphics/GraphicsMagick

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Nov 22 16:09:23 UTC 2018

Modified Files:
        pkgsrc/graphics/GraphicsMagick: Makefile buildlink3.mk
Added Files:
        pkgsrc/graphics/GraphicsMagick/patches: patch-configure

Log Message:
GraphicsMagick: commit missing patch, fix buildlink.mk


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/graphics/GraphicsMagick/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/GraphicsMagick/buildlink3.mk
cvs rdiff -u -r0 -r1.3 pkgsrc/graphics/GraphicsMagick/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/GraphicsMagick/Makefile
diff -u pkgsrc/graphics/GraphicsMagick/Makefile:1.93 pkgsrc/graphics/GraphicsMagick/Makefile:1.94
--- pkgsrc/graphics/GraphicsMagick/Makefile:1.93        Thu Nov 22 15:51:45 2018
+++ pkgsrc/graphics/GraphicsMagick/Makefile     Thu Nov 22 16:09:23 2018
@@ -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+=  magick/GraphicsMagi
 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"

Index: pkgsrc/graphics/GraphicsMagick/buildlink3.mk
diff -u pkgsrc/graphics/GraphicsMagick/buildlink3.mk:1.42 pkgsrc/graphics/GraphicsMagick/buildlink3.mk:1.43
--- pkgsrc/graphics/GraphicsMagick/buildlink3.mk:1.42   Wed Nov 14 22:21:34 2018
+++ pkgsrc/graphics/GraphicsMagick/buildlink3.mk        Thu Nov 22 16:09:23 2018
@@ -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 @@ pkgbase := GraphicsMagick
 .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"

Added files:

Index: pkgsrc/graphics/GraphicsMagick/patches/patch-configure
diff -u /dev/null pkgsrc/graphics/GraphicsMagick/patches/patch-configure:1.3
--- /dev/null   Thu Nov 22 16:09:23 2018
+++ pkgsrc/graphics/GraphicsMagick/patches/patch-configure      Thu Nov 22 16:09:23 2018
@@ -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