git: ceb72bff4cf2 - main - misc/img2xterm: update ImageMagick dependency

The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ceb72bff4cf20abfd1f09adb1f624e3f06f987af

commit ceb72bff4cf20abfd1f09adb1f624e3f06f987af
Author:     Laurent <laurent.chardon@gmail.com>
AuthorDate: 2024-01-12 08:27:59 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2024-01-14 16:43:47 +0000

    misc/img2xterm: update ImageMagick dependency
    
     * Update dependency from old ImageMagick-6 to current
     * Various minor changes to make portlint happy
     * Submitter becomes maintainer (already maintainer of sysutils/modules)
    
    PR:             276266
    Reported by:    laurent.chardon@gmail.com
---
 misc/img2xterm/Makefile                |  6 +++---
 misc/img2xterm/files/patch-Makefile    | 22 ----------------------
 misc/img2xterm/files/patch-img2xterm.c | 20 ++++++++++++++++++++
 misc/img2xterm/pkg-descr               |  4 +++-
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/misc/img2xterm/Makefile b/misc/img2xterm/Makefile
index c883cde74aa4..b6ab40ae8f13 100644
--- a/misc/img2xterm/Makefile
+++ b/misc/img2xterm/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	img2xterm
 PORTVERSION=	1.0.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	laurent.chardon@gmail.com
 COMMENT=	Display images on 256 color xterms
 WWW=		https://github.com/kfei/img2xterm
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		gmake magick ncurses
 USE_GITHUB=	yes
 GH_ACCOUNT=	kfei
-USES=		gmake magick:6 ncurses
 PLIST_FILES=	bin/img2xterm
 
 .include <bsd.port.pre.mk>
diff --git a/misc/img2xterm/files/patch-Makefile b/misc/img2xterm/files/patch-Makefile
deleted file mode 100644
index 949208b9f75d..000000000000
--- a/misc/img2xterm/files/patch-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.orig	2017-05-08 16:25:31.094039000 +0200
-+++ Makefile	2017-05-08 16:25:49.406674000 +0200
-@@ -1,19 +1,3 @@
--PREFIX = /usr/local
--INSTALL = install
--LN = ln -fs
--
--ifeq ($(shell sh -c 'which gcc>/dev/null 2>/dev/null && echo y'), y)
--	CC = gcc
--	CFLAGS = -O2 -Wall
--	LDFLAGS = -s
--endif
--
--ifeq ($(shell sh -c 'uname'), Darwin)
--	CC = clang
--	CFLAGS = -O2 -Wall
--	LDFLAGS =
--endif
--
- ifeq ($(shell sh -c 'which ncurses5-config>/dev/null 2>/dev/null && echo y'), y)
- 	DEFS =
- 	CFLAGS += $(shell ncurses5-config --cflags)
diff --git a/misc/img2xterm/files/patch-img2xterm.c b/misc/img2xterm/files/patch-img2xterm.c
new file mode 100644
index 000000000000..278acd5fd5d7
--- /dev/null
+++ b/misc/img2xterm/files/patch-img2xterm.c
@@ -0,0 +1,20 @@
+--- img2xterm.c.orig	2024-01-11 14:08:58 UTC
++++ img2xterm.c
+@@ -7,7 +7,7 @@
+ #include <sys/ioctl.h>
+ #include <limits.h>
+ #include <math.h>
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #include <unistd.h>
+ 
+ #ifndef NO_CURSES
+@@ -288,7 +288,7 @@ void xtermfit(MagickWand* wand)
+ 	int scaled_width = (int)floor(rs > ri ? wi * hs / hi : ws);
+ 	int scaled_height = (int)floor(rs > ri ? hs : hi * ws / wi);
+ 
+-	MagickResizeImage(wand, scaled_width, scaled_height, LanczosFilter, 1);
++	MagickResizeImage(wand, scaled_width, scaled_height, LanczosFilter);
+ }
+ 
+ void usage(int ret, const char* binname)
diff --git a/misc/img2xterm/pkg-descr b/misc/img2xterm/pkg-descr
index 22b70a954568..906ac6772df4 100644
--- a/misc/img2xterm/pkg-descr
+++ b/misc/img2xterm/pkg-descr
@@ -1 +1,3 @@
-Display images in terminal
+img2xterm is a program that can display bitmap images on 256-colour terminals
+by converting them into Unicode block characters and xterm compatible control
+sequences.