diff --git a/srcpkgs/php8.1-pear b/srcpkgs/php8.1-pear new file mode 120000 index 00000000000..4ad857cc7c0 --- /dev/null +++ b/srcpkgs/php8.1-pear @@ -0,0 +1 @@ +php8.1 \ No newline at end of file diff --git a/srcpkgs/php8.1/patches/php.ini.patch b/srcpkgs/php8.1/patches/php.ini.patch index 186898f63fa..e4d45eafed3 100644 --- a/srcpkgs/php8.1/patches/php.ini.patch +++ b/srcpkgs/php8.1/patches/php.ini.patch @@ -7,7 +7,7 @@ index b39a960..68f14a6 100644 ; UNIX: "/path1:/path2" -;include_path = ".:/php/includes" -+include_path = ".:/usr/share/pear" ++include_path = ".:/usr/share/pear8.1" ; ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template index 33e38c1db28..f19688b52f6 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.10 +version=8.1.12 revision=1 _php_version=8.1 hostmakedepends="bison pkg-config apache-devel" @@ -14,15 +14,17 @@ maintainer="Joel Beckmeyer " 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=3ea4f323109dfbc8d2631d08aa0e08602c1f713678e9dc6c750f081ef49eab0f +# 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=e0e7c823c9f9aa4c021f5e34ae1a7acafc2a9f3056ca60eb70a8af8f33da3fdf conf_files="/etc/php${_php_version}/php.ini" lib32disabled=yes if [ -n "$CROSS_BUILD" ]; then - # phar needs php to build + # phar and pear need php to build hostmakedepends+=" php${_php_version}" CFLAGS+=" -DHAVE_LIBDL -DHAVE_DLOPEN @@ -89,7 +91,7 @@ do_build() { --with-mysqli=shared,mysqlnd \ --with-openssl=shared \ --with-external-pcre \ - --without-pear \ + --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 \ @@ -111,7 +113,7 @@ do_build() { EXTENSION_DIR="/usr/lib/php${_php_version}/modules" export EXTENSION_DIR - PEAR_INSTALLDIR=/usr/share/pear + PEAR_INSTALLDIR=/usr/share/pear${_php_version} export PEAR_INSTALLDIR EXTRA_LIBS="-ldl" export EXTRA_LIBS @@ -217,6 +219,27 @@ php8.1-embed_package() { } } +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}" diff --git a/srcpkgs/php8.1/update b/srcpkgs/php8.1/update index 0c2792ec963..e39f4573be8 100644 --- a/srcpkgs/php8.1/update +++ b/srcpkgs/php8.1/update @@ -1,2 +1,3 @@ pkgname=php ignore="8.[2-9].*" +site="https://www.php.net/distributions/"