CVS commit: pkgsrc/graphics

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Oct 22 11:22:56 UTC 2020

Modified Files:
        pkgsrc/graphics/ImageMagick: Makefile
        pkgsrc/graphics/ImageMagick6: Makefile

Log Message:
ImageMagick*: Move CTF skip to the correct package.

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


To generate a diff of this commit:
cvs rdiff -u -r1.279 -r1.280 pkgsrc/graphics/ImageMagick/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/graphics/ImageMagick6/Makefile

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

Modified files:

Index: pkgsrc/graphics/ImageMagick/Makefile
diff -u pkgsrc/graphics/ImageMagick/Makefile:1.279 pkgsrc/graphics/ImageMagick/Makefile:1.280
--- pkgsrc/graphics/ImageMagick/Makefile:1.279  Thu Oct 22 11:07:45 2020
+++ pkgsrc/graphics/ImageMagick/Makefile        Thu Oct 22 11:22:56 2020
@@ -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 @@ SUBST_SED.fix-pc=     -e 's,@PKG_CONFIG@,pkg
 # 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"

Index: pkgsrc/graphics/ImageMagick6/Makefile
diff -u pkgsrc/graphics/ImageMagick6/Makefile:1.36 pkgsrc/graphics/ImageMagick6/Makefile:1.37
--- pkgsrc/graphics/ImageMagick6/Makefile:1.36  Mon Aug 31 18:09:36 2020
+++ pkgsrc/graphics/ImageMagick6/Makefile       Thu Oct 22 11:22:56 2020
@@ -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 @@ SUBST_SED.fix-tools=                -e 's,${TOOLS_DIR}
 # 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"