7 files changed, 23 insertions, 25 deletions

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 992cb18ca979..0f7fc4c7d450 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.0.4
-PORTREVISION?=	2
+PORTVERSION=	5.0.5
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
 		http://downloads.php.net/ilia/:rc \
@@ -88,9 +88,10 @@ CONFLICTS+=	php4-4* php4-cli-4* mod_php4-4* php4-cgi-4*
 CONFIGURE_ARGS+=--disable-cli
 .endif
 
+MAN1=		php-config.1 phpize.1
 .if ${PHP_SAPI} == "full" || ${PHP_SAPI} == "cli"
 PLIST_SUB+=	CLI=""
-MAN1=		php.1
+MAN1+=		php.1
 .else
 PLIST_SUB+=	CLI="@comment "
 .endif
diff --git a/lang/php5/Makefile.pear b/lang/php5/Makefile.pear
index 6dd3e608a3a4..865bdf9e90dd 100644
--- a/lang/php5/Makefile.pear
+++ b/lang/php5/Makefile.pear
@@ -1,4 +1,4 @@
-PORTREVISION=	4
+PORTREVISION=	0
 
 USE_GNOME=	libxml2
 
@@ -9,6 +9,7 @@ CONFIGURE_ARGS= --with-layout=GNU \
                 --disable-all \
                 --with-pcre-regex=yes \
                 --enable-xml \
+		--enable-libxml \
                 --with-libxml-dir=${LOCALBASE} \
                 --with-zlib-dir=/usr \
                 --with-pear
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 7a01a4850efb..5877d94312bb 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,2 +1,2 @@
-MD5 (php-5.0.4.tar.bz2) = fb1aac107870f897d26563a9cc5053c0
-SIZE (php-5.0.4.tar.bz2) = 4731383
+MD5 (php-5.0.5.tar.bz2) = b5d4ca75bbb11ee5b830fa67213d9f7f
+SIZE (php-5.0.5.tar.bz2) = 4895556
diff --git a/lang/php5/files/patch-pear::Makefile.frag b/lang/php5/files/patch-pear::Makefile.frag
index 082aa5e74fb8..41b525b28a7c 100644
--- a/lang/php5/files/patch-pear::Makefile.frag
+++ b/lang/php5/files/patch-pear::Makefile.frag
@@ -4,7 +4,7 @@
  # -*- makefile -*-
  
  peardir=$(PEAR_INSTALLDIR)
-+XML_RPC_ver=1.2.2
++XML_RPC_ver=1.4.0
  
  # Skip all php.ini files altogether
  PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0
diff --git a/lang/php5/files/patch-scripts::Makefile.frag b/lang/php5/files/patch-scripts::Makefile.frag
index 7570701e6beb..f3200a0dc3c2 100644
--- a/lang/php5/files/patch-scripts::Makefile.frag
+++ b/lang/php5/files/patch-scripts::Makefile.frag
@@ -1,5 +1,5 @@
---- scripts/Makefile.frag.orig	Mon Feb 28 06:28:25 2005
-+++ scripts/Makefile.frag	Fri Apr  1 15:42:21 2005
+--- scripts/Makefile.frag.orig	Tue Jun  7 23:57:06 2005
++++ scripts/Makefile.frag	Wed Sep  7 17:50:23 2005
 @@ -34,21 +34,12 @@
  	/ \
  	Zend/ \
@@ -17,7 +17,7 @@
 -	ext/xml/expat/ \
 -	ext/mbstring/ \
 -	ext/mbstring/libmbfl/ \
--    ext/mbstring/libmbfl/mbfl/ \
+-	ext/mbstring/libmbfl/mbfl/ \
 -	ext/sqlite/libsqlite/src/sqlite.h
 +	ext/spl/
  
diff --git a/lang/php5/files/patch-scripts::phpize.in b/lang/php5/files/patch-scripts::phpize.in
index cab5309be743..e70286dba4a9 100644
--- a/lang/php5/files/patch-scripts::phpize.in
+++ b/lang/php5/files/patch-scripts::phpize.in
@@ -1,15 +1,13 @@
---- scripts/phpize.in.orig	Fri Apr  1 15:42:47 2005
-+++ scripts/phpize.in	Fri Apr  1 15:43:04 2005
-@@ -102,9 +102,9 @@
+--- scripts/phpize.in.orig	Wed Jun 15 19:19:41 2005
++++ scripts/phpize.in	Wed Sep  7 17:52:24 2005
+@@ -94,8 +94,8 @@
  
- phpize_autotools()
+ phpize_check_autotools()
  {
--  aclocal    || exit 1
--  autoconf   || exit 1
--  autoheader || exit 1
-+  aclocal15    || exit 1
-+  autoconf253   || exit 1
-+  autoheader253 || exit 1
- }
- 
- # Main script
+-  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf
+-  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader
++  test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf259
++  test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader259
+   
+   if ! test -x "`$php_shtool path $PHP_AUTOCONF`"; then
+     cat <<EOF
diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist
index 40e1af9f8bed..494aeea29722 100644
--- a/lang/php5/pkg-plist
+++ b/lang/php5/pkg-plist
@@ -1,6 +1,5 @@
 %%CLI%%bin/php
 bin/php-config
-bin/phpextdist
 bin/phpize
 etc/php.conf
 etc/php.ini-dist
@@ -141,7 +140,6 @@ include/php/ext/standard/url_scanner_ex.h
 @unexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h
 include/php/main/SAPI.h
 include/php/main/build-defs.h
-include/php/main/config.nw.h
 include/php/main/config.w32.h
 include/php/main/fopen_wrappers.h
 include/php/main/internal_functions_registry.h