diff --git a/build/apr/build.sh b/build/apr/build.sh
index 91bcfe82a..64ede4d6c 100755
--- a/build/apr/build.sh
+++ b/build/apr/build.sh
@@ -12,7 +12,7 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
@@ -30,6 +30,8 @@ CONFIGURE_OPTS="
     apr_cv_pthreads_lib=
 "
 
+export CC_FOR_BUILD=/opt/gcc-$DEFAULT_GCC_VER/bin/gcc
+
 CONFIGURE_OPTS[i386]+="
     --with-installbuilddir=$PREFIX/share/apr/i386/build-1
 "
@@ -38,9 +40,18 @@ CONFIGURE_OPTS[amd64]+="
     --with-installbuilddir=$PREFIX/share/apr/amd64/build-1
 "
 
+CONFIGURE_OPTS[aarch64]+="
+    --with-installbuilddir=$PREFIX/share/apr/aarch64/build-1
+    ac_cv_file__dev_zero=yes
+    apr_cv_process_shared_works=yes
+    apr_cv_mutex_robust_shared=yes
+    apr_cv_tcp_nodelay_with_cork=yes
+"
+
 # Run the test-suite for the 32-bit build too
-make_install32() {
-    make_install
+post_install() {
+    [ $1 != i386 ] && return
+
     run_testsuite test "" testsuite-32.log
 }
 
diff --git a/build/jansson/build.sh b/build/jansson/build.sh
index 858f32005..95556737b 100755
--- a/build/jansson/build.sh
+++ b/build/jansson/build.sh
@@ -12,7 +12,7 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
@@ -28,7 +28,7 @@ init
 download_source $PROG $PROG $VER
 prep_build
 patch_source
-build -ctf
+build
 make_package
 clean_up
 
diff --git a/build/ldns/build.sh b/build/ldns/build.sh
index 896ddabfc..cd6fdbb40 100755
--- a/build/ldns/build.sh
+++ b/build/ldns/build.sh
@@ -12,12 +12,12 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
 PROG=ldns
-VER=1.8.3
+VER=1.8.4
 PKG=ooce/library/ldns
 SUMMARY=$PROG
 DESC="$PROG DNS programming library and drill utility"
@@ -44,17 +44,22 @@ CONFIGURE_OPTS[amd64]+="
     --with-drill
     --with-examples
 "
-
-# Building in parallel produces occasional bad objects that then fail the
-# linking stage. This needs investigation but disabled parallelism for now.
-NO_PARALLEL_MAKE=1
+CONFIGURE_OPTS[aarch64]+="
+    --bindir=$PREFIX/bin
+    --with-drill
+    --with-examples
+"
 
 # The 'distclean' target clobbers too much including 'configure'
 make_clean() {
     logcmd $MAKE clean
 }
 
-make_isa_stub() {
+post_install() {
+    typeset arch=$1
+
+    [ $arch != amd64 ] && return
+
     pushd $DESTDIR$PREFIX/bin >/dev/null
     logcmd mkdir -p amd64
     logcmd mv ldns-config amd64/ || logerr "mv ldns-config"
@@ -67,7 +72,6 @@ download_source $PROG $PROG $VER
 patch_source
 prep_build
 build
-make_isa_stub
 make_package
 clean_up
 
diff --git a/build/libvncserver/build.sh b/build/libvncserver/build.sh
index 5b132733b..4307268b1 100755
--- a/build/libvncserver/build.sh
+++ b/build/libvncserver/build.sh
@@ -44,12 +44,18 @@ CONFIGURE_OPTS="
     -DWITH_EXAMPLES=OFF
 "
 CONFIGURE_OPTS[i386]=
-CONFIGURE_OPTS[amd64]="-DCMAKE_INSTALL_LIBDIR=lib/amd64"
+CONFIGURE_OPTS[amd64]="-DCMAKE_INSTALL_LIBDIR=${LIBDIRS[amd64]}"
+CONFIGURE_OPTS[aarch64]=
 
-LDFLAGS[i386]+=" -L$PREFIX/lib -Wl,-R$PREFIX/lib"
-LDFLAGS[amd64]+=" -L$PREFIX/lib/amd64 -Wl,-R$PREFIX/lib/amd64"
 CFLAGS+=" -D_REENTRANT"
 
+pre_configure() {
+    typeset arch=$1
+
+    LDFLAGS[$arch]+=" -L${SYSROOT[$arch]}$PREFIX/${LIBDIRS[$arch]}"
+    LDFLAGS[$arch]+=" -Wl,-R$PREFIX/${LIBDIRS[$arch]}"
+}
+
 init
 download_source $PROG LibVNCServer $VER
 patch_source
diff --git a/build/libvncserver/local.mog b/build/libvncserver/local.mog
index 43b2743b4..331ecb24f 100644
--- a/build/libvncserver/local.mog
+++ b/build/libvncserver/local.mog
@@ -9,14 +9,9 @@
 # http://www.illumos.org/license/CDDL.
 # CDDL HEADER START
 #
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 license COPYING license=GPLv2
 
 <transform path=$(PREFIX)/share/doc -> drop>
 
-link path=$(PREFIX)/lib/libvncclient.so target=libvncclient.so.1
-link path=$(PREFIX)/lib/libvncserver.so target=libvncserver.so.1
-link path=$(PREFIX)/lib/amd64/libvncclient.so target=libvncclient.so.1
-link path=$(PREFIX)/lib/amd64/libvncserver.so target=libvncserver.so.1
-
diff --git a/build/libzip/build.sh b/build/libzip/build.sh
index d47d0b54e..29747f180 100755
--- a/build/libzip/build.sh
+++ b/build/libzip/build.sh
@@ -12,7 +12,7 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
@@ -26,10 +26,6 @@ DESC="A C library for reading, creating and modifying zip archives"
 # nullability attributes to headers which cause issues when
 # being used with gcc
 
-BUILD_DEPENDS_IPS="
-    ooce/developer/cmake
-"
-
 OPREFIX=$PREFIX
 PREFIX+="/$PROG"
 
@@ -45,17 +41,14 @@ CONFIGURE_OPTS="
     -DCMAKE_INSTALL_PREFIX=$PREFIX
     -DCMAKE_INSTALL_INCLUDEDIR=$OPREFIX/include
 "
+CONFIGURE_OPTS[i386]="-DCMAKE_INSTALL_LIBDIR=$OPREFIX/${LIBDIRS[i386]}"
+CONFIGURE_OPTS[amd64]="-DCMAKE_INSTALL_LIBDIR=$OPREFIX/${LIBDIRS[amd64]}"
+CONFIGURE_OPTS[aarch64]="-DCMAKE_INSTALL_LIBDIR=$OPREFIX/${LIBDIRS[aarch64]}"
 
 pre_configure() {
     typeset arch=$1
 
-    CONFIGURE_OPTS[$arch]="
-        -DCMAKE_INSTALL_LIBDIR=$OPREFIX/${LIBDIRS[$arch]}
-    "
-
     LDFLAGS[$arch]+=" -R$OPREFIX/${LIBDIRS[$arch]}"
-
-    export CMAKE_LIBRARY_PATH=$OPREFIX/${LIBDIRS[$arch]}
 }
 
 init
diff --git a/build/mbuffer/build.sh b/build/mbuffer/build.sh
index a4b09e311..0bff269f8 100755
--- a/build/mbuffer/build.sh
+++ b/build/mbuffer/build.sh
@@ -38,6 +38,14 @@ XFORM_ARGS="
     -DPKGROOT=$PROG
 "
 
+pre_configure() {
+    typeset arch=$1
+
+    ! cross_arch $arch && return
+
+    export OBJDUMP="$CROSSTOOLS/$arch/bin/${TRIPLETS[$arch]}-objdump"
+}
+
 init
 download_source $PROG $PROG $VER
 patch_source
diff --git a/build/postfix/build.sh b/build/postfix/build.sh
index 522ad9ff6..32a551f2b 100755
--- a/build/postfix/build.sh
+++ b/build/postfix/build.sh
@@ -24,7 +24,7 @@ SUMMARY="Postfix MTA"
 DESC="Wietse Venema's mail server alternative to sendmail"
 
 set_arch 64
-test_relver '>=' 151041 && set_clangver
+set_clangver
 
 SKIP_LICENCES=IPL
 
@@ -65,6 +65,42 @@ MAKE_INSTALL_TARGET=non-interactive-package
 pre_configure() {
     typeset arch=$1
 
+    if cross_arch $arch; then
+        save_variable BUILDARCH
+        set_arch $BUILD_ARCH
+        set_gccver $DEFAULT_GCC_VER
+
+        note -n "-- Building native tools"
+
+        pushd $TMPDIR/$BUILDDIR >/dev/null
+
+        # we don't really care about the configure options here as we just need
+        # a native postconf; however, postconf decides where to install
+        # everything, so it should know about the proper locations
+        logcmd $MAKE makefiles CCARGS="$CFLAGS"' \
+            -DDEF_COMMAND_DIR=\"'${PREFIX}/sbin'\" \
+            -DDEF_CONFIG_DIR=\"'${CONFPATH}'\" \
+            -DDEF_DAEMON_DIR=\"'${PREFIX}/libexec/postfix'\" \
+            -DDEF_MAILQ_PATH=\"'${PREFIX}/bin/mailq'\" \
+            -DDEF_NEWALIAS_PATH=\"'${PREFIX}/bin/newaliases'\" \
+            -DDEF_MANPAGE_DIR=\"'${PREFIX}/share/man'\" \
+            -DDEF_SENDMAIL_PATH=\"'${PREFIX}/sbin/sendmail'\" \
+            ' || logerr "failed making native makefiles"
+
+        logcmd $MAKE $MAKE_JOBS || logerr "failed to make native tools"
+        logcmd $CP $TMPDIR/$BUILDDIR/bin/postconf $TMPDIR/ \
+            || logerr "failed to copy native postconf"
+
+        popd >/dev/null
+
+        set_crossgcc $arch
+        restore_variable BUILDARCH
+
+        note -n "-- Building $PROG"
+
+        make_clean $arch
+    fi
+
     logmsg "--- configure (make makefiles)"
 
     ARCHLIB=${LIBDIRS[$arch]}
@@ -89,11 +125,11 @@ pre_configure() {
         -I'${OPREFIX}/pgsql-${PGSQLVER}/include' \
         ' \
         OPT='-O2' \
-        AUXLIBS="-L$LIBDIR -Wl,-R$LIBDIR -ldb -lsasl2 -lssl -lcrypto" \
+        AUXLIBS="-L${SYSROOT[$arch]}$LIBDIR -Wl,-R$LIBDIR -ldb -lsasl2 -lssl -lcrypto" \
         AUXLIBS_LDAP="-lldap_r -llber" \
         AUXLIBS_SQLITE="-lsqlite3" \
-        AUXLIBS_MYSQL="-L${OPREFIX}/mariadb-${MARIASQLVER}/$ARCHLIB -Wl,-R${OPREFIX}/mariadb-${MARIASQLVER}/$ARCHLIB -lmysqlclient" \
-        AUXLIBS_PGSQL="-L${OPREFIX}/pgsql-${PGSQLVER}/$ARCHLIB -Wl,-R${OPREFIX}/pgsql-${PGSQLVER}/$ARCHLIB -lpq" \
+        AUXLIBS_MYSQL="-L${SYSROOT[$arch]}${OPREFIX}/mariadb-${MARIASQLVER}/$ARCHLIB -Wl,-R${OPREFIX}/mariadb-${MARIASQLVER}/$ARCHLIB -lmysqlclient" \
+        AUXLIBS_PGSQL="-L${SYSROOT[$arch]}${OPREFIX}/pgsql-${PGSQLVER}/$ARCHLIB -Wl,-R${OPREFIX}/pgsql-${PGSQLVER}/$ARCHLIB -lpq" \
         AUXLIBS_LMDB="-llmdb" \
         AUXLIBS_PCRE="-lpcre2" \
             || logerr "Failed make makefiles command"
@@ -101,6 +137,20 @@ pre_configure() {
     false
 }
 
+pre_install() {
+    typeset arch=$1
+
+    MAKE_INSTALL_ARGS="install_root=${DESTDIR}"
+
+    ! cross_arch $arch && return
+
+    export POSTCONF=$TMPDIR/postconf
+}
+
+post_install() {
+    install_smf ooce smtp-postfix.xml
+}
+
 make_clean() {
     logmsg "--- make (dist)clean"
     logcmd $MAKE tidy || logcmd $MAKE -f Makefile.init makefiles \
@@ -111,9 +161,7 @@ init
 download_source $PROG $PROG $VER
 patch_source
 prep_build
-MAKE_INSTALL_ARGS="install_root=${DESTDIR}" build
-strip_install
-install_smf ooce smtp-postfix.xml
+build
 make_package
 clean_up
 
diff --git a/build/postfix/patches/icu4c.patch b/build/postfix/patches/icu4c.patch
new file mode 100644
index 000000000..28a9fbc84
--- /dev/null
+++ b/build/postfix/patches/icu4c.patch
@@ -0,0 +1,19 @@
+since we also cross-compile postfix, we have to relax the check from
+testing whether the binary can be run on the build host to just trust
+the compiler whether it could build the binary or not
+
+diff -wpruN --no-dereference '--exclude=*.orig' a~/makedefs a/makedefs
+--- a~/makedefs	1970-01-01 00:00:00
++++ a/makedefs	1970-01-01 00:00:00
+@@ -902,9 +902,8 @@ int main(int argc, char **argv)
+ 				  &error) != 14);
+ }
+ EOF
+-		    ${CC-gcc} -o makedefs.test makedefs.test.c $icu_cppflags \
+-			$icu_ldflags >/dev/null 2>&1
+-		    if ./makedefs.test 2>/dev/null ; then
++		    if ${CC-gcc} -o makedefs.test makedefs.test.c $icu_cppflags \
++			$icu_ldflags >/dev/null 2>&1; then
+ 			CCARGS="$CCARGS $icu_cppflags"
+ 			SYSLIBS="$SYSLIBS $icu_ldflags"
+ 		    else
diff --git a/build/postfix/patches/libicu_rpath.patch b/build/postfix/patches/libicu_rpath.patch
deleted file mode 100644
index de89cd1c6..000000000
--- a/build/postfix/patches/libicu_rpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-makedefs checks whether the test binary it builds can be run
-
-diff -wpruN --no-dereference '--exclude=*.orig' a~/makedefs a/makedefs
---- a~/makedefs	1970-01-01 00:00:00
-+++ a/makedefs	1970-01-01 00:00:00
-@@ -881,6 +881,7 @@ case "$CCARGS" in
- 		  (icu-config --cppflags)) 2>/dev/null` && {
- 		icu_ldflags=`((pkg-config --libs icu-uc icu-i18n) ||
- 		  (icu-config --ldflags)) 2>/dev/null` && {
-+		    icu_ldflags+=" -Wl,-R/opt/ooce/lib/amd64"
- 		    trap 'rm -f makedefs.test makedefs.test.[co]' 1 2 3 15
- 		    cat >makedefs.test.c <<'EOF'
- #include <unicode/uidna.h>
diff --git a/build/postfix/patches/postconf.patch b/build/postfix/patches/postconf.patch
new file mode 100644
index 000000000..55cb51929
--- /dev/null
+++ b/build/postfix/patches/postconf.patch
@@ -0,0 +1,95 @@
+postfix runs postconf as part of the install target
+to be able to cross compile we make it variable so
+we can point it to a native postconf
+
+diff -wpruN --no-dereference '--exclude=*.orig' a~/Makefile.in a/Makefile.in
+--- a~/Makefile.in	1970-01-01 00:00:00
++++ a/Makefile.in	1970-01-01 00:00:00
+@@ -21,8 +21,9 @@ META	= meta/main.cf.proto meta/master.cf
+ 	meta/makedefs.out $(PLUGINS)
+ EXPAND	= sed -e "s;\$${LIB_PREFIX};$(LIB_PREFIX);" \
+ 	    -e "s;\$${LIB_SUFFIX};$(LIB_SUFFIX);"
++POSTCONF	?= bin/postconf
+ SHLIB_DIR_OVERRIDE = \
+-	$${shlib_directory:-`$(SHLIB_ENV) bin/postconf -dhx shlib_directory`}
++	$${shlib_directory:-`$(SHLIB_ENV) $(POSTCONF) -dhx shlib_directory`}
+ 
+ default: update
+ 
+diff -wpruN --no-dereference '--exclude=*.orig' a~/postfix-install a/postfix-install
+--- a~/postfix-install	1970-01-01 00:00:00
++++ a/postfix-install	1970-01-01 00:00:00
+@@ -218,6 +218,8 @@ if [ -n "$SHLIB_ENV_VAR" ]; then
+     eval export "$SHLIB_ENV_VAR=\$junk"
+ fi
+ 
++[ "x$POSTCONF" = "x" ] && POSTCONF="bin/postconf"
++
+ USAGE="Usage: $0 [name=value] [option]
+     -keep-build-mtime       Preserve build-time file mtime timestamps.
+     -non-interactive        Do not ask for installation parameters.
+@@ -249,8 +251,8 @@ test -z "$non_interactive" -a ! -t 0 &&
+     exit 1
+ }
+ 
+-test -x bin/postconf || {
+-    echo $0: Error: no bin/postconf file. Did you forget to run \"make\"? 1>&2
++test -x "$POSTCONF" || {
++    echo $0: Error: no $POSTCONF file. Did you forget to run \"make\"? 1>&2
+     exit 1
+ }
+ 
+@@ -271,7 +273,7 @@ do
+     case "$junk" in
+     *MAIL_VERSION*) 
+ 	case "$mail_version" in
+-	"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
++	"") mail_version="`$POSTCONF -dhx mail_version`" || exit 1
+ 	esac
+ 	val=`echo "$junk" | sed 's/MAIL_VERSION$/'"$mail_version/g"` || exit 1
+ 	case "$val" in
+@@ -459,7 +461,7 @@ template files main.cf.proto and master.
+ 
+ : ${install_root=/}
+ : ${tempdir=`pwd`}
+-: ${config_directory=`bin/postconf -c conf -h -d config_directory`}
++: ${config_directory=`$POSTCONF -c conf -h -d config_directory`}
+ 
+ # Find out the location of installed configuration files.
+ 
+@@ -525,7 +527,7 @@ test -f $CONFIG_DIRECTORY/main.cf && {
+ 	case "$junk" in
+ 	"") eval unset $name;;
+ 	esac
+-	eval : \${$name=\`bin/postconf -qc $CONFIG_DIRECTORY -hx $name\`} ||
++	eval : \${$name=\`$POSTCONF -qc $CONFIG_DIRECTORY -hx $name\`} ||
+ 	    exit 1
+     done
+ }
+@@ -538,7 +540,7 @@ do
+     case "$junk" in
+     "") eval unset $name;;
+     esac
+-    eval : \${$name=\`bin/postconf -c conf -d -hx $name\`} || exit 1
++    eval : \${$name=\`$POSTCONF -c conf -d -hx $name\`} || exit 1
+ done
+ 
+ # Override settings manually.
+@@ -846,7 +848,7 @@ IFS="$BACKUP_IFS"
+ # the wrong place when Postfix is being upgraded.
+ 
+ case "$mail_version" in
+-"") mail_version="`bin/postconf -dhx mail_version`" || exit 1
++"") mail_version="`$POSTCONF -dhx mail_version`" || exit 1
+ esac
+ 
+ # Undo MAIL_VERSION expansion at the end of a parameter value. If
+@@ -866,7 +868,7 @@ do
+     esac
+ done
+ 
+-bin/postconf -qc $CONFIG_DIRECTORY -e \
++"$POSTCONF" -qc $CONFIG_DIRECTORY -e \
+     "daemon_directory = $daemon_directory" \
+     "data_directory = $data_directory" \
+     "command_directory = $command_directory" \
diff --git a/build/postfix/patches/series b/build/postfix/patches/series
index 0295a7b71..ff7da9f4e 100644
--- a/build/postfix/patches/series
+++ b/build/postfix/patches/series
@@ -1,3 +1,4 @@
 aliases_patch.patch
-libicu_rpath.patch
+icu4c.patch
 socket.patch
+postconf.patch
diff --git a/build/sasl2/build.sh b/build/sasl2/build.sh
index b7477066b..04380a95d 100755
--- a/build/sasl2/build.sh
+++ b/build/sasl2/build.sh
@@ -22,29 +22,17 @@ PKG=ooce/library/security/libsasl2
 SUMMARY="Simple Authentication and Security Layer (SASL)"
 DESC="$SUMMARY shared library and plugins"
 
-# does not yet build with gcc 14
-((GCCVER > 13)) && set_gccver 13
-
 XFORM_ARGS="
     -DPREFIX=${PREFIX#/}
     -DPROG=$PROG
 "
 
+forgo_isaexec
 set_standard XPG6
 
 SKIP_RTIME_CHECK=1
 SKIP_LICENCES='*'
 
-# Sasl runs make recursively and does not honour $MAKE - put GNU first
-# in the path.
-PATH=$GNUBIN:$PATH
-
-# configure runs mysql_config/pg_config to determine the proper paths
-# for the database libraries. To avoid having to rely on a particular
-# mediator value for the installed packages, set the explicitly versioned
-# bin directories first in the PATH.
-PATH=$PREFIX/mariadb-$MARIASQLVER/bin:$PREFIX/pgsql-$PGSQLVER/bin:$PATH
-
 ETCDIR=/etc$PREFIX/sasl2
 VARDIR=/var$PREFIX/sasl2
 
@@ -60,8 +48,6 @@ CONFIGURE_OPTS="
     --enable-sql
     --enable-ldapdb \
     --with-ldap
-    --with-mysql=$PREFIX/mariadb-$MARIASQLVER
-    --with-pgsql=$PREFIX/pgsql-$PGSQLVER
     --with-gss_impl=mit
 
     --enable-auth-sasldb
@@ -69,26 +55,72 @@ CONFIGURE_OPTS="
     --with-dbpath=$VARDIR/sasldb2
 "
 
-CONFIGURE_OPTS[i386]+="
-    --with-plugindir=$PREFIX/lib/sasl2
-"
+buildcnt=0
 
-CONFIGURE_OPTS[amd64]+="
-    --with-plugindir=$PREFIX/lib/amd64/sasl2
-    --sbindir=$PREFIX/sbin
-"
+pre_configure() {
+    typeset arch=$1
+
+    ((buildcnt++))
+
+    # Sasl runs make recursively and does not honour $MAKE - put GNU first
+    # in the path.
+    PATH=$GNUBIN:$PATH
+
+    CONFIGURE_OPTS[$arch]+="
+        --with-plugindir=$PREFIX/${LIBDIRS[$arch]}/sasl2
+        --with-mysql=${SYSROOT[$arch]}$PREFIX/mariadb-$MARIASQLVER
+        --with-pgsql=${SYSROOT[$arch]}$PREFIX/pgsql-$PGSQLVER
+    "
+
+    for l in mariadb-$MARIASQLVER pgsql-$PGSQLVER; do
+        addpath PKG_CONFIG_PATH[$arch] \
+            ${SYSROOT[$arch]}$PREFIX/$l/${LIBDIRS[$arch]}/pkgconfig
+    done
+
+    # To find lmdb
+    CPPFLAGS+=" -I${SYSROOT[$arch]}$PREFIX/include"
+    LDFLAGS[$arch]+=" -L${SYSROOT[$arch]}$PREFIX/${LIBDIRS[$arch]}"
+    LDFLAGS[$arch]+=" -R$PREFIX/${LIBDIRS[$arch]}"
 
-# To find lmdb
-CPPFLAGS+=" -I$PREFIX/include"
-LDFLAGS[i386]+=" -L$PREFIX/lib -R$PREFIX/lib"
-LDFLAGS[amd64]+=" -L$PREFIX/lib/amd64 -R$PREFIX/lib/amd64"
+    ! cross_arch $arch && return
+
+    export CC_FOR_BUILD=/opt/gcc-$DEFAULT_GCC_VER/bin/gcc
+}
+
+post_install() {
+    typeset arch=$1
+
+    pushd $DESTDIR/$PREFIX >/dev/null
+
+    # We set the library runtime path explicitly for the shared
+    # library that uses mariadb/postgres libraries instead of
+    # just adding it to all shared libraries
+    typeset rpath="$PREFIX/${LIBDIRS[$arch]}"
+    rpath+=":$PREFIX/mariadb-$MARIASQLVER/${LIBDIRS[$arch]}"
+    rpath+=":$PREFIX/pgsql-$PGSQLVER/${LIBDIRS[$arch]}"
+
+    for f in `$FD -t f 'libsql\.so' ${LIBDIRS[$arch]}/sasl2/`; do
+        logmsg "--- fixing runpath in $f"
+        logcmd $ELFEDIT -e "dyn:value -s RUNPATH $rpath" $f
+        logcmd $ELFEDIT -e "dyn:value -s RPATH $rpath" $f
+    done
+
+    popd >/dev/null
+
+    [ $arch = i386 ] && return
+
+    xform $SRCDIR/files/saslauthd.xml > $TMPDIR/saslauthd.xml
+    install_smf ooce saslauthd.xml
+}
 
 tests() {
-    [ `grep -c 'checking DB library to use... lmdb' $SRCDIR/build.log` = 4 ] \
+    c2=$buildcnt
+    ((c2 *= 2))
+    [ `grep -c 'checking DB library to use... lmdb' $SRCDIR/build.log` = $c2 ] \
         || logerr "$PROG was not built with lmdb"
-    [ `grep -c 'lmysqlclient... yes' $SRCDIR/build.log` = 2 ] \
+    [ `grep -c 'lmysqlclient... yes' $SRCDIR/build.log` = $buildcnt ] \
         || logerr "$PROG was not built with mariadb"
-    [ `grep -c 'lpq... yes' $SRCDIR/build.log` = 2 ] \
+    [ `grep -c 'lpq... yes' $SRCDIR/build.log` = $buildcnt ] \
         || logerr "$PROG was not built with postgres"
 }
 
@@ -98,11 +130,9 @@ prep_build
 patch_source
 run_autoreconf -fi
 # Remove the pre-rendered version of the man page to force a new one.
-logcmd rm $TMPDIR/$BUILDDIR/saslauthd/saslauthd.8
-build -ctf
+logcmd $RM $TMPDIR/$BUILDDIR/saslauthd/saslauthd.8
+build
 tests
-xform files/saslauthd.xml > $TMPDIR/saslauthd.xml
-install_smf ooce saslauthd.xml
 make_package
 clean_up
 
diff --git a/build/sasl2/patches/configure-ldap.patch b/build/sasl2/patches/configure-ldap.patch
index c1633110f..84c9c5cb7 100644
--- a/build/sasl2/patches/configure-ldap.patch
+++ b/build/sasl2/patches/configure-ldap.patch
@@ -2,10 +2,10 @@
 Use the thread-safe LDAP library by default. This also prevents a conflict
 with the illumos libldap in /usr/lib.
 
-diff -wpruN '--exclude=*.orig' a~/configure.ac a/configure.ac
+diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
 --- a~/configure.ac	1970-01-01 00:00:00
 +++ a/configure.ac	1970-01-01 00:00:00
-@@ -728,8 +728,8 @@ fi
+@@ -679,8 +679,8 @@ fi
  
  LDAP_LIBS=""
  if test "$with_ldap" != no; then
diff --git a/build/sasl2/patches/configure-mysql.patch b/build/sasl2/patches/configure-mysql.patch
index c991db735..2a7458446 100644
--- a/build/sasl2/patches/configure-mysql.patch
+++ b/build/sasl2/patches/configure-mysql.patch
@@ -1,7 +1,7 @@
-diff -wpruN '--exclude=*.orig' a~/configure.ac a/configure.ac
+diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
 --- a~/configure.ac	1970-01-01 00:00:00
 +++ a/configure.ac	1970-01-01 00:00:00
-@@ -803,30 +803,33 @@ case "$with_mysql" in
+@@ -754,30 +754,33 @@ case "$with_mysql" in
       LDFLAGS=$save_LDFLAGS
       ;;
      *)
@@ -25,7 +25,7 @@ diff -wpruN '--exclude=*.orig' a~/configure.ac a/configure.ac
 +     #fi
  
 +     #LIB_MYSQL="$LIB_MYSQL -lmysqlclient"
-+     LIB_MYSQL=`mysql_config --libs`
++     LIB_MYSQL=`pkg-config --libs mariadb`
       LIB_MYSQL_DIR=$LIB_MYSQL
 -     LIB_MYSQL="$LIB_MYSQL -lmysqlclient"
  
@@ -52,7 +52,7 @@ diff -wpruN '--exclude=*.orig' a~/configure.ac a/configure.ac
 +     #    CPPFLAGS="${CPPFLAGS} -I${with_mysql}"
 +     #fi
 +
-+     CPPFLAGS+=" `mysql_config --include`"
++     CPPFLAGS+=" `pkg-config --cflags mariadb`"
  
         save_LDFLAGS=$LDFLAGS
         LDFLAGS="$LDFLAGS $LIB_MYSQL_DIR"
diff --git a/build/sasl2/patches/configure-pgsql.patch b/build/sasl2/patches/configure-pgsql.patch
index 3471b9c84..df8b96200 100644
--- a/build/sasl2/patches/configure-pgsql.patch
+++ b/build/sasl2/patches/configure-pgsql.patch
@@ -1,7 +1,7 @@
-diff -wpruN '--exclude=*.orig' a~/configure.ac a/configure.ac
+diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
 --- a~/configure.ac	1970-01-01 00:00:00
 +++ a/configure.ac	1970-01-01 00:00:00
-@@ -882,30 +882,33 @@ case "$with_pgsql" in
+@@ -833,30 +833,32 @@ case "$with_pgsql" in
       LDFLAGS=$save_LDFLAGS
       ;;
      *)
@@ -24,8 +24,7 @@ diff -wpruN '--exclude=*.orig' a~/configure.ac a/configure.ac
 +     #   CMU_ADD_LIBPATH_TO(${with_pgsql}, LIB_PGSQL)
 +     #fi
  
-+     _lib=`pg_config --libdir`
-+     LIB_PGSQL="-L$_lib -R$_lib -lpq"
++     LIB_PGSQL="`pkg-config --libs libpq`"
       LIB_PGSQL_DIR=$LIB_PGSQL
 -     LIB_PGSQL="$LIB_PGSQL -lpq"
  
@@ -52,7 +51,7 @@ diff -wpruN '--exclude=*.orig' a~/configure.ac a/configure.ac
 +     #    CPPFLAGS="${CPPFLAGS} -I${with_pgsql}"
 +     #fi
 +
-+     CPPFLAGS+=" `pg_config --cppflags` -I`pg_config --includedir`"
++     CPPFLAGS+=" `pkg-config --cflags libpq`"
  
  
         save_LDFLAGS=$LDFLAGS
diff --git a/build/sasl2/patches/filterlibs.patch b/build/sasl2/patches/filterlibs.patch
index b9432e92e..f25d9a5ae 100644
--- a/build/sasl2/patches/filterlibs.patch
+++ b/build/sasl2/patches/filterlibs.patch
@@ -1,10 +1,10 @@
 
 libdoor and libdl are now just filters. No need to link with them.
 
-diff -wpruN '--exclude=*.orig' a~/configure.ac a/configure.ac
+diff -wpruN --no-dereference '--exclude=*.orig' a~/configure.ac a/configure.ac
 --- a~/configure.ac	1970-01-01 00:00:00
 +++ a/configure.ac	1970-01-01 00:00:00
-@@ -227,7 +227,7 @@ fi
+@@ -173,7 +173,7 @@ fi
  AC_MSG_CHECKING(if DB handle is kept open in SASLDB)
  AC_MSG_RESULT($keep_db_open)
  
@@ -13,7 +13,7 @@ diff -wpruN '--exclude=*.orig' a~/configure.ac a/configure.ac
  AC_SUBST(SASL_DL_LIB)
  
  dnl /dev/random ?
-@@ -332,7 +332,7 @@ IPCTYPE=$with_ipctype
+@@ -282,7 +282,7 @@ IPCTYPE=$with_ipctype
  AC_SUBST(IPCTYPE)
  LIB_DOOR=
  if test "$with_ipctype" = "doors"; then
diff --git a/build/sasl2/patches/ldapdb-quieter.patch b/build/sasl2/patches/ldapdb-quieter.patch
index 9ef3a2764..e4ea494a4 100644
--- a/build/sasl2/patches/ldapdb-quieter.patch
+++ b/build/sasl2/patches/ldapdb-quieter.patch
@@ -1,16 +1,4 @@
-diff -wpruN '--exclude=*.orig' a~/plugins/ldapdb.c a/plugins/ldapdb.c
---- a~/plugins/ldapdb.c	1970-01-01 00:00:00
-+++ a/plugins/ldapdb.c	1970-01-01 00:00:00
-@@ -472,7 +472,7 @@ ldapdb_config(const sasl_utils_t *utils)
-     if(p->inited) return SASL_OK;
- 
-     utils->getopt(utils->getopt_context, ldapdb, "ldapdb_uri", &p->uri, NULL);
--    if(!p->uri) return SASL_BADPARAM;
-+    if(!p->uri) return SASL_NOMECH;
- 
-     utils->getopt(utils->getopt_context, ldapdb, "ldapdb_id",
-     	(const char **)&p->id.bv_val, &len);
-diff -wpruN '--exclude=*.orig' a~/lib/canonusr.c a/lib/canonusr.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/canonusr.c a/lib/canonusr.c
 --- a~/lib/canonusr.c	1970-01-01 00:00:00
 +++ a/lib/canonusr.c	1970-01-01 00:00:00
 @@ -320,8 +320,10 @@ int sasl_canonuser_add_plugin(const char
@@ -24,3 +12,15 @@ diff -wpruN '--exclude=*.orig' a~/lib/canonusr.c a/lib/canonusr.c
  	return result;
      }
  
+diff -wpruN --no-dereference '--exclude=*.orig' a~/plugins/ldapdb.c a/plugins/ldapdb.c
+--- a~/plugins/ldapdb.c	1970-01-01 00:00:00
++++ a/plugins/ldapdb.c	1970-01-01 00:00:00
+@@ -472,7 +472,7 @@ ldapdb_config(const sasl_utils_t *utils)
+     if(p->inited) return SASL_OK;
+ 
+     utils->getopt(utils->getopt_context, ldapdb, "ldapdb_uri", &p->uri, NULL);
+-    if(!p->uri) return SASL_BADPARAM;
++    if(!p->uri) return SASL_NOMECH;
+ 
+     utils->getopt(utils->getopt_context, ldapdb, "ldapdb_id",
+     	(const char **)&p->id.bv_val, &len);
diff --git a/build/sasl2/patches/saslauthd-man.patch b/build/sasl2/patches/saslauthd-man.patch
index ca5db7258..f6b09a85c 100644
--- a/build/sasl2/patches/saslauthd-man.patch
+++ b/build/sasl2/patches/saslauthd-man.patch
@@ -1,4 +1,4 @@
-diff -wpruN '--exclude=*.orig' a~/saslauthd/saslauthd.mdoc a/saslauthd/saslauthd.mdoc
+diff -wpruN --no-dereference '--exclude=*.orig' a~/saslauthd/saslauthd.mdoc a/saslauthd/saslauthd.mdoc
 --- a~/saslauthd/saslauthd.mdoc	1970-01-01 00:00:00
 +++ a/saslauthd/saslauthd.mdoc	1970-01-01 00:00:00
 @@ -38,37 +38,28 @@ authentication services to clients that
diff --git a/build/sasl2/patches/saslauthd-perms.patch b/build/sasl2/patches/saslauthd-perms.patch
index 8ecbf2220..b3c298b04 100644
--- a/build/sasl2/patches/saslauthd-perms.patch
+++ b/build/sasl2/patches/saslauthd-perms.patch
@@ -1,4 +1,4 @@
-diff -wpruN '--exclude=*.orig' a~/saslauthd/saslauthd-main.c a/saslauthd/saslauthd-main.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/saslauthd/saslauthd-main.c a/saslauthd/saslauthd-main.c
 --- a~/saslauthd/saslauthd-main.c	1970-01-01 00:00:00
 +++ a/saslauthd/saslauthd-main.c	1970-01-01 00:00:00
 @@ -252,7 +252,7 @@ int main(int argc, char **argv) {
diff --git a/build/sasl2/patches/sql-quieter.patch b/build/sasl2/patches/sql-quieter.patch
index 6ce8e826b..8e0bae0ed 100644
--- a/build/sasl2/patches/sql-quieter.patch
+++ b/build/sasl2/patches/sql-quieter.patch
@@ -1,4 +1,4 @@
-diff -wpruN '--exclude=*.orig' a~/lib/auxprop.c a/lib/auxprop.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/lib/auxprop.c a/lib/auxprop.c
 --- a~/lib/auxprop.c	1970-01-01 00:00:00
 +++ a/lib/auxprop.c	1970-01-01 00:00:00
 @@ -822,8 +822,10 @@ int sasl_auxprop_add_plugin(const char *
@@ -12,7 +12,7 @@ diff -wpruN '--exclude=*.orig' a~/lib/auxprop.c a/lib/auxprop.c
  	return result;
      }
  
-diff -wpruN '--exclude=*.orig' a~/plugins/sql.c a/plugins/sql.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/plugins/sql.c a/plugins/sql.c
 --- a~/plugins/sql.c	1970-01-01 00:00:00
 +++ a/plugins/sql.c	1970-01-01 00:00:00
 @@ -122,7 +122,7 @@ static int _mysql_exec(void *conn, const
@@ -42,7 +42,7 @@ diff -wpruN '--exclude=*.orig' a~/plugins/sql.c a/plugins/sql.c
  	mysql_free_result(result);
  	return -1;
      }
-@@ -298,7 +298,7 @@ static int _pgsql_exec(void *conn, const
+@@ -299,7 +299,7 @@ static int _pgsql_exec(void *conn, const
      row_count = PQntuples(result);
      if (!row_count) {
  	/* umm nothing found */
@@ -51,7 +51,7 @@ diff -wpruN '--exclude=*.orig' a~/plugins/sql.c a/plugins/sql.c
  	PQclear(result);
  	return -1;
      }
-@@ -426,7 +426,7 @@ static int _sqlite_exec(void *db, const
+@@ -427,7 +427,7 @@ static int _sqlite_exec(void *db, const
  
      if (result == NULL) {
  	/* umm nothing found */
@@ -60,7 +60,7 @@ diff -wpruN '--exclude=*.orig' a~/plugins/sql.c a/plugins/sql.c
  	return -1;
      }
  
-@@ -569,7 +569,7 @@ static int _sqlite3_exec(void *db,
+@@ -570,7 +570,7 @@ static int _sqlite3_exec(void *db,
  
      if (result == NULL) {
  	/* umm nothing found */
@@ -69,7 +69,7 @@ diff -wpruN '--exclude=*.orig' a~/plugins/sql.c a/plugins/sql.c
  	return -1;
      }
  
-@@ -1349,7 +1349,7 @@ int sql_auxprop_plug_init(const sasl_uti
+@@ -1370,7 +1370,7 @@ int sql_auxprop_plug_init(const sasl_uti
      if (!settings->sql_engine->name) return SASL_NOMECH;
  
      if (!sql_exists(settings->sql_select)) {
diff --git a/build/tcpdump/build.sh b/build/tcpdump/build.sh
index 7ea793ce7..c13e17e41 100755
--- a/build/tcpdump/build.sh
+++ b/build/tcpdump/build.sh
@@ -23,7 +23,7 @@ SUMMARY="tcpdump - TCP packet analyzer"
 DESC="tcpdump - a powerful command-line TCP packet analyzer"
 
 set_arch 64
-test_relver '>=' 151045 && set_clangver
+set_clangver
 
 BUILD_DEPENDS_IPS="
     system/library/pcap
diff --git a/build/top/build.sh b/build/top/build.sh
index 281006162..4e070e07f 100755
--- a/build/top/build.sh
+++ b/build/top/build.sh
@@ -12,7 +12,7 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
@@ -23,7 +23,7 @@ BETA=1
 SUMMARY="top"
 DESC="Display and update information about the top cpu processes"
 
-BUILDDIR="$PROG-${VER}beta$BETA"
+set_builddir "$PROG-${VER}beta$BETA"
 
 OPREFIX=$PREFIX
 PREFIX+=/$PROG
@@ -37,10 +37,7 @@ XFORM_ARGS="
     -DVERSION=$VER
 "
 
-CONFIGURE_OPTS[amd64]="
-    --prefix=$PREFIX
-    --disable-dualarch
-"
+CONFIGURE_OPTS[amd64]+=" --disable-dualarch"
 
 init
 download_source $PROG $PROG ${VER}beta$BETA
diff --git a/build/top/patches/01.cmds.patch b/build/top/patches/01.cmds.patch
index 3b499e78d..1a2a11477 100644
--- a/build/top/patches/01.cmds.patch
+++ b/build/top/patches/01.cmds.patch
@@ -3,7 +3,7 @@
 #    6820883 *top* segfaults when re-nicing
 #
 gdiff -Nurp top-3.8beta1/commands.c.orig top-3.8beta1/commands.c
-diff -wpruN '--exclude=*.orig' a~/commands.c a/commands.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/commands.c a/commands.c
 --- a~/commands.c	1970-01-01 00:00:00
 +++ a/commands.c	1970-01-01 00:00:00
 @@ -501,13 +501,15 @@ renice_procs(char *str)
diff --git a/build/top/patches/02.hash-c.patch b/build/top/patches/02.hash-c.patch
index 62367a631..b5ccadb78 100644
--- a/build/top/patches/02.hash-c.patch
+++ b/build/top/patches/02.hash-c.patch
@@ -3,7 +3,7 @@
 #    6893978 top segfaults with high thread ids
 #
 *** top-3.8beta1/hash.c-old  Thu Jul  2 15:30:55 2009
-diff -wpruN '--exclude=*.orig' a~/hash.c a/hash.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/hash.c a/hash.c
 --- a~/hash.c	1970-01-01 00:00:00
 +++ a/hash.c	1970-01-01 00:00:00
 @@ -1354,7 +1354,7 @@ hash_add_pidthr(hash_table *ht, pidthr_t
diff --git a/build/top/patches/03.sunos5.patch b/build/top/patches/03.sunos5.patch
index 65e979e2d..cd7ba8964 100644
--- a/build/top/patches/03.sunos5.patch
+++ b/build/top/patches/03.sunos5.patch
@@ -1,5 +1,5 @@
 *** top-3.8beta1/machine/m_sunos5.c.orig	Wed Aug 31 05:23:52 2011
-diff -wpruN '--exclude=*.orig' a~/machine/m_sunos5.c a/machine/m_sunos5.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/machine/m_sunos5.c a/machine/m_sunos5.c
 --- a~/machine/m_sunos5.c	1970-01-01 00:00:00
 +++ a/machine/m_sunos5.c	1970-01-01 00:00:00
 @@ -2064,7 +2064,13 @@ getptable (struct prpsinfo *baseptr)
diff --git a/build/top/patches/04.percent_cpu.patch b/build/top/patches/04.percent_cpu.patch
index 3b6c6f572..5b0715e40 100644
--- a/build/top/patches/04.percent_cpu.patch
+++ b/build/top/patches/04.percent_cpu.patch
@@ -4,7 +4,7 @@
 # Community BugURL:	https://sourceforge.net/tracker/?func=detail&aid=3602141&group_id=72892&atid=536042
 #
 
-diff -wpruN '--exclude=*.orig' a~/machine/m_sunos5.c a/machine/m_sunos5.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/machine/m_sunos5.c a/machine/m_sunos5.c
 --- a~/machine/m_sunos5.c	1970-01-01 00:00:00
 +++ a/machine/m_sunos5.c	1970-01-01 00:00:00
 @@ -149,10 +149,10 @@
diff --git a/build/top/patches/05.zfs_arc_stats.patch b/build/top/patches/05.zfs_arc_stats.patch
index f0bd2d101..afc234e8f 100644
--- a/build/top/patches/05.zfs_arc_stats.patch
+++ b/build/top/patches/05.zfs_arc_stats.patch
@@ -1,5 +1,5 @@
 $OpenIndiana: Feature https://www.illumos.org/issues/7305 - Franklin Ronald <franklin@wiselabs.com.br>$
-diff -wpruN '--exclude=*.orig' a~/display.c a/display.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/display.c a/display.c
 --- a~/display.c	1970-01-01 00:00:00
 +++ a/display.c	1970-01-01 00:00:00
 @@ -101,6 +101,8 @@ static int x_kernel = X_KERNEL;
@@ -134,7 +134,7 @@ diff -wpruN '--exclude=*.orig' a~/display.c a/display.c
      }
  }
  
-diff -wpruN '--exclude=*.orig' a~/display.h a/display.h
+diff -wpruN --no-dereference '--exclude=*.orig' a~/display.h a/display.h
 --- a~/display.h	1970-01-01 00:00:00
 +++ a/display.h	1970-01-01 00:00:00
 @@ -58,6 +58,8 @@ void i_kernel(int *stats);
@@ -146,7 +146,7 @@ diff -wpruN '--exclude=*.orig' a~/display.h a/display.h
  void i_swap(long *stats);
  void u_swap(long *stats);
  void i_message(struct timeval *now);
-diff -wpruN '--exclude=*.orig' a~/layout.h a/layout.h
+diff -wpruN --no-dereference '--exclude=*.orig' a~/layout.h a/layout.h
 --- a~/layout.h	1970-01-01 00:00:00
 +++ a/layout.h	1970-01-01 00:00:00
 @@ -58,6 +58,8 @@
@@ -158,7 +158,7 @@ diff -wpruN '--exclude=*.orig' a~/layout.h a/layout.h
  #define  X_SWAP		6
  #define  Y_SWAP		4
  #define  Y_MESSAGE	4
-diff -wpruN '--exclude=*.orig' a~/machine/m_sunos5.c a/machine/m_sunos5.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/machine/m_sunos5.c a/machine/m_sunos5.c
 --- a~/machine/m_sunos5.c	1970-01-01 00:00:00
 +++ a/machine/m_sunos5.c	1970-01-01 00:00:00
 @@ -294,6 +294,10 @@ char *memorynames[] =
@@ -274,7 +274,7 @@ diff -wpruN '--exclude=*.orig' a~/machine/m_sunos5.c a/machine/m_sunos5.c
      /* get the cpu statistics arrays */
      cpustats = get_cpustats(&cpus, cpustats);
  
-diff -wpruN '--exclude=*.orig' a~/machine.h a/machine.h
+diff -wpruN --no-dereference '--exclude=*.orig' a~/machine.h a/machine.h
 --- a~/machine.h	1970-01-01 00:00:00
 +++ a/machine.h	1970-01-01 00:00:00
 @@ -50,6 +50,7 @@ struct statics
@@ -293,7 +293,7 @@ diff -wpruN '--exclude=*.orig' a~/machine.h a/machine.h
      long   *swap;
  };
  
-diff -wpruN '--exclude=*.orig' a~/top.c a/top.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/top.c a/top.c
 --- a~/top.c	1970-01-01 00:00:00
 +++ a/top.c	1970-01-01 00:00:00
 @@ -547,6 +547,7 @@ do_display(globalstate *gstate)
@@ -312,7 +312,7 @@ diff -wpruN '--exclude=*.orig' a~/top.c a/top.c
  	u_swap(system_info.swap);
  	u_message(&(gstate->now));
  	u_header(hdr);
-diff -wpruN '--exclude=*.orig' a~/top.h a/top.h
+diff -wpruN --no-dereference '--exclude=*.orig' a~/top.h a/top.h
 --- a~/top.h	1970-01-01 00:00:00
 +++ a/top.h	1970-01-01 00:00:00
 @@ -59,6 +59,7 @@
diff --git a/build/top/patches/06.all-is-long.patch b/build/top/patches/06.all-is-long.patch
index db4b851f8..e7f13e2a0 100644
--- a/build/top/patches/06.all-is-long.patch
+++ b/build/top/patches/06.all-is-long.patch
@@ -1,4 +1,4 @@
-diff -wpruN '--exclude=*.orig' a~/display.c a/display.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/display.c a/display.c
 --- a~/display.c	1970-01-01 00:00:00
 +++ a/display.c	1970-01-01 00:00:00
 @@ -1065,7 +1065,7 @@ static int lthreads = 0;
@@ -37,7 +37,7 @@ diff -wpruN '--exclude=*.orig' a~/display.c a/display.c
  
  {
      if (num_kernel > 0)
-diff -wpruN '--exclude=*.orig' a~/display.h a/display.h
+diff -wpruN --no-dereference '--exclude=*.orig' a~/display.h a/display.h
 --- a~/display.h	1970-01-01 00:00:00
 +++ a/display.h	1970-01-01 00:00:00
 @@ -49,13 +49,13 @@ void u_minibar(int (*formatter)(char *,
@@ -58,7 +58,7 @@ diff -wpruN '--exclude=*.orig' a~/display.h a/display.h
  void i_memory(long *stats);
  void u_memory(long *stats);
  void i_arc(long *stats);
-diff -wpruN '--exclude=*.orig' a~/machine/m_sunos5.c a/machine/m_sunos5.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/machine/m_sunos5.c a/machine/m_sunos5.c
 --- a~/machine/m_sunos5.c	1970-01-01 00:00:00
 +++ a/machine/m_sunos5.c	1970-01-01 00:00:00
 @@ -270,7 +270,7 @@ struct proc_field {
@@ -79,7 +79,7 @@ diff -wpruN '--exclude=*.orig' a~/machine/m_sunos5.c a/machine/m_sunos5.c
  char *kernelnames[] =
  {" ctxsw, ", " trap, ", " intr, ", " syscall, ", " fork, ",
   " flt, ", " pgin, ", " pgout, ", NULL};
-diff -wpruN '--exclude=*.orig' a~/machine.h a/machine.h
+diff -wpruN --no-dereference '--exclude=*.orig' a~/machine.h a/machine.h
 --- a~/machine.h	1970-01-01 00:00:00
 +++ a/machine.h	1970-01-01 00:00:00
 @@ -81,9 +81,9 @@ struct system_info
diff --git a/build/top/patches/07.itoa-fix-long.patch b/build/top/patches/07.itoa-fix-long.patch
index 36159a6bb..f24ee8f92 100644
--- a/build/top/patches/07.itoa-fix-long.patch
+++ b/build/top/patches/07.itoa-fix-long.patch
@@ -1,4 +1,4 @@
-diff -wpruN '--exclude=*.orig' a~/display.c a/display.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/display.c a/display.c
 --- a~/display.c	1970-01-01 00:00:00
 +++ a/display.c	1970-01-01 00:00:00
 @@ -635,7 +635,7 @@ summary_format_memory(int x, int y, long
@@ -10,7 +10,7 @@ diff -wpruN '--exclude=*.orig' a~/display.c a/display.c
  	    }
  
  	    /* next iteration will not start at x, y */
-diff -wpruN '--exclude=*.orig' a~/utils.c a/utils.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/utils.c a/utils.c
 --- a~/utils.c	1970-01-01 00:00:00
 +++ a/utils.c	1970-01-01 00:00:00
 @@ -93,27 +93,27 @@ atoiwi(char *str)
@@ -49,7 +49,7 @@ diff -wpruN '--exclude=*.orig' a~/utils.c a/utils.c
  
      ptr = buffer + sizeof(buffer);
      *--ptr = '\0';
-diff -wpruN '--exclude=*.orig' a~/utils.h a/utils.h
+diff -wpruN --no-dereference '--exclude=*.orig' a~/utils.h a/utils.h
 --- a~/utils.h	1970-01-01 00:00:00
 +++ a/utils.h	1970-01-01 00:00:00
 @@ -40,7 +40,7 @@
diff --git a/build/top/patches/08-winch-segfault-fix.patch b/build/top/patches/08-winch-segfault-fix.patch
index 6c86d675b..44e0c7677 100644
--- a/build/top/patches/08-winch-segfault-fix.patch
+++ b/build/top/patches/08-winch-segfault-fix.patch
@@ -1,6 +1,6 @@
 https://sourceforge.net/p/unixtop/patches/22/
 
-diff -wpruN '--exclude=*.orig' a~/top.c a/top.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/top.c a/top.c
 --- a~/top.c	1970-01-01 00:00:00
 +++ a/top.c	1970-01-01 00:00:00
 @@ -257,14 +257,14 @@ hold_signals()
diff --git a/build/top/patches/09-man-page-references.patch b/build/top/patches/09-man-page-references.patch
index 923a0e00c..a8dadaac2 100644
--- a/build/top/patches/09-man-page-references.patch
+++ b/build/top/patches/09-man-page-references.patch
@@ -1,4 +1,4 @@
-diff -wpruN '--exclude=*.orig' a~/top.1.in a/top.1.in
+diff -wpruN --no-dereference '--exclude=*.orig' a~/top.1.in a/top.1.in
 --- a~/top.1.in	1970-01-01 00:00:00
 +++ a/top.1.in	1970-01-01 00:00:00
 @@ -298,7 +298,7 @@ Quit
diff --git a/build/top/patches/10.zfs_compressed_arc.patch b/build/top/patches/10.zfs_compressed_arc.patch
index 3c9940c67..5538fc2cf 100644
--- a/build/top/patches/10.zfs_compressed_arc.patch
+++ b/build/top/patches/10.zfs_compressed_arc.patch
@@ -1,4 +1,4 @@
-diff -wpruN '--exclude=*.orig' a~/display.c a/display.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/display.c a/display.c
 --- a~/display.c	1970-01-01 00:00:00
 +++ a/display.c	1970-01-01 00:00:00
 @@ -103,6 +103,8 @@ static int x_mem = X_MEM;
@@ -134,7 +134,7 @@ diff -wpruN '--exclude=*.orig' a~/display.c a/display.c
   *  *_swap(stats) - print "Swap: " followed by the swap summary string
   *
   *  Assumptions:  cursor is on "lastline", the previous line
-diff -wpruN '--exclude=*.orig' a~/display.h a/display.h
+diff -wpruN --no-dereference '--exclude=*.orig' a~/display.h a/display.h
 --- a~/display.h	1970-01-01 00:00:00
 +++ a/display.h	1970-01-01 00:00:00
 @@ -60,6 +60,8 @@ void i_memory(long *stats);
@@ -146,7 +146,7 @@ diff -wpruN '--exclude=*.orig' a~/display.h a/display.h
  void i_swap(long *stats);
  void u_swap(long *stats);
  void i_message(struct timeval *now);
-diff -wpruN '--exclude=*.orig' a~/layout.h a/layout.h
+diff -wpruN --no-dereference '--exclude=*.orig' a~/layout.h a/layout.h
 --- a~/layout.h	1970-01-01 00:00:00
 +++ a/layout.h	1970-01-01 00:00:00
 @@ -60,12 +60,14 @@
@@ -166,7 +166,7 @@ diff -wpruN '--exclude=*.orig' a~/layout.h a/layout.h
 -#define  Y_PROCS	6
 +#define  Y_PROCS	7
  
-diff -wpruN '--exclude=*.orig' a~/machine/m_sunos5.c a/machine/m_sunos5.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/machine/m_sunos5.c a/machine/m_sunos5.c
 --- a~/machine/m_sunos5.c	1970-01-01 00:00:00
 +++ a/machine/m_sunos5.c	1970-01-01 00:00:00
 @@ -298,6 +298,10 @@ char *memorynames[] =
@@ -239,7 +239,7 @@ diff -wpruN '--exclude=*.orig' a~/machine/m_sunos5.c a/machine/m_sunos5.c
  
      /* get the cpu statistics arrays */
      cpustats = get_cpustats(&cpus, cpustats);
-diff -wpruN '--exclude=*.orig' a~/machine.h a/machine.h
+diff -wpruN --no-dereference '--exclude=*.orig' a~/machine.h a/machine.h
 --- a~/machine.h	1970-01-01 00:00:00
 +++ a/machine.h	1970-01-01 00:00:00
 @@ -51,6 +51,7 @@ struct statics
@@ -258,7 +258,7 @@ diff -wpruN '--exclude=*.orig' a~/machine.h a/machine.h
      long   *swap;
  };
  
-diff -wpruN '--exclude=*.orig' a~/top.c a/top.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/top.c a/top.c
 --- a~/top.c	1970-01-01 00:00:00
 +++ a/top.c	1970-01-01 00:00:00
 @@ -548,6 +548,7 @@ do_display(globalstate *gstate)
diff --git a/build/top/patches/11.termios.patch b/build/top/patches/11.termios.patch
index b0c455bcc..190cb0bb3 100644
--- a/build/top/patches/11.termios.patch
+++ b/build/top/patches/11.termios.patch
@@ -1,4 +1,4 @@
-diff -wpruN '--exclude=*.orig' a~/screen.c a/screen.c
+diff -wpruN --no-dereference '--exclude=*.orig' a~/screen.c a/screen.c
 --- a~/screen.c	1970-01-01 00:00:00
 +++ a/screen.c	1970-01-01 00:00:00
 @@ -84,14 +84,9 @@ char *tgetstr(const char *, char **);
diff --git a/build/znc/build.sh b/build/znc/build.sh
index 2d06fc49b..d6d00585b 100755
--- a/build/znc/build.sh
+++ b/build/znc/build.sh
@@ -47,14 +47,6 @@ XFORM_ARGS="
 SKIP_RTIME_CHECK=1
 NO_SONAME_EXPECTED=1
 
-install_modules() {
-    for f in $SRCDIR/files/*.cpp; do
-        bf=`basename $f`
-        logmsg "Installing module: $bf"
-        logcmd $CP $f $TMPDIR/$BUILDDIR/modules/
-    done
-}
-
 CONFIGURE_OPTS="
     -DCMAKE_BUILD_TYPE=Release
     -DCMAKE_INSTALL_PREFIX=$PREFIX
@@ -63,12 +55,28 @@ CONFIGURE_OPTS="
     -DWANT_PYTHON=false
     -DWANT_TCL=false
 "
-
-CONFIGURE_OPTS[amd64]="
-    -DCMAKE_INSTALL_LIBDIR=lib
-"
+CONFIGURE_OPTS[amd64]="-DCMAKE_INSTALL_LIBDIR=lib"
+CONFIGURE_OPTS[aarch64]="-DCMAKE_INSTALL_LIBDIR=lib"
 LDFLAGS+=" -lsocket"
-LDFLAGS[amd64]+=" -Wl,-R$OPREFIX/lib/amd64"
+
+pre_build() {
+    for f in $SRCDIR/files/*.cpp; do
+        bf=`basename $f`
+        logmsg "Installing module: $bf"
+        logcmd $CP $f $TMPDIR/$EXTRACTED_SRC/modules/ \
+            || logerr "failed to install module: $bf"
+    done
+}
+
+pre_configure() {
+    typeset arch=$1
+
+    LDFLAGS[$arch]+=" -Wl,-R$OPREFIX/${LIBDIRS[$arch]}"
+}
+
+post_install() {
+    install_smf network znc.xml
+}
 
 tests() {
     for key in SSL IPv6 Zlib; do
@@ -79,12 +87,10 @@ tests() {
 init
 download_source $PROG $PROG $VER
 patch_source
-install_modules
 prep_build cmake+ninja
 build -noctf    # C++
 tests
 strip_install
-install_smf network znc.xml
 make_package
 clean_up
 
diff --git a/build/znc/local.mog b/build/znc/local.mog
index c18808360..ea2433bac 100644
--- a/build/znc/local.mog
+++ b/build/znc/local.mog
@@ -8,7 +8,7 @@
 # source. A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 
-# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 license LICENSE license=Apache2
 
@@ -35,7 +35,7 @@ link path=etc/$(PREFIX) target=/var/$(PREFIX)/configs
 
 <transform file path=var/$(PREFIX)/configs -> set preserve true>
 
-<transform file path=$(PREFIX)/bin -> \
+<transform file path=$(PREFIX)/(?:bin|lib/znc)/ -> \
     set restart_fmri svc:/network/znc:default>
 
 <include binlink.mog>
diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64
index 800a78507..2fd486641 100644
--- a/doc/baseline.aarch64
+++ b/doc/baseline.aarch64
@@ -1,5 +1,6 @@
 extra.omnios ooce/application/links
 extra.omnios ooce/application/mc
+extra.omnios ooce/application/mutt
 extra.omnios ooce/audio/flac
 extra.omnios ooce/compress/pbzip2
 extra.omnios ooce/compress/pigz
@@ -14,12 +15,15 @@ extra.omnios ooce/developer/ninja
 extra.omnios ooce/editor/joe
 extra.omnios ooce/file/tree
 extra.omnios ooce/fonts/liberation
+extra.omnios ooce/library/apr
 extra.omnios ooce/library/cairo
 extra.omnios ooce/library/fontconfig
 extra.omnios ooce/library/freetype2
 extra.omnios ooce/library/gnutls
 extra.omnios ooce/library/icu4c
+extra.omnios ooce/library/jansson
 extra.omnios ooce/library/json-c
+extra.omnios ooce/library/ldns
 extra.omnios ooce/library/libarchive
 extra.omnios ooce/library/libde265
 extra.omnios ooce/library/libev
@@ -34,8 +38,10 @@ extra.omnios ooce/library/libpng
 extra.omnios ooce/library/libsodium
 extra.omnios ooce/library/liburcu
 extra.omnios ooce/library/libuv
+extra.omnios ooce/library/libvncserver
 extra.omnios ooce/library/libvorbis
 extra.omnios ooce/library/libwebp
+extra.omnios ooce/library/libzip
 extra.omnios ooce/library/mariadb-106
 extra.omnios ooce/library/nettle
 extra.omnios ooce/library/onig
@@ -44,6 +50,7 @@ extra.omnios ooce/library/pango
 extra.omnios ooce/library/pixman
 extra.omnios ooce/library/popt
 extra.omnios ooce/library/postgresql-14
+extra.omnios ooce/library/security/libsasl2
 extra.omnios ooce/library/slang
 extra.omnios ooce/library/tiff
 extra.omnios ooce/library/tree-sitter
@@ -55,16 +62,22 @@ extra.omnios ooce/multimedia/ffmpeg
 extra.omnios ooce/multimedia/minidlna
 extra.omnios ooce/multimedia/x264
 extra.omnios ooce/multimedia/x265
+extra.omnios ooce/network/fping
 extra.omnios ooce/network/irssi
 extra.omnios ooce/network/nsd
 extra.omnios ooce/network/openldap
+extra.omnios ooce/network/smtp/postfix
+extra.omnios ooce/network/tcpdump
 extra.omnios ooce/network/unbound
+extra.omnios ooce/network/znc
 extra.omnios ooce/print/cups
 extra.omnios ooce/security/gnupg
 extra.omnios ooce/security/minisign
 extra.omnios ooce/security/oath-toolkit
 extra.omnios ooce/security/pam_radius
 extra.omnios ooce/system/htop
+extra.omnios ooce/system/mbuffer
+extra.omnios ooce/system/top
 extra.omnios ooce/terminal/minicom
 extra.omnios ooce/text/datamash
 extra.omnios ooce/text/hunspell
@@ -79,3 +92,4 @@ extra.omnios ooce/util/pass
 extra.omnios ooce/util/rargs
 extra.omnios ooce/util/stress-ng
 extra.omnios ooce/util/u-boot
+extra.omnios ooce/util/xjobs
diff --git a/doc/packages.md b/doc/packages.md
index 1a652dd9a..29b0aae2f 100644
--- a/doc/packages.md
+++ b/doc/packages.md
@@ -108,7 +108,7 @@
 | ooce/library/icu4c		| 75.1		| https://github.com/unicode-org/icu/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/library/jansson		| 2.14		| https://github.com/akheron/jansson/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/library/json-c		| 0.17		| https://github.com/json-c/json-c/tags https://github.com/json-c/json-c/wiki | [omniosorg](https://github.com/omniosorg)
-| ooce/library/ldns		| 1.8.3		| https://nlnetlabs.nl/downloads/ldns/ | [omniosorg](https://github.com/omniosorg)
+| ooce/library/ldns		| 1.8.4		| https://nlnetlabs.nl/downloads/ldns/ | [omniosorg](https://github.com/omniosorg)
 | ooce/library/libarchive	| 3.7.2		| https://libarchive.org/downloads/ | [omniosorg](https://github.com/omniosorg)
 | ooce/library/libde265		| 1.0.15	| https://github.com/strukturag/libde265/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/library/libdwarf		| 20210528	| https://www.prevanders.net/dwarf.html | [omniosorg](https://github.com/omniosorg)
diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64
index 1c27b0a90..872872c45 100644
--- a/doc/pkglist.aarch64
+++ b/doc/pkglist.aarch64
@@ -64,6 +64,16 @@ ooce/text/xsv
 ooce/util/rargs
 ooce/developer/git-absorb
 ooce/util/bat
+ooce/system/mbuffer
+ooce/application/mutt
+ooce/network/fping
+ooce/util/xjobs
+ooce/library/ldns
+ooce/library/libzip
+ooce/library/jansson
+ooce/network/tcpdump
+ooce/system/top
+ooce/library/apr
 ###############################################################################
 .SYSROOT
 ooce/audio/flac
@@ -85,11 +95,15 @@ ooce/network/unbound
 ooce/library/gnutls
 ooce/application/mc
 ooce/library/cairo
+ooce/library/security/libsasl2
 ###############################################################################
 .SYSROOT
 ooce/security/gnupg
 ooce/multimedia/ffmpeg
 ooce/library/pango
+ooce/network/znc
+ooce/library/libvncserver
+ooce/network/smtp/postfix
 ###############################################################################
 .SYSROOT
 ooce/multimedia/minidlna