ports/69336: [ Maintainer update ] databases/phpmyadmin -- tracking PHP mega-commit

[Matthew Seaman]

>Number:         69336
>Category:       ports
>Synopsis:       [ Maintainer update ] databases/phpmyadmin -- tracking PHP mega-commit
>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:   Tue Jul 20 09:20:19 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 #78: Mon Jul 5 15:49:39 BST 2004 root at happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


	
>Description:

Take advantage of the new ports PHP infrastructure ade at ... committed
yesterday.  This adds explicit dependencies on:

    archivers/phpX-bz2
    graphics/phpX-gd
    databases/phpX-mysql
    security/phpX-openssl
    devel/phpX-pcre
    print/pecl-pdflib
    archivers/phpX-zlib

Where X is 4 or 5 according to the installed version of PHP.

>How-To-Repeat:
	
>Fix:

	

--- phpmyadmin.diff begins here ---
diff -Nur /usr/ports/databases/phpmyadmin/Makefile phpmyadmin/Makefile
--- /usr/ports/databases/phpmyadmin/Makefile	Fri Jul  2 00:51:09 2004
+++ phpmyadmin/Makefile	Tue Jul 20 09:55:07 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	phpMyAdmin
 PORTVERSION=	2.5.7.1
+PORTREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpmyadmin
@@ -17,11 +18,13 @@
 
 USE_BZIP2=	yes
 NO_BUILD=	yes
+USE_PHP=	bz2 gd mysql openssl pcre pdf zlib
 
 .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}
@@ -36,7 +39,6 @@
 
 .else
 
-USE_PHP=	yes
 WANT_PHP_WEB=	yes
 
 .endif
--- phpmyadmin.diff ends here ---


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