diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index f19688b52f6..49fd265f684 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1'
 pkgname=php8.1
 version=8.1.12
-revision=1
+revision=2
 _php_version=8.1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -36,6 +36,14 @@ if [ -n "$CROSS_BUILD" ]; then
 		 -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_build() {
 	local _phpconfig="--srcdir=.. \
 		--config-cache \
@@ -171,7 +179,7 @@ php8.1-devel_package() {
 
 php8.1-phpdbg_package() {
 	short_desc+=" - interactive debugger"
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	pkg_install() {
 		cd ${wrksrc}/build
 		make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg
@@ -180,7 +188,7 @@ php8.1-phpdbg_package() {
 
 php8.1-cgi_package() {
 	short_desc+=' - CGI and FCGI SAPI'
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	pkg_install() {
 		cd ${wrksrc}/build
 		make INSTALL_ROOT=${PKGDESTDIR} install-cgi
@@ -189,7 +197,7 @@ php8.1-cgi_package() {
 
 php8.1-apache_package() {
 	short_desc+=' - Apache SAPI'
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	conf_files="/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"
@@ -199,7 +207,7 @@ php8.1-apache_package() {
 
 php8.1-fpm_package() {
 	short_desc+=' - FastCGI Process Manager'
-	depends="php${_php_version}-${version}_${revision}"
+	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
@@ -210,7 +218,7 @@ php8.1-fpm_package() {
 
 php8.1-embed_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	short_desc+=' - Embed SAPI'
 	pkg_install() {
 		cd ${wrksrc}/build
@@ -221,8 +229,8 @@ php8.1-embed_package() {
 
 php8.1-pear_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}
-	 php${_php_version}-devel-${version}_${revision} autoconf"
+	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() {
@@ -242,7 +250,7 @@ php8.1-pear_package() {
 
 php8.1-enchant_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	short_desc+=' - enchant module'
 	pkg_install() {
 		vmove "usr/lib/php${_php_version}/modules/enchant.so"
@@ -251,7 +259,7 @@ php8.1-enchant_package() {
 
 php8.1-gd_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	short_desc+=' - gd module'
 	pkg_install() {
 		vmove "usr/lib/php${_php_version}/modules/gd.so"
@@ -260,7 +268,7 @@ php8.1-gd_package() {
 
 php8.1-intl_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	short_desc+=' - Internationalization module'
 	pkg_install() {
 		vmove "usr/lib/php${_php_version}/modules/intl.so"
@@ -269,7 +277,7 @@ php8.1-intl_package() {
 
 php8.1-ldap_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	short_desc+=' - LDAP module'
 	pkg_install() {
 		vmove "usr/lib/php${_php_version}/modules/ldap.so"
@@ -278,7 +286,7 @@ php8.1-ldap_package() {
 
 php8.1-mysql_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	short_desc+=' - MySQL modules'
 	pkg_install() {
 		vmove "usr/lib/php${_php_version}/modules/*mysql*.so"
@@ -287,7 +295,7 @@ php8.1-mysql_package() {
 
 php8.1-odbc_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	short_desc+=' - ODBC modules'
 	pkg_install() {
 		vmove "usr/lib/php${_php_version}/modules/*odbc.so"
@@ -296,7 +304,7 @@ php8.1-odbc_package() {
 
 php8.1-pgsql_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	short_desc+=' - PostgreSQL modules'
 	pkg_install() {
 		vmove "usr/lib/php${_php_version}/modules/*pgsql.so"
@@ -305,7 +313,7 @@ php8.1-pgsql_package() {
 
 php8.1-snmp_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	short_desc+=' - snmp module'
 	pkg_install() {
 		vmove "usr/lib/php${_php_version}/modules/snmp.so"
@@ -314,7 +322,7 @@ php8.1-snmp_package() {
 
 php8.1-sqlite_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	short_desc+=' - sqlite module'
 	pkg_install() {
 		vmove "usr/lib/php${_php_version}/modules/*sqlite*.so"
@@ -323,7 +331,7 @@ php8.1-sqlite_package() {
 
 php8.1-tidy_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	short_desc+=' - tidy HTML module'
 	pkg_install() {
 		vmove "usr/lib/php${_php_version}/modules/*tidy*.so"
@@ -332,7 +340,7 @@ php8.1-tidy_package() {
 
 php8.1-xsl_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	short_desc+=' - XSL module'
 	pkg_install() {
 		vmove "usr/lib/php${_php_version}/modules/xsl.so"
@@ -341,7 +349,7 @@ php8.1-xsl_package() {
 
 php8.1-sodium_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	short_desc+=' - sodium module'
 	pkg_install() {
 		vmove "usr/lib/php${_php_version}/modules/sodium.so"
@@ -350,7 +358,7 @@ php8.1-sodium_package() {
 
 php8.1-ffi_package() {
 	lib32disabled=yes
-	depends="php${_php_version}-${version}_${revision}"
+	depends="php${_php_version}>=${version}_${revision}"
 	short_desc+=' - FFI module'
 	pkg_install() {
 		vmove "usr/lib/php${_php_version}/modules/ffi.so"