From nobody Thu Apr 28 06:01:34 2022 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 B835D1AAED48; Thu, 28 Apr 2022 06:01:34 +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 4KplPB4s8Xz4Rnd; Thu, 28 Apr 2022 06:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651125694; 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=a87JctSHoaM2i44skdczCC3hoBTBtT3JQYITOBO9dhM=; b=xNgrHivcgylWMezEsE9BnwovzxKc4DQ9FMlshbe7DC/o0WD802c+44UU60Ul0LyZBQkmAu kIXNG7w4uL0wnXal6bxcDp/8MxhyvylIqFeCiO8TNycQKJMDbteyoOOE2yKA+qfGcOUjMw KN+PLQg9KUZp6oghSTI/3bQYbvar7udyby3PkUBoOH1ewi62bD5Vu1iD4+vDo7bgI+VIhO qUDGKCRhSxEQAgZHjTIhrEE3lGMyMC0PNYAUxphuqm72FBOg0ZY1ULwxePM9G1icRS2qQI ABvfoVhdCLLxHga/5kGZOA941UHIrJfg3SjZuUrHmvnB293dRUe0dLpi7L3H6w== 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 871641328B; Thu, 28 Apr 2022 06:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23S61Ybv010775; Thu, 28 Apr 2022 06:01:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23S61YQQ010774; Thu, 28 Apr 2022 06:01:34 GMT (envelope-from git) Date: Thu, 28 Apr 2022 06:01:34 GMT Message-Id: <202204280601.23S61YQQ010774@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: 930715f767cc - main - editors/rehex: update to 0.5.0 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: 930715f767ccfb6375ee7c56f7ba3134541593de Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651125694; 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=a87JctSHoaM2i44skdczCC3hoBTBtT3JQYITOBO9dhM=; b=rKff5JRlOCaKBLIUZPzIOe6PqkMq1PHlesEbkhTfzMzxj88/ywfz0RT6zDJb3R5qBbEC3u by72LEXjn36kbENGBRYYmiARY4gF24qKRRSGkbYc7SwgbgyOjNAXHN4Nt6hhbtVxP+TRoG x0tUSfoK7sAwxo/G2MFaXzsHL5WLuM54ZgxeDQmzNuwDq8r0OHvxGpZedg4VMCw0E4DxIh 4TbaSlaX5vqIQOuKP8Y8zjZMyXZEBVAtlVxUU2Gomk/ycivvqzKRA466rRZ5uiPuuFBAuT jU44xNLBIlao4GSfK+Khc6c1RDQPwNn9sX48SSK+I0DpKelJDgh/p2RRYgPqiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651125694; a=rsa-sha256; cv=none; b=dS4YYF7WeleRfj82/HUTrWQylmoDKO4BOITljCK7bcwKDh1vf6inBAFRnaNEogVBEUO4V9 dtdHhZUg8c+PJAtJ0aVl/HUtZrGh1eF5Nl7lnkVmsdN/4B8Ax246sK71JbX8BjSYT2dBfa oacx4CHzFiMDy3O2eAFErly3vVQ4FZimBrjQvUrAjR3uu05xwfZlX16JBEpiLfwW55JFGw B9s8I9Fn2zTI3g20Kcc5GvFRZs6EYDxH8uJ9ltutQIRk1KckIOjzMkXNesZB02SkcnxwO4 FNKnIft+5tU7KSY9ronuxpFRnHcISdKpVL64OPik5syt0fVuIGHpS5TQZf48eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=930715f767ccfb6375ee7c56f7ba3134541593de commit 930715f767ccfb6375ee7c56f7ba3134541593de Author: Robert Clausecker AuthorDate: 2022-04-27 07:20:11 +0000 Commit: Fernando Apesteguía CommitDate: 2022-04-28 05:58:56 +0000 editors/rehex: update to 0.5.0 ChangeLog: https://github.com/solemnwarning/rehex/releases/tag/0.5.0 Submitter requests maintainership. Already maintainer of several ports. PR: 263562 Reported by: fuz@fuz.su (maintainer) --- editors/rehex/Makefile | 18 ++++++++---- editors/rehex/distinfo | 6 ++-- editors/rehex/files/patch-Makefile | 32 ++++++++++++---------- .../files/patch-plugins_binary-template_Makefile | 11 ++++++++ editors/rehex/pkg-plist | 13 +++++++++ 5 files changed, 58 insertions(+), 22 deletions(-) diff --git a/editors/rehex/Makefile b/editors/rehex/Makefile index 6726ae7b1dd4..3ecdb18f8f95 100644 --- a/editors/rehex/Makefile +++ b/editors/rehex/Makefile @@ -1,23 +1,31 @@ # Created by: Alexey Dokuchaev PORTNAME= rehex -PORTVERSION= 0.4.1 +DISTVERSION= 0.5.0 CATEGORIES= editors -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fuz@fuz.su 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 \ libjansson.so:devel/jansson \ libunistring.so:devel/libunistring -USES= compiler:c++11-lang gmake gnome lua:53 pkgconfig -USE_WX= 3.0+ -MAKE_ENV= LUA_PKG="lua-${LUA_VER}" LUA="${LUA_CMD}" +USES= compiler:c++11-lang gmake gnome lua:53 perl5 pkgconfig USE_GITHUB= yes 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}" +TEST_TARGET= check PORTDOCS= CHANGES.txt diff --git a/editors/rehex/distinfo b/editors/rehex/distinfo index 3d75ac9b9231..54dfa451bed0 100644 --- a/editors/rehex/distinfo +++ b/editors/rehex/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642090465 -SHA256 (solemnwarning-rehex-0.4.1_GH0.tar.gz) = 88a8ec41147a5ed5c542d40496b7231fb42ebfd1783c4498202fca5a1ddaae8f -SIZE (solemnwarning-rehex-0.4.1_GH0.tar.gz) = 3347164 +TIMESTAMP = 1650880974 +SHA256 (solemnwarning-rehex-0.5.0_GH0.tar.gz) = f6737e44d98da9a81ba0217da56fc0b4d36338204ab5f076b77af536a4b35981 +SIZE (solemnwarning-rehex-0.5.0_GH0.tar.gz) = 3905886 diff --git a/editors/rehex/files/patch-Makefile b/editors/rehex/files/patch-Makefile index 91c4fea5fd06..2f8727d454e7 100644 --- a/editors/rehex/files/patch-Makefile +++ b/editors/rehex/files/patch-Makefile @@ -1,27 +1,31 @@ ---- Makefile.orig 2021-05-03 12:57:27 UTC +--- Makefile.orig 2022-04-23 13:09:38 UTC +++ Makefile -@@ -388,18 +388,20 @@ PLUGINS_INSTALL := \ +@@ -503,17 +503,21 @@ PLUGINS := \ .PHONY: install - install: $(EXE) + install: $(EXE) help/rehex.htb - install -D -m 0755 $(EXE) $(DESTDIR)$(bindir)/$(EXE) -+ $(BSD_INSTALL_PROGRAM) $(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; \ -+ $(BSD_INSTALL_DATA) res/icon$${s}.png $(DESTDIR)$(datarootdir)/icons/hicolor/$${s}x$${s}/apps/rehex.png; \ ++ 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 -+ $(BSD_INSTALL_DATA) 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 f in $(PLUGINS_INSTALL); \ + for p in $(PLUGINS); \ do \ -- install -D -m 0644 plugins/$${f} $(DESTDIR)$(libdir)/rehex/$${f}; \ -+ $(BSD_INSTALL_DATA) plugins/$${f} $(DESTDIR)$(libdir)/rehex/$${f}; \ - done - - .PHONY: uninstall + $(MAKE) -C plugins/$${p} install || exit $$?; \ diff --git a/editors/rehex/files/patch-plugins_binary-template_Makefile b/editors/rehex/files/patch-plugins_binary-template_Makefile new file mode 100644 index 000000000000..8ab71562080e --- /dev/null +++ b/editors/rehex/files/patch-plugins_binary-template_Makefile @@ -0,0 +1,11 @@ +--- plugins/binary-template/Makefile.orig 2022-04-25 10:32:52 UTC ++++ plugins/binary-template/Makefile +@@ -49,7 +49,7 @@ ifeq ($(BUSTED),) + endif + + ifeq ($(BUSTED),) +- X := $(error Neither busted or busted.bat found in PATH) ++ BUSTED := @echo busted not found in PATH, skipping checks ; true + endif + endif + diff --git a/editors/rehex/pkg-plist b/editors/rehex/pkg-plist index 86e612384b8d..6d03734ca597 100644 --- a/editors/rehex/pkg-plist +++ b/editors/rehex/pkg-plist @@ -1,4 +1,16 @@ bin/rehex +lib/rehex/binary-template/executor.lua +lib/rehex/binary-template/executor/arrayvalue.lua +lib/rehex/binary-template/executor/filearrayvalue.lua +lib/rehex/binary-template/executor/filevalue.lua +lib/rehex/binary-template/executor/immediatevalue.lua +lib/rehex/binary-template/executor/plainvalue.lua +lib/rehex/binary-template/executor/structvalue.lua +lib/rehex/binary-template/lulpeg/lulpeg.lua +lib/rehex/binary-template/parser.lua +lib/rehex/binary-template/plugin.lua +lib/rehex/binary-template/preprocessor.lua +lib/rehex/binary-template/templates/riff.bt lib/rehex/exe/bitops52.lua lib/rehex/exe/class.lua lib/rehex/exe/document_stream.lua @@ -17,3 +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