Port build scripts to POSIX shell

Since we are now using Lua to generate ninja files, use of rc in build scripts
seems unnecessary and adds an additional bootstrap dependency. None of them are
too fancy, so just port to POSIX sh instead.

7 files changed, 53 insertions, 32 deletions

diff --git a/pkg/ffmpeg/scripts/sources.rc b/pkg/ffmpeg/scripts/sources.sh
index d963e714..eac0e495 100755
--- a/pkg/ffmpeg/scripts/sources.rc
+++ b/pkg/ffmpeg/scripts/sources.sh
@@ -1,7 +1,6 @@
-#!/bin/rc
+#!/bin/sh
 
-flag e +
-flag x +
+set -ex
 
 ../src/configure >/dev/null
 awk '{print $2}' config.asm >vars.txt
diff --git a/pkg/git/fetch.rc b/pkg/git/fetch.rc
deleted file mode 100644
index bec188d5..00000000
--- a/pkg/git/fetch.rc
+++ /dev/null
@@ -1,17 +0,0 @@
-flag e +
-
-@ . ./scripts/fetch-git.rc $*
-
-cd $1
-shift
-
-if([ -e src/man ])
-	rm -rf src/man
-
-if(! sha256sum -c sha256 >[2]/dev/null) {
-	curl -L -O -K url
-	sha256sum -c sha256
-}
-
-archive=`{awk '{print $2}' sha256}
-xzcat $archive | pax -r -s ',^\.,src/man,'
diff --git a/pkg/git/fetch.sh b/pkg/git/fetch.sh
new file mode 100644
index 00000000..289daf1f
--- /dev/null
+++ b/pkg/git/fetch.sh
@@ -0,0 +1,18 @@
+set -e
+
+(. ./scripts/fetch-git.sh "$@")
+
+cd "$1"
+shift
+
+if [ -e src/man ] ; then
+	rm -rf src/man
+fi
+
+if ! sha256sum -c sha256 2>/dev/null ; then
+	curl -L -O -K url
+	sha256sum -c sha256
+fi
+
+read -r checksum archive <sha256
+xzcat "$archive" | pax -r -s ',^\.,src/man,'
diff --git a/pkg/openbsd/fetch.sh b/pkg/openbsd/fetch.sh
new file mode 100644
index 00000000..8350bd3a
--- /dev/null
+++ b/pkg/openbsd/fetch.sh
@@ -0,0 +1,30 @@
+set -e
+
+dir=$1
+shift
+
+cd "$dir"
+
+if [ -e src ] ; then
+        rm -rf src
+fi
+
+if ! sha256sum -c sha256 2>/dev/null ; then
+        curl -L -K url -O
+        sha256sum -c sha256
+fi
+
+zcat src.tar.gz | pax -r -s '/^/src\//' \
+        'bin/pax/*' \
+        'include/*' \
+        'lib/libc/*' \
+        'lib/libcrypto/arc4random/*' \
+        'usr.bin/diff/*' \
+        'usr.bin/doas/*' \
+        'usr.bin/fmt/*' \
+        'usr.bin/nc/*' \
+        'usr.bin/patch/*' \
+        'usr.bin/yacc/*'
+zcat sys.tar.gz | pax -r -s '/^/src\//' 'sys/sys/*'
+
+git apply -v --whitespace=nowarn --directory "$dir/src" patch/*
diff --git a/pkg/openbsd/gen.lua b/pkg/openbsd/gen.lua
index 4104ec0e..fb08788f 100644
--- a/pkg/openbsd/gen.lua
+++ b/pkg/openbsd/gen.lua
@@ -87,13 +87,4 @@ exe('yacc', [[usr.bin/yacc/(
 file('bin/yacc', '755', '$outdir/yacc')
 man{'usr.bin/yacc/yacc.1'}
 
-fetch('curl', paths[[
-	-s '/^/src\//' '(
-		bin/pax
-		include
-		lib/(libc/(crypt gen net stdlib string) libcrypto/arc4random)
-		usr.bin/(diff doas fmt nc patch yacc)
-	)/*'
-	';'
-	-s '/^/src\//' 'sys/sys/*'
-]])
+fetch 'local'
diff --git a/pkg/tz/gen.lua b/pkg/tz/gen.lua
index 6fa350eb..d97a55fa 100644
--- a/pkg/tz/gen.lua
+++ b/pkg/tz/gen.lua
@@ -19,7 +19,7 @@ local tzdata = {
 rule('tzdata', 'lua $dir/tzdata.lua $repo $outdir/zoneinfo $in >$out.tmp && mv $out.tmp $out')
 build('tzdata', '$outdir/tzdata.index', {
 	expand{'$srcdir/', tzdata},
-	'|', '$dir/tzdata.lua', 'scripts/hash.rc',
+	'|', '$dir/tzdata.lua', 'scripts/hash.sh',
 	'||', '$builddir/root.stamp',
 })
 table.insert(pkg.inputs.index, '$outdir/tzdata.index')
diff --git a/pkg/tz/tzdata.lua b/pkg/tz/tzdata.lua
index 9777e10c..903af2cf 100644
--- a/pkg/tz/tzdata.lua
+++ b/pkg/tz/tzdata.lua
@@ -4,7 +4,7 @@ local function execute(cmd)
 	end
 end
 
-local hash = 'rc ./scripts/hash.rc %s %s share/zoneinfo/%s %s'
+local hash = 'sh ./scripts/hash.sh %s %s share/zoneinfo/%s %s'
 local repo = arg[1]
 local outdir = arg[2]
 for i = 3, #arg do