From nobody Sat Oct 30 17:32:52 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A4AD7181AEA9; Sat, 30 Oct 2021 17:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HhRFw3VfQz3tfq; Sat, 30 Oct 2021 17:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 45B806ABC; Sat, 30 Oct 2021 17:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19UHWqxm016497; Sat, 30 Oct 2021 17:32:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19UHWqn7016496; Sat, 30 Oct 2021 17:32:52 GMT (envelope-from git) Date: Sat, 30 Oct 2021 17:32:52 GMT Message-Id: <202110301732.19UHWqn7016496@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 9d5f58f4b740 - main - graphics/pstoedit: switch to using the default-version of ImageMagick List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d5f58f4b74069abdc80b5018f2667e82bbacdec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d5f58f4b74069abdc80b5018f2667e82bbacdec commit 9d5f58f4b74069abdc80b5018f2667e82bbacdec Author: Tobias C. Berner AuthorDate: 2021-10-30 17:26:26 +0000 Commit: Tobias C. Berner CommitDate: 2021-10-30 17:32:41 +0000 graphics/pstoedit: switch to using the default-version of ImageMagick editors/calligra would pull in graphics/ImageMagick6 making it incompatible with other software relying on ImageMagick7. The ports framework already supports depending on a default-version of ImageMagick using bsd.default-versions.mk's ${IMAGEMAGICK_DEFAULT}, and a patch to support building graphics/pstoedit was added by mi@ in 2017 in 0d908edaeb50afbbc115905bcc9c9a241c59c839 - however the dependency line was never adopted to it. Reported by: Graham Perrin --- graphics/pstoedit/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index c3a7d7a05c93..188a3f6049d9 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -2,7 +2,7 @@ PORTNAME= pstoedit PORTVERSION= 3.70 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics print MASTER_SITES= SF @@ -32,7 +32,7 @@ EMF_DESC= WMF/EMF support via libEMF EMF_LIB_DEPENDS= libEMF.so:graphics/libemf EMF_CONFIGURE_ON= --with-libemf-include=${LOCALBASE}/include/libEMF EMF_CONFIGURE_OFF= --without-emf -MAGICK_LIB_DEPENDS= libMagick++-*.so:graphics/ImageMagick6 +MAGICK_LIB_DEPENDS= libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} MAGICK_CONFIGURE_ON= --with-magick MAGICK_CONFIGURE_OFF= --without-magick MING_DESC= Flash support via Ming