ports/69529: [ Maintainer update ] net/phpldapadmin -- tracking bsd.php.mk changes

[Matthew Seaman]

>Number:         69529
>Category:       ports
>Synopsis:       [ Maintainer update ] net/phpldapadmin -- tracking bsd.php.mk changes
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 24 12:00:47 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 4.10-STABLE FreeBSD 4.10-STABLE #79: Thu Jul 22 11:38:52 BST 2004 root at happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


	
>Description:

This PR supercedes ports/69337 which should be closed.

Changes:

    phpLDAPadmin doesn't work with php5, so add BROKEN_WITH_PHP=5.

    Add explicit dependencies required PHP extension modules:

        net/php4-ldap
        security/php4-openssl
        www/php4-session


>How-To-Repeat:

>Fix:


--- phpldapadmin.diff begins here ---
diff -Nur /usr/ports/net/phpldapadmin/Makefile phpldapadmin/Makefile
--- /usr/ports/net/phpldapadmin/Makefile	Thu May 20 17:31:29 2004
+++ phpldapadmin/Makefile	Sat Jul 24 12:43:22 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	phpldapadmin
 PORTVERSION=	0.9.4b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpldapadmin
@@ -16,11 +16,15 @@
 COMMENT=	A set of PHP-scripts to administer LDAP servers over the web
 
 NO_BUILD=	yes
+USE_PHP=	ldap openssl session
+
+BROKEN_WITH_PHP=	5
 
 .if defined(WITH_SUPHP)
 
-RUN_DEPENDS+=	${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp
 PKGNAMESUFFIX=	-suphp
+RUN_DEPENDS+=	${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp
+WANT_PHP_CGI=	yes
 PKGINST_SKEL=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
 PKGINSTALL=	${WRKDIR}/pkg-install${PKGNAMESUFFIX}
 PKGDEINST_SKEL=	${PKGDIR}/pkg-deinstall${PKGNAMESUFFIX}
@@ -35,7 +39,6 @@
 
 .else
 
-USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
 .endif
diff -Nur /usr/ports/net/phpldapadmin/pkg-message phpldapadmin/pkg-message
--- /usr/ports/net/phpldapadmin/pkg-message	Thu May 20 17:31:30 2004
+++ phpldapadmin/pkg-message	Mon Jul 19 15:29:04 2004
@@ -10,6 +10,3 @@
 
     Alias /phpldapadmin/ "%%PREFIX%%/%%PLADIR%%/"
 
-You will need a version of PHP with LDAP functionality enabled,
-which is not the default.  If necessary, enable the 'OPENLDAP'
-option in the PHP port's configuration screen and reinstall.
--- phpldapadmin.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: