From owner-svn-ports-all@freebsd.org Mon Jun 15 15:30:57 2020 Return-Path: Delivered-To: svn-ports-all@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 DE86E337C49; Mon, 15 Jun 2020 15:30:57 +0000 (UTC) (envelope-from amdmi3@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49lwJx5c50z3X3T; Mon, 15 Jun 2020 15:30:57 +0000 (UTC) (envelope-from amdmi3@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 BBB581FAAC; Mon, 15 Jun 2020 15:30:57 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05FFUvrU031413; Mon, 15 Jun 2020 15:30:57 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05FFUv6u031412; Mon, 15 Jun 2020 15:30:57 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <202006151530.05FFUv6u031412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 15 Jun 2020 15:30:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538894 - head/graphics/inkscape X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/graphics/inkscape X-SVN-Commit-Revision: 538894 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jun 2020 15:30:57 -0000 Author: amdmi3 Date: Mon Jun 15 15:30:57 2020 New Revision: 538894 URL: https://svnweb.freebsd.org/changeset/ports/538894 Log: - Allow to build with both ImageMagick and GraphicsMagick support disabled PR: 246835 Submitted by: amdmi3 Approved by: maintainer timeout (gnome, 2 weeks) Modified: head/graphics/inkscape/Makefile Modified: head/graphics/inkscape/Makefile ============================================================================== --- head/graphics/inkscape/Makefile Mon Jun 15 15:27:49 2020 (r538893) +++ head/graphics/inkscape/Makefile Mon Jun 15 15:30:57 2020 (r538894) @@ -62,8 +62,8 @@ SHEBANG_FILES= share/extensions/*.py share/extensions/ OPTIONS_DEFINE= OPENMP POPPLER VISIO CDR DBUS WPG GVFS NLS OPTIONS_DEFAULT= POPPLER VISIO CDR WPG GM OPTIONS_DEFAULT_amd64= OPENMP -OPTIONS_SINGLE= IMAGICK -OPTIONS_SINGLE_IMAGICK= IMAGICK6 GM +OPTIONS_RADIO= IMAGICK +OPTIONS_RADIO_IMAGICK= IMAGICK6 GM OPTIONS_SUB= yes CDR_DESC= Support for CorelDRAW graphics @@ -100,6 +100,7 @@ IMAGICK6_LIB_DEPENDS= libMagick++-6.so:graphics/ImageM IMAGICK6_CMAKE_BOOL= WITH_IMAGE_MAGICK GM_DESC= Use GraphicsMagick GM_LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick +GM_CMAKE_BOOL= WITH_GRAPHICS_MAGICK NLS_CMAKE_BOOL= WITH_NLS NLS_USES= gettext