CVS commit: pkgsrc/graphics/ImageMagick6

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Apr  2 22:37:54 UTC 2024

Modified Files:
        pkgsrc/graphics/ImageMagick6: Makefile options.mk

Log Message:
ImageMagick6: make pango optional.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/graphics/ImageMagick6/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/ImageMagick6/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/ImageMagick6/Makefile
diff -u pkgsrc/graphics/ImageMagick6/Makefile:1.68 pkgsrc/graphics/ImageMagick6/Makefile:1.69
--- pkgsrc/graphics/ImageMagick6/Makefile:1.68  Thu Jan  4 01:32:08 2024
+++ pkgsrc/graphics/ImageMagick6/Makefile       Tue Apr  2 22:37:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2024/01/04 01:32:08 gutteridge Exp $
+# $NetBSD: Makefile,v 1.69 2024/04/02 22:37:53 nia Exp $
 
 .include "Makefile.common"
 
@@ -104,7 +104,6 @@ post-install:
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"

Index: pkgsrc/graphics/ImageMagick6/options.mk
diff -u pkgsrc/graphics/ImageMagick6/options.mk:1.8 pkgsrc/graphics/ImageMagick6/options.mk:1.9
--- pkgsrc/graphics/ImageMagick6/options.mk:1.8 Mon Jan  1 02:15:27 2024
+++ pkgsrc/graphics/ImageMagick6/options.mk     Tue Apr  2 22:37:53 2024
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.8 2024/01/01 02:15:27 gutteridge Exp $
+# $NetBSD: options.mk,v 1.9 2024/04/02 22:37:53 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ImageMagick6
 PKG_SUPPORTED_OPTIONS=         doc fontconfig ghostscript x11 jp2 djvu openexr
-PKG_SUPPORTED_OPTIONS+=                wmf fpx
+PKG_SUPPORTED_OPTIONS+=                wmf fpx pango
 PKG_OPTIONS_REQUIRED_GROUPS=   policy
 PKG_OPTIONS_GROUP.policy=      imagemagick-policy-limited imagemagick-policy-open imagemagick-policy-secure imagemagick-policy-websafe
-PKG_SUGGESTED_OPTIONS=         doc fontconfig ghostscript x11 jp2 imagemagick-policy-open
+PKG_SUGGESTED_OPTIONS=         doc fontconfig ghostscript x11 jp2 imagemagick-policy-open pango
 PKG_OPTIONS_LEGACY_OPTS+=      jasper:jp2
 
 .include "../../mk/bsd.options.mk"
@@ -75,6 +75,13 @@ CONFIGURE_ARGS+=     --with-fpx
 CONFIGURE_ARGS+=       --without-fpx
 .endif
 
+.if !empty(PKG_OPTIONS:Mfpx)
+.include "../../graphics/pango/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-pango
+.else
+CONFIGURE_ARGS+=       --without-pango
+.endif
+
 .if !empty(PKG_OPTIONS:Mimagemagick-policy-limited)
 CONF_FILES+=           ${EGDIR}/policy-limited.xml ${PKG_SYSCONFDIR}/policy.xml
 .endif