Reformulate "let" helper into "with"

5 files changed, 10 insertions, 11 deletions

diff --git a/extra/libevent/gen.rc b/extra/libevent/gen.rc
index e84204f0..6910ae5d 100644
--- a/extra/libevent/gen.rc
+++ b/extra/libevent/gen.rc
@@ -4,8 +4,8 @@ cflags\
 	-I include\
 	-idirafter core/openbsd/src/sys
 
-let expr '-f $srcdir/make-event-config.sed' --\
-	build '$outdir'/include/event2/event-config.h sed '$dir'/config.h
+build '$outdir'/include/event2/event-config.h sed '$dir'/config.h ; with\
+	expr '-f $srcdir/make-event-config.sed'
 
 phony headers '$outdir'/include/event2/event-config.h
 
diff --git a/extra/libnl/gen.rc b/extra/libnl/gen.rc
index 62e0a465..d16e52e8 100644
--- a/extra/libnl/gen.rc
+++ b/extra/libnl/gen.rc
@@ -27,7 +27,7 @@ hdrs=include/netlink/^(\
 	utils.h\
 )
 for(hdr in $hdrs) build '$outdir'/$hdr copy '$srcdir'/$hdr
-exprs=(\
+build '$outdir'/include/netlink/version.h sed '$srcdir'/include/netlink/version.h.in ; exprs=(\
 	-e s,@PACKAGE_STRING@,'''libnl 3.2.27''',\
 	-e s,@PACKAGE_VERSION@,3.2.27,\
 	-e s,@MAJ_VERSION@,3,\
@@ -36,8 +36,7 @@ exprs=(\
 	-e s,@LT_CURRENT@,222,\
 	-e s,@LT_REVISION@,0,\
 	-e s,@LT_AGE@,22,\
-) let expr $"exprs --\
-	build '$outdir'/include/netlink/version.h sed '$srcdir'/include/netlink/version.h.in
+) with expr $"exprs
 hdrs=($hdrs include/netlink/version.h)
 phony headers '$outdir'/$hdrs
 
diff --git a/extra/pcre/gen.rc b/extra/pcre/gen.rc
index 850d1e30..dfdde386 100644
--- a/extra/pcre/gen.rc
+++ b/extra/pcre/gen.rc
@@ -5,12 +5,12 @@ cflags\
 	-I '$srcdir' \
 	-I '$outdir'/include
 
-exprs=(\
+build '$outdir'/include/pcre.h sed '$srcdir'/pcre.h.in ; exprs=(\
 	-e s,@PCRE_MAJOR@,8,\
 	-e s,@PCRE_MINOR@,39,\
 	-e s,@PCRE_PRERELEASE@,,\
 	-e s,@PCRE_DATE@,2016-06-14,\
-) let expr $"exprs -- build '$outdir'/include/pcre.h sed '$srcdir'/pcre.h.in
+) with expr $"exprs
 
 phony headers '$outdir'/include/pcre.h
 
diff --git a/extra/sshfs/gen.rc b/extra/sshfs/gen.rc
index 1d45d1f1..38b51725 100644
--- a/extra/sshfs/gen.rc
+++ b/extra/sshfs/gen.rc
@@ -4,8 +4,8 @@ cflags\
 	-I extra/libfuse/src/include\
 	-I '$dir'
 
-let expr 's,__UNMOUNT_COMMAND__,''fusermount -u'',' --\
-	build '$outdir'/sshfs.1 sed '$srcdir'/sshfs.1.in
+build '$outdir'/sshfs.1 sed '$srcdir'/sshfs.1.in ; with\
+	expr 's,__UNMOUNT_COMMAND__,''fusermount -u'','
 
 exe sshfs sshfs.c nocache.c '$builddir'/extra/libfuse/libfuse.a
 file bin/sshfs '$outdir'/sshfs 755
diff --git a/extra/transmission/gen.rc b/extra/transmission/gen.rc
index 7210f40f..9d069df8 100644
--- a/extra/transmission/gen.rc
+++ b/extra/transmission/gen.rc
@@ -106,8 +106,8 @@ subninja '$dir'/libnatpmp.ninja
 		-idirafter core/openbsd/src/sys
 
 	hdr='$outdir'/miniupnp/miniupnpcstrings.h
-	let expr '-e s,OS/version,Linux, -e s,version,,' --\
-		build $hdr sed '$srcdir'/third-party/miniupnp/miniupnpcstrings.h.in
+	build $hdr sed '$srcdir'/third-party/miniupnp/miniupnpcstrings.h.in ; with\
+		expr '-e s,OS/version,Linux, -e s,version,,'
 
 	lib libminiupnp.a -d $hdr third-party/miniupnp/^(\
 		connecthostport.c\