From nobody Thu Aug 15 11:54:37 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 4Wl3St0Qj1z5TTr4; Thu, 15 Aug 2024 11:54:38 +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 4Wl3Ss2RDFz3y06; Thu, 15 Aug 2024 11:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723722877; 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=ZRRlTrZV2M0xcPbnObYmW5SdDoscsjbzebZRE/+x1i0=; b=odz0eVbjk+fw9swixtQqQH+H+yTGjfhRC1kla1W4KjZH6FF6UJkQKSUqwy+Qx9Q0gSnOLG TDdTTzD+imwnynBGy+iWcRxgMiTzvUD4SfTC449Xf3clp/7hCtoxwHY2nTVOw87HZ4wEB1 RAYt1eMkLMBlG/IxIrkhK5mrdHdkJjkJnEekGvvVLQQyCSFi2K5E1SB/5qDRb6FZAJFPvq 8p5X9BLY6ql+ztEELSAxs2g5xghKxuxm2aSFM4i6fvN6tXMbaElSue6PNR5dhaJEskd840 OIEwu3d9Ni4TYe8jNMfOyV9pIithydEZZKRVvs8Z6IwkRdGHYUAX7EBQQDMRJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723722877; a=rsa-sha256; cv=none; b=BsMOhUSeLpn8lfxUYpKWDtqLkxDdq3+YnHk1eDmBSpUeetPu9iJThINey+N/ORltBAwr09 h5jKP1YddGht6CJbWKSZ5mPQMQYjyvQbwtuhe8Ws0o2RzG4FKoDkmng32NLMaUlyb0Kt/J rBqCX9rX8V2xxKsq1JII1JWNXaXJ1i2mlMJaychB3DKpQmYGE7o5qURamX+yWunAvCFi6K uodTxomju2NYEKvwpXeDpGrUNZtL6fRT+q8WHKUgZGzOpUQt3QzvoQt6HMeMSo7Aj/cZJE y5eem1FzS0BvpE5IpMw4xSqGlL/CeR/EObboMIYZ33OylirPUcD47LNBgOJt/w== 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=1723722877; 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=ZRRlTrZV2M0xcPbnObYmW5SdDoscsjbzebZRE/+x1i0=; b=v4V5mdeY6AC1ULqqxR1rBTIQG0vEGy36KDccB5IjZ4nu69g5uYtsB2a7w06vdmZFw9lXIA iF99pWweQ74bOuaTvDeodF8oRkpkK/z2wwJnGdWVLqEigPC1SmWbYRS1Mit3HEuthitbDv +xPyQPKCmrFJZ9aZ6PbuhC80aJyEggs08zYOlg4k7VGWFf1EXW6H8WS0oj0WjcbpSHwp+p ME+Yb/8KST9F1OXWzr1dH8J7Tcm0lNPX+wAdI4VhYnf46GcxofPaflvM32+xbH+9MsRHuO wTkc8tEMDwTC4hEs/nBwC21A9e3wESWX0gDNxZUFPqxfumBkq7z4hMyrsXk8gQ== 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 4Wl3Ss23nXzM8B; Thu, 15 Aug 2024 11:54:37 +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 47FBsb0Y056815; Thu, 15 Aug 2024 11:54:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FBsb76056812; Thu, 15 Aug 2024 11:54:37 GMT (envelope-from git) Date: Thu, 15 Aug 2024 11:54:37 GMT Message-Id: <202408151154.47FBsb76056812@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: 9b458083e20d - main - graphics/GraphicsMagick: Convert X11 option to x11 and nox11 flavors 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: 9b458083e20df3d2416374632edf58ce3e4e6cc5 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b458083e20df3d2416374632edf58ce3e4e6cc5 commit 9b458083e20df3d2416374632edf58ce3e4e6cc5 Author: Po-Chuan Hsieh AuthorDate: 2024-08-15 09:41:28 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-08-15 10:55:27 +0000 graphics/GraphicsMagick: Convert X11 option to x11 and nox11 flavors graphics/GraphicsMagick without X11 is graphics/GraphicsMagick@nox11 now. --- graphics/GraphicsMagick/Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index c706642ec1ba..d797f8207053 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -23,13 +23,24 @@ INSTALL_TARGET= install-strip TEST_TARGET= check USE_LDCONFIG= yes +FLAVORS= x11 nox11 +FLAVOR?= ${FLAVORS:[1]} +nox11_PKGNAMESUFFIX= -nox11 +.if ${FLAVOR} == x11 +CONFIGURE_ARGS+=--with-x +USE_XORG= ice sm x11 xext +USES+= xorg +.else +CONFIGURE_ARGS+=--without-x ac_cv_lib_ICE_IceConnectionNumber=no +.endif + PORTSCOUT= limit:^[0-9]\.[0-9]\.[1-9][0-9\]*$$ # Use fonts installed by x11-fonts/webfonts by default WINDOWS_FONT_DIR?= ${LOCALBASE}/share/fonts/webfonts -OPTIONS_DEFINE= BZIP2 DOCS FPX FREETYPE HEIF JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP Q8BIT PNG TEST TIFF WEBP WMF X11 XML ZLIB ZSTD -OPTIONS_DEFAULT=BZIP2 FREETYPE JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP PNG TIFF WEBP WMF X11 XML ZLIB +OPTIONS_DEFINE= BZIP2 DOCS FPX FREETYPE HEIF JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP Q8BIT PNG TEST TIFF WEBP WMF XML ZLIB ZSTD +OPTIONS_DEFAULT=BZIP2 FREETYPE JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP PNG TIFF WEBP WMF XML ZLIB Q8BIT_DESC= Use 8-bit pixels (speed) instead of 16-bit (quality) TEST_DESC= Run bundled self-tests after build @@ -67,10 +78,7 @@ TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WMF_CONFIGURE_WITH= wmf -X11_CONFIGURE_OFF= ac_cv_lib_ICE_IceConnectionNumber=no -X11_CONFIGURE_WITH= x -X11_USE= XORG=ice,sm,x11,xext -X11_USES= xorg +WMF_LIB_DEPENDS= libwmf.so:graphics/libwmf@${FLAVOR} XML_CONFIGURE_WITH= xml XML_USE= GNOME=libxml2 XML_USES= gnome @@ -86,14 +94,6 @@ USES+= compiler:gcc-c++11-lib .endif .endif -.if ${PORT_OPTIONS:MWMF} -.if ${PORT_OPTIONS:MX11} -LIB_DEPENDS+= libwmflite.so:graphics/libwmf -.else -LIB_DEPENDS+= libwmflite.so:graphics/libwmf-nox11 -.endif -.endif - post-install-Q8BIT-off: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q16/coders ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q16/filters