From nobody Sun Apr 30 11:11:12 2023 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 4Q8Nv46zZmz46gkv; Sun, 30 Apr 2023 11:11:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q8Nv45MVRz4DLg; Sun, 30 Apr 2023 11:11:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682853072; 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=eJyoE8xPBTaiTHvbiHxXZr0f0Zg16LJ9moDEuM4a+fs=; b=D8UHQspHAUZuu1Lo9C4ptAE23MVoeuyPO1VUCgj+0NXPwf+mmnnIScqVmxiCvuboxX2eFy wZ1nB9mxgl1OEZVDsjnW4CH6siH+yYiTUMfJOBw72z7X8RykhWXwCmzfPGGJKdjzmAUrkr 48eKAbliAiuqfCEaz5PA22IZul7d3+Bf86ejhbDxtw++8MH5YPyCtUBVH4TrHWqsYulPBW 1Bfk4PKaxXvu/HaEL7bmozhfTrp+duxReCP5rOw/VpbK6biye/YyPHsKHWy6Fdoe+zBrzn s87+IbNVgP/V7C39QUONjIA5M1ymMOF3H0X3ndNN7p3eNUxQlWfrh9HPGWuFEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682853072; 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=eJyoE8xPBTaiTHvbiHxXZr0f0Zg16LJ9moDEuM4a+fs=; b=lS9OkZ6Lno/hJ2gx1tHFoXEpcm0uV8h2mRPBmG7cRsDEYOnOv+lIbSNYNPlh9G8g5HGqxe 1smMh7dl7JFV4qhZX3Zy03HRPwVAAEyT3bZnaLEs5MFPWvyPIvDjKLH7vkF5+vvTdQ9UpZ Q4z4vPRvw8nR2D+1hpc+UB0TZbMAOS4rRUUAsZXO6UNmk9OQaZ29U1RBxC+6uxe6GRDo/K 1KtM+dMMfmKc94uDwIUEGVg1aZZaTjlvBrvvmajCgwbBN8S6xuxdycrqu9rphANkONLMtp OdizeLOyCkCHKe1GdqrQqc4UTCNZEQBJAkFNcbSCQv3yPFSpQpkcOuJobQaMeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682853072; a=rsa-sha256; cv=none; b=TWjs2AnaGKH9JhsQvr/xb57ILbWNzEu5fbzs2kcHsTEyLVCV2pHjWOTF2oUnX35wgenBiw Yoo8uZQ3GkYcb7Xpl1dLCxcDRs9Mq5vg62DkPOcZbrjiC1KGn91QBCfrLpOPj4DhFrLkVU 0R+nppJwwaYl/t08CYUOqgb7E66zqfCLKisl2N3pktEiZxShrlrtq0KGpDNZsQ/LCyQWLO 2uwF4+GDknB9QYpquJQTHzUz+beElJ/0ZMdPFJJsGgzL5CDTsRb2G6bLfSmkRxpdz2HH0P l6W89bjHHXyyScEdL1Ech8LuQUV93yLqyeGPEWFW3k3vDVreTMlo8M8QzfkPAw== 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 4Q8Nv44SmgzLkq; Sun, 30 Apr 2023 11:11:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33UBBCt0000646; Sun, 30 Apr 2023 11:11:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33UBBCHt000645; Sun, 30 Apr 2023 11:11:12 GMT (envelope-from git) Date: Sun, 30 Apr 2023 11:11:12 GMT Message-Id: <202304301111.33UBBCHt000645@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 2a68fe27dc3d - main - graphics/ImageMagick7: Convert -nox11 to flavor 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a68fe27dc3dfef09d780ac4c4a378f7e46dc149 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a68fe27dc3dfef09d780ac4c4a378f7e46dc149 commit 2a68fe27dc3dfef09d780ac4c4a378f7e46dc149 Author: Felix Palmen AuthorDate: 2023-04-05 08:13:07 +0000 Commit: Felix Palmen CommitDate: 2023-04-30 11:10:39 +0000 graphics/ImageMagick7: Convert -nox11 to flavor Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D39424 --- MOVED | 1 + graphics/ImageMagick7-nox11/Makefile | 9 ------- graphics/ImageMagick7/Makefile | 52 +++++++++++++++++++----------------- graphics/Makefile | 1 - 4 files changed, 29 insertions(+), 34 deletions(-) diff --git a/MOVED b/MOVED index 14b3c3da9b66..c8382746b24b 100644 --- a/MOVED +++ b/MOVED @@ -17920,3 +17920,4 @@ devel/zpu-gcc||2023-04-30|Has expired: Broken with latest C compiler and port un devel/zpu-binutils||2023-04-30|Has expired: Broken with latest C compiler and port unused databases/rocksdb-lite||2023-04-30|Has expired: Removed by upstream, see https://github.com/facebook/rocksdb/commit/4720ba4391eb016b05a30d09a8275624c3a4a87e textproc/ltxml||2023-04-30|Has expired: Unfetchable +graphics/ImageMagick7-nox11|graphics/ImageMagick7|2023-04-30|Flavorized diff --git a/graphics/ImageMagick7-nox11/Makefile b/graphics/ImageMagick7-nox11/Makefile deleted file mode 100644 index 14ac29e30124..000000000000 --- a/graphics/ImageMagick7-nox11/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# the SVG and PANGO plugins need X11 -OPTIONS_EXCLUDE= X11 SVG PANGO RAQM -PORTSCOUT= ignore:1 -# workaround until bsd.port.mk code can grok the disabling of the X11 option -WITHOUT_X11=yes - -MASTERDIR= ${.CURDIR}/../ImageMagick7 - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index 7d872b57aa4e..1fae9f8b548a 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -1,6 +1,6 @@ PORTNAME= ImageMagick DISTVERSION= 7.1.0-62 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics perl5 MASTER_SITES= https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \ https://mirror.dogado.de/imagemagick/releases/ \ @@ -19,10 +19,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libltdl.so:devel/libltdl \ libzip.so:archivers/libzip -TESTS_DEPENDS= gsfonts>=0:print/gsfonts +FLAVORS= x11 nox11 +FLAVOR?= ${FLAVORS:[1]} +FLAVORS_SUB= yes +nox11_PKGNAMESUFFIX= 7-nox11 # bin/Magick++-config -CONFLICTS_INSTALL= ImageMagick6 ImageMagick6-nox11 +CONFLICTS_INSTALL= ImageMagick6 ImageMagick6-nox11 \ + ImageMagick7 ImageMagick7-nox11 # This port uses .la files, keep libtool:keepla! (magick/module.c) USES= cpe gettext-runtime gmake gnome libtool:keepla localbase \ @@ -48,11 +52,22 @@ PLIST_SUB= PORTVERSION=${PORTVERSION:R} OPTIONS_SUB= yes OPTIONS_DEFINE= BZIP2 DOCS DJVU FFMPEG FFTW FONTCONFIG FPX FREETYPE \ GRAPHVIZ GSLIB JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES \ - OPENEXR OPENMP PANGO PDF PERL PNG RAQM SVG TESTS TIFF WEBP WMF \ - THREADS X11 16BIT_PIXEL HDRI HEIF RAW + OPENEXR OPENMP PDF PERL PNG TESTS TIFF WEBP WMF THREADS \ + 16BIT_PIXEL HDRI HEIF RAW OPTIONS_DEFAULT= 16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE HEIF \ - JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES OPENEXR PDF PERL PNG RAQM SVG \ - TIFF WEBP WMF THREADS X11 HDRI RAW + JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES OPENEXR PDF PERL PNG \ + TIFF WEBP WMF THREADS HDRI RAW + +.if ${FLAVOR:U} == x11 +# the SVG and PANGO plugins need X11 +OPTIONS_DEFINE+= PANGO RAQM SVG +OPTIONS_DEFAULT+= RAQM SVG +CONFIGURE_ARGS+= --with-x +USES+= xorg +USE_XORG= ice sm x11 xext xt +.else +CONFIGURE_ARGS+= --without-x +.endif DJVU_DESC= DJVU format support (needs THREADS) GSLIB_DESC= libgs (Postscript SHLIB) support @@ -129,7 +144,6 @@ MODULES_CONFIGURE_WITH= modules PANGO_CONFIGURE_WITH= pango PANGO_USE= gnome=pango -PANGO_IMPLIES= X11 PNG_CONFIGURE_WITH= png PNG_LIB_DEPENDS= libpng.so:graphics/png @@ -148,7 +162,8 @@ RAW_IMPLIES= LCMS2 SVG_DESC= SVG vector image format support (via librsvg, implies the x11 option) SVG_CONFIGURE_WITH= rsvg SVG_USE= gnome=cairo,gdkpixbuf2,librsvg2 -SVG_IMPLIES= X11 + +TESTS_TEST_DEPENDS= gsfonts>=0:print/gsfonts TIFF_CONFIGURE_WITH= tiff TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff @@ -156,13 +171,6 @@ TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp -X11_CONFIGURE_WITH= x -X11_USES= xorg -X11_USE= xorg=ice,sm,x11,xext,xt -X11_VARS= CONFLICTS_INSTALL+="ImageMagick7-nox11" -X11_VARS_OFF= CONFLICTS_INSTALL+="ImageMagick7" \ - PKGNAMESUFFIX=7-nox11 - .include .if ${PORT_OPTIONS:MTHREADS} @@ -250,7 +258,7 @@ PLIST_SUB+= DJVU="@comment " .if ${PORT_OPTIONS:MGSLIB} CONFIGURE_ARGS+= --with-gslib -. if ${PORT_OPTIONS:MX11} +. if ${FLAVOR:U} == x11 USES+= ghostscript:x11 . else USES+= ghostscript @@ -261,7 +269,7 @@ CONFIGURE_ARGS+= --without-gslib # WMF (Windows Meta File) images .if ${PORT_OPTIONS:MWMF} -. if ${PORT_OPTIONS:MX11} +. if ${FLAVOR:U} == x11 LIB_DEPENDS+= libwmf.so:graphics/libwmf . else LIB_DEPENDS+= libwmf.so:graphics/libwmf-nox11 @@ -275,7 +283,7 @@ PLIST_SUB+= WMF="@comment " # PDF (Adobe Portable Document Format) support .if ${PORT_OPTIONS:MPDF} -. if ${PORT_OPTIONS:MX11} +. if ${FLAVOR:U} == x11 USES+= ghostscript:x11 . else USES+= ghostscript @@ -298,7 +306,7 @@ INSTALL_TARGET= install-strip .endif .if ${PORT_OPTIONS:MTESTS} -. if ${PORT_OPTIONS:MX11} +. if ${FLAVOR:U} == x11 USES+= ghostscript:x11,build . else USES+= ghostscript:build @@ -329,10 +337,6 @@ pre-configure: @${ECHO_CMD} '###################################################################' .endif -.if ${PORT_OPTIONS:MSVG} && ! ${PORT_OPTIONS:MX11} - @${ECHO_CMD} NOTICE: SVG format support disabled, requires X11 -.endif - post-install: .for i in ${SAMPLE_FILES} @${MV} ${STAGEDIR}${PREFIX}/etc/ImageMagick-7/${i} \ diff --git a/graphics/Makefile b/graphics/Makefile index 42bc2033ed5d..28fd5bdf6b44 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -8,7 +8,6 @@ SUBDIR += ImageMagick6 SUBDIR += ImageMagick6-nox11 SUBDIR += ImageMagick7 - SUBDIR += ImageMagick7-nox11 SUBDIR += O2-tools SUBDIR += R-cran-DiagrammeR SUBDIR += R-cran-GDD