diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2021-02-11 17:16:28 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2021-02-11 17:16:28 +0000 |
commit | 29d82d41f847dc8a45d612805ea837645cb9457e (patch) | |
tree | 521309313e2ea16fa375c42f20b0660881d488f2 | |
parent | 30d5076d8ab38a4367702dfb9f58d571907d0770 (diff) | |
download | ports-29d82d41f847dc8a45d612805ea837645cb9457e.tar.gz ports-29d82d41f847dc8a45d612805ea837645cb9457e.zip |
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>
Notes
Notes:
svn path=/head/; revision=564968
-rw-r--r-- | Mk/bsd.default-versions.mk | 6 | ||||
-rw-r--r-- | print/cups-filters/Makefile | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index d2f57b58e9e0..b5c8bd323d51 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -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 diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index 407fdec2ad21..32683be13dbe 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -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 |