Update to 5.0.0a6 snapshot:

- add mysqli extension
- add support for db 4.2

1 files changed, 22 insertions, 7 deletions

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index b0e011afaaf5..3c24d96a3640 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -20,8 +20,8 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.0.0.a5
-PORTREVISION=	1
+PORTVERSION=	5.0.0.a6
+PORTREVISION=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/:release \
 		http://it.php.net/distributions/:release \
@@ -83,7 +83,7 @@ CONFIGURE_ARGS+=--with-regex=apache
 .endif
 .endif
 
-EXT_DIR=	20020429
+EXT_DIR=	20040316
 SAPI_FILE=	"@comment "
 
 CONFLICTS=	php5-cli-5* mod_php5-5* php5-cgi-5*
@@ -132,10 +132,11 @@ PLIST_SUB+=	CLI=""
 ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DIO \
 		DOM EXIF FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE \
 		INIFILE MBSTRING MCVE MCRYPT MHASH MIME MING MNOGOSEARCH MSSQL \
-		MYSQL NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB POSIX \
-		POSTGRESQL PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP \
-		SOAP SOCKETS SPL SQLITE SYBASEDB SYBASECT SYSVSEM SYSVSHM TIDY \
-		TOKENIZER UNIXODBC WDDX XML XMLRPC XSL YAZ YP ZLIB
+		MYSQL MYSQLI NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB \
+		POSIX POSTGRESQL PSPELL READLINE RECODE SESSION SHMOP \
+		SIMPLEXML SNMP SOAP SOCKETS SPL SQLITE SYBASEDB SYBASECT \
+		SYSVSEM SYSVSHM TIDY TOKENIZER UNIXODBC WDDX XML XMLRPC XSL \
+		YAZ YP ZLIB
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt}) || defined(WITHOUT_${opt})
@@ -245,11 +246,15 @@ CONFIGURE_ARGS+=--with-curl=${LOCALBASE}
 
 .if defined(WITH_DB4)
 WITH_DB4_VER?=	41
+.if ${WITH_DB4_VER} == 42
+LIB_DEPENDS+=	db4.2.2:${PORTSDIR}/databases/db42
+.else
 .if ${WITH_DB4_VER} == 4
 LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
 .else
 LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
 .endif
+.endif
 CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
 .endif
 
@@ -383,6 +388,12 @@ USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
 .endif
 
+.if defined(WITH_MYSQLI)
+USE_MYSQL=	yes
+BROKEN_WITH_MYSQL=	323 40
+CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config
+.endif
+
 .if defined(WITH_OPENLDAP)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
@@ -643,6 +654,10 @@ pre-configure:
 	@${ECHO_CMD} "You cannot define WITH_IMAP *and* WITH_YAZ!"
 	@${FALSE}
 .endif
+.if defined(WITH_MYSQL) && defined(WITH_MYSQLI)
+	@${ECHO_CMD} "You cannot define WITH_MYSQL *and* WITH_MYSQLI!"
+	@${FALSE}
+.endif
 .if defined(WITH_RECODE) && defined(WITH_YAZ)
 	@${ECHO_CMD} "You cannot define WITH_RECODE *and* WITH_YAZ!"
 	@${FALSE}