CVS commit: pkgsrc/devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel
From: "Takahiro Kambe" <taca%netbsd.org@localhost>
Date: Sat, 8 Feb 2025 03:36:57 +0000

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Feb  8 03:36:57 UTC 2025

Modified Files:
        pkgsrc/devel/arcanist: Makefile
        pkgsrc/devel/kcachegrind: Makefile
        pkgsrc/devel/libphutil: Makefile
        pkgsrc/devel/mantis: Makefile
        pkgsrc/devel/pear-Console_CommandLine: Makefile
        pkgsrc/devel/phabricator: Makefile
        pkgsrc/devel/php-base58: Makefile

Log Message:
multiple PHP support

* Use PHP_BASE_VERS in DEPENDS if required.
* Use REPLACE_PHP.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/arcanist/Makefile
cvs rdiff -u -r1.80 -r1.81 pkgsrc/devel/kcachegrind/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/libphutil/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/mantis/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/pear-Console_CommandLine/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/phabricator/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/php-base58/Makefile

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

Modified files:

Index: pkgsrc/devel/arcanist/Makefile
diff -u pkgsrc/devel/arcanist/Makefile:1.20 pkgsrc/devel/arcanist/Makefile:1.21
--- pkgsrc/devel/arcanist/Makefile:1.20 Mon Feb 19 15:43:34 2024
+++ pkgsrc/devel/arcanist/Makefile      Sat Feb  8 03:36:56 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2024/02/19 15:43:34 taca Exp $
+# $NetBSD: Makefile,v 1.21 2025/02/08 03:36:56 taca Exp $
 
 DISTNAME=              arcanist-20170609
-PKGREVISION=           7
+PKGREVISION=           8
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=phacility/}
 # Track the stable branch
@@ -16,19 +16,15 @@ LICENSE=            apache-2.0
 EXTRACT_USING=         bsdtar
 USE_TOOLS+=            bsdtar pax
 
-DEPENDS+=              ${PHP_PKG_PREFIX}-curl-[0-9]*:../../www/php-curl
+DEPENDS+=              ${PHP_PKG_PREFIX}-curl>=${PHP_BASE_VERS}:../../www/php-curl
 DEPENDS+=              libphutil-[0-9]*:../../devel/libphutil
 
 CONFLICTS+=            arc-[0-9]*
 
-SUBST_CLASSES+=                php
-SUBST_MESSAGE.php=     Fixing PHP path
-SUBST_STAGE.php=       post-configure
-SUBST_FILES.php=       scripts/arcanist.php
-SUBST_FILES.php+=      scripts/hgdaemon/hgdaemon_client.php
-SUBST_FILES.php+=      scripts/hgdaemon/hgdaemon_server.php
-SUBST_FILES.php+=      src/lint/linter/xhpast/rules/__tests__/inline-html/inline-html.lint-test
-SUBST_SED.php=         -e 's,/usr/bin/env php,${PREFIX}/bin/php,'
+REPLACE_PHP=   scripts/arcanist.php
+REPLACE_PHP+=  scripts/hgdaemon/hgdaemon_client.php
+REPLACE_PHP+=  scripts/hgdaemon/hgdaemon_server.php
+REPLACE_PHP+=  src/lint/linter/xhpast/rules/__tests__/inline-html/inline-html.lint-test
 
 REPLACE_PYTHON+=       scripts/breakout.py
 

Index: pkgsrc/devel/kcachegrind/Makefile
diff -u pkgsrc/devel/kcachegrind/Makefile:1.80 pkgsrc/devel/kcachegrind/Makefile:1.81
--- pkgsrc/devel/kcachegrind/Makefile:1.80      Thu Nov 14 22:19:22 2024
+++ pkgsrc/devel/kcachegrind/Makefile   Sat Feb  8 03:36:56 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2024/11/14 22:19:22 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2025/02/08 03:36:56 taca Exp $
 
 DISTNAME=      kcachegrind-${KAPPSVER}
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    devel
 
 HOMEPAGE=      https://kde.org/applications/development/kcachegrind/
@@ -20,12 +20,7 @@ REPLACE_PERL+=       converters/op2calltree
 
 REPLACE_PYTHON+=       converters/hotshot2calltree.in
 
-# REPLACE_PHP+= converters/pprof2calltree
-SUBST_CLASSES+=                php
-SUBST_MESSAGE.php=     Fixing PHP path
-SUBST_STAGE.php=       post-configure
-SUBST_FILES.php=       converters/pprof2calltree
-SUBST_SED.php=         -e 's,/usr/bin/env php,${PREFIX}/bin/php,'
+REPLACE_PHP+= converters/pprof2calltree
 
 .include "../../lang/php/phpversion.mk"
 .include "${PHPPKGSRCDIR}/buildlink3.mk"

Index: pkgsrc/devel/libphutil/Makefile
diff -u pkgsrc/devel/libphutil/Makefile:1.10 pkgsrc/devel/libphutil/Makefile:1.11
--- pkgsrc/devel/libphutil/Makefile:1.10        Mon Feb 19 15:43:34 2024
+++ pkgsrc/devel/libphutil/Makefile     Sat Feb  8 03:36:56 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2024/02/19 15:43:34 taca Exp $
+# $NetBSD: Makefile,v 1.11 2025/02/08 03:36:56 taca Exp $
 
 DISTNAME=              libphutil-20170609
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=phacility/}
 # Track the stable branch
@@ -16,42 +16,38 @@ LICENSE=            apache-2.0
 EXTRACT_USING=         bsdtar
 USE_TOOLS+=            bsdtar pax
 
-SUBST_CLASSES+=                php
-SUBST_MESSAGE.php=     Fixing PHP path
-SUBST_STAGE.php=       post-configure
-SUBST_FILES.php=       scripts/build_xhpast.php
-SUBST_FILES.php+=      scripts/daemon/exec/exec_daemon.php
-SUBST_FILES.php+=      scripts/daemon/launch_daemon.php
-SUBST_FILES.php+=      scripts/daemon/torture/resist-death.php
-SUBST_FILES.php+=      scripts/example/calculator.php
-SUBST_FILES.php+=      scripts/example/subworkflow.php
-SUBST_FILES.php+=      scripts/format_log.php
-SUBST_FILES.php+=      scripts/phutil_rebuild_map.php
-SUBST_FILES.php+=      scripts/phutil_symbols.php
-SUBST_FILES.php+=      scripts/sandpit/harden_directory.php
-SUBST_FILES.php+=      scripts/test/deferred_log.php
-SUBST_FILES.php+=      scripts/test/highlight.php
-SUBST_FILES.php+=      scripts/test/http.php
-SUBST_FILES.php+=      scripts/test/interactive_editor.php
-SUBST_FILES.php+=      scripts/test/lipsum.php
-SUBST_FILES.php+=      scripts/test/mime.php
-SUBST_FILES.php+=      scripts/test/paypal.php
-SUBST_FILES.php+=      scripts/test/progress_bar.php
-SUBST_FILES.php+=      scripts/test/prompt.php
-SUBST_FILES.php+=      scripts/test/service_profiler.php
-SUBST_FILES.php+=      scripts/timezones/generate_windows_timezone_map.php
-SUBST_FILES.php+=      scripts/update_compat_info.php
-SUBST_FILES.php+=      scripts/utils/directory_fixture.php
-SUBST_FILES.php+=      scripts/utils/lock.php
-SUBST_FILES.php+=      scripts/utils/prosediff.php
-SUBST_FILES.php+=      scripts/utils/utf8.php
-SUBST_FILES.php+=      src/parser/PhutilLanguageGuesser.php
-SUBST_FILES.php+=      src/parser/__tests__/languageguesser/php.shell-env
-SUBST_FILES.php+=      support/parser/generate-type-parser.php
-SUBST_FILES.php+=      support/xhpast/generate_nodes.php
-SUBST_FILES.php+=      bin/aws-s3
-SUBST_FILES.php+=      scripts/utils/aws-s3.php
-SUBST_SED.php=         -e 's,/usr/bin/env php,${PREFIX}/bin/php,'
+REPLACE_PHP=   scripts/build_xhpast.php
+REPLACE_PHP+=  scripts/daemon/exec/exec_daemon.php
+REPLACE_PHP+=  scripts/daemon/launch_daemon.php
+REPLACE_PHP+=  scripts/daemon/torture/resist-death.php
+REPLACE_PHP+=  scripts/example/calculator.php
+REPLACE_PHP+=  scripts/example/subworkflow.php
+REPLACE_PHP+=  scripts/format_log.php
+REPLACE_PHP+=  scripts/phutil_rebuild_map.php
+REPLACE_PHP+=  scripts/phutil_symbols.php
+REPLACE_PHP+=  scripts/sandpit/harden_directory.php
+REPLACE_PHP+=  scripts/test/deferred_log.php
+REPLACE_PHP+=  scripts/test/highlight.php
+REPLACE_PHP+=  scripts/test/http.php
+REPLACE_PHP+=  scripts/test/interactive_editor.php
+REPLACE_PHP+=  scripts/test/lipsum.php
+REPLACE_PHP+=  scripts/test/mime.php
+REPLACE_PHP+=  scripts/test/paypal.php
+REPLACE_PHP+=  scripts/test/progress_bar.php
+REPLACE_PHP+=  scripts/test/prompt.php
+REPLACE_PHP+=  scripts/test/service_profiler.php
+REPLACE_PHP+=  scripts/timezones/generate_windows_timezone_map.php
+REPLACE_PHP+=  scripts/update_compat_info.php
+REPLACE_PHP+=  scripts/utils/directory_fixture.php
+REPLACE_PHP+=  scripts/utils/lock.php
+REPLACE_PHP+=  scripts/utils/prosediff.php
+REPLACE_PHP+=  scripts/utils/utf8.php
+REPLACE_PHP+=  src/parser/PhutilLanguageGuesser.php
+REPLACE_PHP+=  src/parser/__tests__/languageguesser/php.shell-env
+REPLACE_PHP+=  support/parser/generate-type-parser.php
+REPLACE_PHP+=  support/xhpast/generate_nodes.php
+REPLACE_PHP+=  bin/aws-s3
+REPLACE_PHP+=  scripts/utils/aws-s3.php
 
 NO_BUILD=              yes
 

Index: pkgsrc/devel/mantis/Makefile
diff -u pkgsrc/devel/mantis/Makefile:1.60 pkgsrc/devel/mantis/Makefile:1.61
--- pkgsrc/devel/mantis/Makefile:1.60   Mon Apr 25 17:24:50 2022
+++ pkgsrc/devel/mantis/Makefile        Sat Feb  8 03:36:56 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2022/04/25 17:24:50 christos Exp $
+# $NetBSD: Makefile,v 1.61 2025/02/08 03:36:56 taca Exp $
 
 DISTNAME=      mantisbt-2.25.3
+PKGREVISION=   1
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME:S/mantisbt/mantis/}
 CATEGORIES=    devel www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mantisbt/}
@@ -34,10 +35,7 @@ SUBST_FILES.conf=    mantis.conf
 SUBST_VARS.conf=       MANTIS_HOME
 SUBST_MESSAGE.conf=    Fixing configuration files.
 
-REPLACE_INTERPRETER+=  php
-REPLACE.php.old=       /usr/bin/php
-REPLACE.php.new=       ${PREFIX}/bin/php
-REPLACE_FILES.php=     scripts/*.php
+REPLACE_PHP+=          scripts/*.php
 
 INSTALLATION_DIRS+=    share/doc/mantis ${EGDIR} ${MANTIS_HOME}
 

Index: pkgsrc/devel/pear-Console_CommandLine/Makefile
diff -u pkgsrc/devel/pear-Console_CommandLine/Makefile:1.1 pkgsrc/devel/pear-Console_CommandLine/Makefile:1.2
--- pkgsrc/devel/pear-Console_CommandLine/Makefile:1.1  Sun Aug 21 08:23:06 2016
+++ pkgsrc/devel/pear-Console_CommandLine/Makefile      Sat Feb  8 03:36:57 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2016/08/21 08:23:06 taca Exp $
+# $NetBSD: Makefile,v 1.2 2025/02/08 03:36:57 taca Exp $
 
 DISTNAME=      Console_CommandLine-1.2.2
+PKGREVISION=   1
 CATEGORIES=    devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/devel/phabricator/Makefile
diff -u pkgsrc/devel/phabricator/Makefile:1.19 pkgsrc/devel/phabricator/Makefile:1.20
--- pkgsrc/devel/phabricator/Makefile:1.19      Mon Feb 19 15:43:34 2024
+++ pkgsrc/devel/phabricator/Makefile   Sat Feb  8 03:36:57 2025
@@ -1,88 +1,80 @@
-# $NetBSD: Makefile,v 1.19 2024/02/19 15:43:34 taca Exp $
+# $NetBSD: Makefile,v 1.20 2025/02/08 03:36:57 taca Exp $
 
-DISTNAME=              phabricator-20170609
-PKGREVISION=           3
-CATEGORIES=            devel
-MASTER_SITES=          ${MASTER_SITE_GITHUB:=phacility/}
+DISTNAME=      phabricator-20170609
+PKGREVISION=   4
+CATEGORIES=    devel
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=phacility/}
 # Track the stable branch
-GITHUB_PROJECT=                phabricator
-GITHUB_TAG=            5885704800a97aadf47aee5654ff2647b40fb4ad
+GITHUB_PROJECT=        phabricator
+GITHUB_TAG=    5885704800a97aadf47aee5654ff2647b40fb4ad
 
-MAINTAINER=            roy%NetBSD.org@localhost
-HOMEPAGE=              http://phabricator.com/
-COMMENT=               Open software engineering platform
-LICENSE=               apache-2.0
+MAINTAINER=    roy%NetBSD.org@localhost
+HOMEPAGE=      http://phabricator.com/
+COMMENT=       Open software engineering platform
+LICENSE=       apache-2.0
+
+USE_TOOLS+=    pax bash:run
+EXTRACT_USING= bsdtar
+
+DEPENDS+=      ${PHP_PKG_PREFIX}-curl>=${PHP_BASE_VERS}:../../www/php-curl
+DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=${PHP_BASE_VERS}:../../converters/php-mbstring
+DEPENDS+=      ${PHP_PKG_PREFIX}-iconv>=${PHP_BASE_VERS}:../../converters/php-iconv
+DEPENDS+=      ${PHP_PKG_PREFIX}-mysqli>=${PHP_BASE_VERS}:../../databases/php-mysqli
+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}-gd>=${PHP_BASE_VERS}:../../graphics/php-gd
+DEPENDS+=      ${PHP_PKG_PREFIX}-zlib>=${PHP_BASE_VERS}:../../archivers/php-zlib
+DEPENDS+=      ${PHP_PKG_PREFIX}-opcache>=${PHP_BASE_VERS}:../../devel/php-opcache
+DEPENDS+=      libphutil-[0-9]*:../../devel/libphutil
+DEPENDS+=      arcanist-[0-9]*:../../devel/arcanist
+
+REPLACE_PHP=   externals/httpful/build
+REPLACE_PHP+=  externals/restful/build-phar
+REPLACE_PHP+=  scripts/almanac/manage_almanac.php \
+               scripts/cache/manage_cache.php \
+               scripts/celerity/*.php \
+               scripts/daemon/*.php \
+               scripts/diviner/diviner.php \
+               scripts/drydock/drydock_control.php \
+               scripts/fact/manage_facts.php \
+               scripts/files/manage_files.php \
+               scripts/lipsum/manage_lipsum.php \
+               scripts/mail/*.php \
+               scripts/people/manage_people.php \
+               scripts/repository/*.php \
+               scripts/search/manage_search.php \
+               scripts/setup/*.php \
+               scripts/sms/manage_sms.php \
+               scripts/sql/manage_storage.php \
+               scripts/ssh/*.php \
+               scripts/symbols/*.php \
+               scripts/user/*.php \
+               scripts/util/*.php \
+               support/aphlict/server/aphlict_launcher.php
 
-USE_TOOLS+=            pax bash:run
-EXTRACT_USING=         bsdtar
+REPLACE_BASH+= scripts/install/install_rhel-derivs.sh \
+               scripts/install/install_ubuntu.sh
 
 .include "../../lang/php/phpversion.mk"
-DEPENDS+=              ${PHP_PKG_PREFIX}-curl-[0-9]*:../../www/php-curl
-DEPENDS+=              ${PHP_PKG_PREFIX}-mbstring-[0-9]*:../../converters/php-mbstring
-DEPENDS+=              ${PHP_PKG_PREFIX}-iconv-[0-9]*:../../converters/php-iconv
-DEPENDS+=              ${PHP_PKG_PREFIX}-mysqli-[0-9]*:../../databases/php-mysqli
-DEPENDS+=              ${PHP_PKG_PREFIX}-pcntl-[0-9]*:../../devel/php-pcntl
-DEPENDS+=              ${PHP_PKG_PREFIX}-posix-[0-9]*:../../devel/php-posix
-DEPENDS+=              ${PHP_PKG_PREFIX}-gd-[0-9]*:../../graphics/php-gd
-DEPENDS+=              ${PHP_PKG_PREFIX}-zlib-[0-9]*:../../archivers/php-zlib
-DEPENDS+=              ${PHP_PKG_PREFIX}-opcache-[0-9]*:../../devel/php-opcache
-.if ${PKG_PHP_MAJOR_VERS} == "5"
+.if ${PHP_VER} < 70
 DEPENDS+=              ${PHP_PKG_PREFIX}-apcu<5:../../www/php-apcu4
 .else
 DEPENDS+=              ${PHP_PKG_PREFIX}-apcu>=5:../../www/php-apcu
 .endif
-DEPENDS+=              libphutil-[0-9]*:../../devel/libphutil
-DEPENDS+=              arcanist-[0-9]*:../../devel/arcanist
 
-SUBST_CLASSES+=                php
-SUBST_MESSAGE.php=     Fixing PHP path
-SUBST_STAGE.php=       post-configure
-SUBST_FILES.php=       externals/httpful/build
-SUBST_FILES.php+=      externals/restful/build-phar
-SUBST_SED.php=         -e 's,/usr/bin/php,${PREFIX}/bin/php,'
-
-SUBST_CLASSES+=                php_env
-SUBST_MESSAGE.php_env= Fixing PHP path
-SUBST_STAGE.php_env=   post-configure
-SUBST_FILES.php_env+=  scripts/almanac/manage_almanac.php \
-                       scripts/cache/manage_cache.php \
-                       scripts/celerity/*.php \
-                       scripts/daemon/*.php \
-                       scripts/diviner/diviner.php \
-                       scripts/drydock/drydock_control.php \
-                       scripts/fact/manage_facts.php \
-                       scripts/files/manage_files.php \
-                       scripts/lipsum/manage_lipsum.php \
-                       scripts/mail/*.php \
-                       scripts/people/manage_people.php \
-                       scripts/repository/*.php \
-                       scripts/search/manage_search.php \
-                       scripts/setup/*.php \
-                       scripts/sms/manage_sms.php \
-                       scripts/sql/manage_storage.php \
-                       scripts/ssh/*.php \
-                       scripts/symbols/*.php \
-                       scripts/user/*.php \
-                       scripts/util/*.php \
-                       support/aphlict/server/aphlict_launcher.php
-SUBST_SED.php_env=     -e 's,/usr/bin/env php,${PREFIX}/bin/php,'
-
-REPLACE_BASH+=         scripts/install/install_rhel-derivs.sh \
-                       scripts/install/install_ubuntu.sh
-
-NO_BUILD=              yes
-
-RCD_SCRIPTS=           phd
+NO_BUILD=      yes
+ 
+RCD_SCRIPTS=   phd
+
+CHMOD_FILES=   conf LICENSE NOTICE README.md externals resources src \
+               support webroot scripts/__init_script__.php \
+               scripts/fpm/warmup.php
 
 PHABRICATOR_DIR=       share/phabricator
-
 INSTALLATION_DIRS+=    ${PHABRICATOR_DIR}
 
 CHECK_INTERPRETER_SKIP+=       ${PHABRICATOR_DIR}/externals/wordlist/password.lst
 
-CHMOD_FILES=           conf LICENSE NOTICE README.md externals resources src \
-                       support webroot scripts/__init_script__.php scripts/fpm/warmup.php
-
 post-extract:
        cd ${WRKSRC} && \
        ${FIND} ${CHMOD_FILES} -type f \

Index: pkgsrc/devel/php-base58/Makefile
diff -u pkgsrc/devel/php-base58/Makefile:1.1 pkgsrc/devel/php-base58/Makefile:1.2
--- pkgsrc/devel/php-base58/Makefile:1.1        Thu Mar 11 13:18:46 2021
+++ pkgsrc/devel/php-base58/Makefile    Sat Feb  8 03:36:57 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2021/03/11 13:18:46 tpaul Exp $
+# $NetBSD: Makefile,v 1.2 2025/02/08 03:36:57 taca Exp $
 
 MODNAME=               base58
+PKGREVISION=           1
 PECL_VERSION=          1.0.2
 CATEGORIES=            devel

Prev by Date: CVS commit: pkgsrc/databases
Next by Date: CVS commit: pkgsrc/devel/php-composer
Previous by Thread: CVS commit: pkgsrc/databases
Next by Thread: CVS commit: pkgsrc/devel/php-composer
Indexes:

Home | Main Index | Thread Index | Old Index