CVS commit: pkgsrc/benchmarks/phoronix-test-suite

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Feb  8 03:28:48 UTC 2025

Modified Files:
        pkgsrc/benchmarks/phoronix-test-suite: Makefile distinfo
Added Files:
        pkgsrc/benchmarks/phoronix-test-suite/patches:
            patch-phoronix-test-suite

Log Message:
benchmarks/phoronix-test-suite: multiple PHP support

* Use PHP_BASE_VERS in DEPENDS.
* Select php binary straightforward.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/benchmarks/phoronix-test-suite/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/benchmarks/phoronix-test-suite/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/benchmarks/phoronix-test-suite/patches/patch-phoronix-test-suite

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/benchmarks/phoronix-test-suite/Makefile
diff -u pkgsrc/benchmarks/phoronix-test-suite/Makefile:1.13 pkgsrc/benchmarks/phoronix-test-suite/Makefile:1.14
--- pkgsrc/benchmarks/phoronix-test-suite/Makefile:1.13 Mon Feb 19 15:43:34 2024
+++ pkgsrc/benchmarks/phoronix-test-suite/Makefile      Sat Feb  8 03:28:48 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2024/02/19 15:43:34 taca Exp $
+# $NetBSD: Makefile,v 1.14 2025/02/08 03:28:48 taca Exp $
 #
 
 DISTNAME=      phoronix-test-suite-${PTS_VERSION}
 PTS_VERSION=   8.8.1
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    benchmarks
 MASTER_SITES=  https://www.phoronix-test-suite.com/releases/
 
@@ -12,12 +12,12 @@ HOMEPAGE=   https://www.phoronix-test-suit
 COMMENT=       Phoronix Benchmarking Suite
 LICENSE=       gnu-gpl-v3
 
-DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=5.3:../../www/php-curl
-DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=5.3:../../graphics/php-gd
-DEPENDS+=      ${PHP_PKG_PREFIX}-pcntl>=5.3:../../devel/php-pcntl
-DEPENDS+=      ${PHP_PKG_PREFIX}-posix>=5.3:../../devel/php-posix
-DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=5.3:../../archivers/php-zip
-DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=5.3:../../archivers/php-zlib
+DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=${PHP_BASE_VERS}:../../www/php-curl
+DEPENDS+=      ${PHP_PKG_PREFIX}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-pcntl>=${PHP_BASE_VERS}:../../devel/php-pcntl
+DEPENDS+=      ${PHP_PKG_PREFIX}-posix>=${PHP_BASE_VERS}:../../devel/php-posix
+DEPENDS+=      ${PHP_PKG_PREFIX}-zip>=${PHP_BASE_VERS}:../../archivers/php-zip
+DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
 
 INSTALLATION_DIRS=     bin
 INSTALLATION_DIRS+=    share/bash-completion.d
@@ -39,6 +39,11 @@ PLIST_VARS+= systemd
 PLIST.systemd= yes
 .endif
 
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths+=    phoronix-test-suite
+SUBST_VARS.paths+=     PREFIX PHP_VER
+
 pre-install:
        ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 

Index: pkgsrc/benchmarks/phoronix-test-suite/distinfo
diff -u pkgsrc/benchmarks/phoronix-test-suite/distinfo:1.8 pkgsrc/benchmarks/phoronix-test-suite/distinfo:1.9
--- pkgsrc/benchmarks/phoronix-test-suite/distinfo:1.8  Tue Oct 26 10:02:54 2021
+++ pkgsrc/benchmarks/phoronix-test-suite/distinfo      Sat Feb  8 03:28:48 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:02:54 nia Exp $
+$NetBSD: distinfo,v 1.9 2025/02/08 03:28:48 taca Exp $
 
 BLAKE2s (phoronix-test-suite-8.8.1.tar.gz) = fd55a8d4b1ca1782fdd7a8888e959ca718cd0a95e605c25ed108a09e558bede9
 SHA512 (phoronix-test-suite-8.8.1.tar.gz) = 3395eee510f546447173306152704b9729a39a04062459a8153badcf53c6a63ae294833e377667cf521ee4e73c4b3ed175bacc1e7baa27a33cf6bd1a87338c25
 Size (phoronix-test-suite-8.8.1.tar.gz) = 904758 bytes
 SHA1 (patch-install-sh) = bdabbdccf8bb106cd1d48106cd40822cf997450e
+SHA1 (patch-phoronix-test-suite) = b81f4032900427f79941bcfe6587e56e55232f13
 SHA1 (patch-pts-core_static_sample-pts-client-update-script.sh) = e611f5f776ee645e181a8939d71a09aed5279b0e

Added files:

Index: pkgsrc/benchmarks/phoronix-test-suite/patches/patch-phoronix-test-suite
diff -u /dev/null pkgsrc/benchmarks/phoronix-test-suite/patches/patch-phoronix-test-suite:1.1
--- /dev/null   Sat Feb  8 03:28:48 2025
+++ pkgsrc/benchmarks/phoronix-test-suite/patches/patch-phoronix-test-suite     Sat Feb  8 03:28:48 2025
@@ -0,0 +1,74 @@
+$NetBSD: patch-phoronix-test-suite,v 1.1 2025/02/08 03:28:48 taca Exp $
+
+* Set pkgsrc's PHP.
+
+--- phoronix-test-suite.orig   2019-05-30 15:01:30.000000000 +0000
++++ phoronix-test-suite
+@@ -53,66 +53,7 @@ then
+ fi
+ 
+ # Determine PHP binary location
+-if [ ! "X$PHP_BIN" = "X" ] && [ -x $PHP_BIN ]
+-then
+-      export PHP_BIN=$PHP_BIN
+-elif [ -x /usr/bin/php7 ] || [ -x /usr/local/bin/php7 ] || [ -x /usr/pkg/bin/php7 ]
+-then
+-      export PHP_BIN="php7"
+-elif [ -x /usr/bin/php ] || [ -x /usr/pkg/bin/php ]
+-then
+-      export PHP_BIN="php"
+-elif [ -x /usr/php7/bin/php ]
+-then
+-      export PHP_BIN="/usr/php7/bin/php"
+-elif [ -x /usr/php/bin/php ]
+-then
+-      export PHP_BIN="/usr/php/bin/php"
+-elif [ -x /usr/local/bin/php ]
+-then
+-      export PHP_BIN="/usr/local/bin/php"
+-elif [ -x /usr/local/bin/php-7.0 ]
+-then
+-      export PHP_BIN="/usr/local/bin/php-7.0"
+-elif [ -x /usr/local/bin/php-7.1 ]
+-then
+-      export PHP_BIN="/usr/local/bin/php-7.1"
+-elif [ -x /usr/local/bin/php-7.2 ]
+-then
+-      export PHP_BIN="/usr/local/bin/php-7.2"
+-elif [ -x /opt/bin/php ]
+-then
+-      export PHP_BIN="/opt/bin/php"
+-elif [ -x /usr/pkg/libexec/cgi-bin/php ]
+-then
+-      export PHP_BIN="/usr/pkg/libexec/cgi-bin/php"
+-elif which php >/dev/null 2>&1 ;
+-then
+-      export PHP_BIN="php"
+-elif which php7 >/dev/null 2>&1 ;
+-then
+-      export PHP_BIN="php7"
+-elif [ -x /usr/php5/bin/php ]
+-then
+-      export PHP_BIN="/usr/php5/bin/php"
+-elif [ -x /usr/bin/php5 ] || [ -x /usr/local/bin/php5 ] || [ -x /usr/pkg/bin/php5 ]
+-then
+-      export PHP_BIN="php5"
+-elif which php5 >/dev/null 2>&1 ;
+-then
+-      export PHP_BIN="php5"
+-elif which php-cli >/dev/null 2>&1 ;
+-then
+-      export PHP_BIN="php-cli"
+-elif [ -x /usr/bin/hhvm ]
+-then
+-      export PHP_BIN="/usr/bin/hhvm"
+-elif which hhvm >/dev/null 2>&1 ;
+-then
+-      export PHP_BIN="hhvm"
+-else
+-      export PHP_BIN=""
+-fi
++PHP_BIN="@PREFIX@/bin/php@PHP_VER@
+ 
+ # Make sure PHP is installed
+ if [ "X$PHP_BIN" = "X" ]