git: aaf3658bf427 - main - editors/rehex: update to 0.5.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Mikael Urankar <mikael_at_FreeBSD.org>
Date: Mon, 09 May 2022 08:34:14 UTC
The branch main has been updated by mikael:

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

commit aaf3658bf427531339d8a7af42fd98e6c2d61444
Author:     Robert Clausecker <fuz@fuz.su>
AuthorDate: 2022-04-30 15:05:28 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2022-05-09 08:33:58 +0000

    editors/rehex: update to 0.5.1
    
     - remove upstreamed Makefile patch
     - make building of help files dependent on DOCS option
    
    Changelog:      https://github.com/solemnwarning/rehex/blob/master/CHANGES.txt
    
    PR:             263687
---
 editors/rehex/Makefile             | 15 +++++----------
 editors/rehex/distinfo             |  6 +++---
 editors/rehex/files/patch-Makefile | 31 -------------------------------
 editors/rehex/pkg-plist            |  2 +-
 4 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/editors/rehex/Makefile b/editors/rehex/Makefile
index 3ecdb18f8f95..f4860b4e632a 100644
--- a/editors/rehex/Makefile
+++ b/editors/rehex/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	rehex
-DISTVERSION=	0.5.0
+DISTVERSION=	0.5.1
 CATEGORIES=	editors
 
 MAINTAINER=	fuz@fuz.su
@@ -10,8 +10,6 @@ COMMENT=	Hex editor for reverse engineering
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	p5-Template-Toolkit>0:www/p5-Template-Toolkit \
-		zip:archivers/zip
 LIB_DEPENDS=	libcapstone.so:devel/capstone4 \
 		libharfbuzz.so:print/harfbuzz \
 		libiconv.so:converters/libiconv \
@@ -24,15 +22,12 @@ GH_ACCOUNT=	solemnwarning
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 pango
 USE_PERL5=	build
 USE_WX=		3.0+
-MAKE_ENV=	LUA_PKG="lua-${LUA_VER}" LUA="${LUA_CMD}" STRIP="${STRIP}"
+MAKE_ENV=	INSTALL_STRIP="${STRIP}" LUA_PKG="lua-${LUA_VER}" LUA="${LUA_CMD}"
 TEST_TARGET=	check
 
-PORTDOCS=	CHANGES.txt
-
 OPTIONS_DEFINE=	DOCS
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+DOCS_BUILD_DEPENDS=	p5-Template-Toolkit>0:www/p5-Template-Toolkit \
+			zip:archivers/zip
+DOCS_MAKE_ARGS_OFF=	BUILD_HELP=0
 
 .include <bsd.port.mk>
diff --git a/editors/rehex/distinfo b/editors/rehex/distinfo
index 54dfa451bed0..c4d35ff5c189 100644
--- a/editors/rehex/distinfo
+++ b/editors/rehex/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1650880974
-SHA256 (solemnwarning-rehex-0.5.0_GH0.tar.gz) = f6737e44d98da9a81ba0217da56fc0b4d36338204ab5f076b77af536a4b35981
-SIZE (solemnwarning-rehex-0.5.0_GH0.tar.gz) = 3905886
+TIMESTAMP = 1651326187
+SHA256 (solemnwarning-rehex-0.5.1_GH0.tar.gz) = e976b3dfa2b2a2d1a17f6300b25958825aaa2a2c092904b8fdc55bda98698d69
+SIZE (solemnwarning-rehex-0.5.1_GH0.tar.gz) = 3906525
diff --git a/editors/rehex/files/patch-Makefile b/editors/rehex/files/patch-Makefile
deleted file mode 100644
index 2f8727d454e7..000000000000
--- a/editors/rehex/files/patch-Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.orig	2022-04-23 13:09:38 UTC
-+++ Makefile
-@@ -503,17 +503,21 @@ PLUGINS := \
- 
- .PHONY: install
- install: $(EXE) help/rehex.htb
--	install -D -m 0755 $(EXE) $(DESTDIR)$(bindir)/$(EXE)
-+	install -m 0755 $(STRIP) $(EXE) $(DESTDIR)$(bindir)/$(EXE)
- 	
- 	for s in 16 32 48 64 128 256 512; \
- 	do \
--		install -D -m 0644 res/icon$${s}.png $(DESTDIR)$(datarootdir)/icons/hicolor/$${s}x$${s}/apps/rehex.png; \
-+		mkdir -p $(DESTDIR)$(datarootdir)/icons/hicolor/$${s}x$${s}/apps; \
-+		install -m 0644 res/icon$${s}.png $(DESTDIR)$(datarootdir)/icons/hicolor/$${s}x$${s}/apps/rehex.png; \
- 	done
--	
--	install -D -m 0644 res/rehex.desktop $(DESTDIR)$(datarootdir)/applications/rehex.desktop
--	
--	install -D -m 0644 help/rehex.htb $(DESTDIR)$(datadir)/rehex/rehex.htb
--	
-+
-+	mkdir -p $(DESTDIR)$(datarootdir)/applications
-+	install -m 0644 res/rehex.desktop $(DESTDIR)$(datarootdir)/applications/rehex.desktop
-+
-+	mkdir -p $(DESTDIR)$(datadir)/rehex
-+	install -m 0644 help/rehex.htb $(DESTDIR)$(datadir)/rehex/rehex.htb
-+
-+	mkdir -p $(DESTDIR)$(libdir)/rehex/exe
- 	for p in $(PLUGINS); \
- 	do \
- 		$(MAKE) -C plugins/$${p} install || exit $$?; \
diff --git a/editors/rehex/pkg-plist b/editors/rehex/pkg-plist
index 6d03734ca597..aa30f3c3017c 100644
--- a/editors/rehex/pkg-plist
+++ b/editors/rehex/pkg-plist
@@ -29,4 +29,4 @@ share/icons/hicolor/32x32/apps/rehex.png
 share/icons/hicolor/48x48/apps/rehex.png
 share/icons/hicolor/512x512/apps/rehex.png
 share/icons/hicolor/64x64/apps/rehex.png
-%%DATADIR%%/rehex.htb
+%%PORTDOCS%%%%DATADIR%%/rehex.htb