diff options
Diffstat (limited to 'devel/phabricator')
3 files changed, 39 insertions, 2 deletions
diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile index 226c2bd1773c..bf200ae8de40 100644 --- a/devel/phabricator/Makefile +++ b/devel/phabricator/Makefile @@ -2,6 +2,7 @@ PORTNAME= phabricator PORTVERSION= 20200514 +PORTREVISION= 1 CATEGORIES= devel PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} @@ -11,18 +12,21 @@ 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 \ @@ -40,6 +44,7 @@ SHEBANG_FILES= scripts/*.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 @@ -75,6 +80,10 @@ post-patch: 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 diff --git a/devel/phabricator/files/patch-scripts_celerity_install__merge.sh b/devel/phabricator/files/patch-scripts_celerity_install__merge.sh new file mode 100644 index 000000000000..2d0644e038f9 --- /dev/null +++ b/devel/phabricator/files/patch-scripts_celerity_install__merge.sh @@ -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' diff --git a/devel/phabricator/files/patch-src_infrastructure_testing_fixture_PhabricatorStorageFixtureScopeGuard.php b/devel/phabricator/files/patch-src_infrastructure_testing_fixture_PhabricatorStorageFixtureScopeGuard.php new file mode 100644 index 000000000000..939ee4915ed1 --- /dev/null +++ b/devel/phabricator/files/patch-src_infrastructure_testing_fixture_PhabricatorStorageFixtureScopeGuard.php @@ -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); + } |