diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile
index 6c80d8ef0e85..10288310a0b7 100644
--- a/devel/phabricator/Makefile
+++ b/devel/phabricator/Makefile
@@ -1,76 +1,77 @@
 PORTNAME=	phabricator
 PORTVERSION=	20211218
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Open source, software engineering platform
 WWW=		https://www.phacility.com/phabricator/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	arcanist-lib${PHP_PKGNAMESUFFIX}>=20210113_4:devel/arcanist-lib@${PHP_FLAVOR} \
 		git:devel/git
 
-USES=		cpe php:cli,flavors shebangfix
+USES=		cpe dos2unix php:cli,flavors shebangfix
 CPE_VENDOR=	phacility
+DOS2UNIX_FILES=	externals/phpmailer/class.smtp.php externals/phpqrcode/phpqrcode.php
 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/sql/*.php scripts/ssh/*.php \
 		scripts/symbols/*.php scripts/util/*.php \
 		support/aphlict/server/*.php
 
 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
 
 GD_USE=		PHP=gd
 
 OPCACHE_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR}
 OPCACHE_USE=		PHP=opcache
 
 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
 	@${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/phabricator/files/patch-externals_phpmailer_class.phpmailer-lite.php b/devel/phabricator/files/patch-externals_phpmailer_class.phpmailer-lite.php
new file mode 100644
index 000000000000..ec552a49b104
--- /dev/null
+++ b/devel/phabricator/files/patch-externals_phpmailer_class.phpmailer-lite.php
@@ -0,0 +1,11 @@
+--- externals/phpmailer/class.phpmailer-lite.php.orig	2024-12-03 14:44:25 UTC
++++ externals/phpmailer/class.phpmailer-lite.php
+@@ -1492,7 +1492,7 @@ class PHPMailerLite {
+     $eol = "\r\n";
+     $escape = '=';
+     $output = '';
+-    while( list(, $line) = each($lines) ) {
++    foreach ($lines as $line) {
+       $linlen = strlen($line);
+       $newline = '';
+       for($i = 0; $i < $linlen; $i++) {
diff --git a/devel/phabricator/files/patch-externals_phpmailer_class.phpmailer.php b/devel/phabricator/files/patch-externals_phpmailer_class.phpmailer.php
new file mode 100644
index 000000000000..eed5581a6b8f
--- /dev/null
+++ b/devel/phabricator/files/patch-externals_phpmailer_class.phpmailer.php
@@ -0,0 +1,11 @@
+--- externals/phpmailer/class.phpmailer.php.orig	2024-12-03 14:44:25 UTC
++++ externals/phpmailer/class.phpmailer.php
+@@ -1624,7 +1624,7 @@ class PHPMailer {
+     $eol = "\r\n";
+     $escape = '=';
+     $output = '';
+-    while( list(, $line) = each($lines) ) {
++    foreach ($lines as $line) {
+       $linlen = strlen($line);
+       $newline = '';
+       for($i = 0; $i < $linlen; $i++) {
diff --git a/devel/phabricator/files/patch-externals_phpmailer_class.smtp.php b/devel/phabricator/files/patch-externals_phpmailer_class.smtp.php
new file mode 100644
index 000000000000..69047be742ef
--- /dev/null
+++ b/devel/phabricator/files/patch-externals_phpmailer_class.smtp.php
@@ -0,0 +1,20 @@
+--- externals/phpmailer/class.smtp.php.orig	2024-12-03 14:44:25 UTC
++++ externals/phpmailer/class.smtp.php
+@@ -385,7 +385,7 @@ class SMTP {
+ 
+     $max_line_length = 998; // used below; set here for ease in change
+ 
+-    while(list(,$line) = @each($lines)) {
++    foreach($lines as $line) {
+       $lines_out = null;
+       if($line == "" && $in_headers) {
+         $in_headers = false;
+@@ -414,7 +414,7 @@ class SMTP {
+       $lines_out[] = $line;
+ 
+       // send the lines to the server
+-      while(list(,$line_out) = @each($lines_out)) {
++      foreach($lines_out as $line_out) {
+         if(strlen($line_out) > 0)
+         {
+           if(substr($line_out, 0, 1) == ".") {