Update to the latest snapshot.

Add new SOAP and SPL extensions.
(The distfile may be unreachable for a few hours)

Approved by:	nork (mentor/implicitly)

17 files changed, 71 insertions, 45 deletions

diff --git a/lang/php5-cli/pkg-message b/lang/php5-cli/pkg-message
index b9e0d8ddfd25..d447777d39ec 100644
--- a/lang/php5-cli/pkg-message
+++ b/lang/php5-cli/pkg-message
@@ -3,7 +3,7 @@
 You have installed the php5-cli package.
 
 Have a look at the php5-cli port if you need additional extensions other than
-CTYPE, DOM, PCRE, POSIX, SESSION, SIMPLEXML, SQLITE, TOKENIZER and XML.
+CTYPE, DOM, PCRE, POSIX, SESSION, SIMPLEXML, SPL, SQLITE, TOKENIZER and XML.
 
 You can find it at
 ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/lang/php5-cli.tar
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index c3e88a8ee7f3..b7edc779a2ef 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -8,7 +8,7 @@
 # in interactive mode or in batch mode.
 #
 # By default, the enabled extensions are: CTYPE, DOM, PCRE, POSIX, SESSION,
-# SIMPLEXML, SQLITE, TOKENIZER and XML. This behaviour can be changed
+# SIMPLEXML, SPL, SQLITE, TOKENIZER and XML. This behaviour can be changed
 # overriding the PHP5_OPTIONS variable (e.g. PHP5_OPTIONS="EXT1 EXT2 EXT3").
 #
 # Another way is to use the WITH_<EXT> and WITHOUT_<EXT> knobs, for additional
@@ -20,8 +20,8 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.0.0.a4
-PORTREVISION=	3
+PORTVERSION=	5.0.0.a5
+PORTREVISION=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/:release \
 		http://it.php.net/distributions/:release \
@@ -135,7 +135,7 @@ ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DIO \
 		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 \
-		SOCKETS SQLITE SYBASEDB SYBASECT SYSVSEM SYSVSHM TIDY \
+		SOAP SOCKETS SPL SQLITE SYBASEDB SYBASECT SYSVSEM SYSVSHM TIDY \
 		TOKENIZER UNIXODBC WDDX XML XMLRPC XSL YAZ YP ZLIB
 
 .for opt in ${ALL_OPTIONS}
@@ -151,7 +151,7 @@ IS_INTERACTIVE=	yes
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PHP5_OPTFILE?=	${HOME}/php5_options
 
-PHP5_OPTIONS?=	CTYPE DOM PCRE POSIX SESSION SIMPLEXML SQLITE TOKENIZER XML
+PHP5_OPTIONS?=	CTYPE DOM PCRE POSIX SESSION SIMPLEXML SPL SQLITE TOKENIZER XML
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt})
@@ -199,7 +199,7 @@ WITH_ICONV_DEP=	yes
 WITH_OPENSSL_DEP=	yes
 .endif
 
-.if defined(WITH_DOM) || defined(WITH_SIMPLEXML)
+.if defined(WITH_DOM) || defined(WITH_SIMPLEXML) || defined(WITH_SOAP)
 WITH_XML_DEP=	yes
 .endif
 
@@ -453,10 +453,18 @@ CONFIGURE_ARGS+=--enable-shmop
 CONFIGURE_ARGS+=--enable-simplexml
 .endif
 
+.if defined(WITH_SOAP)
+CONFIGURE_ARGS+=--enable-soap
+.endif
+
 .if defined(WITH_SOCKETS)
 CONFIGURE_ARGS+=--enable-sockets
 .endif
 
+.if defined(WITH_SPL)
+CONFIGURE_ARGS+=--enable-spl
+.endif
+
 .if defined(WITH_SQLITE)
 CONFIGURE_ARGS+=--with-sqlite
 .endif
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 8ba0f0bc10ef..fefcbb7429c1 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1 +1,2 @@
-MD5 (php-5.0.0a4.tar.bz2) = 3fa6dcb3401c9085a51afadce7367cf8
+MD5 (php-5.0.0a5.tar.bz2) = 24c9a376594c9dcdc80342cb93baae6d
+SIZE (php-5.0.0a5.tar.bz2) = 4464672
diff --git a/lang/php5/files/patch-ext::gd::gd_ctx.c b/lang/php5/files/patch-ext::gd::gd_ctx.c
index fa2e4453fd81..11a7ef43e264 100644
--- a/lang/php5/files/patch-ext::gd::gd_ctx.c
+++ b/lang/php5/files/patch-ext::gd::gd_ctx.c
@@ -1,8 +1,8 @@
---- ext/gd/gd_ctx.c.orig	Mon Jun 23 20:07:47 2003
-+++ ext/gd/gd_ctx.c	Tue Jul 15 01:54:58 2003
-@@ -44,23 +44,29 @@
- /* {{{ _php_image_output_ctx */	
- static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)()) 
+--- ext/gd/gd_ctx.c.orig	Wed Jan 28 18:10:05 2004
++++ ext/gd/gd_ctx.c	Fri Feb 13 12:12:00 2004
+@@ -49,23 +49,29 @@
+ /* {{{ _php_image_output_ctx */
+ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)())
  {
 -	zval **imgind, **file, **quality;
 +	zval **imgind, **file, **quality, **lo, **to, **del, **dis;
@@ -23,16 +23,16 @@
 +	 * local/global colormap.
 +	 * The fourth (LeftOfs) parameter for GIF animation begin stands for NETSCAPE2.0 Loop count extension.
  	 */
- 	
+ 
  	if (argc < 2 && image_type == PHP_GDIMG_TYPE_XBM) {
  		WRONG_PARAM_COUNT;
  	}
--	if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &imgind, &file, &quality) == FAILURE) 
+-	if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &imgind, &file, &quality) == FAILURE)
 +	if (argc < 1 || argc > 7 || zend_get_parameters_ex(argc, &imgind, &file, &quality, &lo, &to, &del, &dis) == FAILURE)
  	{
  		WRONG_PARAM_COUNT;
  	}
-@@ -70,11 +76,29 @@
+@@ -75,11 +81,29 @@
  	if (argc > 1) {
  		convert_to_string_ex(file);
  		fn = Z_STRVAL_PP(file);
@@ -66,7 +66,7 @@
  
  	if ((argc == 2) || (argc > 2 && Z_STRLEN_PP(file))) {
  		if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC)) {
-@@ -82,7 +106,7 @@
+@@ -87,7 +111,7 @@
  			RETURN_FALSE;
  		}
  
@@ -75,7 +75,7 @@
  		if (!fp) {
  			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open '%s' for writing", fn);
  			RETURN_FALSE;
-@@ -128,6 +152,14 @@
+@@ -133,6 +157,14 @@
  				(*func_p)(im, q, ctx);
  			}
  			break;
@@ -90,8 +90,8 @@
  		default:
  			(*func_p)(im, ctx);
  			break;
-@@ -146,6 +178,75 @@
- 	
+@@ -151,6 +183,75 @@
+ 
      RETURN_TRUE;
  }
 +
diff --git a/lang/php5/pkg-message b/lang/php5/pkg-message
index 6110eb8db84b..7351576ee97b 100644
--- a/lang/php5/pkg-message
+++ b/lang/php5/pkg-message
@@ -3,7 +3,7 @@
 You have installed the php5 package.
 
 Have a look at the php5 port if you need additional extensions other than
-CTYPE, DOM, PCRE, POSIX, SESSION, SIMPLEXML, SQLITE, TOKENIZER and XML.
+CTYPE, DOM, PCRE, POSIX, SESSION, SIMPLEXML, SPL, SQLITE, TOKENIZER and XML.
 
 You can find it at
 ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/lang/php5.tar
diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist
index e2c2b9e091c2..fd6edf13bec7 100644
--- a/lang/php5/pkg-plist
+++ b/lang/php5/pkg-plist
@@ -28,9 +28,9 @@ include/php/Zend/zend_config.h
 include/php/Zend/zend_config.nw.h
 include/php/Zend/zend_config.w32.h
 include/php/Zend/zend_constants.h
-include/php/Zend/zend_default_classes.h
 include/php/Zend/zend_dynamic_array.h
 include/php/Zend/zend_errors.h
+include/php/Zend/zend_exceptions.h
 include/php/Zend/zend_execute.h
 include/php/Zend/zend_extensions.h
 include/php/Zend/zend_fast_cache.h
diff --git a/lang/php5/scripts/configure.php b/lang/php5/scripts/configure.php
index 32056e094a33..e0a428aa74e4 100644
--- a/lang/php5/scripts/configure.php
+++ b/lang/php5/scripts/configure.php
@@ -66,7 +66,9 @@ SESSION		"session support" ${WITH_SESSION:-OFF} \
 SHMOP		"shmop support" ${WITH_SHMOP:-OFF} \
 SIMPLEXML	"simplexml support" ${WITH_SIMPLEXML:-OFF} \
 SNMP		"SNMP support (implies OPENSSL)" ${WITH_SNMP:-OFF} \
+SOAP		"SOAP support" ${WITH_SOAP:-OFF} \
 SOCKETS		"sockets support" ${WITH_SOCKETS:-OFF} \
+SPL		"Standard PHP Library support" ${WITH_SPL:-ON} \
 SQLITE		"sqlite support" ${WITH_SQLITE:-OFF} \
 SYBASEDB	"Sybase database support (DB-lib)" ${WITH_SYBASEDB:-OFF} \
 SYBASECT	"Sybase database support (CT-lib)" ${WITH_SYBASECT:-OFF} \
diff --git a/lang/php5/scripts/php5_options b/lang/php5/scripts/php5_options
index 3588ccf52c9a..c2316ca45e24 100644
--- a/lang/php5/scripts/php5_options
+++ b/lang/php5/scripts/php5_options
@@ -46,7 +46,9 @@ WITH_SESSION=ON
 WITH_SHMOP=OFF
 WITH_SIMPLEXML=ON
 WITH_SNMP=OFF
+WITH_SOAP=OFF
 WITH_SOCKETS=OFF
+WITH_SPL=ON
 WITH_SQLITE=ON
 WITH_SYBASEDB=OFF
 WITH_SYBASECT=OFF
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index c3e88a8ee7f3..b7edc779a2ef 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -8,7 +8,7 @@
 # in interactive mode or in batch mode.
 #
 # By default, the enabled extensions are: CTYPE, DOM, PCRE, POSIX, SESSION,
-# SIMPLEXML, SQLITE, TOKENIZER and XML. This behaviour can be changed
+# SIMPLEXML, SPL, SQLITE, TOKENIZER and XML. This behaviour can be changed
 # overriding the PHP5_OPTIONS variable (e.g. PHP5_OPTIONS="EXT1 EXT2 EXT3").
 #
 # Another way is to use the WITH_<EXT> and WITHOUT_<EXT> knobs, for additional
@@ -20,8 +20,8 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.0.0.a4
-PORTREVISION=	3
+PORTVERSION=	5.0.0.a5
+PORTREVISION=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/:release \
 		http://it.php.net/distributions/:release \
@@ -135,7 +135,7 @@ ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DIO \
 		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 \
-		SOCKETS SQLITE SYBASEDB SYBASECT SYSVSEM SYSVSHM TIDY \
+		SOAP SOCKETS SPL SQLITE SYBASEDB SYBASECT SYSVSEM SYSVSHM TIDY \
 		TOKENIZER UNIXODBC WDDX XML XMLRPC XSL YAZ YP ZLIB
 
 .for opt in ${ALL_OPTIONS}
@@ -151,7 +151,7 @@ IS_INTERACTIVE=	yes
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PHP5_OPTFILE?=	${HOME}/php5_options
 
-PHP5_OPTIONS?=	CTYPE DOM PCRE POSIX SESSION SIMPLEXML SQLITE TOKENIZER XML
+PHP5_OPTIONS?=	CTYPE DOM PCRE POSIX SESSION SIMPLEXML SPL SQLITE TOKENIZER XML
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt})
@@ -199,7 +199,7 @@ WITH_ICONV_DEP=	yes
 WITH_OPENSSL_DEP=	yes
 .endif
 
-.if defined(WITH_DOM) || defined(WITH_SIMPLEXML)
+.if defined(WITH_DOM) || defined(WITH_SIMPLEXML) || defined(WITH_SOAP)
 WITH_XML_DEP=	yes
 .endif
 
@@ -453,10 +453,18 @@ CONFIGURE_ARGS+=--enable-shmop
 CONFIGURE_ARGS+=--enable-simplexml
 .endif
 
+.if defined(WITH_SOAP)
+CONFIGURE_ARGS+=--enable-soap
+.endif
+
 .if defined(WITH_SOCKETS)
 CONFIGURE_ARGS+=--enable-sockets
 .endif
 
+.if defined(WITH_SPL)
+CONFIGURE_ARGS+=--enable-spl
+.endif
+
 .if defined(WITH_SQLITE)
 CONFIGURE_ARGS+=--with-sqlite
 .endif
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 8ba0f0bc10ef..fefcbb7429c1 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1 +1,2 @@
-MD5 (php-5.0.0a4.tar.bz2) = 3fa6dcb3401c9085a51afadce7367cf8
+MD5 (php-5.0.0a5.tar.bz2) = 24c9a376594c9dcdc80342cb93baae6d
+SIZE (php-5.0.0a5.tar.bz2) = 4464672
diff --git a/lang/php53/files/patch-ext::gd::gd_ctx.c b/lang/php53/files/patch-ext::gd::gd_ctx.c
index fa2e4453fd81..11a7ef43e264 100644
--- a/lang/php53/files/patch-ext::gd::gd_ctx.c
+++ b/lang/php53/files/patch-ext::gd::gd_ctx.c
@@ -1,8 +1,8 @@
---- ext/gd/gd_ctx.c.orig	Mon Jun 23 20:07:47 2003
-+++ ext/gd/gd_ctx.c	Tue Jul 15 01:54:58 2003
-@@ -44,23 +44,29 @@
- /* {{{ _php_image_output_ctx */	
- static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)()) 
+--- ext/gd/gd_ctx.c.orig	Wed Jan 28 18:10:05 2004
++++ ext/gd/gd_ctx.c	Fri Feb 13 12:12:00 2004
+@@ -49,23 +49,29 @@
+ /* {{{ _php_image_output_ctx */
+ static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)())
  {
 -	zval **imgind, **file, **quality;
 +	zval **imgind, **file, **quality, **lo, **to, **del, **dis;
@@ -23,16 +23,16 @@
 +	 * local/global colormap.
 +	 * The fourth (LeftOfs) parameter for GIF animation begin stands for NETSCAPE2.0 Loop count extension.
  	 */
- 	
+ 
  	if (argc < 2 && image_type == PHP_GDIMG_TYPE_XBM) {
  		WRONG_PARAM_COUNT;
  	}
--	if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &imgind, &file, &quality) == FAILURE) 
+-	if (argc < 1 || argc > 3 || zend_get_parameters_ex(argc, &imgind, &file, &quality) == FAILURE)
 +	if (argc < 1 || argc > 7 || zend_get_parameters_ex(argc, &imgind, &file, &quality, &lo, &to, &del, &dis) == FAILURE)
  	{
  		WRONG_PARAM_COUNT;
  	}
-@@ -70,11 +76,29 @@
+@@ -75,11 +81,29 @@
  	if (argc > 1) {
  		convert_to_string_ex(file);
  		fn = Z_STRVAL_PP(file);
@@ -66,7 +66,7 @@
  
  	if ((argc == 2) || (argc > 2 && Z_STRLEN_PP(file))) {
  		if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC)) {
-@@ -82,7 +106,7 @@
+@@ -87,7 +111,7 @@
  			RETURN_FALSE;
  		}
  
@@ -75,7 +75,7 @@
  		if (!fp) {
  			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open '%s' for writing", fn);
  			RETURN_FALSE;
-@@ -128,6 +152,14 @@
+@@ -133,6 +157,14 @@
  				(*func_p)(im, q, ctx);
  			}
  			break;
@@ -90,8 +90,8 @@
  		default:
  			(*func_p)(im, ctx);
  			break;
-@@ -146,6 +178,75 @@
- 	
+@@ -151,6 +183,75 @@
+ 
      RETURN_TRUE;
  }
 +
diff --git a/lang/php53/pkg-message b/lang/php53/pkg-message
index 6110eb8db84b..7351576ee97b 100644
--- a/lang/php53/pkg-message
+++ b/lang/php53/pkg-message
@@ -3,7 +3,7 @@
 You have installed the php5 package.
 
 Have a look at the php5 port if you need additional extensions other than
-CTYPE, DOM, PCRE, POSIX, SESSION, SIMPLEXML, SQLITE, TOKENIZER and XML.
+CTYPE, DOM, PCRE, POSIX, SESSION, SIMPLEXML, SPL, SQLITE, TOKENIZER and XML.
 
 You can find it at
 ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/lang/php5.tar
diff --git a/lang/php53/pkg-plist b/lang/php53/pkg-plist
index e2c2b9e091c2..fd6edf13bec7 100644
--- a/lang/php53/pkg-plist
+++ b/lang/php53/pkg-plist
@@ -28,9 +28,9 @@ include/php/Zend/zend_config.h
 include/php/Zend/zend_config.nw.h
 include/php/Zend/zend_config.w32.h
 include/php/Zend/zend_constants.h
-include/php/Zend/zend_default_classes.h
 include/php/Zend/zend_dynamic_array.h
 include/php/Zend/zend_errors.h
+include/php/Zend/zend_exceptions.h
 include/php/Zend/zend_execute.h
 include/php/Zend/zend_extensions.h
 include/php/Zend/zend_fast_cache.h
diff --git a/lang/php53/scripts/configure.php b/lang/php53/scripts/configure.php
index 32056e094a33..e0a428aa74e4 100644
--- a/lang/php53/scripts/configure.php
+++ b/lang/php53/scripts/configure.php
@@ -66,7 +66,9 @@ SESSION		"session support" ${WITH_SESSION:-OFF} \
 SHMOP		"shmop support" ${WITH_SHMOP:-OFF} \
 SIMPLEXML	"simplexml support" ${WITH_SIMPLEXML:-OFF} \
 SNMP		"SNMP support (implies OPENSSL)" ${WITH_SNMP:-OFF} \
+SOAP		"SOAP support" ${WITH_SOAP:-OFF} \
 SOCKETS		"sockets support" ${WITH_SOCKETS:-OFF} \
+SPL		"Standard PHP Library support" ${WITH_SPL:-ON} \
 SQLITE		"sqlite support" ${WITH_SQLITE:-OFF} \
 SYBASEDB	"Sybase database support (DB-lib)" ${WITH_SYBASEDB:-OFF} \
 SYBASECT	"Sybase database support (CT-lib)" ${WITH_SYBASECT:-OFF} \
diff --git a/lang/php53/scripts/php5_options b/lang/php53/scripts/php5_options
index 3588ccf52c9a..c2316ca45e24 100644
--- a/lang/php53/scripts/php5_options
+++ b/lang/php53/scripts/php5_options
@@ -46,7 +46,9 @@ WITH_SESSION=ON
 WITH_SHMOP=OFF
 WITH_SIMPLEXML=ON
 WITH_SNMP=OFF
+WITH_SOAP=OFF
 WITH_SOCKETS=OFF
+WITH_SPL=ON
 WITH_SQLITE=ON
 WITH_SYBASEDB=OFF
 WITH_SYBASECT=OFF
diff --git a/www/mod_php5/pkg-message b/www/mod_php5/pkg-message
index bbd0eb79f3b1..bb8c065349c0 100644
--- a/www/mod_php5/pkg-message
+++ b/www/mod_php5/pkg-message
@@ -3,7 +3,7 @@
 You have installed the mod_php5 package.
 
 Have a look at the mod_php5 port if you need additional extensions other than
-CTYPE, DOM, PCRE, POSIX, SESSION, SIMPLEXML, SQLITE, TOKENIZER and XML.
+CTYPE, DOM, PCRE, POSIX, SESSION, SIMPLEXML, SPL, SQLITE, TOKENIZER and XML.
 
 You can find it at
 ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/www/mod_php5.tar
diff --git a/www/php5-cgi/pkg-message b/www/php5-cgi/pkg-message
index 5630ca64b4bf..51ffdd33ecbc 100644
--- a/www/php5-cgi/pkg-message
+++ b/www/php5-cgi/pkg-message
@@ -3,7 +3,7 @@
 You have installed the php5-cgi package.
 
 Have a look at the php5-cgi port if you need additional extensions other than
-CTYPE, DOM, PCRE, POSIX, SESSION, SIMPLEXML, SQLITE, TOKENIZER and XML.
+CTYPE, DOM, PCRE, POSIX, SESSION, SIMPLEXML, SPL, SQLITE, TOKENIZER and XML.
 
 You can find it at
 ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/www/php5-cgi.tar