diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile
index 046e144d3cae..2366c585a308 100644
--- a/net/phpldapadmin/Makefile
+++ b/net/phpldapadmin/Makefile
@@ -1,62 +1,63 @@
 PORTNAME=	phpldapadmin
 DISTVERSION=	1.2.6.6
+PORTREVISION=	1
 CATEGORIES=	net www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@bsdserwis.com
 COMMENT=	PHP application to administer LDAP over the web
 WWW=		http://phpldapadmin.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe php:web,flavors tar:tgz
 CPE_VENDOR=	phpldapadmin_project
 USE_GITHUB=	yes
 GH_ACCOUNT=	leenooks
 GH_PROJECT=	phpLDAPadmin
 USE_PHP=	gettext iconv ldap session xml
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	MCRYPT
 
 MCRYPT_DESC=	Use pecl-mcrypt for password hashing
 MCRYPT_USE=	PHP=mcrypt
 
 .include <bsd.port.options.mk>
 
 GROUPS?=	${WWWGRP}
 CFGDIR=		config
 CFGFILE=	config.php
 
 PLIST=		${WRKDIR}/plist
 PLIST_FILES=	'@sample(,${GROUPS},640) ${WWWDIR_REL}/config/config.php.example ${WWWDIR_REL}/config/config.php'
 
 SUB_LIST+=	PKGNAME=${PKGNAME}
 SUB_FILES+=	pkg-message
 
 .SILENT:
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	cd ${WRKSRC} ;							    \
 	${FIND} . ! -type d ! -name ${CFGFILE}.example ! -name .cvsignore   \
 	    ! -name .gitignore ! -name *.orig | ${SORT}			    \
 	    | ${SED} -e "s!^\.!${WWWDIR_REL}!"			>${PLIST} ;
 
 do-install:
 	cd ${WRKSRC} ;					 \
 	for src in $$( ${FIND} . ! -name .cvsignore	 \
 		! -name .gitignore ! -name *.orig) ; do	 \
 	    dst=${STAGEDIR}${WWWDIR}$${src#.} ;		 \
 	    if ${TEST} -d $$src ; then			 \
 		${MKDIR} $$dst ;			 \
 	    else					 \
 		${INSTALL_DATA} $$src $$dst ;		 \
 	    fi						 \
 	done
 
 .include <bsd.port.post.mk>
diff --git a/net/phpldapadmin/files/patch-lib_Template.php b/net/phpldapadmin/files/patch-lib_Template.php
new file mode 100644
index 000000000000..a1ff62c55dfc
--- /dev/null
+++ b/net/phpldapadmin/files/patch-lib_Template.php
@@ -0,0 +1,11 @@
+--- lib/Template.php.orig	2023-04-01 13:46:16 UTC
++++ lib/Template.php
+@@ -56,6 +56,8 @@ class Template extends xmlTemplate {
+ 	# Template RDN attributes
+ 	private $rdn;
+ 
++	private $askcontainer;
++
+ 	public function __construct($server_id,$name='',$filename=null,$type=null,$id=null) {
+ 		parent::__construct($server_id,$name,$filename,$type,$id);
+ 
diff --git a/net/phpldapadmin/files/patch-lib_TemplateRender.php b/net/phpldapadmin/files/patch-lib_TemplateRender.php
new file mode 100644
index 000000000000..c9de2eb362cd
--- /dev/null
+++ b/net/phpldapadmin/files/patch-lib_TemplateRender.php
@@ -0,0 +1,12 @@
+--- lib/TemplateRender.php.orig	2023-04-01 13:46:16 UTC
++++ lib/TemplateRender.php
+@@ -16,6 +16,9 @@ class TemplateRender extends PageRender {
+ 	# Page number
+ 	private $pagelast;
+ 
++	private $url_base;
++	private $layout;
++
+ 	/** CORE FUNCTIONS **/
+ 
+ 	/**
diff --git a/net/phpldapadmin/files/patch-lib_page.php b/net/phpldapadmin/files/patch-lib_page.php
new file mode 100644
index 000000000000..f07b9c9021a0
--- /dev/null
+++ b/net/phpldapadmin/files/patch-lib_page.php
@@ -0,0 +1,13 @@
+--- lib/page.php.orig	2023-04-01 13:46:16 UTC
++++ lib/page.php
+@@ -25,6 +25,10 @@ class page {
+ 	# Default values array.
+ 	protected $_default;
+ 
++	private $index;
++	private $sysmsg;
++	private $_block;
++
+ 	public function __construct($index=null) {
+ 		if (defined('DEBUG_ENABLED') && DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
+ 			debug_log('Entered (%%)',129,0,__FILE__,__LINE__,__METHOD__,$fargs);
diff --git a/net/phpldapadmin/files/patch-lib_schema__functions.php b/net/phpldapadmin/files/patch-lib_schema__functions.php
new file mode 100644
index 000000000000..e3b7575c233b
--- /dev/null
+++ b/net/phpldapadmin/files/patch-lib_schema__functions.php
@@ -0,0 +1,11 @@
+--- lib/schema_functions.php.orig	2023-04-01 13:46:16 UTC
++++ lib/schema_functions.php
+@@ -734,6 +734,8 @@ class AttributeType extends SchemaItem {
+ 	# This attribute has been forced a MAY attribute by the configuration.
+ 	private $forced_as_may = false;
+ 
++	private $is_obsolete;
++
+ 	/**
+ 	 * Creates a new AttributeType object from a raw LDAP AttributeType string.
+ 	 */