Upgrade to 4.1.0.

See http://www.php.net/ChangeLog-4.php for a detailed list of
changes.

22 files changed, 130 insertions, 452 deletions

diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index b7c0dc78d678..9e75e8f9c267 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	mod_php4
-PORTVERSION=	4.0.6
-PORTREVISION?=	5
+PORTVERSION=	4.1.0
+PORTREVISION?=	0
 CATEGORIES?=	www
 MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
 		http://php.he.net/${PHP_DISTDIR}/ \
@@ -32,7 +32,7 @@ PHP_DISTDIR=	distributions
 SLAVEDIRS=	lang/php4
 
 USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	yes
@@ -43,6 +43,8 @@ CONFIGURE_ARGS=	--with-config-file-path=${PREFIX}/etc/php.standalone \
 		--disable-pear \
 		--enable-discard-path \
 		--with-readline=/usr
+
+MAKE_ENV=	STANDALONE="${STANDALONE}"
 .else
 CONFIGURE_ARGS=	--with-apxs=${PREFIX}/sbin/apxs \
 		--with-config-file-path=${PREFIX}/etc
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index db01ee6dac3c..a677eea85da4 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,2 +1,2 @@
-MD5 (php-4.0.6.tar.gz) = 5f698521cf2b392cf9bfa87fc1a0fe90
+MD5 (php-4.1.0.tar.gz) = 4c2bfcc3cfc0b5b49d855316d78a3afc
 MD5 (php4_mbregex-1.2.1.tar.gz) = 46d151afa9ab668df880a70cf786a2c2
diff --git a/www/mod_php4/files/patch-Makefile.in b/www/mod_php4/files/patch-Makefile.in
new file mode 100644
index 000000000000..05bf9df10f97
--- /dev/null
+++ b/www/mod_php4/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+--- Makefile.in.orig	Sun Apr 22 03:09:12 2001
++++ Makefile.in	Wed Dec 19 20:38:06 2001
+@@ -24,7 +24,11 @@
+ 
+ targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
+ 
++.if defined(STANDALONE)
++install_targets = install-sapi
++.else
+ install_targets = install-sapi install-modules
++.endif
+ 
+ include $(top_srcdir)/build/rules.mk
+ include $(top_srcdir)/build/library.mk
diff --git a/www/mod_php4/files/patch-as b/www/mod_php4/files/patch-as
deleted file mode 100644
index 755a0dc0e411..000000000000
--- a/www/mod_php4/files/patch-as
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	Wed May  3 06:51:11 2000
-+++ Makefile.in	Wed May 17 23:42:28 2000
-@@ -1,4 +1,4 @@
--
-+ 
- ZEND_DIR = $(srcdir)/Zend
- SUBDIRS = Zend ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
- 
-@@ -29,7 +29,7 @@
- 
- targets = $(LTLIBRARY_NAME) $(PROGRAM_NAME)
- 
--install_targets = install-sapi install-modules
-+install_targets = install-sapi
- 
- include $(top_srcdir)/build/rules.mk
- include $(top_srcdir)/build/library.mk
diff --git a/www/mod_php4/files/patch-ext_domxml_config.m4 b/www/mod_php4/files/patch-ext_domxml_config.m4
index 736fe2957f41..f55ba83f2e72 100644
--- a/www/mod_php4/files/patch-ext_domxml_config.m4
+++ b/www/mod_php4/files/patch-ext_domxml_config.m4
@@ -1,29 +1,11 @@
---- ext/domxml/config.m4.orig	Sun May 27 11:37:40 2001
-+++ ext/domxml/config.m4	Sun Nov 18 23:20:57 2001
-@@ -3,7 +3,7 @@
+--- ext/domxml/config.m4.orig	Wed Dec 19 18:40:15 2001
++++ ext/domxml/config.m4	Wed Dec 19 18:42:15 2001
+@@ -53,6 +53,8 @@
  
- AC_DEFUN(PHP_DOM_CHECK_VERSION,[
-   old_CPPFLAGS=$CPPFLAGS
--  CPPFLAGS=-I$DOMXML_DIR/include
-+  CPPFLAGS=-I$DOMXML_DIR/include/libxml2
-   AC_MSG_CHECKING(for libxml version)
-   AC_EGREP_CPP(yes,[
-   #include <libxml/xmlversion.h>
-@@ -25,7 +25,7 @@
- 
- if test "$PHP_DOM" != "no"; then
- 
--  if test -r $PHP_DOM/include/libxml/tree.h; then
-+  if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then
-     DOMXML_DIR=$PHP_DOM
-   else
-     AC_MSG_CHECKING(for DOM in default path)
-@@ -44,6 +44,8 @@
- 
-   PHP_DOM_CHECK_VERSION
- 
-+  PHP_ADD_INCLUDE($DOMXML_DIR/include/libxml2)
+   PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
+   PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD)
 +dnl next line is for giconv.h
-   PHP_ADD_INCLUDE($DOMXML_DIR/include)
++  PHP_ADD_INCLUDE($DOMXML_DIR/include)
  
-   if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.s? ; then
+   if test "$PHP_ZLIB_DIR" = "no"; then
+     AC_MSG_ERROR(DOMXML requires ZLIB. Use --with-zlib-dir=<DIR>)
diff --git a/www/mod_php4/files/patch-ext_gd_config.m4 b/www/mod_php4/files/patch-ext_gd_config.m4
deleted file mode 100644
index ee6d54937268..000000000000
--- a/www/mod_php4/files/patch-ext_gd_config.m4
+++ /dev/null
@@ -1,13 +0,0 @@
---- ext/gd/config.m4.orig	Mon Jun  4 10:36:47 2001
-+++ ext/gd/config.m4	Fri Oct 26 20:30:41 2001
-@@ -174,7 +174,9 @@
-   AC_CHECK_LIB(gd, gdImageString16,        [AC_DEFINE(HAVE_LIBGD13, 1, [ ])])
-   AC_CHECK_LIB(gd, gdImagePaletteCopy,     [AC_DEFINE(HAVE_LIBGD15, 1, [ ])])
-   AC_CHECK_LIB(gd, gdImageCreateFromPng,   [AC_DEFINE(HAVE_GD_PNG,  1, [ ])])
--  AC_CHECK_LIB(gd, gdImageCreateFromGif,   [AC_DEFINE(HAVE_GD_GIF,  1, [ ])])
-+  AC_CHECK_LIB(gd, gdImageCreateFromGif,   [AC_DEFINE(HAVE_GD_GIF_READ,  1, [ ])])
-+  AC_CHECK_LIB(gd, gdImageGif,             [AC_DEFINE(HAVE_GD_GIF_CREATE,  1, [ ])])
-+  AC_CHECK_LIB(gd, gdImageCreateFromGd2,   [AC_DEFINE(HAVE_GD_GD2,  1, [ ])])
-   AC_CHECK_LIB(gd, gdImageWBMP,            [AC_DEFINE(HAVE_GD_WBMP, 1, [ ])])
-   AC_CHECK_LIB(gd, gdImageCreateFromJpeg,  [AC_DEFINE(HAVE_GD_JPG,  1, [ ])])
-   AC_CHECK_LIB(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,  1, [ ])])
diff --git a/www/mod_php4/files/patch-ext_gd_gd.c b/www/mod_php4/files/patch-ext_gd_gd.c
deleted file mode 100644
index 336a12257153..000000000000
--- a/www/mod_php4/files/patch-ext_gd_gd.c
+++ /dev/null
@@ -1,81 +0,0 @@
---- ext/gd/gd.c.orig	Mon Jun 11 17:22:10 2001
-+++ ext/gd/gd.c	Fri Nov 30 10:14:50 2001
-@@ -335,8 +335,11 @@
- 
- /* this next part is stupid ... if I knew better, I'd put them all on one row (cmv) */
- 
--#ifdef HAVE_GD_GIF
--	php_info_print_table_row(2, "GIF Support", "enabled");
-+#ifdef HAVE_GD_GIF_READ
-+	php_info_print_table_row(2, "GIF Read Support", "enabled");
-+#endif
-+#ifdef(HAVE_GD_GID_CREATE)
-+	php_info_print_table_row(2, "GIF Create Support", "enabled");
- #endif
- #ifdef HAVE_GD_JPG
- 	php_info_print_table_row(2, "JPG Support", "enabled");
-@@ -1088,7 +1091,7 @@
- 			break;
- 			
- 		case PHP_GDIMG_TYPE_GIF:
--#ifdef HAVE_GD_GIF
-+#ifdef HAVE_GD_GIF_READ
- 			im = _php_image_create_from_string (data, "GIF", gdImageCreateFromGifCtx);
- #else
- 			php_error(E_WARNING, "No GIF support in this PHP build");
-@@ -1205,9 +1208,9 @@
-    Create a new image from GIF file or URL */
- PHP_FUNCTION(imagecreatefromgif)
- {
--#ifdef HAVE_GD_GIF
-+#ifdef HAVE_GD_GIF_READ
- 	_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageCreateFromGif,gdImageCreateFromGifCtx);
--#else /* HAVE_GD_GIF */
-+#else /* HAVE_GD_GIF_READ */
- 	php_error(E_WARNING, "ImageCreateFromGif: No GIF support in this PHP build");
- 	RETURN_FALSE;
- #endif /* HAVE_GD_GIF */
-@@ -1397,14 +1400,14 @@
-    Output GIF image to browser or file */
- PHP_FUNCTION(imagegif)
- {
--#ifdef HAVE_GD_GIF
-+#ifdef HAVE_GD_GIF_CREATE
- #ifdef HAVE_GD_GIF_CTX
- 	_php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGifCtx);
- #else
- 	_php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGif);
- #endif
- #else /* HAVE_GD_GIF */
--	php_error(E_WARNING, "ImageGif: No GIF support in this PHP build");
-+	php_error(E_WARNING, "ImageGif: No GIF create support in this PHP build");
- 	RETURN_FALSE;
- #endif /* HAVE_GD_GIF */
- }
-@@ -2662,7 +2665,7 @@
- 	fontname = (unsigned char *) Z_STRVAL_PP(FONTNAME);
- 
- #ifdef USE_GD_IMGSTRTTF
--# if HAVE_LIBGD20 & HAVE_LIBFREETYPE
-+# if HAVE_LIBFREETYPE
- 	error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y, str);
- # else
- 	error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y, str);
-@@ -3356,7 +3359,7 @@
- 		}
- 
- 		switch (image_type) {
--#ifdef HAVE_GD_GIF
-+#ifdef HAVE_GD_GIF_READ
- 			case PHP_GDIMG_TYPE_GIF:
- 				im_org = gdImageCreateFromGif (org);
- 				if (im_org == NULL) {
-@@ -3364,7 +3367,7 @@
- 					RETURN_FALSE;
- 				}
- 				break;
--#endif /* HAVE_GD_GIF */
-+#endif /* HAVE_GD_GIF_READ */
- 
- #ifdef HAVE_GD_JPG
- 			case PHP_GDIMG_TYPE_JPG:
diff --git a/www/mod_php4/files/patch-ext_imap_config.m4 b/www/mod_php4/files/patch-ext_imap_config.m4
deleted file mode 100644
index ccdfb4c947e2..000000000000
--- a/www/mod_php4/files/patch-ext_imap_config.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/imap/config.m4.orig	Tue May 22 02:38:46 2001
-+++ ext/imap/config.m4	Fri Nov 23 19:40:39 2001
-@@ -53,7 +53,7 @@
-     PHP_ADD_LIBRARY_DEFER(ssl)
- 
-     old_LIBS=$LIBS
--    LIBS="$LIBS -lc-client"
-+    LIBS="$LIBS -lc-client4"
-     if test $PHP_KERBEROS != "no"; then
-       LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-     fi
diff --git a/www/mod_php4/files/patch-ext_readline_readline.c b/www/mod_php4/files/patch-ext_readline_readline.c
deleted file mode 100644
index a757f740e64a..000000000000
--- a/www/mod_php4/files/patch-ext_readline_readline.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- ext/readline/readline.c.orig	Thu May 24 14:42:05 2001
-+++ ext/readline/readline.c	Tue Dec  4 08:14:49 2001
-@@ -57,7 +57,7 @@
- 	PHP_FE(readline_info,  	            NULL)
- 	PHP_FE(readline_add_history, 		NULL)
- 	PHP_FE(readline_clear_history, 		NULL)
--#ifdef HAVE_READLINE
-+#ifdef HAVE_LIBREADLINE
- 	PHP_FE(readline_list_history, 		NULL)
- #else
- 	PHP_FALIAS(readline_list_history, warn_not_available,			NULL)
-@@ -147,7 +147,7 @@
- 		add_assoc_string(return_value,"line_buffer",SAFE_STRING(rl_line_buffer),1);
- 		add_assoc_long(return_value,"point",rl_point);
- 		add_assoc_long(return_value,"end",rl_end);
--#ifdef HAVE_READLINE
-+#ifdef HAVE_LIBREADLINE
- 		add_assoc_long(return_value,"mark",rl_mark);
- 		add_assoc_long(return_value,"done",rl_done);
- 		add_assoc_long(return_value,"pending_input",rl_pending_input);
-@@ -174,7 +174,7 @@
- 			RETVAL_LONG(rl_point);
- 		} else if (! strcasecmp((*what)->value.str.val,"end")) {
- 			RETVAL_LONG(rl_end);
--#ifdef HAVE_READLINE
-+#ifdef HAVE_LIBREADLINE
- 		} else if (! strcasecmp((*what)->value.str.val,"mark")) {
- 			RETVAL_LONG(rl_mark);
- 		} else if (! strcasecmp((*what)->value.str.val,"done")) {
-@@ -256,7 +256,7 @@
- /* }}} */
- /* {{{ proto array readline_list_history(void) 
-    Lists the history */
--#ifdef HAVE_READLINE
-+#ifdef HAVE_LIBREADLINE
- PHP_FUNCTION(readline_list_history)
- {
- 	HIST_ENTRY **history;
diff --git a/www/mod_php4/files/patch-ext_sybase_ct_config.m4 b/www/mod_php4/files/patch-ext_sybase_ct_config.m4
index 8b4692e3c98d..0c5f32e997d0 100644
--- a/www/mod_php4/files/patch-ext_sybase_ct_config.m4
+++ b/www/mod_php4/files/patch-ext_sybase_ct_config.m4
@@ -1,20 +1,21 @@
---- ext/sybase_ct/config.m4.orig	Wed Mar 28 05:34:43 2001
-+++ ext/sybase_ct/config.m4	Fri Oct 26 21:35:50 2001
-@@ -20,16 +20,12 @@
-     fi
- 	PHP_ADD_INCLUDE($SYBASE_CT_INCDIR)
- 	PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR)
--	PHP_ADD_LIBRARY(cs)
- 	PHP_ADD_LIBRARY(ct)
--	PHP_ADD_LIBRARY(comn)
--	PHP_ADD_LIBRARY(intl)
--	SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl"
-+	SYBASE_CT_LIBS="-lct"
-     old_LDFLAGS=$LDFLAGS
-     LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR"
-     AC_CHECK_LIB(tcl, netg_errstr,
-               [ PHP_ADD_LIBRARY(tcl) ],
--              [ PHP_ADD_LIBRARY(sybtcl) ],
-               [ $SYBASE_CT_LIBS ])
-     AC_CHECK_LIB(insck, insck__getVdate,
-               [ PHP_ADD_LIBRARY(insck) ])
+--- ext/sybase_ct/config.m4.orig	Wed Dec 19 19:36:23 2001
++++ ext/sybase_ct/config.m4	Wed Dec 19 19:38:08 2001
+@@ -19,17 +19,12 @@
+ 
+   PHP_ADD_INCLUDE($SYBASE_CT_INCDIR)
+   PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
+-  PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
+   PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
+-  PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD)
+-  PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
+ 
+-  SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
++  SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
+ 
+   AC_CHECK_LIB(tcl, netg_errstr, [
+     PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD)
+-  ],[ 
+-    PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
+   ],[ 
+     $SYBASE_CT_LIBS 
+   ])
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
index b277d7bf36e4..b607a9663664 100644
--- a/www/mod_php4/pkg-plist
+++ b/www/mod_php4/pkg-plist
@@ -1,7 +1,9 @@
 bin/pear
+bin/pearize
 bin/php-config
 bin/phpextdist
 bin/phpize
+bin/phptar
 etc/php.ini-dist
 include/php/TSRM/TSRM.h
 include/php/TSRM/acconfig.h
@@ -84,7 +86,6 @@ include/php/ext/standard/php_link.h
 include/php/ext/standard/php_mail.h
 include/php/ext/standard/php_math.h
 include/php/ext/standard/php_metaphone.h
-include/php/ext/standard/php_output.h
 include/php/ext/standard/php_parsedate.h
 include/php/ext/standard/php_rand.h
 include/php/ext/standard/php_smart_str.h
@@ -92,6 +93,7 @@ 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_var.h
+include/php/ext/standard/php_versioning.h
 include/php/ext/standard/quot_print.h
 include/php/ext/standard/reg.h
 include/php/ext/standard/scanf.h
@@ -100,17 +102,6 @@ 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/xmlparse/expat_hashtable.h
-include/php/ext/xml/expat/xmlparse/xmlparse.h
-include/php/ext/xml/expat/xmltok/asciitab.h
-include/php/ext/xml/expat/xmltok/iasciitab.h
-include/php/ext/xml/expat/xmltok/latin1tab.h
-include/php/ext/xml/expat/xmltok/nametab.h
-include/php/ext/xml/expat/xmltok/utf8tab.h
-include/php/ext/xml/expat/xmltok/xmldef.h
-include/php/ext/xml/expat/xmltok/xmlrole.h
-include/php/ext/xml/expat/xmltok/xmltok.h
-include/php/ext/xml/expat/xmltok/xmltok_impl.h
 include/php/ext/xml/php_xml.h
 include/php/main/SAPI.h
 include/php/main/build-defs.h
@@ -129,6 +120,7 @@ include/php/main/php_logos.h
 include/php/main/php_main.h
 include/php/main/php_network.h
 include/php/main/php_open_temporary_file.h
+include/php/main/php_output.h
 include/php/main/php_reentrancy.h
 include/php/main/php_regex.h
 include/php/main/php_streams.h
@@ -147,6 +139,7 @@ include/php/regex/regex.h
 include/php/regex/regex2.h
 include/php/regex/regex_extra.h
 include/php/regex/utils.h
+lib/php/Archive/Tar.php
 lib/php/Benchmark/Iterate.php
 lib/php/Benchmark/Timer.php
 lib/php/Cache.php
@@ -156,6 +149,7 @@ lib/php/Cache/Container/dbx.php
 lib/php/Cache/Container/file.php
 lib/php/Cache/Container/phplib.php
 lib/php/Cache/Container/shm.php
+lib/php/Cache/DB.php
 lib/php/Cache/Error.php
 lib/php/Cache/Function.php
 lib/php/Cache/Graphics.php
@@ -166,6 +160,7 @@ lib/php/Crypt/CBC.php
 lib/php/Crypt/HCEMD5.php
 lib/php/DB.php
 lib/php/DB/common.php
+lib/php/DB/fbsql.php
 lib/php/DB/ibase.php
 lib/php/DB/ifx.php
 lib/php/DB/msql.php
@@ -185,6 +180,7 @@ lib/php/HTML/Common.php
 lib/php/HTML/Form.php
 lib/php/HTML/IT.php
 lib/php/HTML/ITX.php
+lib/php/HTML/IT_Error.php
 lib/php/HTML/Page.php
 lib/php/HTML/Processor.php
 lib/php/HTML/Select.php
@@ -193,14 +189,15 @@ lib/php/HTTP.php
 lib/php/HTTP/Compress.php
 lib/php/Image/Remote.php
 lib/php/Log.php
+lib/php/Log/Observer.php
 lib/php/Log/composite.php
 lib/php/Log/file.php
 lib/php/Log/mcal.php
-lib/php/Log/observer.php
 lib/php/Log/sql.php
 lib/php/Log/syslog.php
 lib/php/Mail.php
 lib/php/Mail/RFC822.php
+lib/php/Mail/mime.php
 lib/php/Mail/sendmail.php
 lib/php/Mail/smtp.php
 lib/php/Math/Fraction.php
@@ -212,14 +209,16 @@ lib/php/Net/Socket.php
 lib/php/Numbers/Roman.php
 lib/php/PEAR.php
 lib/php/PEAR/Common.php
+lib/php/PEAR/Config.php
 lib/php/PEAR/Installer.php
 lib/php/PEAR/Packager.php
+lib/php/PEAR/Registry.php
+lib/php/PEAR/Remote.php
 lib/php/PEAR/Uploader.php
 lib/php/Payment/Verisign.php
 lib/php/Schedule/At.php
+lib/php/System.php
 lib/php/XML/Parser.php
-lib/php/XML/RPC.php
-lib/php/XML/RPC/Server.php
 lib/php/build/acinclude.m4
 lib/php/build/dynlib.m4
 lib/php/build/dynlib.mk
@@ -247,6 +246,8 @@ libexec/apache/libphp4.so
 @dirrm include/php/main
 @dirrm include/php/regex
 @dirrm include/php
+@dirrm lib/php/20010901
+@dirrm lib/php/Archive
 @dirrm lib/php/Benchmark
 @dirrm lib/php/Cache/Container
 @dirrm lib/php/Cache
@@ -266,7 +267,6 @@ libexec/apache/libphp4.so
 @dirrm lib/php/Payment
 @dirrm lib/php/PEAR
 @dirrm lib/php/Schedule
-@dirrm lib/php/XML/RPC
 @dirrm lib/php/XML
 @dirrm lib/php/build
 @dirrm lib/php
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index b7c0dc78d678..9e75e8f9c267 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	mod_php4
-PORTVERSION=	4.0.6
-PORTREVISION?=	5
+PORTVERSION=	4.1.0
+PORTREVISION?=	0
 CATEGORIES?=	www
 MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
 		http://php.he.net/${PHP_DISTDIR}/ \
@@ -32,7 +32,7 @@ PHP_DISTDIR=	distributions
 SLAVEDIRS=	lang/php4
 
 USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 IS_INTERACTIVE=	yes
@@ -43,6 +43,8 @@ CONFIGURE_ARGS=	--with-config-file-path=${PREFIX}/etc/php.standalone \
 		--disable-pear \
 		--enable-discard-path \
 		--with-readline=/usr
+
+MAKE_ENV=	STANDALONE="${STANDALONE}"
 .else
 CONFIGURE_ARGS=	--with-apxs=${PREFIX}/sbin/apxs \
 		--with-config-file-path=${PREFIX}/etc
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index db01ee6dac3c..a677eea85da4 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,2 +1,2 @@
-MD5 (php-4.0.6.tar.gz) = 5f698521cf2b392cf9bfa87fc1a0fe90
+MD5 (php-4.1.0.tar.gz) = 4c2bfcc3cfc0b5b49d855316d78a3afc
 MD5 (php4_mbregex-1.2.1.tar.gz) = 46d151afa9ab668df880a70cf786a2c2
diff --git a/www/mod_php5/files/patch-Makefile.in b/www/mod_php5/files/patch-Makefile.in
new file mode 100644
index 000000000000..05bf9df10f97
--- /dev/null
+++ b/www/mod_php5/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+--- Makefile.in.orig	Sun Apr 22 03:09:12 2001
++++ Makefile.in	Wed Dec 19 20:38:06 2001
+@@ -24,7 +24,11 @@
+ 
+ targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
+ 
++.if defined(STANDALONE)
++install_targets = install-sapi
++.else
+ install_targets = install-sapi install-modules
++.endif
+ 
+ include $(top_srcdir)/build/rules.mk
+ include $(top_srcdir)/build/library.mk
diff --git a/www/mod_php5/files/patch-as b/www/mod_php5/files/patch-as
deleted file mode 100644
index 755a0dc0e411..000000000000
--- a/www/mod_php5/files/patch-as
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	Wed May  3 06:51:11 2000
-+++ Makefile.in	Wed May 17 23:42:28 2000
-@@ -1,4 +1,4 @@
--
-+ 
- ZEND_DIR = $(srcdir)/Zend
- SUBDIRS = Zend ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
- 
-@@ -29,7 +29,7 @@
- 
- targets = $(LTLIBRARY_NAME) $(PROGRAM_NAME)
- 
--install_targets = install-sapi install-modules
-+install_targets = install-sapi
- 
- include $(top_srcdir)/build/rules.mk
- include $(top_srcdir)/build/library.mk
diff --git a/www/mod_php5/files/patch-ext_domxml_config.m4 b/www/mod_php5/files/patch-ext_domxml_config.m4
index 736fe2957f41..f55ba83f2e72 100644
--- a/www/mod_php5/files/patch-ext_domxml_config.m4
+++ b/www/mod_php5/files/patch-ext_domxml_config.m4
@@ -1,29 +1,11 @@
---- ext/domxml/config.m4.orig	Sun May 27 11:37:40 2001
-+++ ext/domxml/config.m4	Sun Nov 18 23:20:57 2001
-@@ -3,7 +3,7 @@
+--- ext/domxml/config.m4.orig	Wed Dec 19 18:40:15 2001
++++ ext/domxml/config.m4	Wed Dec 19 18:42:15 2001
+@@ -53,6 +53,8 @@
  
- AC_DEFUN(PHP_DOM_CHECK_VERSION,[
-   old_CPPFLAGS=$CPPFLAGS
--  CPPFLAGS=-I$DOMXML_DIR/include
-+  CPPFLAGS=-I$DOMXML_DIR/include/libxml2
-   AC_MSG_CHECKING(for libxml version)
-   AC_EGREP_CPP(yes,[
-   #include <libxml/xmlversion.h>
-@@ -25,7 +25,7 @@
- 
- if test "$PHP_DOM" != "no"; then
- 
--  if test -r $PHP_DOM/include/libxml/tree.h; then
-+  if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then
-     DOMXML_DIR=$PHP_DOM
-   else
-     AC_MSG_CHECKING(for DOM in default path)
-@@ -44,6 +44,8 @@
- 
-   PHP_DOM_CHECK_VERSION
- 
-+  PHP_ADD_INCLUDE($DOMXML_DIR/include/libxml2)
+   PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
+   PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD)
 +dnl next line is for giconv.h
-   PHP_ADD_INCLUDE($DOMXML_DIR/include)
++  PHP_ADD_INCLUDE($DOMXML_DIR/include)
  
-   if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.s? ; then
+   if test "$PHP_ZLIB_DIR" = "no"; then
+     AC_MSG_ERROR(DOMXML requires ZLIB. Use --with-zlib-dir=<DIR>)
diff --git a/www/mod_php5/files/patch-ext_gd_config.m4 b/www/mod_php5/files/patch-ext_gd_config.m4
deleted file mode 100644
index ee6d54937268..000000000000
--- a/www/mod_php5/files/patch-ext_gd_config.m4
+++ /dev/null
@@ -1,13 +0,0 @@
---- ext/gd/config.m4.orig	Mon Jun  4 10:36:47 2001
-+++ ext/gd/config.m4	Fri Oct 26 20:30:41 2001
-@@ -174,7 +174,9 @@
-   AC_CHECK_LIB(gd, gdImageString16,        [AC_DEFINE(HAVE_LIBGD13, 1, [ ])])
-   AC_CHECK_LIB(gd, gdImagePaletteCopy,     [AC_DEFINE(HAVE_LIBGD15, 1, [ ])])
-   AC_CHECK_LIB(gd, gdImageCreateFromPng,   [AC_DEFINE(HAVE_GD_PNG,  1, [ ])])
--  AC_CHECK_LIB(gd, gdImageCreateFromGif,   [AC_DEFINE(HAVE_GD_GIF,  1, [ ])])
-+  AC_CHECK_LIB(gd, gdImageCreateFromGif,   [AC_DEFINE(HAVE_GD_GIF_READ,  1, [ ])])
-+  AC_CHECK_LIB(gd, gdImageGif,             [AC_DEFINE(HAVE_GD_GIF_CREATE,  1, [ ])])
-+  AC_CHECK_LIB(gd, gdImageCreateFromGd2,   [AC_DEFINE(HAVE_GD_GD2,  1, [ ])])
-   AC_CHECK_LIB(gd, gdImageWBMP,            [AC_DEFINE(HAVE_GD_WBMP, 1, [ ])])
-   AC_CHECK_LIB(gd, gdImageCreateFromJpeg,  [AC_DEFINE(HAVE_GD_JPG,  1, [ ])])
-   AC_CHECK_LIB(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,  1, [ ])])
diff --git a/www/mod_php5/files/patch-ext_gd_gd.c b/www/mod_php5/files/patch-ext_gd_gd.c
deleted file mode 100644
index 336a12257153..000000000000
--- a/www/mod_php5/files/patch-ext_gd_gd.c
+++ /dev/null
@@ -1,81 +0,0 @@
---- ext/gd/gd.c.orig	Mon Jun 11 17:22:10 2001
-+++ ext/gd/gd.c	Fri Nov 30 10:14:50 2001
-@@ -335,8 +335,11 @@
- 
- /* this next part is stupid ... if I knew better, I'd put them all on one row (cmv) */
- 
--#ifdef HAVE_GD_GIF
--	php_info_print_table_row(2, "GIF Support", "enabled");
-+#ifdef HAVE_GD_GIF_READ
-+	php_info_print_table_row(2, "GIF Read Support", "enabled");
-+#endif
-+#ifdef(HAVE_GD_GID_CREATE)
-+	php_info_print_table_row(2, "GIF Create Support", "enabled");
- #endif
- #ifdef HAVE_GD_JPG
- 	php_info_print_table_row(2, "JPG Support", "enabled");
-@@ -1088,7 +1091,7 @@
- 			break;
- 			
- 		case PHP_GDIMG_TYPE_GIF:
--#ifdef HAVE_GD_GIF
-+#ifdef HAVE_GD_GIF_READ
- 			im = _php_image_create_from_string (data, "GIF", gdImageCreateFromGifCtx);
- #else
- 			php_error(E_WARNING, "No GIF support in this PHP build");
-@@ -1205,9 +1208,9 @@
-    Create a new image from GIF file or URL */
- PHP_FUNCTION(imagecreatefromgif)
- {
--#ifdef HAVE_GD_GIF
-+#ifdef HAVE_GD_GIF_READ
- 	_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageCreateFromGif,gdImageCreateFromGifCtx);
--#else /* HAVE_GD_GIF */
-+#else /* HAVE_GD_GIF_READ */
- 	php_error(E_WARNING, "ImageCreateFromGif: No GIF support in this PHP build");
- 	RETURN_FALSE;
- #endif /* HAVE_GD_GIF */
-@@ -1397,14 +1400,14 @@
-    Output GIF image to browser or file */
- PHP_FUNCTION(imagegif)
- {
--#ifdef HAVE_GD_GIF
-+#ifdef HAVE_GD_GIF_CREATE
- #ifdef HAVE_GD_GIF_CTX
- 	_php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGifCtx);
- #else
- 	_php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGif);
- #endif
- #else /* HAVE_GD_GIF */
--	php_error(E_WARNING, "ImageGif: No GIF support in this PHP build");
-+	php_error(E_WARNING, "ImageGif: No GIF create support in this PHP build");
- 	RETURN_FALSE;
- #endif /* HAVE_GD_GIF */
- }
-@@ -2662,7 +2665,7 @@
- 	fontname = (unsigned char *) Z_STRVAL_PP(FONTNAME);
- 
- #ifdef USE_GD_IMGSTRTTF
--# if HAVE_LIBGD20 & HAVE_LIBFREETYPE
-+# if HAVE_LIBFREETYPE
- 	error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y, str);
- # else
- 	error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y, str);
-@@ -3356,7 +3359,7 @@
- 		}
- 
- 		switch (image_type) {
--#ifdef HAVE_GD_GIF
-+#ifdef HAVE_GD_GIF_READ
- 			case PHP_GDIMG_TYPE_GIF:
- 				im_org = gdImageCreateFromGif (org);
- 				if (im_org == NULL) {
-@@ -3364,7 +3367,7 @@
- 					RETURN_FALSE;
- 				}
- 				break;
--#endif /* HAVE_GD_GIF */
-+#endif /* HAVE_GD_GIF_READ */
- 
- #ifdef HAVE_GD_JPG
- 			case PHP_GDIMG_TYPE_JPG:
diff --git a/www/mod_php5/files/patch-ext_imap_config.m4 b/www/mod_php5/files/patch-ext_imap_config.m4
deleted file mode 100644
index ccdfb4c947e2..000000000000
--- a/www/mod_php5/files/patch-ext_imap_config.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/imap/config.m4.orig	Tue May 22 02:38:46 2001
-+++ ext/imap/config.m4	Fri Nov 23 19:40:39 2001
-@@ -53,7 +53,7 @@
-     PHP_ADD_LIBRARY_DEFER(ssl)
- 
-     old_LIBS=$LIBS
--    LIBS="$LIBS -lc-client"
-+    LIBS="$LIBS -lc-client4"
-     if test $PHP_KERBEROS != "no"; then
-       LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-     fi
diff --git a/www/mod_php5/files/patch-ext_readline_readline.c b/www/mod_php5/files/patch-ext_readline_readline.c
deleted file mode 100644
index a757f740e64a..000000000000
--- a/www/mod_php5/files/patch-ext_readline_readline.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- ext/readline/readline.c.orig	Thu May 24 14:42:05 2001
-+++ ext/readline/readline.c	Tue Dec  4 08:14:49 2001
-@@ -57,7 +57,7 @@
- 	PHP_FE(readline_info,  	            NULL)
- 	PHP_FE(readline_add_history, 		NULL)
- 	PHP_FE(readline_clear_history, 		NULL)
--#ifdef HAVE_READLINE
-+#ifdef HAVE_LIBREADLINE
- 	PHP_FE(readline_list_history, 		NULL)
- #else
- 	PHP_FALIAS(readline_list_history, warn_not_available,			NULL)
-@@ -147,7 +147,7 @@
- 		add_assoc_string(return_value,"line_buffer",SAFE_STRING(rl_line_buffer),1);
- 		add_assoc_long(return_value,"point",rl_point);
- 		add_assoc_long(return_value,"end",rl_end);
--#ifdef HAVE_READLINE
-+#ifdef HAVE_LIBREADLINE
- 		add_assoc_long(return_value,"mark",rl_mark);
- 		add_assoc_long(return_value,"done",rl_done);
- 		add_assoc_long(return_value,"pending_input",rl_pending_input);
-@@ -174,7 +174,7 @@
- 			RETVAL_LONG(rl_point);
- 		} else if (! strcasecmp((*what)->value.str.val,"end")) {
- 			RETVAL_LONG(rl_end);
--#ifdef HAVE_READLINE
-+#ifdef HAVE_LIBREADLINE
- 		} else if (! strcasecmp((*what)->value.str.val,"mark")) {
- 			RETVAL_LONG(rl_mark);
- 		} else if (! strcasecmp((*what)->value.str.val,"done")) {
-@@ -256,7 +256,7 @@
- /* }}} */
- /* {{{ proto array readline_list_history(void) 
-    Lists the history */
--#ifdef HAVE_READLINE
-+#ifdef HAVE_LIBREADLINE
- PHP_FUNCTION(readline_list_history)
- {
- 	HIST_ENTRY **history;
diff --git a/www/mod_php5/files/patch-ext_sybase_ct_config.m4 b/www/mod_php5/files/patch-ext_sybase_ct_config.m4
index 8b4692e3c98d..0c5f32e997d0 100644
--- a/www/mod_php5/files/patch-ext_sybase_ct_config.m4
+++ b/www/mod_php5/files/patch-ext_sybase_ct_config.m4
@@ -1,20 +1,21 @@
---- ext/sybase_ct/config.m4.orig	Wed Mar 28 05:34:43 2001
-+++ ext/sybase_ct/config.m4	Fri Oct 26 21:35:50 2001
-@@ -20,16 +20,12 @@
-     fi
- 	PHP_ADD_INCLUDE($SYBASE_CT_INCDIR)
- 	PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR)
--	PHP_ADD_LIBRARY(cs)
- 	PHP_ADD_LIBRARY(ct)
--	PHP_ADD_LIBRARY(comn)
--	PHP_ADD_LIBRARY(intl)
--	SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl"
-+	SYBASE_CT_LIBS="-lct"
-     old_LDFLAGS=$LDFLAGS
-     LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR"
-     AC_CHECK_LIB(tcl, netg_errstr,
-               [ PHP_ADD_LIBRARY(tcl) ],
--              [ PHP_ADD_LIBRARY(sybtcl) ],
-               [ $SYBASE_CT_LIBS ])
-     AC_CHECK_LIB(insck, insck__getVdate,
-               [ PHP_ADD_LIBRARY(insck) ])
+--- ext/sybase_ct/config.m4.orig	Wed Dec 19 19:36:23 2001
++++ ext/sybase_ct/config.m4	Wed Dec 19 19:38:08 2001
+@@ -19,17 +19,12 @@
+ 
+   PHP_ADD_INCLUDE($SYBASE_CT_INCDIR)
+   PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
+-  PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
+   PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
+-  PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD)
+-  PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
+ 
+-  SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
++  SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
+ 
+   AC_CHECK_LIB(tcl, netg_errstr, [
+     PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD)
+-  ],[ 
+-    PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
+   ],[ 
+     $SYBASE_CT_LIBS 
+   ])
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index b277d7bf36e4..b607a9663664 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -1,7 +1,9 @@
 bin/pear
+bin/pearize
 bin/php-config
 bin/phpextdist
 bin/phpize
+bin/phptar
 etc/php.ini-dist
 include/php/TSRM/TSRM.h
 include/php/TSRM/acconfig.h
@@ -84,7 +86,6 @@ include/php/ext/standard/php_link.h
 include/php/ext/standard/php_mail.h
 include/php/ext/standard/php_math.h
 include/php/ext/standard/php_metaphone.h
-include/php/ext/standard/php_output.h
 include/php/ext/standard/php_parsedate.h
 include/php/ext/standard/php_rand.h
 include/php/ext/standard/php_smart_str.h
@@ -92,6 +93,7 @@ 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_var.h
+include/php/ext/standard/php_versioning.h
 include/php/ext/standard/quot_print.h
 include/php/ext/standard/reg.h
 include/php/ext/standard/scanf.h
@@ -100,17 +102,6 @@ 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/xmlparse/expat_hashtable.h
-include/php/ext/xml/expat/xmlparse/xmlparse.h
-include/php/ext/xml/expat/xmltok/asciitab.h
-include/php/ext/xml/expat/xmltok/iasciitab.h
-include/php/ext/xml/expat/xmltok/latin1tab.h
-include/php/ext/xml/expat/xmltok/nametab.h
-include/php/ext/xml/expat/xmltok/utf8tab.h
-include/php/ext/xml/expat/xmltok/xmldef.h
-include/php/ext/xml/expat/xmltok/xmlrole.h
-include/php/ext/xml/expat/xmltok/xmltok.h
-include/php/ext/xml/expat/xmltok/xmltok_impl.h
 include/php/ext/xml/php_xml.h
 include/php/main/SAPI.h
 include/php/main/build-defs.h
@@ -129,6 +120,7 @@ include/php/main/php_logos.h
 include/php/main/php_main.h
 include/php/main/php_network.h
 include/php/main/php_open_temporary_file.h
+include/php/main/php_output.h
 include/php/main/php_reentrancy.h
 include/php/main/php_regex.h
 include/php/main/php_streams.h
@@ -147,6 +139,7 @@ include/php/regex/regex.h
 include/php/regex/regex2.h
 include/php/regex/regex_extra.h
 include/php/regex/utils.h
+lib/php/Archive/Tar.php
 lib/php/Benchmark/Iterate.php
 lib/php/Benchmark/Timer.php
 lib/php/Cache.php
@@ -156,6 +149,7 @@ lib/php/Cache/Container/dbx.php
 lib/php/Cache/Container/file.php
 lib/php/Cache/Container/phplib.php
 lib/php/Cache/Container/shm.php
+lib/php/Cache/DB.php
 lib/php/Cache/Error.php
 lib/php/Cache/Function.php
 lib/php/Cache/Graphics.php
@@ -166,6 +160,7 @@ lib/php/Crypt/CBC.php
 lib/php/Crypt/HCEMD5.php
 lib/php/DB.php
 lib/php/DB/common.php
+lib/php/DB/fbsql.php
 lib/php/DB/ibase.php
 lib/php/DB/ifx.php
 lib/php/DB/msql.php
@@ -185,6 +180,7 @@ lib/php/HTML/Common.php
 lib/php/HTML/Form.php
 lib/php/HTML/IT.php
 lib/php/HTML/ITX.php
+lib/php/HTML/IT_Error.php
 lib/php/HTML/Page.php
 lib/php/HTML/Processor.php
 lib/php/HTML/Select.php
@@ -193,14 +189,15 @@ lib/php/HTTP.php
 lib/php/HTTP/Compress.php
 lib/php/Image/Remote.php
 lib/php/Log.php
+lib/php/Log/Observer.php
 lib/php/Log/composite.php
 lib/php/Log/file.php
 lib/php/Log/mcal.php
-lib/php/Log/observer.php
 lib/php/Log/sql.php
 lib/php/Log/syslog.php
 lib/php/Mail.php
 lib/php/Mail/RFC822.php
+lib/php/Mail/mime.php
 lib/php/Mail/sendmail.php
 lib/php/Mail/smtp.php
 lib/php/Math/Fraction.php
@@ -212,14 +209,16 @@ lib/php/Net/Socket.php
 lib/php/Numbers/Roman.php
 lib/php/PEAR.php
 lib/php/PEAR/Common.php
+lib/php/PEAR/Config.php
 lib/php/PEAR/Installer.php
 lib/php/PEAR/Packager.php
+lib/php/PEAR/Registry.php
+lib/php/PEAR/Remote.php
 lib/php/PEAR/Uploader.php
 lib/php/Payment/Verisign.php
 lib/php/Schedule/At.php
+lib/php/System.php
 lib/php/XML/Parser.php
-lib/php/XML/RPC.php
-lib/php/XML/RPC/Server.php
 lib/php/build/acinclude.m4
 lib/php/build/dynlib.m4
 lib/php/build/dynlib.mk
@@ -247,6 +246,8 @@ libexec/apache/libphp4.so
 @dirrm include/php/main
 @dirrm include/php/regex
 @dirrm include/php
+@dirrm lib/php/20010901
+@dirrm lib/php/Archive
 @dirrm lib/php/Benchmark
 @dirrm lib/php/Cache/Container
 @dirrm lib/php/Cache
@@ -266,7 +267,6 @@ libexec/apache/libphp4.so
 @dirrm lib/php/Payment
 @dirrm lib/php/PEAR
 @dirrm lib/php/Schedule
-@dirrm lib/php/XML/RPC
 @dirrm lib/php/XML
 @dirrm lib/php/build
 @dirrm lib/php