13 files changed, 42 insertions, 61 deletions

diff --git a/lang/php5-cli/pkg-message b/lang/php5-cli/pkg-message
index d447777d39ec..aa82109b4e40 100644
--- a/lang/php5-cli/pkg-message
+++ b/lang/php5-cli/pkg-message
@@ -3,7 +3,8 @@
 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, SPL, SQLITE, TOKENIZER and XML.
+CTYPE, DOM, ICONV, 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 0cbce7300393..945262ec639e 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -7,9 +7,10 @@
 # There are many ways to select which extensions you want to enable, either
 # in interactive mode or in batch mode.
 #
-# By default, the enabled extensions are: CTYPE, DOM, PCRE, POSIX, SESSION,
-# SIMPLEXML, SPL, SQLITE, TOKENIZER and XML. This behaviour can be changed
-# overriding the PHP5_OPTIONS variable (e.g. PHP5_OPTIONS="EXT1 EXT2 EXT3").
+# By default, the enabled extensions are: CTYPE, DOM, ICONV, PCRE, POSIX,
+# SESSION, 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
 # and default extensions respectively (implies batch mode).
@@ -20,7 +21,7 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.0.0.a6
+PORTVERSION=	5.0.0.r2
 PORTREVISION=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/:release \
@@ -30,9 +31,7 @@ MASTER_SITES=	http://www.php.net/distributions/:release \
 		http://gr.php.net/distributions/:release \
 		http://fr.php.net/distributions/:release \
 		http://es.php.net/distributions/:release \
-		http://se.php.net/distributions/:release \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ale
+		http://se.php.net/distributions/:release
 .if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
 PKGNAMEPREFIX=	mod_
 .else
@@ -44,7 +43,8 @@ PKGNAMESUFFIX=	-cli
 .endif
 .endif
 .endif
-DISTNAME=	php-${PORTVERSION:S/.a/a/}
+DISTNAME=	php-${PORTVERSION:S/.r/RC/}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:release
 
 MAINTAINER?=	ale@FreeBSD.org
 COMMENT?=	PHP Scripting Language (Apache Module and CLI)
@@ -83,7 +83,7 @@ CONFIGURE_ARGS+=--with-regex=apache
 .endif
 .endif
 
-EXT_DIR=	20040316
+EXT_DIR=	20040412
 SAPI_FILE=	"@comment "
 
 CONFLICTS=	php5-cli-5* mod_php5-5* php5-cgi-5*
@@ -131,12 +131,12 @@ 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 \
+		INIFILE MBSTRING MCVE MCRYPT MHASH MING MNOGOSEARCH MSSQL \
 		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
+		YP ZLIB
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt}) || defined(WITHOUT_${opt})
@@ -151,7 +151,7 @@ IS_INTERACTIVE=	yes
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PHP5_OPTFILE?=	${HOME}/php5_options
 
-PHP5_OPTIONS?=	CTYPE DOM PCRE POSIX SESSION SIMPLEXML SPL SQLITE TOKENIZER XML
+PHP5_OPTIONS?=	CTYPE DOM ICONV PCRE POSIX SESSION SIMPLEXML SPL SQLITE TOKENIZER XML
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt})
@@ -364,10 +364,6 @@ LIB_DEPENDS+=	mhash.2:${PORTSDIR}/security/mhash
 CONFIGURE_ARGS+=--with-mhash=${LOCALBASE}
 .endif
 
-.if defined(WITH_MIME)
-CONFIGURE_ARGS+=--with-mime-magic=/usr/share/misc/magic.mime
-.endif
-
 .if defined(WITH_MING)
 LIB_DEPENDS+=	ming.3:${PORTSDIR}/graphics/ming
 CONFIGURE_ARGS+=--with-ming=${LOCALBASE}
@@ -536,11 +532,6 @@ LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 CONFIGURE_ARGS+=--with-xsl=${LOCALBASE}
 .endif
 
-.if defined(WITH_YAZ)
-LIB_DEPENDS+=	yaz.2:${PORTSDIR}/net/yaz
-CONFIGURE_ARGS+=--with-yaz=${LOCALBASE}/bin
-.endif
-
 .if defined(WITH_YP)
 CONFIGURE_ARGS+=--enable-yp
 .endif
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 737b3938bb60..efe9823a6a17 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,2 +1,2 @@
-MD5 (php-5.0.0a6.tar.bz2) = a52b1fbfc0ab9206112225e351481ebf
-SIZE (php-5.0.0a6.tar.bz2) = 4562718
+MD5 (php-5.0.0RC2.tar.bz2) = 99e056269c2e3eac7e934755c60c44b7
+SIZE (php-5.0.0RC2.tar.bz2) = 4498965
diff --git a/lang/php5/pkg-message b/lang/php5/pkg-message
index 7351576ee97b..a26725a0633f 100644
--- a/lang/php5/pkg-message
+++ b/lang/php5/pkg-message
@@ -3,7 +3,8 @@
 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, SPL, SQLITE, TOKENIZER and XML.
+CTYPE, DOM, ICONV, 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 1e1834888dd5..98373a3ea8e6 100644
--- a/lang/php5/pkg-plist
+++ b/lang/php5/pkg-plist
@@ -67,6 +67,7 @@ include/php/Zend/zend_ts_hash.h
 include/php/Zend/zend_types.h
 include/php/Zend/zend_variables.h
 include/php/acconfig.h
+include/php/ext/libxml/php_libxml.h
 include/php/ext/mbstring/mb_gpc.h
 include/php/ext/mbstring/mbstring.h
 include/php/ext/mbstring/php_mbregex.h
@@ -227,6 +228,7 @@ lib/php/build/shtool
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Frontend/CLI.php
 @dirrm include/php/TSRM
 @dirrm include/php/Zend
+@dirrm include/php/ext/libxml
 @dirrm include/php/ext/mbstring
 @dirrm include/php/ext/session
 @dirrm include/php/ext/sqlite/libsqlite/src
diff --git a/lang/php5/scripts/configure.php b/lang/php5/scripts/configure.php
index c094eee13642..73d1491b9cdf 100644
--- a/lang/php5/scripts/configure.php
+++ b/lang/php5/scripts/configure.php
@@ -37,7 +37,7 @@ GD		"GD library support" ${WITH_GD:-OFF} \
 GDBM		"GDBM database support (dba)" ${WITH_GDBM:-OFF} \
 GETTEXT		"gettext library support" ${WITH_GETTEXT:-OFF} \
 GMP		"GNU MP support" ${WITH_GMP:-OFF} \
-ICONV		"iconv support" ${WITH_ICONV:-OFF} \
+ICONV		"iconv support" ${WITH_ICONV:-ON} \
 IMAP		"IMAP support" ${WITH_IMAP:-OFF} \
 INIFILE		"INI file support (dba)" ${WITH_INIFILE:-OFF} \
 INTERBASE	"Interbase 6 database support (Firebird)" ${WITH_INTERBASE:-OFF} \
@@ -45,7 +45,6 @@ MBSTRING	"multibyte string support" ${WITH_MBSTRING:-OFF} \
 MCVE		"MCVE support (implies OPENSSL)" ${WITH_MCVE:-OFF} \
 MCRYPT		"Encryption support" ${WITH_MCRYPT:-OFF} \
 MHASH		"Crypto-hashing support" ${WITH_MHASH:-OFF} \
-MIME		"mime_magic support" ${WITH_MIME:-OFF} \
 MING		"ming shockwave flash support" ${WITH_MING:-OFF} \
 MNOGOSEARCH	"mnoGoSearch support" ${WITH_MNOGOSEARCH:-OFF} \
 MSSQL		"MS-SQL database support" ${WITH_MSSQL:-OFF} \
@@ -82,7 +81,6 @@ WDDX		"WDDX support (implies XML)" ${WITH_WDDX:-OFF} \
 XML		"XML support" ${WITH_XML:-OFF} \
 XMLRPC		"XMLRPC-EPI support (implies ICONV)" ${WITH_XMLRPC:-OFF} \
 XSL		"XSL support" ${WITH_XSL:-OFF} \
-YAZ		"YAZ support (ANSI/NISO Z39.50)" ${WITH_YAZ:-OFF} \
 YP		"YP/NIS support" ${WITH_YP:-OFF} \
 ZLIB		"ZLIB support" ${WITH_ZLIB:-OFF} \
 2> $tempfile
diff --git a/lang/php5/scripts/php5_options b/lang/php5/scripts/php5_options
index 80b5294e5ba4..1b251f0ddd68 100644
--- a/lang/php5/scripts/php5_options
+++ b/lang/php5/scripts/php5_options
@@ -17,7 +17,7 @@ WITH_GD=OFF
 WITH_GDBM=OFF
 WITH_GETTEXT=OFF
 WITH_GMP=OFF
-WITH_ICONV=OFF
+WITH_ICONV=ON
 WITH_IMAP=OFF
 WITH_INIFILE=OFF
 WITH_INTERBASE=OFF
@@ -25,7 +25,6 @@ WITH_MBSTRING=OFF
 WITH_MCVE=OFF
 WITH_MCRYPT=OFF
 WITH_MHASH=OFF
-WITH_MIME=OFF
 WITH_MING=OFF
 WITH_MNOGOSEARCH=OFF
 WITH_MSSQL=OFF
@@ -62,6 +61,5 @@ WITH_WDDX=OFF
 WITH_XML=ON
 WITH_XMLRPC=OFF
 WITH_XSL=OFF
-WITH_YAZ=OFF
 WITH_YP=OFF
 WITH_ZLIB=ON
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 0cbce7300393..945262ec639e 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -7,9 +7,10 @@
 # There are many ways to select which extensions you want to enable, either
 # in interactive mode or in batch mode.
 #
-# By default, the enabled extensions are: CTYPE, DOM, PCRE, POSIX, SESSION,
-# SIMPLEXML, SPL, SQLITE, TOKENIZER and XML. This behaviour can be changed
-# overriding the PHP5_OPTIONS variable (e.g. PHP5_OPTIONS="EXT1 EXT2 EXT3").
+# By default, the enabled extensions are: CTYPE, DOM, ICONV, PCRE, POSIX,
+# SESSION, 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
 # and default extensions respectively (implies batch mode).
@@ -20,7 +21,7 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.0.0.a6
+PORTVERSION=	5.0.0.r2
 PORTREVISION=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/:release \
@@ -30,9 +31,7 @@ MASTER_SITES=	http://www.php.net/distributions/:release \
 		http://gr.php.net/distributions/:release \
 		http://fr.php.net/distributions/:release \
 		http://es.php.net/distributions/:release \
-		http://se.php.net/distributions/:release \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ale
+		http://se.php.net/distributions/:release
 .if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
 PKGNAMEPREFIX=	mod_
 .else
@@ -44,7 +43,8 @@ PKGNAMESUFFIX=	-cli
 .endif
 .endif
 .endif
-DISTNAME=	php-${PORTVERSION:S/.a/a/}
+DISTNAME=	php-${PORTVERSION:S/.r/RC/}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:release
 
 MAINTAINER?=	ale@FreeBSD.org
 COMMENT?=	PHP Scripting Language (Apache Module and CLI)
@@ -83,7 +83,7 @@ CONFIGURE_ARGS+=--with-regex=apache
 .endif
 .endif
 
-EXT_DIR=	20040316
+EXT_DIR=	20040412
 SAPI_FILE=	"@comment "
 
 CONFLICTS=	php5-cli-5* mod_php5-5* php5-cgi-5*
@@ -131,12 +131,12 @@ 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 \
+		INIFILE MBSTRING MCVE MCRYPT MHASH MING MNOGOSEARCH MSSQL \
 		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
+		YP ZLIB
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt}) || defined(WITHOUT_${opt})
@@ -151,7 +151,7 @@ IS_INTERACTIVE=	yes
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
 PHP5_OPTFILE?=	${HOME}/php5_options
 
-PHP5_OPTIONS?=	CTYPE DOM PCRE POSIX SESSION SIMPLEXML SPL SQLITE TOKENIZER XML
+PHP5_OPTIONS?=	CTYPE DOM ICONV PCRE POSIX SESSION SIMPLEXML SPL SQLITE TOKENIZER XML
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt})
@@ -364,10 +364,6 @@ LIB_DEPENDS+=	mhash.2:${PORTSDIR}/security/mhash
 CONFIGURE_ARGS+=--with-mhash=${LOCALBASE}
 .endif
 
-.if defined(WITH_MIME)
-CONFIGURE_ARGS+=--with-mime-magic=/usr/share/misc/magic.mime
-.endif
-
 .if defined(WITH_MING)
 LIB_DEPENDS+=	ming.3:${PORTSDIR}/graphics/ming
 CONFIGURE_ARGS+=--with-ming=${LOCALBASE}
@@ -536,11 +532,6 @@ LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 CONFIGURE_ARGS+=--with-xsl=${LOCALBASE}
 .endif
 
-.if defined(WITH_YAZ)
-LIB_DEPENDS+=	yaz.2:${PORTSDIR}/net/yaz
-CONFIGURE_ARGS+=--with-yaz=${LOCALBASE}/bin
-.endif
-
 .if defined(WITH_YP)
 CONFIGURE_ARGS+=--enable-yp
 .endif
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 737b3938bb60..efe9823a6a17 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,2 +1,2 @@
-MD5 (php-5.0.0a6.tar.bz2) = a52b1fbfc0ab9206112225e351481ebf
-SIZE (php-5.0.0a6.tar.bz2) = 4562718
+MD5 (php-5.0.0RC2.tar.bz2) = 99e056269c2e3eac7e934755c60c44b7
+SIZE (php-5.0.0RC2.tar.bz2) = 4498965
diff --git a/lang/php53/pkg-message b/lang/php53/pkg-message
index 7351576ee97b..a26725a0633f 100644
--- a/lang/php53/pkg-message
+++ b/lang/php53/pkg-message
@@ -3,7 +3,8 @@
 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, SPL, SQLITE, TOKENIZER and XML.
+CTYPE, DOM, ICONV, 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 1e1834888dd5..98373a3ea8e6 100644
--- a/lang/php53/pkg-plist
+++ b/lang/php53/pkg-plist
@@ -67,6 +67,7 @@ include/php/Zend/zend_ts_hash.h
 include/php/Zend/zend_types.h
 include/php/Zend/zend_variables.h
 include/php/acconfig.h
+include/php/ext/libxml/php_libxml.h
 include/php/ext/mbstring/mb_gpc.h
 include/php/ext/mbstring/mbstring.h
 include/php/ext/mbstring/php_mbregex.h
@@ -227,6 +228,7 @@ lib/php/build/shtool
 %%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Frontend/CLI.php
 @dirrm include/php/TSRM
 @dirrm include/php/Zend
+@dirrm include/php/ext/libxml
 @dirrm include/php/ext/mbstring
 @dirrm include/php/ext/session
 @dirrm include/php/ext/sqlite/libsqlite/src
diff --git a/lang/php53/scripts/configure.php b/lang/php53/scripts/configure.php
index c094eee13642..73d1491b9cdf 100644
--- a/lang/php53/scripts/configure.php
+++ b/lang/php53/scripts/configure.php
@@ -37,7 +37,7 @@ GD		"GD library support" ${WITH_GD:-OFF} \
 GDBM		"GDBM database support (dba)" ${WITH_GDBM:-OFF} \
 GETTEXT		"gettext library support" ${WITH_GETTEXT:-OFF} \
 GMP		"GNU MP support" ${WITH_GMP:-OFF} \
-ICONV		"iconv support" ${WITH_ICONV:-OFF} \
+ICONV		"iconv support" ${WITH_ICONV:-ON} \
 IMAP		"IMAP support" ${WITH_IMAP:-OFF} \
 INIFILE		"INI file support (dba)" ${WITH_INIFILE:-OFF} \
 INTERBASE	"Interbase 6 database support (Firebird)" ${WITH_INTERBASE:-OFF} \
@@ -45,7 +45,6 @@ MBSTRING	"multibyte string support" ${WITH_MBSTRING:-OFF} \
 MCVE		"MCVE support (implies OPENSSL)" ${WITH_MCVE:-OFF} \
 MCRYPT		"Encryption support" ${WITH_MCRYPT:-OFF} \
 MHASH		"Crypto-hashing support" ${WITH_MHASH:-OFF} \
-MIME		"mime_magic support" ${WITH_MIME:-OFF} \
 MING		"ming shockwave flash support" ${WITH_MING:-OFF} \
 MNOGOSEARCH	"mnoGoSearch support" ${WITH_MNOGOSEARCH:-OFF} \
 MSSQL		"MS-SQL database support" ${WITH_MSSQL:-OFF} \
@@ -82,7 +81,6 @@ WDDX		"WDDX support (implies XML)" ${WITH_WDDX:-OFF} \
 XML		"XML support" ${WITH_XML:-OFF} \
 XMLRPC		"XMLRPC-EPI support (implies ICONV)" ${WITH_XMLRPC:-OFF} \
 XSL		"XSL support" ${WITH_XSL:-OFF} \
-YAZ		"YAZ support (ANSI/NISO Z39.50)" ${WITH_YAZ:-OFF} \
 YP		"YP/NIS support" ${WITH_YP:-OFF} \
 ZLIB		"ZLIB support" ${WITH_ZLIB:-OFF} \
 2> $tempfile
diff --git a/lang/php53/scripts/php5_options b/lang/php53/scripts/php5_options
index 80b5294e5ba4..1b251f0ddd68 100644
--- a/lang/php53/scripts/php5_options
+++ b/lang/php53/scripts/php5_options
@@ -17,7 +17,7 @@ WITH_GD=OFF
 WITH_GDBM=OFF
 WITH_GETTEXT=OFF
 WITH_GMP=OFF
-WITH_ICONV=OFF
+WITH_ICONV=ON
 WITH_IMAP=OFF
 WITH_INIFILE=OFF
 WITH_INTERBASE=OFF
@@ -25,7 +25,6 @@ WITH_MBSTRING=OFF
 WITH_MCVE=OFF
 WITH_MCRYPT=OFF
 WITH_MHASH=OFF
-WITH_MIME=OFF
 WITH_MING=OFF
 WITH_MNOGOSEARCH=OFF
 WITH_MSSQL=OFF
@@ -62,6 +61,5 @@ WITH_WDDX=OFF
 WITH_XML=ON
 WITH_XMLRPC=OFF
 WITH_XSL=OFF
-WITH_YAZ=OFF
 WITH_YP=OFF
 WITH_ZLIB=ON