Attachment #233477 for bug #263562

View | Details | Raw Unified | Return to bug 263562
Collapse All | Expand All

Lines 1-23 Link Here

(-)b/editors/rehex/Makefile (-5 / +13 lines)
1	# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>	1	# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
2		2
3	PORTNAME= rehex	3	PORTNAME= rehex
4	PORTVERSION= 0.4.1	4	DISTVERSION= 0.5.0
5	CATEGORIES= editors	5	CATEGORIES= editors
6		6
7	MAINTAINER= ports@FreeBSD.org	7	MAINTAINER= fuz@fuz.su
8	COMMENT= Hex editor for reverse engineering	8	COMMENT= Hex editor for reverse engineering
9		9
10	LICENSE= GPLv2	10	LICENSE= GPLv2
		11	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
11		12
		13	BUILD_DEPENDS= p5-Template-Toolkit>0:www/p5-Template-Toolkit \
		14	zip:archivers/zip
12	LIB_DEPENDS= libcapstone.so:devel/capstone4 \	15	LIB_DEPENDS= libcapstone.so:devel/capstone4 \
		16	libharfbuzz.so:print/harfbuzz \
		17	libiconv.so:converters/libiconv \
13	libjansson.so:devel/jansson \	18	libjansson.so:devel/jansson \
14	libunistring.so:devel/libunistring	19	libunistring.so:devel/libunistring
15		20
16	USES= compiler:c++11-lang gmake gnome lua:53 pkgconfig	21	USES= compiler:c++11-lang gmake gnome lua:53 perl5 pkgconfig
17	USE_WX= 3.0+
18	MAKE_ENV= LUA_PKG="lua-${LUA_VER}" LUA="${LUA_CMD}"
19	USE_GITHUB= yes	22	USE_GITHUB= yes
20	GH_ACCOUNT= solemnwarning	23	GH_ACCOUNT= solemnwarning
		24	USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 pango
		25	USE_PERL5= build
		26	USE_WX= 3.0+
		27	MAKE_ENV= LUA_PKG="lua-${LUA_VER}" LUA="${LUA_CMD}" STRIP="${STRIP}"
		28	TEST_TARGET= check
21		29
22	PORTDOCS= CHANGES.txt	30	PORTDOCS= CHANGES.txt
23		31

Lines 1-3 Link Here

(-)b/editors/rehex/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1642090465	1	TIMESTAMP = 1650880974
2	SHA256 (solemnwarning-rehex-0.4.1_GH0.tar.gz) = 88a8ec41147a5ed5c542d40496b7231fb42ebfd1783c4498202fca5a1ddaae8f	2	SHA256 (solemnwarning-rehex-0.5.0_GH0.tar.gz) = f6737e44d98da9a81ba0217da56fc0b4d36338204ab5f076b77af536a4b35981
3	SIZE (solemnwarning-rehex-0.4.1_GH0.tar.gz) = 3347164	3	SIZE (solemnwarning-rehex-0.5.0_GH0.tar.gz) = 3905886




--- 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 $$?; \
+		$(BSD_INSTALL_DATA) plugins/$${f} $(DESTDIR)$(libdir)/rehex/$${f}; \
 	done
 
 .PHONY: uninstall

Added Link Here

(-)b/editors/rehex/files/patch-plugins_binary-template_Makefile (+11 lines)
1	--- plugins/binary-template/Makefile.orig 2022-04-25 10:32:52 UTC
2	+++ plugins/binary-template/Makefile
3	@@ -49,7 +49,7 @@ ifeq ($(BUSTED),)
4	endif
5
6	ifeq ($(BUSTED),)
7	- X := $(error Neither busted or busted.bat found in PATH)
8	+ BUSTED := @echo busted not found in PATH, skipping checks ; true
9	endif
10	endif
11

Lines 1-4 Link Here

(-)b/editors/rehex/pkg-plist (-1 / +13 lines)
1	bin/rehex	1	bin/rehex
		2	lib/rehex/binary-template/executor.lua
		3	lib/rehex/binary-template/executor/arrayvalue.lua
		4	lib/rehex/binary-template/executor/filearrayvalue.lua
		5	lib/rehex/binary-template/executor/filevalue.lua
		6	lib/rehex/binary-template/executor/immediatevalue.lua
		7	lib/rehex/binary-template/executor/plainvalue.lua
		8	lib/rehex/binary-template/executor/structvalue.lua
		9	lib/rehex/binary-template/lulpeg/lulpeg.lua
		10	lib/rehex/binary-template/parser.lua
		11	lib/rehex/binary-template/plugin.lua
		12	lib/rehex/binary-template/preprocessor.lua
		13	lib/rehex/binary-template/templates/riff.bt
2	lib/rehex/exe/bitops52.lua	14	lib/rehex/exe/bitops52.lua
3	lib/rehex/exe/class.lua	15	lib/rehex/exe/class.lua
4	lib/rehex/exe/document_stream.lua	16	lib/rehex/exe/document_stream.lua
Lines 17-19 share/icons/hicolor/32x32/apps/rehex.png Link Here
17	share/icons/hicolor/48x48/apps/rehex.png	29	share/icons/hicolor/48x48/apps/rehex.png
18	share/icons/hicolor/512x512/apps/rehex.png	30	share/icons/hicolor/512x512/apps/rehex.png
19	share/icons/hicolor/64x64/apps/rehex.png	31	share/icons/hicolor/64x64/apps/rehex.png
20	-	32	%%DATADIR%%/rehex.htb

Return to bug 263562

Lines 1-27 Link Here

(-)b/editors/rehex/files/patch-Makefile (-14 / +18 lines)
1	--- Makefile.orig 2021-05-03 12:57:27 UTC	1	--- Makefile.orig 2022-04-23 13:09:38 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -388,18 +388,20 @@ PLUGINS_INSTALL := \	3	@@ -503,17 +503,21 @@ PLUGINS := \
4		4
5	.PHONY: install	5	.PHONY: install
6	install: $(EXE)	6	install: $(EXE) help/rehex.htb
7	- install -D -m 0755 $(EXE) $(DESTDIR)$(bindir)/$(EXE)	7	- install -D -m 0755 $(EXE) $(DESTDIR)$(bindir)/$(EXE)
8	+ $(BSD_INSTALL_PROGRAM) $(EXE) $(DESTDIR)$(bindir)/$(EXE)	8	+ install -m 0755 $(STRIP) $(EXE) $(DESTDIR)$(bindir)/$(EXE)
9		9
10	for s in 16 32 48 64 128 256 512; \	10	for s in 16 32 48 64 128 256 512; \
11	do \	11	do \
12	- install -D -m 0644 res/icon$${s}.png $(DESTDIR)$(datarootdir)/icons/hicolor/$${s}x$${s}/apps/rehex.png; \	12	- install -D -m 0644 res/icon$${s}.png $(DESTDIR)$(datarootdir)/icons/hicolor/$${s}x$${s}/apps/rehex.png; \
13	+ mkdir -p $(DESTDIR)$(datarootdir)/icons/hicolor/$${s}x$${s}/apps; \	13	+ mkdir -p $(DESTDIR)$(datarootdir)/icons/hicolor/$${s}x$${s}/apps; \
14	+ $(BSD_INSTALL_DATA) res/icon$${s}.png $(DESTDIR)$(datarootdir)/icons/hicolor/$${s}x$${s}/apps/rehex.png; \	14	+ install -m 0644 res/icon$${s}.png $(DESTDIR)$(datarootdir)/icons/hicolor/$${s}x$${s}/apps/rehex.png; \
15	done	15	done
16		16	-
17	- install -D -m 0644 res/rehex.desktop $(DESTDIR)$(datarootdir)/applications/rehex.desktop	17	- install -D -m 0644 res/rehex.desktop $(DESTDIR)$(datarootdir)/applications/rehex.desktop
18	+ $(BSD_INSTALL_DATA) res/rehex.desktop $(DESTDIR)$(datarootdir)/applications/rehex.desktop	18	-
19		19	- install -D -m 0644 help/rehex.htb $(DESTDIR)$(datadir)/rehex/rehex.htb
		20	-
		21	+
		22	+ mkdir -p $(DESTDIR)$(datarootdir)/applications
		23	+ install -m 0644 res/rehex.desktop $(DESTDIR)$(datarootdir)/applications/rehex.desktop
		24	+
		25	+ mkdir -p $(DESTDIR)$(datadir)/rehex
		26	+ install -m 0644 help/rehex.htb $(DESTDIR)$(datadir)/rehex/rehex.htb
		27	+
20	+ mkdir -p $(DESTDIR)$(libdir)/rehex/exe	28	+ mkdir -p $(DESTDIR)$(libdir)/rehex/exe
21	for f in $(PLUGINS_INSTALL); \	29	for p in $(PLUGINS); \
22	do \	30	do \
23	- install -D -m 0644 plugins/$${f} $(DESTDIR)$(libdir)/rehex/$${f}; \	31	$(MAKE) -C plugins/$${p} install \|\| exit $$?; \
24	+ $(BSD_INSTALL_DATA) plugins/$${f} $(DESTDIR)$(libdir)/rehex/$${f}; \
25	done
26
27	.PHONY: uninstall