29 files changed, 273 insertions, 109 deletions
diff --git a/build.sh b/build.sh
index 2cd55cc..449e389 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2016, 2017, 2018, 2019, 2020, 2021 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
+# Copyright (c) 2016, 2017, 2018, 2019, 2020, 2021 Lucía Andrea Illanes Albornoz <lucia@luciaillanes.de>
 #
 
 buildp_ast() {
diff --git a/etc/LICENCE b/etc/LICENCE
index c65b14c..d17f7ae 100644
--- a/etc/LICENCE
+++ b/etc/LICENCE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016, 2017, 2018, 2019, 2020, 2021 Lucio Andrés Illanes Albornoz <l.illanes@gmx.de>
+Copyright (c) 2016, 2017, 2018, 2019, 2020, 2021 Lucía Andrea Illanes Albornoz <lucia@luciaillanes.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/etc/README.md b/etc/README.md
index 9e3d4a7..0d65430 100644
--- a/etc/README.md
+++ b/etc/README.md
@@ -108,18 +108,18 @@ amount of logical processors on the build host divided by two (2).
 ### 2.1.1. Build-time dependencies
 
 * **Alpine Linux**:
-  binutils bzip2 cmake coreutils curl findutils g++ gawk gcc git grep gzip libc-dev linux-headers lzip make musl-dev net-tools patch perl perl-xml-parser procps sed tar util-linux wget xz zip
+  binutils bzip2 cmake coreutils curl findutils g++ gawk gcc git grep gzip libc-dev linux-headers lzip m4 make musl-dev net-tools patch perl perl-xml-parser procps sed tar util-linux wget xz zip
 * **Debian/-derived Linux**:
-  binutils bzip2 cmake coreutils curl findutils g++ gawk gcc git grep gzip hostname libc6-dev libxml-parser-perl lzip make patch perl procps sed tar util-linux wget xz-utils zip
+  binutils bzip2 cmake coreutils curl findutils g++ gawk gcc git grep gzip hostname libc6-dev libxml-parser-perl lzip m4 make patch perl procps sed tar util-linux wget xz-utils zip
 * **Gentoo Linux**:
-  binutils bzip2 cmake coreutils curl findutils gawk =gcc-7.5.0-r1 dev-vcs/git grep gzip lzip make patch perl dev-perl/XML-Parser procps sed tar util-linux wget xz-utils zip
+  binutils bzip2 cmake coreutils curl findutils gawk =gcc-7.5.0-r1 dev-vcs/git grep gzip lzip m4 make patch perl dev-perl/XML-Parser procps sed tar util-linux wget xz-utils zip
 * **OpenSUSE Linux**:
-  binutils bzip2 cmake coreutils curl findutils gawk gcc gcc-c++ git grep gzip hostname linux-glibc-devel lzip make patch perl perl-XML-Parser procps sed tar util-linux wget xz zip
+  binutils bzip2 cmake coreutils curl findutils gawk gcc gcc-c++ git grep gzip hostname linux-glibc-devel lzip m4 make patch perl perl-XML-Parser procps sed tar util-linux wget xz zip
   
 #### The distro matrix:
 
 |   Alpine Linux:   |   Debian/-derived Linux:   |   Gentoo Linux:      |   OpenSUSE Linux:   |
-|                   |                            |                      |                     |
+| ----------------- | -------------------------- | -------------------- | ------------------- |
 | binutils          | binutils                   | binutils             | binutils            |
 | bzip2             | bzip2                      | bzip2                | bzip2               |
 | cmake             | cmake                      | cmake                | cmake               |
@@ -134,15 +134,15 @@ amount of logical processors on the build host divided by two (2).
 | gzip              | gzip                       | gzip                 | gzip                |
 | -                 | hostname                   | -                    | hostname            |
 | libc-dev          | libc6-dev                  | -                    | linux-glibc-devel   |
-| -                 | libxml-parser-perl         | -                    | -                   |
 | linux-headers     | -                          | -                    | -                   |
 | lzip              | lzip                       | lzip                 | lzip                |
+| m4                | m4                         | m4                   | m4                  |
 | make              | make                       | make                 | make                |
 | musl-dev          | -                          | -                    | -                   |
 | net-tools         | -                          | -                    | -                   |
 | patch             | patch                      | patch                | patch               |
 | perl              | perl                       | perl                 | perl                |
-| perl-xml-parser   | -                          | dev-perl/XML-Parser  | perl-XML-Parser     |
+| perl-xml-parser   | libxml-parser-perl         | dev-perl/XML-Parser  | perl-XML-Parser     |
 | procps            | procps                     | procps               | procps              |
 | sed               | sed                        | sed                  | sed                 |
 | tar               | tar                        | tar                  | tar                 |
diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group
index 29037a2..7687eb7 100644
--- a/groups/010.host_deps.group
+++ b/groups/010.host_deps.group
@@ -99,8 +99,8 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_EXPAT_HOST_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_HOST_VERSION}.tar.xz};
 : ${PKG_EXPAT_HOST_CONFIGURE_ARGS_EXTRA:="--without-docbook"};
 : ${PKG_EXPAT_HOST_CONFIGURE_TYPE:="autotools"};
-: ${PKG_FILE_HOST_SHA256SUM:=f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1};
-: ${PKG_FILE_HOST_VERSION:=5.39};
+: ${PKG_FILE_HOST_SHA256SUM:=c076fb4d029c74073f15c43361ef572cfb868407d347190ba834af3b1639b0e4};
+: ${PKG_FILE_HOST_VERSION:=5.42};
 : ${PKG_FILE_HOST_URL:=http://ftp.astron.com/pub/file/file-${PKG_FILE_HOST_VERSION}.tar.gz};
 : ${PKG_FLEX_HOST_DEPENDS:="bison_host"};
 : ${PKG_FLEX_HOST_SHA256SUM:=e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995};
diff --git a/groups/020.host_deps_rpm.group b/groups/020.host_deps_rpm.group
index 67f018c..0a1e758 100644
--- a/groups/020.host_deps_rpm.group
+++ b/groups/020.host_deps_rpm.group
@@ -22,7 +22,7 @@ HOST_DEPS_RPM_PREFIX="${PREFIX}";
 : ${PKG_POPT_HOST_SHA256SUM:=5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1};
 : ${PKG_POPT_HOST_VERSION:=1.18};
 : ${PKG_POPT_HOST_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/popt/popt-${PKG_POPT_HOST_VERSION}.tar.gz};
-: ${PKG_RPM_HOST_DEPENDS:="libarchive_host popt_host"};
+: ${PKG_RPM_HOST_DEPENDS:="libarchive_host popt_host file_host"};
 : ${PKG_RPM_HOST_SHA256SUM:=ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411};
 : ${PKG_RPM_HOST_VERSION:=4.16.0};
 : ${PKG_RPM_HOST_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_HOST_VERSION%.*}.x/rpm-${PKG_RPM_HOST_VERSION}.tar.bz2};
diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group
index c28dae3..1bd8f1d 100644
--- a/groups/211.native_packages_cmdline.group
+++ b/groups/211.native_packages_cmdline.group
@@ -61,8 +61,8 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
 : ${PKG_DASH_URL:=https://git.kernel.org/pub/scm/utils/dash/dash.git/snapshot/dash-${PKG_DASH_VERSION}.tar.gz};
 : ${PKG_DASH_CONFIGURE_ARGS_EXTRA:="--disable-glob --enable-fnmatch"};
 : ${PKG_DASH_INSTALL_FILES_V2:="@dash=bin/sh"};
-: ${PKG_DATAMASH_SHA256SUM:=574a592bb90c5ae702ffaed1b59498d5e3e7466a8abf8530c5f2f3f11fa4adb3};
-: ${PKG_DATAMASH_VERSION:=1.7};
+: ${PKG_DATAMASH_SHA256SUM:=7ad97e8c7ef616dd03aa5bd67ae24c488272db3e7d1f5774161c18b75f29f6fd};
+: ${PKG_DATAMASH_VERSION:=1.8};
 : ${PKG_DATAMASH_URL:=https://ftp.gnu.org/gnu/datamash/datamash-${PKG_DATAMASH_VERSION}.tar.gz};
 : ${PKG_DOS2UNIX_SHA256SUM:=b68db41956daf933828423aa30510e00c12d29ef5916e715e8d4e694fe66ca72};
 : ${PKG_DOS2UNIX_VERSION:=7.4.3};
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index e2097bb..70a016d 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -149,8 +149,8 @@ zstd")";
 : ${PKG_FFMPEG_URL:=https://ffmpeg.org/releases/ffmpeg-${PKG_FFMPEG_VERSION}.tar.xz};
 : ${PKG_FFMPEG_CONFIGURE_ARGS:="--cc=${DEFAULT_TARGET}-gcc --cxx=${DEFAULT_TARGET}-g++ --disable-stripping --enable-cross-compile --enable-libass --enable-libshine --enable-libtheora --enable-libvorbis --enable-libxml2 --enable-gpl --enable-version3 --enable-gnutls --enable-libmp3lame --enable-libssh --pkg-config=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config --prefix=/ --target-os=midipix --x86asmexe=${DEFAULT_TARGET}-nasm"};
 : ${PKG_FFMPEG_CFLAGS_BUILD_EXTRA:="-I${PREFIX_NATIVE}/include/SDL2 -I${PREFIX_NATIVE}/include/libxml2 -std=gnu99"};
-: ${PKG_FILE_SHA256SUM:=f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1};
-: ${PKG_FILE_VERSION:=5.39};
+: ${PKG_FILE_SHA256SUM:=c076fb4d029c74073f15c43361ef572cfb868407d347190ba834af3b1639b0e4};
+: ${PKG_FILE_VERSION:=5.42};
 : ${PKG_FILE_URL:=http://ftp.astron.com/pub/file/file-${PKG_FILE_VERSION}.tar.gz};
 : ${PKG_GDBM_DEPENDS:="ncurses"};
 : ${PKG_GDBM_SHA256SUM:=74b1081d21fff13ae4bd7c16e5d6e504a4c26f7cde1dca0d963a484174bbcacd};
@@ -376,15 +376,15 @@ gl_cv_func_getopt_gnu=yes"};
 : ${PKG_PCRE2_VERSION:=10.40};
 : ${PKG_PCRE2_URL:=https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PKG_PCRE2_VERSION}/pcre2-${PKG_PCRE2_VERSION}.tar.bz2};
 : ${PKG_PCRE2_CONFIGURE_ARGS_EXTRA:="--enable-pcre2grep-libz --enable-pcre2grep-libbz2 --enable-pcre2-16 --enable-pcre2-32 --enable-jit"};
-: ${PKG_PHP_DEPENDS:="bzip2 curl libz libzip libxml2 sqlite3 pcre2 readline libressl onig libiconv"};
-: ${PKG_PHP_SHA256SUM:=da38d65bb0d5dd56f711cd478204f2b62a74a2c2b0d2d523a78d6eb865b2364c};
-: ${PKG_PHP_VERSION:=8.1.6};
+: ${PKG_PHP_DEPENDS:="bzip2 curl libz libzip libxml2 libxslt sqlite3 pcre2 readline libressl onig libiconv"};
+: ${PKG_PHP_SHA256SUM:=f042322f1b5a9f7c2decb84b7086ef676896c2f7178739b9672afafa964ed0e5};
+: ${PKG_PHP_VERSION:=8.1.7};
 : ${PKG_PHP_URL:=https://www.php.net/distributions/php-${PKG_PHP_VERSION}.tar.xz};
 : ${PKG_PHP_CONFIG_CACHE_EXTRA:="
 ac_cv_c_bigendian_php=no
 ac_cv_write_stdout=yes
 have_shm_mmap_posix=yes"};
-: ${PKG_PHP_CONFIGURE_ARGS_EXTRA:="--with-layout=GNU --with-external-pcre --with-gmp --disable-gd --disable-phar --enable-pdo=static --enable-dom=static --enable-embed=shared --enable-all=shared --without-enchant --without-imap --disable-intl --without-ldap --without-oci8 --without-adabas --disable-pcntl --without-pdo-dblib --without-pdo-firebird --without-pdo-mysql --without-pdo-oci --without-pdo-odbc --without-pdo-pgsql --without-pdo-sqlite --without-pgsql --without-pspell --without-libedit --without-sapdb --without-snmp --without-sodium --without-password-argon2 --without-tidy --without-ffi --without-mysqli --without-unixODBC --without-dbmaker --without-solid --with-pdo-odbc=no --without-ibm-db2 --without-empress --without-empress-bcs --without-iodbc --without-esoob --without-custom-odbc --without-pear --with-bzip2=${PREFIX_NATIVE} --disable-opcache-jit"};
+: ${PKG_PHP_CONFIGURE_ARGS_EXTRA:="--with-layout=GNU --with-external-pcre --with-gmp --disable-gd --disable-phar --enable-pdo=static --enable-dom=static --enable-embed=shared --enable-all=shared --without-enchant --without-imap --disable-intl --without-ldap --without-oci8 --without-adabas --disable-pcntl --without-pdo-dblib --without-pdo-firebird --without-pdo-mysql --without-pdo-oci --without-pdo-odbc --without-pdo-pgsql --without-pdo-sqlite --without-pgsql --without-pspell --without-libedit --without-sapdb --without-snmp --without-sodium --without-password-argon2 --without-tidy --without-ffi --without-mysqli --without-unixODBC --without-dbmaker --without-solid --with-pdo-odbc=no --without-ibm-db2 --without-empress --without-empress-bcs --without-iodbc --without-esoob --without-custom-odbc --without-pear --with-bz2=${PREFIX_NATIVE} --disable-opcache-jit --disable-dl-test"};
 : ${PKG_PHP_ENV_VARS_EXTRA:="HOST_CC=gcc:READLINE_DIR=${PREFIX_NATIVE}/include/readline"};
 : ${PKG_PHP_LIBTOOL:=rdlibtool};
 : ${PKG_PHP_MAKEFLAGS_BUILD:=-j1};
@@ -498,8 +498,8 @@ ac_cv_lib_rt_timer_create=no
 ac_cv_search_timer_create=no
 ac_cv_prog_NCURSESW6_CONFIG=%PREFIX%/bin/ncursesw6-config"};
 : ${PKG_VIM_DEPENDS:="ncursesw"};
-: ${PKG_VIM_SHA256SUM:=3052bc702cfb49571dbcf9824827ae6032c37c7bf1a2aa0d3f7cc18c8f085dfb};
-: ${PKG_VIM_VERSION:=8.2.5062};
+: ${PKG_VIM_SHA256SUM:=34a81534fcdd8f507795df39123d90892af11d2d0543b9fc9dd206823e910ec4};
+: ${PKG_VIM_VERSION:=9.0.0037};
 : ${PKG_VIM_URL:=https://github.com/vim/vim/archive/v${PKG_VIM_VERSION}.tar.gz};
 : ${PKG_VIM_CONFIGURE_ARGS_EXTRA:="--enable-gui=no --with-tlib=tinfow --without-x --disable-canberra --disable-libsodium --disable-motif-check --disable-sysmouse --disable-gpm"};
 : ${PKG_VIM_IN_TREE:=1};
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 93cd82f..0eed0dd 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -36,7 +36,7 @@ proxytunnel rsync socat thttpd w3m weechat wget wget2 whois")";
 : ${PKG_CURL_SHA256SUM:=2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4};
 : ${PKG_CURL_VERSION:=7.83.1};
 : ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.xz};
-: ${PKG_CURL_CONFIGURE_ARGS_EXTRA:="--disable-symbol-hiding --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --with-ca-path=/etc/ssl/certs --with-gnutls --without-ssl"};
+: ${PKG_CURL_CONFIGURE_ARGS_EXTRA:="--disable-symbol-hiding --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --with-ca-path=/etc/ssl/certs --with-gnutls --without-ssl --disable-socketpair"};
 : ${PKG_DROPBEAR_DEPENDS:="libz"};
 : ${PKG_DROPBEAR_SHA256SUM:=48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b};
 : ${PKG_DROPBEAR_VERSION:=2020.81};
@@ -67,8 +67,8 @@ ac_cv_snprintf_returns_bogus=0"};
 : ${PKG_GIT_MAKEFLAGS_INSTALL:="CFLAGS=-std=gnu99 CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config CURLDIR=${PREFIX_NATIVE} HAVE_DEV_TTY=yes NO_GETTEXT=yes NO_REGEX=yes NO_PERL=yes NO_PYTHON=yes NO_TCLTK=yes"};
 : ${PKG_GIT_SUBDIR:=git-${PKG_GIT_VERSION}};
 : ${PKG_GNUPG_DEPENDS:="libassuan libgcrypt libgpg_error libksba npth sqlite3"};
-: ${PKG_GNUPG_SHA256SUM:=21f7fe2fc5c2f214184ab050977ec7a8e304e58bfae2ab098fec69f8fabda9c1};
-: ${PKG_GNUPG_VERSION:=2.3.6};
+: ${PKG_GNUPG_SHA256SUM:=ee163a5fb9ec99ffc1b18e65faef8d086800c5713d15a672ab57d3799da83669};
+: ${PKG_GNUPG_VERSION:=2.3.7};
 : ${PKG_GNUPG_URL:=https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${PKG_GNUPG_VERSION}.tar.bz2};
 : ${PKG_GNUPG_CONFIGURE_ARGS_EXTRA:="--with-libgpg-error-prefix=${PREFIX_NATIVE} --with-libgcrypt-prefix=${PREFIX_NATIVE} --with-libassuan-prefix=${PREFIX_NATIVE} --with-ksba-prefix=${PREFIX_NATIVE} --with-npth-prefix=${PREFIX_NATIVE}"};
 : ${PKG_GPGME_DEPENDS:="libassuan libgpg_error"};
@@ -122,10 +122,10 @@ gl_cv_ld_output_def=no"};
 : ${PKG_LDNS_CONFIGURE_ARGS_EXTRA:="--with-ssl=${PREFIX_NATIVE} --disable-dane-ta-usage --with-drill --with-examples"};
 : ${PKG_LDNS_MAKEFLAGS_BUILD:="-j1"};
 : ${PKG_LIGHTTPD_DEPENDS:="bzip2 pcre libressl libsasl2 libz gnutls"};
-: ${PKG_LIGHTTPD_SHA256SUM:=e1489d9fa7496fbf2e071c338b593b2300d38c23f1e5967e52c9ef482e1b0e26};
-: ${PKG_LIGHTTPD_VERSION:=1.4.64};
+: ${PKG_LIGHTTPD_SHA256SUM:=bf0fa68a629fbc404023a912b377e70049331d6797bcbb4b3e8df4c3b42328be};
+: ${PKG_LIGHTTPD_VERSION:=1.4.65};
 : ${PKG_LIGHTTPD_URL:=https://download.lighttpd.net/lighttpd/releases-${PKG_LIGHTTPD_VERSION%.*}.x/lighttpd-${PKG_LIGHTTPD_VERSION}.tar.xz};
-: ${PKG_LIGHTTPD_CONFIGURE_ARGS_EXTRA:="--with-pcre2=${PREFIX_NATIVE} --with-bzip2 --with-openssl --with-gnutls --with-libxml --with-sasl"};
+: ${PKG_LIGHTTPD_CONFIGURE_ARGS_EXTRA:="--with-pcre2 --with-bzip2 --with-openssl --with-gnutls --with-libxml --with-sasl"};
 : ${PKG_LIGHTTPD_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/lua5.4"};
 : ${PKG_LINKS_DEPENDS:="bzip2 libz libpng libX11 libressl tiff libjpeg_turbo xz zstd"};
 : ${PKG_LINKS_SHA256SUM:=d8ddcbfcede7cdde80abeb0a236358f57fa6beb2bcf92e109624e9b896f9ebb4};
@@ -150,8 +150,8 @@ gl_cv_ld_output_def=no"};
 : ${PKG_MICROSOCKS_URLS_GIT:=microsocks=https://github.com/rofl0r/microsocks.git@master};
 : ${PKG_MICROSOCKS_BUILD_DIR:=microsocks};
 : ${PKG_MUTT_DEPENDS:="gnutls libz ncursesw"};
-: ${PKG_MUTT_SHA256SUM:=ff8b781159794adcca126b551d5e419174b7b38a582a159bfe4e13451a757e47};
-: ${PKG_MUTT_VERSION:=2.2.5};
+: ${PKG_MUTT_SHA256SUM:=ffa2d93517cfc606fe01daffc5f12e42062a1c134d3b9af78484ebc5430888d3};
+: ${PKG_MUTT_VERSION:=2.2.6};
 : ${PKG_MUTT_URL:=http://ftp.mutt.org/pub/mutt/mutt-${PKG_MUTT_VERSION}.tar.gz};
 : ${PKG_MUTT_CONFIG_CACHE_EXTRA:="
 mutt_cv_c99_snprintf=yes
@@ -239,10 +239,10 @@ mutt_cv_regex_broken=no"};
 : ${PKG_W3M_MAKEFLAGS_BUILD:=-j1};
 : ${PKG_W3M_SUBDIR:=w3m-0.5.3-git20190105};
 : ${PKG_WEECHAT_DEPENDS:="curl gnutls libgcrypt libz ncursesw"};
-: ${PKG_WEECHAT_SHA256SUM:=aa903d12a36403e22823ff2dfc3e8fcacb1efe6519e0d56e25d3a72757d38611};
-: ${PKG_WEECHAT_VERSION:=3.5};
+: ${PKG_WEECHAT_SHA256SUM:=f095f452aca0a92d86f46db74d712a890bca130fe1f20f7fad6e515b5c3be644};
+: ${PKG_WEECHAT_VERSION:=3.6};
 : ${PKG_WEECHAT_URL:=https://weechat.org/files/src/weechat-${PKG_WEECHAT_VERSION}.tar.gz};
-: ${PKG_WEECHAT_CONFIGURE_ARGS_EXTRA:="--disable-aspell --disable-guile --disable-javascript --disable-perl --disable-python --disable-ruby --disable-tcl"};
+: ${PKG_WEECHAT_CONFIGURE_ARGS_EXTRA:="--disable-guile --disable-javascript --disable-perl --disable-python --disable-ruby --disable-tcl"};
 : ${PKG_WEECHAT_ENV_VARS_EXTRA:="CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config:LIBGCRYPT_CONFIG=${PREFIX_NATIVE}/bin/libgcrypt-config:PKGCONFIG=${DEFAULT_TARGET}-pkg-config"};
 : ${PKG_WEECHAT_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/lua5.4 -I${PREFIX_NATIVE}/include/php -I${PREFIX_NATIVE}/include/php/main -I${PREFIX_NATIVE}/include/php/Zend -I${PREFIX_NATIVE}/include/php/TSRM"};
 : ${PKG_WEECHAT_LDFLAGS_CONFIGURE_EXTRA:="-Wl,--as-needed -ltinfow -Wl,--no-as-needed"};
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index 55f9573..ce31081 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -3,18 +3,27 @@
 #
 GROUP_TARGET="native_packages";
 NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
-bearssl fribidi glib jansson lame libarchive libass libassuan libatomic_ops libdmtx libedit libeditline libelf libestr
+aspell bearssl enchant fribidi glib hunspell ivykis jansson lame libarchive libass libassuan libatomic_ops libdmtx libedit libeditline libelf libestr
 libevent libexif libfastjson libfetch libffi libfirm libflac libglob libgcrypt libgpg_error libiconv libidn2 libite
 libjpeg_turbo libksba libmad libmspack libmp3splt libogg libpcap libpipeline libpng libpsl
 readline libredwg libressl libsasl2 libshine libsndfile libsolv libssh
 libstrophe libtasn1 libtelnet libtheora libtirpc libudns libunistring
 libuv libvorbis libxml2 libxslt libz libzip lzo nettle onig sdl1 sdl1_net sdl1_mixer
 sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf sdl2_net wolfssl")";
+: ${PKG_ASPELL_SHA256SUM:=f9b77e515334a751b2e60daab5db23499e26c9209f5e7b7443b05235ad0226f2};
+: ${PKG_ASPELL_VERSION:=0.60.8};
+: ${PKG_ASPELL_URL:=https://ftp.gnu.org/gnu/aspell/aspell-${PKG_ASPELL_VERSION}.tar.gz};
+: ${PKG_ASPELL_LDFLAGS_CONFIGURE_EXTRA:="-ltinfow"};
 : ${PKG_BEARSSL_SHA256SUM:=6705bba1714961b41a728dfc5debbe348d2966c117649392f8c8139efc83ff14};
 : ${PKG_BEARSSL_VERSION:=0.6};
 : ${PKG_BEARSSL_URL:=https://bearssl.org/bearssl-${PKG_BEARSSL_VERSION}.tar.gz};
 : ${PKG_BEARSSL_IN_TREE:=1};
 : ${PKG_BEARSSL_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"};
+: ${PKG_ENCHANT_DEPENDS:="glib hunspell aspell"};
+: ${PKG_ENCHANT_SHA256SUM:=3da12103f11cf49c3cf2fd2ce3017575c5321a489e5b9bfa81dd91ec413f3891};
+: ${PKG_ENCHANT_VERSION:=2.3.3};
+: ${PKG_ENCHANT_URL:=https://github.com/AbiWord/enchant/releases/download/v${PKG_ENCHANT_VERSION}/enchant-${PKG_ENCHANT_VERSION}.tar.gz};
+: ${PKG_ENCHANT_CXXFLAGS_CONFIGURE_EXTRA:="-std=c++0x"};
 : ${PKG_FRIBIDI_SHA256SUM:=0cd233f97fc8c67bb3ac27ce8440def5d3ffacf516765b91c2cc654498293495};
 : ${PKG_FRIBIDI_VERSION:=1.0.12};
 : ${PKG_FRIBIDI_URL:=https://github.com/fribidi/fribidi/releases/download/v${PKG_FRIBIDI_VERSION}/fribidi-${PKG_FRIBIDI_VERSION}.tar.xz};
@@ -23,6 +32,15 @@ sdl1_image sdl1_ttf sdl2 sdl2_image sdl2_ttf sdl2_net wolfssl")";
 : ${PKG_GLIB_VERSION:=2.56.2};
 : ${PKG_GLIB_URL:="https://download.gnome.org/sources/glib/${PKG_GLIB_VERSION%.[0-9]}/glib-${PKG_GLIB_VERSION}.tar.xz https://ftp.pieskovisko.sk/slackware/slackware-current/source/l/glib2/glib-${PKG_GLIB_VERSION}.tar.xz"};
 : ${PKG_GLIB_CONFIGURE_ARGS_EXTRA:="--disable-dtrace --disable-libelf --disable-libmount --with-python=${PREFIX}/bin/python3 --with-libiconv=gnu"};
+: ${PKG_HUNSPELL_DEPENDS:="readline"};
+: ${PKG_HUNSPELL_SHA256SUM:=57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951};
+: ${PKG_HUNSPELL_VERSION:=1.7.0};
+: ${PKG_HUNSPELL_URL:=https://github.com/hunspell/hunspell/files/2573619/hunspell-${PKG_HUNSPELL_VERSION}.tar.gz};
+: ${PKG_HUNSPELL_CONFIGURE_ARGS_EXTRA:="--with-ui --with-readline"};
+: ${PKG_IVYKIS_SHA256SUM:=6ef8ed255814e5068473356877da55d67493eeafd978884cdecc5a3e58067129};
+: ${PKG_IVYKIS_VERSION:=0.42.4};
+: ${PKG_IVYKIS_URL:=https://mirrors.dotsrc.org/debian/pool/main/i/ivykis/ivykis_${PKG_IVYKIS_VERSION}.orig.tar.gz};
+: ${PKG_IVYKIS_SUBDIR=ivykis-${PKG_IVYKIS_VERSION}};
 : ${PKG_JANSSON_SHA256SUM:=f4f377da17b10201a60c1108613e78ee15df6b12016b116b6de42209f47a474f};
 : ${PKG_JANSSON_VERSION:=2.13.1};
 : ${PKG_JANSSON_URL:=https://digip.org/jansson/releases/jansson-${PKG_JANSSON_VERSION}.tar.gz};
@@ -131,8 +149,8 @@ gcry_cv_visibility_attribute=yes"};
 : ${PKG_LIBICONV_CONFIGURE_ARGS_EXTRA:="--enable-extra-encodings"};
 : ${PKG_LIBICONV_INSTALL_FILES_V2:="@../../native/include/iconv.h=%[_prefix]/../x86_64-nt64-midipix/include/iconv.h"};
 : ${PKG_LIBIDN2_DEPENDS:="libunistring"};
-: ${PKG_LIBIDN2_SHA256SUM:=76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91};
-: ${PKG_LIBIDN2_VERSION:=2.3.2};
+: ${PKG_LIBIDN2_SHA256SUM:=f3ac987522c00d33d44b323cae424e2cffcb4c63c6aa6cd1376edacbf1c36eb0};
+: ${PKG_LIBIDN2_VERSION:=2.3.3};
 : ${PKG_LIBIDN2_URL:=https://ftp.gnu.org/gnu/libidn/libidn2-${PKG_LIBIDN2_VERSION}.tar.gz};
 : ${PKG_LIBITE_URLS_GIT:=libite=https://github.com/troglobit/libite.git@master};
 : ${PKG_LIBITE_SUBDIR:=libite};
@@ -408,8 +426,8 @@ bash_cv_func_sigsetjmp=yes"};
 : ${PKG_SDL2_NET_VERSION:=2.0.1};
 : ${PKG_SDL2_NET_URL:=https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${PKG_SDL2_NET_VERSION}.tar.gz};
 : ${PKG_SDL2_NET_CONFIGURE_ARGS_EXTRA:="--disable-gui"};
-: ${PKG_WOLFSSL_SHA256SUM:=1a3bb310dc01d3e73d9ad91b6ea8249d081016f8eef4ae8f21d3421f91ef1de9};
-: ${PKG_WOLFSSL_VERSION:=5.3.0};
+: ${PKG_WOLFSSL_SHA256SUM:=dc36cc19dad197253e5c2ecaa490c7eef579ad448706e55d73d79396e814098b};
+: ${PKG_WOLFSSL_VERSION:=5.4.0};
 : ${PKG_WOLFSSL_URL:=https://github.com/wolfSSL/wolfssl/archive/v${PKG_WOLFSSL_VERSION}-stable.tar.gz};
 : ${PKG_WOLFSSL_CONFIGURE_ARGS_EXTRA:="--enable-distro --with-libz=${PREFIX_NATIVE}"};
 : ${PKG_WOLFSSL_SUBDIR:=wolfssl-${PKG_WOLFSSL_VERSION}-stable};
diff --git a/midipix.env b/midipix.env
index e7b0ef3..0fa81be 100644
--- a/midipix.env
+++ b/midipix.env
@@ -84,10 +84,10 @@ DEFAULT_PREREQS="											\
 	PREFIX_NATIVE PREFIX_RPM USER"};
 : ${DEFAULT_MIRRORS:="											\
 https://midipix.org/mirror/										\
-https://midipix.lucioillanes.de/archives/								\
+https://midipix.luciaillanes.de/archives/								\
 "};
 : ${DEFAULT_MIRRORS_GIT:="										\
-https://midipix.lucioillanes.de/repos_git/								\
+https://midipix.luciaillanes.de/repos_git/								\
 "};
 
 #
diff --git a/patches/curl-7.83.1.local.patch b/patches/curl-7.83.1.local.patch
index 1b1ea43..365d6ab 100644
--- a/patches/curl-7.83.1.local.patch
+++ b/patches/curl-7.83.1.local.patch
@@ -2190,16 +2190,3 @@
  
  # if unit tests are enabled, build a static library to link them with
  @BUILD_UNITTESTS_TRUE@noinst_LTLIBRARIES = libcurltool.la
---- curl-7.83.1/lib/multihandle.h.orig	2022-05-09 09:52:19.000000000 +0200
-+++ curl-7.83.1/lib/multihandle.h	2022-05-12 17:53:13.903809251 +0200
-@@ -70,10 +70,6 @@
- 
- #define CURLPIPE_ANY (CURLPIPE_MULTIPLEX)
- 
--#if !defined(CURL_DISABLE_SOCKETPAIR)
--#define ENABLE_WAKEUP
--#endif
--
- /* value for MAXIMUM CONCURRENT STREAMS upper limit */
- #define INITIAL_MAX_CONCURRENT_STREAMS ((1U << 31) - 1)
- 
diff --git a/patches/enchant-2.3.3_pre.local.patch b/patches/enchant-2.3.3_pre.local.patch
new file mode 100644
index 0000000..73ac0af
--- /dev/null
+++ b/patches/enchant-2.3.3_pre.local.patch
@@ -0,0 +1,27 @@
+diff -ru enchant-2.3.3.orig/configure enchant-2.3.3/configure
+--- enchant-2.3.3.orig/configure	2022-04-16 15:58:24.000000000 +0000
++++ enchant-2.3.3/configure	2022-08-02 12:42:43.209993400 +0000
+@@ -8100,23 +8100,6 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-  if test x$ax_cxx_compile_cxx11_required = xtrue; then
+-    if test x$ac_success = xno; then
+-      as_fn_error $? "*** A compiler with support for C++11 language features is required." "$LINENO" 5
+-    fi
+-  fi
+-  if test x$ac_success = xno; then
+-    HAVE_CXX11=0
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5
+-$as_echo "$as_me: No compiler with C++11 support was found" >&6;}
+-  else
+-    HAVE_CXX11=1
+-
+-$as_echo "#define HAVE_CXX11 1" >>confdefs.h
+-
+-  fi
+-
+-
+ 
+ ac_ext=mm
+ ac_cpp='$OBJCXXCPP $CPPFLAGS'
diff --git a/patches/file-5.42_pre.local.patch b/patches/file-5.42_pre.local.patch
new file mode 100644
index 0000000..c3cbd39
--- /dev/null
+++ b/patches/file-5.42_pre.local.patch
@@ -0,0 +1,12 @@
+diff -ru file-5.42.orig/src/Makefile.in file-5.42/src/Makefile.in
+--- file-5.42.orig/src/Makefile.in	2022-06-29 22:49:15.379469079 +0200
++++ file-5.42/src/Makefile.in	2022-06-29 22:56:35.117265729 +0200
+@@ -199,7 +199,7 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++	$(AM_LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo "  CCLD    " $@;
diff --git a/patches/file_host-5.42_pre.local.patch b/patches/file_host-5.42_pre.local.patch
new file mode 100644
index 0000000..c3cbd39
--- /dev/null
+++ b/patches/file_host-5.42_pre.local.patch
@@ -0,0 +1,12 @@
+diff -ru file-5.42.orig/src/Makefile.in file-5.42/src/Makefile.in
+--- file-5.42.orig/src/Makefile.in	2022-06-29 22:49:15.379469079 +0200
++++ file-5.42/src/Makefile.in	2022-06-29 22:56:35.117265729 +0200
+@@ -199,7 +199,7 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++	$(AM_LDFLAGS) -o $@
+ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo "  CCLD    " $@;
diff --git a/patches/lighttpd-1.4.64.local.patch b/patches/lighttpd-1.4.65.local.patch
index 50a2ce9..50a2ce9 100644
--- a/patches/lighttpd-1.4.64.local.patch
+++ b/patches/lighttpd-1.4.65.local.patch
diff --git a/patches/lighttpd-1.4.65_pre.local.patch b/patches/lighttpd-1.4.65_pre.local.patch
new file mode 100644
index 0000000..596427e
--- /dev/null
+++ b/patches/lighttpd-1.4.65_pre.local.patch
@@ -0,0 +1,12 @@
+diff -ru lighttpd-1.4.65.orig/configure lighttpd-1.4.65/configure
+--- lighttpd-1.4.65.orig/configure	2022-06-29 20:12:39.278502239 +0200
++++ lighttpd-1.4.65/configure	2022-06-29 20:18:18.776131546 +0200
+@@ -18859,7 +18859,7 @@
+   ac_status=$?
+   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_PCRE2_LIBS=`$PKG_CONFIG --libs "libpcre2-8" 2>/dev/null`
++  pkg_cv_PCRE2_LIBS=`$PKG_CONFIG --libs-only-l "libpcre2-8" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
diff --git a/patches/php-8.1.6_pre.local.patch b/patches/php-8.1.7_pre.local.patch
index dda9bf5..dda9bf5 100644
--- a/patches/php-8.1.6_pre.local.patch
+++ b/patches/php-8.1.7_pre.local.patch
diff --git a/patches/vim-8.2.5062_pre.local.patch b/patches/vim-8.2.5062_pre.local.patch
deleted file mode 100644
index 5913b9f..0000000
--- a/patches/vim-8.2.5062_pre.local.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ru vim-8.2.4230.orig/src/auto/configure vim-8.2.4230/src/auto/configure
---- vim-8.2.4230.orig/src/auto/configure	2022-01-27 16:04:22.000000000 +0100
-+++ vim-8.2.4230/src/auto/configure	2022-01-27 17:15:07.217234738 +0100
-@@ -3772,7 +3772,7 @@
- fi
- 
- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
-+ac_cpp='$CPP $CFLAGS $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-@@ -8343,6 +8343,7 @@
- 
- # Standard set of common directories for X headers.
- # Check X11 before X11Rn because it is often a symlink to the current release.
-+if test -z "$ac_x_header_dirs"; then
- ac_x_header_dirs='
- /usr/X11/include
- /usr/X11R7/include
-@@ -8381,6 +8382,7 @@
- 
- /usr/openwin/include
- /usr/openwin/share/include'
-+fi
- 
- if test "$ac_x_includes" = no; then
-   # Guess where to find include files, by looking for Xlib.h.
-diff -ru vim-8.2.4230.orig/src/Makefile vim-8.2.4230/src/Makefile
---- vim-8.2.4230.orig/src/Makefile	2022-01-27 16:04:22.000000000 +0100
-+++ vim-8.2.4230/src/Makefile	2022-01-27 17:13:59.313233849 +0100
-@@ -3093,7 +3093,7 @@
- 	    $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@
- 
- auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
--	CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
-+	CC="$(CC) $(OSDEF_CFLAGS) -I$(PKG_PREFIX)/include" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
- 
- auto/os_haiku.rdef: os_haiku.rdef.in
- 	@echo creating $@
diff --git a/patches/vim-8.2.5062.local.patch b/patches/vim-9.0.0037.local.patch
index f91e264..f91e264 100644
--- a/patches/vim-8.2.5062.local.patch
+++ b/patches/vim-9.0.0037.local.patch
diff --git a/patches/vim-9.0.0037_pre.local.patch b/patches/vim-9.0.0037_pre.local.patch
new file mode 100644
index 0000000..11ef874
--- /dev/null
+++ b/patches/vim-9.0.0037_pre.local.patch
@@ -0,0 +1,135 @@
+diff -ru vim-8.2.4230.orig/src/auto/configure vim-8.2.4230/src/auto/configure
+--- vim-8.2.4230.orig/src/auto/configure	2022-01-27 16:04:22.000000000 +0100
++++ vim-8.2.4230/src/auto/configure	2022-01-27 17:15:07.217234738 +0100
+@@ -3772,7 +3772,7 @@
+ fi
+ 
+ ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
++ac_cpp='$CPP $CFLAGS $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -8343,6 +8343,7 @@
+ 
+ # Standard set of common directories for X headers.
+ # Check X11 before X11Rn because it is often a symlink to the current release.
++if test -z "$ac_x_header_dirs"; then
+ ac_x_header_dirs='
+ /usr/X11/include
+ /usr/X11R7/include
+@@ -8381,6 +8382,7 @@
+ 
+ /usr/openwin/include
+ /usr/openwin/share/include'
++fi
+ 
+ if test "$ac_x_includes" = no; then
+   # Guess where to find include files, by looking for Xlib.h.
+@@ -13037,93 +13039,7 @@
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for timer_create" >&5
+-$as_echo_n "checking for timer_create... " >&6; }
+-save_LIBS="$LIBS"
+-LIBS="$LIBS -lrt"
+-if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include<signal.h>
+-#include<time.h>
+-static void set_flag(union sigval sv) {}
+-
+-int
+-main ()
+-{
+-
+-  struct timespec ts;
+-  struct sigevent action = {0};
+-  timer_t timer_id;
+-
+-  action.sigev_notify = SIGEV_THREAD;
+-  action.sigev_notify_function = set_flag;
+-  if (timer_create(CLOCK_MONOTONIC, &action, &timer_id) < 0)
+-    exit(1);  // cannot create a monotonic timer
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; with -lrt" >&5
+-$as_echo "yes; with -lrt" >&6; }; $as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h
+-
+-else
+-  LIBS="$save_LIBS"
+-  if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-#include<signal.h>
+-#include<time.h>
+-static void set_flag(union sigval sv) {}
+-
+-int
+-main ()
+-{
+-
+-    struct timespec ts;
+-    struct sigevent action = {0};
+-    timer_t timer_id;
+-
+-    action.sigev_notify = SIGEV_THREAD;
+-    action.sigev_notify_function = set_flag;
+-    if (timer_create(CLOCK_MONOTONIC, &action, &timer_id) < 0)
+-      exit(1);  // cannot create a monotonic timer
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }; $as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h
+-
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
++$as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat() ignores a trailing slash" >&5
+ $as_echo_n "checking whether stat() ignores a trailing slash... " >&6; }
+diff -ru vim-8.2.4230.orig/src/Makefile vim-8.2.4230/src/Makefile
+--- vim-8.2.4230.orig/src/Makefile	2022-01-27 16:04:22.000000000 +0100
++++ vim-8.2.4230/src/Makefile	2022-01-27 17:13:59.313233849 +0100
+@@ -3093,7 +3093,7 @@
+ 	    $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@
+ 
+ auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
+-	CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
++	CC="$(CC) $(OSDEF_CFLAGS) -I$(PKG_PREFIX)/include" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
+ 
+ auto/os_haiku.rdef: os_haiku.rdef.in
+ 	@echo creating $@
diff --git a/patches/vim_minipix-8.2.5062.local.patch b/patches/vim_minipix-8.2.5062.local.patch
deleted file mode 120000
index 3d9596c..0000000
--- a/patches/vim_minipix-8.2.5062.local.patch
+++ /dev/null
@@ -1 +0,0 @@
-vim-8.2.5062.local.patch
-\ No newline at end of file
diff --git a/patches/vim_minipix-8.2.5062_pre.local.patch b/patches/vim_minipix-8.2.5062_pre.local.patch
deleted file mode 120000
index 7676a04..0000000
--- a/patches/vim_minipix-8.2.5062_pre.local.patch
+++ /dev/null
@@ -1 +0,0 @@
-vim-8.2.5062_pre.local.patch
-\ No newline at end of file
diff --git a/patches/vim_minipix-9.0.0037.local.patch b/patches/vim_minipix-9.0.0037.local.patch
new file mode 120000
index 0000000..afa62c5
--- /dev/null
+++ b/patches/vim_minipix-9.0.0037.local.patch
@@ -0,0 +1 @@
+vim-9.0.0037.local.patch
+\ No newline at end of file
diff --git a/patches/vim_minipix-9.0.0037_pre.local.patch b/patches/vim_minipix-9.0.0037_pre.local.patch
new file mode 120000
index 0000000..387166e
--- /dev/null
+++ b/patches/vim_minipix-9.0.0037_pre.local.patch
@@ -0,0 +1 @@
+vim-9.0.0037_pre.local.patch
+\ No newline at end of file
diff --git a/patches/weechat-3.5.local.patch b/patches/weechat-3.6.local.patch
index 4d41b8a..4d41b8a 100644
--- a/patches/weechat-3.5.local.patch
+++ b/patches/weechat-3.6.local.patch
diff --git a/patches/weechat-3.5_pre.local.patch b/patches/weechat-3.6_pre.local.patch
index 1144a86..1144a86 100644
--- a/patches/weechat-3.5_pre.local.patch
+++ b/patches/weechat-3.6_pre.local.patch
diff --git a/pkgtool.sh b/pkgtool.sh
index 276ab7b..af911ec 100755
--- a/pkgtool.sh
+++ b/pkgtool.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2020, 2021 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
+# Copyright (c) 2020, 2021 Lucía Andrea Illanes Albornoz <lucia@luciaillanes.de>
 #
 
 pkgtoolp_info() {
diff --git a/subr/build_init.subr b/subr/build_init.subr
index e6459a8..335a80f 100644
--- a/subr/build_init.subr
+++ b/subr/build_init.subr
@@ -179,18 +179,18 @@ buildp_init_getopts() {
 				done; _shiftfl=1; ;;
 		# {{{ --roar
 		--roar)		printf "%s\n" '
-[49;37m                [41;97m     [49;37m            [0m
-[49;37m             [41;97m           [49;37m         [0m
-[103;31m%.[49;37m          [41;33m [103;33m/\[41;31m  [41;97m     [103;33m/\[41;97m [49;97m   ROAR![0m
-[103;31m`%%.[49;37m        [41;33m [41;31m  [103;31m  [103;33m"""[103;31m [103;30m [41;30m   [49;97m  /[49;37m     [0m
-[49;37m [103;31m`%%[49;37m        [41;97m [103;97m   [103;32mo[103;97m [103;30m_[103;97m [103;32mo[103;97m   [41;31m [49;97m /[49;37m      [0m
-[49;37m [103;30m//[49;37m        [103;30m;[41;33m  [103;31m [103;33m(__[103;30mY[103;33m__)[103;30m [41;31m [41;97m [49;37m        [0m
-[103;30m(([49;37m        [103;30m/[103;33m [103;97m  [41;97m  [103;33m`\_/[41;30m [41;97m  [49;37m          [0m
-[49;37m [103;30m\\[49;37m     [103;30m.'\''  [103;97m  [103;31m  [41;31m     [49;37m            [0m
-[49;37m  [103;30m\\[49;37m   [103;30m/[103;97m         [41;97m   [49;37m             [0m
-[49;37m   [103;30m\\/   [103;97m [103;30m\[103;97m    [103;30m|[103;33m [103;30m|[49;37m               [0m
-[49;37m    [103;30m\[103;33m      [103;30m)___|[103;33m [103;30m|[49;37m               [0m
-[49;37m   [103;30m(_____/__)))))))[49;37m              [0m'; exit 0; ;;
+[40m[37m              [40m[34m▃▃▃▃[0m
+[40m[37m           [40m[34m▟[44m[94m        [40m[34m▙[0m
+[40m[35m▟▙▃▟▙      [44m[34m [44m[33m/\[34m[34m    [34m[33m/\[34m[34m [40m[37m    [40m[97mroar![0m
+[40m[35m▜[40m[95m▒▓▒[40m[35m▛      [104m[94m  [103m[94m▛ [103m[33m""" [103m[94m▜[104m[34m [40m[37m   [40m[97m/[0m
+[40m[37m [40m[35m▜[45m[35m [40m[35m▛       [104m[94m [103m[30m  ^ _ ^ [104m[94m [40m[37m  [40m[97m/[0m
+[40m[37m  [40m[35m▀        [46m[36m [103m[33m (__[103m[30my[103m[33m_)[103m[30m [46m[36m [0m
+[40m[37m [40m[93m▟▙    ▁▂▃▟[103m[36m▐[40m[36m▙[40m[93m▜[103m[33m`\_/[40m[93m▛[40m[36m▟▌[0m
+[40m[37m [40m[93m▟▙   ▟[103m[30m    [103m[36m▓▓▓[103m[30m| |[40m[93m▍[40m[36m▓▓▓[0m
+[40m[37m [40m[93m▜[103m[30m\[40m[93m▙ ▟[103m[30m    [103m[36m▓▓▓▓▓[103m[30m |[40m[36m▓▓▓▓▓[0m
+[40m[37m  [40m[93m▜[103m[30m\\    \ [103m[36m▒▒▒[103m[30m|[103m[33m [103m[30m|[40m[37m [40m[36m▒▒▒[0m
+[40m[37m   [40m[93m▜[103m[30m\     ) [103m[36m▒[103m[30m_|[103m[33m [103m[30m|[40m[93m▙ [40m[36m▒[0m
+[40m[37m   [103m[30m([4m     /  ))))))[0m'; exit 0; ;;
 		# }}}
 		*)		_shiftfl=0; ;;
 		esac;
diff --git a/subr/ex_pkg.subr b/subr/ex_pkg.subr
index e8e3ecb..ac03670 100644
--- a/subr/ex_pkg.subr
+++ b/subr/ex_pkg.subr
@@ -19,7 +19,8 @@ ex_pkg_check_depends() {
 	&& _pkg_depends="$(rtl_uniq $(rtl_lunfold_depends 'PKG_${_name}_DEPENDS' $(rtl_get_var_unsafe -u "PKG_"${_pkg_name}"_DEPENDS")))"; then
 		for _pkg_name_depend in $(rtl_uniq ${_pkg_depends}); do
 			if ! rtl_lmatch "${_pkg_disabled}" "${_pkg_name_depend}"\
-			&& ! rtl_lmatch "${_pkg_finished}" "${_pkg_name_depend}"; then
+			&& ! rtl_lmatch "${_pkg_finished}" "${_pkg_name_depend}"\
+			&& ! ex_pkg_state_test "${_pkg_name_depend}" finish; then
 				if ! rtl_lmatch "${_pkg_names}" "${_pkg_name_depend}"; then
 					rtl_log_msg "fatalexit" "${MSG_build_unknown_dep}" "${_pkg_name_depend}" "${_pkg_name}";
 				else