From d1ccca853c7c68f285d172e37385768e7c9586ae Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 8 Aug 2022 11:36:37 -0400 Subject: [PATCH 1/6] php: add php alternatives group. --- srcpkgs/php/template | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/srcpkgs/php/template b/srcpkgs/php/template index 3eb8e38cd928..a15151a6512e 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,7 +1,8 @@ # Template file for 'php' pkgname=php version=7.4.30 -revision=2 +revision=3 +_php_version=7.4 hostmakedepends="bison pkg-config apache-devel" makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel @@ -34,6 +35,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 \ @@ -47,6 +56,7 @@ do_build() { --disable-rpath \ --mandir=/usr/share/man \ --with-pear=/usr/share/pear \ + --program-suffix=${_php_version} \ " local _phpextensions="--enable-bcmath=shared \ @@ -106,7 +116,7 @@ do_build() { ${configure_args} \ " if [ -n "$CROSS_BUILD" ]; then - local _make_env="PHAR_PHP=/usr/bin/php PHAR_PHP_MODULES=/usr/lib/php/modules" + local _make_env="PHAR_PHP=/usr/bin/php${_php_version} PHAR_PHP_MODULES=/usr/lib/php/modules" fi EXTENSION_DIR=/usr/lib/php/modules @@ -145,7 +155,7 @@ do_install() { cd ${wrksrc}/build local _env="INSTALL_ROOT=${DESTDIR}" if [ -n "$CROSS_BUILD" ]; then - _env+=" PHAR_PHP=/usr/bin/php" + _env+=" PHAR_PHP=/usr/bin/php${_php_version}" fi make ${_env} install-{modules,cli,build,headers,programs,pharcmd} @@ -157,19 +167,27 @@ do_install() { php-devel_package() { short_desc+=" - development files" + alternatives=" + php-devel:php-config:/usr/bin/php-config${_php_version} + php-devel:phpize:/usr/bin/phpize${_php_version} + php-devel:phpize.1:/usr/share/man/man1/phpize${_php_version}.1 + php-devel:php-config.1:/usr/share/man/man1/php-config${_php_version}.1" pkg_install() { vmove usr/include vmove usr/lib/php/build - vmove usr/bin/php-config - vmove usr/bin/phpize - vmove usr/share/man/man1/phpize.1 - vmove usr/share/man/man1/php-config.1 + 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" } } php-phpdbg_package() { short_desc+=" - interactive debugger" depends="php-${version}_${revision}" + alternatives=" + phpdbg:phpdbg:/usr/bin/phpdbg${_php_version} + phpdbg:phpdbg.1:/usr/share/man/man1/phpdbg{_php_version}.1" pkg_install() { cd ${wrksrc}/build make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg @@ -179,6 +197,9 @@ php-phpdbg_package() { php-cgi_package() { short_desc+=' - CGI and FCGI SAPI' depends="php-${version}_${revision}" + alternatives=" + php-cgi:php-cgi:/usr/bin/php-cgi${_php_version} + php-cgi:php-cgi.1:/usr/share/man/man1/php-cgi${_php_version}.1" pkg_install() { cd ${wrksrc}/build make INSTALL_ROOT=${PKGDESTDIR} install-cgi @@ -199,6 +220,9 @@ php-fpm_package() { short_desc+=' - FastCGI Process Manager' depends="php-${version}_${revision}" conf_files="/etc/php/php-fpm.conf /etc/php/php-fpm.d/*" + alternatives=" + php-fpm:php-fpm:/usr/bin/php-fpm${_php_version} + php-fpm:php-fpm.8:/usr/share/man/man8/php-fpm${_php_version}.8" pkg_install() { cd ${wrksrc}/build make INSTALL_ROOT=${PKGDESTDIR} install-fpm @@ -225,7 +249,7 @@ php-pear_package() { cd ${wrksrc}/build local _env="INSTALL_ROOT=${PKGDESTDIR}" if [ -n "$CROSS_BUILD" ]; then - _env+=" PEAR_PHP=/usr/bin/php" + _env+=" PEAR_PHP=/usr/bin/php${_php_version}" fi make install-pear ${_env} rm -rf ${PKGDESTDIR}/.{channels,depdb,depdblock,filemap,lock,registry} From 0b5e3dfce9d9f0a5b9aff9af0e8ba04f1f72df60 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 8 Aug 2022 11:36:52 -0400 Subject: [PATCH 2/6] php8.0: update to 8.0.22 Add php alternatives group. --- srcpkgs/php8.0/template | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template index 48c8f2d386cc..608a66e60242 100644 --- a/srcpkgs/php8.0/template +++ b/srcpkgs/php8.0/template @@ -1,6 +1,6 @@ # Template file for 'php8.0' pkgname=php8.0 -version=8.0.21 +version=8.0.22 revision=1 _php_version=8.0 wrksrc="php-${version}" @@ -16,7 +16,7 @@ license="PHP-3.01" homepage="https://www.php.net" changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS" distfiles="https://www.php.net/distributions/php-${version}.tar.gz" -checksum=2f51f6e90e2e8efd3a20db08f0dd61d7f8d5a9362f8c7325f1ad28ccea5be0ac +checksum=56fce7529a9798fd0895bca3539d2a65b9cac5d23ffbdf6338419c62ed083519 conf_files="/etc/php${_php_version}/php.ini" @@ -35,6 +35,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 \ @@ -158,6 +166,11 @@ do_install() { php8.0-devel_package() { short_desc+=" - development files" + alternatives=" + php-devel:php-config:/usr/bin/php-config${_php_version} + php-devel:phpize:/usr/bin/phpize${_php_version} + php-devel:phpize.1:/usr/share/man/man1/phpize${_php_version}.1 + php-devel:php-config.1:/usr/share/man/man1/php-config${_php_version}.1" pkg_install() { vmove usr/include vmove "usr/lib/php${_php_version}/build" @@ -171,6 +184,9 @@ php8.0-devel_package() { php8.0-phpdbg_package() { short_desc+=" - interactive debugger" depends="php${_php_version}-${version}_${revision}" + alternatives=" + phpdbg:phpdbg:/usr/bin/phpdbg${_php_version} + phpdbg:phpdbg.1:/usr/share/man/man1/phpdbg{_php_version}.1" pkg_install() { cd ${wrksrc}/build make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg @@ -180,6 +196,9 @@ php8.0-phpdbg_package() { php8.0-cgi_package() { short_desc+=' - CGI and FCGI SAPI' depends="php${_php_version}-${version}_${revision}" + alternatives=" + php-cgi:php-cgi:/usr/bin/php-cgi${_php_version} + php-cgi:php-cgi.1:/usr/share/man/man1/php-cgi${_php_version}.1" pkg_install() { cd ${wrksrc}/build make INSTALL_ROOT=${PKGDESTDIR} install-cgi @@ -200,6 +219,9 @@ php8.0-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/*" + alternatives=" + php-fpm:php-fpm:/usr/bin/php-fpm${_php_version} + php-fpm:php-fpm.8:/usr/share/man/man8/php-fpm${_php_version}.8" pkg_install() { cd ${wrksrc}/build make INSTALL_ROOT=${PKGDESTDIR} install-fpm From 3d4d63686b37e37e5b50427d1952e6f0c2c66ef5 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 8 Aug 2022 11:37:33 -0400 Subject: [PATCH 3/6] php8.1: update to 8.1.9. Add php alternatives group. --- srcpkgs/php8.1/template | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template index c307e3315505..ddd662aa01f4 100644 --- a/srcpkgs/php8.1/template +++ b/srcpkgs/php8.1/template @@ -1,6 +1,6 @@ # Template file for 'php8.1' pkgname=php8.1 -version=8.1.8 +version=8.1.9 revision=1 _php_version=8.1 wrksrc="php-${version}" @@ -16,7 +16,7 @@ license="PHP-3.01" homepage="https://www.php.net" changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS" distfiles="https://www.php.net/distributions/php-${version}.tar.gz" -checksum=889d910558d2492f7f2236921b9bcde620674c8b684ec02d126060f8ca45dc8d +checksum=954cf77f7e0a70dc765e7639acdfdccd164be5cd1bce3dbe9d10c58dca631e76 conf_files="/etc/php${_php_version}/php.ini" @@ -35,6 +35,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 \ @@ -158,6 +166,11 @@ do_install() { php8.1-devel_package() { short_desc+=" - development files" + alternatives=" + php-devel:php-config:/usr/bin/php-config${_php_version} + php-devel:phpize:/usr/bin/phpize${_php_version} + php-devel:phpize.1:/usr/share/man/man1/phpize${_php_version}.1 + php-devel:php-config.1:/usr/share/man/man1/php-config${_php_version}.1" pkg_install() { vmove usr/include vmove "usr/lib/php${_php_version}/build" @@ -171,6 +184,9 @@ php8.1-devel_package() { php8.1-phpdbg_package() { short_desc+=" - interactive debugger" depends="php${_php_version}-${version}_${revision}" + alternatives=" + phpdbg:phpdbg:/usr/bin/phpdbg${_php_version} + phpdbg:phpdbg.1:/usr/share/man/man1/phpdbg{_php_version}.1" pkg_install() { cd ${wrksrc}/build make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg @@ -180,6 +196,9 @@ php8.1-phpdbg_package() { php8.1-cgi_package() { short_desc+=' - CGI and FCGI SAPI' depends="php${_php_version}-${version}_${revision}" + alternatives=" + php-cgi:php-cgi:/usr/bin/php-cgi${_php_version} + php-cgi:php-cgi.1:/usr/share/man/man1/php-cgi${_php_version}.1" pkg_install() { cd ${wrksrc}/build make INSTALL_ROOT=${PKGDESTDIR} install-cgi @@ -200,6 +219,9 @@ 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/*" + alternatives=" + php-fpm:php-fpm:/usr/bin/php-fpm${_php_version} + php-fpm:php-fpm.8:/usr/share/man/man8/php-fpm${_php_version}.8" pkg_install() { cd ${wrksrc}/build make INSTALL_ROOT=${PKGDESTDIR} install-fpm From 10156988e9f89ebbb68a7d9439e012aa2885bb20 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 8 Aug 2022 11:58:52 -0400 Subject: [PATCH 4/6] composer: update to 2.3.10. Add composer alternatives group. --- srcpkgs/composer/files/composer7.4 | 2 ++ srcpkgs/composer/template | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/composer/files/composer7.4 diff --git a/srcpkgs/composer/files/composer7.4 b/srcpkgs/composer/files/composer7.4 new file mode 100644 index 000000000000..52db75d49a47 --- /dev/null +++ b/srcpkgs/composer/files/composer7.4 @@ -0,0 +1,2 @@ +#!/bin/sh +php7.4 -f /usr/libexec/composer.phar7.4 "$@" diff --git a/srcpkgs/composer/template b/srcpkgs/composer/template index 81da2bf03aa2..f28f498c4e80 100644 --- a/srcpkgs/composer/template +++ b/srcpkgs/composer/template @@ -1,6 +1,6 @@ # Template file for 'composer' pkgname=composer -version=2.2.4 +version=2.3.10 revision=1 build_style=fetch depends="php" @@ -11,11 +11,14 @@ 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="ba04e246960d193237d5ed6542bd78456898e7787fafb586f500c6807af7458d +checksum="d808272f284fa8e0f8b470703e1438ac8f362030bbc9d12e29530277d767aff0 7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c" +alternatives="composer:composer:/usr/bin/composer7.4" do_install() { - vbin composer.phar composer + vbin ${FILESDIR}/composer7.4 + + vinstall composer.phar 644 usr/libexec composer.phar7.4 vlicense LICENSE vmkdir /etc/php/conf.d From 616a67f8175db87242039b9f024432a9f16ed322 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 8 Aug 2022 12:00:05 -0400 Subject: [PATCH 5/6] composer8.0: add composer alternatives group. --- srcpkgs/composer8.0/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/composer8.0/template b/srcpkgs/composer8.0/template index ac5fc310df4a..602557d016f3 100644 --- a/srcpkgs/composer8.0/template +++ b/srcpkgs/composer8.0/template @@ -1,7 +1,7 @@ # Template file for 'composer8.0' pkgname=composer8.0 version=2.3.10 -revision=1 +revision=2 build_style=fetch depends="php8.0" short_desc="Dependency manager for PHP" @@ -13,6 +13,7 @@ distfiles="https://github.com/composer/composer/releases/download/${version}/com https://raw.githubusercontent.com/composer/composer/main/LICENSE" checksum="d808272f284fa8e0f8b470703e1438ac8f362030bbc9d12e29530277d767aff0 7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c" +alternatives="composer:composer:/usr/bin/composer8.0" do_install() { vbin ${FILESDIR}/composer8.0 From 471ceed4fd0865cf975111cb5caa17863ff7b230 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Mon, 8 Aug 2022 12:00:48 -0400 Subject: [PATCH 6/6] composer8.1: add composer alternatives group. --- srcpkgs/composer8.1/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/composer8.1/template b/srcpkgs/composer8.1/template index e78c09bd575f..302c5fbb6e4e 100644 --- a/srcpkgs/composer8.1/template +++ b/srcpkgs/composer8.1/template @@ -1,7 +1,7 @@ # Template file for 'composer8.1' pkgname=composer8.1 version=2.3.10 -revision=1 +revision=2 build_style=fetch depends="php8.1" short_desc="Dependency manager for PHP" @@ -13,6 +13,7 @@ distfiles="https://github.com/composer/composer/releases/download/${version}/com https://raw.githubusercontent.com/composer/composer/main/LICENSE" checksum="d808272f284fa8e0f8b470703e1438ac8f362030bbc9d12e29530277d767aff0 7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c" +alternatives="composer:composer:/usr/bin/composer8.1" do_install() { vbin ${FILESDIR}/composer8.1