CVS commit: pkgsrc/graphics/GraphicsMagick

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Nov  9 20:55:19 UTC 2023

Modified Files:
        pkgsrc/graphics/GraphicsMagick: Makefile buildlink3.mk options.mk

Log Message:
GraphicsMagick: Make zstd optional, disabled by default.

Rationale: zstd support is only used for tiff files. Since this is a
non-standard extension, it can be assumed to be extremely rare for what's
already a quite uncommon image file format.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/graphics/GraphicsMagick/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/graphics/GraphicsMagick/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/GraphicsMagick/options.mk

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

Modified files:

Index: pkgsrc/graphics/GraphicsMagick/Makefile
diff -u pkgsrc/graphics/GraphicsMagick/Makefile:1.133 pkgsrc/graphics/GraphicsMagick/Makefile:1.134
--- pkgsrc/graphics/GraphicsMagick/Makefile:1.133       Wed Nov  8 13:19:26 2023
+++ pkgsrc/graphics/GraphicsMagick/Makefile     Thu Nov  9 20:55:19 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.133 2023/11/08 13:19:26 wiz Exp $
+# $NetBSD: Makefile,v 1.134 2023/11/09 20:55:19 nia Exp $
 
-PKGREVISION= 6
+PKGREVISION= 7
 .include "Makefile.common"
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -32,7 +32,6 @@ TEST_TARGET=  check
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
-.include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"

Index: pkgsrc/graphics/GraphicsMagick/buildlink3.mk
diff -u pkgsrc/graphics/GraphicsMagick/buildlink3.mk:1.62 pkgsrc/graphics/GraphicsMagick/buildlink3.mk:1.63
--- pkgsrc/graphics/GraphicsMagick/buildlink3.mk:1.62   Wed Nov  8 13:19:26 2023
+++ pkgsrc/graphics/GraphicsMagick/buildlink3.mk        Thu Nov  9 20:55:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.62 2023/11/08 13:19:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.63 2023/11/09 20:55:19 nia Exp $
 
 BUILDLINK_TREE+=       GraphicsMagick
 
@@ -20,10 +20,12 @@ pkgbase := GraphicsMagick
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .endif
+.if ${PKG_BUILD_OPTIONS.GraphicsMagick:Mzstd}
+.include "../../archivers/zstd/buildlink3.mk"
+.endif
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
-.include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"

Index: pkgsrc/graphics/GraphicsMagick/options.mk
diff -u pkgsrc/graphics/GraphicsMagick/options.mk:1.11 pkgsrc/graphics/GraphicsMagick/options.mk:1.12
--- pkgsrc/graphics/GraphicsMagick/options.mk:1.11      Thu Sep 29 09:21:10 2022
+++ pkgsrc/graphics/GraphicsMagick/options.mk   Thu Nov  9 20:55:19 2023
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.11 2022/09/29 09:21:10 nros Exp $
+# $NetBSD: options.mk,v 1.12 2023/11/09 20:55:19 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.GraphicsMagick
-PKG_SUPPORTED_OPTIONS= x11 jasper ghostscript wmf fpx
+PKG_SUPPORTED_OPTIONS= x11 jasper ghostscript wmf fpx zstd
 PKG_SUGGESTED_OPTIONS= x11
 
 .include "../../mk/bsd.options.mk"
@@ -45,3 +45,9 @@ PLIST.fpx=            yes
 .else
 CONFIGURE_ARGS+=       --without-fpx
 .endif
+
+.if !empty(PKG_OPTIONS:Mzstd)
+.include "../../archivers/zstd/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-zstd
+.endif