diff --git a/devel/phorgeit-arcanist-lib/Makefile b/devel/phorgeit-arcanist-lib/Makefile
index 35a8be54bc88..56b4eadf88cd 100644
--- a/devel/phorgeit-arcanist-lib/Makefile
+++ b/devel/phorgeit-arcanist-lib/Makefile
@@ -1,90 +1,85 @@
 PORTNAME?=	arcanist
 PORTVERSION?=	20240304
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	phorgeit-
 PKGNAMESUFFIX=	${SLAVE_PKGNAMESUFFIX}${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT?=	Libraries for the command line interface for Phorge.it
 WWW?=		https://we.phorge.it/book/arcanist/
 
-SLAVEPORT?=	lib
-
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-PHP_DESTDIR=	lib/php/arcanist
 USES=		php:cli,flavors python:env shebangfix
-SHEBANG_FILES=	bin/arc \
-		bin/phage \
-		scripts/*.php \
-		scripts/hgdaemon/*.php \
-		src/parser/*.php \
-		support/arcanoid/arcanoid.py \
-		support/lib/*.php \
-		support/unit/*.php \
-		support/xhpast/*.php \
+USE_GITHUB=	yes
+GH_ACCOUNT=	phorgeit
+GH_TAGNAME=	174bf094
+USE_PHP=	curl dom simplexml zlib
+
+PHP_DESTDIR=	lib/php/arcanist
+SHEBANG_FILES=	bin/arc bin/phage scripts/*.php scripts/hgdaemon/*.php \
+		src/parser/*.php support/arcanoid/arcanoid.py support/lib/*.php \
+		support/unit/*.php support/xhpast/*.php \
 		support/xhpast/bin/*.php
 
-USE_PHP=	curl dom simplexml zlib
-USE_GITHUB=	yes
-NO_BUILD=	yes
 NO_ARCH=	yes
+NO_BUILD=	yes
 PORTSCOUT=	ignore:1
-GH_ACCOUNT=	phorgeit
-GH_TAGNAME=	174bf094ef9fe
+SLAVEPORT?=	lib
+
 PLIST=		${.CURDIR}/pkg-plist
 
 .if ${SLAVEPORT} == lib
 SLAVE_PKGNAMESUFFIX=	-${SLAVEPORT}
 
-OPTIONS_DEFINE=	ENCODINGS
-OPTIONS_DEFAULT=ENCODINGS
-ENCODINGS_DESC=	Support for encodings other than utf-8
-ENCODINGS_USE=	PHP=mbstring
+OPTIONS_DEFINE=		ENCODINGS
+OPTIONS_DEFAULT=	ENCODINGS
+ENCODINGS_DESC=		Support for encodings other than utf-8
+ENCODINGS_USE=		PHP=mbstring
 
 .else # link only
 
 RUN_DEPENDS=	phorgeit-arcanist-lib${PHP_PKGNAMESUFFIX}>0:devel/phorgeit-arcanist-lib@${PHP_FLAVOR}
 
 CONFLICTS=	arc arcanist-php?? phorgeit-arcanist-php??
 
 PLIST_FILES=	bin/arc
 
 .endif
 
 do-install:
 .if ${SLAVEPORT} == bin
 	${RLN} ../${PHP_DESTDIR}/bin/arc ${STAGEDIR}${PREFIX}/bin/arc
 .else
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 	cd ${WRKSRC} ; ${PAX} -rw * ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/
 	@${REINPLACE_CMD} \
 		's|%%PREFIX%%|${PREFIX}|g; \
 		 s|%%PHP_DESTDIR%%|${PHP_DESTDIR}|g' \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/support/shell/hooks/bash-completion.sh
 	@${REINPLACE_CMD} \
 		's|%%PKGNAME%%|${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}|g; \
 		 s|%%PKGVERSION%%|${PKGVERSION}|g; \
 		 s|%%PKGORIGIN%%|${PKGORIGIN}|g' \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/toolset/workflow/ArcanistVersionWorkflow.php
 	@${REINPLACE_CMD} \
 		's|%%PHP_CMD%%|${PREFIX}/bin/php|g' \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/lint/linter/ArcanistPhpLinter.php \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/moduleutils/PhutilLibraryMapBuilder.php \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/phage/bootloader/PhagePHPAgentBootloader.php \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/runtime/ArcanistRuntime.php \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/utils/PhutilExecutionEnvironment.php \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/workflow/ArcanistLiberateWorkflow.php
 	@${REINPLACE_CMD} \
 		's|%%PYTHON_CMD%%|${PYTHON_CMD}|g' \
 		${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/src/workflow/ArcanistAnoidWorkflow.php
 	${RLN} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/support/shell/hooks/bash-completion.sh \
 		 ${STAGEDIR}${PREFIX}/share/bash-completion/completions/arc
 	${RM} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/resources/ssl/default.pem
 	@${FIND} ${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/ -name '*.bak' -delete -o -name '*.orig' -delete
 	${STAGEDIR}${PREFIX}/${PHP_DESTDIR}/bin/arc shell-complete --generate
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/phorgeit-arcanist-lib/distinfo b/devel/phorgeit-arcanist-lib/distinfo
index faffd985b4a9..5e072f148b9b 100644
--- a/devel/phorgeit-arcanist-lib/distinfo
+++ b/devel/phorgeit-arcanist-lib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709549888
-SHA256 (phorgeit-arcanist-20240304-174bf094ef9fe_GH0.tar.gz) = 0be6f73b9487080f96f70759b8e2ca99a637f1fbd03cd4436365a58fb3a1d695
-SIZE (phorgeit-arcanist-20240304-174bf094ef9fe_GH0.tar.gz) = 2287140
+TIMESTAMP = 1711309514
+SHA256 (phorgeit-arcanist-20240304-174bf094_GH0.tar.gz) = a41e51561a2d64cf4db19385f497ab7f041d1abc2eda679357fd19417909dffd
+SIZE (phorgeit-arcanist-20240304-174bf094_GH0.tar.gz) = 2287065