diff -ruN net/phpldapadmin/Makefile net/phpldapadmin.new/Makefile --- net/phpldapadmin/Makefile 2019-04-08 22:13:01.000000000 +0200 +++ net/phpldapadmin.new/Makefile 2019-09-02 15:59:32.045975000 +0200 @@ -3,11 +3,11 @@ PORTNAME= phpldapadmin PORTVERSION= 1.2.3 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 1 CATEGORIES= net www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-php5/${PORTVERSION} -PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} MAINTAINER= ports@bsdserwis.com COMMENT= PHP application to administer LDAP over the web @@ -34,6 +34,12 @@ .SILENT: +.include + +.if (${PHP_VER} == 73) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-lib__PageRender.php +.endif + post-patch: cd ${WRKSRC} ; \ ${FIND} . ! -type d ! -name ${CFGFILE}.example ! -name .cvsignore \ @@ -52,4 +58,4 @@ fi \ done -.include +.include diff -ruN net/phpldapadmin/files/extra-patch-lib__PageRender.php net/phpldapadmin.new/files/extra-patch-lib__PageRender.php --- net/phpldapadmin/files/extra-patch-lib__PageRender.php 1970-01-01 01:00:00.000000000 +0100 +++ net/phpldapadmin.new/files/extra-patch-lib__PageRender.php 2019-09-02 11:18:19.000000000 +0200 @@ -0,0 +1,42 @@ +--- lib/QueryRender.php.orig 2019-08-07 01:14:46.000000000 +0200 ++++ lib/QueryRender.php 2019-09-02 10:45:44.632080000 +0200 +@@ -284,10 +284,10 @@ class QueryRender extends PageRender { + + # Ignore DN, we've already displayed it. + if ($attr == 'dn') +- continue; ++ continue 2; + + if (! isset($dndetails[$attr])) +- continue; ++ continue 2; + + # Set our object with our values + $afattrs[$attr]->clearValue(); +@@ -321,7 +321,7 @@ class QueryRender extends PageRender { + if (! $results) { + echo _('Search returned no results'); + +- continue; ++ continue 2; + } + + printf('
',$counter); +@@ -374,7 +374,7 @@ class QueryRender extends PageRender { + # If the entry is blank, we'll draw an empty box and continue. + if (! isset($dndetails[$attr])) { + echo ' '; +- continue; ++ continue 2; + } + + # Special case for DNs +@@ -384,7 +384,7 @@ class QueryRender extends PageRender { + : htmlspecialchars($dndetails['dn']); + + printf('%s',htmlspecialchars($href),$dn_display); +- continue; ++ continue 2; + } + + # Set our object with our values