From e177e3a3c8b4f235478443615e27e3c11c513392 Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Mon, 10 Feb 2025 04:12:00 +0000 Subject: [PATCH] editors/hexcurse: switch to maintained fork, update, and undeprecate Keep the current port name for the time being, despite that fork had added the `-ng' suffix, to help Git track history better, as it does not have proper support for renames. While here, adjust the LICENSE. --- editors/hexcurse/Makefile | 24 ++++++++++------------ editors/hexcurse/distinfo | 6 +++--- editors/hexcurse/files/patch-include_hex.h | 11 ---------- editors/hexcurse/files/patch-src_file.c | 11 ---------- 4 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 editors/hexcurse/files/patch-include_hex.h delete mode 100644 editors/hexcurse/files/patch-src_file.c diff --git a/editors/hexcurse/Makefile b/editors/hexcurse/Makefile index fab8f2f01537..f13022e88f50 100644 --- a/editors/hexcurse/Makefile +++ b/editors/hexcurse/Makefile @@ -1,29 +1,27 @@ PORTNAME= hexcurse DISTVERSIONPREFIX= v -DISTVERSION= 1.60.0 -PORTREVISION= 1 +DISTVERSION= 1.70.0 CATEGORIES= editors MAINTAINER= bofh@FreeBSD.org COMMENT= Versatile ncurses-based hex editor -WWW= https://BSDforge.com/projects/editors/hexcurse/ +WWW= https://github.com/prso/hexcurse-ng -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Unmaintained, last release in 2015 -EXPIRATION_DATE=2025-02-11 - -USES= ncurses +USES= autoreconf ncurses USE_GITHUB= yes -GH_ACCOUNT= LonnyGomes +GH_ACCOUNT= prso +GH_PROJECT= ${PORTNAME}-ng GNU_CONFIGURE= yes - -CFLAGS+= -Wno-error=deprecated-non-prototype \ - -Wno-error=format-security \ - -Wno-error=format-truncation +INSTALL_TARGET= install-strip PLIST_FILES= bin/hexcurse share/man/man1/hexcurse.1.gz +post-patch: + @${REINPLACE_CMD} -e 's, getopt\.c,,' ${WRKSRC}/src/Makefile.am + @${REINPLACE_CMD} -e 's,hgetopt,getopt,' ${WRKSRC}/src/hexcurse.c + .include diff --git a/editors/hexcurse/distinfo b/editors/hexcurse/distinfo index d06e433d6350..33dada0c699d 100644 --- a/editors/hexcurse/distinfo +++ b/editors/hexcurse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615680672 -SHA256 (LonnyGomes-hexcurse-v1.60.0_GH0.tar.gz) = f6919e4a824ee354f003f0c42e4c4cef98a93aa7e3aa449caedd13f9a2db5530 -SIZE (LonnyGomes-hexcurse-v1.60.0_GH0.tar.gz) = 171904 +TIMESTAMP = 1724695608 +SHA256 (prso-hexcurse-ng-v1.70.0_GH0.tar.gz) = 54d93391bc769173b7e584406e58aee1d01b56298a8acdd8abd9c90ccc1a7b5b +SIZE (prso-hexcurse-ng-v1.70.0_GH0.tar.gz) = 192001 diff --git a/editors/hexcurse/files/patch-include_hex.h b/editors/hexcurse/files/patch-include_hex.h deleted file mode 100644 index 0270248207f8..000000000000 --- a/editors/hexcurse/files/patch-include_hex.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/hex.h.orig 2015-11-18 04:33:09 UTC -+++ include/hex.h -@@ -126,7 +126,7 @@ extern bool color_enabled; - #define max(a,b) ((a) >(b) ? (a) : (b)) - #endif - --FILE *fpIN; /* global file ptr */ -+extern FILE *fpIN; /* global file ptr */ - - /* function prototypes */ - diff --git a/editors/hexcurse/files/patch-src_file.c b/editors/hexcurse/files/patch-src_file.c deleted file mode 100644 index 83385f4a3006..000000000000 --- a/editors/hexcurse/files/patch-src_file.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/file.c.orig 2015-11-18 04:33:09 UTC -+++ src/file.c -@@ -18,6 +18,8 @@ - \******************************************************************************/ - #include "hex.h" - -+FILE *fpIN; /* global file ptr */ -+ - /*******************************************************\ - * Description: prints out a line of text to the screen* - * the current address line and both the *