[pkgsrc/trunk]: pkgsrc/graphics ImageMagick*: Move CTF skip to the correct pa...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fa9c6a85cfd3
branches:  trunk
changeset: 440961:fa9c6a85cfd3
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Oct 22 11:22:56 2020 +0000

description:
ImageMagick*: Move CTF skip to the correct package.

Was added to ImageMagick instead of ImageMagick6.  Pointed out by wiz.

diffstat:

 graphics/ImageMagick/Makefile  |  3 +--
 graphics/ImageMagick6/Makefile |  3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 4c7929def578 -r fa9c6a85cfd3 graphics/ImageMagick/Makefile
--- a/graphics/ImageMagick/Makefile     Thu Oct 22 11:15:04 2020 +0000
+++ b/graphics/ImageMagick/Makefile     Thu Oct 22 11:22:56 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.279 2020/10/22 11:07:45 jperkin Exp $
+# $NetBSD: Makefile,v 1.280 2020/10/22 11:22:56 jperkin Exp $
 
 .include "Makefile.common"
 
@@ -84,7 +84,6 @@
 # failed to convert strong functions and variables: Invalid type identifier
 CTF_FILES_SKIP+=       lib/libMagickCore-7.Q16HDRI.so.*
 CTF_FILES_SKIP+=       lib/libMagickWand-7.Q16HDRI.so.*
-CTF_FILES_SKIP+=       lib/libMagickCore-6.Q16.so.*    # CPU limit exceeded
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
diff -r 4c7929def578 -r fa9c6a85cfd3 graphics/ImageMagick6/Makefile
--- a/graphics/ImageMagick6/Makefile    Thu Oct 22 11:15:04 2020 +0000
+++ b/graphics/ImageMagick6/Makefile    Thu Oct 22 11:22:56 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2020/08/31 18:09:36 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2020/10/22 11:22:56 jperkin Exp $
 
 PKGREVISION= 4
 .include "Makefile.common"
@@ -102,6 +102,7 @@
 # failed to convert strong functions and variables: Invalid type identifier
 CTF_FILES_SKIP+=       lib/libMagickCore-6.Q16.so.5.0.0
 CTF_FILES_SKIP+=       lib/libMagickWand-6.Q16.so.5.0.0
+CTF_FILES_SKIP+=       lib/libMagickCore-6.Q16.so.*    # CPU limit exceeded
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"