Index: head/devel/phabricator/Makefile
===================================================================
--- head/devel/phabricator/Makefile	(revision 511298)
+++ head/devel/phabricator/Makefile	(revision 511299)
@@ -1,83 +1,84 @@
 # $FreeBSD$
 
 PORTNAME=	phabricator
 PORTVERSION=	20190831
 CATEGORIES=	devel
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Open source, software engineering platform
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PHP_PKGNAMEPREFIX}libphutil>=20190831:devel/libphutil@${PHP_FLAVOR} \
 		arcanist-lib${PHP_PKGNAMESUFFIX}>=20190622:devel/arcanist-lib@${PHP_FLAVOR} \
 		git:devel/git
 
-OPTIONS_DEFINE=	GD OPCACHE
-OPTIONS_DEFAULT=GD OPCACHE
-OPCACHE_DESC?=	Use OPcache to improve performance
-
 USES=		php:flavors shebangfix
+
 REINPLACE_ARGS=	-i ""
 SHEBANG_FILES=	scripts/*.php \
 		scripts/almanac/*.php \
 		scripts/cache/*.php \
 		scripts/celerity/*.php \
 		scripts/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
 GH_ACCOUNT=	phacility
 GH_TAGNAME=	24dbff2
 
 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
 
 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/pkg-message.in
===================================================================
--- head/devel/phabricator/files/pkg-message.in	(revision 511298)
+++ head/devel/phabricator/files/pkg-message.in	(revision 511299)
@@ -1,89 +1,92 @@
 [
 { type: install
   message: <<EOM
 To run the phabricator daemons from startup, add phd_enable="YES"
 to /etc/rc.conf. You can control the daemons using
 
 service phd start
 service phd stop
 etc.
 
 Before starting the daemons, please finish configuring your Phabricator
 instance. This involves configuring a web server (Apache, NGINX, LightHTTP)
 and a database server (MySQL, MariaDB). You can find detailed instructions
 on how to finish your setup at:
 
 https://secure.phabricator.com/book/phabricator/article/configuration_guide/
 
 Please note that all files are located in %%PREFIX%%/lib/php/phabricator,
 so if the documentation refers to ./bin, this means
 
   %%PREFIX%%/lib/php/phabricator/bin,
 
 if it refers to webroot, this means
 
   %%PREFIX%%/lib/php/phabricator/webroot.
 
 You might want to install textproc/py-pygments to improve syntax
 highlighting.
 
 Starting with version 20170630, phabricator daemons run as user www
 by default. If you're updating from a version before 20170630 you will need
 to fix permissions of /var/tmp/phd and repositories. Alternatively
 you can continue to run phabricator daemons as root by adding
 phd_user="root" to /etc/rc.conf.
 
 Phabricator daemons and ssh-git requires setting up sudo, see
 
   %%PREFIX%%lib/php/phabricator/resources/sshd/phabricator-sudoers.sample
 
 for an example.
 
 A phabricator example configuration installed here:
 
   %%PREFIX%%lib/php/phabricator/conf/local/local.json.sample
 
-Don't forget to update the database schema after update:
-
-  service nginx stop
-  service php-fpm stop
-  service phd stop
-  cd %%PREFIX%%/lib/php/phabricator
-  ./bin/storage upgrade
-  service phd start
-  service php-fpm start
-  service nginx start
-
-The above procedure is for users of nginx and php-fpm, please adapt
-accordingly to match your setup.
-
-If your configuration uses an unprivileged user to connect to the database,
-you may have to override the default user so the schema changes can be
-applied with root or some other admin user:
-
-  ./bin/storage upgrade --user <user> --password <password>
-
 If you want to access phabricator hosted git repositories via git,
 you can add the following configuration snippet to /etc/sshd_config
 and reload sshd afterwards (`service sshd reload'):
 
 ========================================================================
 Match User git
  AllowUsers git
  AuthorizedKeysCommand %%PREFIX%%/lib/php/phabricator/resources/sshd/phabricator-ssh-hook.sh
  AuthorizedKeysCommandUser git
  AuthorizedKeysFile none
  AuthenticationMethods publickey
  PermitRootLogin no
  PasswordAuthentication no
  PermitTTY no
  AllowAgentForwarding no
  AllowTcpForwarding no
  GatewayPorts no
  PermitOpen none
  PermitTunnel no
  X11Forwarding no
 ========================================================================
+EOM
+},
+{ type: upgrade
+  message: <<EOM
+Don't forget to update the database schema after update:
+
+  service nginx stop
+  service php-fpm stop
+  service phd stop
+  cd %%PREFIX%%/lib/php/phabricator
+  ./bin/storage upgrade
+  service phd start
+  service php-fpm start
+  service nginx start
+
+The above procedure is for users of nginx and php-fpm, please adapt
+accordingly to match your setup.
+
+If your configuration uses an unprivileged user to connect to the database,
+you may have to override the default user so the schema changes can be
+applied with root or some other admin user:
+
+  ./bin/storage upgrade --user <user> --password <password>
 EOM
 }
 ]