Index: head/Mk/bsd.default-versions.mk
===================================================================
--- head/Mk/bsd.default-versions.mk	(revision 564967)
+++ head/Mk/bsd.default-versions.mk	(revision 564968)
@@ -1,155 +1,157 @@
 # $FreeBSD$
 #
 # MAINTAINER:	ports@FreeBSD.org
 #
 # Note: before committing to this file, contact portmgr to arrange for an
 # experimental ports run.  Untested commits may be backed out at portmgr's
 # discretion.
 #
 # Provide default versions for ports with multiple versions selectable
 # by the user.
 #
 # Users who want to override these defaults can easily do so by defining
 # DEFAULT_VERSIONS in their make.conf as follows:
 #
 #   DEFAULT_VERSIONS=	perl5=5.20 ruby=2.0
 
 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK)
 _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
 #.undef ${lang}_DEFAULT
 .endfor
 
 .for lang in ${DEFAULT_VERSIONS}
 _l=		${lang:C/=.*//g}
 ${_l:tu}_DEFAULT=	${lang:C/.*=//g}
 .endfor
 
 # Possible values: 2.4
 APACHE_DEFAULT?=	2.4
 # Possible values: 5, 6, 18
 BDB_DEFAULT?=		5
 # Possible values: 2, 3
 COROSYNC_DEFAULT?=	2
 # Possible_values: full canna nox devel_full devel_nox
 #EMACS_DEFAULT?=	let the flavor be the default if not explicitly set
 # Possible values: 2.5
 FIREBIRD_DEFAULT?=	2.5
 # Possible values: flang (experimental), gfortran
 FORTRAN_DEFAULT?=	gfortran
 # Possible values: 3.2.0
 FPC_DEFAULT?=		3.2.0
 # Possible values: 8, 9 (powerpcspe was dropped with GCC 9), 10
 .if ${ARCH} == "powerpcspe"
 GCC_DEFAULT?=		8
 .else
 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
 JULIA_DEFAULT?=		1.0
 # Possible values: 2.0.10
 LAZARUS_DEFAULT?=	2.0.10
 # Possible values: rust legacy
 .if empty(ARCH:Naarch64:Narmv6:Narmv7:Namd64:Ni386:Npowerpc64:Npowerpc64le)
 LIBRSVG2_DEFAULT?=	rust
 .else
 LIBRSVG2_DEFAULT?=	legacy
 .endif
 # Possible values: c7
 LINUX_DEFAULT?=		c7
 # Possible values: 60, 70, 80, 90, 10, 11, -devel (to be used when non-base compiler is required)
 # Please give notice to the Graphics Team (x11@FreeBSD.org) in advance before 
 # bumping the LLVM version.
 LLVM_DEFAULT?=		90
 # Possible values: 5.1, 5.2, 5.3, 5.4
 LUA_DEFAULT?=		5.2
 # Possible values: 5.10, 5.20, 6.8
 MONO_DEFAULT=		5.10
 # Possible values: 5.5, 5.6, 5.7, 8.0, 10.3m, 10.4m, 10.5m, 5.5p, 5.6p, 5.7p, 5.6w, 5.7w
 MYSQL_DEFAULT?=		5.7
 # Possible values: 5.28, 5.30, 5.32, devel
 .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
     defined(PACKAGE_BUILDING))
 PERL5_DEFAULT?=		5.32
 .elif !defined(PERL5_DEFAULT)
 # There's no need to replace development versions, like "5.23" with "devel"
 # because 1) nobody is supposed to use it outside of poudriere, and 2) it must
 # be set manually in /etc/make.conf in the first place, and we're never getting
 # in here.
 .if !defined(_PERL5_FROM_BIN)
 _PERL5_FROM_BIN!=	${LOCALBASE}/bin/perl -e 'printf "%vd\n", $$^V;'
 .endif
 _EXPORTED_VARS+=	_PERL5_FROM_BIN
 PERL5_DEFAULT:=		${_PERL5_FROM_BIN:R}
 .endif
 # Possible values: 9.5, 9.6, 10, 11, 12, 13
 PGSQL_DEFAULT?=		12
 # Possible values: 7.3, 7.4 8.0
 PHP_DEFAULT?=		7.4
 # Possible values: 2.7, 3.6, 3.7, 3.8, 3.9
 PYTHON_DEFAULT?=	3.7
 # Possible values: 2.7
 PYTHON2_DEFAULT?=	2.7
 # Possible values: 3.6, 3.7, 3.8, 3.9
 PYTHON3_DEFAULT?=	3.7
 # Possible values: 2.5, 2.6, 2.7, 3.0
 RUBY_DEFAULT?=		2.7
 # Possible values: rust, rust-nightly
 RUST_DEFAULT?=		rust
 # Possible values: 4.11, 4.12, 4.13
 SAMBA_DEFAULT?=		4.12
 # Possible values: base, openssl, libressl, libressl-devel
 .if !defined(SSL_DEFAULT)
 #	If no preference was set, check for an installed base version
 #	but give an installed port preference over it.
 .  if	!defined(SSL_DEFAULT) && \
 	!exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \
 	exists(${DESTDIR}/usr/include/openssl/opensslv.h)
 SSL_DEFAULT=	base
 .  else
 .    if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
 .      if defined(PKG_BIN)
 # find installed port and use it for dependency
 .        if !defined(OPENSSL_INSTALLED)
 .          if defined(DESTDIR)
 PKGARGS=	-c ${DESTDIR}
 .          else
 PKGARGS=
 .          endif
 OPENSSL_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || :
 .        endif
 .        if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED)
 SSL_DEFAULT:=		${OPENSSL_INSTALLED:T}
 WARNING+=	"You have ${OPENSSL_INSTALLED} installed but do not have DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} set in your make.conf"
 .        endif
 .      else
 check-makevars::
 	@${ECHO_MSG} "You have a ${LOCALBASE}/lib/libcrypto.so file installed, but the framework is unable"
 	@${ECHO_MSG} "to determine what port it comes from."
 	@${ECHO_MSG} "Add DEFAULT_VERSIONS+=ssl=<openssl package name> to your /etc/make.conf and try again."
 	@${FALSE}
 .      endif
 .    endif
 .  endif
 # Make sure we have a default in the end
 SSL_DEFAULT?=	base
 .endif
 # Possible values: 8.5, 8.6, 8.7
 TCLTK_DEFAULT?=		8.6
 
 # Possible values: 4, 6
 VARNISH_DEFAULT?=	4
 
 .endif
Index: head/print/cups-filters/Makefile
===================================================================
--- head/print/cups-filters/Makefile	(revision 564967)
+++ head/print/cups-filters/Makefile	(revision 564968)
@@ -1,148 +1,148 @@
 # $FreeBSD$
 
 PORTNAME=	cups-filters
 PORTVERSION=	1.28.6
 PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	https://www.openprinting.org/download/cups-filters/
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Additional backends, filters and other software for CUPS
 
 LICENSE=	BSD4CLAUSE GPLv2 GPLv2+ GPLv3 GPLv3+ LGPL20 LGPL21+ MIT
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		libqpdf.so:print/qpdf \
 		libcupsimage.so:print/cups \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		compiler:c++11-lib cpe gmake gnome iconv libtool localbase \
 		pkgconfig shebangfix tar:xz
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	cups_browsed
 
 CONFLICTS=	cups-pstoraster-[0-9]* foomatic-filters-[0-9]*
 
 CPE_VENDOR=	linuxfoundation
 SHEBANG_FILES=	filter/braille/drivers/generic/brftoembosser.in \
 		filter/braille/drivers/index/imageubrltoindexv3.in \
 		filter/braille/drivers/index/imageubrltoindexv4.in \
 		filter/braille/drivers/index/textbrftoindexv3.in \
 		filter/braille/filters/brftopagedbrf.in \
 		filter/braille/filters/imagetobrf.in \
 		filter/braille/filters/liblouis1.defs.gen.in \
 		filter/braille/filters/musicxmltobrf.in \
 		filter/braille/filters/texttobrf.in \
 		filter/braille/filters/vectortobrf.in \
 		filter/braille/filters/vectortopdf.in
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-shell=/bin/sh \
 		--with-pdftops-path=${LOCALBASE}/bin/pdftops \
 		--with-test-font-path=${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE= 		BRAILLE COLORD DOCS
 OPTIONS_GROUP=			FILTERS CUPS_BROWSED
 OPTIONS_GROUP_FILTERS=		GHOSTSCRIPT IMAGES MUPDF POPPLER
 OPTIONS_GROUP_CUPS_BROWSED=	AVAHI LDAP
 OPTIONS_SINGLE= 		PDFTOPS
 OPTIONS_SINGLE_PDFTOPS= 	PSGHOSTSCRIPT PSHYBRID PSMUPDF PSPOPPLER
 OPTIONS_DEFAULT=		COLORD GHOSTSCRIPT IMAGES AVAHI LDAP PSHYBRID
 OPTIONS_SUB=			yes
 
 BRAILLE_CONFIGURE_ENABLE=	braille
 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
 
 COLORD_CONFIGURE_ENABLE=	dbus
 COLORD_DESC=			Get ICC color profiles from colord (via D-Bus)
 COLORD_LIB_DEPENDS=		libdbus-1.so:devel/dbus
 COLORD_RUN_DEPENDS=		colord>0:graphics/colord
 
 # Filters
 
 FILTERS_DESC=			Filters
 
 GHOSTSCRIPT_CONFIGURE_ENABLE=	ghostscript
 GHOSTSCRIPT_DESC=		PS-to-PDF and PS/PDF-to-raster using Ghostscript
 GHOSTSCRIPT_USES=		ghostscript
 
 IMAGES_CONFIGURE_ENABLE=	imagefilters
 IMAGES_CONFIGURE_WITH=		jpeg png tiff
 IMAGES_DESC=			Accept JPEG, PNG, and TIFF files as input
 IMAGES_LIB_DEPENDS=		libtiff.so:graphics/tiff \
 				libpng.so:graphics/png
 IMAGES_USES=			jpeg
 
 MUPDF_BUILD_DEPENDS=		mutool:graphics/mupdf
 MUPDF_RUN_DEPENDS=		mutool:graphics/mupdf
 MUPDF_CONFIGURE_ENABLE= 	mutool
 MUPDF_DESC=			PDF-to-raster using MuPDF
 
 POPPLER_CONFIGURE_ENABLE=	poppler
 POPPLER_DESC=			PDF-to-raster using Poppler
 POPPLER_LIB_DEPENDS=		libpoppler-cpp.so:graphics/poppler
 
 # cups-browsed(8) options
 
 CUPS_BROWSED_DESC=		cups-browsed(8) options
 
 AVAHI_CONFIGURE_ENABLE= 	avahi
 AVAHI_CONFIGURE_OFF=		--with-browseremoteprotocols=cups
 AVAHI_CONFIGURE_ON=		--with-browseremoteprotocols="dnssd cups"
 AVAHI_DESC=			Discover Zeroconf/Bonjour network printers
 AVAHI_LIB_DEPENDS=		libavahi-client.so:net/avahi-app
 AVAHI_SUB_LIST= 		AVAHI_DAEMON=avahi_daemon
 AVAHI_SUB_LIST_OFF=		AVAHI_DAEMON=
 
 LDAP_CONFIGURE_ENABLE=		ldap
 LDAP_DESC=			Get printer locations from an LDAP server
 LDAP_USE=			OPENLDAP=yes
 
 # Default PDF-to-PostScript renderer
 
 PDFTOPS_DESC=			Default PDF-to-PostScript renderer
 
 PSGHOSTSCRIPT_CONFIGURE_ON=	--with-pdftops=gs
 PSGHOSTSCRIPT_DESC=		Ghostscript gs(1)
 PSGHOSTSCRIPT_IMPLIES=		GHOSTSCRIPT
 
 PSHYBRID_BUILD_DEPENDS= 	pdftops:graphics/poppler-utils
 PSHYBRID_RUN_DEPENDS=		pdftops:graphics/poppler-utils
 PSHYBRID_CONFIGURE_ON=		--with-pdftops=hybrid
 PSHYBRID_DESC=			Ghostscript or Poppler depending on printer
 PSHYBRID_IMPLIES=		GHOSTSCRIPT
 
 PSMUPDF_CONFIGURE_ON=		--with-pdftops=mupdf
 PSMUPDF_DESC=			MuPDF mutool(1)
 PSMUPDF_IMPLIES=		MUPDF
 
 PSPOPPLER_BUILD_DEPENDS=	pdftops:graphics/poppler-utils
 PSPOPPLER_RUN_DEPENDS=		pdftops:graphics/poppler-utils
 PSPOPPLER_CONFIGURE_ON= 	--with-pdftops=pdftops
 PSPOPPLER_DESC= 		Poppler pdftops(1)
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
 		-e 's|/etc|${PREFIX}&|' \
 		-e 's|README.gz|README|' \
 		${WRKSRC}/utils/cups-browsed.8 \
 		${WRKSRC}/utils/cups-browsed.conf.5 \
 		${WRKSRC}/utils/driverless.1
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/etc/cups/cups-browsed.conf \
 		${STAGEDIR}${PREFIX}/etc/cups/cups-browsed.conf.sample
 
 .include <bsd.port.mk>