Update to 5.0.0a6 snapshot:

- add mysqli extension
- add support for db 4.2

7 files changed, 45 insertions, 38 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}
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index fefcbb7429c1..737b3938bb60 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,2 +1,2 @@
-MD5 (php-5.0.0a5.tar.bz2) = 24c9a376594c9dcdc80342cb93baae6d
-SIZE (php-5.0.0a5.tar.bz2) = 4464672
+MD5 (php-5.0.0a6.tar.bz2) = a52b1fbfc0ab9206112225e351481ebf
+SIZE (php-5.0.0a6.tar.bz2) = 4562718
diff --git a/lang/php5/files/patch-configure b/lang/php5/files/patch-configure
index 4890f31005d6..2856115cce8e 100644
--- a/lang/php5/files/patch-configure
+++ b/lang/php5/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Dec 22 10:01:56 2003
-+++ configure	Sat Jan 24 14:08:52 2004
-@@ -622,6 +622,8 @@
+--- configure.orig	Fri Mar 19 11:01:07 2004
++++ configure	Fri Mar 19 11:10:11 2004
+@@ -624,6 +624,8 @@
  ac_help="$ac_help
    --enable-gd-jis-conv      GD: Enable JIS-mapped Japanese font support."
  ac_help="$ac_help
@@ -9,7 +9,7 @@
    --with-gettext[=DIR]    Include GNU gettext support."
  ac_help="$ac_help
    --with-gmp[=DIR]        Include GNU MP support"
-@@ -23795,6 +23797,10 @@
+@@ -24057,6 +24059,10 @@
          THIS_PREFIX=$i
          THIS_INCLUDE=$i/db4/db.h
          break
@@ -20,16 +20,16 @@
        elif test -f "$i/include/db4/db.h"; then
          THIS_PREFIX=$i
          THIS_INCLUDE=$i/include/db4/db.h
-@@ -23814,7 +23820,7 @@
+@@ -24076,7 +24082,7 @@
        fi
      done
      
--  for LIB in db-4.1 db-4.0 db-4 db4 db; do
-+  for LIB in db-4.1 db-4.0 db-4 db41 db4 db; do
+-  for LIB in db-4.2 db-4.1 db-4.0 db-4 db4 db; do
++  for LIB in db-4.2 db-4.1 db-4.0 db-4 db41 db4 db; do
      if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
        
    old_LDFLAGS=$LDFLAGS
-@@ -29640,6 +29646,31 @@
+@@ -30047,6 +30053,31 @@
  
  
  
@@ -61,7 +61,7 @@
  
  
  
-@@ -29792,7 +29823,7 @@
+@@ -30199,7 +30230,7 @@
                   libgd/gd_io_file.c libgd/gd_ss.c libgd/gd_io_ss.c libgd/gd_png.c libgd/gd_jpeg.c \
                   libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \
                   libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \
@@ -70,7 +70,7 @@
                   libgd/xbm.c"
  
    for ac_func in fabsf floorf
-@@ -29867,6 +29898,11 @@
+@@ -30274,6 +30305,11 @@
    fi
  
    
@@ -82,7 +82,7 @@
    if test "$PHP_JPEG_DIR" != "no"; then
  
      for i in $PHP_JPEG_DIR /usr/local /usr; do
-@@ -31580,6 +31616,9 @@
+@@ -31987,6 +32023,9 @@
  
    cat >> confdefs.h <<\EOF
  #define HAVE_GD_BUNDLED 1
@@ -92,7 +92,7 @@
  EOF
  
    cat >> confdefs.h <<\EOF
-@@ -31634,6 +31673,14 @@
+@@ -32041,6 +32080,14 @@
      GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
    fi
  
@@ -107,7 +107,7 @@
  else
  
   if test "$PHP_GD" != "no"; then
-@@ -35985,6 +36032,137 @@
+@@ -36392,6 +36439,137 @@
      esac
    done
  
@@ -243,9 +243,9 @@
 +  done
 +
    echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
- echo "configure:35990: checking for gdCacheCreate in -lgd" >&5
+ echo "configure:36397: checking for gdCacheCreate in -lgd" >&5
  ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'`
-@@ -60181,6 +60359,102 @@
+@@ -61441,6 +61619,102 @@
  	    
  
    if test "$ext_shared" = "yes"; then
@@ -348,7 +348,7 @@
      ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
      if test -n "$ORACLE_DIR/lib"; then
        
-@@ -79683,29 +79957,6 @@
+@@ -82018,29 +82292,6 @@
    else
      
    
@@ -378,7 +378,7 @@
    case ct in
    c|c_r|pthread*) ;;
    *) 
-@@ -79729,52 +79980,7 @@
+@@ -82064,52 +82315,7 @@
  
      
    
@@ -432,7 +432,7 @@
    
      
    save_old_LDFLAGS=$LDFLAGS
-@@ -79909,38 +80115,6 @@
+@@ -82244,38 +82450,6 @@
    c|c_r|pthread*) ;;
    *) 
        LIBS="-ltcl $LIBS" 
diff --git a/lang/php5/files/patch-ext::gd::libgd::gdft.c b/lang/php5/files/patch-ext::gd::libgd::gdft.c
deleted file mode 100644
index beadf4bf3935..000000000000
--- a/lang/php5/files/patch-ext::gd::libgd::gdft.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/gd/libgd/gdft.c.orig	Sun Dec 28 22:07:18 2003
-+++ ext/gd/libgd/gdft.c	Thu Mar 18 16:54:09 2004
-@@ -63,7 +63,7 @@
- #include "gdcache.h"
- #include <ft2build.h>
- #include FT_FREETYPE_H
--#include "freetype/ftglyph.h"
-+#include FT_GLYPH_H
- 
- /* number of fonts cached before least recently used is replaced */
- #define FONTCACHESIZE 6
diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist
index fd6edf13bec7..1e1834888dd5 100644
--- a/lang/php5/pkg-plist
+++ b/lang/php5/pkg-plist
@@ -219,6 +219,7 @@ lib/php/build/shtool
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Dependency.php
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/DependencyDB.php
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Downloader.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/ErrorStack.php
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Installer.php
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Packager.php
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Registry.php
diff --git a/lang/php5/scripts/configure.php b/lang/php5/scripts/configure.php
index e0a428aa74e4..c094eee13642 100644
--- a/lang/php5/scripts/configure.php
+++ b/lang/php5/scripts/configure.php
@@ -50,6 +50,7 @@ MING		"ming shockwave flash support" ${WITH_MING:-OFF} \
 MNOGOSEARCH	"mnoGoSearch support" ${WITH_MNOGOSEARCH:-OFF} \
 MSSQL		"MS-SQL database support" ${WITH_MSSQL:-OFF} \
 MYSQL		"MySQL database support" ${WITH_MYSQL:-OFF} \
+MYSQLI		"MySQLi database support" ${WITH_MYSQLI:-OFF} \
 NCURSES		"ncurses support (CLI only)" ${WITH_NCURSES:-OFF} \
 OPENLDAP	"OpenLDAP support" ${WITH_OPENLDAP:-OFF} \
 OPENSSL		"OpenSSL support" ${WITH_OPENSSL:-OFF} \
diff --git a/lang/php5/scripts/php5_options b/lang/php5/scripts/php5_options
index c2316ca45e24..80b5294e5ba4 100644
--- a/lang/php5/scripts/php5_options
+++ b/lang/php5/scripts/php5_options
@@ -30,6 +30,7 @@ WITH_MING=OFF
 WITH_MNOGOSEARCH=OFF
 WITH_MSSQL=OFF
 WITH_MYSQL=OFF
+WITH_MYSQLI=OFF
 WITH_NCURSES=OFF
 WITH_OPENLDAP=OFF
 WITH_OPENSSL=OFF