diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile
index 7631ebe26744d..f85bea9da85a0 100644
--- a/devel/phabricator/Makefile
+++ b/devel/phabricator/Makefile
@@ -16,51 +16,37 @@ RUN_DEPENDS=	arcanist-lib${PHP_PKGNAMESUFFIX}>=20210113_4:devel/arcanist-lib@${P
 
 USES=		cpe php:cli,flavors shebangfix
 CPE_VENDOR=	phacility
+USE_GITHUB=	yes
+GH_ACCOUNT=	phacility
+GH_TAGNAME=	dec9522
+USE_PHP=	ctype curl fileinfo filter iconv mbstring mysqli pcntl posix \
+		zip
+USE_RC_SUBR=	phd
 
-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/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 \
+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/lipsum/*.php scripts/mail/*.php \
+		scripts/repository/*.php scripts/search/*.php \
+		scripts/setup/*.php scripts/sql/*.php scripts/ssh/*.php \
+		scripts/symbols/*.php scripts/util/*.php \
 		support/aphlict/server/*.php
 
-USE_PHP=	ctype curl fileinfo filter iconv mbstring mysqli \
-		pcntl posix zip
+NO_ARCH=	yes
+NO_BUILD=	yes
+PORTSCOUT=	ignore:1
+SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	GD OPCACHE
-OPTIONS_DEFAULT=GD OPCACHE
-OPCACHE_DESC?=	Use OPcache to improve performance
+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
-NO_ARCH=	yes
-USE_RC_SUBR=	phd
-SUB_FILES=	pkg-message
-PORTSCOUT=	ignore:1
-GH_ACCOUNT=	phacility
-GH_TAGNAME=	dec9522
-
 PHP_DESTDIR=	lib/php/phabricator
 
 post-patch: