8 files changed, 107 insertions, 8 deletions
diff --git a/repo/util/bash.xibuild b/repo/util/bash.xibuild
index fbaf390..63626b5 100644
--- a/repo/util/bash.xibuild
+++ b/repo/util/bash.xibuild
@@ -18,6 +18,7 @@ package () {
 
 postinstall () {
     command -v bash || exit 1
+    command -v grep || exit 1
 
     if [ -f /etc/shells ] || grep -vq "bash" /etc/shells; then
         echo "/bin/bash" >> /etc/shells
diff --git a/repo/util/diffutils.xibuild b/repo/util/diffutils.xibuild
index 0087a0d..2a3d0cd 100644
--- a/repo/util/diffutils.xibuild
+++ b/repo/util/diffutils.xibuild
@@ -1,17 +1,19 @@
 #!/bin/sh
 
-MAKEDEPS="make"
+MAKEDEPS="make sort"
 DEPS="musl sh"
 
-PKG_VER=3.8
-SOURCE=https://ftp.gnu.org/gnu/diffutils/diffutils-$PKG_VER.tar.xz
+PKG_VER=0.8.6
+SOURCE=http://landley.net/toybox/downloads/toybox-$PKG_VER.tar.gz
 DESC="Utility programs for creating patch files"
 
 build () {
-    ./configure --prefix=/usr 
-    make
+    make defconfig
+    make diff
+    make cmp
 }
 
 package () {
-    make DESTDIR=$PKG_DEST install 
+    install -Dm755 diff $PKG_DEST/usr/bin/
+    install -Dm755 cmp $PKG_DEST/usr/bin/
 }
diff --git a/repo/util/man-db.xibuild b/repo/util/man-db.xibuild
index 6f80d27..5d0e76c 100644
--- a/repo/util/man-db.xibuild
+++ b/repo/util/man-db.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="make "
-DEPS="bash gdbm zlib groff libpipeline less"
+DEPS="gdbm zlib groff libpipeline less"
 
 PKG_VER=2.9.4
 SOURCE=http://download.savannah.nongnu.org/releases/man-db/man-db-$PKG_VER.tar.xz
diff --git a/repo/util/mandoc.xibuild b/repo/util/mandoc.xibuild
new file mode 100644
index 0000000..d74e6c8
--- /dev/null
+++ b/repo/util/mandoc.xibuild
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="musl zlib sbase"
+
+PKG_VER=1.14.6
+SOURCE=https://mandoc.bsd.lv/snapshots/mandoc-$PKG_VER.tar.gz
+DESC="mandoc (formerly mdocml) UNIX manpage compiler toolset"
+
+prepare () {
+	cat > configure.local << EOF
+PREFIX=/usr
+MANDIR=/usr/share/man
+LIBDIR=/usr/lib
+CFLAGS="$CFLAGS"
+UTF8_LOCALE="en_US.UTF-8"
+MANPATH_DEFAULT="/usr/share/man:/usr/local/man"
+MANPATH_BASE="/usr/share/man"
+LN="ln -sf"
+HAVE_LESS_T=0
+EOF
+
+}
+
+build () {
+    ./configure
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST base-install lib-install
+}
diff --git a/repo/util/mksh.xibuild b/repo/util/mksh.xibuild
new file mode 100644
index 0000000..d946695
--- /dev/null
+++ b/repo/util/mksh.xibuild
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+MAKEDEPS="make "
+DEPS="sbase musl"
+
+PKG_VER=59c
+SOURCE=https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R$PKG_VER.tgz
+DESC="MirBSD Korn Shell"
+
+prepare () {
+    rmdir mksh
+	sed -i check.t -e '/^name: selftest-tty-absent$/,/^---$/d'
+}
+
+build () {
+    sh Build.sh -r
+}
+
+package () {
+    install -Dm755 mksh $PKG_DEST/bin/mksh
+	install -Dm644 dot.mkshrc $PKG_DEST/etc/skel/.mkshrc
+	install -Dm644 mksh.1 $PKG_DEST/usr/share/man/man1/mksh.1
+}
+
+postinstall () {
+    command -v mksh || exit 1
+
+    if [ -f /etc/shells ] || grep -vq "mksh" /etc/shells; then
+        echo "/bin/mksh" >> /etc/shells
+    fi
+}
diff --git a/repo/util/mpd-mpc.xibuild b/repo/util/mpd-mpc.xibuild
new file mode 100644
index 0000000..2018d33
--- /dev/null
+++ b/repo/util/mpd-mpc.xibuild
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+NAME="mpd-mpc"
+DESC="Minimalist command line interface to MPD"
+
+MAKEDEPS=""
+DEPS=""
+
+PKG_VER=0.34
+SOURCE="https://www.musicpd.org/download/mpd-mpc/${PKG_VER%.*}/mpd-mpc-$PKG_VER.tar.xz"
+
diff --git a/repo/util/pm-utils.xibuild b/repo/util/pm-utils.xibuild
index 5f3e179..87c14ef 100644
--- a/repo/util/pm-utils.xibuild
+++ b/repo/util/pm-utils.xibuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MAKEDEPS="xmlto docbook-xml docbook-xsl"
-DEPS="musl bash procps"
+DEPS="musl procps"
 
 PKG_VER=1.4.1
 SOURCE=https://pm-utils.freedesktop.org/releases/pm-utils-$PKG_VER.tar.gz
diff --git a/repo/util/sort.xibuild b/repo/util/sort.xibuild
new file mode 100644
index 0000000..5310d1b
--- /dev/null
+++ b/repo/util/sort.xibuild
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+MAKEDEPS="make sort"
+DEPS="musl sh"
+
+PKG_VER=0.8.6
+SOURCE=http://landley.net/toybox/downloads/toybox-$PKG_VER.tar.gz
+DESC="Sort from toybox"
+
+prepare () {
+    # remove the -s sort flag missing from sbase
+    sed -i "s/sort -s/sort/g" scripts/*.sh
+}
+
+build () {
+    ./configure 
+    make sort
+}
+
+package () {
+    install -Dm755 sort $PKG_DEST/usr/bin/
+}