From nobody Sun Jan 14 16:44:14 2024 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 4TCh1p3WFxz56d2d; Sun, 14 Jan 2024 16:44:14 +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 4TCh1p2cSNz4QdR; Sun, 14 Jan 2024 16:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705250654; 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=jZfKU4OzYmWOqd4TJH4cbSvbrs2zjw1TvGhSlwRFzSs=; b=JxrQ+KlR8HLzobftmhNrqDCV6r/QLqk/5ejmaAUnZaDWnf13PfFKYbCrXH2P7IYig0TX10 ovYzt4cUU8TqKwnb5VR1RjxSxAYlc6/4qehCEB51tagWKv3kVXz/8UxqqE22CpavIarZvG J1ko234/uFncBWhOB7PoKgws+YyGP/6ItOKs1E4Y5v4Va/udEMWU7LM5gl1OnpXgzNGA0v kP1ke8XB1cpw+8ndBqHR2KXdwzB5RcablnIi9VOYadtfQ9l2we04T2FtjgQLOV53u6PgFn UDxyyXjng1SKHxqFqw2JrJGCPJ0QN+EhiJPPDc362M6S5GeeO8cKIsbGNB7JLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705250654; 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=jZfKU4OzYmWOqd4TJH4cbSvbrs2zjw1TvGhSlwRFzSs=; b=dH4VafbyDn1fi/buLSVCnWqbYIEi+WcsNsEVOR7497wEhe6KshqGcHACweegSZt1kjFUla bY/l1AL30q/5c53tnXmEJTym3IDX+I6ajp++YKtw08GFbg2wXhrmGau6QlAICa47rSCEGa ogrzlCYPhdT7z68qCdfm5x18LRSnCjWj1ucvSs1y3ynMMXAlVjD/vOlx5e4DEY5KbpK13H vRKyoYWl1johcn9qwEKFh8zJdSEKFw+UlHUuB3PEomUNPsiv3+jGmyJbzq0aUIIMe2VAMk s4ZTsSmL3oS8lrruCOFKEZFFn3mun7bzoz4Kb2w4WnUQUH1eEQeWizvuIbqyMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705250654; a=rsa-sha256; cv=none; b=VgGfCG9uHjJOVKyInluSgoWawCjJUJficw3O+BjKO5FKtR94Ni2G4jYNmQ9hqOgUNeiIA+ DZnsGc/iDIIkiQ6rcCDRKozUzQ7D2Hh6/OKWgExqyODJFvByjmlBzJSP+fpH+w3LlUqaXR OaETR3mXTv6zJb33EknDjM0SEcPJLoeggP9P3NrRugtQVWpsI3+xZy56Cb+5uFqMOh7BY6 9W42DuDnAi8bfxRXYwgkqiggE/iBpChiRTCO1njqsn5K8I9Z6+U0P8tQrjTlb6EkVJ0Sfj KaPSrDVQBI1Kq9TxFx6mvs68I8dmOVcnSOcJuRBhqSoGrUunDK3/8bKxVdEDxA== 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 4TCh1p1St4zLXl; Sun, 14 Jan 2024 16:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40EGiEDb019588; Sun, 14 Jan 2024 16:44:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40EGiEIT019585; Sun, 14 Jan 2024 16:44:14 GMT (envelope-from git) Date: Sun, 14 Jan 2024 16:44:14 GMT Message-Id: <202401141644.40EGiEIT019585@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: ceb72bff4cf2 - main - misc/img2xterm: update ImageMagick dependency 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ceb72bff4cf20abfd1f09adb1f624e3f06f987af Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=ceb72bff4cf20abfd1f09adb1f624e3f06f987af commit ceb72bff4cf20abfd1f09adb1f624e3f06f987af Author: Laurent AuthorDate: 2024-01-12 08:27:59 +0000 Commit: Fernando Apesteguía 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 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 + #include + #include +-#include ++#include + #include + + #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.