diff --git a/devel/phorgeit-phorge/Makefile b/devel/phorgeit-phorge/Makefile
index a96681d9a97b..0cc2248025d0 100644
--- a/devel/phorgeit-phorge/Makefile
+++ b/devel/phorgeit-phorge/Makefile
@@ -1,92 +1,78 @@
 PORTNAME=	phorge
 PORTVERSION=	20240324
 CATEGORIES=	devel
 PKGNAMEPREFIX=	phorgeit
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Open source, software engineering platform
 WWW=		https://www.phorge.it
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	phorgeit-arcanist-lib${PHP_PKGNAMESUFFIX}>=20240304:devel/phorgeit-arcanist-lib@${PHP_FLAVOR} \
-		git:devel/git
-
-CONFLICTS=	phabricator-php??
+RUN_DEPENDS=	git:devel/git \
+		phorgeit-arcanist-lib${PHP_PKGNAMESUFFIX}>=20240304:devel/phorgeit-arcanist-lib@${PHP_FLAVOR}
 
 USES=		cpe php:cli,flavors shebangfix
 CPE_VENDOR=	phacility
 
-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 \
+USE_GITHUB=	yes
+GH_ACCOUNT=	phorgeit
+GH_TAGNAME=	d42b3eb0
+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/sql/*.php scripts/ssh/*.php \
+		scripts/symbols/*.php scripts/util/*.php \
 		support/aphlict/server/*.php
+CONFLICTS=	phabricator-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=	phorgeit
-GH_TAGNAME=	d42b3eb
-
 PHP_DESTDIR=	lib/php/phorge
 
 post-patch:
 	@${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${FILESDIR}/phorge-sudoers.sample > ${WRKSRC}/resources/sshd/phorge-sudoers.sample
 	@${REINPLACE_CMD} \
 		's|/path/to/phorge|${LOCALBASE}/lib/php/phorge|g; \
 		 s|vcs-user|git|g' \
 		${WRKSRC}/resources/sshd/phorge-ssh-hook.sh
 	@${REINPLACE_CMD} \
 		's|/usr/libexec/phorge-ssh-hook.sh|${LOCALBASE}/lib/php/phorge/resources/sshd/phorge-ssh-hook.sh|; \
 		 s|vcs-user|git|g; \
 		 s|PrintLastLog no||g; \
 		 s|PidFile /var/run/sshd-phorge.pid||g' \
 		${WRKSRC}/resources/sshd/sshd_config.phorge.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>
diff --git a/devel/phorgeit-phorge/distinfo b/devel/phorgeit-phorge/distinfo
index 52b38d041346..eaef33a2491f 100644
--- a/devel/phorgeit-phorge/distinfo
+++ b/devel/phorgeit-phorge/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711264873
-SHA256 (phorgeit-phorge-20240324-d42b3eb_GH0.tar.gz) = 8927af83ffc011013fd1aebb1f52c5fd871e78195fc43cec1755e63b59ec53e0
-SIZE (phorgeit-phorge-20240324-d42b3eb_GH0.tar.gz) = 9365309
+TIMESTAMP = 1711309175
+SHA256 (phorgeit-phorge-20240324-d42b3eb0_GH0.tar.gz) = b1a897198ab378169d0bb8f8e6f9b4638dbbd6126c55a8ec1b4fadb567e472c3
+SIZE (phorgeit-phorge-20240324-d42b3eb0_GH0.tar.gz) = 9363140