From nobody Thu Aug 15 11:56:22 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 4Wl3Vv4wNlz5TVgG; Thu, 15 Aug 2024 11:56:23 +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 4Wl3Vt4kTbz439h; Thu, 15 Aug 2024 11:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723722982; 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=Z+kn+yT4Lr8Pe+i6W2MLvl+hQM66yBX1vIivlglX1qw=; b=XXbdiARC+SyGLeZ3V4ExzWVlgzwCxM47twd3TolQjGQ4VhqGAmCt0tHvKElpYDadZlatQM EjKlYt8wxYDkU8568czqJosO1esVQ6xHVVecwauG3i3+rfAUmWZBcDrKj9vogfx+vWHNlK zDaAfZTnjhuCWlmVVEJWY+7nES7VtLqRU0hH+NaYHPABygTKitzw4rB47c/x4/AHZBh0g6 J9k3QBM+Klq3Aqj/r0IIAjHJNybmJUyBZlhXjEghzy9zr0I6/LOkhUrqzHhsZtgISawhhk MzgRCusHcTDYPdsX0iajDPwr2q+bDfo2GtEQ2TW4SoVfrSpZw9V7JJrWoKV5NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723722982; a=rsa-sha256; cv=none; b=NX/Q2XlqriUgJLiiUDL+qgS2VZOG1Ct2KeB4J91hxvqghkFJdrfTug4nTnrVF0SdDrZv06 jTo4lz1jAeBtWrkMDicMxxHDl8MDXzmxibQx3s5o+9s77oP44D2Xyxda7z6mKvd2VvFFdi aV0Oeo5RwB2dZTNWTT2clIUyyDKeLUm9pJdvqQlnN9KRkbS6WB1C0Ka6oqdEDwHe5cbXI/ E/iTIy6PLCsHE2YmhSrobwGwziL4fvybk8psN+HE67ayfBBgCQXBry894EOgYNSiDsx6h5 0+ID+UTy/47ixS3fKy0Gy20nQiFcNd9SDqHASbl9TFHAyvo49oTyOQTmO2yRXQ== 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=1723722982; 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=Z+kn+yT4Lr8Pe+i6W2MLvl+hQM66yBX1vIivlglX1qw=; b=JRkxwNK9ZVbi5+4d9loPlxfxyrKMcMXx/bm9H6hO7OQjLMpi0D8vPyI94ZDwr7jCw3MWoo WoodMGG6SSaNjnuXoZ+fPE7uuXFJCnSWUjnVBPp6Bk7AQ2fWTdPHFdPrMfQSWAxS4ss1oJ Y3bCAcGd/ZsBlVXNLbMuzj76XlociJUqyE1+b4XF2Q7uSR0Tvjqs1YacoKjWIrund7VQ6C IvK8GNVkZsk4F1Q8Ai8vM5Jl1TZQhk3lWz23xQaajMMuYQivguEQIdTB4/dMIyNKdnJg4C iRNGIfUtnusUMWeqpGXTz8DGfcQ7gtxWMv98k8LTHX3cVmpvzv1zMxGPOLjAXw== 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 4Wl3Vt36CgzMQd; Thu, 15 Aug 2024 11:56:22 +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 47FBuMRp060814; Thu, 15 Aug 2024 11:56:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FBuMb3060811; Thu, 15 Aug 2024 11:56:22 GMT (envelope-from git) Date: Thu, 15 Aug 2024 11:56:22 GMT Message-Id: <202408151156.47FBuMb3060811@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: bf947d5898c1 - main - graphics/ImageMagick6: 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: bf947d5898c131e41b7bd30f4eadd5ca4aba59a8 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf947d5898c131e41b7bd30f4eadd5ca4aba59a8 commit bf947d5898c131e41b7bd30f4eadd5ca4aba59a8 Author: Po-Chuan Hsieh AuthorDate: 2024-08-15 11:46:05 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-08-15 11:47:42 +0000 graphics/ImageMagick6: Simplify WMF option after graphics/libwmf being flavorized Approved by: portmgr (blanket) --- graphics/ImageMagick6/Makefile | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile index e556757e6313..3bf06453373e 100644 --- a/graphics/ImageMagick6/Makefile +++ b/graphics/ImageMagick6/Makefile @@ -173,6 +173,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} @@ -275,20 +278,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