Reformulate "let" helper into "with"

7 files changed, 24 insertions, 21 deletions

diff --git a/core/e2fsprogs/gen.rc b/core/e2fsprogs/gen.rc
index e92032d6..1d58f54d 100644
--- a/core/e2fsprogs/gen.rc
+++ b/core/e2fsprogs/gen.rc
@@ -16,14 +16,14 @@ set subst\
 
 fn et {
 	et=$1 src='$outdir'/$2 hdr='$outdir'/$3
-	let expr '-f $srcdir/lib/et/et_c.awk -v outfile=/dev/stdout outfn='`{basename $src} --\
-		build $src awk $et '|' '$srcdir'/lib/et/et_c.awk
-	let expr '-f $srcdir/lib/et/et_h.awk -v outfile=/dev/stdout outfn='`{basename $hdr} --\
-		build $hdr awk $et '|' '$srcdir'/lib/et/et_h.awk
+	build $src awk $et '|' '$srcdir'/lib/et/et_c.awk ; with\
+		expr '-f $srcdir/lib/et/et_c.awk -v outfile=/dev/stdout outfn='`{basename $src}
+	build $hdr awk $et '|' '$srcdir'/lib/et/et_h.awk ; with\
+		expr '-f $srcdir/lib/et/et_h.awk -v outfile=/dev/stdout outfn='`{basename $hdr}
 }
 
 fn subst {
-	let expr '$subst' -- build '$outdir'/$1 sed '$srcdir'/$2
+	build '$outdir'/$1 sed '$srcdir'/$2 ; with expr '$subst'
 }
 
 fn man {
diff --git a/core/file/gen.rc b/core/file/gen.rc
index 84f672ce..032f96a9 100644
--- a/core/file/gen.rc
+++ b/core/file/gen.rc
@@ -19,12 +19,16 @@ for(src in $srcs) build '$outdir'/magic/$src copy '$srcdir'/magic/Magdir/$src
 rule magic 'cd $outdir && file -C -m magic'
 build '$outdir'/magic.mgc magic '|' '$outdir'/$magic_outs
 
-let expr s@X.YY@`{echo $version | tr -d .}^@ --\
-	build '$outdir'/include/magic.h sed '$srcdir'/src/magic.h.in
+build '$outdir'/include/magic.h sed '$srcdir'/src/magic.h.in ; with\
+	expr s,X.YY,`{echo $version | tr -d .}^,
 phony headers include/magic.h
 
-let expr '-e s@__CSECTION__@1@g -e s@__FSECTION__@5@g -e s@__VERSION__@'$version'@g -e s@__MAGIC__@/share/file/magic@g' --\
-	build '$outdir'/file.1 sed '$srcdir'/doc/file.man
+build '$outdir'/file.1 sed '$srcdir'/doc/file.man ; exprs=(\
+	-e s,__CSECTION__,1,g\
+	-e s,__FSECTION__,5,g\
+	-e s,__VERSION__,$version,g\
+	-e s,__MAGIC__,/share/file/magic,g\
+) with expr $"exprs
 
 lib libmagic.a -d 'phony/$dir/headers phony/core/zlib/headers' src/^(\
 	magic.c\
diff --git a/core/git/gen.rc b/core/git/gen.rc
index 0c77eba4..a5f5ad29 100644
--- a/core/git/gen.rc
+++ b/core/git/gen.rc
@@ -12,7 +12,7 @@ build '$outdir'/common-cmds.h cmdlist '$srcdir'/command-list.txt '|' '$srcdir'/$
 
 deps=phony/core/^(curl libressl zlib)^/headers
 
-let cflags '$cflags ''-DPREFIX=""''' -- cc exec_cmd.c
+cc exec_cmd.c ; with cflags '$cflags ''-DPREFIX=""'''
 
 # src/Makefile:/^LIB_OBJS.\+=
 lib libgit.a -d $"deps\
diff --git a/core/iproute2/gen.rc b/core/iproute2/gen.rc
index df9b26e5..77f88cea 100644
--- a/core/iproute2/gen.rc
+++ b/core/iproute2/gen.rc
@@ -44,7 +44,7 @@ man=(\
 	)\
 ) for(man in man/man8/$man.8) file share/$man '$srcdir'/$man 644
 for(man in ip-address ip-link ip-route) {
-	let expr 's,@SYSCONFDIR@,/etc,g' --\
-		build '$outdir'/$man.8 sed '$srcdir'/man/man8/$man.8.in
+	build '$outdir'/$man.8 sed '$srcdir'/man/man8/$man.8.in ; with\
+		expr s,@SYSCONFDIR@,/etc,g
 	file share/man/man8/$man.8 '$outdir'/$man.8 644
 }
diff --git a/core/kbd/gen.rc b/core/kbd/gen.rc
index 6b78a6f9..4813c739 100644
--- a/core/kbd/gen.rc
+++ b/core/kbd/gen.rc
@@ -39,8 +39,8 @@ fn x {
 	file bin/$exe '$outdir'/$exe 755
 	if(~ $sect ?~) {
 		sect=`{printf %s $sect | cut -c -1}
-		let expr s,@DATADIR@,/share/kbd,g --\
-			build '$outdir'/$exe.$sect sed '$srcdir'/docs/man/man$sect/$exe.$sect.in
+		build '$outdir'/$exe.$sect sed '$srcdir'/docs/man/man$sect/$exe.$sect.in ; with\
+			expr s,@DATADIR@,/share/kbd,g
 		man='$outdir'/$exe.$sect
 	}
 	if not man='$srcdir'/docs/man/man$sect/$exe.$sect
diff --git a/core/openssh/gen.rc b/core/openssh/gen.rc
index 958b76a1..bb3eeb18 100644
--- a/core/openssh/gen.rc
+++ b/core/openssh/gen.rc
@@ -7,14 +7,13 @@ cflags\
 	-I '$srcdir' \
 	-I '$srcdir'/openbsd-compat\
 
-defs=(\
+build '$outdir'/umac128.c.o cc '$srcdir'/umac.c ; defs=(\
 	'-DUMAC_OUTPUT_LEN=16' \
 	'-Dumac_new=umac128_new' \
 	'-Dumac_update=umac128_update' \
 	'-Dumac_final=umac128_final' \
 	'-Dumac_delete=umac128_delete' \
-) let cflags '$cflags '$"defs --\
-	build '$outdir'/umac128.c.o cc '$srcdir'/umac.c
+) with cflags '$cflags '$"defs
 
 lib libopenbsd-compat.a openbsd-compat/^(\
 	base64.c basename.c bcrypt_pbkdf.c bindresvport.c blowfish.c daemon.c\
diff --git a/core/perp/gen.rc b/core/perp/gen.rc
index 1a6a7609..78d0ab28 100644
--- a/core/perp/gen.rc
+++ b/core/perp/gen.rc
@@ -17,8 +17,8 @@ rule rlimit '$outdir/mk_rlimit >$out.tmp && mv $out.tmp $out'
 build '$outdir'/rlimit_defs.c.in rlimit '|' '$outdir'/mk_rlimit
 
 rule sysstr '$outdir/mksysstr $type >$out.tmp && mv $out.tmp $out'
-let type errno -- build '$outdir'/sysstr_errno.c.in sysstr '|' '$outdir'/mksysstr
-let type signo -- build '$outdir'/sysstr_signo.c.in sysstr '|' '$outdir'/mksysstr
+build '$outdir'/sysstr_errno.c.in sysstr '|' '$outdir'/mksysstr ; with type errno
+build '$outdir'/sysstr_signo.c.in sysstr '|' '$outdir'/mksysstr ; with type signo
 
 phony internal_headers outvec_STDOUT.h rlimit_defs.c.in sysstr_^(errno signo)^.c.in
 
@@ -70,8 +70,8 @@ fn x {
 
 x perp perpd perpd.c perpd_conn.c perpd_svdef.c
 
-let cflags '$cflags -D ''TINYLOG_ZIP="/bin/gzip"'' -D ''ZIP_EXT=".gz"''' --\
-	cc perp/tinylog.c
+cc perp/tinylog.c ; with\
+	cflags '$cflags -D ''TINYLOG_ZIP="/bin/gzip"'' -D ''ZIP_EXT=".gz"'''
 x perp tinylog tinylog.c.o
 
 for(exe in perp^(boot ctl hup ls ok stat)) x perp $exe $exe.c