Index: head/devel/phabricator/Makefile
===================================================================
--- head/devel/phabricator/Makefile	(revision 444854)
+++ head/devel/phabricator/Makefile	(revision 444855)
@@ -1,81 +1,80 @@
 # $FreeBSD$
 
 PORTNAME=	phabricator
 PORTVERSION=	20170630
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	php-
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Open source, software engineering platform
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	php-libphutil>0:devel/libphutil \
 		php-arcanist>0:devel/arcanist \
 		git:devel/git
 
 OPTIONS_DEFINE=	GD OPCACHE
 OPTIONS_DEFAULT=OPCACHE
 OPCACHE_DESC?=	Use OPcache to improve performance
 
 USES=		php shebangfix
-SHEBANG_FILES=	bin/* \
-		externals/httpful/build \
+SHEBANG_FILES=	externals/httpful/build \
 		externals/restful/build-phar \
 		scripts/almanac/*.php \
 		scripts/cache/*.php \
 		scripts/celerity/*.php \
 		scripts/daemon/*.php \
-		scripts/daemon/phd-daemon \
 		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/people/*.php \
 		scripts/repository/*.php \
 		scripts/search/*.php \
 		scripts/setup/*.php \
 		scripts/sms/*.php \
 		scripts/sql/*.php \
 		scripts/ssh/*.php \
 		scripts/symbols/*.php \
 		scripts/user/*.php \
 		scripts/util/*.php \
 		support/aphlict/server/*.php
 USE_PHP=	ctype curl fileinfo filter hash iconv mbstring mysqli openssl \
 		pcntl posix
 
 GD_USE=		PHP=gd
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPCACHE}
 USE_PHP+=	opcache
 .	if ${PHP_VER} >= 70
 RUN_DEPENDS+=	 ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu
 .	else
 RUN_DEPENDS+=	 ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu4
 .	endif
 .endif
 
 USE_GITHUB=	yes
 NO_BUILD=	yes
 USE_RC_SUBR=	phd
 SUB_FILES=	pkg-message
 GH_ACCOUNT=	phacility
 GH_TAGNAME=	83266e8
 
 PHP_DESTDIR=	lib/php/phabricator
 
 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.post.mk>
Index: head/devel/phabricator/files/patch-bin
===================================================================
--- head/devel/phabricator/files/patch-bin	(revision 444854)
+++ head/devel/phabricator/files/patch-bin	(nonexistent)
@@ -1,407 +0,0 @@
---- bin/accountadmin~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/accountadmin	2017-07-01 13:51:34.930544995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $table = new PhabricatorUser();
---- bin/almanac~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/almanac	2017-07-01 13:51:35.214537995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/aphlict~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/aphlict	2017-07-01 13:51:35.370541995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(dirname(__FILE__))));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/init/init-aphlict.php';
- 
- PhabricatorAphlictManagementWorkflow::requireExtensions();
---- bin/audit~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/audit	2017-07-01 13:51:35.538578995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/auth~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/auth	2017-07-01 13:51:35.724540995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/cache~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/cache	2017-07-01 13:51:35.922542995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/calendar~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/calendar	2017-07-01 13:51:36.106546995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/celerity~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/celerity	2017-07-01 13:51:36.298540995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/commit-hook~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/commit-hook	2017-07-01 13:51:36.481559995 +0200
-@@ -28,7 +28,7 @@
-   }
- }
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- if ($argc < 2) {
---- bin/config~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/config	2017-07-01 13:51:36.681699995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/init/init-setup.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/differential~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/differential	2017-07-01 13:51:36.890540995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/diviner~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/diviner	2017-07-01 13:51:37.090565995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/drydock~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/drydock	2017-07-01 13:51:37.298538995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/fact~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/fact	2017-07-01 13:51:37.529571995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/feed~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/feed	2017-07-01 13:51:37.754542995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/files~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/files	2017-07-01 13:51:38.170547995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/garbage~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/garbage	2017-07-01 13:51:38.570546995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/harbormaster~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/harbormaster	2017-07-01 13:51:38.866553995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/i18n~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/i18n	2017-07-01 13:51:39.161574995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/lipsum~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/lipsum	2017-07-01 13:51:39.474566995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/mail~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/mail	2017-07-01 13:51:39.770547995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/nuance~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/nuance	2017-07-01 13:51:40.058544995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/people~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/people	2017-07-01 13:51:40.386542995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/phd~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/phd	2017-07-01 13:51:40.722541995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- PhabricatorDaemonManagementWorkflow::requireExtensions();
---- bin/phortune~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/phortune	2017-07-01 13:51:41.082540995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/policy~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/policy	2017-07-01 13:51:41.361589995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/remove~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/remove	2017-07-01 13:51:41.723540995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/repository~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/repository	2017-07-01 13:51:41.994545995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/search~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/search	2017-07-01 13:51:42.313685995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/sms~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/sms	2017-07-01 13:51:42.650562995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/ssh-auth-key~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/ssh-auth-key	2017-07-01 13:51:43.361588995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- try {
---- bin/ssh-auth~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/ssh-auth	2017-07-01 13:51:42.994553995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $cache = PhabricatorCaches::getMutableCache();
---- bin/ssh-connect~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/ssh-connect	2017-07-01 13:51:44.730535995 +0200
-@@ -13,7 +13,7 @@
-   declare(ticks = 1);
- }
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- // Contrary to the documentation, Git may pass a "-p" flag. If it does, respect
---- bin/ssh-exec~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/ssh-exec	2017-07-01 13:51:45.105561995 +0200
-@@ -3,7 +3,7 @@
- 
- $ssh_start_time = microtime(true);
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $ssh_log = PhabricatorSSHLog::getLog();
---- bin/storage~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/storage	2017-07-01 13:51:45.595548995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/init/init-setup.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/trigger~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/trigger	2017-07-01 13:51:46.089539995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);
---- bin/worker~	2017-06-28 17:47:20.000000000 +0200
-+++ bin/worker	2017-07-01 13:51:46.593537995 +0200
-@@ -1,7 +1,7 @@
- #!/usr/bin/env php
- <?php
- 
--$root = dirname(dirname(dirname(__FILE__)));
-+$root = dirname(dirname(__FILE__));
- require_once $root.'/scripts/__init_script__.php';
- 
- $args = new PhutilArgumentParser($argv);

Property changes on: head/devel/phabricator/files/patch-bin
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/phabricator/files/phd.in
===================================================================
--- head/devel/phabricator/files/phd.in	(revision 444854)
+++ head/devel/phabricator/files/phd.in	(revision 444855)
@@ -1,56 +1,57 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: phd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable phabricator daemons:
 # phd_enable (bool):	Set to "NO" by default
 #			Set it to "YES" to enable phd
 # phd_fib (str):	Set an altered default network view for phd
 # phd_user (str):	User to run phabricator daemons as
 
 . /etc/rc.subr
 
 name="phd"
 rcvar=phd_enable
 
 load_rc_config "$name"
 
 : ${phd_enable="NO"}
 : ${phd_user="www"}
 
 command="%%PREFIX%%/lib/php/phabricator/bin/phd"
 
 extra_commands="launch list log"
 poll_cmd="phd_poll"
 stop_cmd="${command} stop"
 status_cmd="${command} status"
 restart_cmd="phd_restart"
 launch_cmd="${command} launch"
 list_cmd="${command} list"
 log_cmd="${command} log"
 
 start_precmd="eval command_args=start"
 
 required_files="%%PREFIX%%/lib/php/phabricator/conf/local/local.json"
 
 PATH="${PATH}:%%PREFIX%%/bin"
 
 phd_poll()
 {
 	pids=`${status_cmd} 2>/dev/null | awk '{ print $4 }' | egrep "^[0-9]+$" | sort | uniq`
 	wait_for_pids $pids
 }
 
 phd_restart()
 {
-	run_rc_command stop
+	${stop_cmd}
+	phd_poll
 	run_rc_command start
 }
 
 run_rc_command "$*"