From nobody Mon Jan 30 23:52:00 2023 X-Original-To: dev-commits-ports-all@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 4P5Q2S6n6Wz3bVpg; Mon, 30 Jan 2023 23:52:00 +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 4P5Q2S6MDXz4R1Q; Mon, 30 Jan 2023 23:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675122720; 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=fOwD1BG8kgQE3+VLq707+hcgMFsQGeGOrpwKMyP80iA=; b=MFbNbJCDbeQDKXefSACL3ZumFTtFk3yDhtc2FBdtAj+amgLAfOgyypP4OQT3XZfflEyaV1 wJdGUkbvxJVeQMeAUG3ymmP5AsEfCKAYsw7Ggy0PQmmVMpFvMnrF0OgxgJIbjE3UUGiD0i bhlRCzIe8Ayq7YxSEQ5tZCFFScHILPG/e12zPaj+FWz+GmzIp4btghGjeJVQnQ9Z++5s94 CYDRzvv6Uz5A6e2fdH+iGWs7uzAwddsUPY1GQhlyNF2qKkIqNWfxyh4rnb6FQ6SAibzfjG aM19feozFXSBqoZzxftPEaeghPFcvVytZDTk/hLviZeuEeyTqMwAl2y/j2iuMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675122720; 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=fOwD1BG8kgQE3+VLq707+hcgMFsQGeGOrpwKMyP80iA=; b=KRxS0vrG8MoDTZHagTr33D9STBN0ylqXFh/Vd5LbATHXmkC7DyGoMX7PyLFLom4XWOG0d/ 0liBqwWBPDBeBnOhBTNTuAnX9q4bFdYdy/QUKX+RptJ5c7khLe2dvELRVZiU5/U3qFWKJ5 4wTc7XII30jhnL8A3z6iIXo6Eb8YBbIKzP4tRVzSRmFhziYo22rbkvvT6RCTa530qR8fC4 IM2yCJz0FFCdb6yZjWbGHmREtb2X2QV3brU+rclL2YHPOTTYBwj7kwQW40PF4glLkHAUYv ijVSLzZJRRlm20Mpy3F73tcGX/Ny5EizcsqTWNWAzjboclemzWAel1HxEIK1VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675122720; a=rsa-sha256; cv=none; b=hRuCFKr26i5DsHM05j49Oa3Wu22n4nctclatEMDHNw5nQW8XZV5xSv/lQh7IrE+wKPX5+I nROmKHwCrANs7JyobuvHw0+f06/je3tklHBWosqlibZJ4SFulXt4CO/DxYpUVJPqmFNfv2 xLkmScqgiZ1lkQOxFfVA9hdE9+i6JShOvOjLtHRfj6ubSTA0c6dilGcACcYB2GfK+9Jnff YHkK7KjVOZKCIXUn3CljHXmbomxbjXr/7hHlybWWBDr1A5PlzbENKSPR7DklVL7sypg0eO szRj3gqsOjg3PXRbi2/co26hAKf8+0Fr50IDx2hUppe6szlHwnBgkbCWgbAyyw== 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 4P5Q2S5T0HzSYc; Mon, 30 Jan 2023 23:52:00 +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 30UNq0vT001527; Mon, 30 Jan 2023 23:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UNq0RE001526; Mon, 30 Jan 2023 23:52:00 GMT (envelope-from git) Date: Mon, 30 Jan 2023 23:52:00 GMT Message-Id: <202301302352.30UNq0RE001526@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: 82803a0404c3 - main - graphics/rubygem-mini_magick: Convert to USES=magick List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 82803a0404c3c7a13ca612a0f0134b457dd2d335 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=82803a0404c3c7a13ca612a0f0134b457dd2d335 commit 82803a0404c3c7a13ca612a0f0134b457dd2d335 Author: Po-Chuan Hsieh AuthorDate: 2023-01-30 23:49:18 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-01-30 23:51:43 +0000 graphics/rubygem-mini_magick: Convert to USES=magick Use the default ImageMagick since all of them (ImageMagick{6,7}{,-nox11}) are mutually exclusive. --- graphics/rubygem-mini_magick/Makefile | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/graphics/rubygem-mini_magick/Makefile b/graphics/rubygem-mini_magick/Makefile index 5370f94392e3..3935e87eeaf6 100644 --- a/graphics/rubygem-mini_magick/Makefile +++ b/graphics/rubygem-mini_magick/Makefile @@ -10,31 +10,8 @@ WWW= https://github.com/minimagick/minimagick LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -OPTIONS_DEFINE= X11 -OPTIONS_SINGLE= IMAGEMAGICK -OPTIONS_SINGLE_IMAGEMAGICK= IMAGEMAGICK6 IMAGEMAGICK7 -OPTIONS_DEFAULT=IMAGEMAGICK7 X11 -IMAGEMAGICK6_DESC= Use ImageMagick 6.x (graphics/ImageMagick6*) -IMAGEMAGICK7_DESC= Use ImageMagick 7.x (graphics/ImageMagick7*) - -USES= gem +USES= gem magick NO_ARCH= yes -.include - -.if ${PORT_OPTIONS:MX11} -.if ${PORT_OPTIONS:MIMAGEMAGICK7} -USES+= magick:7 -.else -USES+= magick:6 -.endif -.else -.if ${PORT_OPTIONS:MIMAGEMAGICK7} -USES+= magick:7,nox11 -.else -USES+= magick:6,nox11 -.endif -.endif - .include