Add php5 5.0.0.a1, PHP5 Scripting Language.

PR: ports/54519 Submitted by: Alex Dupre <sysadmin@alexdupre.com> Repo copied by: joe (cvs) Approved by: portmgr (no objections)
author: nork <nork@FreeBSD.org> 2003-07-16 18:59:22 +0800
committer: nork <nork@FreeBSD.org> 2003-07-16 18:59:22 +0800
commit: b9d099e41d734c0fa76332ebfd0268e6d177784d (patch)
tree: c8d144e26bfd07ef16b5a8470920e7a83c03d50c
parent: 8397c07960dd01e9c0240ba01bacf5c7a3218783 (diff)
download: freebsd-ports-gnome-b9d099e41d734c0fa76332ebfd0268e6d177784d.tar.gz
freebsd-ports-gnome-b9d099e41d734c0fa76332ebfd0268e6d177784d.tar.zst
freebsd-ports-gnome-b9d099e41d734c0fa76332ebfd0268e6d177784d.zip
19 files changed, 555 insertions, 846 deletions
diff --git a/lang/Makefile b/lang/Makefile
index 5478704cac09..f72c1801cfc8 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -149,6 +149,7 @@
     SUBDIR += php3
     SUBDIR += php4
     SUBDIR += php4-cli
+    SUBDIR += php5
     SUBDIR += php_doc
     SUBDIR += pike70
     SUBDIR += pike72
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index b3693984520d..9e22c98b447b 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	php4
+# New ports collection makefile for:	php5
 # Date created:				Tue Feb 18 11:17:13 CET 2003
 # Whom:					Alex Dupre <sysadmin@alexdupre.com>
 #
@@ -7,21 +7,21 @@
 # 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, MYSQL, OVERLOAD, PCRE, POSIX,
-# SESSION, TOKENIZER, XML and ZLIB. This behaviour can be changed overriding
-# the PHP4_OPTIONS variable (e.g. PHP4_OPTIONS="EXT1 EXT2 EXT3").
+# By default, the enabled extensions are: CTYPE, DOM, PCRE, POSIX, SESSION,
+# SIMPLEXML, 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).
 #
-# The last way reads an "extension" file, located in ~/php4_options (the
-# location is overridable by the PHP4_OPTFILE variable). You may find an
-# example in scripts/php4_options (interactive mode only).
+# The last way reads an "extension" file, located in ~/php5_options (the
+# location is overridable by the PHP5_OPTFILE variable). You may find an
+# example in scripts/php5_options (interactive mode only).
 #
 
-PORTNAME=	php4
-PORTVERSION=	4.3.3.r1
-PORTREVISION=	1
+PORTNAME=	php5
+PORTVERSION=	5.0.0.a1
+PORTREVISION=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/ \
 		http://it.php.net/distributions/ \
@@ -31,6 +31,7 @@ MASTER_SITES=	http://www.php.net/distributions/ \
 		http://fr.php.net/distributions/ \
 		http://es.php.net/distributions/ \
 		http://se.php.net/distributions/ \
+		http://www.sm.FreeBSD.org/~alex/ \
 		http://downloads.php.net/jani/
 .if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
 PKGNAMEPREFIX=	mod_
@@ -43,7 +44,7 @@ PKGNAMESUFFIX=	-cli
 .endif
 .endif
 .endif
-DISTNAME=	php-${PORTVERSION:S/.r/RC/}
+DISTNAME=	php-${PORTVERSION:S/.a/a/}
 
 MAINTAINER?=	sysadmin@alexdupre.com
 COMMENT=	PHP Scripting Language (Apache Module and CLI)
@@ -68,7 +69,6 @@ USE_LIBTOOL_VER=14
 CONFIGURE_ARGS=	--enable-versioning \
 		--enable-memory-limit \
 		--with-layout=GNU \
-		--with-zlib-dir=/usr \
 		--disable-all
 
 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
@@ -86,18 +86,19 @@ CONFIGURE_ARGS+=--with-regex=apache
 EXT_DIR=	20020429
 SAPI_FILE=	"@comment "
 
-CONFLICTS=	php4-cli-4* mod_php4-4* php4-cgi-4*
+CONFLICTS=	php5-cli-5* mod_php5-5* php5-cgi-5*
 .if defined(WITHOUT_APACHE)
 .if defined(WITHOUT_CLI)
-CONFLICTS=	php4-4* php4-cli-4* mod_php4-4*
+CONFLICTS=	php5-5* php5-cli-5* mod_php5-5*
 .else
-CONFLICTS=	php4-4* php4-cgi-4* mod_php4-4*
+CONFLICTS=	php5-5* php5-cgi-5* mod_php5-5*
 .endif
 .else
 .if defined(WITHOUT_CLI)
-CONFLICTS=	php4-4* php4-cli-4* php4-cgi-4*
+CONFLICTS=	php5-5* php5-cli-5* php5-cgi-5*
 .endif
 .endif
+CONFLICTS+=	php4-4* php4-cli-4* mod_php4-4* php4-cgi-4*
 
 .if defined(WITHOUT_APACHE)
 CONFIGURE_ARGS+=--enable-discard-path
@@ -109,6 +110,12 @@ PLIST_SUB+=	APACHE=""
 CONFIGURE_ARGS+=--disable-cli
 PLIST_SUB+=	CLI="@comment "
 .else
+.if !defined(WITHOUT_PEAR)
+CONFIGURE_ARGS+=--with-pear
+PLIST_SUB+=	PEAR=""
+.else
+PLIST_SUB+=	PEAR="@comment "
+.endif
 MAN1=		php.1
 PLIST_SUB+=	CLI=""
 .endif
@@ -116,13 +123,13 @@ PLIST_SUB+=	CLI=""
 SAPI_FILE=	"bin/php"
 .endif
 
-ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DBASE DBX DOMXML \
-		DOMXSLT EXIF FILEPRO FRIBIDI FTP GD GDBM GETTEXT GMP HYPERWAVE \
-		ICONV IMAP INTERBASE INIFILE MBSTRING MCAL MCVE MCRYPT MHASH \
-		MIME MING MYSQL NCURSES OPENLDAP OPENSSL ORACLE OVERLOAD PCNTL \
-		PCRE PDFLIB POSIX POSTGRESQL PSPELL READLINE RECODE SESSION \
-		SHMOP SNMP SOCKETS SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER \
-		UNIXODBC WDDX XML XMLRPC XSLT YAZ YP ZIP ZLIB
+ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DBASE DBX DOM EXIF \
+		FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE INIFILE \
+		MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MYSQL NCURSES \
+		OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB POSIX POSTGRESQL \
+		PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOCKETS \
+		SQLITE SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER UNIXODBC \
+		WDDX XML XMLRPC XSL YAZ YP ZLIB
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt}) || defined(WITHOUT_${opt})
@@ -134,8 +141,6 @@ BATCH=		yes
 IS_INTERACTIVE=	yes
 .endif
 
-PBDIR=		${PREFIX}/share/pear/boot
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
@@ -152,11 +157,11 @@ APXS?=		${LOCALBASE}/sbin/apxs
 .if defined(WITH_APACHE2)
 APACHE_PORT?=	${PORTSDIR}/www/apache2
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
-SAPI_FILE=	libexec/apache2/libphp4.so
+SAPI_FILE=	libexec/apache2/libphp5.so
 .else
 APACHE_PORT?=	${PORTSDIR}/www/apache13
 CONFIGURE_ARGS+=--with-apxs=${APXS}
-SAPI_FILE=	libexec/apache/libphp4.so
+SAPI_FILE=	libexec/apache/libphp5.so
 .endif
 
 BUILD_DEPENDS+=	${APXS}:${APACHE_PORT}
@@ -171,16 +176,16 @@ PLIST_SUB+=	SAPI_FILE=${SAPI_FILE} \
 		EXT_DIR=${EXT_DIR}
 
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
-PHP4_OPTFILE?=	${HOME}/php4_options
+PHP5_OPTFILE?=	${HOME}/php5_options
 
-PHP4_OPTIONS?=	CTYPE MYSQL OVERLOAD PCRE POSIX SESSION TOKENIZER XML ZLIB
+PHP5_OPTIONS?=	CTYPE DOM PCRE POSIX SESSION SIMPLEXML SQLITE TOKENIZER XML
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt})
 SEL_OPTIONS+=	${opt}
 .endif
 .endfor
-.for opt in ${PHP4_OPTIONS}
+.for opt in ${PHP5_OPTIONS}
 .if !defined(WITHOUT_${opt})
 SEL_OPTIONS+=	${opt}
 .endif
@@ -188,13 +193,12 @@ SCRIPTS_ENV+=	WITH_${opt}=ON
 .endfor
 
 SCRIPTS_ENV+=	SEL_OPTIONS="${SEL_OPTIONS}" \
-		OPTION_FILE="${PHP4_OPTFILE}" \
+		OPTION_FILE="${PHP5_OPTFILE}" \
 		WRKDIR="${WRKDIR}" \
 		CAT="${CAT}" \
 		SED="${SED}"
 
 .ifmake describe
-WITH_MYSQL=	yes
 WITH_XML=	yes
 .endif
 
@@ -206,24 +210,24 @@ WITH_XML=	yes
 WITH_DBA=	yes
 .endif
 
-.if defined(WITH_DOMXSLT)
-WITH_DOMXML=	yes
+.if defined(WITH_XSL)
+WITH_DOM=	yes
 .endif
 
-.if defined(WITH_XMLRPC) || defined(WITH_XSLT)
+.if defined(WITH_XMLRPC)
 WITH_ICONV_DEP=	yes
 .endif
 
 .if defined(WITH_SNMP)
-WITH_OPENSSL=	yes
+WITH_OPENSSL_DEP=	yes
 .endif
 
-.if defined(WITH_XMLRPC) || defined(WITH_XSLT)
+.if defined(WITH_DOM) || defined(WITH_SIMPLEXML)
 WITH_XML_DEP=	yes
 .endif
 
-.if defined(WITH_WDDX)
-WITH_XML=	yes
+.if defined(WITH_GD) || defined(WITH_MYSQL) || defined(WITH_PDFLIB)
+WITH_ZLIB_DEP=	yes
 .endif
 
 .if defined(WITH_BCMATH)
@@ -275,14 +279,8 @@ CONFIGURE_ARGS+=--enable-dbase
 CONFIGURE_ARGS+=--enable-dbx
 .endif
 
-.if defined(WITH_DOMXML)
-LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
-CONFIGURE_ARGS+=--with-dom=${LOCALBASE}
-.endif
-
-.if defined(WITH_DOMXSLT)
-LIB_DEPENDS+=	xslt.1:${PORTSDIR}/textproc/libxslt
-CONFIGURE_ARGS+=--with-dom-xslt=${LOCALBASE} --with-dom-exslt=${LOCALBASE}
+.if defined(WITH_DOM)
+CONFIGURE_ARGS+=--enable-dom
 .endif
 
 .if defined(WITH_EXIF)
@@ -293,11 +291,6 @@ CONFIGURE_ARGS+=--enable-exif
 CONFIGURE_ARGS+=--enable-filepro
 .endif
 
-.if defined(WITH_FRIBIDI)
-LIB_DEPENDS+=	fribidi.0:${PORTSDIR}/converters/fribidi
-CONFIGURE_ARGS+=--with-fribidi=${LOCALBASE}
-.endif
-
 .if defined(WITH_FTP)
 CONFIGURE_ARGS+=--enable-ftp
 .endif
@@ -336,10 +329,6 @@ LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .endif
 
-.if defined(WITH_HYPERWAVE)
-CONFIGURE_ARGS+=--with-hyperwave
-.endif
-
 .if defined(WITH_ICONV) || defined(WITH_ICONV_DEP)
 LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
 .endif
@@ -376,7 +365,7 @@ CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}/firebird
 .endif
 
 .if defined(WITH_MBSTRING)
-CONFIGURE_ARGS+=--enable-mbstring --enable-mbregex
+CONFIGURE_ARGS+=--enable-mbstring
 .endif
 
 .if defined(WITH_MCAL)
@@ -459,16 +448,12 @@ RUN_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-
 CONFIGURE_ARGS+=--with-oracle=${LOCALBASE}/oracle7
 .endif
 
-.if defined(WITH_OVERLOAD)
-CONFIGURE_ARGS+=--enable-overload
-.endif
-
 .if defined(WITH_PCNTL)
 CONFIGURE_ARGS+=--enable-pcntl
 .endif
 
 .if defined(WITH_PCRE)
-CONFIGURE_ARGS+=--with-pcre-regex=yes
+CONFIGURE_ARGS+=--with-pcre-regex
 .endif
 
 .if defined(WITH_PDFLIB)
@@ -507,19 +492,27 @@ CONFIGURE_ARGS+=--enable-session
 CONFIGURE_ARGS+=--enable-shmop
 .endif
 
+.if defined(WITH_SIMPLEXML)
+CONFIGURE_ARGS+=--enable-simplexml
+.endif
+
 .if defined(WITH_SNMP)
 .if exists(${LOCALBASE}/lib/libsnmp.so.4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
 .else
 LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
 .endif
-CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --enable-ucd-snmp-hack
+CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --with-openssl-dir=${OPENSSLBASE} --enable-ucd-snmp-hack
 .endif
 
 .if defined(WITH_SOCKETS)
 CONFIGURE_ARGS+=--enable-sockets
 .endif
 
+.if defined(WITH_SQLITE)
+CONFIGURE_ARGS+=--with-sqlite
+.endif
+
 .if defined(WITH_SYBASEDB)
 LIB_DEPENDS+=	sybdb.3:${PORTSDIR}/databases/freetds
 CONFIGURE_ARGS+=--with-sybase=${LOCALBASE}
@@ -552,20 +545,22 @@ CONFIGURE_ARGS+=--enable-wddx
 .endif
 
 .if defined(WITH_XML) || defined(WITH_XML_DEP)
-LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
+CONFIGURE_ARGS+=--with-libxml-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_XML)
-CONFIGURE_ARGS+=--enable-xml --with-expat-dir=${LOCALBASE}
+CONFIGURE_ARGS+=--enable-xml
 .endif
 
 .if defined(WITH_XMLRPC)
-CONFIGURE_ARGS+=--with-xmlrpc
+LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2
+CONFIGURE_ARGS+=--with-xmlrpc --with-expat-dir=${LOCALBASE} --with-iconv-dir=${LOCALBASE}
 .endif
 
-.if defined(WITH_XSLT)
-LIB_DEPENDS+=	sablot.70:${PORTSDIR}/textproc/sablotron
-CONFIGURE_ARGS+=--enable-xslt --with-xslt-sablot=${LOCALBASE}
+.if defined(WITH_XSL)
+LIB_DEPENDS+=	xslt.1:${PORTSDIR}/textproc/libxslt
+CONFIGURE_ARGS+=--with-xsl=${LOCALBASE}
 .endif
 
 .if defined(WITH_YAZ)
@@ -577,13 +572,12 @@ CONFIGURE_ARGS+=--with-yaz=${LOCALBASE}/bin
 CONFIGURE_ARGS+=--enable-yp
 .endif
 
-.if defined(WITH_ZIP)
-LIB_DEPENDS+=	zzip-0.10:${PORTSDIR}/devel/zziplib
-CONFIGURE_ARGS+=--with-zip=${LOCALBASE}
+.if defined(WITH_ZLIB) || defined(WITH_ZLIB_DEP)
+CONFIGURE_ARGS+=--with-zlib-dir=/usr
 .endif
 
 .if defined(WITH_ZLIB)
-CONFIGURE_ARGS+=--with-zlib=yes
+CONFIGURE_ARGS+=--with-zlib
 .endif
 
 pre-patch:
@@ -615,13 +609,18 @@ pre-configure:
 	@${ECHO_CMD} "To enable LZW-compressed GIF support in GD define the WITH_LZW knob."
 	@${ECHO_CMD} ""
 .endif
+.if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR) && (!defined(WITH_PCRE) || !defined(WITH_XML))
+	@${ECHO_CMD} "PEAR requires PCRE and XML extensions."
+	@${ECHO_CMD} "Define the WITHOUT_PEAR knob or enable these extensions."
+	@${FALSE}
+.endif
 .if !defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI)
 	@${ECHO_CMD} "You are building the Apache Module and the Command Line Interpreter of PHP."
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Use port:"
-	@${ECHO_CMD} "	lang/php4-cli		for Command Line Interpreter only"
-	@${ECHO_CMD} "	www/php4-cgi		for Common Gateway Interface only"
-	@${ECHO_CMD} "	www/mod_php4		for Apache Module only"
+	@${ECHO_CMD} "	lang/php5-cli		for Command Line Interpreter only"
+	@${ECHO_CMD} "	www/php5-cgi		for Common Gateway Interface only"
+	@${ECHO_CMD} "	www/mod_php5		for Apache Module only"
 	@${ECHO_CMD} ""
 .endif
 
@@ -638,12 +637,13 @@ test: all
 .endif
 
 post-install:
-.if !defined(WITHOUT_CLI)
+.if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR)
 	@${INSTALL_SCRIPT} ${WRKSRC}/pear/scripts/pear ${PREFIX}/bin
 .endif
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
 	@${TOUCH} ${PREFIX}/lib/php/${EXT_DIR}/.php
+	@${TOUCH} ${PREFIX}/include/php/ext/xml/expat/.php
 .if !defined(WITHOUT_APACHE)
 	@${ECHO_CMD} "*****************************************************************************"
 	@${ECHO_CMD} ""
diff --git a/lang/php5/bsd.php.mk b/lang/php5/bsd.php.mk
deleted file mode 100644
index 59f7191d50dd..000000000000
--- a/lang/php5/bsd.php.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-# Just include this makefile after bsd.ports.pre.mk
-#
-# The user/port can now set this options in the makefiles.
-#
-# USE_PHPIZE=yes   - Use to build a php extension.
-# WANT_PHP_CLI=yes - Want the CLI version of PHP.
-# WANT_PHP_CGI=yes - Want the CGI version of PHP.
-# WANT_PHP_MOD=yes - Want the Apache Module for PHP.
-# WANT_PHP_WEB=yes - Want the Apache Module or the CGI version of PHP.
-#
-# You may combine multiple WANT_PHP_* knobs.
-# Don't specify any WANT_PHP_* knob if your port will work with every PHP SAPI.
-#
-
-.if exists(${LOCALBASE}/bin/php) && exists(${LOCALBASE}/bin/pear)
-HAVE_PHP_CLI=	yes
-HAVE_PHP=	yes
-PHP_PORT=	${PORTSDIR}/lang/php4-cli
-.endif
-.if exists(${LOCALBASE}/bin/php) && !exists(${LOCALBASE}/bin/pear)
-HAVE_PHP_CGI=	yes
-HAVE_PHP=	yes
-PHP_PORT=	${PORTSDIR}/www/php4-cgi
-.endif
-.if exists(${LOCALBASE}/libexec/apache/libphp4.so) || exists(${LOCALBASE}/libexec/apache2/libphp4.so)
-HAVE_PHP_MOD=	yes
-HAVE_PHP=	yes
-PHP_PORT=	${PORTSDIR}/www/mod_php4
-.endif
-.if defined(HAVE_PHP_CLI) && defined(HAVE_PHP_MOD)
-PHP_PORT=	${PORTSDIR}/lang/php4
-.endif
-
-.if defined(WANT_PHP_CGI) && (defined(WANT_PHP_CLI) || defined(WANT_PHP_MOD))
-.BEGIN:
-	@${ECHO_CMD} "The CGI version of PHP avoids the installation of other SAPIs."
-	@${ECHO_CMD} "Do not use WANT_PHP_CGI with other WANT_PHP_* knobs."
-	@${FALSE}
-.endif
-
-.if defined(WANT_PHP_CLI) && !defined(WANT_PHP_MOD)
-.if defined(HAVE_PHP) && !defined(HAVE_PHP_CLI)
-.BEGIN:
-	@${ECHO_CMD} "This port requires the CLI version of PHP, but you have already"
-	@${ECHO_CMD} "installed a conflicting PHP port without CLI."
-	@${FALSE}
-.else
-PHP_PORT?=	${PORTSDIR}/lang/php4-cli
-.endif
-.endif
-
-.if defined(WANT_PHP_WEB)
-.if defined(HAVE_PHP) && !defined(HAVE_PHP_CGI) && !defined(HAVE_PHP_MOD)
-.BEGIN:
-        @${ECHO_CMD} "This port requires the Apache Module or the CGI version of PHP, but you have"
-        @${ECHO_CMD} "already installed a conflicting PHP port without them."
-        @${FALSE}
-.else
-PHP_PORT?=	${PORTSDIR}/www/mod_php4
-.endif
-.endif
-
-.if defined(WANT_PHP_CGI)
-.if defined(HAVE_PHP) && !defined(HAVE_PHP_CGI)
-.BEGIN:
-	@${ECHO_CMD} "This port requires the CGI version of PHP, but you have already"
-	@${ECHO_CMD} "installed a conflicting PHP port without CGI."
-	@${FALSE}
-.else
-PHP_PORT?=	${PORTSDIR}/www/php4-cgi
-.endif
-.endif
-
-.if defined(WANT_PHP_MOD) && !defined(WANT_PHP_CLI)
-.if defined(HAVE_PHP) && !defined(HAVE_PHP_MOD)
-.BEGIN:
-	@${ECHO_CMD} "This port requires the Apache Module for PHP, but you have already"
-	@${ECHO_CMD} "installed a conflicting PHP port without the Apache Module."
-	@${FALSE}
-.else
-PHP_PORT?=	${PORTSDIR}/www/mod_php4
-.endif
-.endif
-
-PHP_PORT?=	${PORTSDIR}/lang/php4
-RUN_DEPENDS+=	${LOCALBASE}/include/php/main/php.h:${PHP_PORT}
-
-PHP_EXT_DIR?=	20020429
-PLIST_SUB+=	PHP_EXT_DIR=${PHP_EXT_DIR}
-
-.if defined(USE_PHPIZE)
-BUILD_DEPENDS+=	phpize:${PHP_PORT}
-USE_LIBTOOL=	yes
-WANT_AUTOMAKE_VER=	15
-WANT_AUTOCONF_VER=	253
-CONFIGURE_ARGS+=--with-php-config=${LOCALBASE}/bin/php-config
-
-configure-message: phpize
-
-phpize:
-	@${ECHO_MSG} "===>  PHPizing for ${DISTNAME}"
-	@(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${LOCALBASE}/bin/phpize)
-.endif
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index b364404c5a36..afd0d2a78e2c 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1 +1 @@
-MD5 (php-4.3.3RC1.tar.bz2) = 2b3b4866bedd073d505c554c551fef92
+MD5 (php-5.0.0a1.tar.bz2) = 470fbfdc2ba77a00e0d2e0bacf645103
diff --git a/lang/php5/files/patch-configure b/lang/php5/files/patch-configure
index 9a84d05c3f1c..10b9fafe78b9 100644
--- a/lang/php5/files/patch-configure
+++ b/lang/php5/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Jun 19 00:06:29 2003
-+++ configure	Sat Jun 28 16:45:44 2003
-@@ -597,6 +597,8 @@
+--- configure.orig	Tue Jul 15 00:32:50 2003
++++ configure	Tue Jul 15 01:44:37 2003
+@@ -620,6 +620,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              Include GNU MP support"
-@@ -28224,6 +28226,31 @@
+@@ -29376,6 +29378,31 @@
  
  
  
@@ -41,7 +41,7 @@
  
  
  
-@@ -28248,7 +28275,7 @@
+@@ -29528,7 +29555,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 \
@@ -50,7 +50,7 @@
                   libgd/xbm.c"
  
    for ac_func in fabsf floorf
-@@ -28323,6 +28350,11 @@
+@@ -29603,6 +29630,11 @@
    fi
  
    
@@ -62,7 +62,7 @@
    if test "$PHP_JPEG_DIR" != "no"; then
  
      for i in /usr /usr/local $PHP_JPEG_DIR; do
-@@ -29724,6 +29756,9 @@
+@@ -31314,6 +31346,9 @@
  
    cat >> confdefs.h <<\EOF
  #define HAVE_GD_BUNDLED 1
@@ -72,7 +72,7 @@
  EOF
  
    cat >> confdefs.h <<\EOF
-@@ -29774,6 +29809,14 @@
+@@ -31364,6 +31399,14 @@
      GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
    fi
  
@@ -87,10 +87,10 @@
  else
  
   if test "$PHP_GD" != "no"; then
-@@ -32275,6 +32318,60 @@
-   
-   save_old_LDFLAGS=$LDFLAGS
-   LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD  $LDFLAGS"
+@@ -35713,6 +35756,137 @@
+     esac
+   done
+ 
 +  echo $ac_n "checking for gdImageGifAnimBegin in -lgd""... $ac_c" 1>&6
 +echo "configure:32250: checking for gdImageGifAnimBegin in -lgd" >&5
 +ac_lib_var=`echo gd'_'gdImageGifAnimBegin | sed 'y%./+-%__p_%'`
@@ -126,32 +126,109 @@
 +fi
 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 +  echo "$ac_t""yes" 1>&6
-+  
++
 +    LDFLAGS=$save_old_LDFLAGS
++    ext_shared=$save_ext_shared
 +    cat >> confdefs.h <<\EOF
 +#define HAVE_GD_GIF_ANIM 1
 +EOF
 +
-+  
++
 +else
 +  echo "$ac_t""no" 1>&6
 +
 +    LDFLAGS=$save_old_LDFLAGS
++    ext_shared=$save_ext_shared
 +    unset ac_cv_func_gd
-+    
-+  
++
++
 +fi
 +
-+  
++
 +  save_old_LDFLAGS=$LDFLAGS
-+  LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD  $LDFLAGS"
++  ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
++
++  save_ext_shared=$ext_shared
++  ext_shared=yes
++
++  for ac_i in $ac_stuff; do
++    case $ac_i in
++    -l*)
++      ac_ii=`echo $ac_i|cut -c 3-`
++
++
++  case $ac_ii in
++  c|c_r|pthread*) ;;
++  *)
++    if test "$ext_shared" = "yes"; then
++        LDFLAGS="$LDFLAGS -l$ac_ii"
++    else
++
++
++  case $ac_ii in
++  c|c_r|pthread*) ;;
++  *)
++      LIBS="$LIBS -l$ac_ii"
++   ;;
++  esac
++
++
++    fi
++   ;;
++  esac
++
++
++    ;;
++    -L*)
++      ac_ii=`echo $ac_i|cut -c 3-`
++
++  if test "$ac_ii" != "/usr/lib"; then
++
++  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
++    ai_p=$ac_ii
++  else
++
++    ep_dir="`echo $ac_ii|sed 's%/*[^/][^/]*/*$%%'`"
++
++    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
++    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
++  fi
++
++
++      if test "$ext_shared" = "yes"; then
++        LDFLAGS="$ld_runpath_switch$ai_p -L$ai_p $LDFLAGS"
++      else
++
++
++
++  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
++
++  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
++  if test -n "$unique" && test "`eval $cmd`" = "" ; then
++    eval "LIBPATH$unique=set"
++
++    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
++    LDFLAGS="$LDFLAGS -L$ai_p"
++    PHP_RPATHS="$PHP_RPATHS $ai_p"
++
++  fi
++
++
++      fi
++
++  fi
++
++    ;;
++    esac
++  done
++
    echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
- echo "configure:32280: checking for gdCacheCreate in -lgd" >&5
+ echo "configure:35718: checking for gdCacheCreate in -lgd" >&5
  ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'`
-@@ -54325,8 +54422,8 @@
+@@ -57066,8 +57240,8 @@
    
    echo $ac_n "checking Oracle version""... $ac_c" 1>&6
- echo "configure:54328: checking Oracle version" >&5
+ echo "configure:57069: checking Oracle version" >&5
 -  if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
 -  	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
 +  if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then
@@ -159,7 +236,7 @@
  	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
    elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
      ORACLE_VERSION=9.0
-@@ -56589,6 +56686,102 @@
+@@ -58359,6 +58533,102 @@
  	    
  
    if test "$ext_shared" = "yes"; then
@@ -262,7 +339,7 @@
      ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
      if test -n "$ORACLE_DIR/lib"; then
        
-@@ -71130,29 +71323,6 @@
+@@ -77889,29 +78159,6 @@
    else
      
    
@@ -292,7 +369,7 @@
    case ct in
    c|c_r|pthread*) ;;
    *) 
-@@ -71176,52 +71346,7 @@
+@@ -77935,52 +78182,7 @@
  
      
    
@@ -346,7 +423,7 @@
    
      
    save_old_LDFLAGS=$LDFLAGS
-@@ -71291,37 +71416,6 @@
+@@ -78126,38 +78328,6 @@
  
      
    
@@ -354,6 +431,7 @@
 -  echo "$ac_t""no" 1>&6
 -
 -    LDFLAGS=$save_old_LDFLAGS
+-    ext_shared=$save_ext_shared
 -    unset ac_cv_func_tcl
 -     
 -      
@@ -384,7 +462,7 @@
  fi
  
    
-@@ -84252,10 +84346,7 @@
+@@ -89822,10 +89992,7 @@
  CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
  
  all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
diff --git a/lang/php5/files/patch-ext::gd::gd_ctx.c b/lang/php5/files/patch-ext::gd::gd_ctx.c
index 14ce90f1a83c..fa2e4453fd81 100644
--- a/lang/php5/files/patch-ext::gd::gd_ctx.c
+++ b/lang/php5/files/patch-ext::gd::gd_ctx.c
@@ -1,7 +1,7 @@
---- ext/gd/gd_ctx.c.orig	Wed Mar 12 05:16:31 2003
-+++ ext/gd/gd_ctx.c	Sat Jun 28 15:47:56 2003
-@@ -24,17 +24,22 @@
- 	
+--- 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)()) 
  {
 -	zval **imgind, **file, **quality;
@@ -16,27 +16,34 @@
 +#endif /* HAVE_GD_GIF_ANIM */
  	gdIOCtx *ctx;
  
- 	/* The quality parameter for Wbmp stands for the threshold when called from image2wbmp() */
-+	/* The quality parameter for GIF animation stands for colormap inclusion. 1==include local/global colormap */
-+	/* The LeftOfs parameter for GIF animation begin stands for NETSCAPE2.0 Loop count extension. */
+ 	/* The third (quality) parameter for Wbmp stands for the threshold when called from image2wbmp().
+ 	 * The third (quality) parameter for Wbmp and Xbm stands for the foreground color index when called
+ 	 * from imagey<type>().
++	 * The third (quality) parameter for GIF animation stands for colormap inclusion. 1==include
++	 * 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 > 7 || zend_get_parameters_ex(argc, &imgind, &file, &quality, &lo, &to, &del, &dis) == FAILURE) 
++	if (argc < 1 || argc > 7 || zend_get_parameters_ex(argc, &imgind, &file, &quality, &lo, &to, &del, &dis) == FAILURE)
  	{
  		WRONG_PARAM_COUNT;
  	}
-@@ -44,11 +49,29 @@
+@@ -70,11 +76,29 @@
  	if (argc > 1) {
  		convert_to_string_ex(file);
  		fn = Z_STRVAL_PP(file);
 -		if (argc == 3) {
 -			convert_to_long_ex(quality);
--			q = Z_LVAL_PP(quality);
+-			q = Z_LVAL_PP(quality);/* or colorindex for foreground of BW images (defaults to black) */
 -		}
  	}
 +	if (argc >= 3) {
 +		convert_to_long_ex(quality);
-+		q = Z_LVAL_PP(quality);
++		q = Z_LVAL_PP(quality);/* or colorindex for foreground of BW images (defaults to black) */
 +	}
 +#ifdef HAVE_GD_GIF_ANIM
 +	if (argc >= 4) {
@@ -59,7 +66,7 @@
  
  	if ((argc == 2) || (argc > 2 && Z_STRLEN_PP(file))) {
  		if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC)) {
-@@ -56,7 +79,7 @@
+@@ -82,7 +106,7 @@
  			RETURN_FALSE;
  		}
  
@@ -68,9 +75,9 @@
  		if (!fp) {
  			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open '%s' for writing", fn);
  			RETURN_FALSE;
-@@ -94,6 +117,14 @@
- 			} 
- 			(*func_p)(im, i, ctx);
+@@ -128,6 +152,14 @@
+ 				(*func_p)(im, q, ctx);
+ 			}
  			break;
 +#ifdef HAVE_GD_GIF_ANIM
 +		case PHP_GDIMG_TYPE_GIFANIMBEGIN:
@@ -83,7 +90,7 @@
  		default:
  			(*func_p)(im, ctx);
  			break;
-@@ -112,3 +143,72 @@
+@@ -146,6 +178,75 @@
  	
      RETURN_TRUE;
  }
@@ -156,3 +163,6 @@
 +}
 +/* }}} */
 +#endif /* HAVE_GD_GIF_ANIM */
+ /* }}} */
+ 
+ /*
diff --git a/lang/php5/files/patch-main::main.c b/lang/php5/files/patch-main::main.c
deleted file mode 100644
index 4ed09ae69f5d..000000000000
--- a/lang/php5/files/patch-main::main.c
+++ /dev/null
@@ -1,139 +0,0 @@
---- main/main.c.orig    Sun Jun 22 11:16:39 2003
-+++ main/main.c Sun Jun 22 11:17:00 2003
-
-@@ -134,7 +134,6 @@ static int short_track_vars_names_length
-
- #define NUM_TRACK_VARS		(sizeof(short_track_vars_names_length)/sizeof(int))
-
--
- #define SAFE_FILENAME(f) ((f)?(f):"-")
-
- /* {{{ PHP_INI_MH
-@@ -1362,7 +1361,7 @@ static void php_autoglobal_merge(HashTab
- static int php_hash_environment(TSRMLS_D)
- {
- 	char *p;
--	unsigned char _gpc_flags[3] = {0, 0, 0};
-+	int _gpc_flags[5] = {0, 0, 0, 0, 0};
- 	zend_bool have_variables_order;
- 	zval *dummy_track_vars_array = NULL;
- 	zend_bool initialized_dummy_track_vars_array=0;
-@@ -1409,42 +1408,48 @@ static int php_hash_environment(TSRMLS_D
- 			case 'P':
- 				if (!_gpc_flags[0] && !SG(headers_sent) && SG(request_info).request_method && !strcmp(SG(request_info).request_method, "POST")) {
- 					sapi_module.treat_data(PARSE_POST, NULL, NULL TSRMLS_CC);	/* POST Data */
--					_gpc_flags[0]=1;
-+					_gpc_flags[0]=TRACK_VARS_POST + 1;
- 				}
- 				break;
- 			case 'c':
- 			case 'C':
- 				if (!_gpc_flags[1]) {
- 					sapi_module.treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC);	/* Cookie Data */
--					_gpc_flags[1]=1;
-+					_gpc_flags[1]=TRACK_VARS_COOKIE + 1;
- 				}
- 				break;
- 			case 'g':
- 			case 'G':
- 				if (!_gpc_flags[2]) {
- 					sapi_module.treat_data(PARSE_GET, NULL, NULL TSRMLS_CC);	/* GET Data */
--					_gpc_flags[2]=1;
-+					_gpc_flags[2]=TRACK_VARS_GET + 1;
- 				}
- 				break;
- 			case 'e':
- 			case 'E':
--				if (have_variables_order) {
--					ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]);
--					array_init(PG(http_globals)[TRACK_VARS_ENV]);
--					INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]);
--					php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);
--				} else {
--					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead");
-+				if (!_gpc_flags[3]) {
-+					if (have_variables_order) {
-+						ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]);
-+						array_init(PG(http_globals)[TRACK_VARS_ENV]);
-+						INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]);
-+						php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);
-+					} else {
-+						php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead");
-+					}
-+					_gpc_flags[3]=TRACK_VARS_ENV + 1;
- 				}
- 				break;
- 			case 's':
- 			case 'S':
--				php_register_server_variables(TSRMLS_C);
-+				if (!_gpc_flags[4]) {
-+					php_register_server_variables(TSRMLS_C);
-+					_gpc_flags[4]=TRACK_VARS_SERVER + 1;
-+				}
- 				break;
- 		}
- 	}
-
--	if (!have_variables_order) {
-+	if (!have_variables_order && !PG(http_globals)[TRACK_VARS_SERVER]) {
- 		php_register_server_variables(TSRMLS_C);
- 	}
-
-@@ -1453,6 +1458,14 @@ static int php_hash_environment(TSRMLS_D
- 		php_build_argv(SG(request_info).query_string TSRMLS_CC);
- 	}
-
-+	if (PG(register_globals)) {
-+		for (i = 0; i < 5; i++) {
-+			if (PG(http_globals)[i]) {
-+				php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[i]) TSRMLS_CC);
-+			}
-+		}
-+	}
-+
- 	for (i=0; i<NUM_TRACK_VARS; i++) {
- 		if (!PG(http_globals)[i]) {
- 			if (!initialized_dummy_track_vars_array) {
-@@ -1478,39 +1491,12 @@ static int php_hash_environment(TSRMLS_D
- 		array_init(form_variables);
- 		INIT_PZVAL(form_variables);
-
--		for (p=variables_order; p && *p; p++) {
--			switch (*p) {
--				case 'g':
--				case 'G':
--					php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]) TSRMLS_CC);
--					break;
--				case 'p':
--				case 'P':
--					php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]) TSRMLS_CC);
--					break;
--				case 'c':
--				case 'C':
--					php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) TSRMLS_CC);
--					break;
--			}
--		}
--
--		if (PG(register_globals)) {
--			HashPosition pos;
--			zval **data;
--			char *string_key;
--			uint string_key_len;
--			ulong num_key;
--
--			zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(form_variables), &pos);
--			while (zend_hash_get_current_data_ex(Z_ARRVAL_P(form_variables), (void **)&data, &pos) == SUCCESS) {
--				/* we only register string keys, since we cannot have $1234 */
--				if (zend_hash_get_current_key_ex(Z_ARRVAL_P(form_variables), &string_key, &string_key_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING) {
--					ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), string_key, string_key_len, *data, (*data)->refcount+1, 0);
--				}
--				zend_hash_move_forward_ex(Z_ARRVAL_P(form_variables), &pos);
-+		for (i = 0; i < 3; i++) {
-+			if (_gpc_flags[i]) {
-+				php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[(_gpc_flags[i] - 1)]) TSRMLS_CC);
- 			}
- 		}
-+
- 		zend_hash_update(&EG(symbol_table), "_REQUEST", sizeof("_REQUEST"), &form_variables, sizeof(zval *), NULL);
- 	}
diff --git a/lang/php5/pkg-message b/lang/php5/pkg-message
index f25442446668..6110eb8db84b 100644
--- a/lang/php5/pkg-message
+++ b/lang/php5/pkg-message
@@ -1,12 +1,12 @@
 *****************************************************************************
 
-You have installed the php4 package.
+You have installed the php5 package.
 
-Have a look at the php4 port if you need additional extensions other than
-CTYPE, MYSQL, OVERLOAD, PCRE, POSIX, SESSION, TOKENIZER, XML and ZLIB.
+Have a look at the php5 port if you need additional extensions other than
+CTYPE, DOM, PCRE, POSIX, SESSION, SIMPLEXML, SQLITE, TOKENIZER and XML.
 
 You can find it at
-ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/lang/php4.tar
+ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/lang/php5.tar
 
 Make sure index.php is part of your DirectoryIndex.
 
diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist
index c95c4a6f5dd1..2abeea06a301 100644
--- a/lang/php5/pkg-plist
+++ b/lang/php5/pkg-plist
@@ -1,4 +1,4 @@
-%%CLI%%bin/pear
+%%CLI%%%%PEAR%%bin/pear
 %%CLI%%bin/php
 bin/php-config
 bin/phpextdist
@@ -24,12 +24,13 @@ include/php/Zend/zend_alloc.h
 include/php/Zend/zend_builtin_functions.h
 include/php/Zend/zend_compile.h
 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_execute.h
-include/php/Zend/zend_execute_globals.h
 include/php/Zend/zend_execute_locks.h
 include/php/Zend/zend_extensions.h
 include/php/Zend/zend_fast_cache.h
@@ -46,18 +47,25 @@ include/php/Zend/zend_language_parser.h
 include/php/Zend/zend_language_scanner.h
 include/php/Zend/zend_list.h
 include/php/Zend/zend_llist.h
+include/php/Zend/zend_mm.h
 include/php/Zend/zend_modules.h
-include/php/Zend/zend_multibyte.h
 include/php/Zend/zend_multiply.h
+include/php/Zend/zend_object_handlers.h
+include/php/Zend/zend_objects.h
+include/php/Zend/zend_objects_API.h
 include/php/Zend/zend_operators.h
 include/php/Zend/zend_ptr_stack.h
 include/php/Zend/zend_qsort.h
+include/php/Zend/zend_reflection_api.h
 include/php/Zend/zend_stack.h
 include/php/Zend/zend_static_allocator.h
+include/php/Zend/zend_stream.h
+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/mbstring/cp932_table.h
+include/php/ext/mbstring/mb_gpc.h
 include/php/ext/mbstring/mbfilter.h
 include/php/ext/mbstring/mbfilter_cn.h
 include/php/ext/mbstring/mbfilter_ja.h
@@ -80,7 +88,6 @@ include/php/ext/session/mod_files.h
 include/php/ext/session/mod_mm.h
 include/php/ext/session/mod_user.h
 include/php/ext/session/php_session.h
-include/php/ext/standard/aggregation.h
 include/php/ext/standard/base64.h
 include/php/ext/standard/basic_functions.h
 include/php/ext/standard/crc32.h
@@ -127,28 +134,22 @@ include/php/ext/standard/php_smart_str.h
 include/php/ext/standard/php_smart_str_public.h
 include/php/ext/standard/php_standard.h
 include/php/ext/standard/php_string.h
+include/php/ext/standard/php_sunfuncs.h
 include/php/ext/standard/php_type.h
 include/php/ext/standard/php_var.h
 include/php/ext/standard/php_versioning.h
+include/php/ext/standard/proc_open.h
 include/php/ext/standard/quot_print.h
 include/php/ext/standard/reg.h
 include/php/ext/standard/scanf.h
 include/php/ext/standard/sha1.h
+include/php/ext/standard/streamsfuncs.h
 include/php/ext/standard/uniqid.h
 include/php/ext/standard/url.h
 include/php/ext/standard/url_scanner.h
 include/php/ext/standard/url_scanner_ex.h
-include/php/ext/xml/expat/ascii.h
-include/php/ext/xml/expat/asciitab.h
-include/php/ext/xml/expat/expat.h
-include/php/ext/xml/expat/iasciitab.h
-include/php/ext/xml/expat/latin1tab.h
-include/php/ext/xml/expat/nametab.h
-include/php/ext/xml/expat/utf8tab.h
-include/php/ext/xml/expat/winconfig.h
-include/php/ext/xml/expat/xmlrole.h
-include/php/ext/xml/expat/xmltok.h
-include/php/ext/xml/expat/xmltok_impl.h
+include/php/ext/xml/expat_compat.h
+include/php/ext/xml/expat/.php
 include/php/ext/xml/php_xml.h
 include/php/main/SAPI.h
 include/php/main/build-defs.h
@@ -183,6 +184,13 @@ include/php/main/rfc1867.h
 include/php/main/safe_mode.h
 include/php/main/snprintf.h
 include/php/main/spprintf.h
+include/php/main/streams/php_stream_context.h
+include/php/main/streams/php_stream_filter_api.h
+include/php/main/streams/php_stream_mmap.h
+include/php/main/streams/php_streams_int.h
+include/php/main/streams/php_stream_transport.h
+include/php/main/streams/php_stream_userspace.h
+include/php/main/streams/php_stream_plain_wrapper.h
 include/php/main/win95nt.h
 include/php/regex/cclass.h
 include/php/regex/cname.h
@@ -198,32 +206,34 @@ lib/php/build/phpize.m4
 lib/php/build/scan_makefile_in.awk
 lib/php/build/shtool
 %%SAPI_FILE%%
-%%APACHE%%@exec %D/sbin/apxs -e -a -n php4 %f
-%%APACHE%%@unexec %D/sbin/apxs -e -A -n php4 %f
-%%CLI%%share/pear/bootstrap/Archive/Tar.php
-%%CLI%%share/pear/bootstrap/PEAR.php
-%%CLI%%share/pear/bootstrap/System.php
-%%CLI%%share/pear/bootstrap/Console/Getopt.php
-%%CLI%%share/pear/bootstrap/OS/Guess.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Auth.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Build.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Common.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Config.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Install.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Package.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Registry.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Remote.php
-%%CLI%%share/pear/bootstrap/PEAR/Autoloader.php
-%%CLI%%share/pear/bootstrap/PEAR/Builder.php
-%%CLI%%share/pear/bootstrap/PEAR/Command.php
-%%CLI%%share/pear/bootstrap/PEAR/Common.php
-%%CLI%%share/pear/bootstrap/PEAR/Config.php
-%%CLI%%share/pear/bootstrap/PEAR/Dependency.php
-%%CLI%%share/pear/bootstrap/PEAR/Installer.php
-%%CLI%%share/pear/bootstrap/PEAR/Packager.php
-%%CLI%%share/pear/bootstrap/PEAR/Registry.php
-%%CLI%%share/pear/bootstrap/PEAR/Remote.php
-%%CLI%%share/pear/bootstrap/PEAR/Frontend/CLI.php
+%%APACHE%%@exec %D/sbin/apxs -e -a -n php5 %f
+%%APACHE%%@unexec %D/sbin/apxs -e -A -n php5 %f
+%%CLI%%%%PEAR%%share/pear/bootstrap/Archive/Tar.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/System.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/Console/Getopt.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/OS/Guess.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Autoloader.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Builder.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Auth.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Build.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Common.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Config.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Install.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Mirror.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Package.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Registry.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Remote.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Common.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Config.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Dependency.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/DependencyDB.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
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Remote.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Frontend/CLI.php
 @dirrm include/php/TSRM
 @dirrm include/php/Zend
 @dirrm include/php/ext/mbstring
@@ -233,17 +243,18 @@ lib/php/build/shtool
 @dirrm include/php/ext/xml/expat
 @dirrm include/php/ext/xml
 @dirrm include/php/ext
+@dirrm include/php/main/streams
 @dirrm include/php/main
 @dirrm include/php/regex
 @dirrm include/php/
 @unexec rmdir %D/lib/php/%%EXT_DIR%% 2> /dev/null || true
 @dirrm lib/php/build
 @unexec rmdir %D/lib/php 2> /dev/null || true
-%%CLI%%@dirrm share/pear/bootstrap/Archive
-%%CLI%%@dirrm share/pear/bootstrap/Console
-%%CLI%%@dirrm share/pear/bootstrap/OS
-%%CLI%%@dirrm share/pear/bootstrap/PEAR/Command
-%%CLI%%@dirrm share/pear/bootstrap/PEAR/Frontend
-%%CLI%%@dirrm share/pear/bootstrap/PEAR
-%%CLI%%@dirrm share/pear/bootstrap
-%%CLI%%@unexec rmdir %D/share/pear 2> /dev/null || true
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/Archive
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/Console
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/OS
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR/Command
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR/Frontend
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap
+%%CLI%%%%PEAR%%@unexec rmdir %D/share/pear 2> /dev/null || true
diff --git a/lang/php53/scripts/php4_options b/lang/php5/scripts/php5_options
index 4682abcd60b9..30545182cc24 100644
--- a/lang/php53/scripts/php4_options
+++ b/lang/php5/scripts/php5_options
@@ -7,17 +7,14 @@ WITH_CTYPE=ON
 WITH_CURL=OFF
 WITH_DBASE=OFF
 WITH_DBX=OFF
-WITH_DOMXML=OFF
-WITH_DOMXSLT=OFF
+WITH_DOM=ON
 WITH_EXIF=OFF
 WITH_FILEPRO=OFF
-WITH_FRIBIDI=OFF
 WITH_FTP=OFF
 WITH_GD=OFF
 WITH_GDBM=OFF
 WITH_GETTEXT=OFF
 WITH_GMP=OFF
-WITH_HYPERWAVE=OFF
 WITH_ICONV=OFF
 WITH_IMAP=OFF
 WITH_INIFILE=OFF
@@ -29,12 +26,11 @@ WITH_MCRYPT=OFF
 WITH_MHASH=OFF
 WITH_MIME=OFF
 WITH_MING=OFF
-WITH_MYSQL=ON
+WITH_MYSQL=OFF
 WITH_NCURSES=OFF
 WITH_OPENLDAP=OFF
 WITH_OPENSSL=OFF
 WITH_ORACLE=OFF
-WITH_OVERLOAD=ON
 WITH_PCNTL=OFF
 WITH_PCRE=ON
 WITH_PDFLIB=OFF
@@ -45,8 +41,10 @@ WITH_READLINE=OFF
 WITH_RECODE=OFF
 WITH_SESSION=ON
 WITH_SHMOP=OFF
+WITH_SIMPLEXML=ON
 WITH_SNMP=OFF
 WITH_SOCKETS=OFF
+WITH_SQLITE=ON
 WITH_SYBASEDB=OFF
 WITH_SYBASECT=OFF
 WITH_SYSVSEM=OFF
@@ -56,8 +54,7 @@ WITH_UNIXODBC=OFF
 WITH_WDDX=OFF
 WITH_XML=ON
 WITH_XMLRPC=OFF
-WITH_XSLT=OFF
+WITH_XSL=OFF
 WITH_YAZ=OFF
 WITH_YP=OFF
-WITH_ZIP=OFF
 WITH_ZLIB=ON
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index b3693984520d..9e22c98b447b 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	php4
+# New ports collection makefile for:	php5
 # Date created:				Tue Feb 18 11:17:13 CET 2003
 # Whom:					Alex Dupre <sysadmin@alexdupre.com>
 #
@@ -7,21 +7,21 @@
 # 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, MYSQL, OVERLOAD, PCRE, POSIX,
-# SESSION, TOKENIZER, XML and ZLIB. This behaviour can be changed overriding
-# the PHP4_OPTIONS variable (e.g. PHP4_OPTIONS="EXT1 EXT2 EXT3").
+# By default, the enabled extensions are: CTYPE, DOM, PCRE, POSIX, SESSION,
+# SIMPLEXML, 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).
 #
-# The last way reads an "extension" file, located in ~/php4_options (the
-# location is overridable by the PHP4_OPTFILE variable). You may find an
-# example in scripts/php4_options (interactive mode only).
+# The last way reads an "extension" file, located in ~/php5_options (the
+# location is overridable by the PHP5_OPTFILE variable). You may find an
+# example in scripts/php5_options (interactive mode only).
 #
 
-PORTNAME=	php4
-PORTVERSION=	4.3.3.r1
-PORTREVISION=	1
+PORTNAME=	php5
+PORTVERSION=	5.0.0.a1
+PORTREVISION=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	http://www.php.net/distributions/ \
 		http://it.php.net/distributions/ \
@@ -31,6 +31,7 @@ MASTER_SITES=	http://www.php.net/distributions/ \
 		http://fr.php.net/distributions/ \
 		http://es.php.net/distributions/ \
 		http://se.php.net/distributions/ \
+		http://www.sm.FreeBSD.org/~alex/ \
 		http://downloads.php.net/jani/
 .if defined(WITHOUT_CLI) && !defined(WITHOUT_APACHE)
 PKGNAMEPREFIX=	mod_
@@ -43,7 +44,7 @@ PKGNAMESUFFIX=	-cli
 .endif
 .endif
 .endif
-DISTNAME=	php-${PORTVERSION:S/.r/RC/}
+DISTNAME=	php-${PORTVERSION:S/.a/a/}
 
 MAINTAINER?=	sysadmin@alexdupre.com
 COMMENT=	PHP Scripting Language (Apache Module and CLI)
@@ -68,7 +69,6 @@ USE_LIBTOOL_VER=14
 CONFIGURE_ARGS=	--enable-versioning \
 		--enable-memory-limit \
 		--with-layout=GNU \
-		--with-zlib-dir=/usr \
 		--disable-all
 
 .if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php"
@@ -86,18 +86,19 @@ CONFIGURE_ARGS+=--with-regex=apache
 EXT_DIR=	20020429
 SAPI_FILE=	"@comment "
 
-CONFLICTS=	php4-cli-4* mod_php4-4* php4-cgi-4*
+CONFLICTS=	php5-cli-5* mod_php5-5* php5-cgi-5*
 .if defined(WITHOUT_APACHE)
 .if defined(WITHOUT_CLI)
-CONFLICTS=	php4-4* php4-cli-4* mod_php4-4*
+CONFLICTS=	php5-5* php5-cli-5* mod_php5-5*
 .else
-CONFLICTS=	php4-4* php4-cgi-4* mod_php4-4*
+CONFLICTS=	php5-5* php5-cgi-5* mod_php5-5*
 .endif
 .else
 .if defined(WITHOUT_CLI)
-CONFLICTS=	php4-4* php4-cli-4* php4-cgi-4*
+CONFLICTS=	php5-5* php5-cli-5* php5-cgi-5*
 .endif
 .endif
+CONFLICTS+=	php4-4* php4-cli-4* mod_php4-4* php4-cgi-4*
 
 .if defined(WITHOUT_APACHE)
 CONFIGURE_ARGS+=--enable-discard-path
@@ -109,6 +110,12 @@ PLIST_SUB+=	APACHE=""
 CONFIGURE_ARGS+=--disable-cli
 PLIST_SUB+=	CLI="@comment "
 .else
+.if !defined(WITHOUT_PEAR)
+CONFIGURE_ARGS+=--with-pear
+PLIST_SUB+=	PEAR=""
+.else
+PLIST_SUB+=	PEAR="@comment "
+.endif
 MAN1=		php.1
 PLIST_SUB+=	CLI=""
 .endif
@@ -116,13 +123,13 @@ PLIST_SUB+=	CLI=""
 SAPI_FILE=	"bin/php"
 .endif
 
-ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DBASE DBX DOMXML \
-		DOMXSLT EXIF FILEPRO FRIBIDI FTP GD GDBM GETTEXT GMP HYPERWAVE \
-		ICONV IMAP INTERBASE INIFILE MBSTRING MCAL MCVE MCRYPT MHASH \
-		MIME MING MYSQL NCURSES OPENLDAP OPENSSL ORACLE OVERLOAD PCNTL \
-		PCRE PDFLIB POSIX POSTGRESQL PSPELL READLINE RECODE SESSION \
-		SHMOP SNMP SOCKETS SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER \
-		UNIXODBC WDDX XML XMLRPC XSLT YAZ YP ZIP ZLIB
+ALL_OPTIONS=	BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DBASE DBX DOM EXIF \
+		FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE INIFILE \
+		MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MYSQL NCURSES \
+		OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB POSIX POSTGRESQL \
+		PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOCKETS \
+		SQLITE SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER UNIXODBC \
+		WDDX XML XMLRPC XSL YAZ YP ZLIB
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt}) || defined(WITHOUT_${opt})
@@ -134,8 +141,6 @@ BATCH=		yes
 IS_INTERACTIVE=	yes
 .endif
 
-PBDIR=		${PREFIX}/share/pear/boot
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6)
@@ -152,11 +157,11 @@ APXS?=		${LOCALBASE}/sbin/apxs
 .if defined(WITH_APACHE2)
 APACHE_PORT?=	${PORTSDIR}/www/apache2
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
-SAPI_FILE=	libexec/apache2/libphp4.so
+SAPI_FILE=	libexec/apache2/libphp5.so
 .else
 APACHE_PORT?=	${PORTSDIR}/www/apache13
 CONFIGURE_ARGS+=--with-apxs=${APXS}
-SAPI_FILE=	libexec/apache/libphp4.so
+SAPI_FILE=	libexec/apache/libphp5.so
 .endif
 
 BUILD_DEPENDS+=	${APXS}:${APACHE_PORT}
@@ -171,16 +176,16 @@ PLIST_SUB+=	SAPI_FILE=${SAPI_FILE} \
 		EXT_DIR=${EXT_DIR}
 
 WRKDIR?=	${WRKDIRPREFIX}${.CURDIR}/work
-PHP4_OPTFILE?=	${HOME}/php4_options
+PHP5_OPTFILE?=	${HOME}/php5_options
 
-PHP4_OPTIONS?=	CTYPE MYSQL OVERLOAD PCRE POSIX SESSION TOKENIZER XML ZLIB
+PHP5_OPTIONS?=	CTYPE DOM PCRE POSIX SESSION SIMPLEXML SQLITE TOKENIZER XML
 
 .for opt in ${ALL_OPTIONS}
 .if defined(WITH_${opt})
 SEL_OPTIONS+=	${opt}
 .endif
 .endfor
-.for opt in ${PHP4_OPTIONS}
+.for opt in ${PHP5_OPTIONS}
 .if !defined(WITHOUT_${opt})
 SEL_OPTIONS+=	${opt}
 .endif
@@ -188,13 +193,12 @@ SCRIPTS_ENV+=	WITH_${opt}=ON
 .endfor
 
 SCRIPTS_ENV+=	SEL_OPTIONS="${SEL_OPTIONS}" \
-		OPTION_FILE="${PHP4_OPTFILE}" \
+		OPTION_FILE="${PHP5_OPTFILE}" \
 		WRKDIR="${WRKDIR}" \
 		CAT="${CAT}" \
 		SED="${SED}"
 
 .ifmake describe
-WITH_MYSQL=	yes
 WITH_XML=	yes
 .endif
 
@@ -206,24 +210,24 @@ WITH_XML=	yes
 WITH_DBA=	yes
 .endif
 
-.if defined(WITH_DOMXSLT)
-WITH_DOMXML=	yes
+.if defined(WITH_XSL)
+WITH_DOM=	yes
 .endif
 
-.if defined(WITH_XMLRPC) || defined(WITH_XSLT)
+.if defined(WITH_XMLRPC)
 WITH_ICONV_DEP=	yes
 .endif
 
 .if defined(WITH_SNMP)
-WITH_OPENSSL=	yes
+WITH_OPENSSL_DEP=	yes
 .endif
 
-.if defined(WITH_XMLRPC) || defined(WITH_XSLT)
+.if defined(WITH_DOM) || defined(WITH_SIMPLEXML)
 WITH_XML_DEP=	yes
 .endif
 
-.if defined(WITH_WDDX)
-WITH_XML=	yes
+.if defined(WITH_GD) || defined(WITH_MYSQL) || defined(WITH_PDFLIB)
+WITH_ZLIB_DEP=	yes
 .endif
 
 .if defined(WITH_BCMATH)
@@ -275,14 +279,8 @@ CONFIGURE_ARGS+=--enable-dbase
 CONFIGURE_ARGS+=--enable-dbx
 .endif
 
-.if defined(WITH_DOMXML)
-LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
-CONFIGURE_ARGS+=--with-dom=${LOCALBASE}
-.endif
-
-.if defined(WITH_DOMXSLT)
-LIB_DEPENDS+=	xslt.1:${PORTSDIR}/textproc/libxslt
-CONFIGURE_ARGS+=--with-dom-xslt=${LOCALBASE} --with-dom-exslt=${LOCALBASE}
+.if defined(WITH_DOM)
+CONFIGURE_ARGS+=--enable-dom
 .endif
 
 .if defined(WITH_EXIF)
@@ -293,11 +291,6 @@ CONFIGURE_ARGS+=--enable-exif
 CONFIGURE_ARGS+=--enable-filepro
 .endif
 
-.if defined(WITH_FRIBIDI)
-LIB_DEPENDS+=	fribidi.0:${PORTSDIR}/converters/fribidi
-CONFIGURE_ARGS+=--with-fribidi=${LOCALBASE}
-.endif
-
 .if defined(WITH_FTP)
 CONFIGURE_ARGS+=--enable-ftp
 .endif
@@ -336,10 +329,6 @@ LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .endif
 
-.if defined(WITH_HYPERWAVE)
-CONFIGURE_ARGS+=--with-hyperwave
-.endif
-
 .if defined(WITH_ICONV) || defined(WITH_ICONV_DEP)
 LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
 .endif
@@ -376,7 +365,7 @@ CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}/firebird
 .endif
 
 .if defined(WITH_MBSTRING)
-CONFIGURE_ARGS+=--enable-mbstring --enable-mbregex
+CONFIGURE_ARGS+=--enable-mbstring
 .endif
 
 .if defined(WITH_MCAL)
@@ -459,16 +448,12 @@ RUN_DEPENDS+=	${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-
 CONFIGURE_ARGS+=--with-oracle=${LOCALBASE}/oracle7
 .endif
 
-.if defined(WITH_OVERLOAD)
-CONFIGURE_ARGS+=--enable-overload
-.endif
-
 .if defined(WITH_PCNTL)
 CONFIGURE_ARGS+=--enable-pcntl
 .endif
 
 .if defined(WITH_PCRE)
-CONFIGURE_ARGS+=--with-pcre-regex=yes
+CONFIGURE_ARGS+=--with-pcre-regex
 .endif
 
 .if defined(WITH_PDFLIB)
@@ -507,19 +492,27 @@ CONFIGURE_ARGS+=--enable-session
 CONFIGURE_ARGS+=--enable-shmop
 .endif
 
+.if defined(WITH_SIMPLEXML)
+CONFIGURE_ARGS+=--enable-simplexml
+.endif
+
 .if defined(WITH_SNMP)
 .if exists(${LOCALBASE}/lib/libsnmp.so.4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
 .else
 LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
 .endif
-CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --enable-ucd-snmp-hack
+CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --with-openssl-dir=${OPENSSLBASE} --enable-ucd-snmp-hack
 .endif
 
 .if defined(WITH_SOCKETS)
 CONFIGURE_ARGS+=--enable-sockets
 .endif
 
+.if defined(WITH_SQLITE)
+CONFIGURE_ARGS+=--with-sqlite
+.endif
+
 .if defined(WITH_SYBASEDB)
 LIB_DEPENDS+=	sybdb.3:${PORTSDIR}/databases/freetds
 CONFIGURE_ARGS+=--with-sybase=${LOCALBASE}
@@ -552,20 +545,22 @@ CONFIGURE_ARGS+=--enable-wddx
 .endif
 
 .if defined(WITH_XML) || defined(WITH_XML_DEP)
-LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
+CONFIGURE_ARGS+=--with-libxml-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_XML)
-CONFIGURE_ARGS+=--enable-xml --with-expat-dir=${LOCALBASE}
+CONFIGURE_ARGS+=--enable-xml
 .endif
 
 .if defined(WITH_XMLRPC)
-CONFIGURE_ARGS+=--with-xmlrpc
+LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2
+CONFIGURE_ARGS+=--with-xmlrpc --with-expat-dir=${LOCALBASE} --with-iconv-dir=${LOCALBASE}
 .endif
 
-.if defined(WITH_XSLT)
-LIB_DEPENDS+=	sablot.70:${PORTSDIR}/textproc/sablotron
-CONFIGURE_ARGS+=--enable-xslt --with-xslt-sablot=${LOCALBASE}
+.if defined(WITH_XSL)
+LIB_DEPENDS+=	xslt.1:${PORTSDIR}/textproc/libxslt
+CONFIGURE_ARGS+=--with-xsl=${LOCALBASE}
 .endif
 
 .if defined(WITH_YAZ)
@@ -577,13 +572,12 @@ CONFIGURE_ARGS+=--with-yaz=${LOCALBASE}/bin
 CONFIGURE_ARGS+=--enable-yp
 .endif
 
-.if defined(WITH_ZIP)
-LIB_DEPENDS+=	zzip-0.10:${PORTSDIR}/devel/zziplib
-CONFIGURE_ARGS+=--with-zip=${LOCALBASE}
+.if defined(WITH_ZLIB) || defined(WITH_ZLIB_DEP)
+CONFIGURE_ARGS+=--with-zlib-dir=/usr
 .endif
 
 .if defined(WITH_ZLIB)
-CONFIGURE_ARGS+=--with-zlib=yes
+CONFIGURE_ARGS+=--with-zlib
 .endif
 
 pre-patch:
@@ -615,13 +609,18 @@ pre-configure:
 	@${ECHO_CMD} "To enable LZW-compressed GIF support in GD define the WITH_LZW knob."
 	@${ECHO_CMD} ""
 .endif
+.if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR) && (!defined(WITH_PCRE) || !defined(WITH_XML))
+	@${ECHO_CMD} "PEAR requires PCRE and XML extensions."
+	@${ECHO_CMD} "Define the WITHOUT_PEAR knob or enable these extensions."
+	@${FALSE}
+.endif
 .if !defined(WITHOUT_APACHE) && !defined(WITHOUT_CLI)
 	@${ECHO_CMD} "You are building the Apache Module and the Command Line Interpreter of PHP."
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "Use port:"
-	@${ECHO_CMD} "	lang/php4-cli		for Command Line Interpreter only"
-	@${ECHO_CMD} "	www/php4-cgi		for Common Gateway Interface only"
-	@${ECHO_CMD} "	www/mod_php4		for Apache Module only"
+	@${ECHO_CMD} "	lang/php5-cli		for Command Line Interpreter only"
+	@${ECHO_CMD} "	www/php5-cgi		for Common Gateway Interface only"
+	@${ECHO_CMD} "	www/mod_php5		for Apache Module only"
 	@${ECHO_CMD} ""
 .endif
 
@@ -638,12 +637,13 @@ test: all
 .endif
 
 post-install:
-.if !defined(WITHOUT_CLI)
+.if !defined(WITHOUT_CLI) && !defined(WITHOUT_PEAR)
 	@${INSTALL_SCRIPT} ${WRKSRC}/pear/scripts/pear ${PREFIX}/bin
 .endif
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
 	@${TOUCH} ${PREFIX}/lib/php/${EXT_DIR}/.php
+	@${TOUCH} ${PREFIX}/include/php/ext/xml/expat/.php
 .if !defined(WITHOUT_APACHE)
 	@${ECHO_CMD} "*****************************************************************************"
 	@${ECHO_CMD} ""
diff --git a/lang/php53/bsd.php.mk b/lang/php53/bsd.php.mk
deleted file mode 100644
index 59f7191d50dd..000000000000
--- a/lang/php53/bsd.php.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-# Just include this makefile after bsd.ports.pre.mk
-#
-# The user/port can now set this options in the makefiles.
-#
-# USE_PHPIZE=yes   - Use to build a php extension.
-# WANT_PHP_CLI=yes - Want the CLI version of PHP.
-# WANT_PHP_CGI=yes - Want the CGI version of PHP.
-# WANT_PHP_MOD=yes - Want the Apache Module for PHP.
-# WANT_PHP_WEB=yes - Want the Apache Module or the CGI version of PHP.
-#
-# You may combine multiple WANT_PHP_* knobs.
-# Don't specify any WANT_PHP_* knob if your port will work with every PHP SAPI.
-#
-
-.if exists(${LOCALBASE}/bin/php) && exists(${LOCALBASE}/bin/pear)
-HAVE_PHP_CLI=	yes
-HAVE_PHP=	yes
-PHP_PORT=	${PORTSDIR}/lang/php4-cli
-.endif
-.if exists(${LOCALBASE}/bin/php) && !exists(${LOCALBASE}/bin/pear)
-HAVE_PHP_CGI=	yes
-HAVE_PHP=	yes
-PHP_PORT=	${PORTSDIR}/www/php4-cgi
-.endif
-.if exists(${LOCALBASE}/libexec/apache/libphp4.so) || exists(${LOCALBASE}/libexec/apache2/libphp4.so)
-HAVE_PHP_MOD=	yes
-HAVE_PHP=	yes
-PHP_PORT=	${PORTSDIR}/www/mod_php4
-.endif
-.if defined(HAVE_PHP_CLI) && defined(HAVE_PHP_MOD)
-PHP_PORT=	${PORTSDIR}/lang/php4
-.endif
-
-.if defined(WANT_PHP_CGI) && (defined(WANT_PHP_CLI) || defined(WANT_PHP_MOD))
-.BEGIN:
-	@${ECHO_CMD} "The CGI version of PHP avoids the installation of other SAPIs."
-	@${ECHO_CMD} "Do not use WANT_PHP_CGI with other WANT_PHP_* knobs."
-	@${FALSE}
-.endif
-
-.if defined(WANT_PHP_CLI) && !defined(WANT_PHP_MOD)
-.if defined(HAVE_PHP) && !defined(HAVE_PHP_CLI)
-.BEGIN:
-	@${ECHO_CMD} "This port requires the CLI version of PHP, but you have already"
-	@${ECHO_CMD} "installed a conflicting PHP port without CLI."
-	@${FALSE}
-.else
-PHP_PORT?=	${PORTSDIR}/lang/php4-cli
-.endif
-.endif
-
-.if defined(WANT_PHP_WEB)
-.if defined(HAVE_PHP) && !defined(HAVE_PHP_CGI) && !defined(HAVE_PHP_MOD)
-.BEGIN:
-        @${ECHO_CMD} "This port requires the Apache Module or the CGI version of PHP, but you have"
-        @${ECHO_CMD} "already installed a conflicting PHP port without them."
-        @${FALSE}
-.else
-PHP_PORT?=	${PORTSDIR}/www/mod_php4
-.endif
-.endif
-
-.if defined(WANT_PHP_CGI)
-.if defined(HAVE_PHP) && !defined(HAVE_PHP_CGI)
-.BEGIN:
-	@${ECHO_CMD} "This port requires the CGI version of PHP, but you have already"
-	@${ECHO_CMD} "installed a conflicting PHP port without CGI."
-	@${FALSE}
-.else
-PHP_PORT?=	${PORTSDIR}/www/php4-cgi
-.endif
-.endif
-
-.if defined(WANT_PHP_MOD) && !defined(WANT_PHP_CLI)
-.if defined(HAVE_PHP) && !defined(HAVE_PHP_MOD)
-.BEGIN:
-	@${ECHO_CMD} "This port requires the Apache Module for PHP, but you have already"
-	@${ECHO_CMD} "installed a conflicting PHP port without the Apache Module."
-	@${FALSE}
-.else
-PHP_PORT?=	${PORTSDIR}/www/mod_php4
-.endif
-.endif
-
-PHP_PORT?=	${PORTSDIR}/lang/php4
-RUN_DEPENDS+=	${LOCALBASE}/include/php/main/php.h:${PHP_PORT}
-
-PHP_EXT_DIR?=	20020429
-PLIST_SUB+=	PHP_EXT_DIR=${PHP_EXT_DIR}
-
-.if defined(USE_PHPIZE)
-BUILD_DEPENDS+=	phpize:${PHP_PORT}
-USE_LIBTOOL=	yes
-WANT_AUTOMAKE_VER=	15
-WANT_AUTOCONF_VER=	253
-CONFIGURE_ARGS+=--with-php-config=${LOCALBASE}/bin/php-config
-
-configure-message: phpize
-
-phpize:
-	@${ECHO_MSG} "===>  PHPizing for ${DISTNAME}"
-	@(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${LOCALBASE}/bin/phpize)
-.endif
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index b364404c5a36..afd0d2a78e2c 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1 +1 @@
-MD5 (php-4.3.3RC1.tar.bz2) = 2b3b4866bedd073d505c554c551fef92
+MD5 (php-5.0.0a1.tar.bz2) = 470fbfdc2ba77a00e0d2e0bacf645103
diff --git a/lang/php53/files/patch-configure b/lang/php53/files/patch-configure
index 9a84d05c3f1c..10b9fafe78b9 100644
--- a/lang/php53/files/patch-configure
+++ b/lang/php53/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Jun 19 00:06:29 2003
-+++ configure	Sat Jun 28 16:45:44 2003
-@@ -597,6 +597,8 @@
+--- configure.orig	Tue Jul 15 00:32:50 2003
++++ configure	Tue Jul 15 01:44:37 2003
+@@ -620,6 +620,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              Include GNU MP support"
-@@ -28224,6 +28226,31 @@
+@@ -29376,6 +29378,31 @@
  
  
  
@@ -41,7 +41,7 @@
  
  
  
-@@ -28248,7 +28275,7 @@
+@@ -29528,7 +29555,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 \
@@ -50,7 +50,7 @@
                   libgd/xbm.c"
  
    for ac_func in fabsf floorf
-@@ -28323,6 +28350,11 @@
+@@ -29603,6 +29630,11 @@
    fi
  
    
@@ -62,7 +62,7 @@
    if test "$PHP_JPEG_DIR" != "no"; then
  
      for i in /usr /usr/local $PHP_JPEG_DIR; do
-@@ -29724,6 +29756,9 @@
+@@ -31314,6 +31346,9 @@
  
    cat >> confdefs.h <<\EOF
  #define HAVE_GD_BUNDLED 1
@@ -72,7 +72,7 @@
  EOF
  
    cat >> confdefs.h <<\EOF
-@@ -29774,6 +29809,14 @@
+@@ -31364,6 +31399,14 @@
      GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
    fi
  
@@ -87,10 +87,10 @@
  else
  
   if test "$PHP_GD" != "no"; then
-@@ -32275,6 +32318,60 @@
-   
-   save_old_LDFLAGS=$LDFLAGS
-   LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD  $LDFLAGS"
+@@ -35713,6 +35756,137 @@
+     esac
+   done
+ 
 +  echo $ac_n "checking for gdImageGifAnimBegin in -lgd""... $ac_c" 1>&6
 +echo "configure:32250: checking for gdImageGifAnimBegin in -lgd" >&5
 +ac_lib_var=`echo gd'_'gdImageGifAnimBegin | sed 'y%./+-%__p_%'`
@@ -126,32 +126,109 @@
 +fi
 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 +  echo "$ac_t""yes" 1>&6
-+  
++
 +    LDFLAGS=$save_old_LDFLAGS
++    ext_shared=$save_ext_shared
 +    cat >> confdefs.h <<\EOF
 +#define HAVE_GD_GIF_ANIM 1
 +EOF
 +
-+  
++
 +else
 +  echo "$ac_t""no" 1>&6
 +
 +    LDFLAGS=$save_old_LDFLAGS
++    ext_shared=$save_ext_shared
 +    unset ac_cv_func_gd
-+    
-+  
++
++
 +fi
 +
-+  
++
 +  save_old_LDFLAGS=$LDFLAGS
-+  LDFLAGS=" -L$GD_LIB $GD_SHARED_LIBADD  $LDFLAGS"
++  ac_stuff=" -L$GD_LIB $GD_SHARED_LIBADD "
++
++  save_ext_shared=$ext_shared
++  ext_shared=yes
++
++  for ac_i in $ac_stuff; do
++    case $ac_i in
++    -l*)
++      ac_ii=`echo $ac_i|cut -c 3-`
++
++
++  case $ac_ii in
++  c|c_r|pthread*) ;;
++  *)
++    if test "$ext_shared" = "yes"; then
++        LDFLAGS="$LDFLAGS -l$ac_ii"
++    else
++
++
++  case $ac_ii in
++  c|c_r|pthread*) ;;
++  *)
++      LIBS="$LIBS -l$ac_ii"
++   ;;
++  esac
++
++
++    fi
++   ;;
++  esac
++
++
++    ;;
++    -L*)
++      ac_ii=`echo $ac_i|cut -c 3-`
++
++  if test "$ac_ii" != "/usr/lib"; then
++
++  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
++    ai_p=$ac_ii
++  else
++
++    ep_dir="`echo $ac_ii|sed 's%/*[^/][^/]*/*$%%'`"
++
++    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
++    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
++  fi
++
++
++      if test "$ext_shared" = "yes"; then
++        LDFLAGS="$ld_runpath_switch$ai_p -L$ai_p $LDFLAGS"
++      else
++
++
++
++  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
++
++  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
++  if test -n "$unique" && test "`eval $cmd`" = "" ; then
++    eval "LIBPATH$unique=set"
++
++    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
++    LDFLAGS="$LDFLAGS -L$ai_p"
++    PHP_RPATHS="$PHP_RPATHS $ai_p"
++
++  fi
++
++
++      fi
++
++  fi
++
++    ;;
++    esac
++  done
++
    echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
- echo "configure:32280: checking for gdCacheCreate in -lgd" >&5
+ echo "configure:35718: checking for gdCacheCreate in -lgd" >&5
  ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'`
-@@ -54325,8 +54422,8 @@
+@@ -57066,8 +57240,8 @@
    
    echo $ac_n "checking Oracle version""... $ac_c" 1>&6
- echo "configure:54328: checking Oracle version" >&5
+ echo "configure:57069: checking Oracle version" >&5
 -  if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
 -  	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
 +  if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then
@@ -159,7 +236,7 @@
  	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
    elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
      ORACLE_VERSION=9.0
-@@ -56589,6 +56686,102 @@
+@@ -58359,6 +58533,102 @@
  	    
  
    if test "$ext_shared" = "yes"; then
@@ -262,7 +339,7 @@
      ORACLE_SHARED_LIBADD="-lnlsrtl3 $ORACLE_SHARED_LIBADD"
      if test -n "$ORACLE_DIR/lib"; then
        
-@@ -71130,29 +71323,6 @@
+@@ -77889,29 +78159,6 @@
    else
      
    
@@ -292,7 +369,7 @@
    case ct in
    c|c_r|pthread*) ;;
    *) 
-@@ -71176,52 +71346,7 @@
+@@ -77935,52 +78182,7 @@
  
      
    
@@ -346,7 +423,7 @@
    
      
    save_old_LDFLAGS=$LDFLAGS
-@@ -71291,37 +71416,6 @@
+@@ -78126,38 +78328,6 @@
  
      
    
@@ -354,6 +431,7 @@
 -  echo "$ac_t""no" 1>&6
 -
 -    LDFLAGS=$save_old_LDFLAGS
+-    ext_shared=$save_ext_shared
 -    unset ac_cv_func_tcl
 -     
 -      
@@ -384,7 +462,7 @@
  fi
  
    
-@@ -84252,10 +84346,7 @@
+@@ -89822,10 +89992,7 @@
  CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
  
  all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
diff --git a/lang/php53/files/patch-ext::gd::gd_ctx.c b/lang/php53/files/patch-ext::gd::gd_ctx.c
index 14ce90f1a83c..fa2e4453fd81 100644
--- a/lang/php53/files/patch-ext::gd::gd_ctx.c
+++ b/lang/php53/files/patch-ext::gd::gd_ctx.c
@@ -1,7 +1,7 @@
---- ext/gd/gd_ctx.c.orig	Wed Mar 12 05:16:31 2003
-+++ ext/gd/gd_ctx.c	Sat Jun 28 15:47:56 2003
-@@ -24,17 +24,22 @@
- 	
+--- 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)()) 
  {
 -	zval **imgind, **file, **quality;
@@ -16,27 +16,34 @@
 +#endif /* HAVE_GD_GIF_ANIM */
  	gdIOCtx *ctx;
  
- 	/* The quality parameter for Wbmp stands for the threshold when called from image2wbmp() */
-+	/* The quality parameter for GIF animation stands for colormap inclusion. 1==include local/global colormap */
-+	/* The LeftOfs parameter for GIF animation begin stands for NETSCAPE2.0 Loop count extension. */
+ 	/* The third (quality) parameter for Wbmp stands for the threshold when called from image2wbmp().
+ 	 * The third (quality) parameter for Wbmp and Xbm stands for the foreground color index when called
+ 	 * from imagey<type>().
++	 * The third (quality) parameter for GIF animation stands for colormap inclusion. 1==include
++	 * 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 > 7 || zend_get_parameters_ex(argc, &imgind, &file, &quality, &lo, &to, &del, &dis) == FAILURE) 
++	if (argc < 1 || argc > 7 || zend_get_parameters_ex(argc, &imgind, &file, &quality, &lo, &to, &del, &dis) == FAILURE)
  	{
  		WRONG_PARAM_COUNT;
  	}
-@@ -44,11 +49,29 @@
+@@ -70,11 +76,29 @@
  	if (argc > 1) {
  		convert_to_string_ex(file);
  		fn = Z_STRVAL_PP(file);
 -		if (argc == 3) {
 -			convert_to_long_ex(quality);
--			q = Z_LVAL_PP(quality);
+-			q = Z_LVAL_PP(quality);/* or colorindex for foreground of BW images (defaults to black) */
 -		}
  	}
 +	if (argc >= 3) {
 +		convert_to_long_ex(quality);
-+		q = Z_LVAL_PP(quality);
++		q = Z_LVAL_PP(quality);/* or colorindex for foreground of BW images (defaults to black) */
 +	}
 +#ifdef HAVE_GD_GIF_ANIM
 +	if (argc >= 4) {
@@ -59,7 +66,7 @@
  
  	if ((argc == 2) || (argc > 2 && Z_STRLEN_PP(file))) {
  		if (!fn || fn == empty_string || php_check_open_basedir(fn TSRMLS_CC)) {
-@@ -56,7 +79,7 @@
+@@ -82,7 +106,7 @@
  			RETURN_FALSE;
  		}
  
@@ -68,9 +75,9 @@
  		if (!fp) {
  			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to open '%s' for writing", fn);
  			RETURN_FALSE;
-@@ -94,6 +117,14 @@
- 			} 
- 			(*func_p)(im, i, ctx);
+@@ -128,6 +152,14 @@
+ 				(*func_p)(im, q, ctx);
+ 			}
  			break;
 +#ifdef HAVE_GD_GIF_ANIM
 +		case PHP_GDIMG_TYPE_GIFANIMBEGIN:
@@ -83,7 +90,7 @@
  		default:
  			(*func_p)(im, ctx);
  			break;
-@@ -112,3 +143,72 @@
+@@ -146,6 +178,75 @@
  	
      RETURN_TRUE;
  }
@@ -156,3 +163,6 @@
 +}
 +/* }}} */
 +#endif /* HAVE_GD_GIF_ANIM */
+ /* }}} */
+ 
+ /*
diff --git a/lang/php53/files/patch-main::main.c b/lang/php53/files/patch-main::main.c
deleted file mode 100644
index 4ed09ae69f5d..000000000000
--- a/lang/php53/files/patch-main::main.c
+++ /dev/null
@@ -1,139 +0,0 @@
---- main/main.c.orig    Sun Jun 22 11:16:39 2003
-+++ main/main.c Sun Jun 22 11:17:00 2003
-
-@@ -134,7 +134,6 @@ static int short_track_vars_names_length
-
- #define NUM_TRACK_VARS		(sizeof(short_track_vars_names_length)/sizeof(int))
-
--
- #define SAFE_FILENAME(f) ((f)?(f):"-")
-
- /* {{{ PHP_INI_MH
-@@ -1362,7 +1361,7 @@ static void php_autoglobal_merge(HashTab
- static int php_hash_environment(TSRMLS_D)
- {
- 	char *p;
--	unsigned char _gpc_flags[3] = {0, 0, 0};
-+	int _gpc_flags[5] = {0, 0, 0, 0, 0};
- 	zend_bool have_variables_order;
- 	zval *dummy_track_vars_array = NULL;
- 	zend_bool initialized_dummy_track_vars_array=0;
-@@ -1409,42 +1408,48 @@ static int php_hash_environment(TSRMLS_D
- 			case 'P':
- 				if (!_gpc_flags[0] && !SG(headers_sent) && SG(request_info).request_method && !strcmp(SG(request_info).request_method, "POST")) {
- 					sapi_module.treat_data(PARSE_POST, NULL, NULL TSRMLS_CC);	/* POST Data */
--					_gpc_flags[0]=1;
-+					_gpc_flags[0]=TRACK_VARS_POST + 1;
- 				}
- 				break;
- 			case 'c':
- 			case 'C':
- 				if (!_gpc_flags[1]) {
- 					sapi_module.treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC);	/* Cookie Data */
--					_gpc_flags[1]=1;
-+					_gpc_flags[1]=TRACK_VARS_COOKIE + 1;
- 				}
- 				break;
- 			case 'g':
- 			case 'G':
- 				if (!_gpc_flags[2]) {
- 					sapi_module.treat_data(PARSE_GET, NULL, NULL TSRMLS_CC);	/* GET Data */
--					_gpc_flags[2]=1;
-+					_gpc_flags[2]=TRACK_VARS_GET + 1;
- 				}
- 				break;
- 			case 'e':
- 			case 'E':
--				if (have_variables_order) {
--					ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]);
--					array_init(PG(http_globals)[TRACK_VARS_ENV]);
--					INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]);
--					php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);
--				} else {
--					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead");
-+				if (!_gpc_flags[3]) {
-+					if (have_variables_order) {
-+						ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]);
-+						array_init(PG(http_globals)[TRACK_VARS_ENV]);
-+						INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]);
-+						php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);
-+					} else {
-+						php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead");
-+					}
-+					_gpc_flags[3]=TRACK_VARS_ENV + 1;
- 				}
- 				break;
- 			case 's':
- 			case 'S':
--				php_register_server_variables(TSRMLS_C);
-+				if (!_gpc_flags[4]) {
-+					php_register_server_variables(TSRMLS_C);
-+					_gpc_flags[4]=TRACK_VARS_SERVER + 1;
-+				}
- 				break;
- 		}
- 	}
-
--	if (!have_variables_order) {
-+	if (!have_variables_order && !PG(http_globals)[TRACK_VARS_SERVER]) {
- 		php_register_server_variables(TSRMLS_C);
- 	}
-
-@@ -1453,6 +1458,14 @@ static int php_hash_environment(TSRMLS_D
- 		php_build_argv(SG(request_info).query_string TSRMLS_CC);
- 	}
-
-+	if (PG(register_globals)) {
-+		for (i = 0; i < 5; i++) {
-+			if (PG(http_globals)[i]) {
-+				php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[i]) TSRMLS_CC);
-+			}
-+		}
-+	}
-+
- 	for (i=0; i<NUM_TRACK_VARS; i++) {
- 		if (!PG(http_globals)[i]) {
- 			if (!initialized_dummy_track_vars_array) {
-@@ -1478,39 +1491,12 @@ static int php_hash_environment(TSRMLS_D
- 		array_init(form_variables);
- 		INIT_PZVAL(form_variables);
-
--		for (p=variables_order; p && *p; p++) {
--			switch (*p) {
--				case 'g':
--				case 'G':
--					php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]) TSRMLS_CC);
--					break;
--				case 'p':
--				case 'P':
--					php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]) TSRMLS_CC);
--					break;
--				case 'c':
--				case 'C':
--					php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) TSRMLS_CC);
--					break;
--			}
--		}
--
--		if (PG(register_globals)) {
--			HashPosition pos;
--			zval **data;
--			char *string_key;
--			uint string_key_len;
--			ulong num_key;
--
--			zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(form_variables), &pos);
--			while (zend_hash_get_current_data_ex(Z_ARRVAL_P(form_variables), (void **)&data, &pos) == SUCCESS) {
--				/* we only register string keys, since we cannot have $1234 */
--				if (zend_hash_get_current_key_ex(Z_ARRVAL_P(form_variables), &string_key, &string_key_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING) {
--					ZEND_SET_SYMBOL_WITH_LENGTH(&EG(symbol_table), string_key, string_key_len, *data, (*data)->refcount+1, 0);
--				}
--				zend_hash_move_forward_ex(Z_ARRVAL_P(form_variables), &pos);
-+		for (i = 0; i < 3; i++) {
-+			if (_gpc_flags[i]) {
-+				php_autoglobal_merge(Z_ARRVAL_P(form_variables), Z_ARRVAL_P(PG(http_globals)[(_gpc_flags[i] - 1)]) TSRMLS_CC);
- 			}
- 		}
-+
- 		zend_hash_update(&EG(symbol_table), "_REQUEST", sizeof("_REQUEST"), &form_variables, sizeof(zval *), NULL);
- 	}
diff --git a/lang/php53/pkg-message b/lang/php53/pkg-message
index f25442446668..6110eb8db84b 100644
--- a/lang/php53/pkg-message
+++ b/lang/php53/pkg-message
@@ -1,12 +1,12 @@
 *****************************************************************************
 
-You have installed the php4 package.
+You have installed the php5 package.
 
-Have a look at the php4 port if you need additional extensions other than
-CTYPE, MYSQL, OVERLOAD, PCRE, POSIX, SESSION, TOKENIZER, XML and ZLIB.
+Have a look at the php5 port if you need additional extensions other than
+CTYPE, DOM, PCRE, POSIX, SESSION, SIMPLEXML, SQLITE, TOKENIZER and XML.
 
 You can find it at
-ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/lang/php4.tar
+ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/lang/php5.tar
 
 Make sure index.php is part of your DirectoryIndex.
 
diff --git a/lang/php53/pkg-plist b/lang/php53/pkg-plist
index c95c4a6f5dd1..2abeea06a301 100644
--- a/lang/php53/pkg-plist
+++ b/lang/php53/pkg-plist
@@ -1,4 +1,4 @@
-%%CLI%%bin/pear
+%%CLI%%%%PEAR%%bin/pear
 %%CLI%%bin/php
 bin/php-config
 bin/phpextdist
@@ -24,12 +24,13 @@ include/php/Zend/zend_alloc.h
 include/php/Zend/zend_builtin_functions.h
 include/php/Zend/zend_compile.h
 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_execute.h
-include/php/Zend/zend_execute_globals.h
 include/php/Zend/zend_execute_locks.h
 include/php/Zend/zend_extensions.h
 include/php/Zend/zend_fast_cache.h
@@ -46,18 +47,25 @@ include/php/Zend/zend_language_parser.h
 include/php/Zend/zend_language_scanner.h
 include/php/Zend/zend_list.h
 include/php/Zend/zend_llist.h
+include/php/Zend/zend_mm.h
 include/php/Zend/zend_modules.h
-include/php/Zend/zend_multibyte.h
 include/php/Zend/zend_multiply.h
+include/php/Zend/zend_object_handlers.h
+include/php/Zend/zend_objects.h
+include/php/Zend/zend_objects_API.h
 include/php/Zend/zend_operators.h
 include/php/Zend/zend_ptr_stack.h
 include/php/Zend/zend_qsort.h
+include/php/Zend/zend_reflection_api.h
 include/php/Zend/zend_stack.h
 include/php/Zend/zend_static_allocator.h
+include/php/Zend/zend_stream.h
+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/mbstring/cp932_table.h
+include/php/ext/mbstring/mb_gpc.h
 include/php/ext/mbstring/mbfilter.h
 include/php/ext/mbstring/mbfilter_cn.h
 include/php/ext/mbstring/mbfilter_ja.h
@@ -80,7 +88,6 @@ include/php/ext/session/mod_files.h
 include/php/ext/session/mod_mm.h
 include/php/ext/session/mod_user.h
 include/php/ext/session/php_session.h
-include/php/ext/standard/aggregation.h
 include/php/ext/standard/base64.h
 include/php/ext/standard/basic_functions.h
 include/php/ext/standard/crc32.h
@@ -127,28 +134,22 @@ include/php/ext/standard/php_smart_str.h
 include/php/ext/standard/php_smart_str_public.h
 include/php/ext/standard/php_standard.h
 include/php/ext/standard/php_string.h
+include/php/ext/standard/php_sunfuncs.h
 include/php/ext/standard/php_type.h
 include/php/ext/standard/php_var.h
 include/php/ext/standard/php_versioning.h
+include/php/ext/standard/proc_open.h
 include/php/ext/standard/quot_print.h
 include/php/ext/standard/reg.h
 include/php/ext/standard/scanf.h
 include/php/ext/standard/sha1.h
+include/php/ext/standard/streamsfuncs.h
 include/php/ext/standard/uniqid.h
 include/php/ext/standard/url.h
 include/php/ext/standard/url_scanner.h
 include/php/ext/standard/url_scanner_ex.h
-include/php/ext/xml/expat/ascii.h
-include/php/ext/xml/expat/asciitab.h
-include/php/ext/xml/expat/expat.h
-include/php/ext/xml/expat/iasciitab.h
-include/php/ext/xml/expat/latin1tab.h
-include/php/ext/xml/expat/nametab.h
-include/php/ext/xml/expat/utf8tab.h
-include/php/ext/xml/expat/winconfig.h
-include/php/ext/xml/expat/xmlrole.h
-include/php/ext/xml/expat/xmltok.h
-include/php/ext/xml/expat/xmltok_impl.h
+include/php/ext/xml/expat_compat.h
+include/php/ext/xml/expat/.php
 include/php/ext/xml/php_xml.h
 include/php/main/SAPI.h
 include/php/main/build-defs.h
@@ -183,6 +184,13 @@ include/php/main/rfc1867.h
 include/php/main/safe_mode.h
 include/php/main/snprintf.h
 include/php/main/spprintf.h
+include/php/main/streams/php_stream_context.h
+include/php/main/streams/php_stream_filter_api.h
+include/php/main/streams/php_stream_mmap.h
+include/php/main/streams/php_streams_int.h
+include/php/main/streams/php_stream_transport.h
+include/php/main/streams/php_stream_userspace.h
+include/php/main/streams/php_stream_plain_wrapper.h
 include/php/main/win95nt.h
 include/php/regex/cclass.h
 include/php/regex/cname.h
@@ -198,32 +206,34 @@ lib/php/build/phpize.m4
 lib/php/build/scan_makefile_in.awk
 lib/php/build/shtool
 %%SAPI_FILE%%
-%%APACHE%%@exec %D/sbin/apxs -e -a -n php4 %f
-%%APACHE%%@unexec %D/sbin/apxs -e -A -n php4 %f
-%%CLI%%share/pear/bootstrap/Archive/Tar.php
-%%CLI%%share/pear/bootstrap/PEAR.php
-%%CLI%%share/pear/bootstrap/System.php
-%%CLI%%share/pear/bootstrap/Console/Getopt.php
-%%CLI%%share/pear/bootstrap/OS/Guess.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Auth.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Build.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Common.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Config.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Install.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Package.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Registry.php
-%%CLI%%share/pear/bootstrap/PEAR/Command/Remote.php
-%%CLI%%share/pear/bootstrap/PEAR/Autoloader.php
-%%CLI%%share/pear/bootstrap/PEAR/Builder.php
-%%CLI%%share/pear/bootstrap/PEAR/Command.php
-%%CLI%%share/pear/bootstrap/PEAR/Common.php
-%%CLI%%share/pear/bootstrap/PEAR/Config.php
-%%CLI%%share/pear/bootstrap/PEAR/Dependency.php
-%%CLI%%share/pear/bootstrap/PEAR/Installer.php
-%%CLI%%share/pear/bootstrap/PEAR/Packager.php
-%%CLI%%share/pear/bootstrap/PEAR/Registry.php
-%%CLI%%share/pear/bootstrap/PEAR/Remote.php
-%%CLI%%share/pear/bootstrap/PEAR/Frontend/CLI.php
+%%APACHE%%@exec %D/sbin/apxs -e -a -n php5 %f
+%%APACHE%%@unexec %D/sbin/apxs -e -A -n php5 %f
+%%CLI%%%%PEAR%%share/pear/bootstrap/Archive/Tar.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/System.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/Console/Getopt.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/OS/Guess.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Autoloader.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Builder.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Auth.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Build.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Common.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Config.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Install.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Mirror.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Package.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Registry.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Remote.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Common.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Config.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Dependency.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/DependencyDB.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
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Remote.php
+%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Frontend/CLI.php
 @dirrm include/php/TSRM
 @dirrm include/php/Zend
 @dirrm include/php/ext/mbstring
@@ -233,17 +243,18 @@ lib/php/build/shtool
 @dirrm include/php/ext/xml/expat
 @dirrm include/php/ext/xml
 @dirrm include/php/ext
+@dirrm include/php/main/streams
 @dirrm include/php/main
 @dirrm include/php/regex
 @dirrm include/php/
 @unexec rmdir %D/lib/php/%%EXT_DIR%% 2> /dev/null || true
 @dirrm lib/php/build
 @unexec rmdir %D/lib/php 2> /dev/null || true
-%%CLI%%@dirrm share/pear/bootstrap/Archive
-%%CLI%%@dirrm share/pear/bootstrap/Console
-%%CLI%%@dirrm share/pear/bootstrap/OS
-%%CLI%%@dirrm share/pear/bootstrap/PEAR/Command
-%%CLI%%@dirrm share/pear/bootstrap/PEAR/Frontend
-%%CLI%%@dirrm share/pear/bootstrap/PEAR
-%%CLI%%@dirrm share/pear/bootstrap
-%%CLI%%@unexec rmdir %D/share/pear 2> /dev/null || true
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/Archive
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/Console
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/OS
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR/Command
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR/Frontend
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR
+%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap
+%%CLI%%%%PEAR%%@unexec rmdir %D/share/pear 2> /dev/null || true
diff --git a/lang/php5/scripts/php4_options b/lang/php53/scripts/php5_options
index 4682abcd60b9..30545182cc24 100644
--- a/lang/php5/scripts/php4_options
+++ b/lang/php53/scripts/php5_options
@@ -7,17 +7,14 @@ WITH_CTYPE=ON
 WITH_CURL=OFF
 WITH_DBASE=OFF
 WITH_DBX=OFF
-WITH_DOMXML=OFF
-WITH_DOMXSLT=OFF
+WITH_DOM=ON
 WITH_EXIF=OFF
 WITH_FILEPRO=OFF
-WITH_FRIBIDI=OFF
 WITH_FTP=OFF
 WITH_GD=OFF
 WITH_GDBM=OFF
 WITH_GETTEXT=OFF
 WITH_GMP=OFF
-WITH_HYPERWAVE=OFF
 WITH_ICONV=OFF
 WITH_IMAP=OFF
 WITH_INIFILE=OFF
@@ -29,12 +26,11 @@ WITH_MCRYPT=OFF
 WITH_MHASH=OFF
 WITH_MIME=OFF
 WITH_MING=OFF
-WITH_MYSQL=ON
+WITH_MYSQL=OFF
 WITH_NCURSES=OFF
 WITH_OPENLDAP=OFF
 WITH_OPENSSL=OFF
 WITH_ORACLE=OFF
-WITH_OVERLOAD=ON
 WITH_PCNTL=OFF
 WITH_PCRE=ON
 WITH_PDFLIB=OFF
@@ -45,8 +41,10 @@ WITH_READLINE=OFF
 WITH_RECODE=OFF
 WITH_SESSION=ON
 WITH_SHMOP=OFF
+WITH_SIMPLEXML=ON
 WITH_SNMP=OFF
 WITH_SOCKETS=OFF
+WITH_SQLITE=ON
 WITH_SYBASEDB=OFF
 WITH_SYBASECT=OFF
 WITH_SYSVSEM=OFF
@@ -56,8 +54,7 @@ WITH_UNIXODBC=OFF
 WITH_WDDX=OFF
 WITH_XML=ON
 WITH_XMLRPC=OFF
-WITH_XSLT=OFF
+WITH_XSL=OFF
 WITH_YAZ=OFF
 WITH_YP=OFF
-WITH_ZIP=OFF
 WITH_ZLIB=ON
author	nork <nork@FreeBSD.org>	2003-07-16 18:59:22 +0800
committer	nork <nork@FreeBSD.org>	2003-07-16 18:59:22 +0800
commit	b9d099e41d734c0fa76332ebfd0268e6d177784d (patch)
tree	c8d144e26bfd07ef16b5a8470920e7a83c03d50c
parent	8397c07960dd01e9c0240ba01bacf5c7a3218783 (diff)
download	freebsd-ports-gnome-b9d099e41d734c0fa76332ebfd0268e6d177784d.tar.gz freebsd-ports-gnome-b9d099e41d734c0fa76332ebfd0268e6d177784d.tar.zst freebsd-ports-gnome-b9d099e41d734c0fa76332ebfd0268e6d177784d.zip