Added cmatrix and updated a few

16 files changed, 384 insertions, 12 deletions

diff --git a/auto/update.sh b/auto/update.sh
index 5c79fc0..312d128 100644..100755
--- a/auto/update.sh
+++ b/auto/update.sh
@@ -1,6 +1,125 @@
 #!/bin/sh
 
+. /usr/lib/colors.sh
+. /usr/lib/glyphs.sh
+
+# increment a version string
+#
+#   point - decimal point to update from
+#   version - string of the version (ie 1.4.7)
+#
 increment_ver () {
     point=$1
-    read
+    version=$2
+
+    IFS='.'; set -- $version
+    i=$# out=""
+
+    [ "$point" -gt "$#" ] && {
+        IFS='.'; printf "%s\n" "$version"
+        return
+    }
+
+    while [ "$#" -gt "0" ]; do 
+        p=$1
+
+        [ "$#" -eq "$point" ] && p=$((p+1))
+        [ "$#" -lt "$point" ] && p=0
+
+        out="$out$p."
+        shift
+    done
+
+    IFS='.'; set -- $out
+    printf "%s\n" "${*%${!#}}"
+    IFS=' '
+}
+
+get_source () {
+    local name ver
+    name=$1
+    ver=$2
+
+    cp repo/$name/$name.xibuild /tmp/xibuild
+    sed "s/PKG_VER=.*/PKG_VER=$ver/" repo/$name/$name.xibuild > /tmp/xibuild
+    . /tmp/xibuild
+    echo "$SOURCE"
+}
+
+get_type () {
+    case "$(get_source $1)" in 
+        git://*|*.git)
+            echo "git"
+            ;;
+        "")
+            echo "none"
+            ;;
+        *)
+            echo "archive"
+            ;;
+    esac
+}
+
+check_exists () {
+    local code 
+    [ -n "$1" ] && {
+        code=$(curl -sSL -I -o /dev/null -w "%{http_code}" $1)
+        [ "$code" = "200" ]
+    } 
 }
+
+cur_ver () {
+    local name
+    name=$1
+    . repo/$name/$name.xibuild 
+    echo "$PKG_VER"
+}
+
+new_ver () {
+    local name exists point new_ver ver url
+    name=$1
+
+    ver=$(cur_ver $name)
+    point=1
+    while true; do
+        new_ver=$(increment_ver $point $ver)
+        url=$(get_source $name $new_ver)
+        
+        check_exists $url && {
+            point=1
+
+            [ "$new_ver" = "$ver" ] && {
+                echo "$ver"
+                return
+            }
+
+            ver=$new_ver
+        } || {
+            point=$((point+1))
+        }
+
+
+        # check new_ver is real
+        # if is real ; repeat again with same point
+        # if not, increment point and then check
+    done
+}
+
+for pkg in $(ls repo); do 
+    printf "${LIGHT_BLUE}%s " "$pkg"
+    case "$(get_type $pkg)" in
+        "git"|"none")
+            printf "${LIGHT_WHITE}skipped"
+            ;;
+        *)
+        cur="$(cur_ver $pkg)"
+        new="$(new_ver $pkg)"
+
+        [ "$cur" = "$new" ] && 
+            printf "${LIGHT_WHITE}%s ${CHECKMARK}" "$cur" || 
+            printf "${GREEN}%s > %s" "$cur" "$new"
+    esac
+    printf "\n"
+done
+
+
diff --git a/repo/cmatrix/cmatrix.xibuild b/repo/cmatrix/cmatrix.xibuild
new file mode 100644
index 0000000..3d2befb
--- /dev/null
+++ b/repo/cmatrix/cmatrix.xibuild
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+NAME="cmatrix"
+DESC="Terminal based 'The Matrix' like implementation"
+
+MAKEDEPS=" ncurses kbd autoconf automake"
+
+PKG_VER=2.0
+SOURCE="https://github.com/abishekvashok/cmatrix/archive/v$PKG_VER.tar.gz"
+
+prepare() {
+	autoreconf -i
+}
+
+build() {
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+package() {
+	make DESTDIR="$PKG_DEST" install
+}
+
diff --git a/repo/cunit/cunit.xibuild b/repo/cunit/cunit.xibuild
index 3b4b04f..164235a 100644
--- a/repo/cunit/cunit.xibuild
+++ b/repo/cunit/cunit.xibuild
@@ -5,8 +5,9 @@ DESC="Automated testing framework for C"
 
 MAKEDEPS=" automake autoconf libtool bash"
 
-PKG_VER=2.1-3
-SOURCE="https://downloads.sourceforge.net/project/cunit/CUnit/$PKG_VER/CUnit-$PKG_VER.tar.bz2"
+PKG_VER=2.1.3
+version=${PKG_VER%.*}-${PKG_VER##*.}
+SOURCE="https://downloads.sourceforge.net/project/cunit/CUnit/$version/CUnit-$version.tar.bz2"
 
 ADDITIONAL="
 path-makefile.patch
diff --git a/repo/ext-dump/ext-dump.xibuild b/repo/ext-dump/ext-dump.xibuild
new file mode 100644
index 0000000..d4f12a3
--- /dev/null
+++ b/repo/ext-dump/ext-dump.xibuild
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+NAME="ext-dump"
+DESC="ext2 dump and restore utilities"
+
+MAKEDEPS="make "
+DEPS="musl "
+
+PKG_VER=0.4b47
+SOURCE="https://sourceforge.net/projects/dump/files/dump/$PKG_VER/dump-$PKG_VER.tar.gz/download"
+
+build () {
+    ./configure \
+        --prefix=/usr \
+        --bindir=/usr/bin \
+        --sysconfdir=/etc \
+        --disable-static
+    make
+}
+
+package () {
+    make DESTDIR=$PKG_DEST install
+}
diff --git a/repo/gettext/gettext.xibuild b/repo/gettext/gettext.xibuild
index 8da13a5..cc71899 100644
--- a/repo/gettext/gettext.xibuild
+++ b/repo/gettext/gettext.xibuild
@@ -4,7 +4,7 @@ MAKEDEPS="make"
 DEPS="acl sh"
 
 PKG_VER=0.3.2
-SOURCE=https://ftp.barfooze.de/pub/sabotage/tarballs/gettext-tiny-$PKG_VER.tar.xz
+SOURCE=https://github.com/sabotage-linux/gettext-tiny/archive/refs/tags/v$PKG_VER.tar.gz
 DESC="Lightweight replacement for tools used in the GNU gettext suite"
 
 ADDITIONAL="
diff --git a/repo/imagemagick/imagemagick.xibuild b/repo/imagemagick/imagemagick.xibuild
index f809c5d..ae1b2dd 100644
--- a/repo/imagemagick/imagemagick.xibuild
+++ b/repo/imagemagick/imagemagick.xibuild
@@ -5,9 +5,9 @@ DESC="Collection of tools and libraries for many image formats"
 
 MAKEDEPS="chrpath fontconfig freetype2 ghostscript lcms2 libheif libjpeg-turbo libpng libjxl libtool libwebp libx11 libxext libxml2 perl tiff zlib librsvg"
 
-PKG_VER=7.1.0-45
+PKG_VER=7.1.0.45
 version=${PKG_VER%.*}-${PKG_VER##*.}
-SOURCE="https://imagemagick.org/archive/ImageMagick-$PKG_VER.tar.xz"
+SOURCE="https://imagemagick.org/archive/releases/ImageMagick-$version.tar.xz"
 
 build() {
 
diff --git a/repo/itstool/itstool.xibuild b/repo/itstool/itstool.xibuild
index 721c5a7..0b30401 100644
--- a/repo/itstool/itstool.xibuild
+++ b/repo/itstool/itstool.xibuild
@@ -4,7 +4,7 @@ MAKEDEPS="make "
 DEPS="docbook-xml"
 
 PKG_VER=2.0.7
-SOURCE=http://files.itstool.org/itstool/itstool-2.0.7.tar.bz2
+SOURCE=http://files.itstool.org/itstool/itstool-$PKG_VER.tar.bz2
 DESC="Extract messages from XML files and output PO template files"
 
 build () {
diff --git a/repo/kbd/error.h b/repo/kbd/error.h
new file mode 100644
index 0000000..5eb8ed5
--- /dev/null
+++ b/repo/kbd/error.h
@@ -0,0 +1,20 @@
+#ifndef ERROR_H
+#define ERROR_H
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <err.h>
+
+static inline void error(int status, int errnum, const char *fmt, ...)
+{
+	va_list ap;
+	void (*errfunc[2])(int, const char *, va_list) = { &verr, &verrx };
+	void (*warnfunc[2])(const char *, va_list) = { &vwarn, &vwarnx };
+	fflush(stdout);
+	va_start(ap, fmt);
+	if (status != 0)
+		errfunc[errnum==0](status, fmt, ap); /* does not return */
+	warnfunc[errnum==0](fmt, ap);
+	va_end(ap);
+}
+#endif
diff --git a/repo/kbd/loadkeys.confd b/repo/kbd/loadkeys.confd
new file mode 100644
index 0000000..1ba568a
--- /dev/null
+++ b/repo/kbd/loadkeys.confd
@@ -0,0 +1,23 @@
+# Use keymap to specify the default console keymap.  There is a complete tree
+# of keymaps in /usr/share/keymaps to choose from.
+keymap="us"
+
+# Should we first load the 'windowkeys' console keymap?  Most x86 users will
+# say "yes" here.  Note that non-x86 users should leave it as "no".
+# Loading this keymap will enable VT switching (like ALT+Left/Right)
+# using the special windows keys on the linux console.
+windowkeys="NO"
+
+# The maps to load for extended keyboards.  Most users will leave this as is.
+extended_keymaps=""
+#extended_keymaps="backspace keypad euro2"
+
+# Tell dumpkeys(1) to interpret character action codes to be
+# from the specified character set.
+# This only matters if you set unicode="yes" in /etc/rc.conf.
+# For a list of valid sets, run `dumpkeys --help`
+dumpkeys_charset=""
+
+# Some fonts map AltGr-E to the currency symbol instead of the Euro.
+# To fix this, set to "yes"
+fix_euro="NO"
diff --git a/repo/kbd/loadkeys.initd b/repo/kbd/loadkeys.initd
new file mode 100644
index 0000000..6686bf0
--- /dev/null
+++ b/repo/kbd/loadkeys.initd
@@ -0,0 +1,72 @@
+#!/sbin/openrc-run
+# Copyright (c) 2007-2015 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+description="Applies a keymap for the consoles."
+
+depend()
+{
+	provide keymaps
+	need localmount termencoding
+	after bootmisc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
+}
+
+start()
+{
+	ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
+	: ${unicode:=$UNICODE}
+	: ${keymap:=$KEYMAP}
+	: ${extended_keymaps:=$EXTENDED_KEYMAPS}
+	: ${windowkeys:=$SET_WINDOWSKEYS}
+	: ${fix_euro:=$FIX_EURO}
+	: ${dumpkeys_charset:=${DUMPKEYS_CHARSET}}
+
+	if [ -z "$keymap" ]; then
+		eerror "You need to setup keymap in /etc/conf.d/${0##*/} first"
+		return 1
+	fi
+
+	local ttydev=/dev/tty n=
+	[ -d /dev/vc ] && ttydev=/dev/vc/
+
+	# Force linux keycodes for PPC.
+	if [ -f /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes ]; then
+		echo 1 > /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes
+	fi
+
+	local wkeys= kmode="-a" msg="ASCII"
+	if yesno $unicode; then
+		kmode="-u"
+		msg="UTF-8"
+	fi
+	yesno $windowkeys && wkeys="windowkeys"
+
+	# Set terminal encoding to either ASCII or UNICODE.
+	# See utf-8(7) for more information.
+	ebegin "Setting keyboard mode [$msg]"
+	n=1
+	while [ $n -le $ttyn ]; do
+		kbd_mode $kmode -C $ttydev$n
+		: $(( n += 1 ))
+	done
+	eend 0
+
+	ebegin "Loading key mappings [$keymap]"
+	loadkeys -q $wkeys $keymap $extended_keymaps
+	eend $? "Error loading key mappings" || return $?
+
+	if yesno $fix_euro; then
+		ebegin "Fixing font for euro symbol"
+		# Fix some fonts displaying the Euro, #173528.
+		echo "altgr keycode 18 = U+20AC" | loadkeys -q -
+		eend $?
+	fi
+}
diff --git a/repo/libedit/libedit.xibuild b/repo/libedit/libedit.xibuild
index b594d83..fe211ef 100644
--- a/repo/libedit/libedit.xibuild
+++ b/repo/libedit/libedit.xibuild
@@ -3,8 +3,9 @@
 MAKEDEPS="make automake autoconf"
 DEPS="musl ncurses"
 
-PKG_VER=20210910-3.1
-SOURCE=https://www.thrysoee.dk/editline/libedit-20210910-3.1.tar.gz
+PKG_VER=20210910.3.1
+version=${PKG_VER%%.*}-${PKG_VER#*.}
+SOURCE=https://www.thrysoee.dk/editline/libedit-$version.tar.gz
 DESC="BSD line editing library"
 
 prepare () {
diff --git a/repo/liblangtag/liblangtag.xibuild b/repo/liblangtag/liblangtag.xibuild
index 9e7b01f..5151d91 100644
--- a/repo/liblangtag/liblangtag.xibuild
+++ b/repo/liblangtag/liblangtag.xibuild
@@ -5,8 +5,7 @@ DESC="Interface library to access/deal with tags for identifying languages"
 
 MAKEDEPS="glib gobject-introspection libtool libxml2 gtk-doc"
 
-PKG_VER=0.6.3
-SOURCE="https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-$PKG_VER.tar.bz2"
+SOURCE="git://bitbucket.org/tagoh/liblangtag.git"
 
 build() {
 	./configure --prefix=/usr
diff --git a/repo/minicom/minicom.xibuild b/repo/minicom/minicom.xibuild
new file mode 100644
index 0000000..2c59cae
--- /dev/null
+++ b/repo/minicom/minicom.xibuild
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+NAME="minicom"
+DESC="menu driven communications program for terminals"
+
+MAKEDEPS="ncurses gettext linux-headers"
+
+PKG_VER=2.8
+SOURCE="https://salsa.debian.org/minicom-team/minicom/-/archive/$PKG_VER/minicom-$PKG_VER.tar.gz"
+
+build() {
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make
+}
+
+package() {
+	make DESTDIR="$PKG_DEST" install
+}
+
diff --git a/repo/monero-gui/monero-gui.xibuild b/repo/monero-gui/monero-gui.xibuild
index e35fe63..02eb907 100644
--- a/repo/monero-gui/monero-gui.xibuild
+++ b/repo/monero-gui/monero-gui.xibuild
@@ -7,7 +7,7 @@ MAKEDEPS="cmake monero git qt5-qtquickcontrols qt5-qtdeclarative qt5-qtbase qt5-
 DEPS="musl qt5-qtquickcontrols qt5-qtxmlpatterns "
 
 PKG_VER=musl
-SOURCE="https://github.com/monero-project/monero-gui"
+SOURCE="https://github.com/monero-project/monero-gui.git"
 ADDITIONAL="
 easylogging.patch
 monero-gui.desktop
diff --git a/repo/zig/llvm-include.patch b/repo/zig/llvm-include.patch
new file mode 100644
index 0000000..7cefa89
--- /dev/null
+++ b/repo/zig/llvm-include.patch
@@ -0,0 +1,12 @@
+Our llvm include path is not in the include list tried by default.
+
+--- zig-0.9.1.orig/cmake/Findllvm.cmake
++++ zig-0.9.1/cmake/Findllvm.cmake
+@@ -12,6 +12,7 @@
+     /usr/lib/llvm/13/include
+     /usr/lib/llvm-13/include
+     /usr/lib/llvm-13.0/include
++    /usr/lib/llvm13/include
+     /usr/local/llvm13/include
+     /usr/local/llvm130/include
+     /usr/local/opt/llvm@13/include
diff --git a/repo/zig/zig.xibuild b/repo/zig/zig.xibuild
new file mode 100644
index 0000000..59146b1
--- /dev/null
+++ b/repo/zig/zig.xibuild
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+NAME="zig"
+DESC="general-purpose programming language designed for robustness, optimality, and maintainability"
+
+MAKEDEPS=" cmake clang llvm lld libstdc++ zlib libxml2"
+
+PKG_VER=0.9.1
+SOURCE="https://github.com/ziglang/zig/archive/$PKG_VER.tar.gz"
+
+ADDITIONAL="
+llvm-include.patch
+"
+
+prepare () {
+    apply_patches
+}
+
+build() {
+	mkdir -p build
+	cd build
+	cmake \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		-DZIG_VERSION="$PKG_VER" \
+		..
+	make
+}
+
+#check() {
+#	./zig build test \
+#		-Dskip-release \
+#		-Dskip-release-small \
+#		-Dskip-release-fast \
+#		-Dskip-non-native \
+#		-Dskip-libc
+#}
+
+package() {
+    cd ..
+	make -C build DESTDIR="$PKG_DEST" install
+
+	# Documentation is generated as part of `./zig build test` in check().
+	# If this is no longer the case at some point it can be
+	# generated explicitly using `./zig build docs`.
+	### it is not built now ###
+	#install -Dm644 zig-cache/langref.html \
+	#	"$PKG_DEST"/usr/share/doc/zig/langref.html
+}
+