Sunday, November 27, 2022

Re: NEW: amber (in-place search and replace tool)

On Fri, Oct 21 2022, Edd Barrett <edd@theunixzoo.co.uk> wrote:
> Hi,
>
> Attached is a port of amber -- a recursive search and replace tool:
> https://crates.io/crates/amber
>
> Life's too short to remember the arcane sed incantations to do the same task :P
>
> This is just `ambr <find-this> <replace-with>`, and it is recusrive by default.
>
> Works for me. Any comments / OKs?

Here's a fix for amber on riscv64 and powerpc64, which need a more
recent libc crate version. Builds fine on amd64 too.

While here, drop PKGNAME (default) and merge V and GH_TAGNAME. The
leading 'v' in the tag name is stripped by bsd.port.mk. To be committed
separately.

ok?


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/textproc/amber/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 28 Oct 2022 10:00:47 -0000 1.2
+++ Makefile 26 Nov 2022 22:08:47 -0000
@@ -2,11 +2,8 @@ COMMENT = code search and replace tool

GH_ACCOUNT = dalance
GH_PROJECT = amber
-GH_TAGNAME = v${V}
-
-V = 0.5.9
-PKGNAME = amber-${V}
-REVISION = 0
+GH_TAGNAME = v0.5.9
+REVISION = 1

CATEGORIES = textproc sysutils
MAINTAINER = Edd Barrett <edd@openbsd.org>
@@ -22,6 +19,9 @@ DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
MODULES = devel/cargo
CONFIGURE_STYLE = cargo
SEPARATE_BUILD = Yes
+
+# for riscv64 and powerpc64, please keep: libc >= 0.2.113
+MODCARGO_CRATES_UPDATE = libc

.include "crates.inc"

Index: crates.inc
===================================================================
RCS file: /home/cvs/ports/textproc/amber/crates.inc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 crates.inc
--- crates.inc 21 Oct 2022 20:58:51 -0000 1.1.1.1
+++ crates.inc 26 Nov 2022 21:44:23 -0000
@@ -36,7 +36,7 @@ MODCARGO_CRATES += heck 0.3.2 # MIT OR A
MODCARGO_CRATES += hermit-abi 0.1.17 # MIT/Apache-2.0
MODCARGO_CRATES += itoa 0.4.7 # MIT OR Apache-2.0
MODCARGO_CRATES += lazy_static 1.4.0 # MIT/Apache-2.0
-MODCARGO_CRATES += libc 0.2.89 # MIT OR Apache-2.0
+MODCARGO_CRATES += libc 0.2.137 # MIT OR Apache-2.0
MODCARGO_CRATES += log 0.4.13 # MIT OR Apache-2.0
MODCARGO_CRATES += memchr 2.3.4 # Unlicense/MIT
MODCARGO_CRATES += memmap 0.7.0 # MIT/Apache-2.0
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/textproc/amber/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 21 Oct 2022 20:58:51 -0000 1.1.1.1
+++ distinfo 26 Nov 2022 22:09:00 -0000
@@ -37,7 +37,7 @@ SHA256 (cargo/heck-0.3.2.tar.gz) = h8v0V
SHA256 (cargo/hermit-abi-0.1.17.tar.gz) = WspVZfdg+1siDkmdcnEO0Vb9t05jFlnpk3fZ6/vROug=
SHA256 (cargo/itoa-0.4.7.tar.gz) = 3SUDYCGw3oigr/a4UAUVY8ZRbQv1P4Y4k47bud5zJzY=
SHA256 (cargo/lazy_static-1.4.0.tar.gz) = 4qutI/vEKzcA8vJ5hE3IMq2ysusGmy35GPRVxOGMxkY=
-SHA256 (cargo/libc-0.2.89.tar.gz) = U4wJLlWG9M3X3YB4xKeSIOPhaIgCGBJNy86GDw6pOMY=
+SHA256 (cargo/libc-0.2.137.tar.gz) = /H/MYgo7/3zdejZb4zdslxka6szCpgPmAJUeRSYVv4k=
SHA256 (cargo/log-0.4.13.tar.gz) = /POAXUSAu1uGBw3P654ssuvBSK23U8XMpfiE0dZaQrI=
SHA256 (cargo/memchr-2.3.4.tar.gz) = DuHEeqolbsq8rqNR6uSpsB7zntgQAE4pjSUR7ShLFSU=
SHA256 (cargo/memmap-0.7.0.tar.gz) = ZYX9lee7UNbMMeINTPmvtOK6FsWEb8dnk/ESGNqcR1s=
@@ -147,7 +147,7 @@ SIZE (cargo/heck-0.3.2.tar.gz) = 54718
SIZE (cargo/hermit-abi-0.1.17.tar.gz) = 10065
SIZE (cargo/itoa-0.4.7.tar.gz) = 12099
SIZE (cargo/lazy_static-1.4.0.tar.gz) = 10443
-SIZE (cargo/libc-0.2.89.tar.gz) = 515952
+SIZE (cargo/libc-0.2.137.tar.gz) = 606185
SIZE (cargo/log-0.4.13.tar.gz) = 36015
SIZE (cargo/memchr-2.3.4.tar.gz) = 23077
SIZE (cargo/memmap-0.7.0.tar.gz) = 15214


--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE

No comments:

Post a Comment