Index: head/net/phpldapadmin/Makefile =================================================================== --- head/net/phpldapadmin/Makefile (revision 511039) +++ head/net/phpldapadmin/Makefile (revision 511040) @@ -1,55 +1,61 @@ # Created by: Matthew Seaman # $FreeBSD$ 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 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe php:web,flavors tar:tgz USE_PHP= gettext ldap openssl pcre session xml iconv hash NO_ARCH= yes NO_BUILD= yes CPE_VENDOR= deon_george 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 + +.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 \ ! -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 +.include Index: head/net/phpldapadmin/files/extra-patch-lib__PageRender.php =================================================================== --- head/net/phpldapadmin/files/extra-patch-lib__PageRender.php (nonexistent) +++ head/net/phpldapadmin/files/extra-patch-lib__PageRender.php (revision 511040) @@ -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 Property changes on: head/net/phpldapadmin/files/extra-patch-lib__PageRender.php ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property