summaryrefslogtreecommitdiff
path: root/user/mksh
diff options
context:
space:
mode:
Diffstat (limited to 'user/mksh')
-rw-r--r--user/mksh/APKBUILD23
-rw-r--r--user/mksh/fix-deprecated-fgrep.patch22
2 files changed, 37 insertions, 8 deletions
diff --git a/user/mksh/APKBUILD b/user/mksh/APKBUILD
index acbe85329..596380611 100644
--- a/user/mksh/APKBUILD
+++ b/user/mksh/APKBUILD
@@ -1,19 +1,21 @@
# Contributor: Marek Benc <dusxmt@gmx.com>
# Maintainer: Marek Benc <dusxmt@gmx.com>
pkgname=mksh
-pkgver=57
+pkgver=59c
pkgrel=0
pkgdesc="MirBSD Korn Shell, a free Korn Shell interpreter"
url="http://mirbsd.de/mksh"
arch="all"
-license="MirOS OR ISC"
+license="MirOS AND Unicode-DFS-2016"
depends=""
-makedepends=""
checkdepends="ed perl"
+makedepends=""
subpackages="$pkgname-doc"
install="mksh.post-install mksh.post-upgrade mksh.pre-deinstall"
-source="http://www.mirbsd.org/MirOS/dist/mir/${pkgname}/${pkgname}-R${pkgver}.tgz"
-builddir=$srcdir/$pkgname
+source="https://www.mirbsd.org/MirOS/dist/mir/${pkgname}/${pkgname}-R${pkgver}.tgz
+ fix-deprecated-fgrep.patch
+ "
+builddir="$srcdir"/$pkgname
build() {
# Build the main shell:
@@ -24,13 +26,16 @@ build() {
CFLAGS="$CFLAGS -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED" \
/bin/sh ./Build.sh -r -L
mv test.sh test_lksh.sh
+
+ # Build the HTML FAQ:
+ /bin/sh ./FAQ2HTML.sh
}
check() {
- echo "Running the test suite for mksh:"
+ msg "Running the test suite for mksh"
./test_mksh.sh
- echo "Running the test suite for lksh:"
+ msg "Running the test suite for lksh:"
./test_lksh.sh
}
@@ -45,6 +50,8 @@ package() {
mkdir -p "$pkgdir"/usr/share/doc/mksh/examples/
install -m 644 dot.mkshrc "$pkgdir"/usr/share/doc/mksh/examples/
+ install -m 644 FAQ.htm "$pkgdir"/usr/share/doc/mksh/
}
-sha512sums="7d7fa557c17da4f1f62f82877a136439efb6d4f9fde52b2df39214db09868982e756df6e4fe83498f9013cbcf3252dc383b00ddfafaa4c9f143ffded7cd255b3 mksh-R57.tgz"
+sha512sums="f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340 mksh-R59c.tgz
+46210a286add06ac46adbc57c2150eb98ae67af7f79c509e0d11443cb33ce6617c1fa587179bb1955a832549515e8b1def1e32784caf91b54f7d5cfee1b43970 fix-deprecated-fgrep.patch"
diff --git a/user/mksh/fix-deprecated-fgrep.patch b/user/mksh/fix-deprecated-fgrep.patch
new file mode 100644
index 000000000..03f701f78
--- /dev/null
+++ b/user/mksh/fix-deprecated-fgrep.patch
@@ -0,0 +1,22 @@
+--- a/check.t
++++ b/check.t
+@@ -6728,7 +6728,7 @@
+ echo FNORD-7
+ typeset -
+ echo FNORD-8
+- } | fgrep FNORD
++ } | grep -F FNORD
+ fnord=(42 23)
+ typeset -p fnord
+ echo FNORD-9
+@@ -8641,8 +8641,8 @@
+ (echo x; exit 12) | (cat; exit 23) | (cat; exit 42)
+ echo 5 $? , $PIPESTATUS , ${PIPESTATUS[0]} , ${PIPESTATUS[1]} , ${PIPESTATUS[2]} , ${PIPESTATUS[3]} .
+ echo 6 ${PIPESTATUS[0]} .
+- set | fgrep PIPESTATUS
+- echo 8 $(set | fgrep PIPESTATUS) .
++ set | grep -F PIPESTATUS
++ echo 8 $(set | grep -F PIPESTATUS) .
+ expected-stdout:
+ 1 0 .
+ 2 0 .