From nobody Thu Aug 15 11:56:23 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wl3Vw2X6bz5TVpK; Thu, 15 Aug 2024 11:56:24 +0000 (UTC) (envelope-from git@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wl3Vv4mRFz431Q; Thu, 15 Aug 2024 11:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723722983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qnjmRPCSClLigcQfyl1gSkS3jwgYFc+Fb2O/JF7BBWE=; b=w9S0oLi2iPKZqc8UhgrTkYdjTUus5CjFRaPbKjszELRJgnmPaMPMhVayqqXVFwRZAC8nnC KOshlmYGorMjmZ0X3iKTKzEwGr2a9gRqttaUvmy5Kg97A/usxwzC+poAZopcQPK/e7f6CY UGH5j28mCo1dpCZ2gUMVz1sJ7+SsZ57ZEENXTc9YQjGDQ1Q3oeYSmfeOMRbAtfUuUVLPCp UC1t/zhFfWPOziD6j40eWskaU+lcxQkh9wLW7filxBxyRcRpTdti+J6PYhwjAUnHXpPToF AZN7WTRE7XJeur5/CHreTLVtK5PkKQnhS+SQePGT6MmdJydVJHz3e04SRNUVLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723722983; a=rsa-sha256; cv=none; b=nwXhLvAcMtuR2t+RuVspYfsvVpJ+mNr67+hDKqcIzaLkGlVtCSJxzlFfrkDWyEAlnzSkFY JiCXPT2cwyAIWty1MlUXj8rIZEGymNmh0+h5DAbt+7/UUnENrBCgF3KIsVESc6pxDh/SSi gQEseay168Qhtztkme41PxnwbXUdJTzctg/7fQmnuSEhnJL3u1DOSjUFGnAjlss4TdRnm0 szErw1eWXCTfhIiPO3ToSIU+KSzDR4d3qTIt37iMrZNBtd6enFP2df9SBKuR5sqj91iYre IxviH4lZ3qfbOpHtgt8Ntd0gyXipIBYKg71w0qyS1iwbFGTTRcX7OkZ3oUpJXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723722983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qnjmRPCSClLigcQfyl1gSkS3jwgYFc+Fb2O/JF7BBWE=; b=kOY+MaZJXshz7hEvEPdkMy+hb2868134eUmZ4sIxp3+8dRalazxHtf9zv3mXCC6EgYSihC gNu6Bvqct7FXuhZq1/ONyHzHT2qte4epy9FQPKx4r+hgeMR4nI5OHgN/dcMbjY4E85bR1u fp4DrnM+E9UbbCBDpfLJT63dzwUc+247EdGftPdTJ0OUUKyz4Dr9bLfCxEZ2L5StSZrg98 0KzsftCKnzX5s0WEDbWKYcaC17Yyf/nzj/KA7MNktQWgiCTOOhXUX4D+vjYyvjgajPuQZy FbOeSswTwQkpTE8gvF2IZFCMsJ+HaCpWFMrZmF4rXxSScpn6wR5YltQmy1x1RA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wl3Vv4FZhzM1Y; Thu, 15 Aug 2024 11:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FBuNP7060875; Thu, 15 Aug 2024 11:56:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FBuNHa060872; Thu, 15 Aug 2024 11:56:23 GMT (envelope-from git) Date: Thu, 15 Aug 2024 11:56:23 GMT Message-Id: <202408151156.47FBuNHa060872@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 378e8e2c2d6b - main - graphics/ImageMagick7: Simplify WMF option after graphics/libwmf being flavorized List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 378e8e2c2d6b1d5e2436cf06c4443b2da988450f Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=378e8e2c2d6b1d5e2436cf06c4443b2da988450f commit 378e8e2c2d6b1d5e2436cf06c4443b2da988450f Author: Po-Chuan Hsieh AuthorDate: 2024-08-15 11:46:07 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-08-15 11:47:43 +0000 graphics/ImageMagick7: Simplify WMF option after graphics/libwmf being flavorized Approved by: portmgr (blanket) --- graphics/ImageMagick7/Makefile | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index 5704acb5cdb0..13ffc189d44c 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -176,6 +176,9 @@ TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +WMF_CONFIGURE_WITH= wmf +WMF_LIB_DEPENDS= libwmf.so:graphics/libwmf@${FLAVOR} + .include .if ${PORT_OPTIONS:MTHREADS} @@ -272,20 +275,6 @@ USES+= ghostscript CONFIGURE_ARGS+= --without-gslib .endif -# WMF (Windows Meta File) images -.if ${PORT_OPTIONS:MWMF} -. if ${FLAVOR:U} == x11 -LIB_DEPENDS+= libwmf.so:graphics/libwmf -. else -LIB_DEPENDS+= libwmf.so:graphics/libwmf-nox11 -. endif -CONFIGURE_ARGS+= --with-wmf=yes -PLIST_SUB+= WMF="" -.else -CONFIGURE_ARGS+= --without-wmf -PLIST_SUB+= WMF="@comment " -.endif - # PDF (Adobe Portable Document Format) support .if ${PORT_OPTIONS:MPDF} . if ${FLAVOR:U} == x11