Tue Apr 2 22:37:54 2024 UTC (54d)
ImageMagick6: make pango optional.


(nia)
diff -r1.68 -r1.69 pkgsrc/graphics/ImageMagick6/Makefile
diff -r1.8 -r1.9 pkgsrc/graphics/ImageMagick6/options.mk
cvs diff -r1.68 -r1.69 pkgsrc/graphics/ImageMagick6/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick6/Makefile 2024/01/04 01:32:08 1.68
+++ pkgsrc/graphics/ImageMagick6/Makefile 2024/04/02 22:37:53 1.69
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.68 2024/01/04 01:32:08 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.69 2024/04/02 22:37:53 nia Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= ImageMagick6-${DISTVERSION} 5PKGNAME= ImageMagick6-${DISTVERSION}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Package for display and interactive manipulation of images 8COMMENT= Package for display and interactive manipulation of images
9 9
10CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate' 10CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate'
11 11
12USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
13USE_TOOLS+= gmake pkg-config:run 13USE_TOOLS+= gmake pkg-config:run
14CONFIGURE_ARGS+= --disable-assert 14CONFIGURE_ARGS+= --disable-assert
@@ -94,22 +94,21 @@ SUBST_SED.fix-tools= -e 's,${TOOLS_DIR} @@ -94,22 +94,21 @@ SUBST_SED.fix-tools= -e 's,${TOOLS_DIR}
94 94
95# failed to convert strong functions and variables: Invalid type identifier 95# failed to convert strong functions and variables: Invalid type identifier
96CTF_FILES_SKIP+= lib/libMagickCore-6.Q16.so.5.0.0 96CTF_FILES_SKIP+= lib/libMagickCore-6.Q16.so.5.0.0
97CTF_FILES_SKIP+= lib/libMagickWand-6.Q16.so.5.0.0 97CTF_FILES_SKIP+= lib/libMagickWand-6.Q16.so.5.0.0
98CTF_FILES_SKIP+= lib/libMagickCore-6.Q16.so.* # CPU limit exceeded 98CTF_FILES_SKIP+= lib/libMagickCore-6.Q16.so.* # CPU limit exceeded
99 99
100post-install: 100post-install:
101 ${INSTALL_DATA} ${WRKSRC}/config/policy*xml ${DESTDIR}${EGDIR} 101 ${INSTALL_DATA} ${WRKSRC}/config/policy*xml ${DESTDIR}${EGDIR}
102 102
103.include "../../archivers/bzip2/buildlink3.mk" 103.include "../../archivers/bzip2/buildlink3.mk"
104.include "../../archivers/xz/buildlink3.mk" 104.include "../../archivers/xz/buildlink3.mk"
105.include "../../archivers/zstd/buildlink3.mk" 105.include "../../archivers/zstd/buildlink3.mk"
106.include "../../devel/libltdl/buildlink3.mk" 106.include "../../devel/libltdl/buildlink3.mk"
107.include "../../devel/pango/buildlink3.mk" 
108.include "../../graphics/freetype2/buildlink3.mk" 107.include "../../graphics/freetype2/buildlink3.mk"
109.include "../../graphics/lcms2/buildlink3.mk" 108.include "../../graphics/lcms2/buildlink3.mk"
110.include "../../graphics/libwebp/buildlink3.mk" 109.include "../../graphics/libwebp/buildlink3.mk"
111.include "../../graphics/png/buildlink3.mk" 110.include "../../graphics/png/buildlink3.mk"
112.include "../../graphics/tiff/buildlink3.mk" 111.include "../../graphics/tiff/buildlink3.mk"
113.include "../../math/fftw/buildlink3.mk" 112.include "../../math/fftw/buildlink3.mk"
114.include "../../textproc/libxml2/buildlink3.mk" 113.include "../../textproc/libxml2/buildlink3.mk"
115.include "../../mk/bsd.pkg.mk" 114.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/graphics/ImageMagick6/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick6/options.mk 2024/01/01 02:15:27 1.8
+++ pkgsrc/graphics/ImageMagick6/options.mk 2024/04/02 22:37:53 1.9
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: options.mk,v 1.8 2024/01/01 02:15:27 gutteridge Exp $ 1# $NetBSD: options.mk,v 1.9 2024/04/02 22:37:53 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick6 3PKG_OPTIONS_VAR= PKG_OPTIONS.ImageMagick6
4PKG_SUPPORTED_OPTIONS= doc fontconfig ghostscript x11 jp2 djvu openexr 4PKG_SUPPORTED_OPTIONS= doc fontconfig ghostscript x11 jp2 djvu openexr
5PKG_SUPPORTED_OPTIONS+= wmf fpx 5PKG_SUPPORTED_OPTIONS+= wmf fpx pango
6PKG_OPTIONS_REQUIRED_GROUPS= policy 6PKG_OPTIONS_REQUIRED_GROUPS= policy
7PKG_OPTIONS_GROUP.policy= imagemagick-policy-limited imagemagick-policy-open imagemagick-policy-secure imagemagick-policy-websafe 7PKG_OPTIONS_GROUP.policy= imagemagick-policy-limited imagemagick-policy-open imagemagick-policy-secure imagemagick-policy-websafe
8PKG_SUGGESTED_OPTIONS= doc fontconfig ghostscript x11 jp2 imagemagick-policy-open 8PKG_SUGGESTED_OPTIONS= doc fontconfig ghostscript x11 jp2 imagemagick-policy-open pango
9PKG_OPTIONS_LEGACY_OPTS+= jasper:jp2 9PKG_OPTIONS_LEGACY_OPTS+= jasper:jp2
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13PLIST_SRC+= PLIST 13PLIST_SRC+= PLIST
14 14
15.if !empty(PKG_OPTIONS:Mdoc) 15.if !empty(PKG_OPTIONS:Mdoc)
16PLIST_SRC+= PLIST.doc 16PLIST_SRC+= PLIST.doc
17.else 17.else
18CONFIGURE_ARGS+= --disable-docs 18CONFIGURE_ARGS+= --disable-docs
19.endif 19.endif
20 20
21.if !empty(PKG_OPTIONS:Mfontconfig) 21.if !empty(PKG_OPTIONS:Mfontconfig)
@@ -65,25 +65,32 @@ CONFIGURE_ARGS+= --without-openexr @@ -65,25 +65,32 @@ CONFIGURE_ARGS+= --without-openexr
65.include "../../graphics/libwmf/buildlink3.mk" 65.include "../../graphics/libwmf/buildlink3.mk"
66CONFIGURE_ARGS+= --with-wmf 66CONFIGURE_ARGS+= --with-wmf
67.else 67.else
68CONFIGURE_ARGS+= --without-wmf 68CONFIGURE_ARGS+= --without-wmf
69.endif 69.endif
70 70
71.if !empty(PKG_OPTIONS:Mfpx) 71.if !empty(PKG_OPTIONS:Mfpx)
72.include "../../graphics/libfpx/buildlink3.mk" 72.include "../../graphics/libfpx/buildlink3.mk"
73CONFIGURE_ARGS+= --with-fpx 73CONFIGURE_ARGS+= --with-fpx
74.else 74.else
75CONFIGURE_ARGS+= --without-fpx 75CONFIGURE_ARGS+= --without-fpx
76.endif 76.endif
77 77
 78.if !empty(PKG_OPTIONS:Mfpx)
 79.include "../../graphics/pango/buildlink3.mk"
 80CONFIGURE_ARGS+= --with-pango
 81.else
 82CONFIGURE_ARGS+= --without-pango
 83.endif
 84
78.if !empty(PKG_OPTIONS:Mimagemagick-policy-limited) 85.if !empty(PKG_OPTIONS:Mimagemagick-policy-limited)
79CONF_FILES+= ${EGDIR}/policy-limited.xml ${PKG_SYSCONFDIR}/policy.xml 86CONF_FILES+= ${EGDIR}/policy-limited.xml ${PKG_SYSCONFDIR}/policy.xml
80.endif 87.endif
81.if !empty(PKG_OPTIONS:Mimagemagick-policy-open) 88.if !empty(PKG_OPTIONS:Mimagemagick-policy-open)
82CONF_FILES+= ${EGDIR}/policy-open.xml ${PKG_SYSCONFDIR}/policy.xml 89CONF_FILES+= ${EGDIR}/policy-open.xml ${PKG_SYSCONFDIR}/policy.xml
83.endif 90.endif
84.if !empty(PKG_OPTIONS:Mimagemagick-policy-secure) 91.if !empty(PKG_OPTIONS:Mimagemagick-policy-secure)
85CONF_FILES+= ${EGDIR}/policy-secure.xml ${PKG_SYSCONFDIR}/policy.xml 92CONF_FILES+= ${EGDIR}/policy-secure.xml ${PKG_SYSCONFDIR}/policy.xml
86.endif 93.endif
87.if !empty(PKG_OPTIONS:Mimagemagick-policy-websafe) 94.if !empty(PKG_OPTIONS:Mimagemagick-policy-websafe)
88CONF_FILES+= ${EGDIR}/policy-websafe.xml ${PKG_SYSCONFDIR}/policy.xml 95CONF_FILES+= ${EGDIR}/policy-websafe.xml ${PKG_SYSCONFDIR}/policy.xml
89.endif 96.endif