Mon Jun 8 11:44:41 2020 UTC ()
ImageMagick: Fix and future-proof CTF_FILES_SKIP.


(jperkin)
diff -r1.268 -r1.269 pkgsrc/graphics/ImageMagick/Makefile
cvs diff -r1.268 -r1.269 pkgsrc/graphics/ImageMagick/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile 2020/06/02 08:22:42 1.268
+++ pkgsrc/graphics/ImageMagick/Makefile 2020/06/08 11:44:41 1.269
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.268 2020/06/02 08:22:42 adam Exp $ 1# $NetBSD: Makefile,v 1.269 2020/06/08 11:44:41 jperkin Exp $
2 2
3PKGREVISION= 2 3PKGREVISION= 2
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6PKGNAME= ImageMagick-${DISTVERSION} 6PKGNAME= ImageMagick-${DISTVERSION}
7 7
8MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
9COMMENT= Package for display and interactive manipulation of images 9COMMENT= Package for display and interactive manipulation of images
10 10
11CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate' 11CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate'
12 12
13USE_LANGUAGES= c c++ c99 13USE_LANGUAGES= c c++ c99
14USE_TOOLS+= gmake pkg-config:run 14USE_TOOLS+= gmake pkg-config:run
@@ -73,28 +73,28 @@ SUBST_STAGE.fix-tools= pre-install @@ -73,28 +73,28 @@ SUBST_STAGE.fix-tools= pre-install
73SUBST_MESSAGE.fix-tools= Unwrapping tools path in delegate paths. 73SUBST_MESSAGE.fix-tools= Unwrapping tools path in delegate paths.
74SUBST_FILES.fix-tools= config/delegates.xml 74SUBST_FILES.fix-tools= config/delegates.xml
75SUBST_SED.fix-tools= -e 's,${TOOLS_DIR},,g' 75SUBST_SED.fix-tools= -e 's,${TOOLS_DIR},,g'
76 76
77SUBST_CLASSES+= fix-pc 77SUBST_CLASSES+= fix-pc
78SUBST_STAGE.fix-pc= pre-configure 78SUBST_STAGE.fix-pc= pre-configure
79SUBST_MESSAGE.fix-pc= Unwrapping pkg-config path in installed helper tools. 79SUBST_MESSAGE.fix-pc= Unwrapping pkg-config path in installed helper tools.
80SUBST_FILES.fix-pc+= Magick++/bin/Magick++-config.in 80SUBST_FILES.fix-pc+= Magick++/bin/Magick++-config.in
81SUBST_FILES.fix-pc+= MagickCore/MagickCore-config.in 81SUBST_FILES.fix-pc+= MagickCore/MagickCore-config.in
82SUBST_FILES.fix-pc+= MagickWand/MagickWand-config.in 82SUBST_FILES.fix-pc+= MagickWand/MagickWand-config.in
83SUBST_SED.fix-pc= -e 's,@PKG_CONFIG@,pkg-config,g' 83SUBST_SED.fix-pc= -e 's,@PKG_CONFIG@,pkg-config,g'
84 84
85# failed to convert strong functions and variables: Invalid type identifier 85# failed to convert strong functions and variables: Invalid type identifier
86CTF_FILES_SKIP+= lib/libMagickCore-7.Q16HDRI.so.4.0.0 86CTF_FILES_SKIP+= lib/libMagickCore-7.Q16HDRI.so.*
87CTF_FILES_SKIP+= lib/libMagickWand-7.Q16HDRI.so.4.0.0 87CTF_FILES_SKIP+= lib/libMagickWand-7.Q16HDRI.so.*
88 88
89.include "../../archivers/bzip2/buildlink3.mk" 89.include "../../archivers/bzip2/buildlink3.mk"
90.include "../../archivers/xz/buildlink3.mk" 90.include "../../archivers/xz/buildlink3.mk"
91.include "../../devel/libltdl/buildlink3.mk" 91.include "../../devel/libltdl/buildlink3.mk"
92.include "../../fonts/fontconfig/buildlink3.mk" 92.include "../../fonts/fontconfig/buildlink3.mk"
93.include "../../graphics/freetype2/buildlink3.mk" 93.include "../../graphics/freetype2/buildlink3.mk"
94.include "../../mk/jpeg.buildlink3.mk" 94.include "../../mk/jpeg.buildlink3.mk"
95.include "../../graphics/lcms2/buildlink3.mk" 95.include "../../graphics/lcms2/buildlink3.mk"
96.include "../../graphics/libwebp/buildlink3.mk" 96.include "../../graphics/libwebp/buildlink3.mk"
97.include "../../graphics/png/buildlink3.mk" 97.include "../../graphics/png/buildlink3.mk"
98.include "../../graphics/tiff/buildlink3.mk" 98.include "../../graphics/tiff/buildlink3.mk"
99.include "../../math/fftw/buildlink3.mk" 99.include "../../math/fftw/buildlink3.mk"
100.include "../../print/ghostscript/buildlink3.mk" 100.include "../../print/ghostscript/buildlink3.mk"