diff options
| author | jperkin <jperkin@pkgsrc.org> | 2020-10-22 11:22:56 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2020-10-22 11:22:56 +0000 |
| commit | 67aa7fedc64c122067092b86f3c15afe1cbdc77f (patch) | |
| tree | 104e22fba2687e9942a6d68074a9a32f90eb67e9 /graphics | |
| parent | 0907d05a5e5d3229c54a4fea8bb9547c39d49dfc (diff) | |
| download | pkgsrc-67aa7fedc64c122067092b86f3c15afe1cbdc77f.tar.gz | |
ImageMagick*: Move CTF skip to the correct package.
Was added to ImageMagick instead of ImageMagick6. Pointed out by wiz.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/ImageMagick/Makefile | 3 | ||||
| -rw-r--r-- | graphics/ImageMagick6/Makefile | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 7ee5d994a91..5e3d4769210 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -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-config,g' # 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 --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile index 7ba0f9f9d24..5981afa8cb4 100644 --- a/graphics/ImageMagick6/Makefile +++ b/graphics/ImageMagick6/Makefile @@ -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},,g' # 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" |