From owner-svn-ports-head@freebsd.org Thu Feb 11 17:16:29 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4415552E98C; Thu, 11 Feb 2021 17:16:29 +0000 (UTC) (envelope-from tijl@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 4Dc3FT1X18z4Xss; Thu, 11 Feb 2021 17:16:29 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 274AC1476D; Thu, 11 Feb 2021 17:16:29 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11BHGTs5019176; Thu, 11 Feb 2021 17:16:29 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11BHGSss019175; Thu, 11 Feb 2021 17:16:28 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <202102111716.11BHGSss019175@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Thu, 11 Feb 2021 17:16:28 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head: Mk print/cups-filters X-SVN-Commit-Revision: 564968 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Feb 2021 17:16:29 -0000 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 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