Index: head/devel/arcanist-lib/Makefile
===================================================================
--- head/devel/arcanist-lib/Makefile	(revision 535862)
+++ head/devel/arcanist-lib/Makefile	(revision 535863)
@@ -1,72 +1,90 @@
 # $FreeBSD$
 
 PORTNAME?=	arcanist
 PORTVERSION?=	20200514
+PORTREVISION?=	1
 CATEGORIES?=	devel
 PKGNAMESUFFIX=	${SLAVE_PKGNAMESUFFIX}${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT?=	Libraries for the command line interface for Phabricator
 
 SLAVEPORT?=	lib
 
 LICENSE=	APACHE20
 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
 NO_ARCH=	yes
 PORTSCOUT=	ignore:1
 GH_ACCOUNT=	phacility
 GH_TAGNAME=	b76b9c4
 PLIST=		${.CURDIR}/pkg-plist
 
 .if ${SLAVEPORT} == lib
 SLAVE_PKGNAMESUFFIX=	-${SLAVEPORT}
 
 OPTIONS_DEFINE=	ENCODINGS
 OPTIONS_DEFAULT=ENCODINGS
 ENCODINGS_DESC=	Support for encodings other than utf-8
 ENCODINGS_USE=	PHP=mbstring
 
 .else # link only
 
 RUN_DEPENDS=	arcanist-lib${PHP_PKGNAMESUFFIX}>0:devel/arcanist-lib@${PHP_FLAVOR}
 
 NO_BUILD=	yes
 
 CONFLICTS=	arc
 
 PLIST_FILES=	bin/arc
 
 .endif
 
 do-install:
 .if ${SLAVEPORT} == bin
 	${RLN} ../${PHP_DESTDIR}/bin/arc ${STAGEDIR}${PREFIX}/bin/arc
 .else
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 	cd ${WRKSRC} ; ${PAX} -rw * ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
 	@${REINPLACE_CMD} \
 		's|%%PREFIX%%|${PREFIX}|g; \
 		 s|%%PHP_DESTDIR%%|${PHP_DESTDIR}|g' \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/support/shell/hooks/bash-completion.sh
 	@${REINPLACE_CMD} \
 		's|%%PKGNAME%%|${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}|g; \
 		 s|%%PKGVERSION%%|${PKGVERSION}|g; \
 		 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
 
 .include <bsd.port.mk>
Index: head/devel/arcanist-lib/files/patch-src_lint_linter_ArcanistPhpLinter.php
===================================================================
--- head/devel/arcanist-lib/files/patch-src_lint_linter_ArcanistPhpLinter.php	(nonexistent)
+++ head/devel/arcanist-lib/files/patch-src_lint_linter_ArcanistPhpLinter.php	(revision 535863)
@@ -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() {

Property changes on: head/devel/arcanist-lib/files/patch-src_lint_linter_ArcanistPhpLinter.php
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/arcanist-lib/files/patch-src_moduleutils_PhutilLibraryMapBuilder.php
===================================================================
--- head/devel/arcanist-lib/files/patch-src_moduleutils_PhutilLibraryMapBuilder.php	(nonexistent)
+++ head/devel/arcanist-lib/files/patch-src_moduleutils_PhutilLibraryMapBuilder.php	(revision 535863)
@@ -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);
+   }
+ 
+ 

Property changes on: head/devel/arcanist-lib/files/patch-src_moduleutils_PhutilLibraryMapBuilder.php
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/arcanist-lib/files/patch-src_phage_bootloader_PhagePHPAgentBootloader.php
===================================================================
--- head/devel/arcanist-lib/files/patch-src_phage_bootloader_PhagePHPAgentBootloader.php	(nonexistent)
+++ head/devel/arcanist-lib/files/patch-src_phage_bootloader_PhagePHPAgentBootloader.php	(revision 535863)
@@ -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! */");
+   }
+ 

Property changes on: head/devel/arcanist-lib/files/patch-src_phage_bootloader_PhagePHPAgentBootloader.php
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/arcanist-lib/files/patch-src_runtime_ArcanistRuntime.php
===================================================================
--- head/devel/arcanist-lib/files/patch-src_runtime_ArcanistRuntime.php	(nonexistent)
+++ head/devel/arcanist-lib/files/patch-src_runtime_ArcanistRuntime.php	(revision 535863)
@@ -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));
+ 

Property changes on: head/devel/arcanist-lib/files/patch-src_runtime_ArcanistRuntime.php
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/arcanist-lib/files/patch-src_utils_PhutilExecutionEnvironment.php
===================================================================
--- head/devel/arcanist-lib/files/patch-src_utils_PhutilExecutionEnvironment.php	(nonexistent)
+++ head/devel/arcanist-lib/files/patch-src_utils_PhutilExecutionEnvironment.php	(revision 535863)
@@ -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);
+ 

Property changes on: head/devel/arcanist-lib/files/patch-src_utils_PhutilExecutionEnvironment.php
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/arcanist-lib/files/patch-src_workflow_ArcanistAnoidWorkflow.php
===================================================================
--- head/devel/arcanist-lib/files/patch-src_workflow_ArcanistAnoidWorkflow.php	(nonexistent)
+++ head/devel/arcanist-lib/files/patch-src_workflow_ArcanistAnoidWorkflow.php	(revision 535863)
@@ -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');

Property changes on: head/devel/arcanist-lib/files/patch-src_workflow_ArcanistAnoidWorkflow.php
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/arcanist-lib/files/patch-src_workflow_ArcanistLiberateWorkflow.php
===================================================================
--- head/devel/arcanist-lib/files/patch-src_workflow_ArcanistLiberateWorkflow.php	(nonexistent)
+++ head/devel/arcanist-lib/files/patch-src_workflow_ArcanistLiberateWorkflow.php	(revision 535863)
@@ -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);

Property changes on: head/devel/arcanist-lib/files/patch-src_workflow_ArcanistLiberateWorkflow.php
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/arcanist-lib/files/patch-support_shell_hooks_bash-completion.sh
===================================================================
--- head/devel/arcanist-lib/files/patch-support_shell_hooks_bash-completion.sh	(nonexistent)
+++ head/devel/arcanist-lib/files/patch-support_shell_hooks_bash-completion.sh	(revision 535863)
@@ -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.

Property changes on: head/devel/arcanist-lib/files/patch-support_shell_hooks_bash-completion.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/phabricator/Makefile
===================================================================
--- head/devel/phabricator/Makefile	(revision 535862)
+++ head/devel/phabricator/Makefile	(revision 535863)
@@ -1,85 +1,94 @@
 # $FreeBSD$
 
 PORTNAME=	phabricator
 PORTVERSION=	20200514
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Open source, software engineering platform
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+IGNORE_WITH_PHP=74
+
 RUN_DEPENDS=	arcanist-lib${PHP_PKGNAMESUFFIX}>=20200514:devel/arcanist-lib@${PHP_FLAVOR} \
 		git:devel/git
 
 USES=		php:flavors shebangfix
-IGNORE_WITH_PHP=	74
 
 REINPLACE_ARGS=	-i ""
-SHEBANG_FILES=	scripts/*.php \
+SHEBANG_FILES=	resources/timezones/*.php \
+		scripts/*.php \
 		scripts/almanac/*.php \
 		scripts/cache/*.php \
 		scripts/celerity/*.php \
 		scripts/daemon/*.php \
+		scripts/daemon/exec/exec_daemon.php \
 		scripts/diviner/*.php \
 		scripts/drydock/*.php \
 		scripts/fact/*.php \
 		scripts/files/*.php \
 		scripts/install/install_rhel-derivs.sh \
 		scripts/install/install_ubuntu.sh \
 		scripts/lipsum/*.php \
 		scripts/mail/*.php \
 		scripts/repository/*.php \
 		scripts/search/*.php \
 		scripts/setup/*.php \
 		scripts/ssh/*.php \
 		scripts/sql/*.php \
 		scripts/ssh/*.php \
 		scripts/symbols/*.php \
 		scripts/util/*.php \
 		support/aphlict/server/*.php
+
 USE_PHP=	ctype curl fileinfo filter hash iconv mbstring mysqli openssl \
 		pcntl posix zip
 
 OPTIONS_DEFINE=	GD OPCACHE
 OPTIONS_DEFAULT=GD OPCACHE
 OPCACHE_DESC?=	Use OPcache to improve performance
 
 GD_USE=		PHP=gd
 
 OPCACHE_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR}
 OPCACHE_USE=		PHP=opcache
 
 USE_GITHUB=	yes
 NO_BUILD=	yes
 USE_RC_SUBR=	phd
 SUB_FILES=	pkg-message
 PORTSCOUT=	ignore:1
 GH_ACCOUNT=	phacility
 GH_TAGNAME=	3ee6b53
 
 PHP_DESTDIR=	lib/php/phabricator
 
 post-patch:
 	@${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${FILESDIR}/phabricator-sudoers.sample > ${WRKSRC}/resources/sshd/phabricator-sudoers.sample
 	@${REINPLACE_CMD} \
 		's|/path/to/phabricator|${LOCALBASE}/lib/php/phabricator|g; \
 		 s|vcs-user|git|g' \
 		${WRKSRC}/resources/sshd/phabricator-ssh-hook.sh
 	@${REINPLACE_CMD} \
 		's|/usr/libexec/phabricator-ssh-hook.sh|${LOCALBASE}/lib/php/phabricator/resources/sshd/phabricator-ssh-hook.sh|; \
 		 s|vcs-user|git|g; \
 		 s|PrintLastLog no||g; \
 		 s|PidFile /var/run/sshd-phabricator.pid||g' \
 		${WRKSRC}/resources/sshd/sshd_config.phabricator.example
+	@${REINPLACE_CMD} \
+		's|%%PHP_CMD%%|${PREFIX}/bin/php|g' \
+		${WRKSRC}/scripts/celerity/install_merge.sh \
+		${WRKSRC}/src/infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/conf/local
 	${INSTALL_DATA} ${FILESDIR}/local.json.sample \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/conf/local
 	cd ${WRKSRC} ; ${PAX} -rw * ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 
 .include <bsd.port.mk>
Index: head/devel/phabricator/files/patch-scripts_celerity_install__merge.sh
===================================================================
--- head/devel/phabricator/files/patch-scripts_celerity_install__merge.sh	(nonexistent)
+++ head/devel/phabricator/files/patch-scripts_celerity_install__merge.sh	(revision 535863)
@@ -0,0 +1,8 @@
+--- scripts/celerity/install_merge.sh.orig	2020-05-19 10:53:29 UTC
++++ scripts/celerity/install_merge.sh
+@@ -6,4 +6,4 @@ echo "resources/celerity/map.php merge=celerity" \
+ git config merge.celerity.name "Celerity Mapper"
+ 
+ git config merge.celerity.driver \
+-  'php $GIT_DIR/../bin/celerity map'
++  '%%PHP_CMD%% $GIT_DIR/../bin/celerity map'

Property changes on: head/devel/phabricator/files/patch-scripts_celerity_install__merge.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/phabricator/files/patch-src_infrastructure_testing_fixture_PhabricatorStorageFixtureScopeGuard.php
===================================================================
--- head/devel/phabricator/files/patch-src_infrastructure_testing_fixture_PhabricatorStorageFixtureScopeGuard.php	(nonexistent)
+++ head/devel/phabricator/files/patch-src_infrastructure_testing_fixture_PhabricatorStorageFixtureScopeGuard.php	(revision 535863)
@@ -0,0 +1,20 @@
+--- src/infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php.orig	2020-05-19 10:51:50 UTC
++++ src/infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php
+@@ -11,7 +11,7 @@ final class PhabricatorStorageFixtureScopeGuard extend
+     $this->name = $name;
+ 
+     execx(
+-      'php %s upgrade --force --namespace %s',
++      '%%PHP_CMD%% %s upgrade --force --namespace %s',
+       $this->getStorageBinPath(),
+       $this->name);
+ 
+@@ -30,7 +30,7 @@ final class PhabricatorStorageFixtureScopeGuard extend
+     PhabricatorLiskDAO::closeAllConnections();
+ 
+     execx(
+-      'php %s destroy --force --namespace %s',
++      '%%PHP_CMD%% %s destroy --force --namespace %s',
+       $this->getStorageBinPath(),
+       $this->name);
+   }

Property changes on: head/devel/phabricator/files/patch-src_infrastructure_testing_fixture_PhabricatorStorageFixtureScopeGuard.php
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property