371 files changed, 2269 insertions, 1464 deletions

diff --git a/repos/core/autils/.files b/repos/core/autils/.files
index 7dc86fec..fb13ec00 100644
--- a/repos/core/autils/.files
+++ b/repos/core/autils/.files
@@ -2,9 +2,11 @@ drwxr-xr-x root/root    etc/
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/apkg
+-rwxr-xr-x root/root    usr/bin/apkg-chroot
 -rwxr-xr-x root/root    usr/bin/apkg-clean
 -rwxr-xr-x root/root    usr/bin/apkg-deps
 -rwxr-xr-x root/root    usr/bin/apkg-foreign
+-rwxr-xr-x root/root    usr/bin/apkg-orphan
 -rwxr-xr-x root/root    usr/bin/apkg-purge
 -rwxr-xr-x root/root    usr/bin/revdep
 -rwxr-xr-x root/root    usr/bin/updateconf
diff --git a/repos/core/autils/abuild b/repos/core/autils/abuild
new file mode 100644
index 00000000..5ab57e1c
--- /dev/null
+++ b/repos/core/autils/abuild
@@ -0,0 +1,16 @@
+name=autils
+version=20240612
+_commit=dfd4934a783d991b31063171f9e454a218e431b1
+release=1
+source="$name-$_commit.tar.gz::https://codeberg.org/emmett1/autils/archive/$_commit.tar.gz"
+
+build() {
+	mkdir -p $PKG/usr/bin $PKG/etc
+	for i in *; do
+		case $i in
+			README*|LICENSE);;
+			*.conf) install -Dm644 $i $PKG/etc/$i;;
+			     *) install -Dm755 $i $PKG/usr/bin/$i;;
+		esac
+	done
+}
diff --git a/repos/core/autils/build b/repos/core/autils/build
deleted file mode 100644
index b99d93ac..00000000
--- a/repos/core/autils/build
+++ /dev/null
@@ -1,8 +0,0 @@
-mkdir -p $PKG/usr/bin $PKG/etc
-for i in *; do
-	case $i in
-		README*|LICENSE);;
-		*.conf) install -Dm644 $i $PKG/etc/$i;;
-		     *) install -Dm755 $i $PKG/usr/bin/$i;;
-	esac
-done
diff --git a/repos/core/autils/info b/repos/core/autils/info
deleted file mode 100644
index 5290c398..00000000
--- a/repos/core/autils/info
+++ /dev/null
@@ -1,5 +0,0 @@
-name=autils
-version=20240527
-_commit=bcb55a8700fccd69af1c854c128146d41fbac182
-release=1
-source="$name-$_commit.tar.gz::https://codeberg.org/emmett1/autils/archive/$_commit.tar.gz"
diff --git a/repos/core/baselayout/abuild b/repos/core/baselayout/abuild
new file mode 100644
index 00000000..da10179f
--- /dev/null
+++ b/repos/core/baselayout/abuild
@@ -0,0 +1,72 @@
+name=baselayout
+version=1
+release=1
+source="fstab
+	group
+	hostname
+	hosts
+	issue
+	os-release
+	passwd
+	resolv.conf
+	shells
+	profile"
+
+build() {
+	cd $SRC
+	
+	#  root dirs
+	for d in proc sys run dev bin boot etc/opt home lib mnt \
+		opt sbin srv var; do
+		mkdir -p $PKG/$d
+	done
+	install -d -m 0750 $PKG/root
+	install -d -m 1777 $PKG/tmp $PKG/var/tmp
+	
+	# /usr and /usr/local dirs
+	for d in bin include lib sbin src; do
+		mkdir -p $PKG/usr/$d
+		mkdir -p $PKG/usr/local/$d
+	done
+	
+	# man page dirs
+	for d in 1 2 3 4 5 6 7 8; do
+		mkdir -p $PKG/usr/share/man/man$d
+		mkdir -p $PKG/usr/local/share/man/man$d
+	done
+	
+	# /var dirs
+	for d in log spool/mail opt cache lib/misc local; do
+		mkdir -p $PKG/var/$d
+	done
+	
+	ln -s ../run $PKG/var/run
+	#ln -s ../run/lock $PKG/var/lock
+	install -d $PKG/var/lock
+	
+	ln -s ../proc/self/mounts $PKG/etc/mtab
+	
+	# log files
+	for f in btmp lastlog faillog wtmp; do
+		touch $PKG/var/log/$f
+	done
+	chgrp utmp $PKG/var/log/lastlog
+	chmod 664  $PKG/var/log/lastlog
+	chmod 600  $PKG/var/log/btmp
+		
+	install -m644 passwd $PKG/etc
+	install -m644 group $PKG/etc
+	install -m644 resolv.conf $PKG/etc
+	install -m644 hosts $PKG/etc
+	install -m644 hostname $PKG/etc
+	install -m644 shells $PKG/etc
+	install -m644 fstab $PKG/etc
+	
+	install -dm0755 $PKG/etc/profile.d
+	
+	install -d $PKG/etc/skel
+	install -m644 issue $PKG/etc
+	install -m644 profile $PKG/etc
+	
+	cat os-release > $PKG/etc/os-release
+}
diff --git a/repos/core/baselayout/build b/repos/core/baselayout/build
deleted file mode 100644
index cebe127c..00000000
--- a/repos/core/baselayout/build
+++ /dev/null
@@ -1,56 +0,0 @@
-cd $SRC
-
-#  root dirs
-for d in proc sys run dev bin boot etc/opt home lib mnt \
-	opt sbin srv var; do
-	mkdir -p $PKG/$d
-done
-install -d -m 0750 $PKG/root
-install -d -m 1777 $PKG/tmp $PKG/var/tmp
-
-# /usr and /usr/local dirs
-for d in bin include lib sbin src; do
-	mkdir -p $PKG/usr/$d
-	mkdir -p $PKG/usr/local/$d
-done
-
-# man page dirs
-for d in 1 2 3 4 5 6 7 8; do
-	mkdir -p $PKG/usr/share/man/man$d
-	mkdir -p $PKG/usr/local/share/man/man$d
-done
-
-# /var dirs
-for d in log spool/mail opt cache lib/misc local; do
-	mkdir -p $PKG/var/$d
-done
-
-ln -s ../run $PKG/var/run
-#ln -s ../run/lock $PKG/var/lock
-install -d $PKG/var/lock
-
-ln -s ../proc/self/mounts $PKG/etc/mtab
-
-# log files
-for f in btmp lastlog faillog wtmp; do
-	touch $PKG/var/log/$f
-done
-chgrp utmp $PKG/var/log/lastlog
-chmod 664  $PKG/var/log/lastlog
-chmod 600  $PKG/var/log/btmp
-	
-install -m644 passwd $PKG/etc
-install -m644 group $PKG/etc
-install -m644 resolv.conf $PKG/etc
-install -m644 hosts $PKG/etc
-install -m644 hostname $PKG/etc
-install -m644 shells $PKG/etc
-install -m644 fstab $PKG/etc
-
-install -dm0755 $PKG/etc/profile.d
-
-install -d $PKG/etc/skel
-install -m644 issue $PKG/etc
-install -m644 profile $PKG/etc
-
-cat os-release > $PKG/etc/os-release
diff --git a/repos/core/baselayout/info b/repos/core/baselayout/info
deleted file mode 100644
index ac8831fa..00000000
--- a/repos/core/baselayout/info
+++ /dev/null
@@ -1,13 +0,0 @@
-name=baselayout
-version=1
-release=1
-source="fstab
-	group
-	hostname
-	hosts
-	issue
-	os-release
-	passwd
-	resolv.conf
-	shells
-	profile"
diff --git a/repos/core/binutils/abuild b/repos/core/binutils/abuild
new file mode 100644
index 00000000..2f73b3c5
--- /dev/null
+++ b/repos/core/binutils/abuild
@@ -0,0 +1,31 @@
+name=binutils
+version=2.42
+release=1
+source="https://sourceware.org/pub/$name/releases/$name-$version.tar.xz"
+
+build() {
+	sed -i 's/\(^INFO_DEPS *=\).*/\1/' bfd/Makefile.in
+	sed -i 's/\(^INFO_DEPS *=\).*/\1/' gas/Makefile.in
+	
+	mkdir build
+	cd build
+	
+	../configure \
+	        --prefix=/usr \
+	        --sysconfdir=/etc \
+	        --enable-gold \
+	        --enable-ld=default \
+	        --enable-lto \
+	        --enable-plugins \
+	        --enable-shared \
+	        --disable-werror \
+	        --with-system-zlib \
+	        --disable-multilib \
+	        --disable-gdb \
+	        --disable-gprof \
+	        --disable-gprofng \
+	        --without-zstd \
+	        --with-lib-path=/usr/lib:/lib
+	make DESTDIR=$PKG tooldir=/usr
+	make DESTDIR=$PKG tooldir=/usr install
+}
diff --git a/repos/core/binutils/build b/repos/core/binutils/build
deleted file mode 100644
index fddff04a..00000000
--- a/repos/core/binutils/build
+++ /dev/null
@@ -1,24 +0,0 @@
-sed -i 's/\(^INFO_DEPS *=\).*/\1/' bfd/Makefile.in
-sed -i 's/\(^INFO_DEPS *=\).*/\1/' gas/Makefile.in
-
-mkdir build
-cd build
-
-../configure \
-        --prefix=/usr \
-        --sysconfdir=/etc \
-        --enable-gold \
-        --enable-ld=default \
-        --enable-lto \
-        --enable-plugins \
-        --enable-shared \
-        --disable-werror \
-        --with-system-zlib \
-        --disable-multilib \
-        --disable-gdb \
-        --disable-gprof \
-        --disable-gprofng \
-        --without-zstd \
-        --with-lib-path=/usr/lib:/lib
-make DESTDIR=$PKG tooldir=/usr
-make DESTDIR=$PKG tooldir=/usr install
diff --git a/repos/core/binutils/info b/repos/core/binutils/info
deleted file mode 100644
index 49805573..00000000
--- a/repos/core/binutils/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=binutils
-version=2.42
-release=1
-source="https://sourceware.org/pub/$name/releases/$name-$version.tar.xz"
diff --git a/repos/core/bison/info b/repos/core/bison/abuild
index e19bde49..e19bde49 100644
--- a/repos/core/bison/info
+++ b/repos/core/bison/abuild
diff --git a/repos/core/busybox/abuild b/repos/core/busybox/abuild
new file mode 100644
index 00000000..3242e20e
--- /dev/null
+++ b/repos/core/busybox/abuild
@@ -0,0 +1,95 @@
+name=busybox
+version=1.36.1
+release=1
+source="https://${name}.net/downloads/${name}-${version}.tar.bz2
+	config
+	mdev.conf
+	fsck-resolve-uuid.patch
+	0016-ping-make-ping-work-without-root-privileges.patch
+	install-fix-chown.patch
+	adduser-no-setgid.patch
+	lineedit-Handle-SIGWINCH-gracefully.patch
+	lsusb-vendor-product.patch
+	print-unicode.patch
+	modprobe-kernel-version.patch
+	0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
+	acpid.run
+	crond.run
+	ntpd.run
+	syslogd.run
+	tty1.run
+	tty2.run
+	tty3.run
+	tty4.run
+	tty5.run
+	ttyS0.run"
+sv="acpid.run
+    crond.run
+    ntpd.run
+    syslogd.run
+    tty1.run
+    tty2.run
+    tty3.run
+    tty4.run
+    tty5.run
+    ttyS0.run"
+
+build() {
+	#make defconfig
+	#sed -i "s/# CONFIG_STATIC .*/CONFIG_STATIC=y/" .config
+	
+	#for o in LINUXRC STRINGS XZ UNXZ XZCAT LZCAT UNLZMA LZMA PATCH BZIP2 BZCAT BUNZIP2; do
+	#	sed -i "s/CONFIG_${o}=y/# CONFIG_${o} is not set/" .config
+	#done
+	
+	#sed -i "s/^CONFIG_MODPROBE_SMALL*/# CONFIG_MODPROBE_SMALL is not set/" .config
+	
+	cp $SRC/config .config
+	#make menuconfig
+	make
+	make CONFIG_PREFIX=$PKG install
+	mkdir -p $PKG/usr/share/busybox
+	cat .config > $PKG/usr/share/busybox/config
+	
+	BIN="$BIN xzcat xz unxz unlzma lzcat lzma" #xz
+	#BIN="$BIN zcat gunzip gzip" #gzip
+	BIN="$BIN strings" #binutils
+	BIN="$BIN clear reset" #ncurses
+	BIN="$BIN patch" #patch
+	BIN="$BIN bzcat bunzip2 bzip2" #bzip2
+	BIN="$BIN setfattr" #attr
+	BIN="$BIN chattr lsattr mke2fs findfs mkfs.ext2 blkid" #e2fsprogs
+	BIN="$BIN mkdosfs mkfs.vfat " #dosfstools
+	
+	# XXX
+	for i in $BIN; do
+		rm $PKG/*/$i || true
+		rm $PKG/*/*/$i || true
+	done
+	
+	cp $PKG/bin/busybox $PKG/bin/busybox-suid
+	chmod u+s $PKG/bin/busybox-suid
+	
+	for a in bin/mount \
+		bin/umount \
+		bin/su \
+		bin/ping ; do
+		rm $PKG/$a
+		ln -sv busybox-suid $PKG/$a
+	done
+	
+	for a in usr/bin/crontab \
+		usr/bin/passwd \
+		usr/bin/traceroute \
+		usr/bin/traceroute6 \
+		usr/bin/vlock; do
+		rm $PKG/$a
+		ln -sv ../../bin/busybox-suid $PKG/$a
+	done
+	
+	mkdir -p $PKG/etc
+	install -m644 $SRC/mdev.conf $PKG/etc/mdev.conf
+	
+	rm $PKG/usr/bin/diff
+	ln -s busybox $PKG/bin/diff
+}
diff --git a/repos/core/busybox/build b/repos/core/busybox/build
deleted file mode 100644
index 3c48bd21..00000000
--- a/repos/core/busybox/build
+++ /dev/null
@@ -1,57 +0,0 @@
-#make defconfig
-#sed -i "s/# CONFIG_STATIC .*/CONFIG_STATIC=y/" .config
-
-#for o in LINUXRC STRINGS XZ UNXZ XZCAT LZCAT UNLZMA LZMA PATCH BZIP2 BZCAT BUNZIP2; do
-#	sed -i "s/CONFIG_${o}=y/# CONFIG_${o} is not set/" .config
-#done
-
-#sed -i "s/^CONFIG_MODPROBE_SMALL*/# CONFIG_MODPROBE_SMALL is not set/" .config
-
-cp $SRC/config .config
-#make menuconfig
-make
-make CONFIG_PREFIX=$PKG install
-mkdir -p $PKG/usr/share/busybox
-cat .config > $PKG/usr/share/busybox/config
-
-BIN="$BIN xzcat xz unxz unlzma lzcat lzma" #xz
-#BIN="$BIN zcat gunzip gzip" #gzip
-BIN="$BIN strings" #binutils
-BIN="$BIN clear reset" #ncurses
-BIN="$BIN patch" #patch
-BIN="$BIN bzcat bunzip2 bzip2" #bzip2
-BIN="$BIN setfattr" #attr
-BIN="$BIN chattr lsattr mke2fs findfs mkfs.ext2 blkid" #e2fsprogs
-BIN="$BIN mkdosfs mkfs.vfat " #dosfstools
-
-# XXX
-for i in $BIN; do
-	rm $PKG/*/$i || true
-	rm $PKG/*/*/$i || true
-done
-
-cp $PKG/bin/busybox $PKG/bin/busybox-suid
-chmod u+s $PKG/bin/busybox-suid
-
-for a in bin/mount \
-	bin/umount \
-	bin/su \
-	bin/ping ; do
-	rm $PKG/$a
-	ln -sv busybox-suid $PKG/$a
-done
-
-for a in usr/bin/crontab \
-	usr/bin/passwd \
-	usr/bin/traceroute \
-	usr/bin/traceroute6 \
-	usr/bin/vlock; do
-	rm $PKG/$a
-	ln -sv ../../bin/busybox-suid $PKG/$a
-done
-
-mkdir -p $PKG/etc
-install -m644 $SRC/mdev.conf $PKG/etc/mdev.conf
-
-rm $PKG/usr/bin/diff
-ln -s busybox $PKG/bin/diff
diff --git a/repos/core/busybox/info b/repos/core/busybox/info
deleted file mode 100644
index 62919e3a..00000000
--- a/repos/core/busybox/info
+++ /dev/null
@@ -1,35 +0,0 @@
-name=busybox
-version=1.36.1
-release=1
-source="https://${name}.net/downloads/${name}-${version}.tar.bz2
-	config
-	mdev.conf
-	fsck-resolve-uuid.patch
-	0016-ping-make-ping-work-without-root-privileges.patch
-	install-fix-chown.patch
-	adduser-no-setgid.patch
-	lineedit-Handle-SIGWINCH-gracefully.patch
-	lsusb-vendor-product.patch
-	print-unicode.patch
-	modprobe-kernel-version.patch
-	0007-nologin-Install-applet-to-sbin-instead-of-usr-sbin.patch
-	acpid.run
-	crond.run
-	ntpd.run
-	syslogd.run
-	tty1.run
-	tty2.run
-	tty3.run
-	tty4.run
-	tty5.run
-	ttyS0.run"
-sv="acpid.run
-    crond.run
-    ntpd.run
-    syslogd.run
-    tty1.run
-    tty2.run
-    tty3.run
-    tty4.run
-    tty5.run
-    ttyS0.run"
diff --git a/repos/core/bzip2/abuild b/repos/core/bzip2/abuild
new file mode 100644
index 00000000..1f523e04
--- /dev/null
+++ b/repos/core/bzip2/abuild
@@ -0,0 +1,28 @@
+name=bzip2
+version=1.0.8
+release=1
+source="https://www.sourceware.org/pub/$name/$name-$version.tar.gz"
+
+build() {
+	sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile
+	sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile
+	
+	[ "${CFLAGS}" ] && sed -i "s|-O2|${CFLAGS}|g" Makefile
+	[ "${CFLAGS}" ] && sed -i "s|-O2|${CFLAGS}|g" Makefile-libbz2_so
+	
+	make -f Makefile-libbz2_so
+	mkdir -p $PKG/usr/lib
+	install libbz2.so.$version $PKG/usr/lib
+	ln -s libbz2.so.$version $PKG/usr/lib/libbz2.so
+	ln -s libbz2.so.$version $PKG/usr/lib/libbz2.so.1.0
+	
+	make clean
+	make
+	make PREFIX=$PKG/usr install
+	
+	cp -v bzip2-shared $PKG/usr/bin/bzip2
+	ln -sf bzip2 $PKG/usr/bin/bzcat
+	ln -sf bzip2 $PKG/usr/bin/bunzip2
+	
+	install -Dm 0644 bzlib.h $PKG/usr/include/bzlib.h
+}
diff --git a/repos/core/bzip2/build b/repos/core/bzip2/build
deleted file mode 100644
index 56de6170..00000000
--- a/repos/core/bzip2/build
+++ /dev/null
@@ -1,21 +0,0 @@
-sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile
-sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile
-
-[ "${CFLAGS}" ] && sed -i "s|-O2|${CFLAGS}|g" Makefile
-[ "${CFLAGS}" ] && sed -i "s|-O2|${CFLAGS}|g" Makefile-libbz2_so
-
-make -f Makefile-libbz2_so
-mkdir -p $PKG/usr/lib
-install libbz2.so.$version $PKG/usr/lib
-ln -s libbz2.so.$version $PKG/usr/lib/libbz2.so
-ln -s libbz2.so.$version $PKG/usr/lib/libbz2.so.1.0
-
-make clean
-make
-make PREFIX=$PKG/usr install
-
-cp -v bzip2-shared $PKG/usr/bin/bzip2
-ln -sf bzip2 $PKG/usr/bin/bzcat
-ln -sf bzip2 $PKG/usr/bin/bunzip2
-
-install -Dm 0644 bzlib.h $PKG/usr/include/bzlib.h
diff --git a/repos/core/bzip2/info b/repos/core/bzip2/info
deleted file mode 100644
index 924209a6..00000000
--- a/repos/core/bzip2/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=bzip2
-version=1.0.8
-release=1
-source="https://www.sourceware.org/pub/$name/$name-$version.tar.gz"
diff --git a/repos/core/ca-certificates/abuild b/repos/core/ca-certificates/abuild
new file mode 100644
index 00000000..e71b9886
--- /dev/null
+++ b/repos/core/ca-certificates/abuild
@@ -0,0 +1,13 @@
+name=ca-certificates
+version=20240311
+_noyear=${version#????}
+export _version=${version%????}-${_noyear%??}-${version#??????}
+release=1
+source="https://curl.se/ca/cacert-$_version.pem"
+
+build() {
+	install -Dm644 $SRC/cacert-$_version.pem $PKG/etc/ssl/cert.pem
+	install -d $PKG/etc/ssl/certs
+	ln -s ../cert.pem $PKG/etc/ssl/certs/ca-certificates.crt
+	ln -s cert.pem $PKG/etc/ssl/ca-bundle.crt
+}
diff --git a/repos/core/ca-certificates/build b/repos/core/ca-certificates/build
deleted file mode 100644
index 6afe96b4..00000000
--- a/repos/core/ca-certificates/build
+++ /dev/null
@@ -1,4 +0,0 @@
-install -Dm644 $SRC/cacert-$_version.pem $PKG/etc/ssl/cert.pem
-install -d $PKG/etc/ssl/certs
-ln -s ../cert.pem $PKG/etc/ssl/certs/ca-certificates.crt
-ln -s cert.pem $PKG/etc/ssl/ca-bundle.crt
diff --git a/repos/core/ca-certificates/info b/repos/core/ca-certificates/info
deleted file mode 100644
index 0a6e3dd0..00000000
--- a/repos/core/ca-certificates/info
+++ /dev/null
@@ -1,6 +0,0 @@
-name=ca-certificates
-version=20240311
-_noyear=${version#????}
-export _version=${version%????}-${_noyear%??}-${version#??????}
-release=1
-source="https://curl.se/ca/cacert-$_version.pem"
diff --git a/repos/core/curl/abuild b/repos/core/curl/abuild
new file mode 100644
index 00000000..07740087
--- /dev/null
+++ b/repos/core/curl/abuild
@@ -0,0 +1,41 @@
+name=curl
+version=8.8.0
+release=1
+source="https://$name.se/download/$name-$version.tar.xz"
+build_opt="
+	--with-openssl
+	--enable-threaded-resolver
+	--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+	--without-brotli
+	--without-libidn2
+	--without-libpsl
+	--without-librtmp
+	--without-nghttp2
+	--without-zstd
+	--disable-manual"
+
+build() {
+	mkdir bin
+	echo "#!/bin/sh
+	/bin/true
+	" > bin/perl
+	chmod +x bin/perl
+	export PATH=$PWD/bin:$PATH
+	
+	./configure \
+		--prefix=/usr \
+		--with-openssl \
+		--enable-threaded-resolver \
+		--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
+		--without-brotli \
+		--without-libidn2 \
+		--without-libpsl \
+		--without-librtmp \
+		--without-nghttp2 \
+		--without-zstd \
+		--disable-ldap \
+		--disable-manual \
+		--disable-ares
+	make
+	make install
+}
diff --git a/repos/core/curl/build b/repos/core/curl/build
deleted file mode 100644
index b212811b..00000000
--- a/repos/core/curl/build
+++ /dev/null
@@ -1,23 +0,0 @@
-mkdir bin
-echo "#!/bin/sh
-/bin/true
-" > bin/perl
-chmod +x bin/perl
-export PATH=$PWD/bin:$PATH
-
-./configure \
-	--prefix=/usr \
-	--with-openssl \
-	--enable-threaded-resolver \
-	--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
-	--without-brotli \
-	--without-libidn2 \
-	--without-libpsl \
-	--without-librtmp \
-	--without-nghttp2 \
-	--without-zstd \
-	--disable-ldap \
-	--disable-manual \
-	--disable-ares
-make
-make install
diff --git a/repos/core/curl/info b/repos/core/curl/info
deleted file mode 100644
index 6781009d..00000000
--- a/repos/core/curl/info
+++ /dev/null
@@ -1,15 +0,0 @@
-name=curl
-version=8.8.0
-release=1
-source="https://$name.se/download/$name-$version.tar.xz"
-build_opt="
-	--with-openssl
-	--enable-threaded-resolver
-	--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-	--without-brotli
-	--without-libidn2
-	--without-libpsl
-	--without-librtmp
-	--without-nghttp2
-	--without-zstd
-	--disable-manual"
diff --git a/repos/core/file/info b/repos/core/file/abuild
index 66eba53c..66eba53c 100644
--- a/repos/core/file/info
+++ b/repos/core/file/abuild
diff --git a/repos/core/flex/info b/repos/core/flex/abuild
index c948c035..d57b7b78 100644
--- a/repos/core/flex/info
+++ b/repos/core/flex/abuild
@@ -2,3 +2,7 @@ name=flex
 version=2.6.4
 release=1
 source="https://github.com/westes/$name/releases/download/v$version/$name-$version.tar.gz"
+
+postbuild() {
+	ln -s flex $PKG/usr/bin/lex
+}
diff --git a/repos/core/flex/postbuild b/repos/core/flex/postbuild
deleted file mode 100644
index b1256a5d..00000000
--- a/repos/core/flex/postbuild
+++ /dev/null
@@ -1 +0,0 @@
-ln -s flex $PKG/usr/bin/lex
diff --git a/repos/core/gcc/abuild b/repos/core/gcc/abuild
new file mode 100644
index 00000000..62eb4457
--- /dev/null
+++ b/repos/core/gcc/abuild
@@ -0,0 +1,53 @@
+name=gcc
+version=14.1.0
+release=1
+source="https://ftp.gnu.org/gnu/gcc/gcc-$version/gcc-$version.tar.xz
+	c89
+	c99"
+keep_static=1
+
+build() {
+	# /lib is 64bit libraries directory
+	sed -e '/m64=/s/lib64/lib/' \
+	    -i.orig gcc/config/i386/t-linux64
+	
+	mkdir -v build
+	cd       build
+	
+	SED=sed \
+	../configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib \
+		--enable-languages=c,c++,objc,obj-c++,lto \
+		--enable-lto \
+		--disable-bootstrap \
+		--disable-libmpx \
+		--with-system-zlib \
+		--with-pkgversion="Alice Linux" \
+		--disable-fixincludes \
+		--enable-threads=posix \
+		--enable-__cxa_atexit \
+		--enable-default-pie \
+		--enable-default-ssp \
+		--disable-multilib \
+		--disable-libsanitizer \
+	        --with-zstd=no
+	make
+	make DESTDIR=$PKG -j1 install
+	
+	#mkdir $PKG/lib
+	#ln -sv ../usr/bin/cpp $PKG/lib/cpp
+	ln -sv gcc $PKG/usr/bin/cc
+	
+	install -v -dm755 $PKG/usr/lib/bfd-plugins
+	ln -sfv ../../lib/gcc/$(gcc -dumpmachine)/$version/liblto_plugin.so \
+	        $PKG/usr/lib/bfd-plugins/
+	
+	mkdir -pv $PKG/usr/share/gdb/auto-load/usr/lib
+	mv -v $PKG/usr/lib/*gdb.py $PKG/usr/share/gdb/auto-load/usr/lib
+	
+	install -Dm755 $SRC/c89 $PKG/usr/bin/c89
+	install -Dm755 $SRC/c99 $PKG/usr/bin/c99
+	
+	rm -r $PKG/usr/share/$name-$version
+}
diff --git a/repos/core/gcc/build b/repos/core/gcc/build
deleted file mode 100644
index d133c6fd..00000000
--- a/repos/core/gcc/build
+++ /dev/null
@@ -1,43 +0,0 @@
-# /lib is 64bit libraries directory
-sed -e '/m64=/s/lib64/lib/' \
-    -i.orig gcc/config/i386/t-linux64
-
-mkdir -v build
-cd       build
-
-SED=sed \
-../configure \
-	--prefix=/usr \
-	--libexecdir=/usr/lib \
-	--enable-languages=c,c++,objc,obj-c++,lto \
-	--enable-lto \
-	--disable-bootstrap \
-	--disable-libmpx \
-	--with-system-zlib \
-	--with-pkgversion="Alice Linux" \
-	--disable-fixincludes \
-	--enable-threads=posix \
-	--enable-__cxa_atexit \
-	--enable-default-pie \
-	--enable-default-ssp \
-	--disable-multilib \
-	--disable-libsanitizer \
-        --with-zstd=no
-make
-make DESTDIR=$PKG -j1 install
-
-#mkdir $PKG/lib
-#ln -sv ../usr/bin/cpp $PKG/lib/cpp
-ln -sv gcc $PKG/usr/bin/cc
-
-install -v -dm755 $PKG/usr/lib/bfd-plugins
-ln -sfv ../../lib/gcc/$(gcc -dumpmachine)/$version/liblto_plugin.so \
-        $PKG/usr/lib/bfd-plugins/
-
-mkdir -pv $PKG/usr/share/gdb/auto-load/usr/lib
-mv -v $PKG/usr/lib/*gdb.py $PKG/usr/share/gdb/auto-load/usr/lib
-
-install -Dm755 $SRC/c89 $PKG/usr/bin/c89
-install -Dm755 $SRC/c99 $PKG/usr/bin/c99
-
-rm -r $PKG/usr/share/$name-$version
diff --git a/repos/core/gcc/info b/repos/core/gcc/info
deleted file mode 100644
index b9a769c7..00000000
--- a/repos/core/gcc/info
+++ /dev/null
@@ -1,7 +0,0 @@
-name=gcc
-version=14.1.0
-release=1
-source="https://ftp.gnu.org/gnu/gcc/gcc-$version/gcc-$version.tar.xz
-	c89
-	c99"
-keep_static=1
diff --git a/repos/core/git/prebuild b/repos/core/git/abuild
index 8983587d..e14a43a8 100644
--- a/repos/core/git/prebuild
+++ b/repos/core/git/abuild
@@ -1,3 +1,9 @@
+name=git
+version=2.45.2
+release=1
+source="https://www.kernel.org/pub/software/scm/$name/$name-$version.tar.xz"
+
+prebuild() {
 cat > config.mak <<EOF
 NO_GETTEXT=YesPlease
 NO_EXPAT=YesPlease
@@ -10,3 +16,4 @@ NO_SYS_POLL_H=1
 NO_CROSS_DIRECTORY_HARDLINKS=1
 NO_INSTALL_HARDLINKS=1
 EOF
+}
diff --git a/repos/core/git/info b/repos/core/git/info
deleted file mode 100644
index a05c5cf7..00000000
--- a/repos/core/git/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=git
-version=2.45.2
-release=1
-source="https://www.kernel.org/pub/software/scm/$name/$name-$version.tar.xz"
diff --git a/repos/core/gmp/info b/repos/core/gmp/abuild
index 47db992a..47db992a 100644
--- a/repos/core/gmp/info
+++ b/repos/core/gmp/abuild
diff --git a/repos/core/initscripts/abuild b/repos/core/initscripts/abuild
new file mode 100644
index 00000000..dc90920a
--- /dev/null
+++ b/repos/core/initscripts/abuild
@@ -0,0 +1,12 @@
+name=initscripts
+version=1
+release=1
+source="rc.boot rc.shutdown rc.boot.local rc.shutdown.local rc.modules inittab"
+
+build() {
+	mkdir -p $PKG/etc $PKG/var/service
+	for i in boot boot.local shutdown shutdown.local modules; do
+		install -m755 $SRC/rc.$i $PKG/etc/rc.$i
+	done
+	install -m644 $SRC/inittab $PKG/etc/inittab
+}
diff --git a/repos/core/initscripts/build b/repos/core/initscripts/build
deleted file mode 100644
index 808d6130..00000000
--- a/repos/core/initscripts/build
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir -p $PKG/etc $PKG/var/service
-for i in boot boot.local shutdown shutdown.local modules; do
-	install -m755 $SRC/rc.$i $PKG/etc/rc.$i
-done
-install -m644 $SRC/inittab $PKG/etc/inittab
diff --git a/repos/core/initscripts/info b/repos/core/initscripts/info
deleted file mode 100644
index 50bf40f8..00000000
--- a/repos/core/initscripts/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=initscripts
-version=1
-release=1
-source="rc.boot rc.shutdown rc.boot.local rc.shutdown.local rc.modules inittab"
diff --git a/repos/core/linux-headers/abuild b/repos/core/linux-headers/abuild
new file mode 100644
index 00000000..952682ab
--- /dev/null
+++ b/repos/core/linux-headers/abuild
@@ -0,0 +1,13 @@
+name=linux-headers
+version=6.6.30
+release=1
+source="https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$version.tar.xz"
+
+build() {
+	make mrproper
+	make headers
+	find usr/include -name '.*' -delete
+	rm usr/include/Makefile
+	mkdir -p $PKG/usr/include
+	cp -rv usr/include/* $PKG/usr/include
+}
diff --git a/repos/core/linux-headers/build b/repos/core/linux-headers/build
deleted file mode 100644
index f9c02fcf..00000000
--- a/repos/core/linux-headers/build
+++ /dev/null
@@ -1,6 +0,0 @@
-make mrproper
-make headers
-find usr/include -name '.*' -delete
-rm usr/include/Makefile
-mkdir -p $PKG/usr/include
-cp -rv usr/include/* $PKG/usr/include
diff --git a/repos/core/linux-headers/info b/repos/core/linux-headers/info
deleted file mode 100644
index 6aca64ed..00000000
--- a/repos/core/linux-headers/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=linux-headers
-version=6.6.30
-release=1
-source="https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$version.tar.xz"
diff --git a/repos/core/m4/info b/repos/core/m4/abuild
index f43fb49a..f43fb49a 100644
--- a/repos/core/m4/info
+++ b/repos/core/m4/abuild
diff --git a/repos/core/make/info b/repos/core/make/abuild
index 6a828a9a..6a828a9a 100644
--- a/repos/core/make/info
+++ b/repos/core/make/abuild
diff --git a/repos/core/mpc/info b/repos/core/mpc/abuild
index d51249de..d51249de 100644
--- a/repos/core/mpc/info
+++ b/repos/core/mpc/abuild
diff --git a/repos/core/mpfr/info b/repos/core/mpfr/abuild
index bb119f9c..bb119f9c 100644
--- a/repos/core/mpfr/info
+++ b/repos/core/mpfr/abuild
diff --git a/repos/core/musl/abuild b/repos/core/musl/abuild
new file mode 100644
index 00000000..201cbc58
--- /dev/null
+++ b/repos/core/musl/abuild
@@ -0,0 +1,42 @@
+name=musl
+version=1.2.5
+release=1
+source="https://www.musl-libc.org/releases/musl-$version.tar.gz
+	getconf.c
+	getconf.1
+	getent.c
+	getent.1
+	iconv.c
+	tree.h
+	queue.h
+	cdefs.h
+	elfutils-0.190-relr.patch"
+keep_static=1
+
+build() {
+	./configure \
+	        --prefix=/usr #\
+	        #--syslibdir=/usr/lib
+	make
+	make DESTDIR=$PKG install
+	
+	mkdir -p $PKG/usr/bin
+	ln -sf ../lib/libc.so $PKG/usr/bin/ldd
+	mkdir -p $PKG/sbin
+	echo "#!/bin/sh
+	/bin/true" > $PKG/sbin/ldconfig
+	chmod +x $PKG/sbin/ldconfig
+	
+	for i in getent getconf iconv; do
+	        ${CC:-gcc} $CFLAGS $LDFLAGS -fpie $SRC/$i.c -o $PKG/usr/bin/$i
+	done
+	
+	mkdir -p $PKG/usr/share/man/man1
+	install -m644 $SRC/getconf.1 $PKG/usr/share/man/man1
+	#install -m644 $SRC/getent.1 $PKG/usr/share/man/man1
+	
+	# bsdcompat headers
+	for h in tree.h queue.h cdefs.h; do
+	        install -D $SRC/$h $PKG/usr/include/sys/
+	done
+}
diff --git a/repos/core/musl/build b/repos/core/musl/build
deleted file mode 100644
index 50d2f132..00000000
--- a/repos/core/musl/build
+++ /dev/null
@@ -1,25 +0,0 @@
-./configure \
-        --prefix=/usr #\
-        #--syslibdir=/usr/lib
-make
-make DESTDIR=$PKG install
-
-mkdir -p $PKG/usr/bin
-ln -sf ../lib/libc.so $PKG/usr/bin/ldd
-mkdir -p $PKG/sbin
-echo "#!/bin/sh
-/bin/true" > $PKG/sbin/ldconfig
-chmod +x $PKG/sbin/ldconfig
-
-for i in getent getconf iconv; do
-        ${CC:-gcc} $CFLAGS $LDFLAGS -fpie $SRC/$i.c -o $PKG/usr/bin/$i
-done
-
-mkdir -p $PKG/usr/share/man/man1
-install -m644 $SRC/getconf.1 $PKG/usr/share/man/man1
-#install -m644 $SRC/getent.1 $PKG/usr/share/man/man1
-
-# bsdcompat headers
-for h in tree.h queue.h cdefs.h; do
-        install -D $SRC/$h $PKG/usr/include/sys/
-done
diff --git a/repos/core/musl/info b/repos/core/musl/info
deleted file mode 100644
index 767c125c..00000000
--- a/repos/core/musl/info
+++ /dev/null
@@ -1,14 +0,0 @@
-name=musl
-version=1.2.5
-release=1
-source="https://www.musl-libc.org/releases/musl-$version.tar.gz
-	getconf.c
-	getconf.1
-	getent.c
-	getent.1
-	iconv.c
-	tree.h
-	queue.h
-	cdefs.h
-	elfutils-0.190-relr.patch"
-keep_static=1
diff --git a/repos/core/openssl/info b/repos/core/openssl/abuild
index e0116852..60cfbf9c 100644
--- a/repos/core/openssl/info
+++ b/repos/core/openssl/abuild
@@ -3,3 +3,10 @@ version=3.3.0
 release=1
 source="https://www.$name.org/source/$name-$version.tar.gz
 	https://github.com/kiss-community/openssl/releases/download/generated/openssl-3.3.0-generated.tar.gz::noextract"
+
+build() {
+	tar xf ../*generated*
+	make depend
+	make
+	make DESTDIR=$PKG install_sw install_ssldirs install_man_docs
+}
diff --git a/repos/core/openssl/build b/repos/core/openssl/build
deleted file mode 100644
index af29d00a..00000000
--- a/repos/core/openssl/build
+++ /dev/null
@@ -1,4 +0,0 @@
-tar xf ../*generated*
-make depend
-make
-make DESTDIR=$PKG install_sw install_ssldirs install_man_docs
diff --git a/repos/core/patch/info b/repos/core/patch/abuild
index 6b02ef98..6b02ef98 100644
--- a/repos/core/patch/info
+++ b/repos/core/patch/abuild
diff --git a/repos/core/spm/info b/repos/core/spm/abuild
index 139e3867..5bebb396 100644
--- a/repos/core/spm/info
+++ b/repos/core/spm/abuild
@@ -3,3 +3,8 @@ version=20240527
 _commit=74817cd2c7c394720e4a418b8ecf26fb1c1a7346
 release=1
 source="$name-$_commit.tar.xz::https://codeberg.org/emmett1/spm/archive/$_commit.tar.gz"
+
+build() {
+	install -d $PKG/usr/bin
+	cp spm $PKG/usr/bin
+}
diff --git a/repos/core/spm/build b/repos/core/spm/build
deleted file mode 100644
index f6be0b1a..00000000
--- a/repos/core/spm/build
+++ /dev/null
@@ -1,2 +0,0 @@
-install -d $PKG/usr/bin
-cp spm $PKG/usr/bin
diff --git a/repos/core/xz/.files b/repos/core/xz/.files
index f800d150..cb120647 100644
--- a/repos/core/xz/.files
+++ b/repos/core/xz/.files
@@ -41,10 +41,9 @@ drwxr-xr-x root/root    usr/include/lzma/
 -rw-r--r-- root/root    usr/include/lzma/version.h
 -rw-r--r-- root/root    usr/include/lzma/vli.h
 drwxr-xr-x root/root    usr/lib/
--rw-r--r-- root/root    usr/lib/liblzma.a
-lrwxrwxrwx root/root    usr/lib/liblzma.so -> liblzma.so.5.4.2
-lrwxrwxrwx root/root    usr/lib/liblzma.so.5 -> liblzma.so.5.4.2
--rwxr-xr-x root/root    usr/lib/liblzma.so.5.4.2
+lrwxrwxrwx root/root    usr/lib/liblzma.so -> liblzma.so.5.6.2
+lrwxrwxrwx root/root    usr/lib/liblzma.so.5 -> liblzma.so.5.6.2
+-rwxr-xr-x root/root    usr/lib/liblzma.so.5.6.2
 drwxr-xr-x root/root    usr/lib/pkgconfig/
 -rw-r--r-- root/root    usr/lib/pkgconfig/liblzma.pc
 drwxr-xr-x root/root    usr/share/
diff --git a/repos/core/xz/abuild b/repos/core/xz/abuild
new file mode 100644
index 00000000..edf8f21e
--- /dev/null
+++ b/repos/core/xz/abuild
@@ -0,0 +1,4 @@
+name=xz
+version=5.6.2
+release=1
+source="https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.gz"
diff --git a/repos/core/xz/info b/repos/core/xz/info
deleted file mode 100644
index 4d45ffdc..00000000
--- a/repos/core/xz/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=xz
-version=5.4.2
-release=1
-source="https://excellmedia.dl.sourceforge.net/project/lzmautils/xz-5.4.2.tar.gz"
diff --git a/repos/core/zlib/info b/repos/core/zlib/abuild
index 2190f832..d0a08003 100644
--- a/repos/core/zlib/info
+++ b/repos/core/zlib/abuild
@@ -2,3 +2,9 @@ name=zlib
 version=1.3.1
 release=1
 source="https://$name.net/$name-$version.tar.xz"
+
+build() {
+	./configure --prefix=/usr --localstatedir=/var
+	make
+	make install
+}
diff --git a/repos/core/zlib/build b/repos/core/zlib/build
deleted file mode 100644
index 21e2063e..00000000
--- a/repos/core/zlib/build
+++ /dev/null
@@ -1,3 +0,0 @@
-./configure --prefix=/usr --localstatedir=/var
-make
-make install
diff --git a/repos/extra/8821cu/abuild b/repos/extra/8821cu/abuild
new file mode 100644
index 00000000..487a193f
--- /dev/null
+++ b/repos/extra/8821cu/abuild
@@ -0,0 +1,11 @@
+name=8821cu
+version=20240330
+release=1
+_commit=4f6004a
+source="$name-$version.tar.gz::https://github.com/morrownr/8821cu-20210916/archive/$_commit.tar.gz"
+
+build() {
+	make modules KSRC=/lib/modules/$(uname -r)/build
+	mkdir -p $PKG/lib/modules/$(uname -r)/kernel/drivers/net/wireless/
+	install -p -m 644 8821cu.ko  $PKG/lib/modules/$(uname -r)/kernel/drivers/net/wireless/
+}
diff --git a/repos/extra/8821cu/build b/repos/extra/8821cu/build
deleted file mode 100644
index 9aec9ad0..00000000
--- a/repos/extra/8821cu/build
+++ /dev/null
@@ -1,3 +0,0 @@
-make modules KSRC=/lib/modules/$(uname -r)/build
-mkdir -p $PKG/lib/modules/$(uname -r)/kernel/drivers/net/wireless/
-install -p -m 644 8821cu.ko  $PKG/lib/modules/$(uname -r)/kernel/drivers/net/wireless/
diff --git a/repos/extra/8821cu/info b/repos/extra/8821cu/info
deleted file mode 100644
index b22cc560..00000000
--- a/repos/extra/8821cu/info
+++ /dev/null
@@ -1,5 +0,0 @@
-name=8821cu
-version=20240330
-release=1
-_commit=4f6004a
-source="$name-$version.tar.gz::https://github.com/morrownr/8821cu-20210916/archive/$_commit.tar.gz"
diff --git a/repos/extra/acpi/info b/repos/extra/acpi/abuild
index 87d0fd66..87d0fd66 100644
--- a/repos/extra/acpi/info
+++ b/repos/extra/acpi/abuild
diff --git a/repos/extra/adwaita-icon-theme/.files b/repos/extra/adwaita-icon-theme/.files
index 4c33b3ef..f8430ca2 100644
--- a/repos/extra/adwaita-icon-theme/.files
+++ b/repos/extra/adwaita-icon-theme/.files
@@ -75,6 +75,7 @@ lrwxrwxrwx root/root    usr/share/icons/Adwaita/cursors/cross_reverse -> crossha
 -rw-r--r-- root/root    usr/share/icons/Adwaita/cursors/crosshair
 -rw-r--r-- root/root    usr/share/icons/Adwaita/cursors/default
 lrwxrwxrwx root/root    usr/share/icons/Adwaita/cursors/diamond_cross -> crosshair
+lrwxrwxrwx root/root    usr/share/icons/Adwaita/cursors/dnd-move -> default
 -rw-r--r-- root/root    usr/share/icons/Adwaita/cursors/e-resize
 -rw-r--r-- root/root    usr/share/icons/Adwaita/cursors/ew-resize
 lrwxrwxrwx root/root    usr/share/icons/Adwaita/cursors/fd_double_arrow -> nesw-resize
diff --git a/repos/extra/adwaita-icon-theme/info b/repos/extra/adwaita-icon-theme/abuild
index c5f8796d..6fad3596 100644
--- a/repos/extra/adwaita-icon-theme/info
+++ b/repos/extra/adwaita-icon-theme/abuild
@@ -1,4 +1,4 @@
 name=adwaita-icon-theme
-version=46.0
+version=46.2
 release=1
 source="https://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz"
diff --git a/repos/extra/alsa-lib/info b/repos/extra/alsa-lib/abuild
index 660e7650..660e7650 100644
--- a/repos/extra/alsa-lib/info
+++ b/repos/extra/alsa-lib/abuild
diff --git a/repos/extra/alsa-utils/info b/repos/extra/alsa-utils/abuild
index 2738da53..2738da53 100644
--- a/repos/extra/alsa-utils/info
+++ b/repos/extra/alsa-utils/abuild
diff --git a/repos/extra/at-spi2-core/info b/repos/extra/at-spi2-core/abuild
index 08f3ff3f..08f3ff3f 100644
--- a/repos/extra/at-spi2-core/info
+++ b/repos/extra/at-spi2-core/abuild
diff --git a/repos/extra/autoconf/info b/repos/extra/autoconf/abuild
index d4eab206..d4eab206 100644
--- a/repos/extra/autoconf/info
+++ b/repos/extra/autoconf/abuild
diff --git a/repos/extra/automake/info b/repos/extra/automake/abuild
index fe5e932e..fe5e932e 100644
--- a/repos/extra/automake/info
+++ b/repos/extra/automake/abuild
diff --git a/repos/extra/b3sum/info b/repos/extra/b3sum/abuild
index 71ddc6c0..71ddc6c0 100644
--- a/repos/extra/b3sum/info
+++ b/repos/extra/b3sum/abuild
diff --git a/repos/extra/bash/info b/repos/extra/bash/abuild
index 1eeb724f..1815d91d 100644
--- a/repos/extra/bash/info
+++ b/repos/extra/bash/abuild
@@ -4,3 +4,11 @@ release=1
 source="https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz
 	bashrc"
 build_opt="--without-bash-malloc --with-installed-readline"
+
+postbuild() {
+	mkdir -p $PKG/bin
+	mv $PKG/usr/bin/bash $PKG/bin
+	
+	install -d $PKG/etc
+	install -m644 $SRC/bashrc $PKG/etc
+}
diff --git a/repos/extra/bash/postbuild b/repos/extra/bash/postbuild
deleted file mode 100644
index 36899699..00000000
--- a/repos/extra/bash/postbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir -p $PKG/bin
-mv $PKG/usr/bin/bash $PKG/bin
-
-install -d $PKG/etc
-install -m644 $SRC/bashrc $PKG/etc
diff --git a/repos/extra/basu/info b/repos/extra/basu/abuild
index 099e17e0..099e17e0 100644
--- a/repos/extra/basu/info
+++ b/repos/extra/basu/abuild
diff --git a/repos/extra/birch/abuild b/repos/extra/birch/abuild
new file mode 100644
index 00000000..2f7312bc
--- /dev/null
+++ b/repos/extra/birch/abuild
@@ -0,0 +1,12 @@
+name=birch
+version=27691aa4fb2746f73c373e6653c1fb17795729f9
+release=1
+source="$name-$version.tar.gz::https://github.com/dylanaraps/${name}/archive/${version}.tar.gz"
+
+build() {
+	install -Dm755 birch $PKG/usr/bin/birch
+	
+	# change some defaults
+	sed 's|irc.freenode.net|irc.libera.chat|' -i $PKG/usr/bin/birch
+	sed 's|kisslinux|libera|' -i $PKG/usr/bin/birch
+}
diff --git a/repos/extra/birch/build b/repos/extra/birch/build
deleted file mode 100644
index 70d715bb..00000000
--- a/repos/extra/birch/build
+++ /dev/null
@@ -1,5 +0,0 @@
-install -Dm755 birch $PKG/usr/bin/birch
-
-# change some defaults
-sed 's|irc.freenode.net|irc.libera.chat|' -i $PKG/usr/bin/birch
-sed 's|kisslinux|libera|' -i $PKG/usr/bin/birch
diff --git a/repos/extra/birch/info b/repos/extra/birch/info
deleted file mode 100644
index f89ffe91..00000000
--- a/repos/extra/birch/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=birch
-version=27691aa4fb2746f73c373e6653c1fb17795729f9
-release=1
-source="$name-$version.tar.gz::https://github.com/dylanaraps/${name}/archive/${version}.tar.gz"
diff --git a/repos/extra/brightnessctl/info b/repos/extra/brightnessctl/abuild
index 0ed73b7b..72ac5bc3 100644
--- a/repos/extra/brightnessctl/info
+++ b/repos/extra/brightnessctl/abuild
@@ -2,3 +2,7 @@ name=brightnessctl
 version=0.5.1
 release=1
 source="https://github.com/Hummer12007/${name}/archive/${version}/${name}-${version}.tar.gz"
+
+prebuild() {
+	sed '/INSTALL_UDEV_1/d' -i Makefile
+}
diff --git a/repos/extra/brightnessctl/prebuild b/repos/extra/brightnessctl/prebuild
deleted file mode 100644
index 03c0bbd8..00000000
--- a/repos/extra/brightnessctl/prebuild
+++ /dev/null
@@ -1 +0,0 @@
-sed '/INSTALL_UDEV_1/d' -i Makefile
diff --git a/repos/extra/c-ares/.files b/repos/extra/c-ares/.files
index 27a21877..bcc8dc6b 100644
--- a/repos/extra/c-ares/.files
+++ b/repos/extra/c-ares/.files
@@ -18,8 +18,8 @@ drwxr-xr-x root/root    usr/lib/cmake/c-ares/
 -rw-r--r-- root/root    usr/lib/cmake/c-ares/c-ares-targets-release.cmake
 -rw-r--r-- root/root    usr/lib/cmake/c-ares/c-ares-targets.cmake
 lrwxrwxrwx root/root    usr/lib/libcares.so -> libcares.so.2
-lrwxrwxrwx root/root    usr/lib/libcares.so.2 -> libcares.so.2.13.1
--rwxr-xr-x root/root    usr/lib/libcares.so.2.13.1
+lrwxrwxrwx root/root    usr/lib/libcares.so.2 -> libcares.so.2.14.0
+-rwxr-xr-x root/root    usr/lib/libcares.so.2.14.0
 drwxr-xr-x root/root    usr/lib/pkgconfig/
 -rw-r--r-- root/root    usr/lib/pkgconfig/libcares.pc
 drwxr-xr-x root/root    usr/share/
@@ -30,88 +30,88 @@ drwxr-xr-x root/root    usr/share/man/man1/
 drwxr-xr-x root/root    usr/share/man/man3/
 -rw-r--r-- root/root    usr/share/man/man3/ares_cancel.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_create_query.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_destroy.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_destroy.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_destroy_options.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_class_fromstr.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_class_t.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_class_tostr.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_class_tostr.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_datatype_t.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_flags_t.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_mapping.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_flags_t.3.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_mapping.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_opcode_t.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_opcode_tostr.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_opcode_tostr.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_opt_datatype_t.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_opt_get_datatype.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_opt_get_name.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_opt_get_datatype.3.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_opt_get_name.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_parse.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rcode_t.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rcode_tostr.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_rec_type_fromstr.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_rec_type_fromstr.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rec_type_t.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_record.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_create.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_destroy.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_duplicate.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_get_flags.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_record.3.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_create.3.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_destroy.3.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_duplicate.3.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_get_flags.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_get_id.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_get_opcode.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_get_rcode.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_query_add.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_query_cnt.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_query_cnt.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_query_get.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_query_set_name.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_query_set_type.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_rr_add.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_rr_cnt.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_rr_del.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_rr_del.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_rr_get.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_rr_get_const.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_record_rr_get_const.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_addr.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_addr6.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_addr.3.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_addr6.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_bin.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_class.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_keys.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_name.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_opt.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_opt_byid.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_opt_byid.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_opt_cnt.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_str.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_ttl.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_type.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_u16.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_u32.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_u32.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_get_u8.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_key_datatype.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_key_datatype.3.gz.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_key_t.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_key_to_rec_type.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_key_to_rec_type.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_key_tostr.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_set_addr.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_set_addr6.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_set_bin.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_set_opt.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_set_str.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_set_bin.3.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_set_opt.3.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_set_str.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_set_u16.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_set_u32.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_set_u32.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_rr_set_u8.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dns_section_t.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_section_tostr.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_dns_write.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_section_tostr.3.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_dns_write.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_dup.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_expand_name.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_expand_name.3.gz.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_expand_string.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_fds.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_free_data.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_free_data.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_free_hostent.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_free_string.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_freeaddrinfo.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_free_string.3.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_freeaddrinfo.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_get_servers.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_get_servers_csv.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_get_servers_ports.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_getaddrinfo.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_gethostbyaddr.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_gethostbyname.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_gethostbyname_file.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_gethostbyname.3.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_gethostbyname_file.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_getnameinfo.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_getsock.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_inet_ntop.3.gz
@@ -119,50 +119,51 @@ drwxr-xr-x root/root    usr/share/man/man3/
 -rw-r--r-- root/root    usr/share/man/man3/ares_init.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_init_options.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_library_cleanup.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_library_init.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_library_init.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_library_init_android.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_library_initialized.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_mkquery.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_opt_param_t.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_parse_a_reply.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_parse_aaaa_reply.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_opt_param_t.3.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_parse_a_reply.3.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_parse_aaaa_reply.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_parse_caa_reply.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_parse_mx_reply.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_parse_naptr_reply.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_parse_ns_reply.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_parse_ptr_reply.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_parse_ns_reply.3.gz.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_parse_ptr_reply.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_parse_soa_reply.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_parse_srv_reply.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_parse_txt_reply.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_parse_txt_reply.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_parse_uri_reply.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_process.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_process.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_query.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_query_dnsrec.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_query_dnsrec.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_queue.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_queue_active_queries.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_queue_wait_empty.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_reinit.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_reinit.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_save_options.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_search.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_search_dnsrec.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_search.3.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_search_dnsrec.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_send.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_send_dnsrec.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_set_local_dev.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_set_local_ip4.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_set_local_ip6.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_set_server_state_callback.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_set_servers.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_set_servers_csv.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_set_servers_ports.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_set_servers_ports_csv.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_set_socket_callback.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_set_socket_configure_callback.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_set_socket_functions.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_set_socket_functions.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_set_sortlist.3.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_strerror.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_svcb_param_t.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_threadsafety.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_svcb_param_t.3.gz.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_threadsafety.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_timeout.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_tlsa_match_t.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_tlsa_match_t.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_tlsa_selector_t.3.gz
--rw-r--r-- root/root    usr/share/man/man3/ares_tlsa_usage_t.3.gz
+-rw-r--r-- root/root    usr/share/man/man3/ares_tlsa_usage_t.3.gz.gz
 -rw-r--r-- root/root    usr/share/man/man3/ares_version.3.gz
diff --git a/repos/extra/c-ares/info b/repos/extra/c-ares/abuild
index 93290d3b..8b836e31 100644
--- a/repos/extra/c-ares/info
+++ b/repos/extra/c-ares/abuild
@@ -1,5 +1,5 @@
 name=c-ares
-version=1.28.1
+version=1.29.0
 release=1
 source="https://$name.haxx.se/download/$name-$version.tar.gz"
 build_type=cmake_build
diff --git a/repos/extra/cairo/info b/repos/extra/cairo/abuild
index 6436621f..6436621f 100644
--- a/repos/extra/cairo/info
+++ b/repos/extra/cairo/abuild
diff --git a/repos/extra/cbindgen/info b/repos/extra/cbindgen/abuild
index 1fa04fc2..5443e7b2 100644
--- a/repos/extra/cbindgen/info
+++ b/repos/extra/cbindgen/abuild
@@ -2,3 +2,9 @@ name=cbindgen
 version=0.26.0
 release=1
 source="https://github.com/eqrion/$name/archive/v$version/$name-$version.tar.gz"
+
+build() {
+	cargo build --release
+	install -d $PKG/usr/bin/
+	install -Dm755 target/release/cbindgen $PKG/usr/bin/
+}
diff --git a/repos/extra/cbindgen/build b/repos/extra/cbindgen/build
deleted file mode 100644
index 4b461648..00000000
--- a/repos/extra/cbindgen/build
+++ /dev/null
@@ -1,3 +0,0 @@
-cargo build --release
-install -d $PKG/usr/bin/
-install -Dm755 target/release/cbindgen $PKG/usr/bin/
diff --git a/repos/extra/ccache/abuild b/repos/extra/ccache/abuild
new file mode 100644
index 00000000..269ce67a
--- /dev/null
+++ b/repos/extra/ccache/abuild
@@ -0,0 +1,13 @@
+name=ccache
+version=4.9.1
+release=1
+source="https://github.com/$name/$name/releases/download/v$version/$name-$version.tar.xz"
+build_opt="-DREDIS_STORAGE_BACKEND=OFF -DENABLE_TESTING=OFF"
+
+postbuild() {
+	install -d $PKG/usr/lib/ccache
+	for c in gcc g++ cc c++; do
+		ln -s /usr/bin/ccache $PKG/usr/lib/ccache/$c
+	done
+	#install -dm777 $PKG/var/cache/ccache
+}
diff --git a/repos/extra/ccache/info b/repos/extra/ccache/info
deleted file mode 100644
index fdb1e202..00000000
--- a/repos/extra/ccache/info
+++ /dev/null
@@ -1,5 +0,0 @@
-name=ccache
-version=4.9.1
-release=1
-source="https://github.com/$name/$name/releases/download/v$version/$name-$version.tar.xz"
-build_opt="-DREDIS_STORAGE_BACKEND=OFF"
diff --git a/repos/extra/ccache/postbuild b/repos/extra/ccache/postbuild
deleted file mode 100644
index d7b9cf50..00000000
--- a/repos/extra/ccache/postbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-install -d $PKG/usr/lib/ccache
-for c in gcc g++ cc c++; do
-	ln -s /usr/bin/ccache $PKG/usr/lib/ccache/$c
-done
-#install -dm777 $PKG/var/cache/ccache
diff --git a/repos/extra/cfm/info b/repos/extra/cfm/abuild
index 7c9aa0cb..7c9aa0cb 100644
--- a/repos/extra/cfm/info
+++ b/repos/extra/cfm/abuild
diff --git a/repos/extra/clang/info b/repos/extra/clang/abuild
index a2626651..9369492e 100644
--- a/repos/extra/clang/info
+++ b/repos/extra/clang/abuild
@@ -15,3 +15,8 @@ build_opt="
 	-DCLANG_INCLUDE_TESTS=OFF
 	-DLIBCLANG_BUILD_STATIC=ON"
 keep_static=1
+
+prebuild() {
+	mv ../cmake-${version}.src .
+	sed "/LLVM_COMMON_CMAKE_UTILS/s@../cmake@cmake-${version}.src@" -i CMakeLists.txt
+}
diff --git a/repos/extra/clang/prebuild b/repos/extra/clang/prebuild
deleted file mode 100644
index 79f1d68f..00000000
--- a/repos/extra/clang/prebuild
+++ /dev/null
@@ -1,2 +0,0 @@
-mv ../cmake-${version}.src .
-sed "/LLVM_COMMON_CMAKE_UTILS/s@../cmake@cmake-${version}.src@" -i CMakeLists.txt
diff --git a/repos/extra/cmake/abuild b/repos/extra/cmake/abuild
new file mode 100644
index 00000000..a45f1e78
--- /dev/null
+++ b/repos/extra/cmake/abuild
@@ -0,0 +1,20 @@
+name=cmake
+version=3.29.4
+release=1
+source="https://$name.org/files/v${version%.*}/$name-$version.tar.gz"
+build_opt="--system-libs"
+build_type="configure_build"
+
+
+build() {
+	./configure \
+	        --prefix=/usr \
+		--system-curl \
+		--system-expat \
+		--system-zlib \
+		--system-bzip2 -- \
+		-DBUILD_CursesDialog=OFF
+	make
+	make install
+	rm -r $PKG/usr/doc
+}
diff --git a/repos/extra/cmake/build b/repos/extra/cmake/build
deleted file mode 100644
index 2acabfd3..00000000
--- a/repos/extra/cmake/build
+++ /dev/null
@@ -1,10 +0,0 @@
-./configure \
-        --prefix=/usr \
-	--system-curl \
-	--system-expat \
-	--system-zlib \
-	--system-bzip2 -- \
-	-DBUILD_CursesDialog=OFF
-make
-make install
-rm -r $PKG/usr/doc
diff --git a/repos/extra/cmake/info b/repos/extra/cmake/info
deleted file mode 100644
index aded43a6..00000000
--- a/repos/extra/cmake/info
+++ /dev/null
@@ -1,7 +0,0 @@
-name=cmake
-version=3.29.3
-release=1
-source="https://$name.org/files/v${version%.*}/$name-$version.tar.gz"
-build_opt="--system-libs"
-build_type="configure_build"
-
diff --git a/repos/extra/cmus/info b/repos/extra/cmus/abuild
index a688c4c5..a4127ca0 100644
--- a/repos/extra/cmus/info
+++ b/repos/extra/cmus/abuild
@@ -2,3 +2,9 @@ name=cmus
 version=2.11.0
 release=1
 source="https://github.com/${name}/${name}/archive/v${version}/${name}-v${version}.tar.gz"
+
+build() {
+	./configure prefix=/usr
+	make
+	make install install-man
+}
diff --git a/repos/extra/cmus/build b/repos/extra/cmus/build
deleted file mode 100644
index 1dfde63c..00000000
--- a/repos/extra/cmus/build
+++ /dev/null
@@ -1,3 +0,0 @@
-./configure prefix=/usr
-make
-make install install-man
diff --git a/repos/extra/dbus/info b/repos/extra/dbus/abuild
index 0ec42b5a..0ec42b5a 100644
--- a/repos/extra/dbus/info
+++ b/repos/extra/dbus/abuild
diff --git a/repos/extra/dbus/postinstall b/repos/extra/dbus/postinstall
index 5bb5e44b..970b2e18 100755
--- a/repos/extra/dbus/postinstall
+++ b/repos/extra/dbus/postinstall
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-getent group messagebus >/dev/null || addgroup -g 18 messagebus
-getent passwd messagebus >/dev/null || adduser -g messagebus -s /bin/false messagebus
+getent group messagebus >/dev/null || addgroup -S messagebus 2>/dev/null
+getent passwd messagebus >/dev/null || adduser -S -D -H -h /dev/null -s /sbin/nologin -G messagebus -g messagebus messagebus 2>/dev/null
 
 chown root:messagebus /usr/libexec/dbus-daemon-launch-helper
 chmod 4750 /usr/libexec/dbus-daemon-launch-helper
diff --git a/repos/extra/dejavu-fonts-ttf/.files b/repos/extra/dejavu-fonts-ttf/.files
index d4b90a64..9dbc6f68 100644
--- a/repos/extra/dejavu-fonts-ttf/.files
+++ b/repos/extra/dejavu-fonts-ttf/.files
@@ -1,21 +1,22 @@
 drwxr-xr-x root/root    etc/
 drwxr-xr-x root/root    etc/fonts/
-drwxr-xr-x root/root    etc/fonts/conf.avail/
--rw-r--r-- root/root    etc/fonts/conf.avail/20-unhint-small-dejavu-sans-mono.conf.new
--rw-r--r-- root/root    etc/fonts/conf.avail/20-unhint-small-dejavu-sans.conf.new
--rw-r--r-- root/root    etc/fonts/conf.avail/20-unhint-small-dejavu-serif.conf.new
--rw-r--r-- root/root    etc/fonts/conf.avail/57-dejavu-sans-mono.conf.new
--rw-r--r-- root/root    etc/fonts/conf.avail/57-dejavu-sans.conf.new
--rw-r--r-- root/root    etc/fonts/conf.avail/57-dejavu-serif.conf.new
 drwxr-xr-x root/root    etc/fonts/conf.d/
-lrwxrwxrwx root/root    etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf -> ../conf.avail/20-unhint-small-dejavu-sans-mono.conf
-lrwxrwxrwx root/root    etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf -> ../conf.avail/20-unhint-small-dejavu-sans.conf
-lrwxrwxrwx root/root    etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf -> ../conf.avail/20-unhint-small-dejavu-serif.conf
-lrwxrwxrwx root/root    etc/fonts/conf.d/57-dejavu-sans-mono.conf -> ../conf.avail/57-dejavu-sans-mono.conf
-lrwxrwxrwx root/root    etc/fonts/conf.d/57-dejavu-sans.conf -> ../conf.avail/57-dejavu-sans.conf
-lrwxrwxrwx root/root    etc/fonts/conf.d/57-dejavu-serif.conf -> ../conf.avail/57-dejavu-serif.conf
+lrwxrwxrwx root/root    etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf -> ../../../../usr/share/fontconfig/conf.avail/20-unhint-small-dejavu-sans-mono.conf
+lrwxrwxrwx root/root    etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf -> ../../../../usr/share/fontconfig/conf.avail/20-unhint-small-dejavu-sans.conf
+lrwxrwxrwx root/root    etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf -> ../../../../usr/share/fontconfig/conf.avail/20-unhint-small-dejavu-serif.conf
+lrwxrwxrwx root/root    etc/fonts/conf.d/57-dejavu-sans-mono.conf -> ../../../../usr/share/fontconfig/conf.avail/57-dejavu-sans-mono.conf
+lrwxrwxrwx root/root    etc/fonts/conf.d/57-dejavu-sans.conf -> ../../../../usr/share/fontconfig/conf.avail/57-dejavu-sans.conf
+lrwxrwxrwx root/root    etc/fonts/conf.d/57-dejavu-serif.conf -> ../../../../usr/share/fontconfig/conf.avail/57-dejavu-serif.conf
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/fontconfig/
+drwxr-xr-x root/root    usr/share/fontconfig/conf.avail/
+-rw-r--r-- root/root    usr/share/fontconfig/conf.avail/20-unhint-small-dejavu-sans-mono.conf
+-rw-r--r-- root/root    usr/share/fontconfig/conf.avail/20-unhint-small-dejavu-sans.conf
+-rw-r--r-- root/root    usr/share/fontconfig/conf.avail/20-unhint-small-dejavu-serif.conf
+-rw-r--r-- root/root    usr/share/fontconfig/conf.avail/57-dejavu-sans-mono.conf
+-rw-r--r-- root/root    usr/share/fontconfig/conf.avail/57-dejavu-sans.conf
+-rw-r--r-- root/root    usr/share/fontconfig/conf.avail/57-dejavu-serif.conf
 drwxr-xr-x root/root    usr/share/fonts/
 drwxr-xr-x root/root    usr/share/fonts/TTF/
 -rw-r--r-- root/root    usr/share/fonts/TTF/DejaVuMathTeXGyre.ttf
diff --git a/repos/extra/dejavu-fonts-ttf/abuild b/repos/extra/dejavu-fonts-ttf/abuild
new file mode 100644
index 00000000..29996e5d
--- /dev/null
+++ b/repos/extra/dejavu-fonts-ttf/abuild
@@ -0,0 +1,20 @@
+name=dejavu-fonts-ttf
+version=2.37
+release=1
+source="https://downloads.sourceforge.net/dejavu/dejavu/$version/$name-$version.tar.bz2"
+
+build() {
+	install -dm755 $PKG/usr/share/fontconfig/conf.avail
+	install -dm755 $PKG/etc/fonts/conf.d
+	install -dm755 $PKG/usr/share/fonts/TTF
+	
+	cd $SRC/dejavu-fonts-ttf-$version
+	install -m644 ttf/*.ttf $PKG/usr/share/fonts/TTF/
+	install -m644 fontconfig/*.conf $PKG/usr/share/fontconfig/conf.avail/
+	
+	cd $PKG/usr/share/fontconfig/conf.avail
+	for config in *; do
+	  ln -sf ../../../../usr/share/fontconfig/conf.avail/${config} $PKG/etc/fonts/conf.d/${config}
+	done
+	cd -
+}
diff --git a/repos/extra/dejavu-fonts-ttf/build b/repos/extra/dejavu-fonts-ttf/build
deleted file mode 100644
index b4eb92fb..00000000
--- a/repos/extra/dejavu-fonts-ttf/build
+++ /dev/null
@@ -1,13 +0,0 @@
-install -dm755 $PKG/etc/fonts/conf.avail
-install -dm755 $PKG/etc/fonts/conf.d
-install -dm755 $PKG/usr/share/fonts/TTF
-
-cd $SRC/dejavu-fonts-ttf-$version
-install -m644 ttf/*.ttf $PKG/usr/share/fonts/TTF/
-install -m644 fontconfig/*.conf $PKG/etc/fonts/conf.avail/
-
-cd $PKG/etc/fonts/conf.avail
-for config in *; do
-  ln -sf ../conf.avail/${config} ../conf.d/${config}
-done
-cd -
diff --git a/repos/extra/dejavu-fonts-ttf/info b/repos/extra/dejavu-fonts-ttf/info
deleted file mode 100644
index 5ecfb80b..00000000
--- a/repos/extra/dejavu-fonts-ttf/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=dejavu-fonts-ttf
-version=2.37
-release=1
-source="https://downloads.sourceforge.net/dejavu/dejavu/$version/$name-$version.tar.bz2"
diff --git a/repos/extra/dfc/info b/repos/extra/dfc/abuild
index 4729dcb3..4729dcb3 100644
--- a/repos/extra/dfc/info
+++ b/repos/extra/dfc/abuild
diff --git a/repos/extra/dhcpcd/info b/repos/extra/dhcpcd/abuild
index 1a86b6e2..5d1421e6 100644
--- a/repos/extra/dhcpcd/info
+++ b/repos/extra/dhcpcd/abuild
@@ -1,5 +1,5 @@
 name=dhcpcd
-version=10.0.6
+version=10.0.8
 release=1
 source="https://github.com/NetworkConfiguration/$name/releases/download/v$version/$name-$version.tar.xz
 	run"
diff --git a/repos/extra/dosfstools/info b/repos/extra/dosfstools/abuild
index 95c0faa2..95c0faa2 100644
--- a/repos/extra/dosfstools/info
+++ b/repos/extra/dosfstools/abuild
diff --git a/repos/extra/dropbear/info b/repos/extra/dropbear/abuild
index 5ebdadb7..5ebdadb7 100644
--- a/repos/extra/dropbear/info
+++ b/repos/extra/dropbear/abuild
diff --git a/repos/extra/dunst/info b/repos/extra/dunst/abuild
index aaf3afef..07323734 100644
--- a/repos/extra/dunst/info
+++ b/repos/extra/dunst/abuild
@@ -3,4 +3,8 @@ version=1.11.0
 release=1
 source="https://github.com/$name-project/$name/archive/v$version/$name-$version.tar.gz"
 export WAYLAND=1
-export X11=0
+if [ "$(apkg -a ^libx11$)" ]; then
+	export X11=1
+else
+	export X11=0
+fi
diff --git a/repos/extra/e2fsprogs/.files b/repos/extra/e2fsprogs/.files
index 7370fa6f..2c3faabc 100644
--- a/repos/extra/e2fsprogs/.files
+++ b/repos/extra/e2fsprogs/.files
@@ -6,24 +6,24 @@ drwxr-xr-x root/root    sbin/
 -rwxr-xr-x root/root    sbin/blkid
 -rwxr-xr-x root/root    sbin/debugfs
 -rwxr-xr-x root/root    sbin/dumpe2fs -> sbin/e2mmpstatus
--rwxr-xr-x root/root    sbin/e2fsck -> sbin/fsck.ext4
+-rwxr-xr-x root/root    sbin/e2fsck -> sbin/fsck.ext2
 -rwxr-xr-x root/root    sbin/e2image
--rwxr-xr-x root/root    sbin/e2label -> sbin/tune2fs
+-rwxr-xr-x root/root    sbin/e2label
 -rwxr-xr-x root/root    sbin/e2mmpstatus
 -rwxr-xr-x root/root    sbin/e2scrub
 -rwxr-xr-x root/root    sbin/e2scrub_all
 -rwxr-xr-x root/root    sbin/e2undo
--rwxr-xr-x root/root    sbin/findfs -> sbin/tune2fs
--rwxr-xr-x root/root    sbin/fsck.ext2 -> sbin/fsck.ext4
--rwxr-xr-x root/root    sbin/fsck.ext3 -> sbin/fsck.ext4
--rwxr-xr-x root/root    sbin/fsck.ext4
+-rwxr-xr-x root/root    sbin/findfs -> sbin/e2label
+-rwxr-xr-x root/root    sbin/fsck.ext2
+-rwxr-xr-x root/root    sbin/fsck.ext3 -> sbin/fsck.ext2
+-rwxr-xr-x root/root    sbin/fsck.ext4 -> sbin/fsck.ext2
 -rwxr-xr-x root/root    sbin/logsave
--rwxr-xr-x root/root    sbin/mke2fs -> sbin/mkfs.ext3
--rwxr-xr-x root/root    sbin/mkfs.ext2 -> sbin/mkfs.ext3
--rwxr-xr-x root/root    sbin/mkfs.ext3
--rwxr-xr-x root/root    sbin/mkfs.ext4 -> sbin/mkfs.ext3
+-rwxr-xr-x root/root    sbin/mke2fs -> sbin/mkfs.ext2
+-rwxr-xr-x root/root    sbin/mkfs.ext2
+-rwxr-xr-x root/root    sbin/mkfs.ext3 -> sbin/mkfs.ext2
+-rwxr-xr-x root/root    sbin/mkfs.ext4 -> sbin/mkfs.ext2
 -rwxr-xr-x root/root    sbin/resize2fs
--rwxr-xr-x root/root    sbin/tune2fs
+-rwxr-xr-x root/root    sbin/tune2fs -> sbin/e2label
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/chattr
@@ -35,11 +35,11 @@ drwxr-xr-x root/root    usr/include/
 drwxr-xr-x root/root    usr/include/blkid/
 -rw-r--r-- root/root    usr/include/blkid/blkid.h
 -rw-r--r-- root/root    usr/include/blkid/blkid_types.h
--rw-r--r-- root/root    usr/include/com_err.h
+-rw-r--r-- root/root    usr/include/com_err.h -> usr/include/et/com_err.h
 drwxr-xr-x root/root    usr/include/e2p/
 -rw-r--r-- root/root    usr/include/e2p/e2p.h
 drwxr-xr-x root/root    usr/include/et/
--rw-r--r-- root/root    usr/include/et/com_err.h -> usr/include/com_err.h
+-rw-r--r-- root/root    usr/include/et/com_err.h
 drwxr-xr-x root/root    usr/include/ext2fs/
 -rw-r--r-- root/root    usr/include/ext2fs/bitops.h
 -rw-r--r-- root/root    usr/include/ext2fs/ext2_err.h
@@ -84,9 +84,6 @@ drwxr-xr-x root/root    usr/lib/pkgconfig/
 -rw-r--r-- root/root    usr/lib/pkgconfig/ext2fs.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/ss.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/uuid.pc
-drwxr-xr-x root/root    usr/lib/udev/
-drwxr-xr-x root/root    usr/lib/udev/rules.d/
--rw-r--r-- root/root    usr/lib/udev/rules.d/96-e2scrub.rules
 drwxr-xr-x root/root    usr/sbin/
 -rwxr-xr-x root/root    usr/sbin/e2freefrag
 -rwxr-xr-x root/root    usr/sbin/e4crypt
@@ -98,7 +95,6 @@ drwxr-xr-x root/root    usr/share/et/
 -rw-r--r-- root/root    usr/share/et/et_c.awk
 -rw-r--r-- root/root    usr/share/et/et_h.awk
 drwxr-xr-x root/root    usr/share/info/
--rw-r--r-- root/root    usr/share/info/libext2fs.info.gz.gz
 drwxr-xr-x root/root    usr/share/man/
 drwxr-xr-x root/root    usr/share/man/man1/
 -rw-r--r-- root/root    usr/share/man/man1/chattr.1.gz
diff --git a/repos/extra/e2fsprogs/info b/repos/extra/e2fsprogs/abuild
index 6fc17b16..3ca23b76 100644
--- a/repos/extra/e2fsprogs/info
+++ b/repos/extra/e2fsprogs/abuild
@@ -1,5 +1,5 @@
 name=e2fsprogs
-version=1.47.0
+version=1.47.1
 release=1
 source="https://downloads.sourceforge.net/project/$name/$name/v$version/$name-$version.tar.gz"
 build_opt="
@@ -11,3 +11,7 @@ build_opt="
 	--disable-fsck
 	--disable-fuse2fs
 "
+
+prebuild() {
+	sed 's|my_llseek|llseek|g' -i lib/blkid/llseek.c
+}
diff --git a/repos/extra/e2fsprogs/prebuild b/repos/extra/e2fsprogs/prebuild
deleted file mode 100644
index 11d97bad..00000000
--- a/repos/extra/e2fsprogs/prebuild
+++ /dev/null
@@ -1 +0,0 @@
-sed 's|my_llseek|llseek|g' -i lib/blkid/llseek.c
diff --git a/repos/extra/efibootmgr/abuild b/repos/extra/efibootmgr/abuild
new file mode 100644
index 00000000..5a2c96ec
--- /dev/null
+++ b/repos/extra/efibootmgr/abuild
@@ -0,0 +1,12 @@
+name=efibootmgr
+version=18
+release=1
+source="https://github.com/rhboot/efibootmgr/archive/$version/$name-$version.tar.gz"
+export CFLAGS="${CFLAGS} -Wno-error=pointer-sign"
+
+build() {
+	sed -e '/extern int efi_set_verbose/d' -i src/efibootmgr.c
+	EFIDIR=/boot/efi make
+	install -D src/efibootmgr $PKG/usr/sbin/efibootmgr
+	install -D src/efibootmgr.8 $PKG/usr/share/man/man8/efibootmgr.8
+}
diff --git a/repos/extra/efibootmgr/build b/repos/extra/efibootmgr/build
deleted file mode 100644
index e5e94bc7..00000000
--- a/repos/extra/efibootmgr/build
+++ /dev/null
@@ -1,4 +0,0 @@
-sed -e '/extern int efi_set_verbose/d' -i src/efibootmgr.c
-EFIDIR=/boot/efi make
-install -D src/efibootmgr $PKG/usr/sbin/efibootmgr
-install -D src/efibootmgr.8 $PKG/usr/share/man/man8/efibootmgr.8
diff --git a/repos/extra/efibootmgr/info b/repos/extra/efibootmgr/info
deleted file mode 100644
index c3371acd..00000000
--- a/repos/extra/efibootmgr/info
+++ /dev/null
@@ -1,5 +0,0 @@
-name=efibootmgr
-version=18
-release=1
-source="https://github.com/rhboot/efibootmgr/archive/$version/$name-$version.tar.gz"
-export CFLAGS="${CFLAGS} -Wno-error=pointer-sign"
diff --git a/repos/extra/efivar/abuild b/repos/extra/efivar/abuild
new file mode 100644
index 00000000..ce86d171
--- /dev/null
+++ b/repos/extra/efivar/abuild
@@ -0,0 +1,14 @@
+name=efivar
+version=39
+release=1
+source="https://github.com/rhboot/efivar/archive/$version/$name-$version.tar.gz"
+
+prebuild() {
+	sed -i 's/#include <sys\/cdefs.h>//g' "src/compiler.h"
+}
+
+build() {
+	sed 's/docs//' -i Makefile
+	make -j1
+	make libdir=/usr/lib install
+}
diff --git a/repos/extra/efivar/build b/repos/extra/efivar/build
deleted file mode 100644
index 9d8a6f69..00000000
--- a/repos/extra/efivar/build
+++ /dev/null
@@ -1,3 +0,0 @@
-sed 's/docs//' -i Makefile
-make -j1
-make libdir=/usr/lib install
diff --git a/repos/extra/efivar/info b/repos/extra/efivar/info
deleted file mode 100644
index 29903f4d..00000000
--- a/repos/extra/efivar/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=efivar
-version=39
-release=1
-source="https://github.com/rhboot/efivar/archive/$version/$name-$version.tar.gz"
diff --git a/repos/extra/efivar/prebuild b/repos/extra/efivar/prebuild
deleted file mode 100644
index 63016dd4..00000000
--- a/repos/extra/efivar/prebuild
+++ /dev/null
@@ -1 +0,0 @@
-sed -i 's/#include <sys\/cdefs.h>//g' "src/compiler.h"
diff --git a/repos/extra/eiwd/info b/repos/extra/eiwd/abuild
index 75883b76..1845a577 100644
--- a/repos/extra/eiwd/info
+++ b/repos/extra/eiwd/abuild
@@ -7,3 +7,11 @@ source="https://github.com/illiliti/${name}/releases/download/${version}-1/iwd-$
 	main.conf"
 sv="$name.run"
 build_opt="--libexecdir=/usr/bin --disable-dbus"
+
+postbuild() {
+	cp $SRC/iwd_passphrase $PKG/usr/bin
+	chmod 755 $PKG/usr/bin/iwd_passphrase
+	
+	mkdir -p $PKG/etc/iwd
+	cp $SRC/main.conf $PKG/etc/iwd
+}
diff --git a/repos/extra/eiwd/postbuild b/repos/extra/eiwd/postbuild
deleted file mode 100644
index eaa075a2..00000000
--- a/repos/extra/eiwd/postbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-cp $SRC/iwd_passphrase $PKG/usr/bin
-chmod 755 $PKG/usr/bin/iwd_passphrase
-
-mkdir -p $PKG/etc/iwd
-cp $SRC/main.conf $PKG/etc/iwd
diff --git a/repos/extra/elfutils/abuild b/repos/extra/elfutils/abuild
new file mode 100644
index 00000000..99cf367f
--- /dev/null
+++ b/repos/extra/elfutils/abuild
@@ -0,0 +1,30 @@
+name=elfutils
+version=0.191
+release=1
+source="https://sourceware.org/ftp/$name/$version/$name-$version.tar.bz2
+	musl.patch"
+
+build() {
+	# get from KISS
+	# Build sometimes forces -Werror.
+	export CFLAGS="$CFLAGS -Wno-error"
+	
+	sh ./configure \
+	    --prefix=/usr \
+	    --disable-symbol-versioning \
+	    --disable-debuginfod \
+	    --disable-libdebuginfod \
+	    --without-zstd \
+	    ac_cv_c99=yes # Override check for Clang.
+	
+	# Utility functions that need argp and fts, not strictly necessary
+	# for the library to function
+	:>libdwfl/argp-std.c
+	:>libdwfl/linux-kernel-modules.c
+	
+	# Useless stuff
+	printf '%s\n' "all:" "install:" > src/Makefile
+	
+	make
+	make install
+}
diff --git a/repos/extra/elfutils/build b/repos/extra/elfutils/build
deleted file mode 100644
index 96c0419b..00000000
--- a/repos/extra/elfutils/build
+++ /dev/null
@@ -1,22 +0,0 @@
-# get from KISS
-# Build sometimes forces -Werror.
-export CFLAGS="$CFLAGS -Wno-error"
-
-sh ./configure \
-    --prefix=/usr \
-    --disable-symbol-versioning \
-    --disable-debuginfod \
-    --disable-libdebuginfod \
-    --without-zstd \
-    ac_cv_c99=yes # Override check for Clang.
-
-# Utility functions that need argp and fts, not strictly necessary
-# for the library to function
-:>libdwfl/argp-std.c
-:>libdwfl/linux-kernel-modules.c
-
-# Useless stuff
-printf '%s\n' "all:" "install:" > src/Makefile
-
-make
-make install
diff --git a/repos/extra/elfutils/info b/repos/extra/elfutils/info
deleted file mode 100644
index 534c6d5f..00000000
--- a/repos/extra/elfutils/info
+++ /dev/null
@@ -1,5 +0,0 @@
-name=elfutils
-version=0.191
-release=1
-source="https://sourceware.org/ftp/$name/$version/$name-$version.tar.bz2
-	musl.patch"
diff --git a/repos/extra/exfatprogs/info b/repos/extra/exfatprogs/abuild
index 2713d962..77f998b6 100644
--- a/repos/extra/exfatprogs/info
+++ b/repos/extra/exfatprogs/abuild
@@ -1,4 +1,4 @@
 name=exfatprogs
-version=1.2.2
+version=1.2.3
 release=1
 source="https://github.com/$name/$name/releases/download/$version/$name-$version.tar.xz"
diff --git a/repos/extra/expat/info b/repos/extra/expat/abuild
index f988aa37..f988aa37 100644
--- a/repos/extra/expat/info
+++ b/repos/extra/expat/abuild
diff --git a/repos/extra/fcft/info b/repos/extra/fcft/abuild
index 2042b643..2042b643 100644
--- a/repos/extra/fcft/info
+++ b/repos/extra/fcft/abuild
diff --git a/repos/extra/fdk-aac/info b/repos/extra/fdk-aac/abuild
index 8b32c7bc..8b32c7bc 100644
--- a/repos/extra/fdk-aac/info
+++ b/repos/extra/fdk-aac/abuild
diff --git a/repos/extra/fff/info b/repos/extra/fff/abuild
index 410726c4..410726c4 100644
--- a/repos/extra/fff/info
+++ b/repos/extra/fff/abuild
diff --git a/repos/extra/ffmpeg/abuild b/repos/extra/ffmpeg/abuild
new file mode 100644
index 00000000..0f281c73
--- /dev/null
+++ b/repos/extra/ffmpeg/abuild
@@ -0,0 +1,31 @@
+name=ffmpeg
+version=6.1.1
+release=1
+source="https://$name.org/releases/$name-$version.tar.xz
+	ffmpeg-6.0-chromium_method-1.patch
+	fef22c87ada4517441701e6e61e062c9f4399c8e.patch"
+#	ffmpeg-7.0-chromium_method-1.patch"
+
+build() {
+	./configure \
+		--prefix=/usr \
+		--enable-gpl \
+		--enable-version3 \
+		--enable-nonfree \
+		--enable-shared \
+		--disable-debug \
+		--enable-libaom \
+		--enable-libass \
+		--enable-libfdk-aac \
+		--enable-libfreetype \
+		--enable-libmp3lame \
+		--enable-libopus \
+		--enable-libtheora \
+		--enable-libvorbis \
+		--enable-libvpx \
+		--enable-libx264 \
+		--enable-libx265 \
+		--enable-openssl
+	make
+	make install
+}
diff --git a/repos/extra/ffmpeg/build b/repos/extra/ffmpeg/build
deleted file mode 100644
index abdb01a7..00000000
--- a/repos/extra/ffmpeg/build
+++ /dev/null
@@ -1,21 +0,0 @@
-./configure \
-	--prefix=/usr \
-	--enable-gpl \
-	--enable-version3 \
-	--enable-nonfree \
-	--enable-shared \
-	--disable-debug \
-	--enable-libaom \
-	--enable-libass \
-	--enable-libfdk-aac \
-	--enable-libfreetype \
-	--enable-libmp3lame \
-	--enable-libopus \
-	--enable-libtheora \
-	--enable-libvorbis \
-	--enable-libvpx \
-	--enable-libx264 \
-	--enable-libx265 \
-	--enable-openssl
-make
-make install
diff --git a/repos/extra/ffmpeg/fef22c87ada4517441701e6e61e062c9f4399c8e.patch b/repos/extra/ffmpeg/fef22c87ada4517441701e6e61e062c9f4399c8e.patch
new file mode 100644
index 00000000..93b8ac1b
--- /dev/null
+++ b/repos/extra/ffmpeg/fef22c87ada4517441701e6e61e062c9f4399c8e.patch
@@ -0,0 +1,124 @@
+From fef22c87ada4517441701e6e61e062c9f4399c8e Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Jan=20Ekstr=C3=B6m?= <jeebjp@gmail.com>
+Date: Wed, 14 Feb 2024 22:40:54 +0200
+Subject: [PATCH] {avcodec,tests}: rename the bundled Mesa AV1 vulkan video
+ headers
+
+This together with adjusting the inclusion define allows for the
+build to not fail with latest Vulkan-Headers that contain the
+stabilized Vulkan AV1 decoding definitions.
+
+Compilation fails currently as the AV1 header is getting included
+via hwcontext_vulkan.h -> <vulkan/vulkan.h> -> vulkan_core.h, which
+finally includes vk_video/vulkan_video_codec_av1std.h and the decode
+header, leading to the bundled header to never defining anything
+due to the inclusion define being the same.
+
+This fix is imperfect, as it leads to additional re-definition
+warnings for things such as
+VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION. , but it is
+not clear how to otherwise have the bundled version trump the
+actually standardized one for a short-term compilation fix.
+
+(cherry picked from commit e06ce6d2b45edac4a2df04f304e18d4727417d24)
+---
+ libavcodec/Makefile                                           | 4 ++--
+ libavcodec/vulkan_video.h                                     | 4 ++--
+ ...v1std_decode.h => vulkan_video_codec_av1std_decode_mesa.h} | 4 ++--
+ ..._video_codec_av1std.h => vulkan_video_codec_av1std_mesa.h} | 4 ++--
+ tests/ref/fate/source                                         | 4 ++--
+ 5 files changed, 10 insertions(+), 10 deletions(-)
+ rename libavcodec/{vulkan_video_codec_av1std_decode.h => vulkan_video_codec_av1std_decode_mesa.h} (89%)
+ rename libavcodec/{vulkan_video_codec_av1std.h => vulkan_video_codec_av1std_mesa.h} (99%)
+
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile
+index ec57e53e30..eb25707ef5 100644
+--- a/libavcodec/Makefile
++++ b/libavcodec/Makefile
+@@ -1284,7 +1284,7 @@ SKIPHEADERS                            += %_tablegen.h                  \
+                                           aacenc_quantization.h         \
+                                           aacenc_quantization_misc.h    \
+                                           bitstream_template.h          \
+-                                          vulkan_video_codec_av1std.h   \
++                                          vulkan_video_codec_av1std_mesa.h \
+                                           $(ARCH)/vpx_arith.h          \
+ 
+ SKIPHEADERS-$(CONFIG_AMF)              += amfenc.h
+@@ -1306,7 +1306,7 @@ SKIPHEADERS-$(CONFIG_XVMC)             += xvmc.h
+ SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_decode.h vaapi_hevc.h vaapi_encode.h
+ SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
+ SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX)     += videotoolbox.h vt_internal.h
+-SKIPHEADERS-$(CONFIG_VULKAN)           += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode.h
++SKIPHEADERS-$(CONFIG_VULKAN)           += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode_mesa.h
+ SKIPHEADERS-$(CONFIG_V4L2_M2M)         += v4l2_buffers.h v4l2_context.h v4l2_m2m.h
+ SKIPHEADERS-$(CONFIG_ZLIB)             += zlib_wrapper.h
+ 
+diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h
+index b28e3fe0bd..51f44dd543 100644
+--- a/libavcodec/vulkan_video.h
++++ b/libavcodec/vulkan_video.h
+@@ -23,8 +23,8 @@
+ #include "vulkan.h"
+ 
+ #include <vk_video/vulkan_video_codecs_common.h>
+-#include "vulkan_video_codec_av1std.h"
+-#include "vulkan_video_codec_av1std_decode.h"
++#include "vulkan_video_codec_av1std_mesa.h"
++#include "vulkan_video_codec_av1std_decode_mesa.h"
+ 
+ #define CODEC_VER_MAJ(ver) (ver >> 22)
+ #define CODEC_VER_MIN(ver) ((ver >> 12) & ((1 << 10) - 1))
+diff --git a/libavcodec/vulkan_video_codec_av1std_decode.h b/libavcodec/vulkan_video_codec_av1std_decode_mesa.h
+similarity index 89%
+rename from libavcodec/vulkan_video_codec_av1std_decode.h
+rename to libavcodec/vulkan_video_codec_av1std_decode_mesa.h
+index a697c00593..e2f37b4e6e 100644
+--- a/libavcodec/vulkan_video_codec_av1std_decode.h
++++ b/libavcodec/vulkan_video_codec_av1std_decode_mesa.h
+@@ -14,8 +14,8 @@
+  * limitations under the License.
+  */
+ 
+-#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_
+-#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1
++#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_
++#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_ 1
+ 
+ /*
+ ** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
+diff --git a/libavcodec/vulkan_video_codec_av1std.h b/libavcodec/vulkan_video_codec_av1std_mesa.h
+similarity index 99%
+rename from libavcodec/vulkan_video_codec_av1std.h
+rename to libavcodec/vulkan_video_codec_av1std_mesa.h
+index c46236c457..c91589eee2 100644
+--- a/libavcodec/vulkan_video_codec_av1std.h
++++ b/libavcodec/vulkan_video_codec_av1std_mesa.h
+@@ -14,8 +14,8 @@
+  * limitations under the License.
+  */
+ 
+-#ifndef VULKAN_VIDEO_CODEC_AV1STD_H_
+-#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1
++#ifndef VULKAN_VIDEO_CODEC_AV1STD_MESA_H_
++#define VULKAN_VIDEO_CODEC_AV1STD_MESA_H_ 1
+ 
+ /*
+ ** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
+diff --git a/tests/ref/fate/source b/tests/ref/fate/source
+index c575789dd5..8bb58b61f1 100644
+--- a/tests/ref/fate/source
++++ b/tests/ref/fate/source
+@@ -23,8 +23,8 @@ compat/djgpp/math.h
+ compat/float/float.h
+ compat/float/limits.h
+ libavcodec/bitstream_template.h
+-libavcodec/vulkan_video_codec_av1std.h
+-libavcodec/vulkan_video_codec_av1std_decode.h
++libavcodec/vulkan_video_codec_av1std_decode_mesa.h
++libavcodec/vulkan_video_codec_av1std_mesa.h
+ tools/decode_simple.h
+ Use of av_clip() where av_clip_uintp2() could be used:
+ Use of av_clip() where av_clip_intp2() could be used:
+-- 
+2.25.1
+
diff --git a/repos/extra/ffmpeg/ffmpeg-7.0-chromium_method-1.patch b/repos/extra/ffmpeg/ffmpeg-6.0-chromium_method-1.patch
index 9aee44a5..9aee44a5 100644
--- a/repos/extra/ffmpeg/ffmpeg-7.0-chromium_method-1.patch
+++ b/repos/extra/ffmpeg/ffmpeg-6.0-chromium_method-1.patch
diff --git a/repos/extra/ffmpeg/info b/repos/extra/ffmpeg/info
deleted file mode 100644
index 03657c95..00000000
--- a/repos/extra/ffmpeg/info
+++ /dev/null
@@ -1,5 +0,0 @@
-name=ffmpeg
-version=7.0
-release=1
-source="https://$name.org/releases/$name-$version.tar.xz
-	ffmpeg-7.0-chromium_method-1.patch"
diff --git a/repos/extra/firefox/abuild b/repos/extra/firefox/abuild
new file mode 100644
index 00000000..c9474598
--- /dev/null
+++ b/repos/extra/firefox/abuild
@@ -0,0 +1,87 @@
+name=firefox
+version=126.0.1
+release=1
+source="https://ftp.mozilla.org/pub/${name}/releases/${version}/source/${name}-${version}.source.tar.xz
+	fix-target-detection.patch"
+
+build() {
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
+	export MOZBUILD_STATE_PATH=${PWD}/mozbuild
+	
+	cat > .mozconfig << EOF
+	ac_add_options --prefix=/usr
+	ac_add_options --libdir=/usr/lib
+	ac_add_options --enable-strip
+	ac_add_options --enable-release
+	#ac_add_options --enable-rust-simd
+	ac_add_options --enable-audio-backends=alsa
+	ac_add_options --enable-install-strip
+	ac_add_options --enable-official-branding
+	ac_add_options --enable-application=browser
+	ac_add_options --enable-optimize
+	ac_add_options --with-system-ffi
+	ac_add_options --with-system-jpeg
+	ac_add_options --with-system-libvpx
+	ac_add_options --with-system-nspr
+	ac_add_options --with-system-nss
+	ac_add_options --with-system-pixman
+	ac_add_options --with-system-png
+	ac_add_options --with-system-webp
+	ac_add_options --with-system-zlib
+	ac_add_options --without-wasm-sandboxed-libraries
+	ac_add_options --disable-eme
+	#ac_add_options --disable-dbus
+	ac_add_options --disable-tests
+	ac_add_options --disable-vtune
+	ac_add_options --disable-updater
+	ac_add_options --disable-jemalloc
+	ac_add_options --disable-elf-hack
+	ac_add_options --disable-callgrind
+	ac_add_options --disable-profiling
+	ac_add_options --disable-necko-wifi
+	ac_add_options --disable-crashreporter
+	ac_add_options --disable-accessibility
+	ac_add_options --disable-debug
+	ac_add_options --disable-debug-symbols
+	ac_add_options --disable-parental-controls
+	ac_add_options --disable-system-extension-dirs
+	EOF
+	
+	[ -f $SPM_PKGDB/libx11 ] || echo "--enable-default-toolkit=cairo-gtk3-wayland-only" >> .mozconfig
+	
+	if [ -e '/usr/bin/ccache' ]; then
+	        echo 'ac_add_options --enable-ccache' >> .mozconfig
+	        PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')
+	fi
+	
+	export CFLAGS="$CFLAGS -w"
+	export CXXFLAGS="$CXXFLAGS -w"
+	export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/firefox,--enable-new-dtags"
+	
+	./mach build
+	./mach install
+	
+	mkdir -pv $PKG/usr/share/applications
+	mkdir -pv $PKG/usr/share/pixmaps
+	
+	cat > $PKG/usr/share/applications/firefox.desktop << EOF
+	[Desktop Entry]
+	Encoding=UTF-8
+	Name=Firefox Web Browser
+	Comment=Browse the World Wide Web
+	GenericName=Web Browser
+	Exec=firefox %u
+	Terminal=false
+	Type=Application
+	Icon=firefox
+	Categories=GNOME;GTK;Network;WebBrowser;
+	MimeType=text/xml;text/mml;text/html;application/xhtml+xml;application/vnd.mozilla.xul+xml;x-scheme-handler/http;x-scheme-handler/https
+	StartupNotify=true
+	EOF
+	
+	mkdir -p $PKG/usr/share/pixmaps
+	ln -sfv /usr/lib/firefox/browser/chrome/icons/default/default128.png \
+	        $PKG/usr/share/pixmaps/firefox.png
+	
+	rm $PKG/usr/lib/firefox/firefox-bin
+}
diff --git a/repos/extra/firefox/build b/repos/extra/firefox/build
deleted file mode 100644
index fc368bb8..00000000
--- a/repos/extra/firefox/build
+++ /dev/null
@@ -1,82 +0,0 @@
-#pkg-config --exist apulse && _opt=",pulseaudio"
-
-export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
-export MOZBUILD_STATE_PATH=${PWD}/mozbuild
-
-cat > .mozconfig << EOF
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-ac_add_options --enable-default-toolkit=cairo-gtk3-wayland-only
-ac_add_options --enable-strip
-ac_add_options --enable-release
-#ac_add_options --enable-rust-simd
-ac_add_options --enable-audio-backends=alsa$_opt
-ac_add_options --enable-install-strip
-ac_add_options --enable-official-branding
-ac_add_options --enable-application=browser
-ac_add_options --enable-optimize
-ac_add_options --with-system-ffi
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-libvpx
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-pixman
-ac_add_options --with-system-png
-ac_add_options --with-system-webp
-ac_add_options --with-system-zlib
-ac_add_options --without-wasm-sandboxed-libraries
-ac_add_options --disable-eme
-#ac_add_options --disable-dbus
-ac_add_options --disable-tests
-ac_add_options --disable-vtune
-ac_add_options --disable-updater
-ac_add_options --disable-jemalloc
-ac_add_options --disable-elf-hack
-ac_add_options --disable-callgrind
-ac_add_options --disable-profiling
-ac_add_options --disable-necko-wifi
-ac_add_options --disable-crashreporter
-ac_add_options --disable-accessibility
-ac_add_options --disable-debug
-ac_add_options --disable-debug-symbols
-ac_add_options --disable-parental-controls
-ac_add_options --disable-system-extension-dirs
-EOF
-
-if [ -e '/usr/bin/ccache' ]; then
-        echo 'ac_add_options --enable-ccache' >> .mozconfig
-        PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')
-fi
-
-# XXX: failed to build with clang
-#export CC=gcc
-#export CXX=g++
-
-export CFLAGS="$CFLAGS -w"
-export CXXFLAGS="$CXXFLAGS -w"
-export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/firefox,--enable-new-dtags"
-
-./mach build
-./mach install
-
-mkdir -pv $PKG/usr/share/applications
-mkdir -pv $PKG/usr/share/pixmaps
-
-cat > $PKG/usr/share/applications/firefox.desktop << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=Firefox Web Browser
-Comment=Browse the World Wide Web
-GenericName=Web Browser
-Exec=firefox %u
-Terminal=false
-Type=Application
-Icon=firefox
-Categories=GNOME;GTK;Network;WebBrowser;
-MimeType=text/xml;text/mml;text/html;application/xhtml+xml;application/vnd.mozilla.xul+xml;x-scheme-handler/http;x-scheme-handler/https
-StartupNotify=true
-EOF
-
-mkdir -p $PKG/usr/share/pixmaps
-ln -sfv /usr/lib/firefox/browser/chrome/icons/default/default128.png \
-        $PKG/usr/share/pixmaps/firefox.png
diff --git a/repos/extra/firefox/info b/repos/extra/firefox/info
deleted file mode 100644
index 777723d6..00000000
--- a/repos/extra/firefox/info
+++ /dev/null
@@ -1,5 +0,0 @@
-name=firefox
-version=126.0.1
-release=1
-source="https://ftp.mozilla.org/pub/${name}/releases/${version}/source/${name}-${version}.source.tar.xz
-	fix-target-detection.patch"
diff --git a/repos/extra/fontconfig/info b/repos/extra/fontconfig/abuild
index 80c9305e..80c9305e 100644
--- a/repos/extra/fontconfig/info
+++ b/repos/extra/fontconfig/abuild
diff --git a/repos/extra/foot/info b/repos/extra/foot/abuild
index 6cf6d47a..3f6975b8 100644
--- a/repos/extra/foot/info
+++ b/repos/extra/foot/abuild
@@ -2,3 +2,8 @@ name=foot
 version=1.17.2
 release=1
 source="https://codeberg.org/dnkl/${name}/archive/${version}.tar.gz"
+
+postbuild() {
+	rm $PKG/usr/share/terminfo/f/foot
+	rm $PKG/usr/share/terminfo/f/foot-direct
+}
diff --git a/repos/extra/foot/postbuild b/repos/extra/foot/postbuild
deleted file mode 100644
index 2acd127d..00000000
--- a/repos/extra/foot/postbuild
+++ /dev/null
@@ -1,2 +0,0 @@
-rm $PKG/usr/share/terminfo/f/foot
-rm $PKG/usr/share/terminfo/f/foot-direct
diff --git a/repos/extra/freetype/info b/repos/extra/freetype/abuild
index e0b6f39c..e0b6f39c 100644
--- a/repos/extra/freetype/info
+++ b/repos/extra/freetype/abuild
diff --git a/repos/extra/fribidi/info b/repos/extra/fribidi/abuild
index 5351a5dc..5351a5dc 100644
--- a/repos/extra/fribidi/info
+++ b/repos/extra/fribidi/abuild
diff --git a/repos/extra/fuse2/info b/repos/extra/fuse2/abuild
index fee6da5d..d81feba0 100644
--- a/repos/extra/fuse2/info
+++ b/repos/extra/fuse2/abuild
@@ -5,3 +5,11 @@ source="https://github.com/libfuse/libfuse/releases/download/fuse-$version/fuse-
 	fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch"
 build_opt="--enable-lib --enable-util --disable-example"
 export UDEV_RULES_PATH=/usr/lib/udev/rules.d
+
+prebuild() {
+	autoreconf -fiv
+}
+
+postbuild() {
+	rm -rf $PKG/dev $PKG/etc/init.d
+}
diff --git a/repos/extra/fuse2/postbuild b/repos/extra/fuse2/postbuild
deleted file mode 100644
index 685a48db..00000000
--- a/repos/extra/fuse2/postbuild
+++ /dev/null
@@ -1 +0,0 @@
-rm -rf $PKG/dev $PKG/etc/init.d
diff --git a/repos/extra/fuse2/prebuild b/repos/extra/fuse2/prebuild
deleted file mode 100644
index eae4d076..00000000
--- a/repos/extra/fuse2/prebuild
+++ /dev/null
@@ -1 +0,0 @@
-autoreconf -fiv
diff --git a/repos/extra/gdk-pixbuf/info b/repos/extra/gdk-pixbuf/abuild
index d0958d88..d0958d88 100644
--- a/repos/extra/gdk-pixbuf/info
+++ b/repos/extra/gdk-pixbuf/abuild
diff --git a/repos/extra/geany/info b/repos/extra/geany/abuild
index d7a95fda..d7a95fda 100644
--- a/repos/extra/geany/info
+++ b/repos/extra/geany/abuild
diff --git a/repos/extra/gettext-tiny/info b/repos/extra/gettext-tiny/abuild
index 6c5eec89..6c5eec89 100644
--- a/repos/extra/gettext-tiny/info
+++ b/repos/extra/gettext-tiny/abuild
diff --git a/repos/extra/glad/info b/repos/extra/glad/abuild
index f3fdf49d..f3fdf49d 100644
--- a/repos/extra/glad/info
+++ b/repos/extra/glad/abuild
diff --git a/repos/extra/glib/info b/repos/extra/glib/abuild
index e29f3305..e29f3305 100644
--- a/repos/extra/glib/info
+++ b/repos/extra/glib/abuild
diff --git a/repos/extra/glslang/info b/repos/extra/glslang/abuild
index f357e87c..f357e87c 100644
--- a/repos/extra/glslang/info
+++ b/repos/extra/glslang/abuild
diff --git a/repos/extra/gobject-introspection/info b/repos/extra/gobject-introspection/abuild
index d4cd8880..d4cd8880 100644
--- a/repos/extra/gobject-introspection/info
+++ b/repos/extra/gobject-introspection/abuild
diff --git a/repos/extra/gperf/info b/repos/extra/gperf/abuild
index e5577297..e5577297 100644
--- a/repos/extra/gperf/info
+++ b/repos/extra/gperf/abuild
diff --git a/repos/extra/gptfdisk/abuild b/repos/extra/gptfdisk/abuild
new file mode 100644
index 00000000..3d74c086
--- /dev/null
+++ b/repos/extra/gptfdisk/abuild
@@ -0,0 +1,13 @@
+name=gptfdisk
+version=1.0.10
+release=1
+source="https://downloads.sourceforge.net/$name/$name-$version.tar.gz
+	gptfdisk-1.0.9-convenience-1.patch
+	fix-musl.patch"
+
+prebuild() {
+	sed -i 's|ncursesw/||' gptcurses.cc
+	sed -i 's|sbin|usr/sbin|' Makefile
+	sed -i '/UUID_H/s/^.*$/#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)/' guid.cc
+	sed -i "/device =/s/= \(.*\);/= strdup(\1);/" gptcl.cc
+}
diff --git a/repos/extra/gptfdisk/info b/repos/extra/gptfdisk/info
deleted file mode 100644
index 42e7268a..00000000
--- a/repos/extra/gptfdisk/info
+++ /dev/null
@@ -1,6 +0,0 @@
-name=gptfdisk
-version=1.0.10
-release=1
-source="https://downloads.sourceforge.net/$name/$name-$version.tar.gz
-	gptfdisk-1.0.9-convenience-1.patch
-	fix-musl.patch"
diff --git a/repos/extra/gptfdisk/prebuild b/repos/extra/gptfdisk/prebuild
deleted file mode 100644
index 56b033cb..00000000
--- a/repos/extra/gptfdisk/prebuild
+++ /dev/null
@@ -1,4 +0,0 @@
-sed -i 's|ncursesw/||' gptcurses.cc
-sed -i 's|sbin|usr/sbin|' Makefile
-sed -i '/UUID_H/s/^.*$/#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)/' guid.cc
-sed -i "/device =/s/= \(.*\);/= strdup(\1);/" gptcl.cc
diff --git a/repos/extra/graphite2/info b/repos/extra/graphite2/abuild
index 7b7949c2..7b7949c2 100644
--- a/repos/extra/graphite2/info
+++ b/repos/extra/graphite2/abuild
diff --git a/repos/extra/grim/info b/repos/extra/grim/abuild
index 263a7ec0..263a7ec0 100644
--- a/repos/extra/grim/info
+++ b/repos/extra/grim/abuild
diff --git a/repos/extra/grub/.files b/repos/extra/grub/.files
index e9817c43..85c88da6 100644
--- a/repos/extra/grub/.files
+++ b/repos/extra/grub/.files
@@ -1,6 +1,18 @@
 drwxr-xr-x root/root    etc/
+drwxr-xr-x root/root    etc/bash_completion.d/
+-rw-r--r-- root/root    etc/bash_completion.d/grub.new
 drwxr-xr-x root/root    etc/default/
 -rw-r--r-- root/root    etc/default/grub.new
+drwxr-xr-x root/root    etc/grub.d/
+-rwxr-xr-x root/root    etc/grub.d/00_header.new
+-rwxr-xr-x root/root    etc/grub.d/10_linux.new
+-rwxr-xr-x root/root    etc/grub.d/20_linux_xen.new
+-rwxr-xr-x root/root    etc/grub.d/25_bli.new
+-rwxr-xr-x root/root    etc/grub.d/30_os-prober.new
+-rwxr-xr-x root/root    etc/grub.d/30_uefi-firmware.new
+-rwxr-xr-x root/root    etc/grub.d/40_custom.new
+-rwxr-xr-x root/root    etc/grub.d/41_custom.new
+-rw-r--r-- root/root    etc/grub.d/README.new
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/grub-editenv
@@ -21,19 +33,6 @@ drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/grub-render-label
 -rwxr-xr-x root/root    usr/bin/grub-script-check
 -rwxr-xr-x root/root    usr/bin/grub-syslinux2cfg
-drwxr-xr-x root/root    usr/etc/
-drwxr-xr-x root/root    usr/etc/bash_completion.d/
--rw-r--r-- root/root    usr/etc/bash_completion.d/grub
-drwxr-xr-x root/root    usr/etc/grub.d/
--rwxr-xr-x root/root    usr/etc/grub.d/00_header
--rwxr-xr-x root/root    usr/etc/grub.d/10_linux
--rwxr-xr-x root/root    usr/etc/grub.d/20_linux_xen
--rwxr-xr-x root/root    usr/etc/grub.d/25_bli
--rwxr-xr-x root/root    usr/etc/grub.d/30_os-prober
--rwxr-xr-x root/root    usr/etc/grub.d/30_uefi-firmware
--rwxr-xr-x root/root    usr/etc/grub.d/40_custom
--rwxr-xr-x root/root    usr/etc/grub.d/41_custom
--rw-r--r-- root/root    usr/etc/grub.d/README
 drwxr-xr-x root/root    usr/lib/
 drwxr-xr-x root/root    usr/lib/grub/
 drwxr-xr-x root/root    usr/lib/grub/i386-pc/
@@ -1181,12 +1180,7 @@ drwxr-xr-x root/root    usr/share/fonts/
 drwxr-xr-x root/root    usr/share/fonts/unifont/
 -rw-r--r-- root/root    usr/share/fonts/unifont/unifont.pcf
 drwxr-xr-x root/root    usr/share/grub/
--rw-r--r-- root/root    usr/share/grub/ascii.h
--rw-r--r-- root/root    usr/share/grub/ascii.pf2
--rw-r--r-- root/root    usr/share/grub/euro.pf2
 -rw-r--r-- root/root    usr/share/grub/grub-mkconfig_lib
--rw-r--r-- root/root    usr/share/grub/unicode.pf2
--rw-r--r-- root/root    usr/share/grub/widthspec.h
 drwxr-xr-x root/root    usr/share/info/
 -rw-r--r-- root/root    usr/share/info/grub-dev.info.gz
 -rw-r--r-- root/root    usr/share/info/grub.info-1.gz
diff --git a/repos/extra/grub/abuild b/repos/extra/grub/abuild
new file mode 100644
index 00000000..a2c88dc5
--- /dev/null
+++ b/repos/extra/grub/abuild
@@ -0,0 +1,41 @@
+name=grub
+version=2.12
+release=1
+source="https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz
+	https://unifoundry.com/pub/unifont/unifont-15.0.01/font-builds/unifont-15.0.01.pcf.gz::noextract
+	no-asorti.patch
+	grub.default"
+skip_patch=1
+build_dir=$SRC
+unset CFLAGS
+unset CXXFLAGS
+
+build() {
+	mv grub-* grub-pc
+	cp -rp grub-pc grub-efi
+	
+	_build_grub() {
+		cd grub-${1##*=}
+		patch -p1 < $SRC/no-asorti.patch
+		echo depends bli part_gpt > grub-core/extra_deps.lst
+		./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--enable-grub-mount \
+		--enable-grub-mkfont \
+		--disable-werror \
+		$@
+		make
+		make install
+		cd -
+	}
+	
+	_build_grub --with-platform=pc --target=i386
+	_build_grub --with-platform=efi --target=x86_64 --disable-efiemu
+	
+	mkdir -pv $PKG/usr/share/fonts/unifont
+	gunzip -c $SRC/unifont-15.0.01.pcf.gz > $PKG/usr/share/fonts/unifont/unifont.pcf
+	
+	mkdir -p $PKG/etc/default
+	cp $SRC/grub.default $PKG/etc/default/grub
+}
diff --git a/repos/extra/grub/build b/repos/extra/grub/build
deleted file mode 100644
index db19df3a..00000000
--- a/repos/extra/grub/build
+++ /dev/null
@@ -1,27 +0,0 @@
-mv grub-* grub-pc
-cp -rp grub-pc grub-efi
-
-_build_grub() {
-	cd grub-${1##*=}
-	patch -p1 < $SRC/no-asorti.patch
-	echo depends bli part_gpt > grub-core/extra_deps.lst
-	./configure \
-	--prefix=/usr \
-	--sysconfdir=/etc \
-	--enable-grub-mount \
-	--enable-grub-mkfont \
-	--disable-werror \
-	$@
-	make
-	make install
-	cd -
-}
-
-_build_grub --with-platform=pc --target=i386
-_build_grub --with-platform=efi --target=x86_64 --disable-efiemu
-
-mkdir -pv $PKG/usr/share/fonts/unifont
-gunzip -c $SRC/unifont-15.0.01.pcf.gz > $PKG/usr/share/fonts/unifont/unifont.pcf
-
-mkdir -p $PKG/etc/default
-cp $SRC/grub.default $PKG/etc/default/grub
diff --git a/repos/extra/grub/info b/repos/extra/grub/info
deleted file mode 100644
index 09e79711..00000000
--- a/repos/extra/grub/info
+++ /dev/null
@@ -1,11 +0,0 @@
-name=grub
-version=2.12
-release=1
-source="https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz
-	https://unifoundry.com/pub/unifont/unifont-15.0.01/font-builds/unifont-15.0.01.pcf.gz::noextract
-	no-asorti.patch
-	grub.default"
-skip_patch=1
-build_dir=$SRC
-unset CFLAGS
-unset CXXFLAGS
diff --git a/repos/extra/gtk-layer-shell/info b/repos/extra/gtk-layer-shell/abuild
index 81aee42b..81aee42b 100644
--- a/repos/extra/gtk-layer-shell/info
+++ b/repos/extra/gtk-layer-shell/abuild
diff --git a/repos/extra/gtk3/abuild b/repos/extra/gtk3/abuild
new file mode 100644
index 00000000..875a66a2
--- /dev/null
+++ b/repos/extra/gtk3/abuild
@@ -0,0 +1,6 @@
+name=gtk3
+version=3.24.41
+release=1
+source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${version%.*}/gtk+-$version.tar.xz"
+build_opt="-Dwayland_backend=true -Ddemos=false -Dexamples=false -Dtests=false"
+[ -f $SPM_PKGDB/libx11 ] || build_opt="$build_opt -Dx11_backend=false"
diff --git a/repos/extra/gtk3/info b/repos/extra/gtk3/info
deleted file mode 100644
index 43780dd8..00000000
--- a/repos/extra/gtk3/info
+++ /dev/null
@@ -1,5 +0,0 @@
-name=gtk3
-version=3.24.41
-release=1
-source="http://ftp.gnome.org/pub/gnome/sources/gtk+/${version%.*}/gtk+-$version.tar.xz"
-build_opt="-Dx11_backend=false -Dwayland_backend=true -Ddemos=false -Dexamples=false -Dtests=false"
diff --git a/repos/extra/harfbuzz/info b/repos/extra/harfbuzz/abuild
index d8205f33..d8205f33 100644
--- a/repos/extra/harfbuzz/info
+++ b/repos/extra/harfbuzz/abuild
diff --git a/repos/extra/htop/info b/repos/extra/htop/abuild
index 61e5ff94..61e5ff94 100644
--- a/repos/extra/htop/info
+++ b/repos/extra/htop/abuild
diff --git a/repos/extra/hwdata/info b/repos/extra/hwdata/abuild
index a2c91990..ebd1e45c 100644
--- a/repos/extra/hwdata/info
+++ b/repos/extra/hwdata/abuild
@@ -2,3 +2,11 @@ name=hwdata
 version=0.383
 release=1
 source="https://github.com/vcrhonek/${name}/archive/v${version}/${name}-${version}.tar.gz"
+
+build() {
+	./configure \
+	    --prefix=/usr \
+	    --disable-blacklist
+	
+	make install
+}
diff --git a/repos/extra/hwdata/build b/repos/extra/hwdata/build
deleted file mode 100644
index 5e8f240a..00000000
--- a/repos/extra/hwdata/build
+++ /dev/null
@@ -1,5 +0,0 @@
-./configure \
-    --prefix=/usr \
-    --disable-blacklist
-
-make install
diff --git a/repos/extra/icu/info b/repos/extra/icu/abuild
index 3ca5572c..3ca5572c 100644
--- a/repos/extra/icu/info
+++ b/repos/extra/icu/abuild
diff --git a/repos/extra/imv/info b/repos/extra/imv/abuild
index dedcd61c..dedcd61c 100644
--- a/repos/extra/imv/info
+++ b/repos/extra/imv/abuild
diff --git a/repos/extra/inih/info b/repos/extra/inih/abuild
index 14ba8cd2..14ba8cd2 100644
--- a/repos/extra/inih/info
+++ b/repos/extra/inih/abuild
diff --git a/repos/extra/irssi/info b/repos/extra/irssi/abuild
index 905bdd48..905bdd48 100644
--- a/repos/extra/irssi/info
+++ b/repos/extra/irssi/abuild
diff --git a/repos/extra/json-c/info b/repos/extra/json-c/abuild
index 02bfbb28..02bfbb28 100644
--- a/repos/extra/json-c/info
+++ b/repos/extra/json-c/abuild
diff --git a/repos/extra/kirc/info b/repos/extra/kirc/abuild
index 609ff95c..c6633f90 100644
--- a/repos/extra/kirc/info
+++ b/repos/extra/kirc/abuild
@@ -2,3 +2,7 @@ name=kirc
 version=0.3.2
 release=1
 source="https://github.com/mcpcpc/${name}/archive/${version}/${name}-${version}.tar.gz"
+
+build() {
+	make PREFIX=/usr DESTDIR=$PKG install
+}
diff --git a/repos/extra/kirc/build b/repos/extra/kirc/build
deleted file mode 100644
index 75b30ea0..00000000
--- a/repos/extra/kirc/build
+++ /dev/null
@@ -1 +0,0 @@
-make PREFIX=/usr DESTDIR=$PKG install
diff --git a/repos/extra/labwc-menu-generator/info b/repos/extra/labwc-menu-generator/abuild
index a279e611..a279e611 100644
--- a/repos/extra/labwc-menu-generator/info
+++ b/repos/extra/labwc-menu-generator/abuild
diff --git a/repos/extra/labwc/info b/repos/extra/labwc/abuild
index 7f19d86e..7f19d86e 100644
--- a/repos/extra/labwc/info
+++ b/repos/extra/labwc/abuild
diff --git a/repos/extra/lame/info b/repos/extra/lame/abuild
index 166fe0c9..166fe0c9 100644
--- a/repos/extra/lame/info
+++ b/repos/extra/lame/abuild
diff --git a/repos/extra/lcms2/.files b/repos/extra/lcms2/.files
index cc866a7f..1760474d 100644
--- a/repos/extra/lcms2/.files
+++ b/repos/extra/lcms2/.files
@@ -1,23 +1,10 @@
 drwxr-xr-x root/root    usr/
-drwxr-xr-x root/root    usr/bin/
--rwxr-xr-x root/root    usr/bin/jpgicc
--rwxr-xr-x root/root    usr/bin/linkicc
--rwxr-xr-x root/root    usr/bin/psicc
--rwxr-xr-x root/root    usr/bin/tificc
--rwxr-xr-x root/root    usr/bin/transicc
 drwxr-xr-x root/root    usr/include/
 -rw-r--r-- root/root    usr/include/lcms2.h
 -rw-r--r-- root/root    usr/include/lcms2_plugin.h
 drwxr-xr-x root/root    usr/lib/
 lrwxrwxrwx root/root    usr/lib/liblcms2.so -> liblcms2.so.2
-lrwxrwxrwx root/root    usr/lib/liblcms2.so.2 -> liblcms2.so.2.0.15
--rwxr-xr-x root/root    usr/lib/liblcms2.so.2.0.15
+lrwxrwxrwx root/root    usr/lib/liblcms2.so.2 -> liblcms2.so.2.0.16
+-rwxr-xr-x root/root    usr/lib/liblcms2.so.2.0.16
 drwxr-xr-x root/root    usr/lib/pkgconfig/
 -rw-r--r-- root/root    usr/lib/pkgconfig/lcms2.pc
-drwxr-xr-x root/root    usr/share/
-drwxr-xr-x root/root    usr/share/man/
-drwxr-xr-x root/root    usr/share/man/man1/
--rw-r--r-- root/root    usr/share/man/man1/jpgicc.1.gz
--rw-r--r-- root/root    usr/share/man/man1/linkicc.1.gz
--rw-r--r-- root/root    usr/share/man/man1/tificc.1.gz
--rw-r--r-- root/root    usr/share/man/man1/transicc.1.gz
diff --git a/repos/extra/lcms2/info b/repos/extra/lcms2/abuild
index ff394761..ceed594e 100644
--- a/repos/extra/lcms2/info
+++ b/repos/extra/lcms2/abuild
@@ -1,4 +1,4 @@
 name=lcms2
-version=2.15
+version=2.16
 release=1
 source="https://github.com/mm2/Little-CMS/releases/download/$name.${version#*.}/$name-$version.tar.gz"
diff --git a/repos/extra/libaom/info b/repos/extra/libaom/abuild
index 5dd7b200..5dd7b200 100644
--- a/repos/extra/libaom/info
+++ b/repos/extra/libaom/abuild
diff --git a/repos/extra/libarchive/info b/repos/extra/libarchive/abuild
index 02581d36..02581d36 100644
--- a/repos/extra/libarchive/info
+++ b/repos/extra/libarchive/abuild
diff --git a/repos/extra/libass/info b/repos/extra/libass/abuild
index 8990fdf4..8990fdf4 100644
--- a/repos/extra/libass/info
+++ b/repos/extra/libass/abuild
diff --git a/repos/extra/libatasmart/info b/repos/extra/libatasmart/abuild
index 7b24cac9..7b24cac9 100644
--- a/repos/extra/libatasmart/info
+++ b/repos/extra/libatasmart/abuild
diff --git a/repos/extra/libburn/info b/repos/extra/libburn/abuild
index 55ff8564..55ff8564 100644
--- a/repos/extra/libburn/info
+++ b/repos/extra/libburn/abuild
diff --git a/repos/extra/libdeflate/info b/repos/extra/libdeflate/abuild
index 200cad9b..200cad9b 100644
--- a/repos/extra/libdeflate/info
+++ b/repos/extra/libdeflate/abuild
diff --git a/repos/extra/libdisplay-info/info b/repos/extra/libdisplay-info/abuild
index 41b8ee9b..41b8ee9b 100644
--- a/repos/extra/libdisplay-info/info
+++ b/repos/extra/libdisplay-info/abuild
diff --git a/repos/extra/libdrm/info b/repos/extra/libdrm/abuild
index 16d0a6b2..b14b1a0f 100644
--- a/repos/extra/libdrm/info
+++ b/repos/extra/libdrm/abuild
@@ -1,5 +1,5 @@
 name=libdrm
-version=2.4.120
+version=2.4.121
 release=1
 source="https://dri.freedesktop.org/$name/$name-$version.tar.xz"
 build_opt="
diff --git a/repos/extra/libepoxy/info b/repos/extra/libepoxy/abuild
index 5c0431fc..50c16ad4 100644
--- a/repos/extra/libepoxy/info
+++ b/repos/extra/libepoxy/abuild
@@ -2,4 +2,5 @@ name=libepoxy
 version=1.5.10
 release=1
 source="https://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz"
-build_opt="-Dtests=false -Dx11=false"
+build_opt="-Dtests=false"
+[ -f $SPM_PKGDB/libx11 ] || build_opt="$build_opt -Dx11=false"
diff --git a/repos/extra/libevdev/info b/repos/extra/libevdev/abuild
index 729a8d61..1dac370a 100644
--- a/repos/extra/libevdev/info
+++ b/repos/extra/libevdev/abuild
@@ -1,5 +1,5 @@
 name=libevdev
-version=1.13.1
+version=1.13.2
 release=1
 source="https://www.freedesktop.org/software/$name/$name-$version.tar.xz"
 build_opt="-Ddocumentation=disabled -Dtests=disabled"
diff --git a/repos/extra/libevent/info b/repos/extra/libevent/abuild
index 84f2aeef..1c902d6b 100644
--- a/repos/extra/libevent/info
+++ b/repos/extra/libevent/abuild
@@ -2,3 +2,7 @@ name=libevent
 version=2.1.12
 release=1
 source="https://github.com/$name/$name/releases/download/release-$version-stable/$name-$version-stable.tar.gz"
+
+prebuild() {
+	sed -i 's/python/&3/' event_rpcgen.py
+}
diff --git a/repos/extra/libevent/prebuild b/repos/extra/libevent/prebuild
deleted file mode 100644
index 0c90b225..00000000
--- a/repos/extra/libevent/prebuild
+++ /dev/null
@@ -1 +0,0 @@
-sed -i 's/python/&3/' event_rpcgen.py
diff --git a/repos/extra/libffi/info b/repos/extra/libffi/abuild
index c60837b0..c60837b0 100644
--- a/repos/extra/libffi/info
+++ b/repos/extra/libffi/abuild
diff --git a/repos/extra/libglvnd/info b/repos/extra/libglvnd/abuild
index 9de073e3..9de073e3 100644
--- a/repos/extra/libglvnd/info
+++ b/repos/extra/libglvnd/abuild
diff --git a/repos/extra/libinput/info b/repos/extra/libinput/abuild
index 10cf5326..10cf5326 100644
--- a/repos/extra/libinput/info
+++ b/repos/extra/libinput/abuild
diff --git a/repos/extra/libisoburn/info b/repos/extra/libisoburn/abuild
index b00f43cf..b00f43cf 100644
--- a/repos/extra/libisoburn/info
+++ b/repos/extra/libisoburn/abuild
diff --git a/repos/extra/libisofs/info b/repos/extra/libisofs/abuild
index 508579ae..508579ae 100644
--- a/repos/extra/libisofs/info
+++ b/repos/extra/libisofs/abuild
diff --git a/repos/extra/libjpeg-turbo/info b/repos/extra/libjpeg-turbo/abuild
index a6b556c5..a6b556c5 100644
--- a/repos/extra/libjpeg-turbo/info
+++ b/repos/extra/libjpeg-turbo/abuild
diff --git a/repos/extra/libnl-tiny/info b/repos/extra/libnl-tiny/abuild
index 9b2f50f6..9b2f50f6 100644
--- a/repos/extra/libnl-tiny/info
+++ b/repos/extra/libnl-tiny/abuild
diff --git a/repos/extra/libnotify/info b/repos/extra/libnotify/abuild
index af827b2c..af827b2c 100644
--- a/repos/extra/libnotify/info
+++ b/repos/extra/libnotify/abuild
diff --git a/repos/extra/libogg/info b/repos/extra/libogg/abuild
index 3769d4e0..3769d4e0 100644
--- a/repos/extra/libogg/info
+++ b/repos/extra/libogg/abuild
diff --git a/repos/extra/libpciaccess/info b/repos/extra/libpciaccess/abuild
index ca54c155..ca54c155 100644
--- a/repos/extra/libpciaccess/info
+++ b/repos/extra/libpciaccess/abuild
diff --git a/repos/extra/libplacebo/info b/repos/extra/libplacebo/abuild
index 2c15cc23..2c15cc23 100644
--- a/repos/extra/libplacebo/info
+++ b/repos/extra/libplacebo/abuild
diff --git a/repos/extra/libpng/info b/repos/extra/libpng/abuild
index a0b993a3..a0b993a3 100644
--- a/repos/extra/libpng/info
+++ b/repos/extra/libpng/abuild
diff --git a/repos/extra/libtheora/info b/repos/extra/libtheora/abuild
index cb21f270..42f9f482 100644
--- a/repos/extra/libtheora/info
+++ b/repos/extra/libtheora/abuild
@@ -2,3 +2,7 @@ name=libtheora
 version=1.1.1
 release=1
 source="https://downloads.xiph.org/releases/theora/$name-$version.tar.xz"
+
+prebuild() {
+	sed -i 's/png_\(sizeof\)/\1/g' examples/png2theora.c
+}
diff --git a/repos/extra/libtheora/prebuild b/repos/extra/libtheora/prebuild
deleted file mode 100644
index f2db4d46..00000000
--- a/repos/extra/libtheora/prebuild
+++ /dev/null
@@ -1 +0,0 @@
-sed -i 's/png_\(sizeof\)/\1/g' examples/png2theora.c
diff --git a/repos/extra/libtool/abuild b/repos/extra/libtool/abuild
new file mode 100644
index 00000000..7a3b92fc
--- /dev/null
+++ b/repos/extra/libtool/abuild
@@ -0,0 +1,9 @@
+name=libtool
+version=2.4.7
+release=1
+source="https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz"
+
+postbuild() {
+	sed 's|/usr/bin/sed|/bin/sed|g' -i $PKG/usr/bin/libtoolize
+	sed 's|/usr/bin/grep|/bin/grep|g' -i $PKG/usr/bin/libtoolize
+}
diff --git a/repos/extra/libtool/info b/repos/extra/libtool/info
deleted file mode 100644
index 2dce61b4..00000000
--- a/repos/extra/libtool/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=libtool
-version=2.4.7
-release=1
-source="https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz"
diff --git a/repos/extra/libtool/postbuild b/repos/extra/libtool/postbuild
deleted file mode 100644
index be454a04..00000000
--- a/repos/extra/libtool/postbuild
+++ /dev/null
@@ -1,2 +0,0 @@
-sed 's|/usr/bin/sed|/bin/sed|g' -i $PKG/usr/bin/libtoolize
-sed 's|/usr/bin/grep|/bin/grep|g' -i $PKG/usr/bin/libtoolize
diff --git a/repos/extra/libudev-zero/abuild b/repos/extra/libudev-zero/abuild
new file mode 100644
index 00000000..afd07af0
--- /dev/null
+++ b/repos/extra/libudev-zero/abuild
@@ -0,0 +1,11 @@
+name=libudev-zero
+version=1.0.3
+release=1
+source="https://github.com/illiliti/${name}/archive/${version}/${name}-${version}.tar.gz"
+
+postbuild() {
+	mkdir -p $PKG/usr/bin
+	
+	"${CC:-gcc}" -static $LDFLAGS $CFLAGS $CPPFLAGS \
+	    -o "$PKG/usr/bin/libudev-zero-helper" contrib/helper.c
+}
diff --git a/repos/extra/libudev-zero/info b/repos/extra/libudev-zero/info
deleted file mode 100644
index 5d1a9372..00000000
--- a/repos/extra/libudev-zero/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=libudev-zero
-version=1.0.3
-release=1
-source="https://github.com/illiliti/${name}/archive/${version}/${name}-${version}.tar.gz"
diff --git a/repos/extra/libudev-zero/postbuild b/repos/extra/libudev-zero/postbuild
deleted file mode 100755
index 57515730..00000000
--- a/repos/extra/libudev-zero/postbuild
+++ /dev/null
@@ -1,4 +0,0 @@
-mkdir -p $PKG/usr/bin
-
-"${CC:-gcc}" -static $LDFLAGS $CFLAGS $CPPFLAGS \
-    -o "$PKG/usr/bin/libudev-zero-helper" contrib/helper.c
diff --git a/repos/extra/libuv/info b/repos/extra/libuv/abuild
index 42653577..786f4f0e 100644
--- a/repos/extra/libuv/info
+++ b/repos/extra/libuv/abuild
@@ -2,3 +2,7 @@ name=libuv
 version=1.48.0
 release=1
 source="https://dist.$name.org/dist/v$version/$name-v$version.tar.gz"
+
+prebuild() {
+	./autogen.sh
+}
diff --git a/repos/extra/libuv/prebuild b/repos/extra/libuv/prebuild
deleted file mode 100644
index 4185faf7..00000000
--- a/repos/extra/libuv/prebuild
+++ /dev/null
@@ -1 +0,0 @@
-./autogen.sh
diff --git a/repos/extra/libva/info b/repos/extra/libva/abuild
index 2eaa4584..2eaa4584 100644
--- a/repos/extra/libva/info
+++ b/repos/extra/libva/abuild
diff --git a/repos/extra/libvorbis/info b/repos/extra/libvorbis/abuild
index eea50a88..eea50a88 100644
--- a/repos/extra/libvorbis/info
+++ b/repos/extra/libvorbis/abuild
diff --git a/repos/extra/libvpx/.files b/repos/extra/libvpx/.files
index 01ec63c8..154d1b0f 100644
--- a/repos/extra/libvpx/.files
+++ b/repos/extra/libvpx/.files
@@ -16,9 +16,9 @@ drwxr-xr-x root/root    usr/include/vpx/
 -rw-rw-r-- root/root    usr/include/vpx/vpx_integer.h
 -rw-rw-r-- root/root    usr/include/vpx/vpx_tpl.h
 drwxr-xr-x root/root    usr/lib/
-lrwxrwxrwx root/root    usr/lib/libvpx.so -> libvpx.so.9.0.0
-lrwxrwxrwx root/root    usr/lib/libvpx.so.9 -> libvpx.so.9.0.0
-lrwxrwxrwx root/root    usr/lib/libvpx.so.9.0 -> libvpx.so.9.0.0
--rwxr-xr-x root/root    usr/lib/libvpx.so.9.0.0
+lrwxrwxrwx root/root    usr/lib/libvpx.so -> libvpx.so.9.0.1
+lrwxrwxrwx root/root    usr/lib/libvpx.so.9 -> libvpx.so.9.0.1
+lrwxrwxrwx root/root    usr/lib/libvpx.so.9.0 -> libvpx.so.9.0.1
+-rwxr-xr-x root/root    usr/lib/libvpx.so.9.0.1
 drwxr-xr-x root/root    usr/lib/pkgconfig/
 -rw-r--r-- root/root    usr/lib/pkgconfig/vpx.pc
diff --git a/repos/extra/libvpx/abuild b/repos/extra/libvpx/abuild
new file mode 100644
index 00000000..30d8e1fd
--- /dev/null
+++ b/repos/extra/libvpx/abuild
@@ -0,0 +1,17 @@
+name=libvpx
+version=1.14.1
+release=1
+source="https://github.com/webmproject/$name/archive/v$version/$name-$version.tar.gz"
+
+build() {
+	# Remove the perl requirement from configure.
+	# Also fix issue with non-GNU diff.
+	sed 's/perl/:/g;s/diff --version/command -v diff/' -i configure
+	
+	mkdir libvpx-build
+	cd    libvpx-build
+	
+	../configure --prefix=/usr --enable-shared
+	make
+	make install
+}
diff --git a/repos/extra/libvpx/build b/repos/extra/libvpx/build
deleted file mode 100644
index 3c112b73..00000000
--- a/repos/extra/libvpx/build
+++ /dev/null
@@ -1,10 +0,0 @@
-# Remove the perl requirement from configure.
-# Also fix issue with non-GNU diff.
-sed 's/perl/:/g;s/diff --version/command -v diff/' -i configure
-
-mkdir libvpx-build
-cd    libvpx-build
-
-../configure --prefix=/usr --enable-shared
-make
-make install
diff --git a/repos/extra/libvpx/info b/repos/extra/libvpx/info
deleted file mode 100644
index 18c3fa0e..00000000
--- a/repos/extra/libvpx/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=libvpx
-version=1.14.0
-release=1
-source="https://github.com/webmproject/$name/archive/v$version/$name-$version.tar.gz"
diff --git a/repos/extra/libwebp/info b/repos/extra/libwebp/abuild
index 0dbdfc7f..0dbdfc7f 100644
--- a/repos/extra/libwebp/info
+++ b/repos/extra/libwebp/abuild
diff --git a/repos/extra/libxkbcommon/.files b/repos/extra/libxkbcommon/.files
index 750fcd53..ea50099c 100644
--- a/repos/extra/libxkbcommon/.files
+++ b/repos/extra/libxkbcommon/.files
@@ -7,9 +7,13 @@ drwxr-xr-x root/root    usr/include/xkbcommon/
 -rw-r--r-- root/root    usr/include/xkbcommon/xkbcommon-compose.h
 -rw-r--r-- root/root    usr/include/xkbcommon/xkbcommon-keysyms.h
 -rw-r--r-- root/root    usr/include/xkbcommon/xkbcommon-names.h
+-rw-r--r-- root/root    usr/include/xkbcommon/xkbcommon-x11.h
 -rw-r--r-- root/root    usr/include/xkbcommon/xkbcommon.h
 -rw-r--r-- root/root    usr/include/xkbcommon/xkbregistry.h
 drwxr-xr-x root/root    usr/lib/
+lrwxrwxrwx root/root    usr/lib/libxkbcommon-x11.so -> libxkbcommon-x11.so.0
+lrwxrwxrwx root/root    usr/lib/libxkbcommon-x11.so.0 -> libxkbcommon-x11.so.0.0.0
+-rwxr-xr-x root/root    usr/lib/libxkbcommon-x11.so.0.0.0
 lrwxrwxrwx root/root    usr/lib/libxkbcommon.so -> libxkbcommon.so.0
 lrwxrwxrwx root/root    usr/lib/libxkbcommon.so.0 -> libxkbcommon.so.0.0.0
 -rwxr-xr-x root/root    usr/lib/libxkbcommon.so.0.0.0
@@ -17,6 +21,7 @@ lrwxrwxrwx root/root    usr/lib/libxkbregistry.so -> libxkbregistry.so.0
 lrwxrwxrwx root/root    usr/lib/libxkbregistry.so.0 -> libxkbregistry.so.0.0.0
 -rwxr-xr-x root/root    usr/lib/libxkbregistry.so.0.0.0
 drwxr-xr-x root/root    usr/lib/pkgconfig/
+-rw-r--r-- root/root    usr/lib/pkgconfig/xkbcommon-x11.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/xkbcommon.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/xkbregistry.pc
 drwxr-xr-x root/root    usr/libexec/
@@ -26,6 +31,7 @@ drwxr-xr-x root/root    usr/libexec/xkbcommon/
 -rwxr-xr-x root/root    usr/libexec/xkbcommon/xkbcli-how-to-type
 -rwxr-xr-x root/root    usr/libexec/xkbcommon/xkbcli-interactive-evdev
 -rwxr-xr-x root/root    usr/libexec/xkbcommon/xkbcli-interactive-wayland
+-rwxr-xr-x root/root    usr/libexec/xkbcommon/xkbcli-interactive-x11
 -rwxr-xr-x root/root    usr/libexec/xkbcommon/xkbcli-list
 drwxr-xr-x root/root    usr/share/
 drwxr-xr-x root/root    usr/share/bash-completion/
@@ -38,5 +44,6 @@ drwxr-xr-x root/root    usr/share/man/man1/
 -rw-r--r-- root/root    usr/share/man/man1/xkbcli-how-to-type.1.gz
 -rw-r--r-- root/root    usr/share/man/man1/xkbcli-interactive-evdev.1.gz
 -rw-r--r-- root/root    usr/share/man/man1/xkbcli-interactive-wayland.1.gz
+-rw-r--r-- root/root    usr/share/man/man1/xkbcli-interactive-x11.1.gz
 -rw-r--r-- root/root    usr/share/man/man1/xkbcli-list.1.gz
 -rw-r--r-- root/root    usr/share/man/man1/xkbcli.1.gz
diff --git a/repos/extra/libxkbcommon/abuild b/repos/extra/libxkbcommon/abuild
new file mode 100644
index 00000000..fab93e33
--- /dev/null
+++ b/repos/extra/libxkbcommon/abuild
@@ -0,0 +1,6 @@
+name=libxkbcommon
+version=1.7.0
+release=1
+source="https://xkbcommon.org/download/$name-$version.tar.xz"
+build_opt="-Denable-docs=false -Denable-wayland=true"
+[ -f $SPM_PKGDB/libx11 ] || build_opt="$build_opt -Denable-x11=false"
diff --git a/repos/extra/libxkbcommon/info b/repos/extra/libxkbcommon/info
deleted file mode 100644
index f99a3021..00000000
--- a/repos/extra/libxkbcommon/info
+++ /dev/null
@@ -1,5 +0,0 @@
-name=libxkbcommon
-version=1.7.0
-release=1
-source="https://xkbcommon.org/download/$name-$version.tar.xz"
-build_opt="-Denable-docs=false -Denable-x11=false -Denable-wayland=true"
diff --git a/repos/extra/libxml2/.files b/repos/extra/libxml2/.files
index 48c382b6..e8b0d0e1 100644
--- a/repos/extra/libxml2/.files
+++ b/repos/extra/libxml2/.files
@@ -56,21 +56,21 @@ drwxr-xr-x root/root    usr/lib/
 drwxr-xr-x root/root    usr/lib/cmake/
 drwxr-xr-x root/root    usr/lib/cmake/libxml2/
 -rw-r--r-- root/root    usr/lib/cmake/libxml2/libxml2-config.cmake
-lrwxrwxrwx root/root    usr/lib/libxml2.so -> libxml2.so.2.12.6
-lrwxrwxrwx root/root    usr/lib/libxml2.so.2 -> libxml2.so.2.12.6
--rwxr-xr-x root/root    usr/lib/libxml2.so.2.12.6
+lrwxrwxrwx root/root    usr/lib/libxml2.so -> libxml2.so.2.12.7
+lrwxrwxrwx root/root    usr/lib/libxml2.so.2 -> libxml2.so.2.12.7
+-rwxr-xr-x root/root    usr/lib/libxml2.so.2.12.7
 drwxr-xr-x root/root    usr/lib/pkgconfig/
 -rw-r--r-- root/root    usr/lib/pkgconfig/libxml-2.0.pc
-drwxr-xr-x root/root    usr/lib/python3.11/
-drwxr-xr-x root/root    usr/lib/python3.11/site-packages/
-drwxr-xr-x root/root    usr/lib/python3.11/site-packages/__pycache__/
--rw-r--r-- root/root    usr/lib/python3.11/site-packages/__pycache__/drv_libxml2.cpython-311.opt-1.pyc
--rw-r--r-- root/root    usr/lib/python3.11/site-packages/__pycache__/drv_libxml2.cpython-311.pyc
--rw-r--r-- root/root    usr/lib/python3.11/site-packages/__pycache__/libxml2.cpython-311.opt-1.pyc
--rw-r--r-- root/root    usr/lib/python3.11/site-packages/__pycache__/libxml2.cpython-311.pyc
--rw-r--r-- root/root    usr/lib/python3.11/site-packages/drv_libxml2.py
--rw-r--r-- root/root    usr/lib/python3.11/site-packages/libxml2.py
--rwxr-xr-x root/root    usr/lib/python3.11/site-packages/libxml2mod.so
+drwxr-xr-x root/root    usr/lib/python3.12/
+drwxr-xr-x root/root    usr/lib/python3.12/site-packages/
+drwxr-xr-x root/root    usr/lib/python3.12/site-packages/__pycache__/
+-rw-r--r-- root/root    usr/lib/python3.12/site-packages/__pycache__/drv_libxml2.cpython-312.opt-1.pyc
+-rw-r--r-- root/root    usr/lib/python3.12/site-packages/__pycache__/drv_libxml2.cpython-312.pyc
+-rw-r--r-- root/root    usr/lib/python3.12/site-packages/__pycache__/libxml2.cpython-312.opt-1.pyc
+-rw-r--r-- root/root    usr/lib/python3.12/site-packages/__pycache__/libxml2.cpython-312.pyc
+-rw-r--r-- root/root    usr/lib/python3.12/site-packages/drv_libxml2.py
+-rw-r--r-- root/root    usr/lib/python3.12/site-packages/libxml2.py
+-rwxr-xr-x root/root    usr/lib/python3.12/site-packages/libxml2mod.so
 drwxr-xr-x root/root    usr/share/
 drwxr-xr-x root/root    usr/share/aclocal/
 -rw-r--r-- root/root    usr/share/aclocal/libxml.m4
diff --git a/repos/extra/libxml2/info b/repos/extra/libxml2/abuild
index 3744d268..a91c39a1 100644
--- a/repos/extra/libxml2/info
+++ b/repos/extra/libxml2/abuild
@@ -1,5 +1,5 @@
 name=libxml2
-version=2.12.6
+version=2.12.7
 release=1
 source="https://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz"
 build_opt="--with-history PYTHON=/usr/bin/python3 --with-icu"
diff --git a/repos/extra/linux-firmware-nvidia/info b/repos/extra/linux-firmware-nvidia/abuild
index 417a9d21..1a25ea73 100644
--- a/repos/extra/linux-firmware-nvidia/info
+++ b/repos/extra/linux-firmware-nvidia/abuild
@@ -2,3 +2,10 @@ name=linux-firmware-nvidia
 version=20240410
 release=1
 source="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-$version.tar.gz"
+
+build() {
+	make FIRMWAREDIR=/lib/firmware_tmp install-xz
+	mkdir -p $PKG/lib/firmware
+	mv $PKG/lib/firmware_tmp/nvidia $PKG/lib/firmware
+	rm -rf $PKG/lib/firmware_tmp
+}
diff --git a/repos/extra/linux-firmware-nvidia/build b/repos/extra/linux-firmware-nvidia/build
deleted file mode 100644
index 0ed2052f..00000000
--- a/repos/extra/linux-firmware-nvidia/build
+++ /dev/null
@@ -1,4 +0,0 @@
-make FIRMWAREDIR=/lib/firmware_tmp install-xz
-mkdir -p $PKG/lib/firmware
-mv $PKG/lib/firmware_tmp/nvidia $PKG/lib/firmware
-rm -rf $PKG/lib/firmware_tmp
diff --git a/repos/extra/linux-firmware/abuild b/repos/extra/linux-firmware/abuild
new file mode 100644
index 00000000..afe3c380
--- /dev/null
+++ b/repos/extra/linux-firmware/abuild
@@ -0,0 +1,12 @@
+name=linux-firmware
+version=20240513
+release=1
+source="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/$name.git/snapshot/$name-$version.tar.gz"
+
+build() {
+	make FIRMWAREDIR=/lib/firmware install-xz
+	# make separate port for them
+	for i in amd* radeon brcm cypress nvidia qcom netronome mellanox mrvl; do
+	        rm -rf $PKG/lib/firmware/$i
+	done
+}
diff --git a/repos/extra/linux-firmware/build b/repos/extra/linux-firmware/build
deleted file mode 100644
index 3bb664af..00000000
--- a/repos/extra/linux-firmware/build
+++ /dev/null
@@ -1,5 +0,0 @@
-make FIRMWAREDIR=/lib/firmware install-xz
-# make separate port for them
-for i in amd* radeon brcm cypress nvidia qcom netronome mellanox mrvl; do
-        rm -rf $PKG/lib/firmware/$i
-done
diff --git a/repos/extra/linux-firmware/info b/repos/extra/linux-firmware/info
deleted file mode 100644
index 4fe545ae..00000000
--- a/repos/extra/linux-firmware/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=linux-firmware
-version=20240513
-release=1
-source="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/$name.git/snapshot/$name-$version.tar.gz"
diff --git a/repos/extra/linux/abuild b/repos/extra/linux/abuild
new file mode 100644
index 00000000..c0b329b3
--- /dev/null
+++ b/repos/extra/linux/abuild
@@ -0,0 +1,79 @@
+name=linux
+version=6.6.31
+release=2
+source="https://cdn.kernel.org/pub/$name/kernel/v6.x/$name-$version.tar.xz
+	dotconfig"
+
+build() {
+	make mrproper
+	
+	cp $SRC/dotconfig .config
+	
+	sed '/^CONFIG_LOGO=/d' -i .config
+	echo '# CONFIG_LOGO is not set' >> .config
+	sed '/^CONFIG_LOGO_LINUX_CLUT224=/d' -i .config
+	echo '# CONFIG_LOGO_LINUX_CLUT224 is not set' >> .config
+	sed '/^CONFIG_LOCALVERSION=/d' -i .config
+	echo 'CONFIG_LOCALVERSION="-Alice"' >> .config
+	sed '/^CONFIG_IKHEADERS=/d' -i .config
+	echo '# CONFIG_IKHEADERS is not set' >> .config
+	sed '/^CONFIG_DEFAULT_HOSTNAME=/d' -i .config
+	echo 'CONFIG_DEFAULT_HOSTNAME="alice"' >> .config
+	sed '/^# CONFIG_MODULE_COMPRESS_XZ/d' -i .config
+	echo 'CONFIG_MODULE_COMPRESS_XZ=y' >> .config
+	sed '/^# CONFIG_EROFS_FS/d' -i .config
+	echo 'CONFIG_EROFS_FS=y' >> .config
+	
+	make olddefconfig
+	
+	kernver=${version}$(grep CONFIG_LOCALVERSION= .config | cut -d '"' -f2)
+	
+	#make menuconfig
+	
+	make bzImage modules
+	make INSTALL_MOD_PATH=$PKG INSTALL_MOD_STRIP=1 modules_install
+	
+	mkdir -p $PKG/boot
+	
+	cp arch/x86/boot/bzImage $PKG/boot/vmlinuz-linux
+	
+	make clean
+	make prepare
+	
+	rm -rf $PKG/lib/firmware
+	
+	for file in $(ls arch); do
+		case $file in
+			x86|Kconfig) continue ;;
+			*) rm -fr arch/$file ;;
+		esac
+	done
+	
+	# strip down sources
+	# don't package the kernel in the sources directory
+	find . -name "*Image" -exec rm "{}" \;
+	find . -name "*.cmd" -exec rm -f "{}" \; 
+	rm -f .*.d
+	
+	rm -fr firmware ipc .config.old .version .cocciconfig \
+		.get_maintainer.ignore .gitattributes .gitignore .mailmap \
+		COPYING CREDITS MAINTAINERS README Documentation
+	find . -name ".gitignore" -exec rm "{}" \;
+	for dir in block certs crypto drivers fs init kernel lib mm net samples security sound usr virt; do
+		find $dir -type f \( -name "*.c" -o -name "*.h" \) -exec rm "{}" \;
+	done
+	for i in $(ls tools); do
+		[ "$i" = "objtool" ] || rm -fr tools/$i
+	done
+	for i in $(ls tools/objtool); do
+		[ "$i" = "objtool" ] || rm -fr tools/objtool/$i
+	done
+	
+	rm $PKG/lib/modules/$kernver/build \
+	   $PKG/lib/modules/$kernver/source || true
+	mv $SRC/linux-${version%.0} $PKG/lib/modules/$kernver/build
+	ln -sv build $PKG/lib/modules/$kernver/source
+	
+	# remove now broken symlinks
+	find -L $PKG/lib/modules/$kernver/build -type l -exec rm -f "{}" \;
+}
diff --git a/repos/extra/linux/build b/repos/extra/linux/build
deleted file mode 100644
index 6260ba36..00000000
--- a/repos/extra/linux/build
+++ /dev/null
@@ -1,71 +0,0 @@
-make mrproper
-
-cp $SRC/dotconfig .config
-
-sed '/^CONFIG_LOGO=/d' -i .config
-echo '# CONFIG_LOGO is not set' >> .config
-sed '/^CONFIG_LOGO_LINUX_CLUT224=/d' -i .config
-echo '# CONFIG_LOGO_LINUX_CLUT224 is not set' >> .config
-sed '/^CONFIG_LOCALVERSION=/d' -i .config
-echo 'CONFIG_LOCALVERSION="-Alice"' >> .config
-sed '/^CONFIG_IKHEADERS=/d' -i .config
-echo '# CONFIG_IKHEADERS is not set' >> .config
-sed '/^CONFIG_DEFAULT_HOSTNAME=/d' -i .config
-echo 'CONFIG_DEFAULT_HOSTNAME="alice"' >> .config
-sed '/^# CONFIG_MODULE_COMPRESS_XZ/d' -i .config
-echo 'CONFIG_MODULE_COMPRESS_XZ=y' >> .config
-sed '/^# CONFIG_EROFS_FS/d' -i .config
-echo 'CONFIG_EROFS_FS=y' >> .config
-
-make olddefconfig
-
-kernver=${version}$(grep CONFIG_LOCALVERSION= .config | cut -d '"' -f2)
-
-#make menuconfig
-
-make bzImage modules
-make INSTALL_MOD_PATH=$PKG INSTALL_MOD_STRIP=1 modules_install
-
-mkdir -p $PKG/boot
-
-cp arch/x86/boot/bzImage $PKG/boot/vmlinuz-linux
-
-make clean
-make prepare
-
-rm -rf $PKG/lib/firmware
-
-for file in $(ls arch); do
-	case $file in
-		x86|Kconfig) continue ;;
-		*) rm -fr arch/$file ;;
-	esac
-done
-
-# strip down sources
-# don't package the kernel in the sources directory
-find . -name "*Image" -exec rm "{}" \;
-find . -name "*.cmd" -exec rm -f "{}" \; 
-rm -f .*.d
-
-rm -fr firmware ipc .config.old .version .cocciconfig \
-	.get_maintainer.ignore .gitattributes .gitignore .mailmap \
-	COPYING CREDITS MAINTAINERS README Documentation
-find . -name ".gitignore" -exec rm "{}" \;
-for dir in block certs crypto drivers fs init kernel lib mm net samples security sound usr virt; do
-	find $dir -type f \( -name "*.c" -o -name "*.h" \) -exec rm "{}" \;
-done
-for i in $(ls tools); do
-	[ "$i" = "objtool" ] || rm -fr tools/$i
-done
-for i in $(ls tools/objtool); do
-	[ "$i" = "objtool" ] || rm -fr tools/objtool/$i
-done
-
-rm $PKG/lib/modules/$kernver/build \
-   $PKG/lib/modules/$kernver/source || true
-mv $SRC/linux-${version%.0} $PKG/lib/modules/$kernver/build
-ln -sv build $PKG/lib/modules/$kernver/source
-
-# remove now broken symlinks
-find -L $PKG/lib/modules/$kernver/build -type l -exec rm -f "{}" \;
diff --git a/repos/extra/linux/info b/repos/extra/linux/info
deleted file mode 100644
index 0d9263e2..00000000
--- a/repos/extra/linux/info
+++ /dev/null
@@ -1,5 +0,0 @@
-name=linux
-version=6.6.31
-release=2
-source="https://cdn.kernel.org/pub/$name/kernel/v6.x/$name-$version.tar.xz
-	dotconfig"
diff --git a/repos/extra/llvm/info b/repos/extra/llvm/abuild
index 67a859fb..7d05c308 100644
--- a/repos/extra/llvm/info
+++ b/repos/extra/llvm/abuild
@@ -21,3 +21,12 @@ build_opt="
 "
 keep_static=1
 build_type="cmake_build"
+
+prebuild() {
+	mv ../cmake-${version}.src .
+	sed "/LLVM_COMMON_CMAKE_UTILS/s@../cmake@cmake-${version}.src@" -i CMakeLists.txt
+}
+
+postbuild() {
+	cp */bin/FileCheck $PKG/usr/bin
+}
diff --git a/repos/extra/llvm/postbuild b/repos/extra/llvm/postbuild
deleted file mode 100644
index d2d2f007..00000000
--- a/repos/extra/llvm/postbuild
+++ /dev/null
@@ -1 +0,0 @@
-cp */bin/FileCheck $PKG/usr/bin
diff --git a/repos/extra/llvm/prebuild b/repos/extra/llvm/prebuild
deleted file mode 100644
index 79f1d68f..00000000
--- a/repos/extra/llvm/prebuild
+++ /dev/null
@@ -1,2 +0,0 @@
-mv ../cmake-${version}.src .
-sed "/LLVM_COMMON_CMAKE_UTILS/s@../cmake@cmake-${version}.src@" -i CMakeLists.txt
diff --git a/repos/extra/lm-sensors/info b/repos/extra/lm-sensors/abuild
index 2d8c04ea..2d8c04ea 100644
--- a/repos/extra/lm-sensors/info
+++ b/repos/extra/lm-sensors/abuild
diff --git a/repos/extra/lzo/info b/repos/extra/lzo/abuild
index 89767653..89767653 100644
--- a/repos/extra/lzo/info
+++ b/repos/extra/lzo/abuild
diff --git a/repos/extra/mako/info b/repos/extra/mako/abuild
index 0680d67c..0680d67c 100644
--- a/repos/extra/mako/info
+++ b/repos/extra/mako/abuild
diff --git a/repos/extra/mandoc/.files b/repos/extra/mandoc/.files
index ebbc49a9..5aa7217c 100644
--- a/repos/extra/mandoc/.files
+++ b/repos/extra/mandoc/.files
@@ -1,31 +1,30 @@
 drwxr-xr-x root/root    usr/
-drwxr-xr-x root/root    usr/local/
-drwxr-xr-x root/root    usr/local/bin/
--r-xr-xr-x root/root    usr/local/bin/apropos -> usr/local/sbin/makewhatis
--r-xr-xr-x root/root    usr/local/bin/demandoc
--r-xr-xr-x root/root    usr/local/bin/man -> usr/local/sbin/makewhatis
--r-xr-xr-x root/root    usr/local/bin/mandoc -> usr/local/sbin/makewhatis
--r-xr-xr-x root/root    usr/local/bin/soelim
--r-xr-xr-x root/root    usr/local/bin/whatis -> usr/local/sbin/makewhatis
-drwxr-xr-x root/root    usr/local/man/
-drwxr-xr-x root/root    usr/local/man/man1/
--r--r--r-- root/root    usr/local/man/man1/apropos.1 -> usr/local/man/man1/whatis.1
--r--r--r-- root/root    usr/local/man/man1/demandoc.1
--r--r--r-- root/root    usr/local/man/man1/man.1
--r--r--r-- root/root    usr/local/man/man1/mandoc.1
--r--r--r-- root/root    usr/local/man/man1/soelim.1
--r--r--r-- root/root    usr/local/man/man1/whatis.1
-drwxr-xr-x root/root    usr/local/man/man5/
--r--r--r-- root/root    usr/local/man/man5/man.conf.5
--r--r--r-- root/root    usr/local/man/man5/mandoc.db.5
-drwxr-xr-x root/root    usr/local/man/man7/
--r--r--r-- root/root    usr/local/man/man7/eqn.7
--r--r--r-- root/root    usr/local/man/man7/man.7
--r--r--r-- root/root    usr/local/man/man7/mandoc_char.7
--r--r--r-- root/root    usr/local/man/man7/mdoc.7
--r--r--r-- root/root    usr/local/man/man7/roff.7
--r--r--r-- root/root    usr/local/man/man7/tbl.7
-drwxr-xr-x root/root    usr/local/man/man8/
--r--r--r-- root/root    usr/local/man/man8/makewhatis.8
-drwxr-xr-x root/root    usr/local/sbin/
--r-xr-xr-x root/root    usr/local/sbin/makewhatis
+drwxr-xr-x root/root    usr/bin/
+lrwxrwxrwx root/root    usr/bin/apropos -> mandoc
+-r-xr-xr-x root/root    usr/bin/demandoc
+lrwxrwxrwx root/root    usr/bin/makewhatis -> ../bin/mandoc
+lrwxrwxrwx root/root    usr/bin/man -> mandoc
+-r-xr-xr-x root/root    usr/bin/mandoc
+-r-xr-xr-x root/root    usr/bin/soelim
+lrwxrwxrwx root/root    usr/bin/whatis -> mandoc
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/man/
+drwxr-xr-x root/root    usr/share/man/man1/
+-r--r--r-- root/root    usr/share/man/man1/apropos.1.gz
+-r--r--r-- root/root    usr/share/man/man1/demandoc.1.gz
+-r--r--r-- root/root    usr/share/man/man1/man.1.gz
+-r--r--r-- root/root    usr/share/man/man1/mandoc.1.gz
+-r--r--r-- root/root    usr/share/man/man1/soelim.1.gz
+lrwxrwxrwx root/root    usr/share/man/man1/whatis.1.gz -> apropos.1.gz
+drwxr-xr-x root/root    usr/share/man/man5/
+-r--r--r-- root/root    usr/share/man/man5/man.conf.5.gz
+-r--r--r-- root/root    usr/share/man/man5/mandoc.db.5.gz
+drwxr-xr-x root/root    usr/share/man/man7/
+-r--r--r-- root/root    usr/share/man/man7/eqn.7.gz
+-r--r--r-- root/root    usr/share/man/man7/man.7.gz
+-r--r--r-- root/root    usr/share/man/man7/mandoc_char.7.gz
+-r--r--r-- root/root    usr/share/man/man7/mdoc.7.gz
+-r--r--r-- root/root    usr/share/man/man7/roff.7.gz
+-r--r--r-- root/root    usr/share/man/man7/tbl.7.gz
+drwxr-xr-x root/root    usr/share/man/man8/
+-r--r--r-- root/root    usr/share/man/man8/makewhatis.8.gz
diff --git a/repos/extra/mandoc/abuild b/repos/extra/mandoc/abuild
new file mode 100644
index 00000000..3351c0c1
--- /dev/null
+++ b/repos/extra/mandoc/abuild
@@ -0,0 +1,14 @@
+name=mandoc
+version=1.14.6
+release=1
+source="https://${name}.bsd.lv/snapshots/${name}-${version}.tar.gz"
+
+prebuild() {
+cat > configure.local <<EOF
+PREFIX=/usr
+MANDIR=/usr/share/man
+LIBDIR=/usr/lib
+SBINDIR=/usr/bin
+LN="ln -sf"
+EOF
+}
diff --git a/repos/extra/mandoc/info b/repos/extra/mandoc/info
deleted file mode 100644
index 1708dc93..00000000
--- a/repos/extra/mandoc/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=mandoc
-version=1.14.6
-release=1
-source="https://${name}.bsd.lv/snapshots/${name}-${version}.tar.gz"
diff --git a/repos/extra/mandoc/prebuild b/repos/extra/mandoc/prebuild
deleted file mode 100644
index 1eedee04..00000000
--- a/repos/extra/mandoc/prebuild
+++ /dev/null
@@ -1,7 +0,0 @@
-cat > configure.local <<EOF
-PREFIX=/usr
-MANDIR=/usr/share/man
-LIBDIR=/usr/lib
-SBINDIR=/usr/bin
-LN="ln -sf"
-EOF
diff --git a/repos/extra/mc/.files b/repos/extra/mc/.files
new file mode 100644
index 00000000..da36058f
--- /dev/null
+++ b/repos/extra/mc/.files
@@ -0,0 +1,242 @@
+drwxr-xr-x root/root    etc/
+drwxr-xr-x root/root    etc/mc/
+-rwxr-xr-x root/root    etc/mc/edit.indent.rc.new
+-rw-r--r-- root/root    etc/mc/filehighlight.ini.new
+-rw-r--r-- root/root    etc/mc/mc.default.keymap.new
+-rw-r--r-- root/root    etc/mc/mc.emacs.keymap.new
+-rw-r--r-- root/root    etc/mc/mc.ext.ini.new
+lrwxrwxrwx root/root    etc/mc/mc.keymap -> mc.default.keymap
+-rw-r--r-- root/root    etc/mc/mc.menu.new
+-rw-r--r-- root/root    etc/mc/mcedit.menu.new
+-rw-r--r-- root/root    etc/mc/sfs.ini.new
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/bin/
+-rwxr-xr-x root/root    usr/bin/mc
+lrwxrwxrwx root/root    usr/bin/mcdiff -> mc
+lrwxrwxrwx root/root    usr/bin/mcedit -> mc
+lrwxrwxrwx root/root    usr/bin/mcview -> mc
+drwxr-xr-x root/root    usr/libexec/
+drwxr-xr-x root/root    usr/libexec/mc/
+-rwxr-xr-x root/root    usr/libexec/mc/cons.saver
+drwxr-xr-x root/root    usr/libexec/mc/ext.d/
+-rwxr-xr-x root/root    usr/libexec/mc/ext.d/archive.sh
+-rwxr-xr-x root/root    usr/libexec/mc/ext.d/doc.sh
+-rwxr-xr-x root/root    usr/libexec/mc/ext.d/image.sh
+-rwxr-xr-x root/root    usr/libexec/mc/ext.d/misc.sh
+-rwxr-xr-x root/root    usr/libexec/mc/ext.d/package.sh
+-rwxr-xr-x root/root    usr/libexec/mc/ext.d/sound.sh
+-rwxr-xr-x root/root    usr/libexec/mc/ext.d/text.sh
+-rwxr-xr-x root/root    usr/libexec/mc/ext.d/video.sh
+-rwxr-xr-x root/root    usr/libexec/mc/ext.d/web.sh
+drwxr-xr-x root/root    usr/libexec/mc/extfs.d/
+-rw-r--r-- root/root    usr/libexec/mc/extfs.d/README
+-rw-r--r-- root/root    usr/libexec/mc/extfs.d/README.extfs
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/a+
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/apt+
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/audio
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/bpp
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/changesetfs
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/deb
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/deba
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/debd
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/dpkg+
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/gitfs+
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/hp48+
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/iso9660
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/lslR
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/mailfs
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/patchfs
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/patchsetfs
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/rpm
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/rpms+
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/s3+
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/trpm
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/u7z
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/uace
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/ualz
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/uar
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/uarc
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/uarj
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/uc1541
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/ucab
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/uha
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/ulha
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/ulib
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/unar
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/urar
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/uwim
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/uzip
+-rwxr-xr-x root/root    usr/libexec/mc/extfs.d/uzoo
+-rwxr-xr-x root/root    usr/libexec/mc/mc-wrapper.csh
+-rwxr-xr-x root/root    usr/libexec/mc/mc-wrapper.sh
+-rwxr-xr-x root/root    usr/libexec/mc/mc.csh
+-rwxr-xr-x root/root    usr/libexec/mc/mc.sh
+drwxr-xr-x root/root    usr/libexec/mc/shell/
+-rw-r--r-- root/root    usr/libexec/mc/shell/README.shell
+-rw-r--r-- root/root    usr/libexec/mc/shell/append
+-rw-r--r-- root/root    usr/libexec/mc/shell/chmod
+-rw-r--r-- root/root    usr/libexec/mc/shell/chown
+-rw-r--r-- root/root    usr/libexec/mc/shell/fexists
+-rw-r--r-- root/root    usr/libexec/mc/shell/get
+-rw-r--r-- root/root    usr/libexec/mc/shell/hardlink
+-rw-r--r-- root/root    usr/libexec/mc/shell/info
+-rw-r--r-- root/root    usr/libexec/mc/shell/ln
+-rw-r--r-- root/root    usr/libexec/mc/shell/ls
+-rw-r--r-- root/root    usr/libexec/mc/shell/mkdir
+-rw-r--r-- root/root    usr/libexec/mc/shell/mv
+-rw-r--r-- root/root    usr/libexec/mc/shell/rmdir
+-rw-r--r-- root/root    usr/libexec/mc/shell/send
+-rw-r--r-- root/root    usr/libexec/mc/shell/unlink
+-rw-r--r-- root/root    usr/libexec/mc/shell/utime
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/man/
+drwxr-xr-x root/root    usr/share/man/man1/
+-rw-r--r-- root/root    usr/share/man/man1/mc.1.gz
+-rw-r--r-- root/root    usr/share/man/man1/mcedit.1.gz
+-rw-r--r-- root/root    usr/share/man/man1/mcview.1.gz
+drwxr-xr-x root/root    usr/share/mc/
+drwxr-xr-x root/root    usr/share/mc/examples/
+drwxr-xr-x root/root    usr/share/mc/examples/macros.d/
+-rw-r--r-- root/root    usr/share/mc/examples/macros.d/macro.0.sh
+-rw-r--r-- root/root    usr/share/mc/examples/macros.d/macro.1.sh
+-rw-r--r-- root/root    usr/share/mc/examples/macros.d/macro.3.sh
+-rw-r--r-- root/root    usr/share/mc/examples/macros.d/macro.4.sh
+-rw-r--r-- root/root    usr/share/mc/examples/macros.d/macro.5.sh
+-rw-r--r-- root/root    usr/share/mc/examples/macros.d/macro.6.sh
+-rw-r--r-- root/root    usr/share/mc/examples/macros.d/macro.7.sh
+drwxr-xr-x root/root    usr/share/mc/help/
+-rw-r--r-- root/root    usr/share/mc/help/mc.hlp
+drwxr-xr-x root/root    usr/share/mc/hints/
+-rw-r--r-- root/root    usr/share/mc/hints/mc.hint
+-rw-r--r-- root/root    usr/share/mc/mc.charsets
+-rw-r--r-- root/root    usr/share/mc/mc.lib
+drwxr-xr-x root/root    usr/share/mc/skins/
+-rw-r--r-- root/root    usr/share/mc/skins/dark.ini
+-rw-r--r-- root/root    usr/share/mc/skins/darkfar.ini
+-rw-r--r-- root/root    usr/share/mc/skins/default.ini
+-rw-r--r-- root/root    usr/share/mc/skins/double-lines.ini
+-rw-r--r-- root/root    usr/share/mc/skins/featured-plus.ini
+-rw-r--r-- root/root    usr/share/mc/skins/featured.ini
+-rw-r--r-- root/root    usr/share/mc/skins/gotar.ini
+-rw-r--r-- root/root    usr/share/mc/skins/gray-green-purple256.ini
+-rw-r--r-- root/root    usr/share/mc/skins/gray-orange-blue256.ini
+-rw-r--r-- root/root    usr/share/mc/skins/julia256.ini
+-rw-r--r-- root/root    usr/share/mc/skins/mc46.ini
+-rw-r--r-- root/root    usr/share/mc/skins/modarcon16-defbg.ini
+-rw-r--r-- root/root    usr/share/mc/skins/modarcon16.ini
+-rw-r--r-- root/root    usr/share/mc/skins/modarcon16root-defbg.ini
+-rw-r--r-- root/root    usr/share/mc/skins/modarcon16root.ini
+-rw-r--r-- root/root    usr/share/mc/skins/modarin256-defbg.ini
+-rw-r--r-- root/root    usr/share/mc/skins/modarin256.ini
+-rw-r--r-- root/root    usr/share/mc/skins/modarin256root-defbg.ini
+-rw-r--r-- root/root    usr/share/mc/skins/modarin256root.ini
+-rw-r--r-- root/root    usr/share/mc/skins/nicedark.ini
+-rw-r--r-- root/root    usr/share/mc/skins/sand256.ini
+-rw-r--r-- root/root    usr/share/mc/skins/seasons-autumn16M.ini
+-rw-r--r-- root/root    usr/share/mc/skins/seasons-spring16M.ini
+-rw-r--r-- root/root    usr/share/mc/skins/seasons-summer16M.ini
+-rw-r--r-- root/root    usr/share/mc/skins/seasons-winter16M.ini
+-rw-r--r-- root/root    usr/share/mc/skins/xoria256.ini
+-rw-r--r-- root/root    usr/share/mc/skins/yadt256-defbg.ini
+-rw-r--r-- root/root    usr/share/mc/skins/yadt256.ini
+drwxr-xr-x root/root    usr/share/mc/syntax/
+-rw-r--r-- root/root    usr/share/mc/syntax/PKGBUILD.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/Syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/ada95.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/as.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/aspx.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/assembler.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/awk.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/b.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/c.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/cabal.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/changelog.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/cmake.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/cobol.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/cs.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/css.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/cuda.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/cxx.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/cython.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/d.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/debian-changelog.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/debian-control.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/debian-description.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/debian-sources-list.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/diff.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/dlink.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/dos.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/dot.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/ebuild.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/eiffel.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/erlang.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/f90.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/filehighlight.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/fortran.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/glsl.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/go.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/haskell.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/hive.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/html.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/idl.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/ini.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/j.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/jal.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/java.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/js.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/json.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/kotlin.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/latex.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/lisp.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/lkr.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/lsm.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/lua.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/m4.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/mail.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/makefile.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/markdown.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/meson.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/ml.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/named.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/nemerle.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/nroff.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/octave.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/opencl.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/osl.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/pascal.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/perl.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/php.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/po.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/povray.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/privoxy.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/procmail.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/properties.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/protobuf.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/puppet.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/python.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/r.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/ruby.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/rust.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/sh.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/slang.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/smalltalk.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/spec.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/spice.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/sql.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/strace.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/swift.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/swig.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/syntax.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/tcl.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/texinfo.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/toml.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/ts.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/tt.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/unknown.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/verilog.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/vhdl.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/xml.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/yabasic.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/yaml.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/yum-repo.syntax
+-rw-r--r-- root/root    usr/share/mc/syntax/yxx.syntax
diff --git a/repos/extra/mc/abuild b/repos/extra/mc/abuild
new file mode 100644
index 00000000..44c1003a
--- /dev/null
+++ b/repos/extra/mc/abuild
@@ -0,0 +1,4 @@
+name=mc
+version=4.8.31
+release=1
+source="http://ftp.midnight-commander.org/${name}-${version}.tar.xz"
diff --git a/repos/extra/mc/depends b/repos/extra/mc/depends
new file mode 100644
index 00000000..c9d95e65
--- /dev/null
+++ b/repos/extra/mc/depends
@@ -0,0 +1,2 @@
+glib
+slang
diff --git a/repos/extra/mesa/info b/repos/extra/mesa/abuild
index a28751ad..a28751ad 100644
--- a/repos/extra/mesa/info
+++ b/repos/extra/mesa/abuild
diff --git a/repos/extra/meson/info b/repos/extra/meson/abuild
index 09453bb3..09453bb3 100644
--- a/repos/extra/meson/info
+++ b/repos/extra/meson/abuild
diff --git a/repos/extra/mpv/info b/repos/extra/mpv/abuild
index 79ae2760..b8f4bdf3 100644
--- a/repos/extra/mpv/info
+++ b/repos/extra/mpv/abuild
@@ -2,4 +2,5 @@ name=mpv
 version=0.38.0
 release=1
 source="https://github.com/${name}-player/${name}/archive/v${version}/${name}-${version}.tar.gz"
-build_opt="-Dx11=disabled -Dwayland=enabled"
+build_opt="-Dwayland=enabled"
+[ -f $SPM_PKGDB/libx11 ] && build_opt="$build_opt -Dx11=enabled"
diff --git a/repos/extra/mtdev/info b/repos/extra/mtdev/abuild
index 777f650f..777f650f 100644
--- a/repos/extra/mtdev/info
+++ b/repos/extra/mtdev/abuild
diff --git a/repos/extra/mtools/info b/repos/extra/mtools/abuild
index 11605d56..92ea993e 100644
--- a/repos/extra/mtools/info
+++ b/repos/extra/mtools/abuild
@@ -1,5 +1,5 @@
 name=mtools
-version=4.0.43
+version=4.0.44
 release=1
 source="http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz"
 build_opt="--disable-floppyd"
diff --git a/repos/extra/nasm/info b/repos/extra/nasm/abuild
index 72a3c91c..72a3c91c 100644
--- a/repos/extra/nasm/info
+++ b/repos/extra/nasm/abuild
diff --git a/repos/extra/ncdu/info b/repos/extra/ncdu/abuild
index f2bd1a7b..f2bd1a7b 100644
--- a/repos/extra/ncdu/info
+++ b/repos/extra/ncdu/abuild
diff --git a/repos/extra/ncurses/abuild b/repos/extra/ncurses/abuild
new file mode 100644
index 00000000..ee431684
--- /dev/null
+++ b/repos/extra/ncurses/abuild
@@ -0,0 +1,32 @@
+name=ncurses
+version=6.5
+release=1
+source="https://invisible-mirror.net/archives/$name/$name-$version.tar.gz"
+build_opt="--without-debug
+	--with-shared
+	--without-normal
+	--with-cxx-shared
+	--enable-pc-files
+	--enable-widec
+	--with-pkg-config-libdir=/usr/lib/pkgconfig"
+
+postbuild() {
+	# Create libtinfo symlinks.
+	ln -sf $PKG/usr/lib/libncursesw.so \
+	       $PKG/usr/lib/libtinfo.so
+	ln -sf $PKG/lib/libncursesw.so.${version} \
+	       $PKG/usr/lib/libtinfo.so.${version}
+	ln -sf $PKG/usr/lib/libtinfo.so.${version} \
+	       $PKG/usr/lib/libtinfo.so.6
+	ln -sf $PKG/usr/lib/pkgconfig/ncursesw.pc \
+	       $PKG/usr/lib/pkgconfig/tinfo.pc
+	for lib in ncurses form panel menu ; do
+	    rm -vf                    $PKG/usr/lib/lib${lib}.so
+	    echo "INPUT(-l${lib}w)" > $PKG/usr/lib/lib${lib}.so
+	    ln -sfv ${lib}w.pc        $PKG/usr/lib/pkgconfig/${lib}.pc
+	done
+	
+	rm -vf                     $PKG/usr/lib/libcursesw.so
+	echo "INPUT(-lncursesw)" > $PKG/usr/lib/libcursesw.so
+	ln -sfv libncurses.so      $PKG/usr/lib/libcurses.so
+}
diff --git a/repos/extra/ncurses/info b/repos/extra/ncurses/info
deleted file mode 100644
index ea8dc47d..00000000
--- a/repos/extra/ncurses/info
+++ /dev/null
@@ -1,11 +0,0 @@
-name=ncurses
-version=6.5
-release=1
-source="https://invisible-mirror.net/archives/$name/$name-$version.tar.gz"
-build_opt="--without-debug
-	--with-shared
-	--without-normal
-	--with-cxx-shared
-	--enable-pc-files
-	--enable-widec
-	--with-pkg-config-libdir=/usr/lib/pkgconfig"
diff --git a/repos/extra/ncurses/postbuild b/repos/extra/ncurses/postbuild
deleted file mode 100644
index 069b8d5f..00000000
--- a/repos/extra/ncurses/postbuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Create libtinfo symlinks.
-ln -sf $PKG/usr/lib/libncursesw.so \
-       $PKG/usr/lib/libtinfo.so
-ln -sf $PKG/lib/libncursesw.so.${version} \
-       $PKG/usr/lib/libtinfo.so.${version}
-ln -sf $PKG/usr/lib/libtinfo.so.${version} \
-       $PKG/usr/lib/libtinfo.so.6
-ln -sf $PKG/usr/lib/pkgconfig/ncursesw.pc \
-       $PKG/usr/lib/pkgconfig/tinfo.pc
-for lib in ncurses form panel menu ; do
-    rm -vf                    $PKG/usr/lib/lib${lib}.so
-    echo "INPUT(-l${lib}w)" > $PKG/usr/lib/lib${lib}.so
-    ln -sfv ${lib}w.pc        $PKG/usr/lib/pkgconfig/${lib}.pc
-done
-
-rm -vf                     $PKG/usr/lib/libcursesw.so
-echo "INPUT(-lncursesw)" > $PKG/usr/lib/libcursesw.so
-ln -sfv libncurses.so      $PKG/usr/lib/libcurses.so
diff --git a/repos/extra/neofetch/info b/repos/extra/neofetch/abuild
index 7e829489..7e829489 100644
--- a/repos/extra/neofetch/info
+++ b/repos/extra/neofetch/abuild
diff --git a/repos/extra/nettle/info b/repos/extra/nettle/abuild
index 2e6397bb..2e6397bb 100644
--- a/repos/extra/nettle/info
+++ b/repos/extra/nettle/abuild
diff --git a/repos/extra/nghttp2/info b/repos/extra/nghttp2/abuild
index db2bb7ca..db2bb7ca 100644
--- a/repos/extra/nghttp2/info
+++ b/repos/extra/nghttp2/abuild
diff --git a/repos/extra/ninja/abuild b/repos/extra/ninja/abuild
new file mode 100644
index 00000000..bd38c3b8
--- /dev/null
+++ b/repos/extra/ninja/abuild
@@ -0,0 +1,16 @@
+name=ninja
+version=1.12.1
+release=1
+source="https://github.com/$name-build/$name/archive/v$version/$name-$version.tar.gz"
+
+build() {
+	sed -i '/int Guess/a \
+	  int   j = 0;\
+	  char* jobs = getenv( "NINJAJOBS" );\
+	  if ( jobs != NULL ) j = atoi( jobs );\
+	  if ( j > 0 ) return j;\
+	' src/ninja.cc
+	
+	python3 ./configure.py --bootstrap
+	install -Dm755 ninja $PKG/usr/bin/ninja
+}
diff --git a/repos/extra/ninja/build b/repos/extra/ninja/build
deleted file mode 100644
index 0eba37e0..00000000
--- a/repos/extra/ninja/build
+++ /dev/null
@@ -1,9 +0,0 @@
-sed -i '/int Guess/a \
-  int   j = 0;\
-  char* jobs = getenv( "NINJAJOBS" );\
-  if ( jobs != NULL ) j = atoi( jobs );\
-  if ( j > 0 ) return j;\
-' src/ninja.cc
-
-python3 ./configure.py --bootstrap
-install -Dm755 ninja $PKG/usr/bin/ninja
diff --git a/repos/extra/ninja/info b/repos/extra/ninja/info
deleted file mode 100644
index 0122bc57..00000000
--- a/repos/extra/ninja/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=ninja
-version=1.12.1
-release=1
-source="https://github.com/$name-build/$name/archive/v$version/$name-$version.tar.gz"
diff --git a/repos/extra/nodejs/abuild b/repos/extra/nodejs/abuild
new file mode 100644
index 00000000..0b1f2126
--- /dev/null
+++ b/repos/extra/nodejs/abuild
@@ -0,0 +1,16 @@
+name=nodejs
+version=22.2.0
+release=1
+source="https://$name.org/dist/v$version/node-v$version.tar.xz"
+
+build() {
+	./configure --prefix=/usr          \
+	            --shared-cares         \
+	            --shared-libuv         \
+	            --shared-openssl       \
+	            --shared-nghttp2       \
+	            --shared-zlib          \
+	            --with-intl=system-icu
+	make
+	make install
+}
diff --git a/repos/extra/nodejs/build b/repos/extra/nodejs/build
deleted file mode 100644
index 6003b70e..00000000
--- a/repos/extra/nodejs/build
+++ /dev/null
@@ -1,9 +0,0 @@
-./configure --prefix=/usr          \
-            --shared-cares         \
-            --shared-libuv         \
-            --shared-openssl       \
-            --shared-nghttp2       \
-            --shared-zlib          \
-            --with-intl=system-icu
-make
-make install
diff --git a/repos/extra/nodejs/info b/repos/extra/nodejs/info
deleted file mode 100644
index c3419631..00000000
--- a/repos/extra/nodejs/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=nodejs
-version=22.2.0
-release=1
-source="https://$name.org/dist/v$version/node-v$version.tar.xz"
diff --git a/repos/extra/nspr/abuild b/repos/extra/nspr/abuild
new file mode 100644
index 00000000..33408718
--- /dev/null
+++ b/repos/extra/nspr/abuild
@@ -0,0 +1,17 @@
+name=nspr
+version=4.35
+release=1
+source="https://archive.mozilla.org/pub/$name/releases/v$version/src/$name-$version.tar.gz"
+
+build() {
+	cd nspr
+	sed -ri '/^RELEASE/s/^/#/' pr/src/misc/Makefile.in
+	sed -i 's#$(LIBRARY" ##'   config/rules.mk
+	
+	./configure --prefix=/usr \
+	            --with-mozilla \
+	            --with-pthreads \
+	            --enable-64bit
+	make
+	make install
+}
diff --git a/repos/extra/nspr/build b/repos/extra/nspr/build
deleted file mode 100644
index 71054b45..00000000
--- a/repos/extra/nspr/build
+++ /dev/null
@@ -1,10 +0,0 @@
-cd nspr
-sed -ri '/^RELEASE/s/^/#/' pr/src/misc/Makefile.in
-sed -i 's#$(LIBRARY" ##'   config/rules.mk
-
-./configure --prefix=/usr \
-            --with-mozilla \
-            --with-pthreads \
-            --enable-64bit
-make
-make install
diff --git a/repos/extra/nspr/info b/repos/extra/nspr/info
deleted file mode 100644
index cd5ce6b0..00000000
--- a/repos/extra/nspr/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=nspr
-version=4.35
-release=1
-source="https://archive.mozilla.org/pub/$name/releases/v$version/src/$name-$version.tar.gz"
diff --git a/repos/extra/nss/abuild b/repos/extra/nss/abuild
new file mode 100644
index 00000000..2ec5f3e3
--- /dev/null
+++ b/repos/extra/nss/abuild
@@ -0,0 +1,35 @@
+name=nss
+version=3.100
+ver=${version%.*}
+sion=${version#*.}
+release=1
+source="https://archive.mozilla.org/pub/security/nss/releases/NSS_${ver}_${sion}_RTM/src/nss-$version.tar.gz
+	nss-3.92-standalone-1.patch"
+
+build() {
+	cd nss
+	make BUILD_OPT=1                  \
+	  NSPR_INCLUDE_DIR=/usr/include/nspr  \
+	  USE_SYSTEM_ZLIB=1                   \
+	  ZLIB_LIBS=-lz                       \
+	  NSS_ENABLE_WERROR=0                 \
+	  USE_64=1 \
+	  NSS_USE_SYSTEM_SQLITE=1
+	
+	cd ../dist
+	
+	mkdir -p $PKG/usr/lib $PKG/usr/bin $PKG/usr/lib/pkgconfig
+	install -v -m755 Linux*/lib/*.so $PKG/usr/lib
+	install -v -m644 Linux*/lib/*.chk $PKG/usr/lib
+	install -v -m644 Linux*/lib/libcrmf.a $PKG/usr/lib
+	
+	install -v -m755 -d $PKG/usr/include/nss
+	cp -v -RL public/nss/* $PKG/usr/include/nss
+	cp -v -RL private/nss/* $PKG/usr/include/nss
+	
+	install -v -m755 Linux*/bin/certutil $PKG/usr/bin
+	install -v -m755 Linux*/bin/nss-config $PKG/usr/bin
+	install -v -m755 Linux*/bin/pk12util $PKG/usr/bin
+	
+	install -v -m644 Linux*/lib/pkgconfig/nss.pc $PKG/usr/lib/pkgconfig
+}
diff --git a/repos/extra/nss/build b/repos/extra/nss/build
deleted file mode 100644
index a96b7fd9..00000000
--- a/repos/extra/nss/build
+++ /dev/null
@@ -1,25 +0,0 @@
-cd nss
-make BUILD_OPT=1                  \
-  NSPR_INCLUDE_DIR=/usr/include/nspr  \
-  USE_SYSTEM_ZLIB=1                   \
-  ZLIB_LIBS=-lz                       \
-  NSS_ENABLE_WERROR=0                 \
-  USE_64=1 \
-  NSS_USE_SYSTEM_SQLITE=1
-
-cd ../dist
-
-mkdir -p $PKG/usr/lib $PKG/usr/bin $PKG/usr/lib/pkgconfig
-install -v -m755 Linux*/lib/*.so $PKG/usr/lib
-install -v -m644 Linux*/lib/*.chk $PKG/usr/lib
-install -v -m644 Linux*/lib/libcrmf.a $PKG/usr/lib
-
-install -v -m755 -d $PKG/usr/include/nss
-cp -v -RL public/nss/* $PKG/usr/include/nss
-cp -v -RL private/nss/* $PKG/usr/include/nss
-
-install -v -m755 Linux*/bin/certutil $PKG/usr/bin
-install -v -m755 Linux*/bin/nss-config $PKG/usr/bin
-install -v -m755 Linux*/bin/pk12util $PKG/usr/bin
-
-install -v -m644 Linux*/lib/pkgconfig/nss.pc $PKG/usr/lib/pkgconfig
diff --git a/repos/extra/nss/info b/repos/extra/nss/info
deleted file mode 100644
index 54e2bbc5..00000000
--- a/repos/extra/nss/info
+++ /dev/null
@@ -1,7 +0,0 @@
-name=nss
-version=3.100
-ver=${version%.*}
-sion=${version#*.}
-release=1
-source="https://archive.mozilla.org/pub/security/nss/releases/NSS_${ver}_${sion}_RTM/src/nss-$version.tar.gz
-	nss-3.92-standalone-1.patch"
diff --git a/repos/extra/ntfs-3g/info b/repos/extra/ntfs-3g/abuild
index 715ef994..715ef994 100644
--- a/repos/extra/ntfs-3g/info
+++ b/repos/extra/ntfs-3g/abuild
diff --git a/repos/extra/opendoas/abuild b/repos/extra/opendoas/abuild
new file mode 100644
index 00000000..8f96fdde
--- /dev/null
+++ b/repos/extra/opendoas/abuild
@@ -0,0 +1,21 @@
+name=opendoas
+version=6.8.2
+release=1
+source="https://github.com/Duncaen/OpenDoas/releases/download/v${version}/${name}-${version}.tar.xz
+	doas.conf"
+
+build() {
+	BINOWN="$(id -u)" \
+	BINGRP="$(id -g)" \
+	./configure \
+	    --prefix=/usr \
+	    --with-shadow \
+	    --with-timestamp \
+	    --without-pam
+	make
+	make install
+	
+	mkdir -p $PKG/etc
+	cp $SRC/doas.conf $PKG/etc
+	chmod 600 $PKG/etc/doas.conf
+}
diff --git a/repos/extra/opendoas/build b/repos/extra/opendoas/build
deleted file mode 100644
index 6a089b06..00000000
--- a/repos/extra/opendoas/build
+++ /dev/null
@@ -1,13 +0,0 @@
-BINOWN="$(id -u)" \
-BINGRP="$(id -g)" \
-./configure \
-    --prefix=/usr \
-    --with-shadow \
-    --with-timestamp \
-    --without-pam
-make
-make install
-
-mkdir -p $PKG/etc
-cp $SRC/doas.conf $PKG/etc
-chmod 600 $PKG/etc/doas.conf
diff --git a/repos/extra/opendoas/info b/repos/extra/opendoas/info
deleted file mode 100644
index bbba2c55..00000000
--- a/repos/extra/opendoas/info
+++ /dev/null
@@ -1,5 +0,0 @@
-name=opendoas
-version=6.8.2
-release=1
-source="https://github.com/Duncaen/OpenDoas/releases/download/v${version}/${name}-${version}.tar.xz
-	doas.conf"
diff --git a/repos/extra/openresolv/info b/repos/extra/openresolv/abuild
index ae4f493f..ae4f493f 100644
--- a/repos/extra/openresolv/info
+++ b/repos/extra/openresolv/abuild
diff --git a/repos/extra/opus/info b/repos/extra/opus/abuild
index 495a0c19..495a0c19 100644
--- a/repos/extra/opus/info
+++ b/repos/extra/opus/abuild
diff --git a/repos/extra/os-prober/abuild b/repos/extra/os-prober/abuild
new file mode 100644
index 00000000..ba56054f
--- /dev/null
+++ b/repos/extra/os-prober/abuild
@@ -0,0 +1,22 @@
+name=os-prober
+version=1.81
+release=1
+source="http://ftp.de.debian.org/debian/pool/main/o/$name/${name}_$version.tar.xz"
+
+build() {
+	make
+	
+	install -Dm755 linux-boot-prober $PKG/usr/bin/linux-boot-prober
+	install -Dm755 os-prober $PKG/usr/bin/os-prober
+	install -Dm755 newns $PKG/usr/lib/os-prober/newns
+	install -Dm755 common.sh $PKG/usr/share/os-prober/common.sh  
+	
+	for dir in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do
+	        install -dm755 "$PKG/usr/lib/$dir"
+	        install -m755 -t "$PKG/usr/lib/$dir" "$dir"/common/*
+	        [ -d "$dir"/x86 ] && cp -r "$dir"/x86/* "$PKG/usr/lib/$dir"
+	done
+	
+	install -Dm755 os-probes/mounted/powerpc/20macosx $PKG/usr/lib/os-probes/mounted/20macosx
+	install -dm755 $PKG/var/lib/os-prober
+}
diff --git a/repos/extra/os-prober/build b/repos/extra/os-prober/build
deleted file mode 100644
index f072239c..00000000
--- a/repos/extra/os-prober/build
+++ /dev/null
@@ -1,15 +0,0 @@
-make
-
-install -Dm755 linux-boot-prober $PKG/usr/bin/linux-boot-prober
-install -Dm755 os-prober $PKG/usr/bin/os-prober
-install -Dm755 newns $PKG/usr/lib/os-prober/newns
-install -Dm755 common.sh $PKG/usr/share/os-prober/common.sh  
-
-for dir in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do
-        install -dm755 "$PKG/usr/lib/$dir"
-        install -m755 -t "$PKG/usr/lib/$dir" "$dir"/common/*
-        [ -d "$dir"/x86 ] && cp -r "$dir"/x86/* "$PKG/usr/lib/$dir"
-done
-
-install -Dm755 os-probes/mounted/powerpc/20macosx $PKG/usr/lib/os-probes/mounted/20macosx
-install -dm755 $PKG/var/lib/os-prober
diff --git a/repos/extra/os-prober/info b/repos/extra/os-prober/info
deleted file mode 100644
index 8e12dca5..00000000
--- a/repos/extra/os-prober/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=os-prober
-version=1.81
-release=1
-source="http://ftp.de.debian.org/debian/pool/main/o/$name/${name}_$version.tar.xz"
diff --git a/repos/extra/p7zip/abuild b/repos/extra/p7zip/abuild
new file mode 100644
index 00000000..84258177
--- /dev/null
+++ b/repos/extra/p7zip/abuild
@@ -0,0 +1,13 @@
+name=p7zip
+version=17.05
+release=1
+source="https://github.com/$name-project/$name/archive/v$version/$name-$version.tar.gz"
+
+build() {
+	sed '/^gzip/d' -i install.sh
+	sed -i '160a if(_buffer == nullptr || _size == _pos) return E_FAIL;' CPP/7zip/Common/StreamObjects.cpp
+	make all3
+	make DEST_HOME=/usr \
+	DEST_MAN=/usr/share/man \
+	DEST_DIR=$PKG install
+}
diff --git a/repos/extra/p7zip/build b/repos/extra/p7zip/build
deleted file mode 100644
index 5defb8d2..00000000
--- a/repos/extra/p7zip/build
+++ /dev/null
@@ -1,6 +0,0 @@
-sed '/^gzip/d' -i install.sh
-sed -i '160a if(_buffer == nullptr || _size == _pos) return E_FAIL;' CPP/7zip/Common/StreamObjects.cpp
-make all3
-make DEST_HOME=/usr \
-DEST_MAN=/usr/share/man \
-DEST_DIR=$PKG install
diff --git a/repos/extra/p7zip/info b/repos/extra/p7zip/info
deleted file mode 100644
index 16267dba..00000000
--- a/repos/extra/p7zip/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=p7zip
-version=17.05
-release=1
-source="https://github.com/$name-project/$name/archive/v$version/$name-$version.tar.gz"
diff --git a/repos/extra/pango/.files b/repos/extra/pango/.files
index 0ff52df5..cb6f410d 100644
--- a/repos/extra/pango/.files
+++ b/repos/extra/pango/.files
@@ -42,8 +42,6 @@ drwxr-xr-x root/root    usr/include/pango-1.0/pango/
 -rw-r--r-- root/root    usr/include/pango-1.0/pango/pangofc-font.h
 -rw-r--r-- root/root    usr/include/pango-1.0/pango/pangofc-fontmap.h
 -rw-r--r-- root/root    usr/include/pango-1.0/pango/pangoft2.h
--rw-r--r-- root/root    usr/include/pango-1.0/pango/pangoxft-render.h
--rw-r--r-- root/root    usr/include/pango-1.0/pango/pangoxft.h
 drwxr-xr-x root/root    usr/lib/
 drwxr-xr-x root/root    usr/lib/girepository-1.0/
 -rw-r--r-- root/root    usr/lib/girepository-1.0/Pango-1.0.typelib
@@ -51,26 +49,21 @@ drwxr-xr-x root/root    usr/lib/girepository-1.0/
 -rw-r--r-- root/root    usr/lib/girepository-1.0/PangoFT2-1.0.typelib
 -rw-r--r-- root/root    usr/lib/girepository-1.0/PangoFc-1.0.typelib
 -rw-r--r-- root/root    usr/lib/girepository-1.0/PangoOT-1.0.typelib
--rw-r--r-- root/root    usr/lib/girepository-1.0/PangoXft-1.0.typelib
 lrwxrwxrwx root/root    usr/lib/libpango-1.0.so -> libpango-1.0.so.0
-lrwxrwxrwx root/root    usr/lib/libpango-1.0.so.0 -> libpango-1.0.so.0.5000.14
--rwxr-xr-x root/root    usr/lib/libpango-1.0.so.0.5000.14
+lrwxrwxrwx root/root    usr/lib/libpango-1.0.so.0 -> libpango-1.0.so.0.5200.2
+-rwxr-xr-x root/root    usr/lib/libpango-1.0.so.0.5200.2
 lrwxrwxrwx root/root    usr/lib/libpangocairo-1.0.so -> libpangocairo-1.0.so.0
-lrwxrwxrwx root/root    usr/lib/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.5000.14
--rwxr-xr-x root/root    usr/lib/libpangocairo-1.0.so.0.5000.14
+lrwxrwxrwx root/root    usr/lib/libpangocairo-1.0.so.0 -> libpangocairo-1.0.so.0.5200.2
+-rwxr-xr-x root/root    usr/lib/libpangocairo-1.0.so.0.5200.2
 lrwxrwxrwx root/root    usr/lib/libpangoft2-1.0.so -> libpangoft2-1.0.so.0
-lrwxrwxrwx root/root    usr/lib/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.5000.14
--rwxr-xr-x root/root    usr/lib/libpangoft2-1.0.so.0.5000.14
-lrwxrwxrwx root/root    usr/lib/libpangoxft-1.0.so -> libpangoxft-1.0.so.0
-lrwxrwxrwx root/root    usr/lib/libpangoxft-1.0.so.0 -> libpangoxft-1.0.so.0.5000.14
--rwxr-xr-x root/root    usr/lib/libpangoxft-1.0.so.0.5000.14
+lrwxrwxrwx root/root    usr/lib/libpangoft2-1.0.so.0 -> libpangoft2-1.0.so.0.5200.2
+-rwxr-xr-x root/root    usr/lib/libpangoft2-1.0.so.0.5200.2
 drwxr-xr-x root/root    usr/lib/pkgconfig/
 -rw-r--r-- root/root    usr/lib/pkgconfig/pango.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/pangocairo.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/pangofc.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/pangoft2.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/pangoot.pc
--rw-r--r-- root/root    usr/lib/pkgconfig/pangoxft.pc
 drwxr-xr-x root/root    usr/share/
 drwxr-xr-x root/root    usr/share/gir-1.0/
 -rw-r--r-- root/root    usr/share/gir-1.0/Pango-1.0.gir
@@ -78,4 +71,3 @@ drwxr-xr-x root/root    usr/share/gir-1.0/
 -rw-r--r-- root/root    usr/share/gir-1.0/PangoFT2-1.0.gir
 -rw-r--r-- root/root    usr/share/gir-1.0/PangoFc-1.0.gir
 -rw-r--r-- root/root    usr/share/gir-1.0/PangoOT-1.0.gir
--rw-r--r-- root/root    usr/share/gir-1.0/PangoXft-1.0.gir
diff --git a/repos/extra/pango/info b/repos/extra/pango/abuild
index 51fc33c7..179cb54d 100644
--- a/repos/extra/pango/info
+++ b/repos/extra/pango/abuild
@@ -1,5 +1,8 @@
 name=pango
-version=1.50.14
+version=1.52.2
 release=1
 source="https://download.gnome.org/sources/$name/${version%.*}/$name-$version.tar.xz"
-build_opt="--wrap-mode=nofallback"
+
+prebuild() {
+	sed -i '/array-bounds/d' meson.build
+}
diff --git a/repos/extra/pango/prebuild b/repos/extra/pango/prebuild
deleted file mode 100644
index ac6210d4..00000000
--- a/repos/extra/pango/prebuild
+++ /dev/null
@@ -1 +0,0 @@
-sed -i '/array-bounds/d' meson.build
diff --git a/repos/extra/pcre2/abuild b/repos/extra/pcre2/abuild
new file mode 100644
index 00000000..2500093b
--- /dev/null
+++ b/repos/extra/pcre2/abuild
@@ -0,0 +1,17 @@
+name=pcre2
+version=10.43
+release=1
+source="https://github.com/PCRE2Project/$name/releases/download/$name-$version/$name-$version.tar.bz2"
+
+build() {
+	./configure --prefix=/usr                       \
+	            --enable-unicode                    \
+	            --enable-jit                        \
+	            --enable-pcre2-16                   \
+	            --enable-pcre2-32                   \
+	            --enable-pcre2grep-libz             \
+	            --enable-pcre2grep-libbz2           \
+	            --enable-pcre2test-libreadline
+	make
+	make install
+}
diff --git a/repos/extra/pcre2/build b/repos/extra/pcre2/build
deleted file mode 100644
index d3f198ba..00000000
--- a/repos/extra/pcre2/build
+++ /dev/null
@@ -1,10 +0,0 @@
-./configure --prefix=/usr                       \
-            --enable-unicode                    \
-            --enable-jit                        \
-            --enable-pcre2-16                   \
-            --enable-pcre2-32                   \
-            --enable-pcre2grep-libz             \
-            --enable-pcre2grep-libbz2           \
-            --enable-pcre2test-libreadline
-make
-make install
diff --git a/repos/extra/pcre2/info b/repos/extra/pcre2/info
deleted file mode 100644
index 7b85814c..00000000
--- a/repos/extra/pcre2/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=pcre2
-version=10.43
-release=1
-source="https://github.com/PCRE2Project/$name/releases/download/$name-$version/$name-$version.tar.bz2"
diff --git a/repos/extra/perl/abuild b/repos/extra/perl/abuild
new file mode 100644
index 00000000..a52666f7
--- /dev/null
+++ b/repos/extra/perl/abuild
@@ -0,0 +1,21 @@
+name=perl
+version=5.38.2
+release=1
+source="https://www.cpan.org/src/5.0/perl-$version.tar.xz"
+
+build() {
+	BUILD_ZLIB=False \
+	BUILD_BZIP2=0 \
+	sh Configure -des -Dprefix=/usr                 \
+	                  -Dvendorprefix=/usr           \
+	                  -Dprivlib=/usr/lib/perl5/${version%.*} \
+	                  -Dsitelib=/usr/lib/perl5/site_perl/${version%.*} \
+	                  -Dvendorlib=/usr/lib/perl5/site_perl/${version%.*} \
+	                  -Dman1dir=/usr/share/man/man1 \
+	                  -Dman3dir=/usr/share/man/man3 \
+	                  -Dpager="/usr/bin/less -isR"  \
+	                  -Duseshrplib                  \
+	                  -Dusethreads
+	make
+	make DESTDIR=$PKG install
+}
diff --git a/repos/extra/perl/build b/repos/extra/perl/build
deleted file mode 100644
index 6f0a2599..00000000
--- a/repos/extra/perl/build
+++ /dev/null
@@ -1,14 +0,0 @@
-BUILD_ZLIB=False \
-BUILD_BZIP2=0 \
-sh Configure -des -Dprefix=/usr                 \
-                  -Dvendorprefix=/usr           \
-                  -Dprivlib=/usr/lib/perl5/${version%.*} \
-                  -Dsitelib=/usr/lib/perl5/site_perl/${version%.*} \
-                  -Dvendorlib=/usr/lib/perl5/site_perl/${version%.*} \
-                  -Dman1dir=/usr/share/man/man1 \
-                  -Dman3dir=/usr/share/man/man3 \
-                  -Dpager="/usr/bin/less -isR"  \
-                  -Duseshrplib                  \
-                  -Dusethreads
-make
-make DESTDIR=$PKG install
diff --git a/repos/extra/perl/info b/repos/extra/perl/info
deleted file mode 100644
index c3a108f9..00000000
--- a/repos/extra/perl/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=perl
-version=5.38.2
-release=1
-source="https://www.cpan.org/src/5.0/perl-$version.tar.xz"
diff --git a/repos/extra/pfetch/info b/repos/extra/pfetch/abuild
index b00bc4b2..09faa5ab 100644
--- a/repos/extra/pfetch/info
+++ b/repos/extra/pfetch/abuild
@@ -2,3 +2,8 @@ name=pfetch
 version=0.6.0
 release=1
 source="https://github.com/dylanaraps/${name}/archive/${version}/${name}-${version}.tar.gz"
+
+build() {
+	mkdir -p $PKG/usr/bin
+	install -m755 pfetch $PKG/usr/bin/pfetch
+}
diff --git a/repos/extra/pfetch/build b/repos/extra/pfetch/build
deleted file mode 100644
index 53dbaa5d..00000000
--- a/repos/extra/pfetch/build
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p $PKG/usr/bin
-install -m755 pfetch $PKG/usr/bin/pfetch
diff --git a/repos/extra/pixman/info b/repos/extra/pixman/abuild
index 09a855ec..09a855ec 100644
--- a/repos/extra/pixman/info
+++ b/repos/extra/pixman/abuild
diff --git a/repos/extra/pkgconf/info b/repos/extra/pkgconf/abuild
index 9183cb7b..99eab210 100644
--- a/repos/extra/pkgconf/info
+++ b/repos/extra/pkgconf/abuild
@@ -6,3 +6,7 @@ build_type=configure_build
 build_opt="--with-pkg-config-dir=/usr/lib/pkgconfig:/usr/share/pkgconfig
 	--with-system-libdir=/lib:/usr/lib
 	--with-system-includedir=/usr/include"
+
+postbuild() {
+	ln -sf pkgconf $PKG/usr/bin/pkg-config
+}
diff --git a/repos/extra/pkgconf/postbuild b/repos/extra/pkgconf/postbuild
deleted file mode 100644
index 7d3f3900..00000000
--- a/repos/extra/pkgconf/postbuild
+++ /dev/null
@@ -1 +0,0 @@
-ln -sf pkgconf $PKG/usr/bin/pkg-config
diff --git a/repos/extra/pm-utils/info b/repos/extra/pm-utils/abuild
index 8195f05d..8195f05d 100644
--- a/repos/extra/pm-utils/info
+++ b/repos/extra/pm-utils/abuild
diff --git a/repos/extra/popt/info b/repos/extra/popt/abuild
index 472520f1..472520f1 100644
--- a/repos/extra/popt/info
+++ b/repos/extra/popt/abuild
diff --git a/repos/extra/ports/abuild b/repos/extra/ports/abuild
new file mode 100644
index 00000000..4d751b73
--- /dev/null
+++ b/repos/extra/ports/abuild
@@ -0,0 +1,24 @@
+name=ports
+version=1.6
+release=1
+source="https://crux.nu/files/tools/${name}/${name}-${version}.tar.gz
+	git"
+
+postbuild() {
+	install -m755 $SRC/git $PKG/etc/ports/drivers/git
+	sed -i 's,/usr/ports,/var/lib/repos,g' $PKG/usr/bin/ports
+	sed -i 's,collection,repo,g' $PKG/etc/ports/drivers/git
+	mkdir -p $PKG/var/lib/repos
+	
+	for repo in core extra; do
+		echo "#
+# /etc/ports/$repo.git
+#
+
+URL=https://github.com/emmett1/alicelinux.git
+NAME=$repo
+BRANCH=$repo
+
+# End of file" > $PKG/etc/ports/$repo.git
+	done
+}
diff --git a/repos/extra/ports/info b/repos/extra/ports/info
deleted file mode 100644
index 42a9feae..00000000
--- a/repos/extra/ports/info
+++ /dev/null
@@ -1,5 +0,0 @@
-name=ports
-version=1.6
-release=1
-source="https://crux.nu/files/tools/${name}/${name}-${version}.tar.gz
-	git"
diff --git a/repos/extra/ports/postbuild b/repos/extra/ports/postbuild
deleted file mode 100644
index f1b75892..00000000
--- a/repos/extra/ports/postbuild
+++ /dev/null
@@ -1,16 +0,0 @@
-install -m755 $SRC/git $PKG/etc/ports/drivers/git
-sed -i 's,/usr/ports,/var/lib/repos,g' $PKG/usr/bin/ports
-sed -i 's,collection,repo,g' $PKG/etc/ports/drivers/git
-mkdir -p $PKG/var/lib/repos
-
-for repo in core extra; do
-	echo "#
-# /etc/ports/$repo.git
-#
-
-URL=https://github.com/emmett1/alicelinux.git
-NAME=$repo
-BRANCH=$repo
-
-# End of file" > $PKG/etc/ports/$repo.git
-done
diff --git a/repos/extra/python-jinja2/info b/repos/extra/python-jinja2/abuild
index c534f191..c534f191 100644
--- a/repos/extra/python-jinja2/info
+++ b/repos/extra/python-jinja2/abuild
diff --git a/repos/extra/python-mako/info b/repos/extra/python-mako/abuild
index 66d5254a..66d5254a 100644
--- a/repos/extra/python-mako/info
+++ b/repos/extra/python-mako/abuild
diff --git a/repos/extra/python-markupsafe/info b/repos/extra/python-markupsafe/abuild
index 6275913d..6275913d 100644
--- a/repos/extra/python-markupsafe/info
+++ b/repos/extra/python-markupsafe/abuild
diff --git a/repos/extra/python-setuptools/info b/repos/extra/python-setuptools/abuild
index 92c13283..92c13283 100644
--- a/repos/extra/python-setuptools/info
+++ b/repos/extra/python-setuptools/abuild
diff --git a/repos/extra/python/info b/repos/extra/python/abuild
index 35bdb813..fb2ee4d2 100644
--- a/repos/extra/python/info
+++ b/repos/extra/python/abuild
@@ -7,3 +7,12 @@ build_opt="--without-ensurepip
 	--with-system-expat
 	--with-system-ffi
 	--enable-optimizations"
+
+prebuild() {
+	# Remove tests
+	rm -rvf Lib/test Lib/*/test Lib/*/tests Lib/*/idle_test
+}
+
+postbuild() {
+	ln -s python3 $PKG/usr/bin/python
+}
diff --git a/repos/extra/python/postbuild b/repos/extra/python/postbuild
deleted file mode 100644
index 0b779eb0..00000000
--- a/repos/extra/python/postbuild
+++ /dev/null
@@ -1 +0,0 @@
-ln -s python3 $PKG/usr/bin/python
diff --git a/repos/extra/python/prebuild b/repos/extra/python/prebuild
deleted file mode 100644
index fd3bd1d3..00000000
--- a/repos/extra/python/prebuild
+++ /dev/null
@@ -1,2 +0,0 @@
-# Remove tests
-rm -rvf Lib/test Lib/*/test Lib/*/tests Lib/*/idle_test
diff --git a/repos/extra/qemu/info b/repos/extra/qemu/abuild
index 24e9f387..24e9f387 100644
--- a/repos/extra/qemu/info
+++ b/repos/extra/qemu/abuild
diff --git a/repos/extra/ranger/info b/repos/extra/ranger/abuild
index 9bbc4309..9bbc4309 100644
--- a/repos/extra/ranger/info
+++ b/repos/extra/ranger/abuild
diff --git a/repos/extra/rdfind/info b/repos/extra/rdfind/abuild
index a864db35..a864db35 100644
--- a/repos/extra/rdfind/info
+++ b/repos/extra/rdfind/abuild
diff --git a/repos/extra/readline/abuild b/repos/extra/readline/abuild
new file mode 100644
index 00000000..06128c3b
--- /dev/null
+++ b/repos/extra/readline/abuild
@@ -0,0 +1,11 @@
+name=readline
+version=8.2
+release=1
+source="https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz
+	readline-8.2-upstream_fix-1.patch"
+
+build() {
+	./configure --prefix=/usr --with-curses
+	make SHLIB_LIBS="-lncursesw"
+	make SHLIB_LIBS="-lncursesw" DESTDIR=$PKG install
+}
diff --git a/repos/extra/readline/build b/repos/extra/readline/build
deleted file mode 100644
index c6b8f343..00000000
--- a/repos/extra/readline/build
+++ /dev/null
@@ -1,3 +0,0 @@
-./configure --prefix=/usr --with-curses
-make SHLIB_LIBS="-lncursesw"
-make SHLIB_LIBS="-lncursesw" DESTDIR=$PKG install
diff --git a/repos/extra/readline/info b/repos/extra/readline/info
deleted file mode 100644
index a7faf7c3..00000000
--- a/repos/extra/readline/info
+++ /dev/null
@@ -1,5 +0,0 @@
-name=readline
-version=8.2
-release=1
-source="https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz
-	readline-8.2-upstream_fix-1.patch"
diff --git a/repos/extra/rsync/info b/repos/extra/rsync/abuild
index a583ccc6..a583ccc6 100644
--- a/repos/extra/rsync/info
+++ b/repos/extra/rsync/abuild
diff --git a/repos/extra/rust/abuild b/repos/extra/rust/abuild
new file mode 100644
index 00000000..27083d62
--- /dev/null
+++ b/repos/extra/rust/abuild
@@ -0,0 +1,87 @@
+name=rust
+version=1.78.0
+
+##cat src/stage0.txt
+export _date=2024-03-21
+export _rustc=1.77.0
+export _cargo=$_rustc
+##
+
+release=1
+source="https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz
+	https://static.rust-lang.org/dist/$_date/rust-std-$_rustc-x86_64-unknown-linux-musl.tar.xz::noextract
+	https://static.rust-lang.org/dist/$_date/rustc-$_rustc-x86_64-unknown-linux-musl.tar.xz::noextract
+	https://static.rust-lang.org/dist/$_date/cargo-$_cargo-x86_64-unknown-linux-musl.tar.xz::noextract
+	fix-curl.patch"
+build_dir=${name}c-$version-src
+keep_static=1
+no_strip=1
+
+build() {
+	mkdir -p build/cache/$_date
+	
+	_tuplet=x86_64-unknown-linux-musl
+	cp $SRC/rust-std-$_rustc-x86_64-unknown-linux-musl.tar.xz build/cache/$_date/
+	cp $SRC/rustc-$_rustc-x86_64-unknown-linux-musl.tar.xz build/cache/$_date/
+	cp $SRC/cargo-$_cargo-x86_64-unknown-linux-musl.tar.xz build/cache/$_date/
+	
+	sed -i 's/\(crt_static_default = \)true/\1false/' compiler/rustc_target/src/spec/base/linux_musl.rs
+	sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys/.cargo-checksum.json
+		
+	cat > config.toml <<EOF
+	[llvm]
+	link-shared = true
+	
+	[build]
+	build     = "$_tuplet"
+	host      = [ "$_tuplet" ]
+	target    = [ "$_tuplet" ]
+	
+	docs           = false
+	compiler-docs  = false
+	extended       = true
+	submodules     = false
+	python         = "python3"
+	locked-deps    = true
+	vendor         = true
+	tools          = [ "cargo", "rustfmt" ]
+	sanitizers     = false
+	profiler       = false
+	full-bootstrap = false
+	
+	[install]
+	prefix = "/usr"
+	
+	[target.$_tuplet]
+	llvm-config = "/usr/bin/llvm-config"
+	crt-static  = false
+	sanitizers  = false
+	
+	[dist]
+	src-tarball = false
+	
+	[rust]
+	backtrace         = false
+	channel           = "stable"
+	codegen-tests     = false
+	codegen-units-std = 1
+	codegen-units     = 0
+	debug             = false
+	debug-assertions  = false
+	debuginfo-level   = 0
+	incremental       = false
+	jemalloc          = false
+	rpath             = false
+	dist-src          = false
+	EOF
+	
+	mkdir "$SRC/rust"
+	export RUST_BACKTRACE=1
+	
+	python x.py build
+	python x.py install
+	
+	rm -rf $PKG/usr/lib/rustlib/src/ \
+		$PKG/usr/share/zsh \
+		$PKG/usr/lib/rustlib/uninstall.sh
+}
diff --git a/repos/extra/rust/build b/repos/extra/rust/build
deleted file mode 100644
index 58557502..00000000
--- a/repos/extra/rust/build
+++ /dev/null
@@ -1,66 +0,0 @@
-mkdir -p build/cache/$_date
-
-_tuplet=x86_64-unknown-linux-musl
-cp $SRC/rust-std-$_rustc-x86_64-unknown-linux-musl.tar.xz build/cache/$_date/
-cp $SRC/rustc-$_rustc-x86_64-unknown-linux-musl.tar.xz build/cache/$_date/
-cp $SRC/cargo-$_cargo-x86_64-unknown-linux-musl.tar.xz build/cache/$_date/
-
-sed -i 's/\(crt_static_default = \)true/\1false/' compiler/rustc_target/src/spec/base/linux_musl.rs
-sed -i 's/\("files":{\)[^}]*/\1/' vendor/curl-sys/.cargo-checksum.json
-	
-cat > config.toml <<EOF
-[llvm]
-link-shared = true
-
-[build]
-build     = "$_tuplet"
-host      = [ "$_tuplet" ]
-target    = [ "$_tuplet" ]
-
-docs           = false
-compiler-docs  = false
-extended       = true
-submodules     = false
-python         = "python3"
-locked-deps    = true
-vendor         = true
-tools          = [ "cargo", "rustfmt" ]
-sanitizers     = false
-profiler       = false
-full-bootstrap = false
-
-[install]
-prefix = "/usr"
-
-[target.$_tuplet]
-llvm-config = "/usr/bin/llvm-config"
-crt-static  = false
-sanitizers  = false
-
-[dist]
-src-tarball = false
-
-[rust]
-backtrace         = false
-channel           = "stable"
-codegen-tests     = false
-codegen-units-std = 1
-codegen-units     = 0
-debug             = false
-debug-assertions  = false
-debuginfo-level   = 0
-incremental       = false
-jemalloc          = false
-rpath             = false
-dist-src          = false
-EOF
-
-mkdir "$SRC/rust"
-export RUST_BACKTRACE=1
-
-python x.py build
-python x.py install
-
-rm -rf $PKG/usr/lib/rustlib/src/ \
-	$PKG/usr/share/zsh \
-	$PKG/usr/lib/rustlib/uninstall.sh
diff --git a/repos/extra/rust/info b/repos/extra/rust/info
deleted file mode 100755
index 4e6c5fe3..00000000
--- a/repos/extra/rust/info
+++ /dev/null
@@ -1,18 +0,0 @@
-name=rust
-version=1.78.0
-
-##cat src/stage0.txt
-export _date=2024-03-21
-export _rustc=1.77.0
-export _cargo=$_rustc
-##
-
-release=1
-source="https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz
-	https://static.rust-lang.org/dist/$_date/rust-std-$_rustc-x86_64-unknown-linux-musl.tar.xz::noextract
-	https://static.rust-lang.org/dist/$_date/rustc-$_rustc-x86_64-unknown-linux-musl.tar.xz::noextract
-	https://static.rust-lang.org/dist/$_date/cargo-$_cargo-x86_64-unknown-linux-musl.tar.xz::noextract
-	fix-curl.patch"
-build_dir=${name}c-$version-src
-keep_static=1
-no_strip=1
diff --git a/repos/extra/scdoc/info b/repos/extra/scdoc/abuild
index 80a4367c..80a4367c 100644
--- a/repos/extra/scdoc/info
+++ b/repos/extra/scdoc/abuild
diff --git a/repos/extra/sdl2/.files b/repos/extra/sdl2/.files
index 030bf689..ac9594ae 100644
--- a/repos/extra/sdl2/.files
+++ b/repos/extra/sdl2/.files
@@ -86,9 +86,9 @@ drwxr-xr-x root/root    usr/lib/cmake/
 drwxr-xr-x root/root    usr/lib/cmake/SDL2/
 -rw-r--r-- root/root    usr/lib/cmake/SDL2/sdl2-config-version.cmake
 -rw-r--r-- root/root    usr/lib/cmake/SDL2/sdl2-config.cmake
-lrwxrwxrwx root/root    usr/lib/libSDL2-2.0.so.0 -> libSDL2-2.0.so.0.3000.2
--rwxr-xr-x root/root    usr/lib/libSDL2-2.0.so.0.3000.2
-lrwxrwxrwx root/root    usr/lib/libSDL2.so -> libSDL2-2.0.so.0.3000.2
+lrwxrwxrwx root/root    usr/lib/libSDL2-2.0.so.0 -> libSDL2-2.0.so.0.3000.3
+-rwxr-xr-x root/root    usr/lib/libSDL2-2.0.so.0.3000.3
+lrwxrwxrwx root/root    usr/lib/libSDL2.so -> libSDL2-2.0.so.0.3000.3
 drwxr-xr-x root/root    usr/lib/pkgconfig/
 -rw-r--r-- root/root    usr/lib/pkgconfig/sdl2.pc
 drwxr-xr-x root/root    usr/share/
diff --git a/repos/extra/sdl2/info b/repos/extra/sdl2/abuild
index 9d7a9a1f..985ff336 100644
--- a/repos/extra/sdl2/info
+++ b/repos/extra/sdl2/abuild
@@ -1,4 +1,4 @@
 name=sdl2
-version=2.30.2
+version=2.30.3
 release=1
 source="https://www.libsdl.org/release/SDL2-$version.tar.gz"
diff --git a/repos/extra/seatd/info b/repos/extra/seatd/abuild
index d2fe7118..d2fe7118 100644
--- a/repos/extra/seatd/info
+++ b/repos/extra/seatd/abuild
diff --git a/repos/extra/sfwbar/info b/repos/extra/sfwbar/abuild
index 6106b4e0..6106b4e0 100644
--- a/repos/extra/sfwbar/info
+++ b/repos/extra/sfwbar/abuild
diff --git a/repos/extra/shared-mime-info/info b/repos/extra/shared-mime-info/abuild
index b400a678..b400a678 100644
--- a/repos/extra/shared-mime-info/info
+++ b/repos/extra/shared-mime-info/abuild
diff --git a/repos/extra/slang/.files b/repos/extra/slang/.files
new file mode 100644
index 00000000..716a06c5
--- /dev/null
+++ b/repos/extra/slang/.files
@@ -0,0 +1,157 @@
+drwxr-xr-x root/root    etc/
+-rw-r--r-- root/root    etc/slsh.rc.new
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/bin/
+-rwxr-xr-x root/root    usr/bin/slsh
+drwxr-xr-x root/root    usr/include/
+-rw-r--r-- root/root    usr/include/slang.h
+-rw-r--r-- root/root    usr/include/slcurses.h
+drwxr-xr-x root/root    usr/lib/
+lrwxrwxrwx root/root    usr/lib/libslang.so -> libslang.so.2
+lrwxrwxrwx root/root    usr/lib/libslang.so.2 -> libslang.so.2.3.3
+-rwxr-xr-x root/root    usr/lib/libslang.so.2.3.3
+drwxr-xr-x root/root    usr/lib/pkgconfig/
+-rw-r--r-- root/root    usr/lib/pkgconfig/slang.pc
+drwxr-xr-x root/root    usr/lib/slang/
+drwxr-xr-x root/root    usr/lib/slang/v2/
+drwxr-xr-x root/root    usr/lib/slang/v2/modules/
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/base64-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/chksum-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/csv-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/fcntl-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/fork-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/histogram-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/iconv-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/json-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/pcre-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/png-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/rand-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/select-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/slsmg-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/socket-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/stats-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/sysconf-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/termios-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/varray-module.so
+-rwxr-xr-x root/root    usr/lib/slang/v2/modules/zlib-module.so
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/man/
+drwxr-xr-x root/root    usr/share/man/man1/
+-rw-r--r-- root/root    usr/share/man/man1/slsh.1.gz
+drwxr-xr-x root/root    usr/share/slsh/
+-rw-r--r-- root/root    usr/share/slsh/arrayfuns.sl
+-rw-r--r-- root/root    usr/share/slsh/autoload.sl
+-rw-r--r-- root/root    usr/share/slsh/base64.sl
+-rw-r--r-- root/root    usr/share/slsh/chksum.sl
+drwxr-xr-x root/root    usr/share/slsh/cmaps/
+-rw-r--r-- root/root    usr/share/slsh/cmaps/cool.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/coolwarm.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/copper.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/cubicl.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/cubicyf.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/drywet.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/ds9b.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/ds9sls.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/edge.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/gebco.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/globe.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/gray.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/haxby.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/hot.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/jet.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/no_green.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/ocean.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/polar.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/rainbow.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/red2green.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/relief.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/sealand.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/seis.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/split.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/topo.map
+-rw-r--r-- root/root    usr/share/slsh/cmaps/wysiwyg.map
+-rw-r--r-- root/root    usr/share/slsh/cmdopt.sl
+-rw-r--r-- root/root    usr/share/slsh/csv.sl
+-rw-r--r-- root/root    usr/share/slsh/fcntl.sl
+-rw-r--r-- root/root    usr/share/slsh/fork.sl
+-rw-r--r-- root/root    usr/share/slsh/fswalk.sl
+-rw-r--r-- root/root    usr/share/slsh/glob.sl
+drwxr-xr-x root/root    usr/share/slsh/help/
+-rw-r--r-- root/root    usr/share/slsh/help/arrayfuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/base64funs.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/chksumfuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/cmdopt.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/csvfuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/forkfuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/fswalk.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/glob.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/histfuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/jsonfuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/listfuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/onigfuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/pcrefuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/pngfuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/print.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/process.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/profile.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/randfuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/readascii.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/require.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/setfuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/slsmg.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/sockfuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/statsfuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/structfuns.hlp
+-rw-r--r-- root/root    usr/share/slsh/help/timestamp.hlp
+-rw-r--r-- root/root    usr/share/slsh/histogram.sl
+-rw-r--r-- root/root    usr/share/slsh/iconv.sl
+-rw-r--r-- root/root    usr/share/slsh/json.sl
+-rw-r--r-- root/root    usr/share/slsh/listfuns.sl
+drwxr-xr-x root/root    usr/share/slsh/local-packages/
+-rw-r--r-- root/root    usr/share/slsh/onig.sl
+-rw-r--r-- root/root    usr/share/slsh/pcre.sl
+-rw-r--r-- root/root    usr/share/slsh/png.sl
+-rw-r--r-- root/root    usr/share/slsh/print.sl
+-rw-r--r-- root/root    usr/share/slsh/process.sl
+-rw-r--r-- root/root    usr/share/slsh/profile.sl
+-rw-r--r-- root/root    usr/share/slsh/rand.sl
+-rw-r--r-- root/root    usr/share/slsh/readascii.sl
+-rw-r--r-- root/root    usr/share/slsh/require.sl
+drwxr-xr-x root/root    usr/share/slsh/rline/
+-rw-r--r-- root/root    usr/share/slsh/rline/complete.sl
+-rw-r--r-- root/root    usr/share/slsh/rline/editfuns.sl
+-rw-r--r-- root/root    usr/share/slsh/rline/editor.sl
+-rw-r--r-- root/root    usr/share/slsh/rline/emacskeys.sl
+-rw-r--r-- root/root    usr/share/slsh/rline/history.sl
+-rw-r--r-- root/root    usr/share/slsh/rline/histsrch.sl
+-rw-r--r-- root/root    usr/share/slsh/rline/slrline.rc
+-rw-r--r-- root/root    usr/share/slsh/rline/vikeys.sl
+drwxr-xr-x root/root    usr/share/slsh/scripts/
+-rwxr-xr-x root/root    usr/share/slsh/scripts/jpegsize
+-rwxr-xr-x root/root    usr/share/slsh/scripts/lsrpm
+-rwxr-xr-x root/root    usr/share/slsh/scripts/slcov
+-rwxr-xr-x root/root    usr/share/slsh/scripts/sldb
+-rwxr-xr-x root/root    usr/share/slsh/scripts/slprof
+-rwxr-xr-x root/root    usr/share/slsh/scripts/slstkchk
+-rwxr-xr-x root/root    usr/share/slsh/scripts/svnsh
+-rw-r--r-- root/root    usr/share/slsh/select.sl
+-rw-r--r-- root/root    usr/share/slsh/setfuns.sl
+-rw-r--r-- root/root    usr/share/slsh/sldb.sl
+-rw-r--r-- root/root    usr/share/slsh/sldbcore.sl
+-rw-r--r-- root/root    usr/share/slsh/sldbsock.sl
+-rw-r--r-- root/root    usr/share/slsh/slshhelp.sl
+-rw-r--r-- root/root    usr/share/slsh/slshrl.sl
+-rw-r--r-- root/root    usr/share/slsh/slsmg.sl
+-rw-r--r-- root/root    usr/share/slsh/socket.sl
+-rw-r--r-- root/root    usr/share/slsh/stats.sl
+drwxr-xr-x root/root    usr/share/slsh/statslib/
+-rw-r--r-- root/root    usr/share/slsh/statslib/ad_test.sl
+-rw-r--r-- root/root    usr/share/slsh/statslib/ks_test.sl
+-rw-r--r-- root/root    usr/share/slsh/statslib/kuiper.sl
+-rw-r--r-- root/root    usr/share/slsh/stkcheck.sl
+-rw-r--r-- root/root    usr/share/slsh/structfuns.sl
+-rw-r--r-- root/root    usr/share/slsh/sysconf.sl
+-rw-r--r-- root/root    usr/share/slsh/termios.sl
+-rw-r--r-- root/root    usr/share/slsh/timestamp.sl
+-rw-r--r-- root/root    usr/share/slsh/varray.sl
+-rw-r--r-- root/root    usr/share/slsh/zlib.sl
diff --git a/repos/extra/slang/abuild b/repos/extra/slang/abuild
new file mode 100644
index 00000000..902700bb
--- /dev/null
+++ b/repos/extra/slang/abuild
@@ -0,0 +1,5 @@
+name=slang
+version=2.3.3
+release=1
+source="https://www.jedsoft.org/releases/$name/$name-$version.tar.bz2"
+build_opt="--with-readline=gnu"
diff --git a/repos/extra/slang/depends b/repos/extra/slang/depends
new file mode 100644
index 00000000..0b5a58e2
--- /dev/null
+++ b/repos/extra/slang/depends
@@ -0,0 +1 @@
+readline
diff --git a/repos/extra/slurp/info b/repos/extra/slurp/abuild
index 4e9ec154..4e9ec154 100644
--- a/repos/extra/slurp/info
+++ b/repos/extra/slurp/abuild
diff --git a/repos/extra/sqlite/abuild b/repos/extra/sqlite/abuild
new file mode 100644
index 00000000..ca866328
--- /dev/null
+++ b/repos/extra/sqlite/abuild
@@ -0,0 +1,19 @@
+name=sqlite
+version=3420000
+release=1
+source="https://sqlite.org/2023/$name-autoconf-$version.tar.gz"
+
+build() {
+	./configure \
+	        --prefix=/usr     \
+	        --disable-static  \
+	        --enable-fts4 \
+	        --enable-fts5 \
+	        CPPFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA=1 \
+	        -DSQLITE_ENABLE_UNLOCK_NOTIFY=1   \
+	        -DSQLITE_ENABLE_DBSTAT_VTAB=1     \
+	        -DSQLITE_SECURE_DELETE=1          \
+	        -DSQLITE_ENABLE_FTS3_TOKENIZER=1"
+	make
+	make install
+}
diff --git a/repos/extra/sqlite/build b/repos/extra/sqlite/build
deleted file mode 100644
index 378c81fb..00000000
--- a/repos/extra/sqlite/build
+++ /dev/null
@@ -1,12 +0,0 @@
-./configure \
-        --prefix=/usr     \
-        --disable-static  \
-        --enable-fts4 \
-        --enable-fts5 \
-        CPPFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA=1 \
-        -DSQLITE_ENABLE_UNLOCK_NOTIFY=1   \
-        -DSQLITE_ENABLE_DBSTAT_VTAB=1     \
-        -DSQLITE_SECURE_DELETE=1          \
-        -DSQLITE_ENABLE_FTS3_TOKENIZER=1"
-make
-make install
diff --git a/repos/extra/sqlite/info b/repos/extra/sqlite/info
deleted file mode 100644
index 63a96c89..00000000
--- a/repos/extra/sqlite/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=sqlite
-version=3420000
-release=1
-source="https://sqlite.org/2023/$name-autoconf-$version.tar.gz"
diff --git a/repos/extra/squashfs-tools/abuild b/repos/extra/squashfs-tools/abuild
new file mode 100644
index 00000000..c8d371fd
--- /dev/null
+++ b/repos/extra/squashfs-tools/abuild
@@ -0,0 +1,9 @@
+name=squashfs-tools
+version=4.6.1
+release=1
+source="https://github.com/plougher/$name/archive/$version/$name-$version.tar.gz"
+
+build() {
+	make ZSTD_SUPPORT=1 GZIP_SUPPORT=1 LZO_SUPPORT=1 XZ_SUPPORT=1 EXTRA_CFLAGS="-fcommon" -C $name
+	make install INSTALL_PREFIX= INSTALL_DIR=$PKG/sbin INSTALL_MANPAGES_DIR=$PKG/usr/share/man/man1 -C $name
+}
diff --git a/repos/extra/squashfs-tools/build b/repos/extra/squashfs-tools/build
deleted file mode 100644
index 47bd3305..00000000
--- a/repos/extra/squashfs-tools/build
+++ /dev/null
@@ -1,2 +0,0 @@
-make ZSTD_SUPPORT=1 GZIP_SUPPORT=1 LZO_SUPPORT=1 XZ_SUPPORT=1 EXTRA_CFLAGS="-fcommon" -C $name
-make install INSTALL_PREFIX= INSTALL_DIR=$PKG/sbin INSTALL_MANPAGES_DIR=$PKG/usr/share/man/man1 -C $name
diff --git a/repos/extra/squashfs-tools/info b/repos/extra/squashfs-tools/info
deleted file mode 100644
index 574de299..00000000
--- a/repos/extra/squashfs-tools/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=squashfs-tools
-version=4.6.1
-release=1
-source="https://github.com/plougher/$name/archive/$version/$name-$version.tar.gz"
diff --git a/repos/extra/strace/.files b/repos/extra/strace/.files
new file mode 100644
index 00000000..2dca2441
--- /dev/null
+++ b/repos/extra/strace/.files
@@ -0,0 +1,9 @@
+drwxr-xr-x root/root    usr/
+drwxr-xr-x root/root    usr/bin/
+-rwxr-xr-x root/root    usr/bin/strace
+-rwxr-xr-x root/root    usr/bin/strace-log-merge
+drwxr-xr-x root/root    usr/share/
+drwxr-xr-x root/root    usr/share/man/
+drwxr-xr-x root/root    usr/share/man/man1/
+-rw-r--r-- root/root    usr/share/man/man1/strace-log-merge.1.gz
+-rw-r--r-- root/root    usr/share/man/man1/strace.1.gz
diff --git a/repos/extra/strace/abuild b/repos/extra/strace/abuild
new file mode 100644
index 00000000..ff80588d
--- /dev/null
+++ b/repos/extra/strace/abuild
@@ -0,0 +1,5 @@
+name=strace
+version=6.9
+release=1
+source="https://github.com/${name}/${name}/releases/download/v${version}/${name}-${version}.tar.xz"
+build_opt="--enable-mpers=no"
diff --git a/repos/extra/sway/info b/repos/extra/sway/abuild
index 1537286a..50dc0484 100644
--- a/repos/extra/sway/info
+++ b/repos/extra/sway/abuild
@@ -2,5 +2,5 @@ name=sway
 version=1.9
 release=1
 source="https://github.com/${name}wm/${name}/releases/download/${version}/${name}-${version}.tar.gz"
-[ "$(command -v Xwayland)" ] && xwayland="-Dxwayland=enabled"
-build_opt="-Dwerror=false $xwayland"
+build_opt="-Dwerror=false"
+[ -f $SPM_PKGDB/xwayland ] && build_opt="$build_opt -Dxwayland=enabled"
diff --git a/repos/extra/swaybg/info b/repos/extra/swaybg/abuild
index ef15e811..ef15e811 100644
--- a/repos/extra/swaybg/info
+++ b/repos/extra/swaybg/abuild
diff --git a/repos/extra/swayidle/info b/repos/extra/swayidle/abuild
index 8a776458..8a776458 100644
--- a/repos/extra/swayidle/info
+++ b/repos/extra/swayidle/abuild
diff --git a/repos/extra/swaylock/info b/repos/extra/swaylock/abuild
index fef97722..098f62d3 100644
--- a/repos/extra/swaylock/info
+++ b/repos/extra/swaylock/abuild
@@ -2,3 +2,7 @@ name=swaylock
 version=1.7.2
 release=1
 source="https://github.com/swaywm/${name}/releases/download/v${version}/${name}-${version}.tar.gz"
+
+postbuild() {
+	chmod a+s $PKG/usr/bin/swaylock
+}
diff --git a/repos/extra/swaylock/postbuild b/repos/extra/swaylock/postbuild
deleted file mode 100644
index 536817ce..00000000
--- a/repos/extra/swaylock/postbuild
+++ /dev/null
@@ -1 +0,0 @@
-chmod a+s $PKG/usr/bin/swaylock
diff --git a/repos/extra/syslinux/abuild b/repos/extra/syslinux/abuild
new file mode 100644
index 00000000..bd534632
--- /dev/null
+++ b/repos/extra/syslinux/abuild
@@ -0,0 +1,21 @@
+name=syslinux
+version=6.03
+release=2
+source="http://www.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.xz
+        $name-Makefile.patch
+	$name-sysmacros.patch
+	$name-fix-missing-stdio.patch"
+skip_patch=1
+unset CFLAGS
+unset CXXFLAGS
+
+build() {
+	patch -p0 -i $SRC/$name-Makefile.patch
+	patch -p1 -i $SRC/$name-sysmacros.patch
+	patch -p1 -i $SRC/$name-fix-missing-stdio.patch
+	
+	export LDFLAGS="$LDFLAGS --no-dynamic-linker"
+	
+	make OPTFLAGS="$CFLAGS -fcommon" installer
+	make -j1 OPTFLAGS="$CFLAGS -fcommon" INSTALLROOT=$PKG MANDIR=/usr/share/man install
+}
diff --git a/repos/extra/syslinux/build b/repos/extra/syslinux/build
deleted file mode 100644
index 019dcf1f..00000000
--- a/repos/extra/syslinux/build
+++ /dev/null
@@ -1,8 +0,0 @@
-patch -p0 -i $SRC/$name-Makefile.patch
-patch -p1 -i $SRC/$name-sysmacros.patch
-patch -p1 -i $SRC/$name-fix-missing-stdio.patch
-
-export LDFLAGS="$LDFLAGS --no-dynamic-linker"
-
-make OPTFLAGS="$CFLAGS -fcommon" installer
-make -j1 OPTFLAGS="$CFLAGS -fcommon" INSTALLROOT=$PKG MANDIR=/usr/share/man install
diff --git a/repos/extra/syslinux/info b/repos/extra/syslinux/info
deleted file mode 100644
index 41891cec..00000000
--- a/repos/extra/syslinux/info
+++ /dev/null
@@ -1,10 +0,0 @@
-name=syslinux
-version=6.03
-release=2
-source="http://www.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.xz
-        $name-Makefile.patch
-	$name-sysmacros.patch
-	$name-fix-missing-stdio.patch"
-skip_patch=1
-unset CFLAGS
-unset CXXFLAGS
diff --git a/repos/extra/tiff/info b/repos/extra/tiff/abuild
index 26dfcdd3..26dfcdd3 100644
--- a/repos/extra/tiff/info
+++ b/repos/extra/tiff/abuild
diff --git a/repos/extra/tllist/info b/repos/extra/tllist/abuild
index 93403438..93403438 100644
--- a/repos/extra/tllist/info
+++ b/repos/extra/tllist/abuild
diff --git a/repos/extra/tty-clock/info b/repos/extra/tty-clock/abuild
index 0437d9b2..0437d9b2 100644
--- a/repos/extra/tty-clock/info
+++ b/repos/extra/tty-clock/abuild
diff --git a/repos/extra/tzdata/abuild b/repos/extra/tzdata/abuild
new file mode 100644
index 00000000..0be330f5
--- /dev/null
+++ b/repos/extra/tzdata/abuild
@@ -0,0 +1,26 @@
+name=tzdata
+version=2024a
+release=1
+source="https://www.iana.org/time-zones/repository/releases/${name}${version}.tar.gz
+	https://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"
+
+build() {
+	make
+	make DESTDIR=$PKG install
+	
+	ZONEINFO=$PKG/usr/share/zoneinfo
+	mkdir -pv $ZONEINFO/posix \
+	          $ZONEINFO/right
+	
+	for tz in etcetera southamerica northamerica europe africa antarctica  \
+	          asia australasia backward; do
+	    ./zic -L /dev/null   -d $ZONEINFO       -y "sh yearistype.sh" ${tz}
+	    ./zic -L /dev/null   -d $ZONEINFO/posix -y "sh yearistype.sh" ${tz}
+	    ./zic -L leapseconds -d $ZONEINFO/right -y "sh yearistype.sh" ${tz}
+	done
+	
+	cp -v zone.tab zone1970.tab iso3166.tab $ZONEINFO
+	./zic -d $ZONEINFO -p America/New_York
+	
+	rm $PKG/etc/localtime
+}
diff --git a/repos/extra/tzdata/build b/repos/extra/tzdata/build
deleted file mode 100644
index cbd90326..00000000
--- a/repos/extra/tzdata/build
+++ /dev/null
@@ -1,18 +0,0 @@
-make
-make DESTDIR=$PKG install
-
-ZONEINFO=$PKG/usr/share/zoneinfo
-mkdir -pv $ZONEINFO/posix \
-          $ZONEINFO/right
-
-for tz in etcetera southamerica northamerica europe africa antarctica  \
-          asia australasia backward; do
-    ./zic -L /dev/null   -d $ZONEINFO       -y "sh yearistype.sh" ${tz}
-    ./zic -L /dev/null   -d $ZONEINFO/posix -y "sh yearistype.sh" ${tz}
-    ./zic -L leapseconds -d $ZONEINFO/right -y "sh yearistype.sh" ${tz}
-done
-
-cp -v zone.tab zone1970.tab iso3166.tab $ZONEINFO
-./zic -d $ZONEINFO -p America/New_York
-
-rm $PKG/etc/localtime
diff --git a/repos/extra/tzdata/info b/repos/extra/tzdata/info
deleted file mode 100644
index def597ed..00000000
--- a/repos/extra/tzdata/info
+++ /dev/null
@@ -1,5 +0,0 @@
-name=tzdata
-version=2024a
-release=1
-source="https://www.iana.org/time-zones/repository/releases/${name}${version}.tar.gz
-	https://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"
diff --git a/repos/extra/unrar/abuild b/repos/extra/unrar/abuild
new file mode 100644
index 00000000..d8ce59de
--- /dev/null
+++ b/repos/extra/unrar/abuild
@@ -0,0 +1,11 @@
+name=unrar
+version=7.0.9
+release=1
+source="https://www.rarlab.com/rar/${name}src-$version.tar.gz"
+
+build() {
+	sed -e '/CXXFLAGS=/d' -e '/LDFLAGS=/d' -i makefile
+	export LDFLAGS="$LDFLAGS -pthread"
+	make -j1 STRIP=:
+	make install DESTDIR=$PKG/usr
+}
diff --git a/repos/extra/unrar/build b/repos/extra/unrar/build
deleted file mode 100644
index 0ac6ff4c..00000000
--- a/repos/extra/unrar/build
+++ /dev/null
@@ -1,4 +0,0 @@
-sed -e '/CXXFLAGS=/d' -e '/LDFLAGS=/d' -i makefile
-export LDFLAGS="$LDFLAGS -pthread"
-make -j1 STRIP=:
-make install DESTDIR=$PKG/usr
diff --git a/repos/extra/unrar/info b/repos/extra/unrar/info
deleted file mode 100644
index b6cbdbe5..00000000
--- a/repos/extra/unrar/info
+++ /dev/null
@@ -1,4 +0,0 @@
-name=unrar
-version=7.0.9
-release=1
-source="https://www.rarlab.com/rar/${name}src-$version.tar.gz"
diff --git a/repos/extra/vim/.files b/repos/extra/vim/.files
index 4292433f..955eceba 100644
--- a/repos/extra/vim/.files
+++ b/repos/extra/vim/.files
@@ -3,12 +3,10 @@ drwxr-xr-x root/root    usr/bin/
 lrwxrwxrwx root/root    usr/bin/ex -> vim
 lrwxrwxrwx root/root    usr/bin/rview -> vim
 lrwxrwxrwx root/root    usr/bin/rvim -> vim
-lrwxrwxrwx root/root    usr/bin/vi -> vim
 lrwxrwxrwx root/root    usr/bin/view -> vim
 -rwxr-xr-x root/root    usr/bin/vim
 lrwxrwxrwx root/root    usr/bin/vimdiff -> vim
 -rwxr-xr-x root/root    usr/bin/vimtutor
--rwxr-xr-x root/root    usr/bin/xxd
 drwxr-xr-x root/root    usr/share/
 drwxr-xr-x root/root    usr/share/icons/
 drwxr-xr-x root/root    usr/share/icons/hicolor/
@@ -58,6 +56,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/autoload/dist/
 -rw-r--r-- root/root    usr/share/vim/vim91/autoload/getscript.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/autoload/gnat.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/autoload/gzip.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/autoload/hare.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/autoload/haskellcomplete.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/autoload/htmlcomplete.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/autoload/javascriptcomplete.vim
@@ -100,8 +99,6 @@ drwxr-xr-x root/root    usr/share/vim/vim91/autoload/xml/
 -rw-r--r-- root/root    usr/share/vim/vim91/autoload/xml/xsl.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/autoload/xmlcomplete.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/autoload/xmlformat.vim
-drwxr-xr-x root/root    usr/share/vim/vim91/autoload/zig/
--rw-r--r-- root/root    usr/share/vim/vim91/autoload/zig/fmt.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/autoload/zip.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/bugreport.vim
 drwxr-xr-x root/root    usr/share/vim/vim91/colors/
@@ -190,6 +187,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/compiler/
 -rw-r--r-- root/root    usr/share/vim/vim91/compiler/jest.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/compiler/jikes.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/compiler/jjs.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/compiler/jq.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/compiler/jshint.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/compiler/jsonlint.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/compiler/mcs.vim
@@ -273,6 +271,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/doc/
 -rw-r--r-- root/root    usr/share/vim/vim91/doc/fold.txt
 -rw-r--r-- root/root    usr/share/vim/vim91/doc/ft_ada.txt
 -rw-r--r-- root/root    usr/share/vim/vim91/doc/ft_context.txt
+-rw-r--r-- root/root    usr/share/vim/vim91/doc/ft_hare.txt
 -rw-r--r-- root/root    usr/share/vim/vim91/doc/ft_mp.txt
 -rw-r--r-- root/root    usr/share/vim/vim91/doc/ft_ps1.txt
 -rw-r--r-- root/root    usr/share/vim/vim91/doc/ft_raku.txt
@@ -426,6 +425,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/ftplugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/ant.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/apache.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/arch.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/arduino.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/art.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/asciidoc.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/asm.vim
@@ -467,6 +467,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/ftplugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/css.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/cucumber.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/cvsrc.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/dart.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/deb822sources.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/debchangelog.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/debcontrol.vim
@@ -518,6 +519,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/ftplugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/go.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/gpg.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/gprof.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/graphql.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/groovy.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/group.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/grub.vim
@@ -525,6 +527,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/ftplugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/haml.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/hamster.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/hare.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/haredoc.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/haskell.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/heex.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/help.vim
@@ -535,6 +538,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/ftplugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/html.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/htmldjango.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/hurl.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/hyprlang.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/i3config.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/icon.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/indent.vim
@@ -544,7 +548,9 @@ drwxr-xr-x root/root    usr/share/vim/vim91/ftplugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/java.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/javascript.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/javascriptreact.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/jj.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/jproperties.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/jq.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/json.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/json5.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/jsonc.vim
@@ -554,6 +560,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/ftplugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/kconfig.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/kotlin.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/kwt.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/lc.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/ld.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/less.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/lftp.vim
@@ -599,6 +606,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/ftplugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/neomuttrc.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/netrc.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/nginx.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/nim.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/nix.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/nroff.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/nsis.vim
@@ -624,11 +632,13 @@ drwxr-xr-x root/root    usr/share/vim/vim91/ftplugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/poefilter.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/poke.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/postscr.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/prisma.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/procmail.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/prolog.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/protocols.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/ps1.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/ps1xml.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/purescript.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/pymanifest.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/pyrex.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/python.vim
@@ -641,9 +651,11 @@ drwxr-xr-x root/root    usr/share/vim/vim91/ftplugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/racc.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/racket.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/raku.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/rasi.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/readline.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/registry.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/requirements.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/rescript.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/reva.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/rhelp.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/rmd.vim
@@ -671,6 +683,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/ftplugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/sgml.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/sh.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/sieve.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/slint.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/slpconf.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/slpreg.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/slpspi.vim
@@ -680,6 +693,8 @@ drwxr-xr-x root/root    usr/share/vim/vim91/ftplugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/sql.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/ssa.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/sshconfig.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/sshdconfig.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/stylus.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/sudoers.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/svg.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/swayconfig.vim
@@ -702,6 +717,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/ftplugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/tt2html.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/typescript.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/typescriptreact.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/typst.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/uci.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/udevconf.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/udevperm.vim
@@ -710,6 +726,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/ftplugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/updatedb.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/urlshortcut.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/usd.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/v.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/vb.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/vdf.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/ftplugin/verilog.vim
@@ -747,7 +764,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/indent/
 -rw-r--r-- root/root    usr/share/vim/vim91/indent/aap.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/indent/ada.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/indent/ant.vim
--rw-r--r-- root/root    usr/share/vim/vim91/indent/asm.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/indent/arduino.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/indent/astro.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/indent/automake.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/indent/awk.vim
@@ -880,6 +897,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/indent/
 -rw-r--r-- root/root    usr/share/vim/vim91/indent/sql.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/indent/sqlanywhere.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/indent/sshconfig.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/indent/stylus.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/indent/systemverilog.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/indent/tcl.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/indent/tcsh.vim
@@ -949,6 +967,14 @@ drwxr-xr-x root/root    usr/share/vim/vim91/pack/dist/opt/
 drwxr-xr-x root/root    usr/share/vim/vim91/pack/dist/opt/cfilter/
 drwxr-xr-x root/root    usr/share/vim/vim91/pack/dist/opt/cfilter/plugin/
 -rw-r--r-- root/root    usr/share/vim/vim91/pack/dist/opt/cfilter/plugin/cfilter.vim
+drwxr-xr-x root/root    usr/share/vim/vim91/pack/dist/opt/comment/
+drwxr-xr-x root/root    usr/share/vim/vim91/pack/dist/opt/comment/autoload/
+-rw-r--r-- root/root    usr/share/vim/vim91/pack/dist/opt/comment/autoload/comment.vim
+drwxr-xr-x root/root    usr/share/vim/vim91/pack/dist/opt/comment/doc/
+-rw-r--r-- root/root    usr/share/vim/vim91/pack/dist/opt/comment/doc/comment.txt
+-rw-r--r-- root/root    usr/share/vim/vim91/pack/dist/opt/comment/doc/tags
+drwxr-xr-x root/root    usr/share/vim/vim91/pack/dist/opt/comment/plugin/
+-rw-r--r-- root/root    usr/share/vim/vim91/pack/dist/opt/comment/plugin/comment.vim
 drwxr-xr-x root/root    usr/share/vim/vim91/pack/dist/opt/dvorak/
 drwxr-xr-x root/root    usr/share/vim/vim91/pack/dist/opt/dvorak/dvorak/
 -rw-r--r-- root/root    usr/share/vim/vim91/pack/dist/opt/dvorak/dvorak/disable.vim
@@ -1302,6 +1328,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/syntax/
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/haml.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/hamster.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/hare.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/syntax/haredoc.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/haskell.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/haste.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/hastepreproc.vim
@@ -1348,8 +1375,10 @@ drwxr-xr-x root/root    usr/share/vim/vim91/syntax/
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/javascriptreact.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/jess.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/jgraph.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/syntax/jj.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/jovial.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/jproperties.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/syntax/jq.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/json.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/json5.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/jsonc.vim
@@ -1546,6 +1575,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/syntax/modula2/opt/
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/raku.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/raml.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/rapid.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/syntax/rasi.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/ratpoison.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/rc.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/rcs.vim
@@ -1662,6 +1692,7 @@ drwxr-xr-x root/root    usr/share/vim/vim91/syntax/shared/
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/stp.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/strace.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/structurizr.vim
+-rw-r--r-- root/root    usr/share/vim/vim91/syntax/stylus.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/sudoers.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/svg.vim
 -rw-r--r-- root/root    usr/share/vim/vim91/syntax/svn.vim
diff --git a/repos/extra/vim/info b/repos/extra/vim/abuild
index e7b8ee05..371ec4f7 100644
--- a/repos/extra/vim/info
+++ b/repos/extra/vim/abuild
@@ -1,5 +1,10 @@
 name=vim
-version=9.1.0368
+version=9.1.0465
 release=1
 source="https://github.com/$name/$name/archive/v$version/$name-$version.tar.gz"
 build_opt="--without-x --disable-gui --disable-gpm --disable-libsodium --disable-nls"
+
+postbuild() {
+	rm $PKG/usr/bin/xxd
+	rm -rf $PKG/usr/share/applications/
+}
diff --git a/repos/extra/vim/postbuild b/repos/extra/vim/postbuild
deleted file mode 100644
index 86c874f3..00000000
--- a/repos/extra/vim/postbuild
+++ /dev/null
@@ -1,2 +0,0 @@
-rm $PKG/usr/bin/xxd
-rm -rf $PKG/usr/share/applications/
diff --git a/repos/extra/vulkan-headers/info b/repos/extra/vulkan-headers/abuild
index 934c2890..52ff9fe9 100644
--- a/repos/extra/vulkan-headers/info
+++ b/repos/extra/vulkan-headers/abuild
@@ -1,4 +1,4 @@
 name=vulkan-headers
-version=1.3.281
+version=1.3.286
 release=1
 source="https://github.com/KhronosGroup/Vulkan-Headers/archive/v$version/$name-$version.tar.gz"
diff --git a/repos/extra/wayland-protocols/info b/repos/extra/wayland-protocols/abuild
index 48c0333c..48c0333c 100644
--- a/repos/extra/wayland-protocols/info
+++ b/repos/extra/wayland-protocols/abuild
diff --git a/repos/extra/wayland/.files b/repos/extra/wayland/.files
index c8b9062f..a3bf6515 100644
--- a/repos/extra/wayland/.files
+++ b/repos/extra/wayland/.files
@@ -16,17 +16,17 @@ drwxr-xr-x root/root    usr/include/
 -rw-r--r-- root/root    usr/include/wayland-version.h
 drwxr-xr-x root/root    usr/lib/
 lrwxrwxrwx root/root    usr/lib/libwayland-client.so -> libwayland-client.so.0
-lrwxrwxrwx root/root    usr/lib/libwayland-client.so.0 -> libwayland-client.so.0.22.0
--rwxr-xr-x root/root    usr/lib/libwayland-client.so.0.22.0
+lrwxrwxrwx root/root    usr/lib/libwayland-client.so.0 -> libwayland-client.so.0.23.0
+-rwxr-xr-x root/root    usr/lib/libwayland-client.so.0.23.0
 lrwxrwxrwx root/root    usr/lib/libwayland-cursor.so -> libwayland-cursor.so.0
-lrwxrwxrwx root/root    usr/lib/libwayland-cursor.so.0 -> libwayland-cursor.so.0.22.0
--rwxr-xr-x root/root    usr/lib/libwayland-cursor.so.0.22.0
+lrwxrwxrwx root/root    usr/lib/libwayland-cursor.so.0 -> libwayland-cursor.so.0.23.0
+-rwxr-xr-x root/root    usr/lib/libwayland-cursor.so.0.23.0
 lrwxrwxrwx root/root    usr/lib/libwayland-egl.so -> libwayland-egl.so.1
-lrwxrwxrwx root/root    usr/lib/libwayland-egl.so.1 -> libwayland-egl.so.1.22.0
--rwxr-xr-x root/root    usr/lib/libwayland-egl.so.1.22.0
+lrwxrwxrwx root/root    usr/lib/libwayland-egl.so.1 -> libwayland-egl.so.1.23.0
+-rwxr-xr-x root/root    usr/lib/libwayland-egl.so.1.23.0
 lrwxrwxrwx root/root    usr/lib/libwayland-server.so -> libwayland-server.so.0
-lrwxrwxrwx root/root    usr/lib/libwayland-server.so.0 -> libwayland-server.so.0.22.0
--rwxr-xr-x root/root    usr/lib/libwayland-server.so.0.22.0
+lrwxrwxrwx root/root    usr/lib/libwayland-server.so.0 -> libwayland-server.so.0.23.0
+-rwxr-xr-x root/root    usr/lib/libwayland-server.so.0.23.0
 drwxr-xr-x root/root    usr/lib/pkgconfig/
 -rw-r--r-- root/root    usr/lib/pkgconfig/wayland-client.pc
 -rw-r--r-- root/root    usr/lib/pkgconfig/wayland-cursor.pc
diff --git a/repos/extra/wayland/info b/repos/extra/wayland/abuild
index 7b58e11f..18574765 100644
--- a/repos/extra/wayland/info
+++ b/repos/extra/wayland/abuild
@@ -1,5 +1,5 @@
 name=wayland
-version=1.22.0
+version=1.23.0
 release=1
 source="https://gitlab.freedesktop.org/$name/$name/-/releases/$version/downloads/$name-$version.tar.xz"
 build_opt="-Ddocumentation=false"
diff --git a/repos/extra/wbg/info b/repos/extra/wbg/abuild
index 3d6bef75..3d6bef75 100644
--- a/repos/extra/wbg/info
+++ b/repos/extra/wbg/abuild
diff --git a/repos/extra/wf-recorder/info b/repos/extra/wf-recorder/abuild
index eac463b4..eac463b4 100644
--- a/repos/extra/wf-recorder/info
+++ b/repos/extra/wf-recorder/abuild
diff --git a/repos/extra/wireless-tools/abuild b/repos/extra/wireless-tools/abuild
new file mode 100644
index 00000000..e1b5f479
--- /dev/null
+++ b/repos/extra/wireless-tools/abuild
@@ -0,0 +1,19 @@
+name=wireless-tools
+n=$(echo $name | sed 's/-/_/')
+version=30.pre9
+release=1
+source="https://hewlettpackard.github.io/$name/${n}.$version.tar.gz
+	fix-basename.patch"
+
+build() {
+	# fix compiler flags, build shared library, don't run ldconfig
+	sed -i Makefile \
+	        -e "s|CFLAGS=|CFLAGS=$CFLAGS |" \
+	        -e "/^BUILD_STATIC/d" \
+	        -e "/ldconfig/d"
+	
+	make
+	make install \
+	        PREFIX=$PKG/usr \
+	        INSTALL_MAN=$PKG/usr/share/man
+}
diff --git a/repos/extra/wireless-tools/build b/repos/extra/wireless-tools/build
deleted file mode 100644
index aa26da8f..00000000
--- a/repos/extra/wireless-tools/build
+++ /dev/null
@@ -1,10 +0,0 @@
-# fix compiler flags, build shared library, don't run ldconfig
-sed -i Makefile \
-        -e "s|CFLAGS=|CFLAGS=$CFLAGS |" \
-        -e "/^BUILD_STATIC/d" \
-        -e "/ldconfig/d"
-
-make
-make install \
-        PREFIX=$PKG/usr \
-        INSTALL_MAN=$PKG/usr/share/man
diff --git a/repos/extra/wireless-tools/info b/repos/extra/wireless-tools/info
deleted file mode 100644
index f9767b73..00000000
--- a/repos/extra/wireless-tools/info
+++ /dev/null
@@ -1,6 +0,0 @@
-name=wireless-tools
-n=$(echo $name | sed 's/-/_/')
-version=30.pre9
-release=1
-source="https://hewlettpackard.github.io/$name/${n}.$version.tar.gz
-	fix-basename.patch"
diff --git a/repos/extra/wl-clipboard/info b/repos/extra/wl-clipboard/abuild
index 8f3f586a..8f3f586a 100644
--- a/repos/extra/wl-clipboard/info
+++ b/repos/extra/wl-clipboard/abuild
diff --git a/repos/extra/wlroots/info b/repos/extra/wlroots/abuild
index a0404b36..bd19c3fd 100644
--- a/repos/extra/wlroots/info
+++ b/repos/extra/wlroots/abuild
@@ -2,5 +2,5 @@ name=wlroots
 version=0.17.3
 release=1
 source="https://gitlab.freedesktop.org/${name}/${name}/-/releases/${version}/downloads/${name}-${version}.tar.gz"
-[ "$(command -v Xwayland)" ] && xwayland="-Dxwayland=enabled"
-build_opt="-Dexamples=false -Ddefault_library=both -Dbackends=drm,libinput $xwayland"
+build_opt="-Dexamples=false -Ddefault_library=both -Dbackends=drm,libinput"
+[ -f $SPM_PKGDB/xwayland ] && build_opt="$build_opt -Dxwayland=enabled"
diff --git a/repos/extra/wmenu/info b/repos/extra/wmenu/abuild
index d1073d3d..d1073d3d 100644
--- a/repos/extra/wmenu/info
+++ b/repos/extra/wmenu/abuild
diff --git a/repos/extra/wpa_supplicant/build b/repos/extra/wpa_supplicant/abuild
index a4bf0dba..b4f7c5d0 100644
--- a/repos/extra/wpa_supplicant/build
+++ b/repos/extra/wpa_supplicant/abuild
@@ -1,3 +1,12 @@
+name=wpa_supplicant
+version=2.10
+release=1
+source="https://w1.fi/releases/$name-$version.tar.gz
+	run"
+sv="run"
+export CFLAGS="$CFLAGS $(pkg-config --cflags libnl-tiny)"
+
+build() {
 cat > wpa_supplicant/.config << "EOF"
 CONFIG_BACKEND=file
 CONFIG_CTRL_IFACE=y
@@ -26,19 +35,20 @@ CONFIG_SMARTCARD=y
 CONFIG_WPS=y
 CFLAGS += -I/usr/include/libnl3
 EOF
-
+	
 cd wpa_supplicant
 make BINDIR=/usr/sbin LIBDIR=/usr/lib
-
+	
 mkdir -p $PKG/usr/sbin $PKG/usr/share/man/man5 $PKG/usr/share/man/man8
 install -v -m755 wpa_cli wpa_passphrase wpa_supplicant $PKG/usr/sbin
 install -v -m644 doc/docbook/wpa_supplicant.conf.5 $PKG/usr/share/man/man5/
 install -v -m644 doc/docbook/wpa_cli.8 $PKG/usr/share/man/man8/
 install -v -m644 doc/docbook/wpa_passphrase.8 $PKG/usr/share/man/man8/
 install -v -m644 doc/docbook/wpa_supplicant.8 $PKG/usr/share/man/man8/
-
+	
 mkdir -p $PKG/etc
 cat > $PKG/etc/wpa_supplicant.conf << "EOF"
 ctrl_interface=DIR=/run/wpa_supplicant GROUP=wheel
 update_config=1
-EOF
\ No newline at end of file
+EOF
+}
diff --git a/repos/extra/wpa_supplicant/info b/repos/extra/wpa_supplicant/info
deleted file mode 100644
index 2586e456..00000000
--- a/repos/extra/wpa_supplicant/info
+++ /dev/null
@@ -1,7 +0,0 @@
-name=wpa_supplicant
-version=2.10
-release=1
-source="https://w1.fi/releases/$name-$version.tar.gz
-	run"
-sv="run"
-export CFLAGS="$CFLAGS $(pkg-config --cflags libnl-tiny)"
diff --git a/repos/extra/x264/info b/repos/extra/x264/abuild
index bafbcea6..bafbcea6 100644
--- a/repos/extra/x264/info
+++ b/repos/extra/x264/abuild
diff --git a/repos/extra/x265/info b/repos/extra/x265/abuild
index 3aac0cc3..3aac0cc3 100644
--- a/repos/extra/x265/info
+++ b/repos/extra/x265/abuild
diff --git a/repos/extra/xdg-user-dirs/info b/repos/extra/xdg-user-dirs/abuild
index 9b7afde1..9b7afde1 100644
--- a/repos/extra/xdg-user-dirs/info
+++ b/repos/extra/xdg-user-dirs/abuild
diff --git a/repos/extra/xkeyboard-config/info b/repos/extra/xkeyboard-config/abuild
index 3b5ccc55..3b5ccc55 100644
--- a/repos/extra/xkeyboard-config/info
+++ b/repos/extra/xkeyboard-config/abuild
diff --git a/repos/extra/zstd/info b/repos/extra/zstd/abuild
index 3c898a59..3c898a59 100644
--- a/repos/extra/zstd/info
+++ b/repos/extra/zstd/abuild