diff --git a/srcpkgs/composer8.1/files/composer8.1 b/srcpkgs/composer8.1/files/composer8.1
deleted file mode 100644
index a42b58d7bf15f8..00000000000000
--- a/srcpkgs/composer8.1/files/composer8.1
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-php8.1 /usr/libexec/composer.phar8.1 "$@"
diff --git a/srcpkgs/composer8.1/template b/srcpkgs/composer8.1/template
deleted file mode 100644
index b4a24ea2432677..00000000000000
--- a/srcpkgs/composer8.1/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'composer8.1'
-pkgname=composer8.1
-version=2.8.10
-revision=1
-build_style=fetch
-depends="php8.1"
-short_desc="Dependency manager for PHP"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://getcomposer.org/"
-changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
-distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
- https://raw.githubusercontent.com/composer/composer/main/LICENSE"
-checksum="28dbb6bd8bef31479c7985b774c130a8bda37dbe63c35b56f6cb6bc377427573
- 7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
-alternatives="composer:composer:/usr/bin/composer8.1"
-
-do_install() {
-	vbin ${FILESDIR}/composer8.1
-
-	vinstall composer.phar 644 usr/libexec composer.phar8.1
-	vlicense LICENSE
-
-	vmkdir /etc/php8.1/conf.d
-	printf 'extension=%s\n' phar iconv openssl zip \
-		>${DESTDIR}/etc/php8.1/conf.d/composer.ini
-}
diff --git a/srcpkgs/php8.1-apache b/srcpkgs/php8.1-apache
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-apache
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-apcu/files/README.voidlinux b/srcpkgs/php8.1-apcu/files/README.voidlinux
deleted file mode 100644
index 9da8a70ccc2ba9..00000000000000
--- a/srcpkgs/php8.1-apcu/files/README.voidlinux
+++ /dev/null
@@ -1,3 +0,0 @@
-To enable APCu add the following line to your php.ini:
-
-	extension=apcu.so
diff --git a/srcpkgs/php8.1-apcu/template b/srcpkgs/php8.1-apcu/template
deleted file mode 100644
index 3c9fa3bc471dd9..00000000000000
--- a/srcpkgs/php8.1-apcu/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'php8.1-apcu'
-pkgname=php8.1-apcu
-version=5.1.24
-revision=1
-build_style=gnu-configure
-configure_args="--with-php-config=/usr/bin/php-config8.1"
-make_check_target=test
-hostmakedepends="autoconf php8.1-devel"
-makedepends="php8.1-devel pcre2-devel"
-depends="php8.1"
-short_desc="In-memory key-value store for PHP"
-maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
-license="PHP-3.01"
-homepage="https://pecl.php.net/package/APCu"
-distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=5c28a55b27082c69657e25b7ecf553e2cf6b74ec3fa77d6b76f4fb982e001e43
-
-pre_configure() {
-	phpize8.1
-}
-
-pre_install() {
-	make_install_args="INSTALL_ROOT=$DESTDIR"
-}
-
-post_install() {
-	rm -r $DESTDIR/usr/include
-	vdoc "${FILESDIR}/README.voidlinux"
-}
diff --git a/srcpkgs/php8.1-apcu/update b/srcpkgs/php8.1-apcu/update
deleted file mode 100644
index ad899519e31382..00000000000000
--- a/srcpkgs/php8.1-apcu/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://pecl.php.net/package/APCu"
-pattern="apcu-\K[\d\.]*(?=\.tgz)"
diff --git a/srcpkgs/php8.1-ast/files/README.voidlinux b/srcpkgs/php8.1-ast/files/README.voidlinux
deleted file mode 100644
index 0dd0b5df2d961e..00000000000000
--- a/srcpkgs/php8.1-ast/files/README.voidlinux
+++ /dev/null
@@ -1,2 +0,0 @@
-To enable the ast extension please add the following to php.ini:
-	extension=ast.so 
diff --git a/srcpkgs/php8.1-ast/template b/srcpkgs/php8.1-ast/template
deleted file mode 100644
index 0c3ebcfff1622b..00000000000000
--- a/srcpkgs/php8.1-ast/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'php8.1-ast'
-pkgname=php8.1-ast
-version=1.1.2
-revision=1
-build_style=gnu-configure
-configure_args="--with-php-config=/usr/bin/php-config8.1"
-make_check_target="test"
-hostmakedepends="php8.1-devel autoconf"
-makedepends="php8.1-devel"
-depends="php8.1"
-checkdepends="${depends}"
-short_desc="Exposes the abstract syntax tree generated by PHP"
-maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
-license="BSD-3-Clause"
-homepage="https://github.com/nikic/php-ast"
-distfiles="https://pecl.php.net/get/ast-${version}.tgz"
-checksum=8742427ff7c07ba93f940968f7363972ea040d97d847da3b79b4283c2a369dea
-make_check_pre="env NO_INTERACTION=1"
-
-pre_configure() {
-	phpize8.1
-}
-
-do_install() {
-	make INSTALL_ROOT=${DESTDIR} install
-	vlicense LICENSE
-	vdoc "${FILESDIR}/README.voidlinux"
-}
diff --git a/srcpkgs/php8.1-cgi b/srcpkgs/php8.1-cgi
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-cgi
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-devel b/srcpkgs/php8.1-devel
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-devel
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-embed b/srcpkgs/php8.1-embed
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-embed
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-enchant b/srcpkgs/php8.1-enchant
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-enchant
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-ffi b/srcpkgs/php8.1-ffi
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-ffi
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-fpm b/srcpkgs/php8.1-fpm
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-fpm
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-gd b/srcpkgs/php8.1-gd
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-gd
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-igbinary/template b/srcpkgs/php8.1-igbinary/template
deleted file mode 100644
index d36a839daf69f0..00000000000000
--- a/srcpkgs/php8.1-igbinary/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'php8.1-igbinary'
-pkgname=php8.1-igbinary
-version=3.2.16
-revision=1
-build_style=gnu-configure
-configure_args="--with-php-config=/usr/bin/php-config8.1"
-hostmakedepends="autoconf php8.1-devel"
-makedepends="php8.1-devel"
-depends="php8.1"
-short_desc="Igbinary is a drop in replacement for the standard php serializer"
-maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
-license="BSD-3-Clause"
-homepage="https://github.com/igbinary/igbinary/"
-distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
-checksum=8bf25d465abc7973d9e2c9a3039a5f8eea635b23bc1477017ff3999ff95836da
-
-pre_configure() {
-	phpize8.1
-}
-
-do_install() {
-	make INSTALL_ROOT="${DESTDIR}" install
-	vlicense COPYING
-}
diff --git a/srcpkgs/php8.1-imagick/files/README.voidlinux b/srcpkgs/php8.1-imagick/files/README.voidlinux
deleted file mode 100644
index 00497519fcee5b..00000000000000
--- a/srcpkgs/php8.1-imagick/files/README.voidlinux
+++ /dev/null
@@ -1,3 +0,0 @@
-To enable the Imagick extension add the following line to your php.ini:
-
-	extension=imagick.so
diff --git a/srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch b/srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
deleted file mode 100644
index 16b8aaa5737151..00000000000000
--- a/srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/imagemagick.m4	2021-09-09 10:53:42.287881616 +0200
-+++ b/imagemagick.m4	2021-09-09 11:14:47.662312430 +0200
-@@ -167,6 +167,14 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[
-   
-     AC_MSG_RESULT([user location ${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/wand/MagickWand.h])
- 
-+  elif test -r "${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
-+
-+    IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
-+    IM_HEADER_STYLE="SEVEN"
-+    AC_DEFINE([IM_MAGICKWAND_HEADER_STYLE_SEVEN], [1], [ImageMagick 7.x style header])
-+
-+    AC_MSG_RESULT([${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h])
-+
-   elif test -r "${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
- 
-     IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
diff --git a/srcpkgs/php8.1-imagick/template b/srcpkgs/php8.1-imagick/template
deleted file mode 100644
index 9a2480e4f53e6b..00000000000000
--- a/srcpkgs/php8.1-imagick/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'php8.1-imagick'
-pkgname=php8.1-imagick
-version=3.7.0
-revision=12
-build_style=gnu-configure
-configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
- --with-php-config=/usr/bin/php-config8.1"
-hostmakedepends="php8.1-devel autoconf pkg-config"
-makedepends="php8.1-devel pcre2-devel libmagick-devel"
-depends="php8.1"
-short_desc="Provides a PHP wrapper to the ImageMagick library"
-maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
-license="PHP-3.01"
-homepage="https://pecl.php.net/package/imagick"
-distfiles="https://pecl.php.net/get/imagick-$version.tgz"
-checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e
-
-pre_configure() {
-	phpize8.1
-}
-
-pre_install() {
-	make_install_args="INSTALL_ROOT=$DESTDIR"
-}
-
-post_install() {
-	rm -r $DESTDIR/usr/include
-	vdoc "${FILESDIR}/README.voidlinux"
-}
diff --git a/srcpkgs/php8.1-imagick/update b/srcpkgs/php8.1-imagick/update
deleted file mode 100644
index fb47044a964d56..00000000000000
--- a/srcpkgs/php8.1-imagick/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='<th.*Release \K[\d.]+(?=:</th>)'
diff --git a/srcpkgs/php8.1-intl b/srcpkgs/php8.1-intl
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-intl
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-ldap b/srcpkgs/php8.1-ldap
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-ldap
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-mongodb/files/README.voidlinux b/srcpkgs/php8.1-mongodb/files/README.voidlinux
deleted file mode 100644
index 173fab80af8df0..00000000000000
--- a/srcpkgs/php8.1-mongodb/files/README.voidlinux
+++ /dev/null
@@ -1,3 +0,0 @@
-To enable the MongoDB extension add the following line to your php.ini:
-
-	extension=mongodb
diff --git a/srcpkgs/php8.1-mongodb/template b/srcpkgs/php8.1-mongodb/template
deleted file mode 100644
index be1d62581d5b24..00000000000000
--- a/srcpkgs/php8.1-mongodb/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'php8.1-mongodb'
-pkgname=php8.1-mongodb
-version=1.20.0
-revision=1
-build_style=gnu-configure
-configure_args="--with-php-config=/usr/bin/php-config8.1"
-hostmakedepends="php8.1-devel autoconf pkg-config"
-makedepends="php8.1-devel pcre2-devel openssl-devel"
-depends="php8.1"
-short_desc="Official MongoDB PHP driver"
-maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
-license="Apache-2.0"
-homepage="https://pecl.php.net/package/mongodb"
-changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
-distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
-checksum=01e87973fe7e54aac52054ec4a99cdd439ed5c01f7e5b8ea0a57031850d8e75a
-
-pre_configure() {
-	phpize8.1
-}
-
-pre_install() {
-	make_install_args="INSTALL_ROOT=$DESTDIR"
-}
-
-post_install() {
-	vdoc "${FILESDIR}/README.voidlinux"
-}
diff --git a/srcpkgs/php8.1-mongodb/update b/srcpkgs/php8.1-mongodb/update
deleted file mode 100644
index fb47044a964d56..00000000000000
--- a/srcpkgs/php8.1-mongodb/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='<th.*Release \K[\d.]+(?=:</th>)'
diff --git a/srcpkgs/php8.1-mysql b/srcpkgs/php8.1-mysql
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-mysql
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-odbc b/srcpkgs/php8.1-odbc
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-odbc
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-pear
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-pgsql b/srcpkgs/php8.1-pgsql
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-pgsql
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-phpdbg b/srcpkgs/php8.1-phpdbg
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-phpdbg
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-redis/files/README.voidlinux b/srcpkgs/php8.1-redis/files/README.voidlinux
deleted file mode 100644
index 2a9de04b421e15..00000000000000
--- a/srcpkgs/php8.1-redis/files/README.voidlinux
+++ /dev/null
@@ -1,3 +0,0 @@
-To enable the Redis extension add the following line to your php.ini:
-
-	extension=redis
diff --git a/srcpkgs/php8.1-redis/template b/srcpkgs/php8.1-redis/template
deleted file mode 100644
index e08cf5582915a1..00000000000000
--- a/srcpkgs/php8.1-redis/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'php8.1-redis'
-pkgname=php8.1-redis
-version=6.1.0
-revision=1
-build_style=gnu-configure
-configure_args="--with-php-config=/usr/bin/php-config8.1"
-hostmakedepends="php8.1-devel autoconf pkg-config"
-makedepends="php8.1-devel"
-depends="php8.1"
-short_desc="PHP extension for Redis"
-maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
-license="PHP-3.01"
-homepage="https://pecl.php.net/package/redis"
-distfiles="https://pecl.php.net/get/redis-$version.tgz"
-checksum=f10405f639fe415e9ed4ec99538e72c90694d8dbd62868edcfcd6a453466b48c
-
-pre_configure() {
-	phpize8.1
-}
-
-pre_install() {
-	make_install_args="INSTALL_ROOT=$DESTDIR"
-}
-
-post_install() {
-	vdoc $FILESDIR/README.voidlinux
-}
diff --git a/srcpkgs/php8.1-redis/update b/srcpkgs/php8.1-redis/update
deleted file mode 100644
index fb47044a964d56..00000000000000
--- a/srcpkgs/php8.1-redis/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='<th.*Release \K[\d.]+(?=:</th>)'
diff --git a/srcpkgs/php8.1-snmp b/srcpkgs/php8.1-snmp
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-snmp
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-sodium b/srcpkgs/php8.1-sodium
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-sodium
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-sqlite b/srcpkgs/php8.1-sqlite
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-sqlite
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-tidy b/srcpkgs/php8.1-tidy
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-tidy
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-xsl b/srcpkgs/php8.1-xsl
deleted file mode 120000
index 4ad857cc7c081d..00000000000000
--- a/srcpkgs/php8.1-xsl
+++ /dev/null
@@ -1 +0,0 @@
-php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/files/apache.conf b/srcpkgs/php8.1/files/apache.conf
deleted file mode 100644
index bc57ba73dbcdf3..00000000000000
--- a/srcpkgs/php8.1/files/apache.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Required modules: dir_module, php_module
-
-<IfModule dir_module>
-	<IfModule php_module>
-		DirectoryIndex index.php index.html
-		<FilesMatch "\.php$">
-			SetHandler application/x-httpd-php
-		</FilesMatch>
-		<FilesMatch "\.phps$">
-			SetHandler application/x-httpd-php-source
-		</FilesMatch>
-	</IfModule>
-</IfModule>
diff --git a/srcpkgs/php8.1/files/php-fpm8.1/run b/srcpkgs/php8.1/files/php-fpm8.1/run
deleted file mode 100644
index ddc4298cece4ac..00000000000000
--- a/srcpkgs/php8.1/files/php-fpm8.1/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-exec 2>&1
-[ -r conf ] && . ./conf
-exec php-fpm8.1 --nodaemonize ${OPTS}
diff --git a/srcpkgs/php8.1/patches/cross-configure.patch b/srcpkgs/php8.1/patches/cross-configure.patch
deleted file mode 100644
index c6977514ceba71..00000000000000
--- a/srcpkgs/php8.1/patches/cross-configure.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4
-index 80ffd97..d8cad47 100644
---- a/ext/pdo_pgsql/config.m4
-+++ b/ext/pdo_pgsql/config.m4
-@@ -20,7 +20,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then
-     fi
-   done
- 
--  if test -n "$PG_CONFIG"; then
-+  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
-     AC_MSG_RESULT([$PG_CONFIG])
-     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
-     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
-diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
-index 669a9f7..7e5bf7f 100644
---- a/ext/pgsql/config.m4
-+++ b/ext/pgsql/config.m4
-@@ -18,7 +18,7 @@ if test "$PHP_PGSQL" != "no"; then
-     fi
-   done
- 
--  if test -n "$PG_CONFIG"; then
-+  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
-     AC_MSG_RESULT([$PG_CONFIG])
-     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
-     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
diff --git a/srcpkgs/php8.1/patches/cross-ltmain-sysroot-support.patch b/srcpkgs/php8.1/patches/cross-ltmain-sysroot-support.patch
deleted file mode 100644
index a6447ac150221e..00000000000000
--- a/srcpkgs/php8.1/patches/cross-ltmain-sysroot-support.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-PHP's phpize is based on a very old libtool to generate build files for its
-extensions. This libtool does not support .la files with '=' to support
-sysroot.
-
-In order to support more PHP extension cross compilation this modifies
-ltmain.sh to support such path. This is a bit hackish has it only get sysroot
-from the used toolchain; the proper way to fix that is to have PHP developpers
-to update the autotools file used to build there extensions.
-
---- a/build/ltmain.sh	2021-09-09 15:19:14.822208365 +0200
-+++ b/build/ltmain.sh	2021-09-09 15:47:55.397011151 +0200
-@@ -2375,6 +2375,13 @@ EOF
- 	*) . ./$lib ;;
- 	esac
- 
-+        newdependency_libs=
-+        for deplib in $dependency_libs; do
-+            deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#")
-+            newdependency_libs="$newdependency_libs $deplib"
-+        done
-+        dependency_libs=${newdependency_libs}
-+
- 	if test "$linkmode,$pass" = "lib,link" ||
- 	   test "$linkmode,$pass" = "prog,scan" ||
- 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -5750,6 +5757,13 @@ fi\
- 	  case $host,$output,$installed,$module,$dlname in
- 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
- 	  esac
-+
-+          newdependency_libs=
-+          for deplib in $dependency_libs; do
-+              deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#")
-+              newdependency_libs="$newdependency_libs $deplib"
-+          done
-+
- 	  $echo > $output "\
- # $outputname - a libtool library file
- # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-@@ -5767,7 +5781,7 @@ library_names='$library_names'
- old_library='$old_library'
- 
- # Libraries that this one depends upon.
--dependency_libs='$dependency_libs'
-+dependency_libs='$newdependency_libs'
- 
- # Version information for $libname.
- current=$current
diff --git a/srcpkgs/php8.1/patches/cross-pear.patch b/srcpkgs/php8.1/patches/cross-pear.patch
deleted file mode 100644
index f9191a50a0b58c..00000000000000
--- a/srcpkgs/php8.1/patches/cross-pear.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/pear/Makefile.frag	2020-03-17 11:40:21.000000000 +0100
-+++ b/pear/Makefile.frag	2020-04-12 22:29:31.846943414 +0200
-@@ -8,9 +8,10 @@ FETCH = `which fetch 2>/dev/null`
- PEAR_PREFIX = -dp a${program_prefix}
- PEAR_SUFFIX = -ds a$(program_suffix)
- PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
-+PEAR_PHP ?= $(top_builddir)/sapi/cli/php
- 
- install-pear-installer: $(SAPI_CLI_PATH)
--	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
-+	@$(PEAR_PHP) $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
- 
- install-pear:
- 	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
-@@ -23,7 +24,7 @@ install-pear:
- 			elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
- 				"$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \
- 			else \
--				$(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
-+				$(PEAR_PHP) -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
- 			fi \
- 		fi \
- 	fi
diff --git a/srcpkgs/php8.1/patches/cross-phar.patch b/srcpkgs/php8.1/patches/cross-phar.patch
deleted file mode 100644
index 1e4e627ec65b96..00000000000000
--- a/srcpkgs/php8.1/patches/cross-phar.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/ext/phar/Makefile.frag	2020-04-13 12:18:23.998801926 +0200
-+++ b/ext/phar/Makefile.frag	2020-04-13 12:20:58.031795293 +0200
-@@ -8,12 +8,14 @@ $(srcdir)/phar_path_check.c: $(srcdir)/p
- 
- pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
- 
-+PHAR_PHP ?= $(top_builddir)/$(SAPI_CLI_PATH)
-+PHAR_PHP_MODULES ?= $(top_builddir)/modules
- PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
- PHP_PHARCMD_EXECUTABLE = ` \
--	if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
--		$(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
-+	if test -x "$(PHAR_PHP)"; then \
-+		$(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP) -n"; \
- 		if test "x$(PHP_MODULES)" != "x"; then \
--		$(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
-+		$(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(PHAR_PHP_MODULES)"; \
- 		for i in bz2 zlib phar; do \
- 			if test -f "$(top_builddir)/modules/$$i.la"; then \
- 				. $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
-@@ -21,7 +23,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
- 		done; \
- 		fi; \
- 	else \
--		$(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
-+		$(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP)"; \
- 	fi;`
- PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
- 
diff --git a/srcpkgs/php8.1/patches/cross-phpize-sysroot-support.patch b/srcpkgs/php8.1/patches/cross-phpize-sysroot-support.patch
deleted file mode 100644
index 76cff3f8166410..00000000000000
--- a/srcpkgs/php8.1/patches/cross-phpize-sysroot-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/scripts/phpize.m4	2020-03-17 11:40:21.000000000 +0100
-+++ b/scripts/phpize.m4	2020-04-15 12:27:36.400466387 +0200
-@@ -44,6 +44,12 @@ PHP_ARG_WITH([libdir],
-   [lib],
-   [no])
- 
-+PHP_ARG_WITH([sysroot],,
-+  [AS_HELP_STRING([--with-sysroot=NAME],
-+    [System sysroot])],
-+    [no],
-+    [no])
-+
- PHP_RUNPATH_SWITCH
- PHP_SHLIB_SUFFIX_NAMES
- 
-@@ -58,7 +64,11 @@ dnl For BC.
- PHP_CONFIG=$PHP_PHP_CONFIG
- prefix=`$PHP_CONFIG --prefix 2>/dev/null`
- phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
--INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
-+if test "x$PHP_SYSROOT" = xno; then :
-+	INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
-+else
-+	INCLUDES=`$PHP_CONFIG --includes 2>/dev/null | sed "s#-I#-I$PHP_SYSROOT#g"`
-+fi
- EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
- PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
- 
diff --git a/srcpkgs/php8.1/patches/musl-crypt.patch b/srcpkgs/php8.1/patches/musl-crypt.patch
deleted file mode 100644
index b83a7ab9bc1e49..00000000000000
--- a/srcpkgs/php8.1/patches/musl-crypt.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-TODO: This is apparently needed on musl, not sure what the error is, might be
-something to dig in to.
-
---- a/ext/standard/crypt.c	2016-04-28 14:13:00.000000000 -0400
-+++ b/ext/standard/crypt.c	2016-04-28 21:45:24.340955313 -0400
-@@ -267,6 +267,12 @@
- 	}
- # elif defined(HAVE_CRYPT)
- 	crypt_res = crypt(password, salt);
-+	if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
-+		return NULL;
-+	} else {
-+		result = zend_string_init(crypt_res, strlen(crypt_res), 0);
-+		return result;
-+	}
- # else
- #  error No crypt() implementation
- # endif
diff --git a/srcpkgs/php8.1/patches/php-fpm.patch b/srcpkgs/php8.1/patches/php-fpm.patch
deleted file mode 100644
index 5e55e179f8a4a0..00000000000000
--- a/srcpkgs/php8.1/patches/php-fpm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/sapi/fpm/Makefile.frag	2017-04-15 23:58:56.965737425 +0200
-+++ b/sapi/fpm/Makefile.frag	2017-04-16 00:00:57.814831649 +0200
-@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH)
- 	else \
- 		echo "Installing PHP FPM defconfig:     $(INSTALL_ROOT)$(sysconfdir)/" && \
- 		$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
--		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
--		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
-+		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
-+		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
- 	fi
- 	
- 	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
diff --git a/srcpkgs/php8.1/patches/php8.1-fix-manpages.patch b/srcpkgs/php8.1/patches/php8.1-fix-manpages.patch
deleted file mode 100644
index 06b5b7d0cf0aef..00000000000000
--- a/srcpkgs/php8.1/patches/php8.1-fix-manpages.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This patch fixes .so links in man pages.
-It's needed because of the configure option -
-
-    --program-suffix=${_php_version}
-
-The changes made by this patch should be the same as the changes made by this
-block of code -
-
-    _regexp='^[[:space:]]*\.so[[:space:]]'
-    for file in $(grep -l -e "$_regexp" -R .); do
-    	vsed -i "$file" -e "/$_regexp/"'s=^[[:space:]]*\.[^.]*=&'${_php_version}=
-    done
-
-Where _php_version is defined in the template file.
-
---- a/ext/phar/phar.phar.1.in
-+++ b/ext/phar/phar.phar.1.in
-@@ -1 +1 @@
--.so man1/phar.1
-+.so man1/phar8.1.1
---- a/sapi/cgi/php-cgi.1.in
-+++ b/sapi/cgi/php-cgi.1.in
-@@ -1 +1 @@
--.so man1/php.1
-+.so man1/php8.1.1
diff --git a/srcpkgs/php8.1/patches/php8.1-ini.patch b/srcpkgs/php8.1/patches/php8.1-ini.patch
deleted file mode 100644
index e4d45eafed320b..00000000000000
--- a/srcpkgs/php8.1/patches/php8.1-ini.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/php.ini-production b/php.ini-production
-index b39a960..68f14a6 100644
---- a/php.ini-production
-+++ b/php.ini-production
-@@ -737,7 +737,7 @@ default_charset = "UTF-8"
- ;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear8.1"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -760,9 +760,7 @@ user_dir =
- 
- ; Directory in which the loadable extensions (modules) reside.
- ; https://php.net/extension-dir
--;extension_dir = "./"
--; On windows:
--;extension_dir = "ext"
-+extension_dir = "/usr/lib/php8.1/modules/"
- 
- ; Directory where the temporary files should be placed.
- ; Defaults to the system default (see sys_get_temp_dir)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
deleted file mode 100644
index 6e95ccdcd9cab3..00000000000000
--- a/srcpkgs/php8.1/template
+++ /dev/null
@@ -1,383 +0,0 @@
-# Template file for 'php8.1'
-# rebuild php8.1-apcu and php8.1-imagick when updating this package
-pkgname=php8.1
-version=8.1.31
-revision=1
-_php_version=8.1
-hostmakedepends="bison pkg-config apache-devel autoconf"
-makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
- gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
- libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
- postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
- libffi-devel oniguruma-devel gd-devel acl-devel"
-short_desc="HTML-embedded scripting language"
-maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
-license="PHP-3.01"
-homepage="https://www.php.net"
-changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
-# this is the source where the www.php.net code pulls the tarballs it serves
-# at https://www.php.net/distributions/
-distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=618923b407c4575bfee085f00c4aaa16a5cc86d4b1eb893c0f352d61541bbfb1
-provides="php-runtime-${version}_1"
-
-system_accounts="_phpfpm"
-_phpfpm_homedir="/var/empty"
-
-conf_files="/etc/php${_php_version}/php.ini"
-
-lib32disabled=yes
-
-if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
-	makedepends+=" libxcrypt-devel"
-fi
-
-if [ -n "$CROSS_BUILD" ]; then
-	# phar and pear need php to build
-	hostmakedepends+=" php${_php_version}"
-	CFLAGS+=" -DHAVE_LIBDL
-		 -DHAVE_DLOPEN
-		 -DHAVE_DLSYM
-		 -DHAVE_SHM_IPC
-		 -DHAVE_SHM_MMAP_ANON
-		 -DHAVE_SHM_MMAP_ZERO
-		 -DHAVE_SHM_MMAP_POSIX
-		 -DHAVE_SHM_MMAP_FILE"
-fi
-
-alternatives="
- php:phar.phar:/usr/bin/phar${_php_version}.phar
- php:php:/usr/bin/php${_php_version}
- php:phar:/usr/bin/phar${_php_version}
- php:phar.1:/usr/share/man/man1/phar${_php_version}.1
- php:phar.phar.1:/usr/share/man/man1/phar${_php_version}.phar.1
- php:php.1:/usr/share/man/man1/php${_php_version}.1"
-
-do_configure() {
-	autoconf -f
-}
-
-do_build() {
-	local _phpconfig="--srcdir=.. \
-		--config-cache \
-		--prefix=/usr \
-		--sbindir=/usr/bin \
-		--sysconfdir=/etc/php${_php_version} \
-		--localstatedir=/var \
-		--with-layout=GNU \
-		--with-config-file-path=/etc/php${_php_version} \
-		--with-config-file-scan-dir=/etc/php${_php_version}/conf.d \
-		--disable-rpath \
-		--mandir=/usr/share/man \
-		--libdir=/usr/lib/php${_php_version} \
-		--datarootdir=/usr/share/php${_php_version} \
-		--datadir=/usr/share/php${_php_version} \
-		--program-suffix=${_php_version} \
-		--includedir=/usr/include/php${_php_version} \
-		"
-
-	local _phpextensions="--enable-bcmath=shared \
-		--enable-calendar=shared \
-		--enable-exif=shared \
-		--enable-ftp=shared \
-		--enable-intl=shared \
-		--enable-mbstring \
-		--enable-opcache \
-		--enable-pcntl \
-		--enable-phar=shared \
-		--enable-posix=shared \
-		--enable-shmop=shared \
-		--enable-soap=shared \
-		--enable-sockets=shared \
-		--enable-sysvmsg=shared \
-		--enable-sysvsem=shared \
-		--enable-sysvshm=shared \
-		--enable-mysqlnd \
-		--enable-gd=shared \
-		--with-external-gd \
-		--with-ffi=shared \
-		--with-bz2=shared,$XBPS_CROSS_BASE/usr/ \
-		--with-curl=shared \
-		--with-db4=$XBPS_CROSS_BASE/usr \
-		--with-enchant=shared,$XBPS_CROSS_BASE/usr \
-		--with-gdbm=$XBPS_CROSS_BASE/usr \
-		--with-gettext=shared \
-		--with-gmp=shared \
-		--with-iconv=shared \
-		--with-ldap=shared,$XBPS_CROSS_BASE/usr \
-		--with-ldap-sasl \
-		--with-sodium=shared \
-		--with-mhash \
-		--with-mysql-sock=/run/mysqld/mysqld.sock \
-		--with-mysqli=shared,mysqlnd \
-		--with-openssl=shared \
-		--with-external-pcre \
-		--with-pear=/usr/share/pear${_php_version} \
-		--with-pdo-mysql=shared,mysqlnd \
-		--with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
-		--with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
-		--with-pdo-sqlite=shared,$XBPS_CROSS_BASE/usr \
-		--with-pgsql=shared,$XBPS_CROSS_BASE/usr \
-		--with-readline=$XBPS_CROSS_BASE/usr \
-		--with-snmp=shared,$XBPS_CROSS_BASE/usr \
-		--with-sqlite3=shared,$XBPS_CROSS_BASE/usr \
-		--with-unixODBC=shared,$XBPS_CROSS_BASE/usr \
-		--with-xsl=shared,$XBPS_CROSS_BASE/usr \
-		--with-tidy=shared,$XBPS_CROSS_BASE/usr \
-		--with-zip=shared \
-		--with-zlib \
-		${configure_args} \
-		"
-	if [ -n "$CROSS_BUILD" ]; then
-		local _make_env="PHAR_PHP=/usr/bin/php${_php_version} PHAR_PHP_MODULES=/usr/lib/php${_php_version}/modules"
-	fi
-
-	EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
-	export EXTENSION_DIR
-	PEAR_INSTALLDIR=/usr/share/pear${_php_version}
-	export PEAR_INSTALLDIR
-	EXTRA_LIBS="-ldl"
-	export EXTRA_LIBS
-
-	# cgi,cli,embed,fcgi,fpm
-	mkdir -p build
-	cd build
-	ln -s ${wrksrc}/configure
-	./configure ${_phpconfig} \
-		--host=${XBPS_CROSS_TRIPLET} \
-		--enable-cgi \
-		--enable-fpm \
-		--with-fpm-user=_phpfpm \
-		--with-fpm-group=_phpfpm \
-		--with-fpm-acl \
-		--enable-embed=shared \
-		${_phpextensions}
-	make ${makejobs} ${_make_env}
-
-	# apache
-	# reuse the previous run; this will save us a lot of time
-	cp -a ${wrksrc}/build ${wrksrc}/build-apache
-	cd ${wrksrc}/build-apache
-	./configure ${_phpconfig} \
-		--host=${XBPS_CROSS_TRIPLET} \
-		--with-apxs2 \
-		${_phpextensions}
-	make ${makejobs} ${_make_env}
-}
-
-do_install() {
-	cd ${wrksrc}/build
-	local _env="INSTALL_ROOT=${DESTDIR}"
-	if [ -n "$CROSS_BUILD" ]; then
-		_env+=" PHAR_PHP=/usr/bin/php${_php_version}"
-	fi
-	make ${_env} install-{modules,cli,build,headers,programs,pharcmd}
-
-	# install php.ini
-	vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini
-	# remove static modules
-	rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a"
-}
-
-php8.1-devel_package() {
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/php${_php_version}/build"
-		vmove "usr/bin/php-config${_php_version}"
-		vmove "usr/bin/phpize${_php_version}"
-		vmove "usr/share/man/man1/phpize${_php_version}.1"
-		vmove "usr/share/man/man1/php-config${_php_version}.1"
-	}
-}
-
-php8.1-phpdbg_package() {
-	short_desc+=" - interactive debugger"
-	depends="php${_php_version}>=${version}_${revision}"
-	pkg_install() {
-		cd ${wrksrc}/build
-		make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg
-	}
-}
-
-php8.1-cgi_package() {
-	short_desc+=' - CGI and FCGI SAPI'
-	depends="php${_php_version}>=${version}_${revision}"
-	pkg_install() {
-		cd ${wrksrc}/build
-		make INSTALL_ROOT=${PKGDESTDIR} install-cgi
-	}
-}
-
-php8.1-apache_package() {
-	short_desc+=' - Apache SAPI'
-	depends="php${_php_version}>=${version}_${revision}"
-	conf_files="/etc/apache/extra/php${_php_version}_module.conf"
-	alternatives="
-	 php-apache:libphp.so:/usr/libexec/httpd/modules/libphp${_php_version}.so
-	 php-apache:php_module.conf:/etc/apache/extra/php${_php_version}_module.conf"
-	pkg_install() {
-		vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so"
-		vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf"
-	}
-}
-
-php8.1-fpm_package() {
-	short_desc+=' - FastCGI Process Manager'
-	depends="php${_php_version}>=${version}_${revision}"
-	conf_files="/etc/php${_php_version}/php-fpm.conf /etc/php${_php_version}/php-fpm.d/*"
-	pkg_install() {
-		cd ${wrksrc}/build
-		make INSTALL_ROOT=${PKGDESTDIR} install-fpm
-		vsv "php-fpm${_php_version}"
-	}
-}
-
-php8.1-embed_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - Embed SAPI'
-	pkg_install() {
-		cd ${wrksrc}/build
-		make INSTALL_ROOT=${PKGDESTDIR} PHP_SAPI=embed install-sapi
-		mv ${PKGDESTDIR}/usr/lib/libphp.so ${PKGDESTDIR}/usr/lib/libphp${_php_version}.so
-	}
-}
-
-php8.1-pear_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}
-	 php${_php_version}>=devel-${version}_${revision} autoconf"
-	short_desc+=' - PHP Extension and Application Repository'
-	conf_files="/etc/php${_php_version}/pear.conf"
-	pkg_install() {
-		cd ${wrksrc}/build
-		local _env="INSTALL_ROOT=${PKGDESTDIR} PHP_PEAR_PHP_BIN=php${_php_version}"
-		if [ -n "$CROSS_BUILD" ]; then
-			_env+=" PEAR_PHP=/usr/bin/php${_php_version}"
-		fi
-		make install-pear ${_env}
-		rm -rf ${PKGDESTDIR}/.{channels,depdb,depdblock,filemap,lock,registry}
-		rm -rf ${PKGDESTDIR}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
-		mv ${PKGDESTDIR}/usr/bin/pear{,${_php_version}}
-		mv ${PKGDESTDIR}/usr/bin/peardev{,${_php_version}}
-		mv ${PKGDESTDIR}/usr/bin/pecl{,${_php_version}}
-	}
-}
-
-php8.1-enchant_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - enchant module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/enchant.so"
-	}
-}
-
-php8.1-gd_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - gd module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/gd.so"
-	}
-}
-
-php8.1-intl_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - Internationalization module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/intl.so"
-	}
-}
-
-php8.1-ldap_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - LDAP module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/ldap.so"
-	}
-}
-
-php8.1-mysql_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - MySQL modules'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/*mysql*.so"
-	}
-}
-
-php8.1-odbc_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - ODBC modules'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/*odbc.so"
-	}
-}
-
-php8.1-pgsql_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - PostgreSQL modules'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/*pgsql.so"
-	}
-}
-
-php8.1-snmp_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - snmp module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/snmp.so"
-	}
-}
-
-php8.1-sqlite_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - sqlite module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/*sqlite*.so"
-	}
-}
-
-php8.1-tidy_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - tidy HTML module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/*tidy*.so"
-	}
-}
-
-php8.1-xsl_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - XSL module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/xsl.so"
-	}
-}
-
-php8.1-sodium_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - sodium module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/sodium.so"
-	}
-}
-
-php8.1-ffi_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - FFI module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/ffi.so"
-	}
-}
diff --git a/srcpkgs/php8.1/update b/srcpkgs/php8.1/update
deleted file mode 100644
index e39f4573be8907..00000000000000
--- a/srcpkgs/php8.1/update
+++ /dev/null
@@ -1,3 +0,0 @@
-pkgname=php
-ignore="8.[2-9].*"
-site="https://www.php.net/distributions/"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index feaf57a56859fc..f50506e56406f1 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -92,6 +92,7 @@ replaces="
  cointop<=1.6.10_1
  compiler-rt17<=17.0.6_5
  composer8.0<=2.5.8_1
+ composer8.1<=2.8.10_1
  compton-conf<=0.15.0_1
  couchdb<=1.7.1_2
  couchpotato<=3.0.1_3
@@ -683,6 +684,33 @@ replaces="
  php8.0-tidy<=8.0.29_1
  php8.0-xsl<=8.0.29_1
  php8.0<=8.0.29_1
+ php8.1-apache<=8.1.31_1
+ php8.1-apcu<=5.1.24_1
+ php8.1-ast<=1.1.2_1
+ php8.1-cgi<=8.1.31_1
+ php8.1-devel<=8.1.31_1
+ php8.1-embed<=8.1.31_1
+ php8.1-enchant<=8.1.31_1
+ php8.1-ffi<=8.1.31_1
+ php8.1-fpm<=8.1.31_1
+ php8.1-gd<=8.1.31_1
+ php8.1-igbinary<=3.2.16_1
+ php8.1-imagick<=3.7.0_12
+ php8.1-intl<=8.1.31_1
+ php8.1-ldap<=8.0.29_2
+ php8.1-mongodb<=1.20.0_1
+ php8.1-mysql<=8.1.31_1
+ php8.1-odbc<=8.1.31_1
+ php8.1-pear<=8.1.31_1
+ php8.1-pgsql<=8.1.31_1
+ php8.1-phpdbg<=8.1.31_1
+ php8.1-redis<=6.1.0_1
+ php8.1-snmp<=8.1.31_1
+ php8.1-sodium<=8.1.31_1
+ php8.1-sqlite<=8.1.31_1
+ php8.1-tidy<=8.1.31_1
+ php8.1-xsl<=8.1.31_1
+ php8.1<=8.1.31_1
  plasma-applet-active-window-control<=1.7.3_1
  plex-media-player<=2.58.0_4
  plex-media-server<=1.15.3.876_4
@@ -1000,6 +1028,7 @@ replaces="
  wmii<=3.9.2_8
  xcdroast<=1.19_1
  xdebug8.0<=3.2.1_1
+ xdebug8.1<=3.3.2_1
  xlennart<=1.1.1_1
  xmonad-contrib<=0.16_3
  xmonad<=0.15_5
diff --git a/srcpkgs/xdebug8.1/files/README.voidlinux b/srcpkgs/xdebug8.1/files/README.voidlinux
deleted file mode 100644
index 04e3343216f7f1..00000000000000
--- a/srcpkgs/xdebug8.1/files/README.voidlinux
+++ /dev/null
@@ -1 +0,0 @@
-You should add 'zend_extension="xdebug.so"' to php.ini
diff --git a/srcpkgs/xdebug8.1/template b/srcpkgs/xdebug8.1/template
deleted file mode 100644
index 5f5c192106a34b..00000000000000
--- a/srcpkgs/xdebug8.1/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'xdebug8.1'
-pkgname=xdebug8.1
-version=3.3.2
-revision=1
-build_style=gnu-configure
-configure_args="--with-php-config=/usr/bin/php-config8.1"
-hostmakedepends="autoconf php8.1-devel"
-makedepends="php8.1-devel"
-short_desc="PHP debugging extension"
-maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
-license="PHP-3.0"
-homepage="http://xdebug.org"
-changelog="https://xdebug.org/updates"
-distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
-checksum=15545b8311bedb5e7df08fd90d6653d9bf33629791e8119e70350475df932c55
-
-pre_configure() {
-	phpize8.1
-}
-
-do_install() {
-	make INSTALL_ROOT=${DESTDIR} install
-	vlicense LICENSE
-	vdoc "${FILESDIR}/README.voidlinux"
-}
diff --git a/srcpkgs/xdebug8.1/update b/srcpkgs/xdebug8.1/update
deleted file mode 100644
index 280b0bc7e3ac92..00000000000000
--- a/srcpkgs/xdebug8.1/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://xdebug.org/updates"
-pattern='<dt><a name=.*></a>.*Xdebug \K[\d.]+(?=</dt>)'
diff --git a/srcpkgs/zabbix/patches/fix-libxml2_m4.patch b/srcpkgs/zabbix/patches/fix-libxml2_m4.patch
index dfdcd55ce5c61a..79f708d4215da3 100644
--- a/srcpkgs/zabbix/patches/fix-libxml2_m4.patch
+++ b/srcpkgs/zabbix/patches/fix-libxml2_m4.patch
@@ -1,11 +1,13 @@
---- a/m4/libxml2.m4	2020-05-10 19:36:06.000000000 +0200
-+++ b/m4/libxml2.m4	2020-07-24 07:58:12.642619506 +0200
-@@ -52,7 +52,7 @@
-         AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-         PKG_PROG_PKG_CONFIG()
+diff --git a/m4/libxml2.m4 b/m4/libxml2.m4
+index a5e9b22..bbb3c0e 100644
+--- a/m4/libxml2.m4
++++ b/m4/libxml2.m4
+@@ -63,7 +63,7 @@ AS_HELP_STRING([--with-libxml2@<:@=ARG@:>@],
+             AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+             m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG()], [:])
  
--        if test -x "$PKG_CONFIG"; then
-+        if test -x $(which "$PKG_CONFIG"); then
+-            if test -x "$PKG_CONFIG"; then
++            if test -x $(which "$PKG_CONFIG"); then
  
-             LIBXML2_CFLAGS="`$PKG_CONFIG --cflags libxml-2.0`"
+                 LIBXML2_CFLAGS="`$PKG_CONFIG --cflags libxml-2.0`"
  
diff --git a/srcpkgs/zabbix/template b/srcpkgs/zabbix/template
index 707b48567e87ec..32b50afadc69fa 100644
--- a/srcpkgs/zabbix/template
+++ b/srcpkgs/zabbix/template
@@ -1,6 +1,6 @@
 # Template file for 'zabbix'
 pkgname=zabbix
-version=6.2.2
+version=6.4.21
 revision=1
 build_style=gnu-configure
 configure_args="--with-gnutls --with-libcurl --with-libxml2=yes --with-net-snmp
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.zabbix.com"
 changelog="https://www.zabbix.com/rn/rn${version}"
 distfiles="https://cdn.zabbix.com/zabbix/sources/oldstable/${version%.*}/zabbix-${version}.tar.gz"
-checksum=f0e7a9abb0f65d700f531253b91c31165077a9c94769cc8d238a423ada852773
+checksum=527010dbd45cf204dcd3b38e82df696b908b74f38e8d1ab9bbbb1292e784f394
 conf_files="/etc/zabbix_server.conf"
 system_accounts="_zabbix_server"
 system_groups="_zabbix_server"
@@ -95,7 +95,7 @@ zabbix-proxy_package() {
 }
 
 zabbix-frontend-php_package() {
-	depends="zabbix php8.1-gd php8.1-mysql"
+	depends="zabbix php8.2-gd php8.2-mysql"
 	short_desc="Zabbix Networking Monitoring PHP Frontend"
 	conf_files="/etc/webapps/zabbix/zabbix.conf.php /etc/webapps/zabbix/maintenance.inc.php"
 	pkg_install() {