Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 409541A923E for ; Thu, 22 Oct 2020 11:22:58 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id D59E884E70; Thu, 22 Oct 2020 11:22:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5DDD384D51 for ; Thu, 22 Oct 2020 11:22:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id DYdyoT6ReZnE for ; Thu, 22 Oct 2020 11:22:56 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D774484CDC for ; Thu, 22 Oct 2020 11:22:56 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D3AE2FB28; Thu, 22 Oct 2020 11:22:56 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1603365776296010" MIME-Version: 1.0 Date: Thu, 22 Oct 2020 11:22:56 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/graphics To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20201022112256.D3AE2FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1603365776296010 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1603365776296010 Content-Disposition: inline Content-Length: 1733 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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" --_----------=_1603365776296010--