Unbreak with php > 5.2.10 and fix the do-install target wo it will pick

up the patches files.

php fix from robert@
This commit is contained in:
bernd 2009-09-26 10:02:57 +00:00
parent 7015dd2c08
commit 059de9d5a8
2 changed files with 22 additions and 4 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.17 2009/09/15 17:37:22 jasper Exp $
# $OpenBSD: Makefile,v 1.18 2009/09/26 10:02:57 bernd Exp $
COMMENT= web-based LDAP browser to manage LDAP servers
VERSION= 1.1.0.7
DISTNAME= phpldapadmin-${VERSION}
PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= www
HOMEPAGE= http://phpldapadmin.sourceforge.net/
@ -27,7 +27,10 @@ SUBST_VARS= INSTDIR
RUN_DEPENDS= :php5-ldap-*:www/php5/extensions,-ldap
do-install:
@cd ${PREFIX} && tar zxf ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} && \
mv ${PREFIX}/${DISTNAME} ${PREFIX}/phpldapadmin
${INSTALL_DATA_DIR} ${PREFIX}/phpldapadmin
cd ${WRKBUILD} && tar -cf - * .* | \
tar -C ${PREFIX}/phpldapadmin -xf -
find ${PREFIX}/phpldapadmin -name '*.orig' | xargs -r rm -f
chown -R root:daemon ${PREFIX}/phpldapadmin
.include <bsd.port.mk>

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-lib_AJAXTree_php,v 1.1 2009/09/26 10:02:57 bernd Exp $
Fix for php > 5.2.10.
--- lib/AJAXTree.php.orig Sat Sep 26 11:58:15 2009
+++ lib/AJAXTree.php Sat Sep 26 11:58:22 2009
@@ -13,7 +13,7 @@ class AJAXTree extends PLMTree {
* @param $first_child is this the first child ?
* @param $last_child is this the last child ?
*/
- protected function draw_dn($dn,$level=0,$first_child=true,$last_child=true) {
+ protected function draw_dn($dn,$level,$first_child=true,$last_child=true) {
if (DEBUG_ENABLED)
debug_log('Entered with (%s,%s)',33,__FILE__,__LINE__,__METHOD__,$dn,$level);