Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Jan 2023 23:52:00 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: 82803a0404c3 - main - graphics/rubygem-mini_magick: Convert to USES=magick
Message-ID:  <202301302352.30UNq0RE001526@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=82803a0404c3c7a13ca612a0f0134b457dd2d335

commit 82803a0404c3c7a13ca612a0f0134b457dd2d335
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-01-30 23:49:18 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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 <bsd.port.options.mk>
-
-.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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301302352.30UNq0RE001526>