Date: Thu, 11 Feb 2021 17:16:28 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564968 - in head: Mk print/cups-filters Message-ID: <202102111716.11BHGSss019175@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu Feb 11 17:16:28 2021 New Revision: 564968 URL: https://svnweb.freebsd.org/changeset/ports/564968 Log: Introduce ImageMagick default version and use it in print/cups-filters. The different versions of ImageMagick in the ports tree all conflict with each other and some ports can depend on either of them so it's a perfect candidate for the default-versions framework. PR: 252335 Submitted by: VVD <vvd@unislabs.com> Modified: head/Mk/bsd.default-versions.mk head/print/cups-filters/Makefile Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Thu Feb 11 17:13:59 2021 (r564967) +++ head/Mk/bsd.default-versions.mk Thu Feb 11 17:16:28 2021 (r564968) @@ -20,8 +20,8 @@ _INCLUDE_BSD_DEFAULT_VERSIONS_MK= yes LOCALBASE?= /usr/local .for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \ - JAVA JULIA LAZARUS LIBRSVG2 LINUX LLVM LUA MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 \ - PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH + IMAGEMAGICK JAVA JULIA LAZARUS LIBRSVG2 LINUX LLVM LUA MYSQL PERL5 \ + PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH .if defined(${lang}_DEFAULT) ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf" .endif @@ -55,6 +55,8 @@ GCC_DEFAULT?= 10 .endif # Possible values: 7, 8, 9, agpl GHOSTSCRIPT_DEFAULT?= agpl +# Possible values: 6 7 +IMAGEMAGICK_DEFAULT?= 7 # Possible values: 7, 8, 11, 12, 13, 14, 15 JAVA_DEFAULT?= 8 # Possible values: 0.6, 0.7, 1.0, 1.1 Modified: head/print/cups-filters/Makefile ============================================================================== --- head/print/cups-filters/Makefile Thu Feb 11 17:13:59 2021 (r564967) +++ head/print/cups-filters/Makefile Thu Feb 11 17:16:28 2021 (r564968) @@ -61,7 +61,7 @@ BRAILLE_DESC= Braille embosser support BRAILLE_BUILD_DEPENDS= bash:shells/bash BRAILLE_LIB_DEPENDS= liblouis.so:devel/liblouis \ # liblouisutdml.so:devel/liblouisutdml -BRAILLE_RUN_DEPENDS= convert:graphics/ImageMagick6 \ +BRAILLE_RUN_DEPENDS= convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} \ pdftotext:graphics/poppler-utils \ bash:shells/bash
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102111716.11BHGSss019175>