git: 9d5f58f4b740 - main - graphics/pstoedit: switch to using the default-version of ImageMagick

From: Tobias C. Berner <tcberner_at_FreeBSD.org>
Date: Sat, 30 Oct 2021 17:32:52 UTC 
The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9d5f58f4b74069abdc80b5018f2667e82bbacdec

commit 9d5f58f4b74069abdc80b5018f2667e82bbacdec
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2021-10-30 17:26:26 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
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 <grahamperrin@gmail.com>
---
 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