diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index be5d27a7a5e6f..0000000000000 --- a/.gitattributes +++ /dev/null @@ -1,8 +0,0 @@ -# Normalize EOLs by default, to avoid falling back on committers' -# "core.autocrlf" settings. -* text=auto - -# Don't normalize EOLs of files derived from an upstream. -*.diff -text -*.patch -text -net/nagios-plugins/files/check_nt.c -text diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index e238740b18117..0000000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -open_collective: macports -github: macports diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index f45f2b9930975..0000000000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,32 +0,0 @@ -#### Description - - - -###### Type(s) - - -- [ ] bugfix -- [ ] enhancement -- [ ] security fix - -###### Tested on - -macOS x.y -Xcode x.y / Command Line Tools x.y.z - -###### Verification -Have you - -- [ ] followed our [Commit Message Guidelines](https://trac.macports.org/wiki/CommitMessages)? -- [ ] squashed and [minimized your commits](https://guide.macports.org/#project.github)? -- [ ] checked that there aren't other open [pull requests](https://github.com/macports/macports-ports/pulls) for the same change? -- [ ] referenced existing tickets on [Trac](https://trac.macports.org/wiki/Tickets) with full URL in commit message? -- [ ] checked your Portfile with `port lint`? -- [ ] tried existing tests with `sudo port test`? -- [ ] tried a full install with `sudo port -vst install`? -- [ ] tested basic functionality of all binary files? -- [ ] checked that the Portfile's most important [variants](https://trac.macports.org/wiki/Variants) haven't been broken? - - diff --git a/.github/workflows/bootstrap.sh b/.github/workflows/bootstrap.sh deleted file mode 100644 index 00ea59a908056..0000000000000 --- a/.github/workflows/bootstrap.sh +++ /dev/null @@ -1,148 +0,0 @@ -#!/bin/bash - -set -e - -printtag() { - # GitHub Actions tag format - echo "::$1::${2-}" -} - -begingroup() { - printtag "group" "$1" -} - -endgroup() { - printtag "endgroup" -} - -MACPORTS_VERSION=2.10.3 - -OS_MAJOR=$(uname -r | cut -f 1 -d .) -OS_ARCH=$(uname -m) -case "$OS_ARCH" in - i586|i686|x86_64) - OS_ARCH=i386 - ;; - arm64) - OS_ARCH=arm - ;; -esac - -MACPORTS_FILENAME=MacPorts-${MACPORTS_VERSION}-${OS_MAJOR}.tar.bz2 - -begingroup "Fetching files" -# Download resources in background ASAP but use later. -# Use /usr/bin/curl so that we don't use Homebrew curl. -echo "Fetching getopt..." -/usr/bin/curl -fsSLO "https://distfiles.macports.org/_ci/getopt/getopt-v1.1.6.tar.bz2" & -curl_getopt_pid=$! -echo "Fetching MacPorts..." -/usr/bin/curl -fsSLO "https://github.com/macports/macports-ci-files/releases/download/v${MACPORTS_VERSION}/${MACPORTS_FILENAME}" & -curl_mpbase_pid=$! -PORTINDEX_URL="https://ftp.fau.de/macports/release/ports/PortIndex_darwin_${OS_MAJOR}_${OS_ARCH}/PortIndex" -echo "Fetching PortIndex from $PORTINDEX_URL ..." -/usr/bin/curl -fsSLo ports/PortIndex "$PORTINDEX_URL" & -curl_portindex_pid=$! -endgroup - - -begingroup "Info" -echo "macOS version: $(sw_vers -productVersion)" -echo "IP address: $(/usr/bin/curl -fsS https://www-origin.macports.org/ip.php)" -/usr/bin/curl -fsSIo /dev/null https://packages-private.macports.org/.org.macports.packages-private.healthcheck.txt && private_packages_available=yes || private_packages_available=no -echo "Can reach private packages server: $private_packages_available" -endgroup - - -begingroup "Disabling Spotlight" -# Disable Spotlight indexing. We don't need it, and it might cost performance -sudo mdutil -a -i off -endgroup - - -begingroup "Uninstalling Homebrew" -# Move directories to /opt/*-off -echo "Moving directories..." -sudo mkdir /opt/local-off /opt/homebrew-off -test ! -d /usr/local || /usr/bin/sudo /usr/bin/find /usr/local -mindepth 1 -maxdepth 1 -type d -print -exec /bin/mv {} /opt/local-off/ \; -test ! -d /opt/homebrew || /usr/bin/sudo /usr/bin/find /opt/homebrew -mindepth 1 -maxdepth 1 -type d -print -exec /bin/mv {} /opt/homebrew-off/ \; - -# Unlink files -echo "Removing files..." -test ! -d /usr/local || /usr/bin/sudo /usr/bin/find /usr/local -mindepth 1 -maxdepth 1 -type f -print -delete -test ! -d /opt/homebrew || /usr/bin/sudo /usr/bin/find /opt/homebrew -mindepth 1 -maxdepth 1 -type f -print -delete - -# Rehash to forget about the deleted files -hash -r -endgroup - -begingroup "Selecting Xcode version" -case "$OS_MAJOR" in - 22) sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer - ;; - 23) sudo xcode-select --switch /Applications/Xcode_15.4.app/Contents/Developer - ;; -esac -endgroup - -begingroup "Installing getopt" -# Install getopt required by mpbb -if ! wait $curl_getopt_pid; then - echo "Fetching getopt failed: $?" -fi -echo "Extracting..." -sudo tar -xpf "getopt-v1.1.6.tar.bz2" -C / -rm -f "getopt-v1.1.6.tar.bz2" -endgroup - - -begingroup "Installing MacPorts" -# Install MacPorts built by https://github.com/macports/macports-base/tree/master/.github -if ! wait $curl_mpbase_pid; then - echo "Fetching base failed: $?" -fi -echo "Extracting..." -sudo tar -xpf "${MACPORTS_FILENAME}" -C / -rm -f "${MACPORTS_FILENAME}" -endgroup - - -begingroup "Configuring MacPorts" -# Set PATH for portindex -source /opt/local/share/macports/setupenv.bash -# Set ports tree to $PWD/ports -echo "file://${PWD}/ports [default,nosync]" | sudo tee /opt/local/etc/macports/sources.conf >/dev/null -# CI is not interactive -echo "ui_interactive no" | sudo tee -a /opt/local/etc/macports/macports.conf >/dev/null -# Only download from the CDN, not the mirrors -echo "host_blacklist *.distfiles.macports.org *.packages.macports.org" | sudo tee -a /opt/local/etc/macports/macports.conf >/dev/null -# Also try downloading archives from the private server -echo "archive_site_local https://packages-private.macports.org/:tbz2" | sudo tee -a /opt/local/etc/macports/macports.conf >/dev/null -# Prefer to get archives from the public server instead of the private server -# preferred_hosts has no effect on archive_site_local -# See https://trac.macports.org/ticket/57720 -#echo "preferred_hosts packages.macports.org" | sudo tee -a /opt/local/etc/macports/macports.conf >/dev/null -endgroup - - -begingroup "Updating PortIndex" -## Run portindex on recent commits if PR is newer -git -C ports/ remote add macports https://github.com/macports/macports-ports.git -git -C ports/ fetch macports master -git -C ports/ checkout -qf macports/master~10 -git -C ports/ checkout -qf - -git -C ports/ checkout -qf "$(git -C ports/ merge-base macports/master HEAD)" -if ! wait $curl_portindex_pid; then - echo "Fetching PortIndex failed: $?" -fi -## Ignore portindex errors on common ancestor -(cd ports/ && portindex) -git -C ports/ checkout -qf - -(cd ports/ && portindex -e) -endgroup - - -begingroup "Running postflight" -# Create macports user -sudo /opt/local/libexec/macports/postflight/postflight -endgroup diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 5bc15dbc74838..0000000000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,274 +0,0 @@ -name: "lint & build changed ports" - -on: - pull_request: - branches: - - master - paths-ignore: - - '.github/**' - push: - branches-ignore: - - master - -permissions: - contents: read - -jobs: - build: - name: ${{ matrix.os }} - timeout-minutes: 0 - concurrency: - cancel-in-progress: true - group: ${{ github.ref }}/${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [macos-13, macos-14, macos-15] - - steps: - - name: Checkout ports - uses: actions/checkout@v4 - with: - fetch-depth: 64 - path: ports - show-progress: false - - name: Checkout mpbb - uses: actions/checkout@v4 - with: - repository: macports/mpbb - path: mpbb - show-progress: false - - name: Bootstrap MacPorts - run: . ports/.github/workflows/bootstrap.sh - - name: Determine list of changed ports - id: portlist - run: | - set -eu - # Add getopt, mpbb and the MacPorts paths to $PATH for the subsequent - # steps. - echo "/opt/mports/bin" >> $GITHUB_PATH - echo "${PWD}/mpbb" >> $GITHUB_PATH - echo "/opt/local/bin" >> $GITHUB_PATH - echo "/opt/local/sbin" >> $GITHUB_PATH - - portlist=$( \ - git -C ports/ diff --name-only --diff-filter=AM macports/master...@ \ - | grep -E '^[^._/][^/]*/[^/]+/(Portfile$|files/)' \ - | cut -d/ -f2 \ - | sort -u \ - | tr '\n' ' ' \ - | sed 's/ $//') - - echo "$portlist" - echo "portlist=$portlist" >> $GITHUB_OUTPUT - - - name: Determine list of subports from portlist - id: subportlist - run: | - set -eu - - echo "#### Changed Ports" >> $GITHUB_STEP_SUMMARY - - subportlist="" - echo "::group::Listing subports" - new_subports=$(mpbb \ - --work-dir /tmp/mpbb \ - list-subports \ - --archive-site= \ - --archive-site-private= \ - --include-deps=no \ - $portlist \ - | tr '\n' ' ') - for subport in $new_subports; do - echo "$subport" - echo "- ${subport}" >> $GITHUB_STEP_SUMMARY - subportlist="$subportlist $subport" - done - echo "::endgroup::" - - echo "subportlist=${subportlist}" >> $GITHUB_OUTPUT - env: - portlist: ${{ steps.portlist.outputs.portlist }} - - name: Run port lint for all changed subports - run: | - set -eu - - echo "#### Lint Results" >> $GITHUB_STEP_SUMMARY - - fail=0 - for subport in $subportlist; do - echo "::group::${subport}" - path=$(port file "$subport") - messagetype="warning" - if ! messages=$(port -q lint "$subport" 2>&1); then - messagetype="error" - fail=1 - fi - - - if [ -n "$messages" ]; then - echo "$messages" - - if [ "$fail" -eq 1 ]; then - echo "##### ❌ ${subport}" >> $GITHUB_STEP_SUMMARY - else - echo "##### ⚠️ ${subport}" >> $GITHUB_STEP_SUMMARY - fi - printf '```\n%s\n```\n' "$messages" >> $GITHUB_STEP_SUMMARY - - # See https://github.com/actions/toolkit/issues/193#issuecomment-605394935 - encoded_messages="port lint ${subport}:%0A" - encoded_messages+="$(echo "${messages}" | sed -E 's/$/%0A/g' | tr -d '\n')" - echo "::${messagetype} file=${path#${PWD}/ports/},line=1,col=1::${encoded_messages}" - else - echo "##### ✅ ${subport}" >> $GITHUB_STEP_SUMMARY - fi - echo "::endgroup::" - done - - exit "$fail" - env: - subportlist: ${{ steps.subportlist.outputs.subportlist }} - - name: Build changed subports - run: | - set -eu - - echo "#### Build Results" >> $GITHUB_STEP_SUMMARY - - fail=0 - for subport in $subportlist; do - workdir="/tmp/mpbb/$subport" - mkdir -p "$workdir/logs" - echo "##### ${subport}" >> $GITHUB_STEP_SUMMARY - touch "$workdir/logs/dependencies-progress.txt" - - echo "::group::Cleaning up between ports" - sudo mpbb --work-dir "$workdir" cleanup - echo "::endgroup::" - - echo "::group::Installing dependencies for ${subport}" - sudo mpbb \ - --work-dir "$workdir" \ - install-dependencies \ - "$subport" >"$workdir/logs/install-dependencies.log" 2>&1 & - deps_pid=$! - - tail -f "$workdir/logs/dependencies-progress.txt" 2>/dev/null & - tail_pid=$! - - set +e - wait "$deps_pid" - deps_exit=$? - set -e - - kill "$tail_pid" || true - - if [ "$deps_exit" -ne 0 ]; then - echo "::endgroup::" - echo "::error::Failed to install dependencies for ${subport}" - - echo "⚠️ Failed to install dependencies" >> $GITHUB_STEP_SUMMARY - - fail=1 - continue - fi - echo "::endgroup::" - - echo "::group::Installing ${subport}" - - set +e - sudo mpbb \ - --work-dir "$workdir" \ - install-port \ - --source \ - "$subport" - install_exit=$? - set -e - - if [ "$install_exit" -ne 0 ]; then - echo "::endgroup::" - echo "::error::Failed to install ${subport}" - - echo "❌ Failed to install, see the log for more details" >> $GITHUB_STEP_SUMMARY - - lognum=0 - for logfile in $(find $(port work "${subport}") -name config.log \ - -or -name CMakeError.log -or -name meson-log.txt); do - mkdir -p "$workdir/logs/$lognum" - echo "$logfile" > "$workdir/logs/$lognum/path.txt" - cp "$logfile" "$workdir/logs/$lognum/" - lognum=$(( $lognum + 1)) - done - - fail=1 - continue - fi - - echo "✅ Successfully built" >> $GITHUB_STEP_SUMMARY - echo "::endgroup::" - - echo "::group::Testing ${subport}" - - test_fail=0 - set +e - sudo mpbb \ - --work-dir "$workdir" \ - test-port \ - --builtin-only \ - "$subport" - test_exit=$? - set -e - - if [ "$test_exit" -ne 0 ]; then - echo "::endgroup::" - echo "::error::Tests failed for ${subport}" - - echo "❌ Tests failed, see the log for more details" >> $GITHUB_STEP_SUMMARY - - # Not setting fail=1 as a 100% passing test suite is not considered - # essential to merge a PR. - test_fail=1 - fi - - test_msgs=$(port log --phase test --level warn "$subport") - - if [ -n "$test_msgs" ]; then - echo "$test_msgs" - echo "⚠️ Test warnings" >> $GITHUB_STEP_SUMMARY - - printf '```\n%s\n```\n' "$test_msgs" >> $GITHUB_STEP_SUMMARY - - path=$(port file "$subport") - # See https://github.com/actions/toolkit/issues/193#issuecomment-605394935 - encoded_messages="port test ${subport}:%0A" - encoded_messages+="$(echo "${test_msgs}" | sed -E 's/$/%0A/g' | tr -d '\n')" - echo "::warning file=${path#${PWD}/ports/},line=1,col=1::${encoded_messages}" - elif [ $test_fail -eq 0 ]; then - echo "✅ Successfully tested" >> $GITHUB_STEP_SUMMARY - fi - - echo "::endgroup::" - - done - - exit "$fail" - env: - subportlist: ${{ steps.subportlist.outputs.subportlist }} - - name: Make logfiles readable - if: always() - run: | - mkdir -p /tmp/mpbb - sudo find \ - /tmp/mpbb \ - -maxdepth 1 \ - -mindepth 1 \ - -type d \ - -print \ - -exec chmod -R go+rX {} \; - - name: Archive build logs - if: always() - uses: actions/upload-artifact@v4 - with: - name: logs-${{ matrix.os }} - path: /tmp/mpbb/*/logs diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2350259f310a5..0000000000000 --- a/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/PortIndex -/PortIndex.quick - -*/*/work - -Portfile~ -*.tcl~ -*.diff~ -*.patch~ - -.DS_Store diff --git a/.mailmap b/.mailmap deleted file mode 100644 index 66f17215bf9b6..0000000000000 --- a/.mailmap +++ /dev/null @@ -1,32 +0,0 @@ - - -Alexander Gaenko -Aljaž Srebrnič - - -Christoph Iserlohn -Dan R. K. Ports - - - -James Berry - - -Ken Cunningham - -Mark Evenson Mark - - -Perry E. Metzger Perry E. Metzger - - -René J. V. Bertin - - - - -Toby Peterson - - -Vadym-Valdis Yudaiev -Wataru Kimura diff --git a/_resources/port1.0/group/php-1.1.tcl b/_resources/port1.0/group/php-1.1.tcl index 68f0615d55bb6..d40be3910f69b 100644 --- a/_resources/port1.0/group/php-1.1.tcl +++ b/_resources/port1.0/group/php-1.1.tcl @@ -103,7 +103,7 @@ proc php._set_name {option action args} { # when the php port is updated. options php.latest_stable_branch -default php.latest_stable_branch 8.3 +default php.latest_stable_branch 8.4 # php.default_branch: the branch of PHP for which the port should be installed diff --git a/devel/everparse/files/everparse-hints.tar.xz b/devel/everparse/files/everparse-hints.tar.xz deleted file mode 100644 index ba8cb55e70244..0000000000000 Binary files a/devel/everparse/files/everparse-hints.tar.xz and /dev/null differ diff --git a/devel/xapian-core/Portfile b/devel/xapian-core/Portfile index 6f6537d11234b..d0815b6a455ea 100644 --- a/devel/xapian-core/Portfile +++ b/devel/xapian-core/Portfile @@ -149,7 +149,7 @@ foreach v {5.28 5.30 5.32 5.34 5.36 5.38} { } # PHP -foreach v {8.0 8.1 8.2 8.3} { +foreach v {8.0 8.1 8.2 8.3 8.4 8.5} { set v_no_dot [string map {. {}} ${v}] set php php${v_no_dot} subport ${php}-xapian " diff --git a/lang/ghc/files/rtd-theme-70526f5bd8886126f49833ef20604a2c6477780a/static/css/fonts/lato-bold-italic.woff b/lang/ghc/files/rtd-theme-70526f5bd8886126f49833ef20604a2c6477780a/static/css/fonts/lato-bold-italic.woff deleted file mode 100644 index 88ad05b9ff413..0000000000000 Binary files a/lang/ghc/files/rtd-theme-70526f5bd8886126f49833ef20604a2c6477780a/static/css/fonts/lato-bold-italic.woff and /dev/null differ diff --git a/lang/php/Portfile b/lang/php/Portfile index 3658451b841fa..06c1b105495c6 100644 --- a/lang/php/Portfile +++ b/lang/php/Portfile @@ -2,7 +2,6 @@ PortSystem 1.0 PortGroup php 1.1 -PortGroup compiler_blacklist_versions 1.0 PortGroup openssl 1.0 # Disable by default adding openssl support. @@ -25,7 +24,7 @@ long_description PHP is a widely-used general-purpose scripting \ scripting. # The list of PHP branches this port provides. -php.branches 5.2 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 +php.branches 5.2 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 # Fix for users specifying the subport name with the wrong case. set subport [string tolower ${subport}] @@ -170,45 +169,70 @@ switch ${subport_branch} { } 8.1 { epoch 2 - version 8.1.30 + version 8.1.33 use_xz yes - checksums rmd160 9a94a84bdcdd30957c39f8907eceb0d7ada0995a \ - sha256 f24a6007f0b25a53cb7fbaee69c85017e0345b62089c2425a0afb7e177192ed1 \ - size 11850340 + checksums rmd160 fd04645fb61718c5b1b1142bbc85d2af7060de71 \ + sha256 9db83bf4590375562bc1a10b353cccbcf9fcfc56c58b7c8fb814e6865bb928d1 \ + size 11898724 } 8.2 { epoch 2 - version 8.2.24 + version 8.2.29 use_xz yes - checksums rmd160 767162c5683a200cd1f994e301bcd9e5a32cc2c5 \ - sha256 80a5225746a9eb484475b312d4c626c63a88a037d8e56d214f30205e1ba1411a \ - size 12110000 - } + checksums rmd160 153f2c7214f75681916a7d8cc3517a930272c9d8 \ + sha256 475f991afd2d5b901fb410be407d929bc00c46285d3f439a02c59e8b6fe3589c \ + size 12162364 + } 8.3 { epoch 2 - version 8.3.12 + version 8.3.24 use_xz yes - checksums rmd160 fd7d34f0528bcebd1ab33ff180bab40c4f2cd466 \ - sha256 f774e28633e26fc8c5197f4dae58ec9e3ff87d1b4311cbc61ab05a7ad24bd131 \ - size 12493432 + checksums rmd160 7346e7734aad8c2cfb94eee6309dcb25f105e3e8 \ + sha256 388ee5fd111097e97bae439bff46aec4ea27f816d3f0c2cb5490a41410d44251 \ + size 12579100 } 8.4 { + epoch 1 + version 8.4.11 + use_xz yes + checksums rmd160 845fc38b9d18b2df86b2f8b26d630e1585158f25 \ + sha256 04cd331380a8683a5c2503938eb51764d48d507c53ad4208d2c82e0eed779a00 \ + size 13632328 + + } + 8.5 { # When this becomes a stable version, remove the overrides for homepage, # master_sites and livecheck, and update php.latest_stable_branch in the # php-1.1 portgroup. - epoch 1 - version 8.4.0RC1 + epoch 0 + version 8.5.0alpha4 homepage https://qa.php.net/ - master_sites https://downloads.php.net/~saki/ + master_sites https://downloads.php.net/~daniels/ use_xz yes - checksums rmd160 be0e3528c5e5551c06686f0c2fe42d57bc9ffe91 \ - sha256 0b3db6af3e0643e310c9c32b407faf4be6fe265c0f37c5b2fed911d6e9ab046e \ - size 13510864 + checksums rmd160 536382bebd61896147cc0e67e3c161110619750a \ + sha256 5d33e15942d89956814f1521540210c58174c7f72dd277deda6b99709173e2db \ + size 14192052 livecheck.url ${homepage} livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar } } +# 8.6 { +# # When this becomes a stable version, remove the overrides for homepage, +# # master_sites and livecheck, and update php.latest_stable_branch in the +# # php-1.1 portgroup. +# epoch 1 +# version 8.6.0RC1 +# homepage https://qa.php.net/ +# master_sites https://downloads.php.net/~saki/ +# use_xz yes +# checksums rmd160 d78af388868bc0a1ca36955971c21ad77da81cf4 \ +# sha256 5c42173cbde7d0add8249c2e8a0c19ae271f41d8c47d67d72bdf91a88dcc7e4b \ +# size 13569728 +# +# livecheck.url ${homepage} +# livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar +# } # https://www.php.net/eol.php set php.oldest_supported_branch 8.1 @@ -273,9 +297,6 @@ if {[is_sapi_subport]} { if {[vercmp ${branch} >= 8.2]} { patchfiles-append \ patch-${php}-atomic.diff - } else { - patchfiles-append \ - patch-${php}-libxml2-2.12.diff } if {[vercmp ${branch} >= 8.0]} { if {[vercmp ${branch} < 8.2]} { @@ -291,11 +312,18 @@ if {[is_sapi_subport]} { port:autoconf \ port:libtool } + # this has to be done for <7.4 too + if {[vercmp ${branch} >= 7.4] && [vercmp ${branch} <= 8.0]} { + patchfiles-append \ + patch-${php}-libxml.diff \ + patch-${php}-ext-xml-compat.c.diff \ + ext-xml-tests-gh14834.phpt + } if {[vercmp ${branch} < 7.4]} { patchfiles-append \ patch-${php}-libxml2-overlinking.diff } - if {[vercmp ${branch} >= 7.0] && [vercmp ${branch} <= 7.2]} { + if {[vercmp ${branch} >= 7.0] && [vercmp ${branch} <= 7.4]} { patchfiles-append \ patch-${php}-implicit.diff } @@ -308,10 +336,14 @@ if {[is_sapi_subport]} { patch-${php}-libxml2-2.9.diff \ patch-${php}-pcre-8.30.diff } - if {[vercmp ${branch} >= 7.3] && [vercmp ${branch} < 8.5]} { + if {[vercmp ${branch} >= 7.3] && [vercmp ${branch} < 8.1]} { patchfiles-append \ patch-${php}-zend_string_equal_val.diff } + if {[vercmp ${branch} >= 8.1] && [vercmp ${branch} <= 8.3]} { + patchfiles-append \ + patch-${php}-ext-hash-xxhash.diff + } # https://trac.macports.org/ticket/31590 # Tested all subports (except oracle) and they built with clang-425. The reported failure was with Xcode 4.2. @@ -418,6 +450,14 @@ if {[is_sapi_subport]} { configure.args-append --enable-debug } + variant pear description {Enable pear support} { + if {[vercmp ${branch} < 7.4]} { + configure.args-replace --witout-pear --with-pear + } else { + configure.args-append --with-pear + } + } + if {[vercmp ${branch} <= 5.3]} { variant suhosin description {Add Suhosin patch} { pre-fetch { @@ -474,10 +514,11 @@ subport ${php} { 7.3.33 {revision 4} 7.4.33 {revision 2} 8.0.30 {revision 1} - 8.1.30 {revision 1} - 8.2.24 {revision 1} - 8.3.12 {revision 1} - 8.4.0RC1 {revision 1} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } depends_run port:php_select @@ -639,10 +680,11 @@ subport ${php}-apache2handler { 7.3.33 {revision 2} 7.4.33 {revision 1} 8.0.30 {revision 1} - 8.1.30 {revision 1} - 8.2.24 {revision 1} - 8.3.12 {revision 1} - 8.4.0RC1 {revision 1} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } description ${php} Apache 2 Handler SAPI @@ -704,10 +746,11 @@ subport ${php}-cgi { 7.3.33 {revision 2} 7.4.33 {revision 1} 8.0.30 {revision 1} - 8.1.30 {revision 1} - 8.2.24 {revision 1} - 8.3.12 {revision 1} - 8.4.0RC1 {revision 1} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } description ${php} CGI SAPI @@ -749,10 +792,11 @@ subport ${php}-fpm { 7.3.33 {revision 2} 7.4.33 {revision 1} 8.0.30 {revision 1} - 8.1.30 {revision 1} - 8.2.24 {revision 1} - 8.3.12 {revision 1} - 8.4.0RC1 {revision 1} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } description ${php} FPM SAPI @@ -823,10 +867,11 @@ subport ${php}-calendar { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } description a PHP extension for converting between different \ @@ -848,10 +893,11 @@ subport ${php}-curl { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append net www @@ -889,10 +935,11 @@ subport ${php}-dba { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append databases @@ -926,10 +973,11 @@ subport ${php}-enchant { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 1} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append textproc devel @@ -982,10 +1030,11 @@ subport ${php}-exif { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append graphics @@ -1000,10 +1049,11 @@ subport ${php}-ffi { switch -- ${version} { 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append devel @@ -1033,10 +1083,11 @@ subport ${php}-ftp { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append net @@ -1072,10 +1123,11 @@ subport ${php}-gd { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append graphics @@ -1147,10 +1199,11 @@ subport ${php}-gettext { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append devel @@ -1178,10 +1231,11 @@ subport ${php}-gmp { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append devel math @@ -1214,10 +1268,11 @@ subport ${php}-iconv { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append textproc @@ -1232,7 +1287,9 @@ subport ${php}-iconv { configure.args-append --with-iconv=${prefix} } -if {[vercmp ${branch} < 8.4]} { +if {[vercmp ${branch} < 8.3]} { +# imap was evicted from PHP core in version 8.4; +# php83-imap and later subports are found in the separate php-imap Portfile. subport ${php}-imap { switch -- ${version} { 5.2.17 {revision 0} @@ -1246,10 +1303,8 @@ subport ${php}-imap { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} } categories-append mail @@ -1289,10 +1344,11 @@ subport ${php}-intl { 7.3.33 {revision 5} 7.4.33 {revision 3} 8.0.30 {revision 2} - 8.1.30 {revision 1} - 8.2.24 {revision 1} - 8.3.12 {revision 1} - 8.4.0RC1 {revision 1} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append devel @@ -1360,10 +1416,11 @@ subport ${php}-ipc { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } php.extensions shmop sysvmsg sysvsem sysvshm @@ -1387,10 +1444,11 @@ subport ${php}-ldap { 7.3.33 {revision 1} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append databases @@ -1428,10 +1486,11 @@ subport ${php}-mbstring { 7.3.33 {revision 1} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append textproc @@ -1520,10 +1579,11 @@ subport ${php}-mysql { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } php.extensions mysqli pdo_mysql @@ -1546,7 +1606,7 @@ subport ${php}-mysql { configure.args-append --with-zlib-dir=${prefix} if {[vercmp ${branch} >= 5.3]} { - variant mysqlnd conflicts mysql51 mysql55 mysql56 mariadb percona description {Use MySQL Native Driver} { + variant mysqlnd conflicts mysql51 mysql55 mysql56 mysql57 mysql8 mariadb10 mariadb11 percona description {Use MySQL Native Driver} { configure.args-append --with-pdo-mysql=mysqlnd if {[vercmp ${branch} < 7.0]} { @@ -1572,13 +1632,14 @@ For mysql55, use ${prefix}/var/run/mysql55/mysqld.sock For mysql56, use ${prefix}/var/run/mysql56/mysqld.sock For mysql57, use ${prefix}/var/run/mysql57/mysqld.sock For mysql8, use ${prefix}/var/run/mysql8/mysqld.sock -For mariadb, use ${prefix}/var/run/mariadb/mysqld.sock +For mariadb10, use ${prefix}/var/run/mariadb-10.11/mysqld.sock +For mariadb11, use ${prefix}/var/run/mariadb-11.4/mysqld.sock For percona, use ${prefix}/var/run/percona/mysqld.sock " } } - variant mysql51 conflicts mysqlnd mysql55 mysql56 mysql57 mysql8 mariadb percona description {Use MySQL 5.1 libraries} { + variant mysql51 conflicts mysqlnd mysql55 mysql56 mysql57 mysql8 mariadb10 mariadb11 percona description {Use MySQL 5.1 libraries} { depends_lib-append port:mysql51 configure.args-append --with-mysql-sock=${prefix}/var/run/mysql51/mysqld.sock \ @@ -1601,7 +1662,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock } } - variant mysql55 conflicts mysqlnd mysql51 mysql56 mysql57 mysql8 mariadb percona description {Use MySQL 5.5 libraries} { + variant mysql55 conflicts mysqlnd mysql51 mysql56 mysql57 mysql8 mariadb10 mariadb11 percona description {Use MySQL 5.5 libraries} { depends_lib-append port:mysql55 configure.args-append --with-mysql-sock=${prefix}/var/run/mysql55/mysqld.sock \ @@ -1624,7 +1685,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock } } - variant mysql56 conflicts mysqlnd mysql51 mysql55 mysql57 mysql8 mariadb percona description {Use MySQL 5.6 libraries} { + variant mysql56 conflicts mysqlnd mysql51 mysql55 mysql57 mysql8 mariadb10 mariadb11 percona description {Use MySQL 5.6 libraries} { depends_lib-append port:mysql56 configure.args-append --with-mysql-sock=${prefix}/var/run/mysql56/mysqld.sock \ @@ -1647,7 +1708,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock } } - variant mysql57 conflicts mysqlnd mysql51 mysql55 mysql56 mysql8 mariadb percona description {Use MySQL 5.7 libraries} { + variant mysql57 conflicts mysqlnd mysql51 mysql55 mysql56 mysql8 mariadb10 mariadb11 percona description {Use MySQL 5.7 libraries} { depends_lib-append port:mysql57 configure.args-append --with-mysql-sock=${prefix}/var/run/mysql57/mysqld.sock \ @@ -1671,7 +1732,7 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock } if {[vercmp ${branch} >= 7.3]} { - variant mysql8 conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mariadb percona description {Use MySQL 8 libraries} { + variant mysql8 conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mariadb10 mariadb11 percona description {Use MySQL 8 libraries} { depends_lib-append port:mysql8 configure.args-append --with-mysql-sock=${prefix}/var/run/mysql8/mysqld.sock \ @@ -1685,30 +1746,58 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock } } - variant mariadb conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mysql8 percona description {Use MariaDB libraries} { - depends_lib-append port:mariadb + # remove after 2026-04-02 + variant mariadb requires mariadb10 description "Legacy compatibility variant" {} + + variant mariadb10 conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mysql8 mariadb11 percona description {Use MariaDB 10 libraries} { + set my_db 10.11 + depends_lib-append port:mariadb-${my_db} + + configure.args-append --with-mysql-sock=${prefix}/var/run/mariadb-${my_db}/mysqld.sock \ + --with-pdo-mysql=${prefix}/lib/mariadb-${my_db}/bin/mysql_config + + if {[vercmp ${branch} < 7.0]} { + post-extract { + file mkdir ${workpath}/mariadb + file link -symbolic ${workpath}/mariadb/lib ${prefix}/lib/mariadb-${my_db} + file link -symbolic ${workpath}/mariadb/include ${prefix}/include/mariadb-${my_db} + } + + configure.args-append --with-mysql=${workpath}/mariadb + } + + if {[vercmp ${branch} < 8.2]} { + configure.args-append --with-mysqli=${prefix}/lib/mariadb/bin-${my_db}/mysql_config + } else { + configure.args-append --with-mysqli + } + } + + variant mariadb11 conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mysql8 mariadb10 percona description {Use MariaDB 11 libraries} { + set my_db 11.8 + depends_lib-append port:mariadb-${my_db} - configure.args-append --with-mysql-sock=${prefix}/var/run/mariadb/mysqld.sock \ - --with-pdo-mysql=${prefix}/lib/mariadb/bin/mysql_config + configure.args-append --with-mysql-sock=${prefix}/var/run/mariadb-${my_db}/mysqld.sock \ + --with-pdo-mysql=${prefix}/lib/mariadb-${my_db}/bin/mysql_config if {[vercmp ${branch} < 7.0]} { post-extract { file mkdir ${workpath}/mariadb - file link -symbolic ${workpath}/mariadb/lib ${prefix}/lib/mariadb - file link -symbolic ${workpath}/mariadb/include ${prefix}/include/mariadb + file link -symbolic ${workpath}/mariadb/lib ${prefix}/lib/mariadb-${my_db} + file link -symbolic ${workpath}/mariadb/include ${prefix}/include/mariadb-${my_db} } configure.args-append --with-mysql=${workpath}/mariadb } if {[vercmp ${branch} < 8.2]} { - configure.args-append --with-mysqli=${prefix}/lib/mariadb/bin/mysql_config + configure.args-append --with-mysqli=${prefix}/lib/mariadb/bin-${my_db}/mysql_config } else { configure.args-append --with-mysqli } } - variant percona conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mysql8 mariadb description {Use Percona libraries} { + variant percona conflicts mysqlnd mysql51 mysql55 mysql56 mysql57 mysql8 mariadb10 mariadb11 description {Use Percona libraries} { depends_lib-append port:percona configure.args-append --with-mysql-sock=${prefix}/var/run/percona/mysqld.sock \ @@ -1731,9 +1820,9 @@ For percona, use ${prefix}/var/run/percona/mysqld.sock } } - if {![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mysql57] && ![variant_isset mysql8] && ![variant_isset mariadb] && ![variant_isset percona]} { + if {![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mysql57] && ![variant_isset mysql8] && ![variant_isset mariadb10] && ![variant_isset mariadb11] && ![variant_isset percona]} { if {[vercmp ${branch} < 5.3]} { - default_variants +mariadb + default_variants +mariadb10 } else { default_variants +mysqlnd } @@ -1753,10 +1842,11 @@ subport ${php}-odbc { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } php.extensions odbc pdo_odbc @@ -1818,10 +1908,11 @@ if {[vercmp ${branch} >= 5.5]} { 7.3.33 {revision 1} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } php.extensions.zend opcache @@ -1879,10 +1970,11 @@ subport ${php}-openssl { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append devel security @@ -1938,10 +2030,11 @@ subport ${php}-oracle { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } php.extensions oci8 pdo_oci @@ -1982,10 +2075,11 @@ subport ${php}-pcntl { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append sysutils @@ -2016,10 +2110,11 @@ subport ${php}-posix { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append sysutils @@ -2044,10 +2139,11 @@ subport ${php}-postgresql { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } php.extensions pgsql pdo_pgsql @@ -2061,40 +2157,50 @@ subport ${php}-postgresql { long_description ${description} - variant postgresql13 conflicts postgresql14 postgresql15 postgresql16 description {Use PostgreSQL 13 libraries} { + variant postgresql13 conflicts postgresql14 postgresql15 postgresql16 postgresql17 description {Use PostgreSQL 13 libraries} { depends_lib-append port:postgresql13 configure.args-append --with-pgsql=${prefix}/lib/postgresql13/bin \ --with-pdo-pgsql=${prefix}/lib/postgresql13/bin } - variant postgresql14 conflicts postgresql13 postgresql15 postgresql16 description {Use PostgreSQL 14 libraries} { + variant postgresql14 conflicts postgresql13 postgresql15 postgresql16 postgresql17 description {Use PostgreSQL 14 libraries} { depends_lib-append port:postgresql14 configure.args-append --with-pgsql=${prefix}/lib/postgresql14/bin \ --with-pdo-pgsql=${prefix}/lib/postgresql14/bin } - variant postgresql15 conflicts postgresql13 postgresql14 postgresql16 description {Use PostgreSQL 15 libraries} { + variant postgresql15 conflicts postgresql13 postgresql14 postgresql16 postgresql17 description {Use PostgreSQL 15 libraries} { depends_lib-append port:postgresql15 configure.args-append --with-pgsql=${prefix}/lib/postgresql15/bin \ --with-pdo-pgsql=${prefix}/lib/postgresql15/bin } - variant postgresql16 conflicts postgresql13 postgresql14 postgresql15 description {Use PostgreSQL 16 libraries} { + variant postgresql16 conflicts postgresql13 postgresql14 postgresql15 postgresql17 description {Use PostgreSQL 16 libraries} { depends_lib-append port:postgresql16 configure.args-append --with-pgsql=${prefix}/lib/postgresql16/bin \ --with-pdo-pgsql=${prefix}/lib/postgresql16/bin } - if {![variant_isset postgresql13] && ![variant_isset postgresql14] && ![variant_isset postgresql15] && ![variant_isset postgresql16]} { - default_variants +postgresql16 + variant postgresql17 conflicts postgresql13 postgresql14 postgresql15 postgresql16 description {Use PostgreSQL 17 libraries} { + depends_lib-append port:postgresql17 + + configure.args-append --with-pgsql=${prefix}/lib/postgresql17/bin \ + --with-pdo-pgsql=${prefix}/lib/postgresql17/bin + } + + if {![variant_isset postgresql13] && ![variant_isset postgresql14] && ![variant_isset postgresql15] && ![variant_isset postgresql16] && ![variant_isset postgresql17]} { + default_variants +postgresql17 } } -if {[vercmp ${branch} < 8.4]} { +if {[vercmp ${branch} < 8.1]} { +# pspell was evicted from PHP core in version 8.4 +# php81-pspell and later +# subports are found in the separate php-pspell Portfile. subport ${php}-pspell { switch -- ${version} { 5.2.17 {revision 0} @@ -2108,10 +2214,6 @@ subport ${php}-pspell { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} } categories-append textproc @@ -2140,10 +2242,11 @@ subport ${php}-snmp { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append sysutils @@ -2171,10 +2274,11 @@ subport ${php}-soap { 7.3.33 {revision 1} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append net @@ -2210,10 +2314,11 @@ subport ${php}-sockets { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append net @@ -2231,10 +2336,11 @@ subport ${php}-sodium { 7.3.33 {revision 1} 7.4.33 {revision 1} 8.0.30 {revision 1} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } php.extensions sodium @@ -2271,10 +2377,11 @@ subport ${php}-sqlite { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } php.extensions sqlite sqlite3 pdo_sqlite @@ -2324,10 +2431,11 @@ subport ${php}-tidy { 7.3.33 {revision 0} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append www @@ -2430,10 +2538,11 @@ subport ${php}-xsl { 7.3.33 {revision 1} 7.4.33 {revision 0} 8.0.30 {revision 0} - 8.1.30 {revision 0} - 8.2.24 {revision 0} - 8.3.12 {revision 0} - 8.4.0RC1 {revision 0} + 8.1.33 {revision 0} + 8.2.29 {revision 0} + 8.3.24 {revision 0} + 8.4.11 {revision 0} + 8.5.0alpha4 {revision 0} } categories-append textproc diff --git a/lang/php/files/ext-xml-tests-gh14834.phpt b/lang/php/files/ext-xml-tests-gh14834.phpt new file mode 100644 index 0000000000000..c207fa46bc7ad --- /dev/null +++ b/lang/php/files/ext-xml-tests-gh14834.phpt @@ -0,0 +1,33 @@ +https://github.com/php/php-src/commit/67259e4 +--- php-src/ext/xml/tests/gh14834.phpt.orig 2025-03-29 11:04:03.000000000 -0600 ++++ php-src/ext/xml/tests/gh14834.phpt 2025-03-29 16:00:42.000000000 -0600 +@@ -0,0 +1,29 @@ ++--TEST-- ++GH-14834 (Error installing PHP when --with-pear is used) ++--EXTENSIONS-- ++xml ++--FILE-- ++ ++ ++]> ++ ++ &foo; ++ ++XML; ++ ++$parser = xml_parser_create(); ++xml_set_character_data_handler($parser, function($_, $data) { ++ var_dump($data); ++}); ++xml_parse($parser, $xml, true); ++?> ++--EXPECT-- ++string(3) " ++ " ++string(3) "ent" ++string(7) " & " ++string(1) " ++" diff --git a/lang/php/files/patch-php52-libxml2-2.12.diff b/lang/php/files/patch-php52-libxml2-2.12.diff deleted file mode 100644 index 6ca7ada765930..0000000000000 --- a/lang/php/files/patch-php52-libxml2-2.12.diff +++ /dev/null @@ -1,61 +0,0 @@ -Fix libxml2 2.12.x build issues. -https://github.com/php/php-src/commit/8a95e616b91ac0eeedba90a61e36e652919763f2 -https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 ---- a/ext/dom/document.c 2020-09-30 00:15:55.000000000 -0500 -+++ b/ext/dom/document.c 2024-05-19 14:58:38.000000000 -0500 -@@ -27,6 +27,7 @@ - #if HAVE_LIBXML && HAVE_DOM - #include "php_dom.h" - #include -+#include - #ifdef LIBXML_SCHEMAS_ENABLED - #include - #include ---- a/ext/libxml/libxml.c 2010-01-03 03:23:27.000000000 -0600 -+++ b/ext/libxml/libxml.c 2024-05-20 15:47:47.000000000 -0500 -@@ -440,7 +440,11 @@ - return 1; - } - --static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) -+#if LIBXML_VERSION >= 21200 -+static void _php_list_set_error_structure(const xmlError *error, const char *msg) -+#else -+static void _php_list_set_error_structure(xmlError *error, const char *msg) -+#endif - { - xmlError error_copy; - int ret; -@@ -552,7 +556,11 @@ - va_end(args); - } - -+#if LIBXML_VERSION >= 21200 -+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error) -+#else - PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) -+#endif - { - _php_list_set_error_structure(error, NULL); - -@@ -760,9 +768,7 @@ - Retrieve last error from libxml */ - static PHP_FUNCTION(libxml_get_last_error) - { -- xmlErrorPtr error; -- -- error = xmlGetLastError(); -+ const xmlError *error = xmlGetLastError(); - - if (error) { - object_init_ex(return_value, libxmlerror_class_entry); ---- a/ext/libxml/php_libxml.h 2010-01-03 03:23:27.000000000 -0600 -+++ b/ext/libxml/php_libxml.h 2024-06-04 12:59:16.000000000 -0500 -@@ -34,6 +34,7 @@ - - #include "ext/standard/php_smart_str.h" - #include -+#include - - #define LIBXML_SAVE_NOEMPTYTAG 1<<2 - diff --git a/lang/php/files/patch-php53-libxml2-2.12.diff b/lang/php/files/patch-php53-libxml2-2.12.diff deleted file mode 100644 index 56ca46e76c38d..0000000000000 --- a/lang/php/files/patch-php53-libxml2-2.12.diff +++ /dev/null @@ -1,61 +0,0 @@ -Fix libxml2 2.12.x build issues. -https://github.com/php/php-src/commit/8a95e616b91ac0eeedba90a61e36e652919763f2 -https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 ---- a/ext/dom/document.c 2020-09-30 00:15:55.000000000 -0500 -+++ b/ext/dom/document.c 2024-05-19 14:58:38.000000000 -0500 -@@ -27,6 +27,7 @@ - #if HAVE_LIBXML && HAVE_DOM - #include "php_dom.h" - #include -+#include - #ifdef LIBXML_SCHEMAS_ENABLED - #include - #include ---- a/ext/libxml/libxml.c 2014-08-13 14:22:50.000000000 -0500 -+++ b/ext/libxml/libxml.c 2024-05-20 15:46:25.000000000 -0500 -@@ -432,7 +432,11 @@ - return 1; - } - --static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) -+#if LIBXML_VERSION >= 21200 -+static void _php_list_set_error_structure(const xmlError *error, const char *msg) -+#else -+static void _php_list_set_error_structure(xmlError *error, const char *msg) -+#endif - { - xmlError error_copy; - int ret; -@@ -544,7 +548,11 @@ - va_end(args); - } - -+#if LIBXML_VERSION >= 21200 -+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error) -+#else - PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) -+#endif - { - _php_list_set_error_structure(error, NULL); - -@@ -755,9 +763,7 @@ - Retrieve last error from libxml */ - static PHP_FUNCTION(libxml_get_last_error) - { -- xmlErrorPtr error; -- -- error = xmlGetLastError(); -+ const xmlError *error = xmlGetLastError(); - - if (error) { - object_init_ex(return_value, libxmlerror_class_entry); ---- a/ext/libxml/php_libxml.h 2019-01-09 03:54:13.000000000 -0600 -+++ b/ext/libxml/php_libxml.h 2024-05-20 15:37:55.000000000 -0500 -@@ -36,6 +36,7 @@ - - #include "ext/standard/php_smart_str.h" - #include -+#include - - #define LIBXML_SAVE_NOEMPTYTAG 1<<2 - diff --git a/lang/php/files/patch-php54-libxml2-2.12.diff b/lang/php/files/patch-php54-libxml2-2.12.diff deleted file mode 100644 index fbc0ba3d1f987..0000000000000 --- a/lang/php/files/patch-php54-libxml2-2.12.diff +++ /dev/null @@ -1,61 +0,0 @@ -Fix libxml2 2.12.x build issues. -https://github.com/php/php-src/commit/8a95e616b91ac0eeedba90a61e36e652919763f2 -https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 ---- a/ext/dom/document.c 2020-09-30 00:15:55.000000000 -0500 -+++ b/ext/dom/document.c 2024-05-19 14:58:38.000000000 -0500 -@@ -27,6 +27,7 @@ - #if HAVE_LIBXML && HAVE_DOM - #include "php_dom.h" - #include -+#include - #ifdef LIBXML_SCHEMAS_ENABLED - #include - #include ---- a/ext/libxml/libxml.c 2015-09-01 15:09:37.000000000 -0500 -+++ b/ext/libxml/libxml.c 2024-05-20 15:45:03.000000000 -0500 -@@ -453,7 +453,11 @@ - return 1; - } - --static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) -+#if LIBXML_VERSION >= 21200 -+static void _php_list_set_error_structure(const xmlError *error, const char *msg) -+#else -+static void _php_list_set_error_structure(xmlError *error, const char *msg) -+#endif - { - xmlError error_copy; - int ret; -@@ -711,7 +715,11 @@ - va_end(args); - } - -+#if LIBXML_VERSION >= 21200 -+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error) -+#else - PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) -+#endif - { - _php_list_set_error_structure(error, NULL); - -@@ -973,9 +981,7 @@ - Retrieve last error from libxml */ - static PHP_FUNCTION(libxml_get_last_error) - { -- xmlErrorPtr error; -- -- error = xmlGetLastError(); -+ const xmlError *error = xmlGetLastError(); - - if (error) { - object_init_ex(return_value, libxmlerror_class_entry); ---- a/ext/libxml/php_libxml.h 2019-01-09 03:54:13.000000000 -0600 -+++ b/ext/libxml/php_libxml.h 2024-05-20 15:37:55.000000000 -0500 -@@ -36,6 +36,7 @@ - - #include "ext/standard/php_smart_str.h" - #include -+#include - - #define LIBXML_SAVE_NOEMPTYTAG 1<<2 - diff --git a/lang/php/files/patch-php55-libxml2-2.12.diff b/lang/php/files/patch-php55-libxml2-2.12.diff deleted file mode 100644 index e94e4b83d65ad..0000000000000 --- a/lang/php/files/patch-php55-libxml2-2.12.diff +++ /dev/null @@ -1,61 +0,0 @@ -Fix libxml2 2.12.x build issues. -https://github.com/php/php-src/commit/8a95e616b91ac0eeedba90a61e36e652919763f2 -https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 ---- a/ext/dom/document.c 2020-09-30 00:15:55.000000000 -0500 -+++ b/ext/dom/document.c 2024-05-19 14:58:38.000000000 -0500 -@@ -27,6 +27,7 @@ - #if HAVE_LIBXML && HAVE_DOM - #include "php_dom.h" - #include -+#include - #ifdef LIBXML_SCHEMAS_ENABLED - #include - #include ---- a/ext/libxml/libxml.c 2016-07-20 03:41:48.000000000 -0500 -+++ b/ext/libxml/libxml.c 2024-05-20 15:43:36.000000000 -0500 -@@ -469,7 +469,11 @@ - return 1; - } - --static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) -+#if LIBXML_VERSION >= 21200 -+static void _php_list_set_error_structure(const xmlError *error, const char *msg) -+#else -+static void _php_list_set_error_structure(xmlError *error, const char *msg) -+#endif - { - xmlError error_copy; - int ret; -@@ -727,7 +731,11 @@ - va_end(args); - } - -+#if LIBXML_VERSION >= 21200 -+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error) -+#else - PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) -+#endif - { - _php_list_set_error_structure(error, NULL); - -@@ -1000,9 +1008,7 @@ - Retrieve last error from libxml */ - static PHP_FUNCTION(libxml_get_last_error) - { -- xmlErrorPtr error; -- -- error = xmlGetLastError(); -+ const xmlError *error = xmlGetLastError(); - - if (error) { - object_init_ex(return_value, libxmlerror_class_entry); ---- a/ext/libxml/php_libxml.h 2019-01-09 03:54:13.000000000 -0600 -+++ b/ext/libxml/php_libxml.h 2024-05-20 15:37:55.000000000 -0500 -@@ -36,6 +36,7 @@ - - #include "ext/standard/php_smart_str.h" - #include -+#include - - #define LIBXML_SAVE_NOEMPTYTAG 1<<2 - diff --git a/lang/php/files/patch-php56-libxml2-2.12.diff b/lang/php/files/patch-php56-libxml2-2.12.diff deleted file mode 100644 index 0ae39243825fc..0000000000000 --- a/lang/php/files/patch-php56-libxml2-2.12.diff +++ /dev/null @@ -1,61 +0,0 @@ -Fix libxml2 2.12.x build issues. -https://github.com/php/php-src/commit/8a95e616b91ac0eeedba90a61e36e652919763f2 -https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 ---- a/ext/dom/document.c 2020-09-30 00:15:55.000000000 -0500 -+++ b/ext/dom/document.c 2024-05-19 14:58:38.000000000 -0500 -@@ -27,6 +27,7 @@ - #if HAVE_LIBXML && HAVE_DOM - #include "php_dom.h" - #include -+#include - #ifdef LIBXML_SCHEMAS_ENABLED - #include - #include ---- a/ext/libxml/libxml.c 2019-01-09 03:54:13.000000000 -0600 -+++ b/ext/libxml/libxml.c 2024-05-20 15:38:21.000000000 -0500 -@@ -470,7 +470,11 @@ - return 1; - } - --static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) -+#if LIBXML_VERSION >= 21200 -+static void _php_list_set_error_structure(const xmlError *error, const char *msg) -+#else -+static void _php_list_set_error_structure(xmlError *error, const char *msg) -+#endif - { - xmlError error_copy; - int ret; -@@ -728,7 +732,11 @@ - va_end(args); - } - -+#if LIBXML_VERSION >= 21200 -+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error) -+#else - PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) -+#endif - { - _php_list_set_error_structure(error, NULL); - -@@ -1001,9 +1009,7 @@ - Retrieve last error from libxml */ - static PHP_FUNCTION(libxml_get_last_error) - { -- xmlErrorPtr error; -- -- error = xmlGetLastError(); -+ const xmlError *error = xmlGetLastError(); - - if (error) { - object_init_ex(return_value, libxmlerror_class_entry); ---- a/ext/libxml/php_libxml.h 2019-01-09 03:54:13.000000000 -0600 -+++ b/ext/libxml/php_libxml.h 2024-05-20 15:37:55.000000000 -0500 -@@ -36,6 +36,7 @@ - - #include "ext/standard/php_smart_str.h" - #include -+#include - - #define LIBXML_SAVE_NOEMPTYTAG 1<<2 - diff --git a/lang/php/files/patch-php70-libxml2-2.12.diff b/lang/php/files/patch-php70-libxml2-2.12.diff deleted file mode 100644 index f7b7e5d46505c..0000000000000 --- a/lang/php/files/patch-php70-libxml2-2.12.diff +++ /dev/null @@ -1,61 +0,0 @@ -Fix libxml2 2.12.x build issues. -https://github.com/php/php-src/commit/8a95e616b91ac0eeedba90a61e36e652919763f2 -https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 ---- a/ext/dom/document.c 2020-09-30 00:15:55.000000000 -0500 -+++ b/ext/dom/document.c 2024-05-19 14:58:38.000000000 -0500 -@@ -27,6 +27,7 @@ - #if HAVE_LIBXML && HAVE_DOM - #include "php_dom.h" - #include -+#include - #ifdef LIBXML_SCHEMAS_ENABLED - #include - #include ---- a/ext/libxml/libxml.c 2019-10-22 11:59:42.000000000 -0500 -+++ b/ext/libxml/libxml.c 2024-05-19 15:08:42.000000000 -0500 -@@ -477,7 +477,11 @@ - return 1; - } - --static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) -+#if LIBXML_VERSION >= 21200 -+static void _php_list_set_error_structure(const xmlError *error, const char *msg) -+#else -+static void _php_list_set_error_structure(xmlError *error, const char *msg) -+#endif - { - xmlError error_copy; - int ret; -@@ -728,7 +732,11 @@ - va_end(args); - } - -+#if LIBXML_VERSION >= 21200 -+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error) -+#else - PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) -+#endif - { - _php_list_set_error_structure(error, NULL); - -@@ -1006,9 +1014,7 @@ - Retrieve last error from libxml */ - static PHP_FUNCTION(libxml_get_last_error) - { -- xmlErrorPtr error; -- -- error = xmlGetLastError(); -+ const xmlError *error = xmlGetLastError(); - - if (error) { - object_init_ex(return_value, libxmlerror_class_entry); ---- a/ext/libxml/php_libxml.h 2020-09-30 00:15:53.000000000 -0500 -+++ b/ext/libxml/php_libxml.h 2024-05-19 14:58:38.000000000 -0500 -@@ -39,6 +39,7 @@ - - #include "zend_smart_str.h" - #include -+#include - - #define LIBXML_SAVE_NOEMPTYTAG 1<<2 - diff --git a/lang/php/files/patch-php71-libxml2-2.12.diff b/lang/php/files/patch-php71-libxml2-2.12.diff deleted file mode 100644 index f7b7e5d46505c..0000000000000 --- a/lang/php/files/patch-php71-libxml2-2.12.diff +++ /dev/null @@ -1,61 +0,0 @@ -Fix libxml2 2.12.x build issues. -https://github.com/php/php-src/commit/8a95e616b91ac0eeedba90a61e36e652919763f2 -https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 ---- a/ext/dom/document.c 2020-09-30 00:15:55.000000000 -0500 -+++ b/ext/dom/document.c 2024-05-19 14:58:38.000000000 -0500 -@@ -27,6 +27,7 @@ - #if HAVE_LIBXML && HAVE_DOM - #include "php_dom.h" - #include -+#include - #ifdef LIBXML_SCHEMAS_ENABLED - #include - #include ---- a/ext/libxml/libxml.c 2019-10-22 11:59:42.000000000 -0500 -+++ b/ext/libxml/libxml.c 2024-05-19 15:08:42.000000000 -0500 -@@ -477,7 +477,11 @@ - return 1; - } - --static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) -+#if LIBXML_VERSION >= 21200 -+static void _php_list_set_error_structure(const xmlError *error, const char *msg) -+#else -+static void _php_list_set_error_structure(xmlError *error, const char *msg) -+#endif - { - xmlError error_copy; - int ret; -@@ -728,7 +732,11 @@ - va_end(args); - } - -+#if LIBXML_VERSION >= 21200 -+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error) -+#else - PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) -+#endif - { - _php_list_set_error_structure(error, NULL); - -@@ -1006,9 +1014,7 @@ - Retrieve last error from libxml */ - static PHP_FUNCTION(libxml_get_last_error) - { -- xmlErrorPtr error; -- -- error = xmlGetLastError(); -+ const xmlError *error = xmlGetLastError(); - - if (error) { - object_init_ex(return_value, libxmlerror_class_entry); ---- a/ext/libxml/php_libxml.h 2020-09-30 00:15:53.000000000 -0500 -+++ b/ext/libxml/php_libxml.h 2024-05-19 14:58:38.000000000 -0500 -@@ -39,6 +39,7 @@ - - #include "zend_smart_str.h" - #include -+#include - - #define LIBXML_SAVE_NOEMPTYTAG 1<<2 - diff --git a/lang/php/files/patch-php72-libxml2-2.12.diff b/lang/php/files/patch-php72-libxml2-2.12.diff deleted file mode 100644 index 2b707fe55e1c5..0000000000000 --- a/lang/php/files/patch-php72-libxml2-2.12.diff +++ /dev/null @@ -1,61 +0,0 @@ -Fix libxml2 2.12.x build issues. -https://github.com/php/php-src/commit/8a95e616b91ac0eeedba90a61e36e652919763f2 -https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 ---- a/ext/dom/document.c 2020-09-30 00:15:55.000000000 -0500 -+++ b/ext/dom/document.c 2024-05-19 14:58:38.000000000 -0500 -@@ -27,6 +27,7 @@ - #if HAVE_LIBXML && HAVE_DOM - #include "php_dom.h" - #include -+#include - #ifdef LIBXML_SCHEMAS_ENABLED - #include - #include ---- a/ext/libxml/libxml.c 2020-09-30 00:15:53.000000000 -0500 -+++ b/ext/libxml/libxml.c 2024-05-19 14:58:38.000000000 -0500 -@@ -477,7 +477,11 @@ - return 1; - } - --static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) -+#if LIBXML_VERSION >= 21200 -+static void _php_list_set_error_structure(const xmlError *error, const char *msg) -+#else -+static void _php_list_set_error_structure(xmlError *error, const char *msg) -+#endif - { - xmlError error_copy; - int ret; -@@ -728,7 +732,11 @@ - va_end(args); - } - -+#if LIBXML_VERSION >= 21200 -+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error) -+#else - PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) -+#endif - { - _php_list_set_error_structure(error, NULL); - -@@ -1009,9 +1017,7 @@ - Retrieve last error from libxml */ - static PHP_FUNCTION(libxml_get_last_error) - { -- xmlErrorPtr error; -- -- error = xmlGetLastError(); -+ const xmlError *error = xmlGetLastError(); - - if (error) { - object_init_ex(return_value, libxmlerror_class_entry); ---- a/ext/libxml/php_libxml.h 2020-09-30 00:15:53.000000000 -0500 -+++ b/ext/libxml/php_libxml.h 2024-05-19 14:58:38.000000000 -0500 -@@ -39,6 +39,7 @@ - - #include "zend_smart_str.h" - #include -+#include - - #define LIBXML_SAVE_NOEMPTYTAG 1<<2 - diff --git a/lang/php/files/patch-php73-implicit.diff b/lang/php/files/patch-php73-implicit.diff new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/lang/php/files/patch-php73-libxml2-2.12.diff b/lang/php/files/patch-php73-libxml2-2.12.diff deleted file mode 100644 index da6dbef8a4d64..0000000000000 --- a/lang/php/files/patch-php73-libxml2-2.12.diff +++ /dev/null @@ -1,61 +0,0 @@ -Fix libxml2 2.12.x build issues. -https://github.com/php/php-src/commit/8a95e616b91ac0eeedba90a61e36e652919763f2 -https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 ---- a/ext/dom/document.c 2022-10-31 05:36:09.000000000 -0500 -+++ b/ext/dom/document.c 2024-05-18 01:59:38.000000000 -0500 -@@ -25,6 +25,7 @@ - #if HAVE_LIBXML && HAVE_DOM - #include "php_dom.h" - #include -+#include - #ifdef LIBXML_SCHEMAS_ENABLED - #include - #include ---- a/ext/libxml/libxml.c 2021-11-16 05:18:39.000000000 -0600 -+++ b/ext/libxml/libxml.c 2024-05-19 14:29:03.000000000 -0500 -@@ -485,7 +485,11 @@ - return 1; - } - --static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) -+#if LIBXML_VERSION >= 21200 -+static void _php_list_set_error_structure(const xmlError *error, const char *msg) -+#else -+static void _php_list_set_error_structure(xmlError *error, const char *msg) -+#endif - { - xmlError error_copy; - int ret; -@@ -736,7 +740,11 @@ - va_end(args); - } - -+#if LIBXML_VERSION >= 21200 -+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error) -+#else - PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) -+#endif - { - _php_list_set_error_structure(error, NULL); - -@@ -1017,9 +1025,7 @@ - Retrieve last error from libxml */ - static PHP_FUNCTION(libxml_get_last_error) - { -- xmlErrorPtr error; -- -- error = xmlGetLastError(); -+ const xmlError *error = xmlGetLastError(); - - if (error) { - object_init_ex(return_value, libxmlerror_class_entry); ---- a/ext/libxml/php_libxml.h 2022-10-31 05:36:06.000000000 -0500 -+++ b/ext/libxml/php_libxml.h 2024-05-18 01:59:38.000000000 -0500 -@@ -37,6 +37,7 @@ - - #include "zend_smart_str.h" - #include -+#include - - #define LIBXML_SAVE_NOEMPTYTAG 1<<2 - diff --git a/lang/php/files/patch-php74-ext-xml-compat.c.diff b/lang/php/files/patch-php74-ext-xml-compat.c.diff new file mode 100644 index 0000000000000..370126257c94c --- /dev/null +++ b/lang/php/files/patch-php74-ext-xml-compat.c.diff @@ -0,0 +1,12 @@ +https://github.com/php/php-src/commit/67259e4 +--- php-src/ext/xml/compat.c.orig 2025-03-29 11:04:03.000000000 -0600 ++++ php-src/ext/xml/compat.c 2025-03-29 16:00:42.000000000 -0600 +@@ -376,7 +376,7 @@ _get_entity(void *user, const xmlChar *name) + if (ret == NULL) + ret = xmlGetDocEntity(parser->parser->myDoc, name); + +- if (ret == NULL || (parser->parser->instate != XML_PARSER_ENTITY_VALUE && parser->parser->instate != XML_PARSER_ATTRIBUTE_VALUE)) { ++ if (ret == NULL || parser->parser->instate == XML_PARSER_CONTENT) { + if (ret == NULL || ret->etype == XML_INTERNAL_GENERAL_ENTITY || ret->etype == XML_INTERNAL_PARAMETER_ENTITY || ret->etype == XML_INTERNAL_PREDEFINED_ENTITY) { + /* Predefined entities will expand unless no cdata handler is present */ + if (parser->h_default && ! (ret && ret->etype == XML_INTERNAL_PREDEFINED_ENTITY && parser->h_cdata)) { diff --git a/lang/php/files/patch-php74-implicit.diff b/lang/php/files/patch-php74-implicit.diff new file mode 100644 index 0000000000000..e080bb06e0672 --- /dev/null +++ b/lang/php/files/patch-php74-implicit.diff @@ -0,0 +1,176 @@ +https://github.com/php/php-src/commit/aeaab8e Port various autoconf bits to C99 compilers +https://trac.macports.org/ticket/70468 php74 @7.4.33: Undefined symbols due to implicit ints +--- a/Zend/Zend.m4.orig ++++ b/Zend/Zend.m4 +@@ -157,6 +157,7 @@ AC_MSG_CHECKING(whether double cast to long preserves least significant bits) + + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include ++#include + + int main() + { +@@ -256,6 +257,7 @@ AC_MSG_CHECKING(for MM alignment and log values) + + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include ++#include + + typedef union _mm_align_test { + void *ptr; +--- a/build/libtool.m4.orig ++++ b/build/libtool.m4 +@@ -945,6 +945,7 @@ else + #endif + + #include ++#include + + #ifdef RTLD_GLOBAL + # define LT_DLGLOBAL RTLD_GLOBAL +--- a/build/php.m4.orig ++++ b/build/php.m4 +@@ -1120,7 +1120,7 @@ AC_CACHE_CHECK(for type of reentrant time-related functions, ac_cv_time_r_type,[ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + +-main() { ++int main() { + char buf[27]; + struct tm t; + time_t old = 0; +@@ -1136,7 +1136,7 @@ return (1); + ],[ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include +-main() { ++int main() { + struct tm t, *s; + time_t old = 0; + char buf[27], *p; +@@ -1175,6 +1175,7 @@ AC_DEFUN([PHP_DOES_PWRITE_WORK],[ + #include + #include + #include ++#include + $1 + int main() { + int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600); +@@ -1208,6 +1209,7 @@ AC_DEFUN([PHP_DOES_PREAD_WORK],[ + #include + #include + #include ++#include + $1 + int main() { + char buf[3]; +@@ -1462,6 +1464,7 @@ dnl Even newer glibcs have a different seeker definition. + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #define _GNU_SOURCE + #include ++#include + + struct cookiedata { + off64_t pos; +@@ -1597,7 +1600,7 @@ AC_DEFUN([PHP_CHECK_FUNC_LIB],[ + if test "$found" = "yes"; then + ac_libs=$LIBS + LIBS="$LIBS -l$2" +- AC_RUN_IFELSE([AC_LANG_SOURCE([[main() { return (0); }]])],[found=yes],[found=no],[found=no]) ++ AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return (0); }]])],[found=yes],[found=no],[found=no]) + LIBS=$ac_libs + fi + +@@ -2285,7 +2288,7 @@ AC_DEFUN([PHP_TEST_WRITE_STDOUT],[ + + #define TEXT "This is the test message -- " + +-main() ++int main() + { + int n; + +--- a/configure.ac.orig ++++ b/configure.ac +@@ -663,6 +663,7 @@ AC_CACHE_CHECK([for getaddrinfo], ac_cv_func_getaddrinfo, + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);]])],[AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include ++#include + #include + #include + #ifndef AF_INET +--- a/ext/standard/config.m4.orig ++++ b/ext/standard/config.m4 +@@ -5,8 +5,10 @@ AC_CACHE_CHECK([whether flush should be called explicitly after a buffered io], + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #include +-#include ++#ifdef HAVE_UNISTD_H + #include ++#endif ++#include + + int main(int argc, char **argv) + { +@@ -71,6 +73,9 @@ AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[ + #include + #endif + ++#include ++#include ++ + int main() { + #if HAVE_CRYPT + char *encrypted = crypt("rasmuslerdorf","rl"); +@@ -98,6 +103,9 @@ AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[ + #include + #endif + ++#include ++#include ++ + int main() { + #if HAVE_CRYPT + char *encrypted = crypt("rasmuslerdorf","_J9..rasm"); +@@ -125,6 +133,9 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #endif + ++#include ++#include ++ + int main() { + #if HAVE_CRYPT + char salt[15], answer[40]; +@@ -162,6 +173,9 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #endif + ++#include ++#include ++ + int main() { + #if HAVE_CRYPT + char salt[30], answer[70]; +@@ -196,6 +210,9 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #endif + ++#include ++#include ++ + int main() { + #if HAVE_CRYPT + char salt[21], answer[21+86]; +@@ -229,6 +246,9 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include + #endif + ++#include ++#include ++ + int main() { + #if HAVE_CRYPT + char salt[21], answer[21+43]; diff --git a/lang/php/files/patch-php74-libxml.diff b/lang/php/files/patch-php74-libxml.diff new file mode 100644 index 0000000000000..07a4521bba48b --- /dev/null +++ b/lang/php/files/patch-php74-libxml.diff @@ -0,0 +1,50 @@ +https://github.com/php/php-src/issues/12965 Build Failure With libxml2-2.12.3 #12965 +https://github.com/php/php-src/commit/0a39890 Fix libxml2 2.12 build due to API breaks +https://github.com/php/php-src/commit/8a95e61 Fix GH-12702: libxml2 2.12.0 issue building from src +--- a/ext/dom/document.c.orig ++++ b/ext/dom/document.c +@@ -25,6 +25,7 @@ + #if HAVE_LIBXML && HAVE_DOM + #include "php_dom.h" + #include ++#include + #ifdef LIBXML_SCHEMAS_ENABLED + #include + #include +--- a/ext/libxml/php_libxml.h ++++ b/ext/libxml/php_libxml.h +@@ -37,6 +37,7 @@ extern zend_module_entry libxml_module_entry; + + #include "zend_smart_str.h" + #include ++#include + + #define LIBXML_SAVE_NOEMPTYTAG 1<<2 + +--- a/ext/libxml/libxml.c ++++ b/ext/libxml/libxml.c +@@ -530,7 +530,11 @@ static int _php_libxml_free_error(xmlErrorPtr error) + return 1; + } + +-static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) ++#if LIBXML_VERSION >= 212000 ++static void _php_list_set_error_structure(const xmlError *error, const char *msg) ++#else ++static void _php_list_set_error_structure(xmlError *error, const char *msg) ++#endif + { + xmlError error_copy; + int ret; +@@ -782,7 +786,11 @@ PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...) + va_end(args); + } + ++#if LIBXML_VERSION >= 21200 ++PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error) ++#else + PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) ++#endif + { + _php_list_set_error_structure(error, NULL); + diff --git a/lang/php/files/patch-php74-libxml.diff.fails b/lang/php/files/patch-php74-libxml.diff.fails new file mode 100644 index 0000000000000..1c12cb9b7d7c7 --- /dev/null +++ b/lang/php/files/patch-php74-libxml.diff.fails @@ -0,0 +1,28 @@ +https://github.com/php/php-src/issues/12965 Build Failure With libxml2-2.12.3 #12965 +https://github.com/php/php-src/commit/0a39890 Fix libxml2 2.12 build due to API breaks +https://github.com/php/php-src/commit/8a95e61 Fix GH-12702: libxml2 2.12.0 issue building from src +--- a/ext/soap/php_sdl.c ++++ b/ext/soap/php_sdl.c +@@ -333,7 +333,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include) + sdl_restore_uri_credentials(ctx); + + if (!wsdl) { +- xmlErrorPtr xmlErrorPtr = xmlGetLastError(); ++ const xmlError *xmlErrorPtr = xmlGetLastError(); + + if (xmlErrorPtr) { + soap_error2(E_ERROR, "Parsing WSDL: Couldn't load from '%s' : %s", struri, xmlErrorPtr->message); + +--- a/ext/libxml/libxml.c ++++ b/ext/libxml/libxml.c +@@ -1069,9 +1069,7 @@ static PHP_FUNCTION(libxml_use_internal_errors) + Retrieve last error from libxml */ + static PHP_FUNCTION(libxml_get_last_error) + { +- xmlErrorPtr error; +- +- error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + + if (error) { + object_init_ex(return_value, libxmlerror_class_entry); diff --git a/lang/php/files/patch-php74-libxml.diff.orig b/lang/php/files/patch-php74-libxml.diff.orig new file mode 100644 index 0000000000000..6d0d75d8f3210 --- /dev/null +++ b/lang/php/files/patch-php74-libxml.diff.orig @@ -0,0 +1,75 @@ +https://github.com/php/php-src/issues/12965 Build Failure With libxml2-2.12.3 #12965 +https://github.com/php/php-src/commit/0a39890 Fix libxml2 2.12 build due to API breaks +https://github.com/php/php-src/commit/8a95e61 Fix GH-12702: libxml2 2.12.0 issue building from src +--- a/ext/dom/document.c.orig ++++ b/ext/dom/document.c +@@ -25,6 +25,7 @@ + #if HAVE_LIBXML && HAVE_DOM + #include "php_dom.h" + #include ++#include + #ifdef LIBXML_SCHEMAS_ENABLED + #include + #include +--- a/ext/libxml/php_libxml.h ++++ b/ext/libxml/php_libxml.h +@@ -37,6 +37,7 @@ extern zend_module_entry libxml_module_entry; + + #include "zend_smart_str.h" + #include ++#include + + #define LIBXML_SAVE_NOEMPTYTAG 1<<2 + +--- a/ext/soap/php_sdl.c ++++ b/ext/soap/php_sdl.c +@@ -333,7 +333,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include) + sdl_restore_uri_credentials(ctx); + + if (!wsdl) { +- xmlErrorPtr xmlErrorPtr = xmlGetLastError(); ++ const xmlError *xmlErrorPtr = xmlGetLastError(); + + if (xmlErrorPtr) { + soap_error2(E_ERROR, "Parsing WSDL: Couldn't load from '%s' : %s", struri, xmlErrorPtr->message); + +--- a/ext/libxml/libxml.c ++++ b/ext/libxml/libxml.c +@@ -530,7 +530,11 @@ static int _php_libxml_free_error(xmlErrorPtr error) + return 1; + } + +-static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) ++#if LIBXML_VERSION >= 212000 ++static void _php_list_set_error_structure(const xmlError *error, const char *msg) ++#else ++static void _php_list_set_error_structure(xmlError *error, const char *msg) ++#endif + { + xmlError error_copy; + int ret; +@@ -782,7 +786,11 @@ PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...) + va_end(args); + } + ++#if LIBXML_VERSION >= 21200 ++PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error) ++#else + PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) ++#endif + { + _php_list_set_error_structure(error, NULL); + +--- a/ext/libxml/libxml.c ++++ b/ext/libxml/libxml.c +@@ -1069,9 +1069,7 @@ static PHP_FUNCTION(libxml_use_internal_errors) + Retrieve last error from libxml */ + static PHP_FUNCTION(libxml_get_last_error) + { +- xmlErrorPtr error; +- +- error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + + if (error) { + object_init_ex(return_value, libxmlerror_class_entry); diff --git a/lang/php/files/patch-php74-libxml2-2.12.diff b/lang/php/files/patch-php74-libxml2-2.12.diff deleted file mode 100644 index aeac0175c20b9..0000000000000 --- a/lang/php/files/patch-php74-libxml2-2.12.diff +++ /dev/null @@ -1,61 +0,0 @@ -Fix libxml2 2.12.x build issues. -https://github.com/php/php-src/commit/8a95e616b91ac0eeedba90a61e36e652919763f2 -https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 ---- a/ext/dom/document.c 2022-10-31 05:36:09.000000000 -0500 -+++ b/ext/dom/document.c 2024-05-18 01:59:38.000000000 -0500 -@@ -25,6 +25,7 @@ - #if HAVE_LIBXML && HAVE_DOM - #include "php_dom.h" - #include -+#include - #ifdef LIBXML_SCHEMAS_ENABLED - #include - #include ---- a/ext/libxml/libxml.c 2022-10-31 05:36:06.000000000 -0500 -+++ b/ext/libxml/libxml.c 2024-05-18 02:02:02.000000000 -0500 -@@ -530,7 +530,11 @@ - return 1; - } - --static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) -+#if LIBXML_VERSION >= 21200 -+static void _php_list_set_error_structure(const xmlError *error, const char *msg) -+#else -+static void _php_list_set_error_structure(xmlError *error, const char *msg) -+#endif - { - xmlError error_copy; - int ret; -@@ -782,7 +786,11 @@ - va_end(args); - } - -+#if LIBXML_VERSION >= 21200 -+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error) -+#else - PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) -+#endif - { - _php_list_set_error_structure(error, NULL); - -@@ -1061,9 +1069,7 @@ - Retrieve last error from libxml */ - static PHP_FUNCTION(libxml_get_last_error) - { -- xmlErrorPtr error; -- -- error = xmlGetLastError(); -+ const xmlError *error = xmlGetLastError(); - - if (error) { - object_init_ex(return_value, libxmlerror_class_entry); ---- a/ext/libxml/php_libxml.h 2022-10-31 05:36:06.000000000 -0500 -+++ b/ext/libxml/php_libxml.h 2024-05-18 01:59:38.000000000 -0500 -@@ -37,6 +37,7 @@ - - #include "zend_smart_str.h" - #include -+#include - - #define LIBXML_SAVE_NOEMPTYTAG 1<<2 - diff --git a/lang/php/files/patch-php80-ext-xml-compat.c.diff b/lang/php/files/patch-php80-ext-xml-compat.c.diff new file mode 100644 index 0000000000000..84090ca054bff --- /dev/null +++ b/lang/php/files/patch-php80-ext-xml-compat.c.diff @@ -0,0 +1,12 @@ +https://github.com/php/php-src/commit/67259e4 +--- php-src/ext/xml/compat.c.orig 2025-03-29 11:04:03.000000000 -0600 ++++ php-src/ext/xml/compat.c 2025-03-29 16:00:42.000000000 -0600 +@@ -375,7 +375,7 @@ _get_entity(void *user, const xmlChar *name) + if (ret == NULL) + ret = xmlGetDocEntity(parser->parser->myDoc, name); + +- if (ret == NULL || (parser->parser->instate != XML_PARSER_ENTITY_VALUE && parser->parser->instate != XML_PARSER_ATTRIBUTE_VALUE)) { ++ if (ret == NULL || parser->parser->instate == XML_PARSER_CONTENT) { + if (ret == NULL || ret->etype == XML_INTERNAL_GENERAL_ENTITY || ret->etype == XML_INTERNAL_PARAMETER_ENTITY || ret->etype == XML_INTERNAL_PREDEFINED_ENTITY) { + /* Predefined entities will expand unless no cdata handler is present */ + if (parser->h_default && ! (ret && ret->etype == XML_INTERNAL_PREDEFINED_ENTITY && parser->h_cdata)) { diff --git a/lang/php/files/patch-php80-libxml2-2.12.diff b/lang/php/files/patch-php80-libxml.diff similarity index 54% rename from lang/php/files/patch-php80-libxml2-2.12.diff rename to lang/php/files/patch-php80-libxml.diff index b82c4f96e24e7..3cb1911262192 100644 --- a/lang/php/files/patch-php80-libxml2-2.12.diff +++ b/lang/php/files/patch-php80-libxml.diff @@ -1,7 +1,7 @@ -Fix libxml2 2.12.x build issues. -https://github.com/php/php-src/commit/8a95e616b91ac0eeedba90a61e36e652919763f2 -https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 ---- a/ext/dom/document.c +https://github.com/php/php-src/issues/12965 Build Failure With libxml2-2.12.3 #12965 +https://github.com/php/php-src/commit/0a39890 Fix libxml2 2.12 build due to API breaks +https://github.com/php/php-src/commit/8a95e61 Fix GH-12702: libxml2 2.12.0 issue building from src +--- a/ext/dom/document.c.orig +++ b/ext/dom/document.c @@ -23,6 +23,7 @@ #if defined(HAVE_LIBXML) && defined(HAVE_DOM) @@ -11,10 +11,20 @@ https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 #ifdef LIBXML_SCHEMAS_ENABLED #include #include ---- a/ext/libxml/libxml.c 2023-08-03 12:13:08.000000000 -0500 -+++ b/ext/libxml/libxml.c 2024-05-17 08:58:49.000000000 -0500 -@@ -481,7 +481,11 @@ - xmlResetError((xmlErrorPtr) ptr); +--- a/ext/libxml/php_libxml.h.orig ++++ b/ext/libxml/php_libxml.h +@@ -35,6 +35,7 @@ extern zend_module_entry libxml_module_entry; + + #include "zend_smart_str.h" + #include ++#include + + #define LIBXML_SAVE_NOEMPTYTAG 1<<2 + +--- a/ext/libxml/libxml.c.orig ++++ b/ext/libxml/libxml.c +@@ -481,7 +481,11 @@ static void _php_libxml_free_error(void *ptr) + xmlResetError((xmlErrorPtr) ptr); } -static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) @@ -24,10 +34,10 @@ https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 +static void _php_list_set_error_structure(xmlError *error, const char *msg) +#endif { - xmlError error_copy; - int ret; -@@ -732,7 +736,11 @@ - va_end(args); + xmlError error_copy; + int ret; +@@ -732,7 +736,11 @@ PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...) + va_end(args); } +#if LIBXML_VERSION >= 21200 @@ -36,28 +46,5 @@ https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) +#endif { - _php_list_set_error_structure(error, NULL); - -@@ -1035,11 +1043,9 @@ - /* {{{ Retrieve last error from libxml */ - PHP_FUNCTION(libxml_get_last_error) - { -- xmlErrorPtr error; -- - ZEND_PARSE_PARAMETERS_NONE(); - -- error = xmlGetLastError(); -+ const xmlError *error = xmlGetLastError(); - - if (error) { - object_init_ex(return_value, libxmlerror_class_entry); ---- a/ext/libxml/php_libxml.h -+++ b/ext/libxml/php_libxml.h -@@ -35,6 +35,7 @@ extern zend_module_entry libxml_module_entry; - - #include "zend_smart_str.h" - #include -+#include - - #define LIBXML_SAVE_NOEMPTYTAG 1<<2 + _php_list_set_error_structure(error, NULL); diff --git a/lang/php/files/patch-php80-libxml.diff.fails b/lang/php/files/patch-php80-libxml.diff.fails new file mode 100644 index 0000000000000..4cb0817fa7822 --- /dev/null +++ b/lang/php/files/patch-php80-libxml.diff.fails @@ -0,0 +1,28 @@ +https://github.com/php/php-src/issues/12965 Build Failure With libxml2-2.12.3 #12965 +https://github.com/php/php-src/commit/0a39890 Fix libxml2 2.12 build due to API breaks +https://github.com/php/php-src/commit/8a95e61 Fix GH-12702: libxml2 2.12.0 issue building from src +--- a/ext/soap/php_sdl.c.orig ++++ b/ext/soap/php_sdl.c +@@ -331,7 +331,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include) + sdl_restore_uri_credentials(ctx); + + if (!wsdl) { +- xmlErrorPtr xmlErrorPtr = xmlGetLastError(); ++ const xmlError *xmlErrorPtr = xmlGetLastError(); + + if (xmlErrorPtr) { + soap_error2(E_ERROR, "Parsing WSDL: Couldn't load from '%s' : %s", struri, xmlErrorPtr->message); +--- a/ext/libxml/libxml.c.orig ++++ b/ext/libxml/libxml.c +@@ -1044,10 +1044,8 @@ + PHP_FUNCTION(libxml_get_last_error) + { +- xmlErrorPtr error; +- + ZEND_PARSE_PARAMETERS_NONE(); + +- error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + + if (error) { + object_init_ex(return_value, libxmlerror_class_entry); diff --git a/lang/php/files/patch-php80-libxml.diff.orig b/lang/php/files/patch-php80-libxml.diff.orig new file mode 100644 index 0000000000000..7ac4b9792d13a --- /dev/null +++ b/lang/php/files/patch-php80-libxml.diff.orig @@ -0,0 +1,75 @@ +https://github.com/php/php-src/issues/12965 Build Failure With libxml2-2.12.3 #12965 +https://github.com/php/php-src/commit/0a39890 Fix libxml2 2.12 build due to API breaks +https://github.com/php/php-src/commit/8a95e61 Fix GH-12702: libxml2 2.12.0 issue building from src +--- a/ext/dom/document.c.orig ++++ b/ext/dom/document.c +@@ -23,6 +23,7 @@ + #if defined(HAVE_LIBXML) && defined(HAVE_DOM) + #include "php_dom.h" + #include ++#include + #ifdef LIBXML_SCHEMAS_ENABLED + #include + #include +--- a/ext/libxml/php_libxml.h ++++ b/ext/libxml/php_libxml.h +@@ -35,6 +35,7 @@ extern zend_module_entry libxml_module_entry; + + #include "zend_smart_str.h" + #include ++#include + + #define LIBXML_SAVE_NOEMPTYTAG 1<<2 + +--- a/ext/soap/php_sdl.c.orig ++++ b/ext/soap/php_sdl.c +@@ -331,7 +331,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include) + sdl_restore_uri_credentials(ctx); + + if (!wsdl) { +- xmlErrorPtr xmlErrorPtr = xmlGetLastError(); ++ const xmlError *xmlErrorPtr = xmlGetLastError(); + + if (xmlErrorPtr) { + soap_error2(E_ERROR, "Parsing WSDL: Couldn't load from '%s' : %s", struri, xmlErrorPtr->message); +--- a/ext/libxml/libxml.c.orig ++++ b/ext/libxml/libxml.c +@@ -481,7 +481,11 @@ static void _php_libxml_free_error(void *ptr) + xmlResetError((xmlErrorPtr) ptr); + } + +-static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) ++#if LIBXML_VERSION >= 21200 ++static void _php_list_set_error_structure(const xmlError *error, const char *msg) ++#else ++static void _php_list_set_error_structure(xmlError *error, const char *msg) ++#endif + { + xmlError error_copy; + int ret; +@@ -732,7 +736,11 @@ PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...) + va_end(args); + } + ++#if LIBXML_VERSION >= 21200 ++PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error) ++#else + PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) ++#endif + { + _php_list_set_error_structure(error, NULL); + +--- a/ext/libxml/libxml.c.orig ++++ b/ext/libxml/libxml.c +@@ -1044,10 +1044,8 @@ + PHP_FUNCTION(libxml_get_last_error) + { +- xmlErrorPtr error; +- + ZEND_PARSE_PARAMETERS_NONE(); + +- error = xmlGetLastError(); ++ const xmlError *error = xmlGetLastError(); + + if (error) { + object_init_ex(return_value, libxmlerror_class_entry); diff --git a/lang/php/files/patch-php81-ext-hash-xxhash.diff b/lang/php/files/patch-php81-ext-hash-xxhash.diff new file mode 100644 index 0000000000000..431c033d9edd4 --- /dev/null +++ b/lang/php/files/patch-php81-ext-hash-xxhash.diff @@ -0,0 +1,30 @@ +--- a/ext/hash/php_hash_xxhash.h ++++ b/ext/hash/php_hash_xxhash.h +@@ -18,7 +18,7 @@ + #define PHP_HASH_XXHASH_H + + #define XXH_INLINE_ALL 1 +-#include "xxhash.h" ++#include "xxhash/xxhash.h" + + typedef struct { + XXH32_state_t s; +--- a/ext/hash/config.m4 ++++ b/ext/hash/config.m4 +@@ -32,7 +32,6 @@ + fi + + PHP_ADD_BUILD_DIR(ext/hash/murmur, 1) +-PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -I@ext_srcdir@/xxhash" + + EXT_HASH_SOURCES="hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c \ + hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c hash_adler32.c \ +@@ -42,7 +41,7 @@ + php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h \ + php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h \ + php_hash_fnv.h php_hash_joaat.h php_hash_sha3.h php_hash_murmur.h \ +- php_hash_xxhash.h" ++ php_hash_xxhash.h xxhash/xxhash.h" + + PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, 0,,$PHP_HASH_CFLAGS) + PHP_INSTALL_HEADERS(ext/hash, $EXT_HASH_HEADERS) diff --git a/lang/php/files/patch-php81-libxml2-2.12.diff b/lang/php/files/patch-php81-libxml2-2.12.diff deleted file mode 100644 index 095aaae193133..0000000000000 --- a/lang/php/files/patch-php81-libxml2-2.12.diff +++ /dev/null @@ -1,42 +0,0 @@ -Fix libxml2 2.12.x build issues. -https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 ---- a/ext/libxml/libxml.c 2024-04-10 00:53:50.000000000 -0500 -+++ b/ext/libxml/libxml.c 2024-05-17 07:21:47.000000000 -0500 -@@ -483,7 +483,11 @@ - xmlResetError((xmlErrorPtr) ptr); - } - --static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg) -+#if LIBXML_VERSION >= 21200 -+static void _php_list_set_error_structure(const xmlError *error, const char *msg) -+#else -+static void _php_list_set_error_structure(xmlError *error, const char *msg) -+#endif - { - xmlError error_copy; - int ret; -@@ -736,7 +740,11 @@ - va_end(args); - } - -+#if LIBXML_VERSION >= 21200 -+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error) -+#else - PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error) -+#endif - { - _php_list_set_error_structure(error, NULL); - -@@ -1009,11 +1017,9 @@ - /* {{{ Retrieve last error from libxml */ - PHP_FUNCTION(libxml_get_last_error) - { -- xmlErrorPtr error; -- - ZEND_PARSE_PARAMETERS_NONE(); - -- error = xmlGetLastError(); -+ const xmlError *error = xmlGetLastError(); - - if (error) { - object_init_ex(return_value, libxmlerror_class_entry); diff --git a/lang/php/files/patch-php82-ext-hash-xxhash.diff b/lang/php/files/patch-php82-ext-hash-xxhash.diff new file mode 100644 index 0000000000000..431c033d9edd4 --- /dev/null +++ b/lang/php/files/patch-php82-ext-hash-xxhash.diff @@ -0,0 +1,30 @@ +--- a/ext/hash/php_hash_xxhash.h ++++ b/ext/hash/php_hash_xxhash.h +@@ -18,7 +18,7 @@ + #define PHP_HASH_XXHASH_H + + #define XXH_INLINE_ALL 1 +-#include "xxhash.h" ++#include "xxhash/xxhash.h" + + typedef struct { + XXH32_state_t s; +--- a/ext/hash/config.m4 ++++ b/ext/hash/config.m4 +@@ -32,7 +32,6 @@ + fi + + PHP_ADD_BUILD_DIR(ext/hash/murmur, 1) +-PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -I@ext_srcdir@/xxhash" + + EXT_HASH_SOURCES="hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c \ + hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c hash_adler32.c \ +@@ -42,7 +41,7 @@ + php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h \ + php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h \ + php_hash_fnv.h php_hash_joaat.h php_hash_sha3.h php_hash_murmur.h \ +- php_hash_xxhash.h" ++ php_hash_xxhash.h xxhash/xxhash.h" + + PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, 0,,$PHP_HASH_CFLAGS) + PHP_INSTALL_HEADERS(ext/hash, $EXT_HASH_HEADERS) diff --git a/lang/php/files/patch-php83-ext-hash-xxhash.diff b/lang/php/files/patch-php83-ext-hash-xxhash.diff new file mode 100644 index 0000000000000..431c033d9edd4 --- /dev/null +++ b/lang/php/files/patch-php83-ext-hash-xxhash.diff @@ -0,0 +1,30 @@ +--- a/ext/hash/php_hash_xxhash.h ++++ b/ext/hash/php_hash_xxhash.h +@@ -18,7 +18,7 @@ + #define PHP_HASH_XXHASH_H + + #define XXH_INLINE_ALL 1 +-#include "xxhash.h" ++#include "xxhash/xxhash.h" + + typedef struct { + XXH32_state_t s; +--- a/ext/hash/config.m4 ++++ b/ext/hash/config.m4 +@@ -32,7 +32,6 @@ + fi + + PHP_ADD_BUILD_DIR(ext/hash/murmur, 1) +-PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -I@ext_srcdir@/xxhash" + + EXT_HASH_SOURCES="hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c \ + hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c hash_adler32.c \ +@@ -42,7 +41,7 @@ + php_hash_haval.h php_hash_tiger.h php_hash_gost.h php_hash_snefru.h \ + php_hash_whirlpool.h php_hash_adler32.h php_hash_crc32.h \ + php_hash_fnv.h php_hash_joaat.h php_hash_sha3.h php_hash_murmur.h \ +- php_hash_xxhash.h" ++ php_hash_xxhash.h xxhash/xxhash.h" + + PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, 0,,$PHP_HASH_CFLAGS) + PHP_INSTALL_HEADERS(ext/hash, $EXT_HASH_HEADERS) diff --git a/lang/php/files/patch-php85-atomic.diff b/lang/php/files/patch-php85-atomic.diff new file mode 100644 index 0000000000000..0bec0ecb7b22f --- /dev/null +++ b/lang/php/files/patch-php85-atomic.diff @@ -0,0 +1,17 @@ +Fix: + +error: address argument to atomic operation must be a pointer to non-const _Atomic type ('const _Atomic(bool) *' invalid) + +https://github.com/php/php-src/issues/8881 +https://github.com/php/php-src/pull/11931 +--- a/Zend/zend_atomic.h.orig 2024-02-13 09:41:14.000000000 -0600 ++++ b/Zend/zend_atomic.h 2024-03-03 17:16:17.000000000 -0600 +@@ -23,7 +23,7 @@ + ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || (__GNUC__ > (x))) + + /* Builtins are used to avoid library linkage */ +-#if __has_feature(c_atomic) && defined(__clang__) ++#if __has_feature(c_atomic) && defined(__clang__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201710L + #define HAVE_C11_ATOMICS 1 + #elif ZEND_GCC_PREREQ(4, 7) + #define HAVE_GNUC_ATOMICS 1 diff --git a/lang/php/files/patch-php85-iODBC.diff b/lang/php/files/patch-php85-iODBC.diff new file mode 100644 index 0000000000000..b5f95c2b84457 --- /dev/null +++ b/lang/php/files/patch-php85-iODBC.diff @@ -0,0 +1,18 @@ +--- ext/odbc/config.m4.orig 2024-09-24 10:59:52.000000000 -0500 ++++ ext/odbc/config.m4 2024-09-30 03:06:55.000000000 -0500 +@@ -113,6 +113,7 @@ + be defined.])], + [0x0350]) + ++:<<'MACPORTS_DISABLED' + AS_VAR_IF([ODBC_TYPE],, [ + PHP_ARG_WITH([adabas], + [for Adabas support], +@@ -305,6 +306,7 @@ + ]) + ]) + ++MACPORTS_DISABLED + AS_VAR_IF([ODBC_TYPE],, [ + PHP_ARG_WITH([iodbc], + [whether to build with iODBC support], diff --git a/lang/php/files/patch-php85-sapi-fpm-php-fpm.conf.in.diff b/lang/php/files/patch-php85-sapi-fpm-php-fpm.conf.in.diff new file mode 100644 index 0000000000000..acdfeb5cce562 --- /dev/null +++ b/lang/php/files/patch-php85-sapi-fpm-php-fpm.conf.in.diff @@ -0,0 +1,39 @@ +--- a/sapi/fpm/php-fpm.conf.in.orig 2020-11-24 11:04:03.000000000 -0600 ++++ b/sapi/fpm/php-fpm.conf.in 2020-12-02 15:27:04.000000000 -0600 +@@ -14,14 +14,14 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++;pid = run/@PHP@/php-fpm.pid + + ; Error log file + ; If it's set to "syslog", log is sent to syslogd instead of being written + ; into a local file. + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: log/php-fpm.log +-;error_log = log/php-fpm.log ++error_log = log/@PHP@/php-fpm.log + + ; syslog_facility is used to specify what type of program is logging the + ; message. This lets syslogd specify that messages from different facilities +@@ -34,7 +34,7 @@ + ; instances running on the same server, you can change the default value + ; which must suit common needs. + ; Default Value: php-fpm +-;syslog.ident = php-fpm ++syslog.ident = @PHP@-fpm + + ; Log level + ; Possible Values: alert, error, warning, notice, debug +@@ -95,8 +95,9 @@ + ; process.priority = -19 + + ; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. ++; or for use with launchd. + ; Default Value: yes +-;daemonize = yes ++daemonize = no + + ; Set open file descriptor rlimit for the master process. + ; Default Value: system defined value diff --git a/lang/php/files/patch-php85-scripts-php-config.in.diff b/lang/php/files/patch-php85-scripts-php-config.in.diff new file mode 100644 index 0000000000000..f65e9a7671e64 --- /dev/null +++ b/lang/php/files/patch-php85-scripts-php-config.in.diff @@ -0,0 +1,11 @@ +--- a/scripts/php-config.in.orig 2024-07-02 08:43:13.000000000 -0500 ++++ b/scripts/php-config.in 2024-07-21 19:58:40.000000000 -0500 +@@ -8,7 +8,7 @@ + vernum="@PHP_VERSION_ID@" + include_dir="@includedir@/php" + lib_dir="@orig_libdir@" +-includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib" ++includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib -I@prefix@/include" + ldflags="@PHP_LDFLAGS@" + libs="@EXTRA_LIBS@" + extension_dir="@EXTENSION_DIR@" diff --git a/lang/php/files/patch-php85-unixODBC.diff b/lang/php/files/patch-php85-unixODBC.diff new file mode 100644 index 0000000000000..5454f6a365f1f --- /dev/null +++ b/lang/php/files/patch-php85-unixODBC.diff @@ -0,0 +1,18 @@ +--- ext/odbc/config.m4.orig 2024-09-24 10:59:52.000000000 -0500 ++++ ext/odbc/config.m4 2024-09-30 03:04:19.000000000 -0500 +@@ -113,6 +113,7 @@ + be defined.])], + [0x0350]) + ++:<<'MACPORTS_DISABLED' + AS_VAR_IF([ODBC_TYPE],, [ + PHP_ARG_WITH([adabas], + [for Adabas support], +@@ -339,6 +340,7 @@ + ]) + ]) + ++MACPORTS_DISABLED + AS_VAR_IF([ODBC_TYPE],, [ + PHP_ARG_WITH([unixODBC], + [whether to build with unixODBC support], diff --git a/lang/php/files/patch-php85-zend_string_equal_val.diff b/lang/php/files/patch-php85-zend_string_equal_val.diff new file mode 100644 index 0000000000000..729d59fb04591 --- /dev/null +++ b/lang/php/files/patch-php85-zend_string_equal_val.diff @@ -0,0 +1,90 @@ +Use local labels in assembly functions. +https://github.com/php/php-src/issues/16168#issuecomment-2404792553 +--- a/Zend/zend_string.c.orig 2024-09-24 10:59:52.000000000 -0500 ++++ b/Zend/zend_string.c 2024-10-10 18:42:28.000000000 -0500 +@@ -402,32 +402,32 @@ + ZEND_API zend_never_inline NOIPA bool ZEND_FASTCALL zend_string_equal_val(const zend_string *s1, const zend_string *s2) + { + const char *ptr = ZSTR_VAL(s1); +- size_t delta = (const char*)s2 - (const char*)s1; ++ uintptr_t delta = (uintptr_t) s2 - (uintptr_t) s1; + size_t len = ZSTR_LEN(s1); + zend_ulong ret; + + __asm__ ( +- ".LL0%=:\n\t" ++ "0:\n\t" + "movl (%2,%3), %0\n\t" + "xorl (%2), %0\n\t" +- "jne .LL1%=\n\t" ++ "jne 1f\n\t" + "addl $0x4, %2\n\t" + "subl $0x4, %1\n\t" +- "ja .LL0%=\n\t" ++ "ja 0b\n\t" + "movl $0x1, %0\n\t" +- "jmp .LL3%=\n\t" +- ".LL1%=:\n\t" ++ "jmp 3f\n\t" ++ "1:\n\t" + "cmpl $0x4,%1\n\t" +- "jb .LL2%=\n\t" ++ "jb 2f\n\t" + "xorl %0, %0\n\t" +- "jmp .LL3%=\n\t" +- ".LL2%=:\n\t" ++ "jmp 3f\n\t" ++ "2:\n\t" + "negl %1\n\t" + "lea 0x20(,%1,8), %1\n\t" + "shll %b1, %0\n\t" + "sete %b0\n\t" + "movzbl %b0, %0\n\t" +- ".LL3%=:\n" ++ "3:\n" + : "=&a"(ret), + "+c"(len), + "+r"(ptr) +@@ -440,32 +440,32 @@ + ZEND_API zend_never_inline NOIPA bool ZEND_FASTCALL zend_string_equal_val(const zend_string *s1, const zend_string *s2) + { + const char *ptr = ZSTR_VAL(s1); +- size_t delta = (const char*)s2 - (const char*)s1; ++ uintptr_t delta = (uintptr_t) s2 - (uintptr_t) s1; + size_t len = ZSTR_LEN(s1); + zend_ulong ret; + + __asm__ ( +- ".LL0%=:\n\t" ++ "0:\n\t" + "movq (%2,%3), %0\n\t" + "xorq (%2), %0\n\t" +- "jne .LL1%=\n\t" ++ "jne 1f\n\t" + "addq $0x8, %2\n\t" + "subq $0x8, %1\n\t" +- "ja .LL0%=\n\t" ++ "ja 0b\n\t" + "movq $0x1, %0\n\t" +- "jmp .LL3%=\n\t" +- ".LL1%=:\n\t" ++ "jmp 3f\n\t" ++ "1:\n\t" + "cmpq $0x8,%1\n\t" +- "jb .LL2%=\n\t" ++ "jb 2f\n\t" + "xorq %0, %0\n\t" +- "jmp .LL3%=\n\t" +- ".LL2%=:\n\t" ++ "jmp 3f\n\t" ++ "2:\n\t" + "negq %1\n\t" + "lea 0x40(,%1,8), %1\n\t" + "shlq %b1, %0\n\t" + "sete %b0\n\t" + "movzbq %b0, %0\n\t" +- ".LL3%=:\n" ++ "3:\n" + : "=&a"(ret), + "+c"(len), + "+r"(ptr) diff --git a/lang/php/files/php85 b/lang/php/files/php85 new file mode 100644 index 0000000000000..a801167a9eb8d --- /dev/null +++ b/lang/php/files/php85 @@ -0,0 +1,6 @@ +bin/php84 +bin/php-config84 +bin/phpize84 +share/man/man1/php84.1.gz +share/man/man1/php-config84.1.gz +share/man/man1/phpize84.1.gz diff --git a/math/z3/files/z3-fstar.profdata.tar.xz b/math/z3/files/z3-fstar.profdata.tar.xz deleted file mode 100644 index 6867b08727af0..0000000000000 Binary files a/math/z3/files/z3-fstar.profdata.tar.xz and /dev/null differ diff --git a/net/macos-fortress/files/hphosts-hosts_20180316.txt.bz2 b/net/macos-fortress/files/hphosts-hosts_20180316.txt.bz2 deleted file mode 100644 index cd249e5fc0d11..0000000000000 Binary files a/net/macos-fortress/files/hphosts-hosts_20180316.txt.bz2 and /dev/null differ diff --git a/php/php-APCu/Portfile b/php/php-APCu/Portfile index 6f0e36c42817c..fb8aea05e2c24 100644 --- a/php/php-APCu/Portfile +++ b/php/php-APCu/Portfile @@ -9,15 +9,15 @@ maintainers {ryandesign @ryandesign} license PHP-3.01 # Compatible with PHP 8.4 as of 5.1.24 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.0]} { - version 5.1.24 + version 5.1.25 revision 0 - checksums rmd160 fb9c938d351d881142d2dd5c06764371d0f96fd9 \ - sha256 5c28a55b27082c69657e25b7ecf553e2cf6b74ec3fa77d6b76f4fb982e001e43 \ - size 90866 + checksums rmd160 dcc564509f7ee5179bd5b825b93a57f0ffa8c820 \ + sha256 c4e7bae1cc2b9f68857889c022c7ea8cbc38b830c07273a2226cc44dc6de3048 \ + size 94319 } else { version 4.0.11 revision 0 diff --git a/php/php-amqp/Portfile b/php/php-amqp/Portfile index b611c063af073..1189ca9daf35f 100644 --- a/php/php-amqp/Portfile +++ b/php/php-amqp/Portfile @@ -8,7 +8,7 @@ categories php net maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes description AMQP interface for PHP diff --git a/php/php-dbase/Portfile b/php/php-dbase/Portfile index 4924069eeb63f..34459e1e7e62f 100644 --- a/php/php-dbase/Portfile +++ b/php/php-dbase/Portfile @@ -8,7 +8,7 @@ categories-append databases maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes description a PHP interface for accessing dBase databases diff --git a/php/php-event/Portfile b/php/php-event/Portfile index d537faf937a43..ae5c55ba429dc 100644 --- a/php/php-event/Portfile +++ b/php/php-event/Portfile @@ -8,7 +8,7 @@ categories-append devel maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 -php.branches 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes # This extension must load after the sockets extension. diff --git a/php/php-gearman/Portfile b/php/php-gearman/Portfile index 711c200655133..45f75263062a3 100644 --- a/php/php-gearman/Portfile +++ b/php/php-gearman/Portfile @@ -10,7 +10,7 @@ maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 # Compatible with PHP 8.4 as of 2.1.3 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes description Library to provide API for communicating with gearmand, using libgearman. diff --git a/php/php-geoip/Portfile b/php/php-geoip/Portfile index a7e360bb25dc4..2efe292528d5e 100644 --- a/php/php-geoip/Portfile +++ b/php/php-geoip/Portfile @@ -8,7 +8,7 @@ license PHP categories php devel maintainers {ryandesign @ryandesign} openmaintainer -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.0]} { diff --git a/php/php-gmagick/Portfile b/php/php-gmagick/Portfile index f4108634ea7d0..763d6810e3d45 100644 --- a/php/php-gmagick/Portfile +++ b/php/php-gmagick/Portfile @@ -8,7 +8,7 @@ license PHP categories php devel maintainers {ryandesign @ryandesign} openmaintainer -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes php.pecl.prerelease yes @@ -33,6 +33,8 @@ long_description \ of images using the GraphicsMagick API. if {${name} ne ${subport}} { + conflicts [string map {-g -i} ${subport}] + depends_lib-append port:GraphicsMagick configure.args-append --with-gmagick=${prefix} diff --git a/php/php-igbinary/Portfile b/php/php-igbinary/Portfile index e7abf2cac17a2..eb7989506a299 100644 --- a/php/php-igbinary/Portfile +++ b/php/php-igbinary/Portfile @@ -9,7 +9,7 @@ license BSD PHP-3.01 platforms darwin freebsd openbsd maintainers {ryandesign @ryandesign} openmaintainer -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.0]} { diff --git a/php/php-imagick/Portfile b/php/php-imagick/Portfile index 32acdb466fae4..5f3997447e90f 100644 --- a/php/php-imagick/Portfile +++ b/php/php-imagick/Portfile @@ -8,7 +8,7 @@ categories-append graphics maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes description PHP extension to create and modify images with \ @@ -19,29 +19,39 @@ long_description Imagick is a native PHP extension for creating and \ if {[vercmp ${php.branch} >= 5.4]} { epoch 1 - version 3.7.0 - revision 1 - checksums rmd160 60d5c6cc154b65bdfd31be6980633ff1e659bc73 \ - sha256 5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e \ - size 360138 + version 3.8.0 + revision 0 + checksums rmd160 79656fcf0900a1456ddc5555ac2c6eb6389dbf88 \ + sha256 bda67461c854f20d6105782b769c524fc37388b75d4481d951644d2167ffeec6 \ + size 363874 } else { # imagick 3.4.0RC1 dropped support for PHP 5.3. # https://pecl.php.net/package-info.php?package=imagick&version=3.4.0RC1 epoch 2 version 3.3.0 - revision 1 + revision 2 checksums rmd160 5746dc20ed455049a6eb5cea8dfe2b6c702c8f7c \ sha256 bd69ebadcedda1d87592325b893fa78a5710a0ca7307f8e18c5e593949b1db2d \ size 179978 } if {${name} ne ${subport}} { + conflicts [string map {-i -g} ${subport}] + depends_build-append \ path:bin/pkg-config:pkgconfig - depends_lib-append port:ImageMagick + variant ImageMagick7 conflicts ImageMagick6 description {Use ImageMagick7 libraries} { + depends_lib-append port:ImageMagick7 + + configure.args --with-imagick=${prefix}/lib/ImageMagick7 + } + + variant ImageMagick6 conflicts ImageMagick7 description {Use ImageMagick6 libraries} { + depends_lib-append port:ImageMagick - configure.args --with-imagick=${prefix} + configure.args --with-imagick=${prefix} + } post-destroot { set docdir ${prefix}/share/doc/${subport} @@ -49,4 +59,14 @@ if {${name} ne ${subport}} { xinstall -m 0644 -W ${worksrcpath} CREDITS ${destroot}${subport} copy ${worksrcpath}/examples ${destroot}${prefix}/share/examples/${subport} } + + # https://trac.macports.org/ticket/69390 + if {![variant_isset ImageMagick7] && ![variant_isset ImageMagick6] } { + if {[vercmp ${php.branch} >= 7.4]} { + default_variants +ImageMagick7 + } else { + default_variants +ImageMagick6 + } + } + } diff --git a/php/php-imap/Portfile b/php/php-imap/Portfile new file mode 100644 index 0000000000000..3c45f27df8ddd --- /dev/null +++ b/php/php-imap/Portfile @@ -0,0 +1,45 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 + +PortSystem 1.0 +PortGroup php 1.1 + +name php-imap +categories-append mail +maintainers openmaintainer +license PHP-3.01 + +# php81-imap and earlier subports are in the php Portfile. +php.branches 8.3 8.4 8.5 +php.pecl yes + +description a PHP interface to the IMAP protocol + +long_description ${description} + +# according to +# https://pecl.php.net/package/imap +# imap for php81-php84 ought to be supported by this; +# but 1.0.0 fails to compile +if {[vercmp ${php.branch} >= 8.3]} { + version 1.0.3 + revision 0 + checksums rmd160 13677f1f6b649360eaaf603ba86d39af69e16835 \ + sha256 0c2c0b1f94f299004be996b85a424e3d11ff65ac0a3c980db3213289a4a3faaf \ + size 63476 +} elseif {[vercmp ${php.branch} >= 8.1]} { + version 1.0.0 + revision 0 + checksums rmd160 250cc83d4b4125f233da6c160a4c1900837d988b \ + sha256 cddf9e90380f01f27408137a62253254cff54f2f988de09350b5f107c8f44a39 \ + size 63260 +} +if {${name} ne ${subport}} { + depends_build-append port:cclient + + depends_lib-append port:kerberos5 \ + port:libcomerr + + configure.args-append --with-imap=${prefix} \ + --with-imap-ssl=${prefix} \ + --with-kerberos=${prefix} +} diff --git a/php/php-jsmin/Portfile b/php/php-jsmin/Portfile index da9e8cf00e6f2..9c864a0420135 100644 --- a/php/php-jsmin/Portfile +++ b/php/php-jsmin/Portfile @@ -8,7 +8,7 @@ categories-append devel maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.0]} { diff --git a/php/php-lzf/Portfile b/php/php-lzf/Portfile index 696e2a4c1b2e9..0c377597ad6ea 100644 --- a/php/php-lzf/Portfile +++ b/php/php-lzf/Portfile @@ -8,7 +8,7 @@ categories php devel maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes description Handles LZF compression / decompression. diff --git a/php/php-mailparse/Portfile b/php/php-mailparse/Portfile index c65c0ffcc331f..3c672614888c2 100644 --- a/php/php-mailparse/Portfile +++ b/php/php-mailparse/Portfile @@ -9,7 +9,7 @@ categories php mail devel maintainers {ryandesign @ryandesign} openmaintainer # Compatible with PHP 8.4 as of 3.1.8 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes # This extension must load after the mbstring extension. diff --git a/php/php-maxminddb/Portfile b/php/php-maxminddb/Portfile index 3ed4076120c83..306abf8299667 100644 --- a/php/php-maxminddb/Portfile +++ b/php/php-maxminddb/Portfile @@ -8,15 +8,15 @@ license Apache-2 categories php devel maintainers {ryandesign @ryandesign} openmaintainer -php.branches 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.2]} { - version 1.12.0 + version 1.12.1 revision 0 - checksums rmd160 5130272d5464cce218c9720cd41d01bce04f312e \ - sha256 54a5d13399690d4c8da026775031db5851dddd4a8b40bdfbfde2caddeffdadfc \ - size 16162 + checksums rmd160 bc1c482352f0d062685dfe916c6685fe0db8a4ad \ + sha256 12e0db583e961700725b14c880d529bc93cac0db22ab7bd0fde8a926e478bfb5 \ + size 16175 } description PHP API for reading MaxMind DB files diff --git a/php/php-mcrypt/Portfile b/php/php-mcrypt/Portfile index 4b7be2d1c4252..0f442c57e37fe 100644 --- a/php/php-mcrypt/Portfile +++ b/php/php-mcrypt/Portfile @@ -9,7 +9,7 @@ maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 # php71-mcrypt and earlier subports are in the php Portfile. -php.branches 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes description a PHP interface to the mcrypt library, which offers \ @@ -28,6 +28,10 @@ if {[vercmp ${php.branch} >= 7.2]} { if {${name} ne ${subport}} { depends_lib-append port:libmcrypt + if {[vercmp ${php.branch} >= 8.4]} { + patchfiles-append patch-mcrypt.c.diff + } + # The mcrypt extension may be using libtool unnecessarily; monitor # https://bugs.php.net/bug.php?id=54500 depends_lib-append port:libtool diff --git a/php/php-mcrypt/files/patch-mcrypt.c.diff b/php/php-mcrypt/files/patch-mcrypt.c.diff new file mode 100644 index 0000000000000..10a24525fff3c --- /dev/null +++ b/php/php-mcrypt/files/patch-mcrypt.c.diff @@ -0,0 +1,20 @@ +--- mcrypt.c.orig ++++ mcrypt.c +@@ -38,7 +38,7 @@ + #include "php_ini.h" + #include "php_globals.h" + #include "ext/standard/info.h" +-#include "ext/standard/php_rand.h" ++#include "ext/random/php_random.h" + #include "zend_smart_str.h" + #include "php_mcrypt_filter.h" + +@@ -1414,7 +1414,7 @@ + } else { + n = (int)size; + while (size) { +- iv[--size] = (char) (255.0 * php_rand() / RAND_MAX); ++ iv[--size] = (char) (255.0 * php_mt_rand() / RAND_MAX); + } + } + RETVAL_STRINGL(iv, n); diff --git a/php/php-memcache/Portfile b/php/php-memcache/Portfile index d45b091d31713..861292ddc1b62 100644 --- a/php/php-memcache/Portfile +++ b/php/php-memcache/Portfile @@ -9,7 +9,7 @@ platforms darwin freebsd openbsd maintainers {ryandesign @ryandesign} openmaintainer license PHP-3 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes description PHP bindings for memcache diff --git a/php/php-memcached/Portfile b/php/php-memcached/Portfile index 16f64d5793c93..f682edeb49501 100644 --- a/php/php-memcached/Portfile +++ b/php/php-memcached/Portfile @@ -9,7 +9,7 @@ platforms darwin freebsd openbsd maintainers {ryandesign @ryandesign} openmaintainer license PHP-3 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.0]} { diff --git a/php/php-meminfo/Portfile b/php/php-meminfo/Portfile index 8699d234ee772..913ff95acda78 100644 --- a/php/php-meminfo/Portfile +++ b/php/php-meminfo/Portfile @@ -8,7 +8,7 @@ name php-meminfo maintainers {ryandesign @ryandesign} openmaintainer license MIT -php.branches 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 if {[vercmp ${php.branch} >= 5.6]} { github.setup BitOne php-meminfo 1.1.1 v diff --git a/php/php-mongodb/Portfile b/php/php-mongodb/Portfile index c9aab51fd5e6d..cf7b84c04d74e 100644 --- a/php/php-mongodb/Portfile +++ b/php/php-mongodb/Portfile @@ -8,10 +8,24 @@ categories php databases devel maintainers {ryandesign @ryandesign} openmaintainer license Apache-2 -php.branches 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes -if {[vercmp ${php.branch} >= 7.2]} { +# https://www.mongodb.com/docs/drivers/php-drivers/ +# https://pecl.php.net/package/mongodb +if {[vercmp ${php.branch} >= 8.1]} { + version 2.1.1 + revision 0 + checksums rmd160 1e7c10f8c30c61c77bb200a6a7f9f38fbe893d21 \ + sha256 bea8eb86be7e301b1cd3935ee3ccfa052e410a7cfa404ae5ab4b11e4c99b8899 \ + size 2128535 +} elseif {[vercmp ${php.branch} >= 7.4]} { + version 1.20.1 + revision 0 + checksums rmd160 83fcdfe9792a77e5d199ab721ea017abdee39ba8 \ + sha256 614e57594918feb621f525e6516d59ce09b78f5172355ba8afb6c2207c1ce900 \ + size 2106641 +} elseif {[vercmp ${php.branch} >= 7.2]} { version 1.16.2 revision 0 checksums rmd160 5e23773ac2b29012c969e25a3522e4e939615e4c \ diff --git a/php/php-mysql_xdevapi/Portfile b/php/php-mysql_xdevapi/Portfile index 79a5f410051ee..4641b0a1fed18 100644 --- a/php/php-mysql_xdevapi/Portfile +++ b/php/php-mysql_xdevapi/Portfile @@ -12,7 +12,7 @@ license PHP-3.01 homepage https://dev.mysql.com/doc/x-devapi-userguide/en/ -php.branches 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.1]} { diff --git a/php/php-oauth/Portfile b/php/php-oauth/Portfile index 68f75d2713be7..979df95fa77e4 100644 --- a/php/php-oauth/Portfile +++ b/php/php-oauth/Portfile @@ -9,7 +9,7 @@ categories php devel maintainers {ryandesign @ryandesign} openmaintainer # Compatible with PHP 8.4 as of 2.0.9 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.1]} { diff --git a/php/php-openswoole/Portfile b/php/php-openswoole/Portfile index a7c18a90db9b1..3879a19463105 100644 --- a/php/php-openswoole/Portfile +++ b/php/php-openswoole/Portfile @@ -8,10 +8,22 @@ categories-append net devel maintainers {ryandesign @ryandesign} openmaintainer license Apache-2 -php.branches 7.2 7.3 7.4 8.0 8.1 8.2 +php.branches 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes -if {[vercmp ${php.branch} >= 7.4]} { +if {[vercmp ${php.branch} >= 8.2]} { + version 25.2.0 + revision 0 + checksums rmd160 745e2859737fb01da2adb32ca032c2fd63a4e3ed \ + sha256 bcc1fed4877b6646cb8f79b092ba03d5e495800465a3fff83c065c58d4312d40 \ + size 1239054 +} elseif {[vercmp ${php.branch} >= 8.1]} { + version 22.1.2 + revision 0 + checksums rmd160 554eb7fa11c1927e57f7bdb5ca4eb820fbf9f548 \ + sha256 ec9d08e9484bf95a0080738342a84f09b9c5b8222f4a03c4736caacb7668cb46 \ + size 1252932 +} elseif {[vercmp ${php.branch} >= 7.4]} { version 22.0.0 revision 0 checksums rmd160 9c9c2da1afd86be905ccc9b692450cf0af4f43c0 \ diff --git a/php/php-pcov/Portfile b/php/php-pcov/Portfile index 15f0ac1712fc1..2132f0670c93c 100644 --- a/php/php-pcov/Portfile +++ b/php/php-pcov/Portfile @@ -10,7 +10,7 @@ maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 # Compatible with PHP 8.4 as of 1.0.12 -php.branches 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes description A self contained php-code-coverage compatible driver for PHP. diff --git a/php/php-pspell/Portfile b/php/php-pspell/Portfile new file mode 100644 index 0000000000000..2076fe9ab6047 --- /dev/null +++ b/php/php-pspell/Portfile @@ -0,0 +1,34 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 + +PortSystem 1.0 +PortGroup php 1.1 + +name php-pspell +categories-append textproc +maintainers openmaintainer +license PHP-3.01 + +# php80-pspell and earlier subports are in the php Portfile. +php.branches 8.1 8.2 8.3 8.4 8.5 +php.pecl yes + +description a PHP interface to the aspell library, which lets you \ + check spelling and offer spelling suggestions + +long_description ${description} + +if {[vercmp ${php.branch} >= 8.1]} { + version 1.0.1 + revision 0 + checksums rmd160 1b035791e93bb9e622dba3a7c7249fc9d5b29f17 \ + sha256 585441202e3a53e7b5190b38c2f8438d37b53845448d28af5f904cf65c56c02f \ + size 10850 +} + +if {${name} ne ${subport}} { + depends_build-append port:cclient + + depends_lib-append port:aspell + + configure.args-append --with-pspell=${prefix} +} diff --git a/php/php-psr/Portfile b/php/php-psr/Portfile index d5b637cb03edd..7e95e04f9c0fd 100644 --- a/php/php-psr/Portfile +++ b/php/php-psr/Portfile @@ -7,7 +7,7 @@ name php-psr maintainers {ryandesign @ryandesign} openmaintainer license BSD -php.branches 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.3]} { diff --git a/php/php-raphf/Portfile b/php/php-raphf/Portfile index d9cf38123f0b7..767440957c3d2 100644 --- a/php/php-raphf/Portfile +++ b/php/php-raphf/Portfile @@ -7,7 +7,7 @@ name php-raphf maintainers {ryandesign @ryandesign} openmaintainer license BSD -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.0]} { diff --git a/php/php-rar/Portfile b/php/php-rar/Portfile index f4d0044cbebdd..3e8a673939d30 100644 --- a/php/php-rar/Portfile +++ b/php/php-rar/Portfile @@ -8,7 +8,7 @@ categories php devel maintainers {ryandesign @ryandesign} openmaintainer license PHP-3 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes description A PECL extension to create and read rar files. diff --git a/php/php-redis/Portfile b/php/php-redis/Portfile index 825693693b24c..abd5b8d8c8d47 100644 --- a/php/php-redis/Portfile +++ b/php/php-redis/Portfile @@ -9,15 +9,15 @@ maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 # Compatible with PHP 8.4 as of 6.1.0 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.4]} { - version 6.1.0 + version 6.2.0 revision 0 - checksums rmd160 ed4ce8479b88d34a9f3e32e5dbb4fa8600e1ddf4 \ - sha256 f10405f639fe415e9ed4ec99538e72c90694d8dbd62868edcfcd6a453466b48c \ - size 373740 + checksums rmd160 8776948ffbe15e47a00eef93ffbf9894044daaa2 \ + sha256 5069c13dd22bd9e494bb246891052cb6cc0fc9a1b45c6a572a8be61773101363 \ + size 379865 } elseif {[vercmp ${php.branch} >= 7.2]} { version 6.0.2 revision 0 diff --git a/php/php-rrd/Portfile b/php/php-rrd/Portfile index 61a1b7a9d34d0..ba35a43c55a68 100644 --- a/php/php-rrd/Portfile +++ b/php/php-rrd/Portfile @@ -8,7 +8,7 @@ categories-append net devel maintainers {ryandesign @ryandesign} openmaintainer license BSD -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.0]} { diff --git a/php/php-scrypt/Portfile b/php/php-scrypt/Portfile index 546b64e453f94..b1770e26cbf77 100644 --- a/php/php-scrypt/Portfile +++ b/php/php-scrypt/Portfile @@ -8,7 +8,7 @@ categories-append security maintainers {ryandesign @ryandesign} openmaintainer license BSD -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.0]} { diff --git a/php/php-solr/Portfile b/php/php-solr/Portfile index 89f0933f3ec18..3be19d9a336b4 100644 --- a/php/php-solr/Portfile +++ b/php/php-solr/Portfile @@ -9,15 +9,15 @@ license PHP-3.01 maintainers {ryandesign @ryandesign} openmaintainer # Compatible with PHP 8.4 as of 2.8.0 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.4]} { - version 2.8.0 + version 2.8.1 revision 0 - checksums rmd160 b44e9c4da116812e4ee54e87c9a568597641bc09 \ - sha256 092b52a7b94a807e40f8d85032c85dd0c052fab31d4f518e1d756b9f2d42d4b8 \ - size 627604 + checksums rmd160 e1cd87051d63f052595dbfe5128a62ec37ced695 \ + sha256 1284d25f0314009abf7187d79e4bdb53a28ca63436c2c3dd8767fc4880810c91 \ + size 627662 } elseif {[vercmp ${php.branch} >= 7.0]} { version 2.6.0 revision 1 diff --git a/php/php-sqlsrv/Portfile b/php/php-sqlsrv/Portfile index 801f14709ed8f..ea11ba3578491 100644 --- a/php/php-sqlsrv/Portfile +++ b/php/php-sqlsrv/Portfile @@ -12,7 +12,7 @@ categories-append databases maintainers {ryandesign @ryandesign} openmaintainer license MIT -php.branches 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes description Microsoft sqlsrv drivers for PHP diff --git a/php/php-ssh2/Portfile b/php/php-ssh2/Portfile index b4250cf6939c8..65494f931ae25 100644 --- a/php/php-ssh2/Portfile +++ b/php/php-ssh2/Portfile @@ -8,7 +8,7 @@ categories-append net maintainers {ryandesign @ryandesign} openmaintainer license PHP -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes php.pecl.prerelease yes diff --git a/php/php-stomp/Portfile b/php/php-stomp/Portfile index 67384ca9e817d..0a3b2eec61565 100644 --- a/php/php-stomp/Portfile +++ b/php/php-stomp/Portfile @@ -8,7 +8,7 @@ categories php devel maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.0]} { diff --git a/php/php-svm/Portfile b/php/php-svm/Portfile index de294ca63ac77..8e6cceb38b9da 100644 --- a/php/php-svm/Portfile +++ b/php/php-svm/Portfile @@ -8,7 +8,7 @@ categories-append math maintainers {ryandesign @ryandesign} openmaintainer license BSD -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes php.pecl.prerelease yes diff --git a/php/php-swoole/Portfile b/php/php-swoole/Portfile index ccafa16b5fa08..533277e95fd2e 100644 --- a/php/php-swoole/Portfile +++ b/php/php-swoole/Portfile @@ -9,15 +9,15 @@ categories-append net devel maintainers {ryandesign @ryandesign} openmaintainer license Apache-2 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 8.0]} { - version 5.0.3 + version 6.0.2 revision 0 - checksums rmd160 c8d3b6e892b2c2bc919ac0da36c6837b4315bfa6 \ - sha256 6c51e11199214921e07ab1b9f0e67781c96f7b8e06afb4225f05d1dc79832ead \ - size 2066852 + checksums rmd160 fb03a3b55a4b9b60143bd2493aef89aaf235840b \ + sha256 ca9df27a4188f6670720ffaed9c4ecd6e832ea5aed55e554b63230f3147166ca \ + size 2330514 } elseif {[vercmp ${php.branch} >= 7.2]} { version 4.8.13 revision 0 diff --git a/php/php-timezonedb/Portfile b/php/php-timezonedb/Portfile index 105dd5c596436..dcd1833bb8213 100644 --- a/php/php-timezonedb/Portfile +++ b/php/php-timezonedb/Portfile @@ -8,7 +8,7 @@ categories php devel maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes description A PECL Timezone Database. @@ -21,11 +21,11 @@ long_description Timezone Database to be used with PHP's date and time \ # https://bugs.php.net/bug.php?id=80923 # https://github.com/php/pecl-datetime-timezonedb/commit/fb6fbdc87bd579085481f2d61c65a672ae10fe8e if {[vercmp ${php.branch} >= 5.4]} { - version 2025.1 + version 2025.2 revision 0 - checksums rmd160 80c9151133af56f183c024f17870c5d537c7b037 \ - sha256 0ca91cabdd952a54ff9413337c374d4b157277f25d492c14a403ed526153e3bb \ - size 646718 + checksums rmd160 2a93463a5edbcc31d0dae61f36a0503f8f42165e \ + sha256 ae32b224a843df303d61bffbf38ce325e0ca6117b92a974a101a6729d1ce5fea \ + size 649563 } elseif {[vercmp ${php.branch} >= 5.2]} { version 2021.1 revision 0 diff --git a/php/php-uploadprogress/Portfile b/php/php-uploadprogress/Portfile index f5a09dcc2894a..ad3a32d5824d1 100644 --- a/php/php-uploadprogress/Portfile +++ b/php/php-uploadprogress/Portfile @@ -8,7 +8,7 @@ categories php www devel maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes description An extension to track progress of a file upload. diff --git a/php/php-uuid/Portfile b/php/php-uuid/Portfile index 3e29d94e11c2a..221439b539950 100644 --- a/php/php-uuid/Portfile +++ b/php/php-uuid/Portfile @@ -8,7 +8,7 @@ categories-append net www maintainers {ryandesign @ryandesign} openmaintainer license LGPL-2.1+ -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes description A wrapper around libuuid from the ext2utils project. @@ -16,11 +16,11 @@ description A wrapper around libuuid from the ext2utils project. long_description ${description} if {[vercmp ${php.branch} >= 7.0]} { - version 1.2.1 + version 1.3.0 revision 0 - checksums rmd160 0f91762096c3658f9914c1ee9a4891050a2549b8 \ - sha256 2235c8584ca8911ce5512ebf791e5bb1d849c323640ad3e0be507b00156481c7 \ - size 16903 + checksums rmd160 4d7cfa161e193436850b48e3579c6156694fc2ad \ + sha256 b7af055e2c409622f8c5e6242d1c526c00e011a93c39b10ca28040b908da3f37 \ + size 17385 } elseif {[vercmp ${php.branch} >= 5.3]} { version 1.0.5 revision 1 diff --git a/php/php-vld/Portfile b/php/php-vld/Portfile index 9eb2d50272e22..1a637714bdbd2 100644 --- a/php/php-vld/Portfile +++ b/php/php-vld/Portfile @@ -8,16 +8,16 @@ categories php devel maintainers {ryandesign @ryandesign} openmaintainer license BSD -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes php.pecl.prerelease yes if {[vercmp ${php.branch} >= 7.0]} { - version 0.18.0 + version 0.19.1 revision 0 - checksums rmd160 470d3e47502046e4011a3c837afc995b5a29dd69 \ - sha256 b891cea46fcd61e304a0945ec19eb13b3714a74256e9ec2b6d8edcffac45701d \ - size 22040 + checksums rmd160 988c7943bd9c016db1267d563d1146b4cbfbcf9c \ + sha256 a8b95b3103d87425453750ed1d20b9507f33bcb62b8f0ca63c962dc330532bdd \ + size 22913 } elseif {[vercmp ${php.branch} >= 5.4]} { version 0.14.0 revision 0 diff --git a/php/php-xdebug/Portfile b/php/php-xdebug/Portfile index 20e604bc00a33..37b1e929525a7 100644 --- a/php/php-xdebug/Portfile +++ b/php/php-xdebug/Portfile @@ -10,18 +10,18 @@ maintainers {ryandesign @ryandesign} openmaintainer license Xdebug-1.01 homepage https://xdebug.org -master_sites ${homepage}/files/ # Compatible with PHP 8.4 as of 3.4.0 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 +php.pecl yes php.extensions.zend xdebug if {[vercmp ${php.branch} >= 8.0]} { - version 3.4.1 + version 3.4.5 revision 0 - checksums rmd160 0657c15401cd336e118ccc0dad8e4ed259df9b9b \ - sha256 4d96bcded78dbd271fb344c119171b625a8597cd67fc6899ec5e019549f1bb87 \ - size 261507 + checksums rmd160 94efbb1598f7f23900abe4e00a6e21a2d40bc0bc \ + sha256 f58442306ce55fe3b811c31759a247242989164f2a7933f05c8d59b06665b9c9 \ + size 263514 } elseif {[vercmp ${php.branch} >= 7.2]} { version 3.1.6 revision 0 diff --git a/php/php-xhprof/Portfile b/php/php-xhprof/Portfile index 6d4f129581eca..39a9e289f90ba 100644 --- a/php/php-xhprof/Portfile +++ b/php/php-xhprof/Portfile @@ -8,7 +8,7 @@ categories-append devel maintainers {ryandesign @ryandesign} openmaintainer license Apache-2 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.0]} { diff --git a/php/php-xmlrpc/Portfile b/php/php-xmlrpc/Portfile index ad704b77a7792..1f6696559ef24 100644 --- a/php/php-xmlrpc/Portfile +++ b/php/php-xmlrpc/Portfile @@ -8,7 +8,7 @@ categories-append textproc maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 -php.branches 8.0 8.1 8.2 8.3 +php.branches 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes php.pecl.prerelease yes diff --git a/php/php-yaf/Portfile b/php/php-yaf/Portfile index 5f6d9c37dc0c5..c9dc65aa172cf 100644 --- a/php/php-yaf/Portfile +++ b/php/php-yaf/Portfile @@ -8,15 +8,15 @@ categories-append net devel maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.0]} { - version 3.3.6 + version 3.3.7 revision 0 - checksums rmd160 d6093d76626947f578cb02a03e2b6075925735f4 \ - sha256 7056dba64f4a6346402cdcfa228aacfbbc67487b9afa05e689d778300cc8a738 \ - size 134030 + checksums rmd160 ddecb4ac0f659d13112e758292eda7b864e7db16 \ + sha256 7fcea41c7b4254e6db71132a2591b5ce4c88d4af70231b0ffb560fdd22b43e95 \ + size 134483 } else { version 2.3.5 revision 0 diff --git a/php/php-yaml/Portfile b/php/php-yaml/Portfile index e9a6ea3574dc4..49a75055f474c 100644 --- a/php/php-yaml/Portfile +++ b/php/php-yaml/Portfile @@ -8,7 +8,7 @@ categories-append devel maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 7.1]} { diff --git a/php/php-yaz/Portfile b/php/php-yaz/Portfile index 844d925b724fe..3c153415dccc0 100644 --- a/php/php-yaz/Portfile +++ b/php/php-yaz/Portfile @@ -8,7 +8,7 @@ categories-append net databases devel maintainers {ryandesign @ryandesign} openmaintainer license PHP -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes description PHP/PECL extension for the Z39.50 protocol diff --git a/php/php-zip/Portfile b/php/php-zip/Portfile index 5d6ed0f62431c..a5df876fa6651 100644 --- a/php/php-zip/Portfile +++ b/php/php-zip/Portfile @@ -9,16 +9,16 @@ maintainers {ryandesign @ryandesign} openmaintainer license PHP-3.01 # Compatible with PHP 8.4 as of 1.22.4 -php.branches 5.2 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.2 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 php.pecl yes if {[vercmp ${php.branch} >= 5.4]} { epoch 3 - version 1.22.4 + version 1.22.6 revision 0 - checksums rmd160 b46311eb2c89546a148f02fc1ad32a1492f38c60 \ - sha256 950cd3ba4f1df93271bda30fe139271359bcbed75cca81879dada9ab1d939692 \ - size 366749 + checksums rmd160 4f7fde88f8b34fee0a79a4990029c945d0cb26f9 \ + sha256 8e605bb7617cdc8fca21820ff411c8977c84a218c974318b813b2bea8c8a145c \ + size 369556 } elseif {[vercmp ${php.branch} >= 4.3]} { epoch 3 version 1.16.1 diff --git a/php/php-zstd/Portfile b/php/php-zstd/Portfile index 80b6003ee61a1..bc04642dcace6 100644 --- a/php/php-zstd/Portfile +++ b/php/php-zstd/Portfile @@ -9,7 +9,7 @@ categories-append devel maintainers {ryandesign @ryandesign} openmaintainer license MIT -php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 +php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5 # Not using "php.pecl yes" because that distfile is 15 times larger because it # includes a bundled copy of libzstd that we don't use. homepage http://pecl.php.net/package/${php.pecl.name}