Date: Thu, 15 Aug 2024 11:56:23 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 378e8e2c2d6b - main - graphics/ImageMagick7: Simplify WMF option after graphics/libwmf being flavorized Message-ID: <202408151156.47FBuNHa060872@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=378e8e2c2d6b1d5e2436cf06c4443b2da988450f commit 378e8e2c2d6b1d5e2436cf06c4443b2da988450f Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2024-08-15 11:46:07 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> 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 <bsd.port.options.mk> .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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408151156.47FBuNHa060872>