Patch paths to php executable, so things like ssh-auth work again

without workarounds.

9 files changed, 117 insertions, 2 deletions

diff --git a/devel/arcanist-lib/Makefile b/devel/arcanist-lib/Makefile
index ef9858d4455c..f2182b9d4f9c 100644
--- a/devel/arcanist-lib/Makefile
+++ b/devel/arcanist-lib/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME?=	arcanist
 PORTVERSION?=	20200514
+PORTREVISION?=	1
 CATEGORIES?=	devel
 PKGNAMESUFFIX=	${SLAVE_PKGNAMESUFFIX}${PHP_PKGNAMESUFFIX}
 
@@ -15,7 +16,17 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PHP_DESTDIR=	lib/php/arcanist
 USES=		php:flavors python:env shebangfix
-SHEBANG_FILES=	support/arcanoid/arcanoid.py
+SHEBANG_FILES=	bin/arc \
+		bin/phage \
+		scripts/*.php \
+		scripts/hgdaemon/*.php \
+		src/parser/*.php \
+		support/arcanoid/arcanoid.py \
+		support/lib/*.php \
+		support/unit/*.php \
+		support/xhpast/*.php \
+		support/xhpast/bin/*.php
+
 USE_PHP=	curl dom hash json simplexml zlib
 USE_GITHUB=	yes
 NO_BUILD=	yes
@@ -62,9 +73,16 @@ do-install:
 		 s|%%PKGORIGIN%%|${PKGORIGIN}|g' \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/toolset/workflow/ArcanistVersionWorkflow.php
 	@${REINPLACE_CMD} \
+		's|%%PHP_CMD%%|${PREFIX}/bin/php|g' \
+		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/lint/linter/ArcanistPhpLinter.php \
+		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/moduleutils/PhutilLibraryMapBuilder.php \
+		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/phage/bootloader/PhagePHPAgentBootloader.php \
+		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/runtime/ArcanistRuntime.php \
+		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/utils/PhutilExecutionEnvironment.php \
+		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/workflow/ArcanistLiberateWorkflow.php
+	@${REINPLACE_CMD} \
 		's|%%PYTHON_CMD%%|${PYTHON_CMD}|g' \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/workflow/ArcanistAnoidWorkflow.php
-	${RM} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/toolset/workflow/*.orig
 	${RLN} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/support/shell/hooks/bash-completion.sh \
 		 ${STAGEDIR}${PREFIX}/share/bash-completion/completions/arc
 .endif
diff --git a/devel/arcanist-lib/files/patch-src_lint_linter_ArcanistPhpLinter.php b/devel/arcanist-lib/files/patch-src_lint_linter_ArcanistPhpLinter.php
new file mode 100644
index 000000000000..52a889b3829d
--- /dev/null
+++ b/devel/arcanist-lib/files/patch-src_lint_linter_ArcanistPhpLinter.php
@@ -0,0 +1,11 @@
+--- src/lint/linter/ArcanistPhpLinter.php.orig	2020-05-19 10:39:38 UTC
++++ src/lint/linter/ArcanistPhpLinter.php
+@@ -44,7 +44,7 @@ final class ArcanistPhpLinter extends ArcanistExternal
+   }
+ 
+   public function getDefaultBinary() {
+-    return 'php';
++    return '%%PHP_CMD%%';
+   }
+ 
+   public function getVersion() {
diff --git a/devel/arcanist-lib/files/patch-src_moduleutils_PhutilLibraryMapBuilder.php b/devel/arcanist-lib/files/patch-src_moduleutils_PhutilLibraryMapBuilder.php
new file mode 100644
index 000000000000..de1b52e43b57
--- /dev/null
+++ b/devel/arcanist-lib/files/patch-src_moduleutils_PhutilLibraryMapBuilder.php
@@ -0,0 +1,11 @@
+--- src/moduleutils/PhutilLibraryMapBuilder.php.orig	2020-05-19 10:41:00 UTC
++++ src/moduleutils/PhutilLibraryMapBuilder.php
+@@ -268,7 +268,7 @@ final class PhutilLibraryMapBuilder extends Phobject {
+     $absolute_file = $this->getPath($file);
+     $bin = dirname(__FILE__).'/../../support/lib/extract-symbols.php';
+ 
+-    return new ExecFuture('php -f %R -- --ugly %R', $bin, $absolute_file);
++    return new ExecFuture('%%PHP_CMD%% -f %R -- --ugly %R', $bin, $absolute_file);
+   }
+ 
+ 
diff --git a/devel/arcanist-lib/files/patch-src_phage_bootloader_PhagePHPAgentBootloader.php b/devel/arcanist-lib/files/patch-src_phage_bootloader_PhagePHPAgentBootloader.php
new file mode 100644
index 000000000000..582ee8ff0314
--- /dev/null
+++ b/devel/arcanist-lib/files/patch-src_phage_bootloader_PhagePHPAgentBootloader.php
@@ -0,0 +1,11 @@
+--- src/phage/bootloader/PhagePHPAgentBootloader.php.orig	2020-05-19 10:37:09 UTC
++++ src/phage/bootloader/PhagePHPAgentBootloader.php
+@@ -27,7 +27,7 @@ final class PhagePHPAgentBootloader extends PhageAgent
+     // reads and evaluates the main agent program.
+ 
+     return csprintf(
+-      'php -r %s',
++      '%%PHP_CMD%% -r %s',
+       "eval(fread(\$I=fopen('php://stdin', 'r'), {$len})); /* phage! */");
+   }
+ 
diff --git a/devel/arcanist-lib/files/patch-src_runtime_ArcanistRuntime.php b/devel/arcanist-lib/files/patch-src_runtime_ArcanistRuntime.php
new file mode 100644
index 000000000000..a1731ca6df4b
--- /dev/null
+++ b/devel/arcanist-lib/files/patch-src_runtime_ArcanistRuntime.php
@@ -0,0 +1,11 @@
+--- src/runtime/ArcanistRuntime.php.orig	2020-05-19 10:39:08 UTC
++++ src/runtime/ArcanistRuntime.php
+@@ -206,7 +206,7 @@ final class ArcanistRuntime {
+     $bin = $arcanist_root.'/scripts/arcanist.php';
+ 
+     $err = phutil_passthru(
+-      'php -f %R -- %Ls',
++      '%%PHP_CMD%% -f %R -- %Ls',
+       $bin,
+       array_slice($argv, 1));
+ 
diff --git a/devel/arcanist-lib/files/patch-src_utils_PhutilExecutionEnvironment.php b/devel/arcanist-lib/files/patch-src_utils_PhutilExecutionEnvironment.php
new file mode 100644
index 000000000000..717f78d04873
--- /dev/null
+++ b/devel/arcanist-lib/files/patch-src_utils_PhutilExecutionEnvironment.php
@@ -0,0 +1,11 @@
+--- src/utils/PhutilExecutionEnvironment.php.orig	2020-05-19 10:38:43 UTC
++++ src/utils/PhutilExecutionEnvironment.php
+@@ -36,7 +36,7 @@ final class PhutilExecutionEnvironment extends Phobjec
+     }
+ 
+     list($env) = execx(
+-      'php -d variables_order=E -r %s',
++      '%%PHP_CMD%% -d variables_order=E -r %s',
+       'echo json_encode($_ENV);');
+     $env = phutil_json_decode($env);
+ 
diff --git a/devel/arcanist-lib/files/patch-src_workflow_ArcanistAnoidWorkflow.php b/devel/arcanist-lib/files/patch-src_workflow_ArcanistAnoidWorkflow.php
new file mode 100644
index 000000000000..5efc47a6ea8f
--- /dev/null
+++ b/devel/arcanist-lib/files/patch-src_workflow_ArcanistAnoidWorkflow.php
@@ -0,0 +1,16 @@
+--- src/workflow/ArcanistAnoidWorkflow.php.orig	2020-05-14 23:31:28 UTC
++++ src/workflow/ArcanistAnoidWorkflow.php
+@@ -24,11 +24,10 @@ EOTEXT
+   }
+ 
+   public function runWorkflow() {
+-    if (!Filesystem::binaryExists('python3')) {
++    if (!Filesystem::binaryExists('%%PYTHON_CMD%%')) {
+       throw new PhutilArgumentUsageException(
+         pht(
+-          'The "arc anoid" workflow requires "python3" to be available '.
+-          'in your $PATH.'));
++          'The "arc anoid" workflow requires "%%PYTHON_CMD%%" to be available.'));
+     }
+ 
+     $support_dir = phutil_get_library_root('arcanist');
diff --git a/devel/arcanist-lib/files/patch-src_workflow_ArcanistLiberateWorkflow.php b/devel/arcanist-lib/files/patch-src_workflow_ArcanistLiberateWorkflow.php
new file mode 100644
index 000000000000..95a7639d687d
--- /dev/null
+++ b/devel/arcanist-lib/files/patch-src_workflow_ArcanistLiberateWorkflow.php
@@ -0,0 +1,11 @@
+--- src/workflow/ArcanistLiberateWorkflow.php.orig	2020-05-19 10:37:58 UTC
++++ src/workflow/ArcanistLiberateWorkflow.php
+@@ -148,7 +148,7 @@ EOTEXT
+     }
+ 
+     return phutil_passthru(
+-      'php -f %R -- %Ls %R',
++      '%%PHP_CMD%% -f %R -- %Ls %R',
+       $bin,
+       $argv,
+       $path);
diff --git a/devel/arcanist-lib/files/patch-support_shell_hooks_bash-completion.sh b/devel/arcanist-lib/files/patch-support_shell_hooks_bash-completion.sh
new file mode 100644
index 000000000000..1d77c05d639d
--- /dev/null
+++ b/devel/arcanist-lib/files/patch-support_shell_hooks_bash-completion.sh
@@ -0,0 +1,15 @@
+--- support/shell/hooks/bash-completion.sh.orig	2020-05-14 22:49:28 UTC
++++ support/shell/hooks/bash-completion.sh
+@@ -1,9 +1,10 @@
+ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
+-GENERATED_RULES_FILE="${SCRIPTDIR}/../rules/bash-rules.sh"
++GENERATED_RULES_FILE="%%PREFIX%%/%%PHP_DESTDIR%%/support/shell/rules/bash-rules.sh"
+ 
+ # Try to generate the shell completion rules if they do not yet exist.
+ if [ ! -f "${GENERATED_RULES_FILE}" ]; then
+-  arc shell-complete --generate >/dev/null 2>/dev/null
++  %%PREFIX%%/%%PHP_DESTDIR%%/bin/arc \
++  	shell-complete --generate >/dev/null 2>/dev/null
+ fi;
+ 
+ # Source the shell completion rules.