[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

update to php-4.3.0



This needs testing; most major change is the fact that PEAR now
works ...  I've attached a sample PEAR port (pear-Log), and
please play with the various 'pear list/show' commands and
make sure all works as intended.

You need to add a file with this line into
/usr/ports/infrastructure/mk/pear.port.mk

.include "${PORTSDIR}/www/php4/pear/files/pear.port.mk"

I've also got ports for various other PEAR modules, but
one should be sufficient for testing.

Anil
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/www/php4/Makefile.inc,v
retrieving revision 1.8
diff -u -r1.8 Makefile.inc
--- Makefile.inc	29 Oct 2002 01:42:41 -0000	1.8
+++ Makefile.inc	16 Feb 2003 23:24:53 -0000
@@ -4,7 +4,7 @@
 # and has Apache that supports DSO's.
 ONLY_FOR_ARCHS=	alpha i386 m68k powerpc sparc sparc64
 
-V=		4.2.3
+V=		4.3.0
 DISTNAME=	php-${V}
 
 CATEGORIES=	www lang
@@ -31,6 +31,7 @@
 
 MODULES_SUBDIR=		lib/php/modules
 MODULES_DIR=		${LOCALBASE}/${MODULES_SUBDIR}
+PEAR_DIR=		${LOCALBASE}/lib/php
 
 CONFIGURE_STYLE=	autoconf
 CONFIGURE_ENV=          CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
@@ -49,5 +50,5 @@
 CONFIGURE_ARGS+= 	--with-openssl \
 			--with-zlib 
 
-# XXX  How to run the test suite?
-NO_REGRESS=		Yes
+REGRESS_TARGET=		test
+REGRESS_FLAGS=		NO_INTERACTION=1
Index: core/Makefile
===================================================================
RCS file: /cvs/ports/www/php4/core/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- core/Makefile	6 Feb 2003 05:28:49 -0000	1.7
+++ core/Makefile	16 Feb 2003 23:24:53 -0000
@@ -1,16 +1,16 @@
 # $OpenBSD: Makefile,v 1.7 2003/02/06 05:28:49 brad Exp $
 
 COMMENT=	"server-side HTML-embedded scripting language"
-PKGNAME=	php4-core-${V}p1
+PKGNAME=	php4-core-${V}
 
 CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
 		--without-mysql \
-		--without-xml \
+		--enable-xml \
 		--enable-cli \
 		--with-iconv=${LOCALBASE} \
 		--with-gettext=${LOCALBASE} \
 		--enable-dio \
-		--without-pear \
+		--with-pear=${PEAR_DIR} \
 		--enable-bcmath \
 		--enable-session \
 		--enable-trans-sid \
Index: core/distinfo
===================================================================
RCS file: /cvs/ports/www/php4/core/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- core/distinfo	11 Sep 2002 23:16:48 -0000	1.3
+++ core/distinfo	16 Feb 2003 23:24:53 -0000
@@ -1,3 +1,3 @@
-MD5 (php-4.2.3.tar.gz) = 2a4a963d79d97ea2725c860c77e908a2
-RMD160 (php-4.2.3.tar.gz) = 37a2ede463cd9af1874fec4a5cfc874dead865ca
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
+MD5 (php-4.3.0.tar.gz) = 9e0eb9ee8e9193ee0a8aea2f428ec3de
+RMD160 (php-4.3.0.tar.gz) = e618b6b3cce929d3a5d104c85cd75b69186cee63
+SHA1 (php-4.3.0.tar.gz) = 8b7ba26adc38a4c97641002705af5c4b19dfd786
Index: core/patches/patch-aclocal_m4
===================================================================
RCS file: core/patches/patch-aclocal_m4
diff -N core/patches/patch-aclocal_m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ core/patches/patch-aclocal_m4	16 Feb 2003 23:24:53 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- aclocal.m4.orig	Wed Jan 22 11:09:53 2003
++++ aclocal.m4	Wed Jan 22 11:10:12 2003
+@@ -3976,7 +3976,7 @@ openbsd*)
+     shlibpath_overrides_runpath=yes
+   fi
+   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  finish_cmds=
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
Index: core/patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/www/php4/core/patches/patch-configure_in,v
retrieving revision 1.3
diff -u -r1.3 patch-configure_in
--- core/patches/patch-configure_in	22 Jul 2002 16:47:33 -0000	1.3
+++ core/patches/patch-configure_in	16 Feb 2003 23:24:53 -0000
@@ -1,28 +1,38 @@
-$OpenBSD: patch-configure_in,v 1.3 2002/07/22 16:47:33 avsm Exp $
---- configure.in.orig	Sun Jul 21 08:49:33 2002
-+++ configure.in	Mon Jul 22 10:43:06 2002
-@@ -791,7 +791,7 @@ unset with_pic
+$OpenBSD$
+--- configure.in.orig	Fri Dec 27 04:07:18 2002
++++ configure.in	Wed Jan 22 10:48:47 2003
+@@ -34,9 +34,7 @@ dnl check for working sed
+ PHP_PROG_SED
+ 
+ PHP_CONFIG_NICE(config.nice)
+-for arg in $0 "$@"; do
+-  CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
+-done
++CONFIGURE_COMMAND="Built via the OpenBSD Ports Tree"
+ 
+ AC_CANONICAL_HOST
+ AC_CONFIG_HEADER(main/php_config.h)
+@@ -806,14 +804,14 @@ unset with_pic
  
  case $php_build_target in
  program|static)
 -    standard_libtool_flag='-prefer-non-pic -static'
 +    standard_libtool_flag='-static'
-     if test "$lib_build_shared" != "yes"; then
+     if test -z "$PHP_MODULES"; then
          enable_shared=no
      fi
-@@ -800,7 +800,7 @@ program|static)
  ;;
  shared)
      enable_static=no
 -    standard_libtool_flag=-prefer-pic
 +    standard_libtool_flag=
-     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version"
+     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
  ;;
  esac
-@@ -920,7 +920,7 @@ EXPANDED_LIBDIR=$libdir
- EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
+@@ -926,7 +924,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
  EXPANDED_DATADIR=$datadir
  EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
+ EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
 -INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
 +INCLUDE_PATH=.:$libdir
  
Index: core/patches/patch-ext_iconv_iconv_c
===================================================================
RCS file: core/patches/patch-ext_iconv_iconv_c
diff -N core/patches/patch-ext_iconv_iconv_c
--- core/patches/patch-ext_iconv_iconv_c	17 Jul 2002 22:41:44 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_iconv_iconv_c,v 1.1 2002/07/17 22:41:44 naddy Exp $
---- ext/iconv/iconv.c.orig	Thu Jul 18 00:01:35 2002
-+++ ext/iconv/iconv.c	Thu Jul 18 00:01:59 2002
-@@ -87,7 +87,7 @@ ZEND_DECLARE_MODULE_GLOBALS(iconv)
- ZEND_GET_MODULE(iconv)
- #endif
- 
--static int php_iconv_string(const char * in_str, unsigned int in_len, char ** out_str, unsigned int * out_len, const char * in_encoding, const char * out_encoding, int *err TSRMLS_DC);
-+static int php_iconv_string(const char * in_str, size_t in_len, char ** out_str, size_t * out_len, const char * in_encoding, const char * out_encoding, int *err TSRMLS_DC);
- 
- /* {{{ PHP_INI
-  */
Index: core/patches/patch-ext_standard_string_c
===================================================================
RCS file: core/patches/patch-ext_standard_string_c
diff -N core/patches/patch-ext_standard_string_c
--- core/patches/patch-ext_standard_string_c	6 Feb 2003 05:28:49 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,106 +0,0 @@
-$OpenBSD: patch-ext_standard_string_c,v 1.1 2003/02/06 05:28:49 brad Exp $
---- ext/standard/string.c.orig	Mon Jun 24 04:19:43 2002
-+++ ext/standard/string.c	Wed Feb  5 23:54:56 2003
-@@ -616,7 +616,7 @@ PHP_FUNCTION(wordwrap)
- {
- 	const char *text, *breakchar = "\n";
- 	char *newtext;
--	int textlen, breakcharlen = 1, newtextlen;
-+	int textlen, breakcharlen = 1, newtextlen, alloced, chk;
- 	long current = 0, laststart = 0, lastspace = 0;
- 	long linelength = 75;
- 	zend_bool docut = 0;
-@@ -642,38 +642,40 @@ PHP_FUNCTION(wordwrap)
- 		for (current = 0; current < textlen; current++) {
- 			if (text[current] == breakchar[0]) {
- 				laststart = lastspace = current;
--			}
--			else if (text[current] == ' ') {
-+			} else if (text[current] == ' ') {
- 				if (current - laststart >= linelength) {
- 					newtext[current] = breakchar[0];
- 					laststart = current;
- 				}
- 				lastspace = current;
--			}
--			else if (current - laststart >= linelength
--					&& laststart != lastspace) {
-+			} else if (current - laststart >= linelength && laststart != lastspace) {
- 				newtext[lastspace] = breakchar[0];
- 				laststart = lastspace;
- 			}
- 		}
- 
- 		RETURN_STRINGL(newtext, textlen, 0);
--	}
--	else {
-+	} else {
- 		/* Multiple character line break or forced cut */
- 		if (linelength > 0) {
--			newtextlen = textlen + (textlen/linelength + 1) * breakcharlen + 1;
--		}
--		else {
--			newtextlen = textlen * (breakcharlen + 1) + 1;
-+			chk = (int)(textlen/linelength + 1);
-+			alloced = textlen + chk * breakcharlen + 1;
-+		} else {
-+			chk = textlen;
-+			alloced = textlen * (breakcharlen + 1) + 1;
- 		}
--		newtext = emalloc(newtextlen);
-+		newtext = emalloc(alloced);
- 
- 		/* now keep track of the actual new text length */
- 		newtextlen = 0;
- 
- 		laststart = lastspace = 0;
- 		for (current = 0; current < textlen; current++) {
-+			if (chk <= 0) {
-+				alloced += (int) (((textlen - current + 1)/linelength + 1) * breakcharlen) + 1;
-+				newtext = erealloc(newtext, alloced);
-+				chk = (int) ((textlen - current)/linelength) + 1;
-+			}
- 			/* when we hit an existing break, copy to new buffer, and
- 			 * fix up laststart and lastspace */
- 			if (text[current] == breakchar[0]
-@@ -683,6 +685,7 @@ PHP_FUNCTION(wordwrap)
- 				newtextlen += current-laststart+breakcharlen;
- 				current += breakcharlen - 1;
- 				laststart = lastspace = current + 1;
-+				chk--;
- 			}
- 			/* if it is a space, check if it is at the line boundary,
- 			 * copy and insert a break, or just keep track of it */
-@@ -693,6 +696,7 @@ PHP_FUNCTION(wordwrap)
- 					memcpy(newtext+newtextlen, breakchar, breakcharlen);
- 					newtextlen += breakcharlen;
- 					laststart = current + 1;
-+					chk--;
- 				}
- 				lastspace = current;
- 			}
-@@ -706,6 +710,7 @@ PHP_FUNCTION(wordwrap)
- 				memcpy(newtext+newtextlen, breakchar, breakcharlen);
- 				newtextlen += breakcharlen;
- 				laststart = lastspace = current;
-+				chk--;
- 			}
- 			/* if the current word puts us over the linelength, copy
- 			 * back up until the last space, insert a break, and move
-@@ -717,6 +722,7 @@ PHP_FUNCTION(wordwrap)
- 				memcpy(newtext+newtextlen, breakchar, breakcharlen);
- 				newtextlen += breakcharlen;
- 				laststart = lastspace = lastspace + 1;
-+				chk--;
- 			}
- 		}
- 
-@@ -727,6 +733,8 @@ PHP_FUNCTION(wordwrap)
- 		}
- 
- 		newtext[newtextlen] = '\0';
-+		/* free unused memory */
-+		newtext = erealloc(newtext, newtextlen+1);
- 
- 		RETURN_STRINGL(newtext, newtextlen, 0);
- 	}
Index: core/patches/patch-ltmain_sh
===================================================================
RCS file: /cvs/ports/www/php4/core/patches/patch-ltmain_sh,v
retrieving revision 1.2
diff -u -r1.2 patch-ltmain_sh
--- core/patches/patch-ltmain_sh	12 Aug 2002 04:27:41 -0000	1.2
+++ core/patches/patch-ltmain_sh	16 Feb 2003 23:24:53 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-ltmain_sh,v 1.2 2002/08/12 04:27:41 avsm Exp $
---- ltmain.sh.orig	Thu Aug  8 03:07:04 2002
-+++ ltmain.sh	Thu Aug  8 03:07:34 2002
-@@ -4412,40 +4412,6 @@ relink_command=\"$relink_command\""
+--- ltmain.sh.orig	Sun Jun 30 00:24:48 2002
++++ ltmain.sh	Mon Jan 20 14:01:25 2003
+@@ -4446,40 +4446,6 @@ relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
      test "$show" = ":" && exit 0
  
Index: core/patches/patch-main_php_open_temporary_file_c
===================================================================
RCS file: /cvs/ports/www/php4/core/patches/patch-main_php_open_temporary_file_c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-main_php_open_temporary_file_c
--- core/patches/patch-main_php_open_temporary_file_c	24 Jun 2002 19:23:41 -0000	1.1.1.1
+++ core/patches/patch-main_php_open_temporary_file_c	16 Feb 2003 23:24:53 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-main_php_open_temporary_file_c,v 1.1.1.1 2002/06/24 19:23:41 avsm Exp $
---- main/php_open_temporary_file.c.orig	Thu May 10 19:32:30 2001
-+++ main/php_open_temporary_file.c	Thu May 10 19:32:44 2001
-@@ -110,7 +110,7 @@ static FILE *php_do_open_temporary_file(
+$OpenBSD$
+--- main/php_open_temporary_file.c.orig	Sun Jan 19 17:05:39 2003
++++ main/php_open_temporary_file.c	Sun Jan 19 17:05:52 2003
+@@ -128,7 +128,7 @@ static FILE *php_do_open_temporary_file(
  		trailing_slash = "/";
  	}
  
Index: core/patches/patch-php_ini-dist
===================================================================
RCS file: /cvs/ports/www/php4/core/patches/patch-php_ini-dist,v
retrieving revision 1.6
diff -u -r1.6 patch-php_ini-dist
--- core/patches/patch-php_ini-dist	11 Sep 2002 23:16:48 -0000	1.6
+++ core/patches/patch-php_ini-dist	16 Feb 2003 23:24:53 -0000
@@ -1,17 +1,17 @@
-$OpenBSD: patch-php_ini-dist,v 1.6 2002/09/11 23:16:48 avsm Exp $
---- php.ini-dist.orig	Wed Aug 14 23:35:36 2002
-+++ php.ini-dist	Sat Aug 24 12:54:49 2002
-@@ -356,9 +356,6 @@ default_mimetype = "text/html"
+$OpenBSD$
+--- php.ini-dist.orig	Thu Dec 26 13:27:08 2002
++++ php.ini-dist	Sun Feb 16 22:38:40 2003
+@@ -404,9 +404,6 @@ default_mimetype = "text/html"
+ 
  ; UNIX: "/path1:/path2"  
  ;include_path = ".:/php/includes"
- ;
+-;
 -; Windows: "\path1;\path2"
 -;include_path = ".;c:\php\includes"
--
+ 
  ; The root of the PHP pages, used only if nonempty.
  ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
- ; if you are running php as a CGI under any web server (other than IIS)
-@@ -371,7 +368,7 @@ doc_root =
+@@ -420,7 +417,7 @@ doc_root =
  user_dir =
  
  ; Directory in which the loadable extensions (modules) reside.
@@ -20,7 +20,7 @@
  
  ; Whether or not to enable the dl() function.  The dl() function does NOT work
  ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -410,85 +407,11 @@ upload_max_filesize = 2M
+@@ -474,7 +471,7 @@ upload_max_filesize = 2M
  ;;;;;;;;;;;;;;;;;;
  
  ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
@@ -29,6 +29,9 @@
  
  ; Define the anonymous ftp password (your email address)
  ;from="john@doe.com"
+@@ -492,80 +489,6 @@ default_socket_timeout = 60
+ ; fgets() and file() will work regardless of the source of the file.
+ ; auto_detect_line_endings = Off
  
 -
 -;;;;;;;;;;;;;;;;;;;;;;
@@ -57,36 +60,36 @@
 -;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
 -;
 -;extension=php_bz2.dll
--;extension=php_ctype.dll
 -;extension=php_cpdf.dll
+-;extension=php_crack.dll
 -;extension=php_curl.dll
--;extension=php_cybercash.dll
 -;extension=php_db.dll
 -;extension=php_dba.dll
 -;extension=php_dbase.dll
 -;extension=php_dbx.dll
 -;extension=php_domxml.dll
--;extension=php_dotnet.dll
 -;extension=php_exif.dll
 -;extension=php_fbsql.dll
 -;extension=php_fdf.dll
 -;extension=php_filepro.dll
 -;extension=php_gd.dll
+-;extension=php_gd2.dll
 -;extension=php_gettext.dll
 -;extension=php_hyperwave.dll
 -;extension=php_iconv.dll
 -;extension=php_ifx.dll
 -;extension=php_iisfunc.dll
 -;extension=php_imap.dll
--;extension=php_ingres.dll
 -;extension=php_interbase.dll
 -;extension=php_java.dll
 -;extension=php_ldap.dll
 -;extension=php_mbstring.dll
 -;extension=php_mcrypt.dll
 -;extension=php_mhash.dll
+-;extension=php_mime_magic.dll
 -;extension=php_ming.dll
 -;extension=php_mssql.dll
+-;extension=php_msql.dll
 -;extension=php_oci8.dll
 -;extension=php_openssl.dll
 -;extension=php_oracle.dll
@@ -97,17 +100,17 @@
 -;extension=php_snmp.dll
 -;extension=php_sockets.dll
 -;extension=php_sybase_ct.dll
--;extension=php_tokenizer.dll
 -;extension=php_w32api.dll
+-;extension=php_xmlrpc.dll
 -;extension=php_xslt.dll
 -;extension=php_yaz.dll
--;extension=php_zlib.dll
+-;extension=php_zip.dll
 -
 -
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
  ;;;;;;;;;;;;;;;;;;;
-@@ -500,11 +423,6 @@ allow_url_fopen = On
+@@ -577,13 +500,8 @@ default_socket_timeout = 60
  define_syslog_variables  = Off
  
  [mail function]
@@ -117,15 +120,16 @@
 -; For Win32 only.
 -sendmail_from = me@localhost.com
  
- ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
+-; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
++;You may supply arguments as well (default: "sendmail -t -i").
  ;sendmail_path =
-@@ -885,6 +803,41 @@ sockets.use_system_read = On
- ;fbsql.max_results = 128
- ;fbsql.batchSize = 1000
- 
--; Local Variables:
--; tab-width: 4
--; End:
+ 
+ [Java]
+@@ -1091,3 +1009,57 @@ sockets.use_system_read = On
+ ; Local Variables:
+ ; tab-width: 4
+ ; End:
++
 +;;;;;;;;;;;;;;;;;;;;;;
 +; Dynamic Extensions ;
 +;;;;;;;;;;;;;;;;;;;;;;
@@ -133,34 +137,49 @@
 +; If you wish to have an extension loaded automatically, use the following
 +; syntax:
 +;
-+;   extension=modulename.extension
-+;
-+; For example under UNIX:
-+;
-+;   extension=msql.so
++;   extension=modulename.so
 +;
-+; Note that it should be the name of the module only; no directory information 
++; Note that it should be the name of the module only; no directory information
 +; needs to go here.  Specify the location of the extension with the
 +; extension_dir directive above.
 +
 +;extension=bz2.so
++;extension=cpdf.so
++;extension=crack.so
 +;extension=curl.so
++;extension=db.so
 +;extension=dba.so
 +;extension=dbase.so
++;extension=dbx.so
++;extension=domxml.so
++;extension=exif.so
++;extension=fbsql.so
++;extension=fdf.so
 +;extension=filepro.so
 +;extension=gd.so
-+;extension=gmp.so
++;extension=hyperwave.so
++;extension=ifx.so
 +;extension=imap.so
++;extension=interbase.so
++;extension=java.so
 +;extension=ldap.so
++;extension=mbstring.so
 +;extension=mcrypt.so
 +;extension=mhash.so
-+;extension=mysql.so
-+;extension=ncurses.so
-+;extension=odbc.so
++;extension=ming.so
++;extension=mssql.so
++;extension=msql.so
++;extension=oci8.so
++;extension=openssl.so
++;extension=oracle.so
 +;extension=pdf.so
 +;extension=pgsql.so
++;extension=printer.so
 +;extension=shmop.so
 +;extension=snmp.so
++;extension=sockets.so
 +;extension=sybase_ct.so
-+;extension=xml.so
++;extension=xmlrpc.so
 +;extension=xslt.so
++;extension=yaz.so
++;extension=zip.so
Index: core/patches/patch-php_ini-recommended
===================================================================
RCS file: /cvs/ports/www/php4/core/patches/patch-php_ini-recommended,v
retrieving revision 1.6
diff -u -r1.6 patch-php_ini-recommended
--- core/patches/patch-php_ini-recommended	11 Sep 2002 23:16:48 -0000	1.6
+++ core/patches/patch-php_ini-recommended	16 Feb 2003 23:24:53 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-php_ini-recommended,v 1.6 2002/09/11 23:16:48 avsm Exp $
---- php.ini-recommended.orig	Wed Aug 14 23:35:36 2002
-+++ php.ini-recommended	Sat Aug 24 12:54:49 2002
-@@ -361,9 +361,6 @@ default_mimetype = "text/html"
+--- php.ini-recommended.orig	Thu Dec 26 13:27:08 2002
++++ php.ini-recommended	Sun Feb 16 22:39:08 2003
+@@ -420,9 +420,6 @@ default_mimetype = "text/html"
  ; UNIX: "/path1:/path2"  
  ;include_path = ".:/php/includes"
  ;
@@ -11,7 +11,7 @@
  ; The root of the PHP pages, used only if nonempty.
  ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
  ; if you are running php as a CGI under any web server (other than IIS)
-@@ -376,7 +373,7 @@ doc_root =
+@@ -435,7 +432,7 @@ doc_root =
  user_dir =
  
  ; Directory in which the loadable extensions (modules) reside.
@@ -20,7 +20,7 @@
  
  ; Whether or not to enable the dl() function.  The dl() function does NOT work
  ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -417,85 +414,11 @@ upload_max_filesize = 2M
+@@ -489,7 +486,7 @@ upload_max_filesize = 2M
  ;;;;;;;;;;;;;;;;;;
  
  ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
@@ -29,8 +29,10 @@
  
  ; Define the anonymous ftp password (your email address)
  ;from="john@doe.com"
+@@ -508,79 +505,6 @@ default_socket_timeout = 60
+ ; auto_detect_line_endings = Off
+ 
  
--
 -;;;;;;;;;;;;;;;;;;;;;;
 -; Dynamic Extensions ;
 -;;;;;;;;;;;;;;;;;;;;;;
@@ -57,36 +59,36 @@
 -;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
 -;
 -;extension=php_bz2.dll
--;extension=php_ctype.dll
 -;extension=php_cpdf.dll
+-;extension=php_crack.dll
 -;extension=php_curl.dll
--;extension=php_cybercash.dll
 -;extension=php_db.dll
 -;extension=php_dba.dll
 -;extension=php_dbase.dll
 -;extension=php_dbx.dll
 -;extension=php_domxml.dll
--;extension=php_dotnet.dll
 -;extension=php_exif.dll
 -;extension=php_fbsql.dll
 -;extension=php_fdf.dll
 -;extension=php_filepro.dll
 -;extension=php_gd.dll
+-;extension=php_gd2.dll
 -;extension=php_gettext.dll
 -;extension=php_hyperwave.dll
 -;extension=php_iconv.dll
 -;extension=php_ifx.dll
 -;extension=php_iisfunc.dll
 -;extension=php_imap.dll
--;extension=php_ingres.dll
 -;extension=php_interbase.dll
 -;extension=php_java.dll
 -;extension=php_ldap.dll
 -;extension=php_mbstring.dll
 -;extension=php_mcrypt.dll
 -;extension=php_mhash.dll
+-;extension=php_mime_magic.dll
 -;extension=php_ming.dll
 -;extension=php_mssql.dll
+-;extension=php_msql.dll
 -;extension=php_oci8.dll
 -;extension=php_openssl.dll
 -;extension=php_oracle.dll
@@ -97,17 +99,17 @@
 -;extension=php_snmp.dll
 -;extension=php_sockets.dll
 -;extension=php_sybase_ct.dll
--;extension=php_tokenizer.dll
 -;extension=php_w32api.dll
+-;extension=php_xmlrpc.dll
 -;extension=php_xslt.dll
 -;extension=php_yaz.dll
--;extension=php_zlib.dll
+-;extension=php_zip.dll
 -
 -
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
  ;;;;;;;;;;;;;;;;;;;
-@@ -507,11 +430,6 @@ allow_url_fopen = On
+@@ -592,11 +516,6 @@ default_socket_timeout = 60
  define_syslog_variables  = Off
  
  [mail function]
@@ -119,9 +121,9 @@
  
  ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
  ;sendmail_path =
-@@ -892,6 +810,41 @@ sockets.use_system_read = On
- ;fbsql.max_results = 128
- ;fbsql.batchSize = 1000
+@@ -1083,6 +1002,56 @@ sockets.use_system_read = On
+ ;exif.decode_jis_motorola = JIS
+ ;exif.decode_jis_intel    = JIS
  
 -; Local Variables:
 -; tab-width: 4
@@ -133,34 +135,49 @@
 +; If you wish to have an extension loaded automatically, use the following
 +; syntax:
 +;
-+;   extension=modulename.extension
-+;
-+; For example under UNIX:
-+;
-+;   extension=msql.so
++;   extension=modulename.so
 +;
 +; Note that it should be the name of the module only; no directory information 
 +; needs to go here.  Specify the location of the extension with the
 +; extension_dir directive above.
 +
 +;extension=bz2.so
++;extension=cpdf.so
++;extension=crack.so
 +;extension=curl.so
++;extension=db.so
 +;extension=dba.so
 +;extension=dbase.so
++;extension=dbx.so
++;extension=domxml.so
++;extension=exif.so
++;extension=fbsql.so
++;extension=fdf.so
 +;extension=filepro.so
 +;extension=gd.so
-+;extension=gmp.so
++;extension=hyperwave.so
++;extension=ifx.so
 +;extension=imap.so
++;extension=interbase.so
++;extension=java.so
 +;extension=ldap.so
++;extension=mbstring.so
 +;extension=mcrypt.so
 +;extension=mhash.so
-+;extension=mysql.so
-+;extension=ncurses.so
-+;extension=odbc.so
++;extension=ming.so
++;extension=mssql.so
++;extension=msql.so
++;extension=oci8.so
++;extension=openssl.so
++;extension=oracle.so
 +;extension=pdf.so
 +;extension=pgsql.so
++;extension=printer.so
 +;extension=shmop.so
 +;extension=snmp.so
++;extension=sockets.so
 +;extension=sybase_ct.so
-+;extension=xml.so
++;extension=xmlrpc.so
 +;extension=xslt.so
++;extension=yaz.so
++;extension=zip.so
Index: core/patches/patch-run-tests_php
===================================================================
RCS file: core/patches/patch-run-tests_php
diff -N core/patches/patch-run-tests_php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ core/patches/patch-run-tests_php	16 Feb 2003 23:24:53 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- run-tests.php.orig	Thu Jan 23 13:26:55 2003
++++ run-tests.php	Thu Jan 23 13:27:05 2003
+@@ -44,6 +44,8 @@ if (getenv('TEST_PHP_SRCDIR')) {
+ 
+ $cwd = getcwd();
+ set_time_limit(0);
++
++ob_flush();
+ while(ob_get_level()) {
+ 	ob_end_clean();
+ }
Index: extensions/Makefile
===================================================================
RCS file: /cvs/ports/www/php4/extensions/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- extensions/Makefile	14 Sep 2002 15:22:06 -0000	1.17
+++ extensions/Makefile	16 Feb 2003 23:24:53 -0000
@@ -3,6 +3,9 @@
 FULLPKGNAME=	php4-extensions-${V}
 COMMENT=	"informational package about PHP4 extensions"
 
+PATCH_LIST=	${PORTSDIR}/www/php4/core/patches/patch-* \
+		patch-*
+
 MULTI_PACKAGES=
 SUBPACKAGE?=
 
@@ -13,15 +16,16 @@
 MODULES=	gettext iconv
 
 CONFIGURE_ARGS+=	--with-apxs=/usr/sbin/apxs \
-			--with-iconv-dir=${LOCALBASE} --with-iconv=${LOCALBASE}
+			--with-iconv-dir=${LOCALBASE} \
+			--with-iconv=${LOCALBASE}
 
 GRAPHIC_DEPENDS=	jpeg.62::graphics/jpeg \
 			png.3::graphics/png \
 			tiff.35::graphics/tiff
 
-GRAPHIC_CONFIG=		--with-jpeg-dir=shared,${LOCALBASE} \
-			--with-png-dir=shared,${LOCALBASE} \
-			--with-tiff-dir=shared,${LOCALBASE}
+GRAPHIC_CONFIG=		--with-jpeg-dir=${LOCALBASE} \
+			--with-png-dir=${LOCALBASE} \
+			--with-tiff-dir=${LOCALBASE}
 
 # bz2
 PSEUDO_FLAVORS+=	no_bz2
@@ -95,15 +99,14 @@
 .else
 MULTI_PACKAGES+=	-gd
 COMMENT-gd=		"image manipulation extensions for php4"
-GD_DEPENDS=		gd.18::graphics/gd ${GRAPHIC_DEPENDS} \
-			ttf.1::print/freetype
-CONFIGURE_ARGS+=	--with-gd=shared,${LOCALBASE} ${GRAPHIC_CONFIG} \
+GD_DEPENDS=		ttf.1::print/freetype
+CONFIGURE_ARGS+=	--with-gd=shared ${GRAPHIC_CONFIG} \
 			--with-ttf=shared,${LOCALBASE} --without-freetype-dir
 .if !${FLAVOR:L:Mno_x11}
-USE_X11=		yes
-CONFIGURE_ARGS+=	--with-xpm-dir=${X11BASE}
+USE_X11=               yes
+CONFIGURE_ARGS+=       --with-xpm-dir=${X11BASE}
 .else
-CONFIGURE_ARGS+=	--without-xpm-dir 
+CONFIGURE_ARGS+=       --without-xpm-dir
 .endif
 .endif
 
@@ -126,7 +129,7 @@
 MULTI_PACKAGES+=	-imap
 COMMENT-imap=		"imap, pop3 and nntp extensions for php4"
 CONFIGURE_ARGS+=	--with-imap=shared,${LOCALBASE} \
-			--with-kerberos=/usr/lib --with-imap-ssl
+			--with-kerberos=/usr --with-imap-ssl
 IMAP_DEPENDS=		c-client.3::mail/c-client
 .endif
 
@@ -264,12 +267,12 @@
 # wddx & xml
 PSEUDO_FLAVORS+=	no_xml
 .if ${FLAVOR:L:Mno_xml}
-CONFIGURE_ARGS+=	--without-wddx --without-xml
+CONFIGURE_ARGS+=	--without-wddx --disable-xml
 .else
 MULTI_PACKAGES+=	-xml
 COMMENT-xml=		"xml parsing extensions for php4"
-CONFIGURE_ARGS+=	--with-wddx=shared --with-xml=shared \
-			--with-expat-dir=shared,${LOCALBASE}
+CONFIGURE_ARGS+=	--with-wddx=shared --enable-xml=shared \
+			--with-expat-dir=${LOCALBASE}
 XML_DEPENDS=		expat.2::textproc/expat
 .endif
 
@@ -281,7 +284,7 @@
 MULTI_PACKAGES+=	-xslt
 COMMENT-xslt=		"xslt transformation extensions for php4"
 CONFIGURE_ARGS+=	--enable-xslt=shared --with-xslt-sablot=shared,${LOCALBASE} \
-			--with-expat-dir=shared,${LOCALBASE}
+			--with-expat-dir=${LOCALBASE}
 XSLT_DEPENDS=		sablot.96::textproc/sablotron expat.2::textproc/expat
 .endif
 
Index: extensions/distinfo
===================================================================
RCS file: /cvs/ports/www/php4/extensions/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- extensions/distinfo	11 Sep 2002 23:16:48 -0000	1.3
+++ extensions/distinfo	16 Feb 2003 23:24:53 -0000
@@ -1,3 +1,3 @@
-MD5 (php-4.2.3.tar.gz) = 2a4a963d79d97ea2725c860c77e908a2
-RMD160 (php-4.2.3.tar.gz) = 37a2ede463cd9af1874fec4a5cfc874dead865ca
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
+MD5 (php-4.3.0.tar.gz) = 9e0eb9ee8e9193ee0a8aea2f428ec3de
+RMD160 (php-4.3.0.tar.gz) = e618b6b3cce929d3a5d104c85cd75b69186cee63
+SHA1 (php-4.3.0.tar.gz) = 8b7ba26adc38a4c97641002705af5c4b19dfd786
Index: extensions/patches/patch-Makefile_in
===================================================================
RCS file: extensions/patches/patch-Makefile_in
diff -N extensions/patches/patch-Makefile_in
--- extensions/patches/patch-Makefile_in	24 Jun 2002 19:27:48 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2002/06/24 19:27:48 avsm Exp $
---- Makefile.in.orig	Fri Jun 21 09:32:31 2002
-+++ Makefile.in	Fri Jun 21 09:33:45 2002
-@@ -1,6 +1,6 @@
- 
- ZEND_DIR = $(srcdir)/Zend
--SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) $(CLI_DIR) . $(PEAR_DIR)
-+SUBDIRS = ext
- 
- LTLIBRARY_NAME = libphp4.la
- LTLIBRARY_SOURCES = stub.c
-@@ -22,7 +22,7 @@ PROGRAM_LDADD        = libphp4.la $(EXT_
- PROGRAM_LDFLAGS      = -export-dynamic	
- PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)
- 
--targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
-+targets = 
- 
- install_targets = install-sapi install-modules
- 
Index: extensions/patches/patch-aclocal_m4
===================================================================
RCS file: extensions/patches/patch-aclocal_m4
diff -N extensions/patches/patch-aclocal_m4
--- extensions/patches/patch-aclocal_m4	11 Sep 2002 23:16:48 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-aclocal_m4,v 1.2 2002/09/11 23:16:48 avsm Exp $
---- aclocal.m4.orig	Sat Aug 24 02:08:12 2002
-+++ aclocal.m4	Sat Aug 24 13:34:25 2002
-@@ -3683,7 +3683,7 @@ openbsd*)
-     shlibpath_overrides_runpath=yes
-   fi
-   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  finish_cmds=
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
Index: extensions/patches/patch-configure_in
===================================================================
RCS file: extensions/patches/patch-configure_in
diff -N extensions/patches/patch-configure_in
--- extensions/patches/patch-configure_in	11 Sep 2002 23:16:48 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.3 2002/09/11 23:16:48 avsm Exp $
---- configure.in.orig	Fri Sep  6 00:20:49 2002
-+++ configure.in	Sat Sep  7 19:21:34 2002
-@@ -787,7 +787,7 @@ unset with_pic
- 
- case $php_build_target in
- program|static)
--    standard_libtool_flag='-prefer-non-pic -static'
-+    standard_libtool_flag='-static'
-     if test "$lib_build_shared" != "yes"; then
-         enable_shared=no
-     fi
-@@ -796,7 +796,7 @@ program|static)
- ;;
- shared)
-     enable_static=no
--    standard_libtool_flag=-prefer-pic
-+    standard_libtool_flag=
-     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version"
- ;;
- esac
Index: extensions/patches/patch-ext_gd_config_m4
===================================================================
RCS file: extensions/patches/patch-ext_gd_config_m4
diff -N extensions/patches/patch-ext_gd_config_m4
--- extensions/patches/patch-ext_gd_config_m4	11 Sep 2002 23:16:48 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
-$OpenBSD: patch-ext_gd_config_m4,v 1.2 2002/09/11 23:16:48 avsm Exp $
---- ext/gd/config.m4.orig	Wed Apr 24 00:18:06 2002
-+++ ext/gd/config.m4	Sun Sep  8 00:28:41 2002
-@@ -135,6 +135,8 @@ AC_DEFUN(PHP_GD_FREETYPE2,[
-     done
-     
-     if test -n "$FREETYPE2_DIR" ; then
-+      PHP_ADD_LIBRARY_WITH_PATH(Xfont, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD)
-+      PHP_ADD_LIBRARY_WITH_PATH(fntstubs, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD)
-       PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD)
-       PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
-       AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
-@@ -209,6 +211,7 @@ PHP_ARG_WITH(gd, for GD support,
- [  --with-gd[=DIR]         Include GD support (DIR is GD's install dir).])
- 
- if test "$PHP_GD" != "no"; then
-+  remember_ext_shared=$ext_shared
- 
-   PHP_EXTENSION(gd, $ext_shared)
-   PHP_SUBST(GD_SHARED_LIBADD)
-@@ -239,6 +242,7 @@ dnl Various checks for GD features
-     done
-   done
- 
-+  ext_shared=$remember_ext_shared
-   if test -n "$GD_INCLUDE" -a -n "$GD_LIB" ; then
-     PHP_ADD_LIBRARY_WITH_PATH(gd, $GD_LIB, GD_SHARED_LIBADD)
-     AC_DEFINE(HAVE_LIBGD,1,[ ])
-@@ -246,16 +250,6 @@ dnl Various checks for GD features
-   else
-     AC_MSG_ERROR([Unable to find libgd.(a|so) anywhere under $GD_SEARCH_PATHS])
-   fi 
--
--dnl NetBSD package structure
--  if test -f /usr/pkg/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
--    GD_INCLUDE=/usr/pkg/include/gd
--  fi
--
--dnl SuSE 6.x package structure
--  if test -f /usr/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
--    GD_INCLUDE=/usr/include/gd
--  fi
- 
-   PHP_EXPAND_PATH($GD_INCLUDE, GD_INCLUDE)
-   PHP_ADD_INCLUDE($GD_INCLUDE)
Index: extensions/patches/patch-ext_imap_config_m4
===================================================================
RCS file: extensions/patches/patch-ext_imap_config_m4
diff -N extensions/patches/patch-ext_imap_config_m4
--- extensions/patches/patch-ext_imap_config_m4	11 Sep 2002 23:16:48 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-ext_imap_config_m4,v 1.3 2002/09/11 23:16:48 avsm Exp $
---- ext/imap/config.m4.orig	Wed Aug 21 00:09:01 2002
-+++ ext/imap/config.m4	Sat Aug 24 13:34:25 2002
-@@ -36,10 +36,12 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [
-   if test "$PHP_KERBEROS" != "no"; then
-     AC_DEFINE(HAVE_IMAP_KRB,1,[ ])
-     PHP_ADD_LIBPATH($PHP_KERBEROS/lib, IMAP_SHARED_LIBADD)
--    PHP_ADD_LIBRARY(gssapi_krb5, 1, IMAP_SHARED_LIBADD)
-+    PHP_ADD_LIBRARY(gssapi, 1, IMAP_SHARED_LIBADD)
-+    PHP_ADD_LIBRARY(krb, 1, IMAP_SHARED_LIBADD)
-     PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD)
--    PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD)
--    PHP_ADD_LIBRARY(com_err,  1, IMAP_SHARED_LIBADD)
-+    PHP_ADD_LIBRARY(asn1, 1, IMAP_SHARED_LIBADD)
-+    PHP_ADD_LIBRARY(des,  1, IMAP_SHARED_LIBADD)
-+    PHP_ADD_LIBRARY(kafs, 1, IMAP_SHARED_LIBADD)
-   else
-     AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
-       AC_MSG_ERROR(This c-client library is built with Kerberos support. 
-@@ -71,7 +73,7 @@ AC_DEFUN(PHP_IMAP_SSL_CHK, [
-     old_LIBS=$LIBS
-     LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB"
-     if test $PHP_KERBEROS != "no"; then
--      LIBS="$LIBS -L$PHP_KERBEROS/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-+      LIBS="$LIBS -L$PHP_KERBEROS/lib -lgssapi -lkrb -lkrb5 -lasn1 -lcom_err_pic -lkafs -ldes"
-     fi
- 
-     AC_TRY_RUN([
Index: extensions/patches/patch-ext_mysql_config_m4
===================================================================
RCS file: extensions/patches/patch-ext_mysql_config_m4
diff -N extensions/patches/patch-ext_mysql_config_m4
--- extensions/patches/patch-ext_mysql_config_m4	24 Jun 2002 19:27:48 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_mysql_config_m4,v 1.1.1.1 2002/06/24 19:27:48 avsm Exp $
---- ext/mysql/config.m4.orig	Sat Apr 27 02:09:56 2002
-+++ ext/mysql/config.m4	Wed Jun 19 22:18:14 2002
-@@ -19,7 +19,7 @@ AC_DEFUN(MYSQL_LIB_CHK,[
- 	
- AC_DEFUN(PHP_MYSQL_SOCK,[
-   AC_MSG_CHECKING(for MySQL UNIX socket)
--  MYSQL_SOCK=/tmp/mysql.sock
-+  MYSQL_SOCK=/var/run/mysql/mysql.sock
-   for i in  \
-       /var/run/mysqld/mysqld.sock \
-       /var/tmp/mysql.sock \
Index: extensions/patches/patch-ext_ncurses_config_m4
===================================================================
RCS file: extensions/patches/patch-ext_ncurses_config_m4
diff -N extensions/patches/patch-ext_ncurses_config_m4
--- extensions/patches/patch-ext_ncurses_config_m4	26 Jun 2002 22:16:40 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-ext_ncurses_config_m4,v 1.1 2002/06/26 22:16:40 avsm Exp $
---- ext/ncurses/config.m4.orig	Sun Jan 20 02:30:17 2002
-+++ ext/ncurses/config.m4	Wed Jun 26 23:33:40 2002
-@@ -32,7 +32,7 @@ if test "$PHP_NCURSES" != "no"; then
-    PHP_ADD_INCLUDE($NCURSES_DIR/include)
- 
-    # --with-ncurses -> chech for lib and symbol presence
--   LIBNAME=ncurses 
-+   LIBNAME=curses 
-    LIBSYMBOL=initscr 
- 
-    PHP_CHECK_LIBRARY($LIBNAME, $LIBSYMBOL, [
-@@ -44,10 +44,10 @@ if test "$PHP_NCURSES" != "no"; then
-      -L$NCURSES_DIR/lib -lm
-    ])
-   
--   AC_CHECK_LIB(ncurses, color_set,   [AC_DEFINE(HAVE_NCURSES_COLOR_SET,  1, [ ])])
--   AC_CHECK_LIB(ncurses, slk_color,   [AC_DEFINE(HAVE_NCURSES_SLK_COLOR,  1, [ ])])
--   AC_CHECK_LIB(ncurses, asume_default_colors,   [AC_DEFINE(HAVE_NCURSES_ASSUME_DEFAULT_COLORS,  1, [ ])])
--   AC_CHECK_LIB(ncurses, use_extended_names,   [AC_DEFINE(HAVE_NCURSES_USE_EXTENDED_NAMES,  1, [ ])])
-+   AC_CHECK_LIB($LIBNAME, color_set,   [AC_DEFINE(HAVE_NCURSES_COLOR_SET,  1, [ ])])
-+   AC_CHECK_LIB($LIBNAME, slk_color,   [AC_DEFINE(HAVE_NCURSES_SLK_COLOR,  1, [ ])])
-+   AC_CHECK_LIB($LIBNAME, asume_default_colors,   [AC_DEFINE(HAVE_NCURSES_ASSUME_DEFAULT_COLORS,  1, [ ])])
-+   AC_CHECK_LIB($LIBNAME, use_extended_names,   [AC_DEFINE(HAVE_NCURSES_USE_EXTENDED_NAMES,  1, [ ])])
- 
-    PHP_EXTENSION(ncurses, $ext_shared, cli)
-    PHP_SUBST(NCURSES_SHARED_LIBADD)
Index: extensions/patches/patch-ext_pdf_config_m4
===================================================================
RCS file: extensions/patches/patch-ext_pdf_config_m4
diff -N extensions/patches/patch-ext_pdf_config_m4
--- extensions/patches/patch-ext_pdf_config_m4	9 Jul 2002 18:14:17 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,67 +0,0 @@
-$OpenBSD: patch-ext_pdf_config_m4,v 1.2 2002/07/09 18:14:17 avsm Exp $
---- ext/pdf/config.m4.orig	Mon Dec  3 23:54:09 2001
-+++ ext/pdf/config.m4	Mon Jul  8 21:17:07 2002
-@@ -5,9 +5,23 @@ dnl
- PHP_ARG_WITH(pdflib,for PDFlib support,
- [  --with-pdflib[=DIR]     Include PDFlib support.])
- 
-+pdflib_ext_shared=$ext_shared
-+
-+PHP_ARG_WITH(jpeg-dir, for the location of libjpeg,
-+[  --with-jpeg-dir[=DIR]     PDFLIB: define libjpeg install directory.
-+                                     (OPTIONAL for PDFlib v4)])
-+
-+PHP_ARG_WITH(png-dir, for the location of libpng,
-+[  --with-png-dir[=DIR]      PDFLIB: define libpng install directory.
-+                                     (OPTIONAL for PDFlib v4)])
-+
-+PHP_ARG_WITH(tiff-dir, for the location of libtiff,
-+[  --with-tiff-dir[=DIR]     PDFLIB: define libtiff install directory.
-+                                     (OPTIONAL for PDFlib v4)])
-+
- if test "$PHP_PDFLIB" != "no"; then
- 
--  PHP_EXTENSION(pdf, $ext_shared)
-+  PHP_EXTENSION(pdf, $pdflib_ext_shared)
-   PHP_SUBST(PDFLIB_SHARED_LIBADD)
- 
-   dnl #
-@@ -16,9 +30,6 @@ if test "$PHP_PDFLIB" != "no"; then
- 
-   dnl # libjpeg
-     
--  PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, 
--  [  --with-jpeg-dir[=DIR]     PDFLIB: define libjpeg install directory. (OPTIONAL for PDFlib v4)])
--
-   if test "$PHP_JPEG_DIR" != "no"; then
-     PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, 
-     [
-@@ -34,9 +45,6 @@ if test "$PHP_PDFLIB" != "no"; then
- 
-   dnl # libpng
- 
--  PHP_ARG_WITH(png-dir, for the location of libpng, 
--  [  --with-png-dir[=DIR]      PDFLIB: define libpng install directory.  (OPTIONAL for PDFlib v4)])
-- 
-   if test "$PHP_PNG_DIR" != "no"; then
-     PHP_CHECK_LIBRARY(png,png_create_info_struct, 
-     [
-@@ -52,9 +60,6 @@ if test "$PHP_PDFLIB" != "no"; then
- 
-   dnl # libtiff
- 
--  PHP_ARG_WITH(tiff-dir, for the location of libtiff,
--  [  --with-tiff-dir[=DIR]     PDFLIB: define libtiff install directory. (OPTIONAL for PDFlib v4)])
--
-   if test "$PHP_TIFF_DIR" != "no"; then
-     PHP_CHECK_LIBRARY(tiff,TIFFOpen, 
-     [
-@@ -111,7 +116,7 @@ Use the options --with-tiff-dir=<DIR>, -
- See config.log for more information.
- ])
-         ],[
--          -L$PHP_PDFLIB/lib
-+          -L$PHP_PDFLIB/lib $PDFLIB_SHARED_LIBADD
-         ])
-       else
-         AC_MSG_ERROR([pdflib.h not found! Check the path passed to --with-pdflib=<PATH>. PATH should be the install prefix directory.])
Index: extensions/patches/patch-ext_pgsql_config_m4
===================================================================
RCS file: extensions/patches/patch-ext_pgsql_config_m4
diff -N extensions/patches/patch-ext_pgsql_config_m4
--- extensions/patches/patch-ext_pgsql_config_m4	11 Sep 2002 23:16:48 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_pgsql_config_m4,v 1.3 2002/09/11 23:16:48 avsm Exp $
---- ext/pgsql/config.m4.orig	Thu Aug  1 11:19:17 2002
-+++ ext/pgsql/config.m4	Sat Aug 24 13:35:19 2002
-@@ -27,7 +27,7 @@ if test "$PHP_PGSQL" != "no"; then
-     done
- 
-     for j in lib lib/pgsql lib/postgres lib/postgresql ""; do
--      if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then 
-+      if test -f "$i/$j/libpq.so*" || test -f "$i/$j/libpq.a"; then 
-         PGSQL_LIBDIR=$i/$j
-       fi
-     done
Index: extensions/patches/patch-ext_snmp_config_m4
===================================================================
RCS file: extensions/patches/patch-ext_snmp_config_m4
diff -N extensions/patches/patch-ext_snmp_config_m4
--- extensions/patches/patch-ext_snmp_config_m4	12 Aug 2002 04:30:21 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ext_snmp_config_m4,v 1.1 2002/08/12 04:30:21 avsm Exp $
---- ext/snmp/config.m4.orig	Wed Jan 16 22:32:40 2002
-+++ ext/snmp/config.m4	Thu Aug  8 03:31:16 2002
-@@ -52,6 +52,7 @@ PHP_ARG_WITH(snmp,for SNMP support,
-       if test "$PHP_OPENSSL" != "no"; then
-         PHP_ADD_LIBRARY(ssl,   1, SNMP_SHARED_LIBADD)
-         PHP_ADD_LIBRARY(crypto,1, SNMP_SHARED_LIBADD)
-+        PHP_ADD_LIBRARY(des   ,1, SNMP_SHARED_LIBADD)
-       else
-         AC_MSG_ERROR(The UCD-SNMP in this system is built with SSL support. 
- 
Index: extensions/patches/patch-ext_sybase_config_m4
===================================================================
RCS file: extensions/patches/patch-ext_sybase_config_m4
diff -N extensions/patches/patch-ext_sybase_config_m4
--- extensions/patches/patch-ext_sybase_config_m4	24 Jun 2002 19:27:48 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-ext_sybase_config_m4,v 1.1.1.1 2002/06/24 19:27:48 avsm Exp $
---- ext/sybase_ct/config.m4.orig	Fri Nov 30 23:12:31 2001
-+++ ext/sybase_ct/config.m4	Wed Jun 19 12:13:08 2002
-@@ -28,7 +28,8 @@ if test "$PHP_SYBASE_CT" != "no"; then
-   PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
-   if test -f $SYBASE_CT_INCDIR/tds.h; then
-     PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
--    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
-+    PHP_ADD_LIBRARY(tds,, SYBASE_CT_SHARED_LIBADD)
-+    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct -ltds"
-   else
-     PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
-     PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
Index: extensions/patches/patch-ext_xml_config_m4
===================================================================
RCS file: extensions/patches/patch-ext_xml_config_m4
diff -N extensions/patches/patch-ext_xml_config_m4
--- extensions/patches/patch-ext_xml_config_m4	24 Jun 2002 19:27:48 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-ext_xml_config_m4,v 1.1.1.1 2002/06/24 19:27:48 avsm Exp $
---- ext/xml/config.m4.orig	Fri Nov 30 20:00:06 2001
-+++ ext/xml/config.m4	Wed Jun 19 13:17:32 2002
-@@ -13,11 +13,12 @@ else
-   order=12
- fi
- 
--PHP_ARG_ENABLE(xml,whether to enable XML support,
--[  --disable-xml           Disable XML support using bundled expat lib], yes)
--
- PHP_ARG_WITH(expat-dir, external libexpat install dir,
- [  --with-expat-dir=DIR    XML: external libexpat install dir])
-+remember_ext_shared=$ext_shared
-+
-+PHP_ARG_ENABLE(xml,whether to enable XML support,
-+[  --disable-xml           Disable XML support using bundled expat lib], yes)
- 
- if test "$PHP_XML" = "yes"; then
- if test "$PHP_EXPAT_DIR" = "no"; then
-@@ -52,6 +53,7 @@ else
-     AC_MSG_ERROR(not found. Please reinstall the expat distribution.)
-   fi
- 
-+  ext_shared=$remember_ext_shared
-   PHP_ADD_INCLUDE($EXPAT_DIR/include)
-   PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, EXPAT_SHARED_LIBADD)
- fi
Index: extensions/patches/patch-ext_xslt_config_m4
===================================================================
RCS file: extensions/patches/patch-ext_xslt_config_m4
diff -N extensions/patches/patch-ext_xslt_config_m4
--- extensions/patches/patch-ext_xslt_config_m4	24 Jun 2002 19:27:48 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
-$OpenBSD: patch-ext_xslt_config_m4,v 1.1.1.1 2002/06/24 19:27:48 avsm Exp $
---- ext/xslt/config.m4.orig	Thu May  2 12:24:03 2002
-+++ ext/xslt/config.m4	Wed Jun 19 13:14:45 2002
-@@ -8,21 +8,16 @@ dnl +-----------------------------------
- 
- PHP_ARG_ENABLE(xslt, whether to enable xslt support,
- [  --enable-xslt           Enable xslt support.])
--
--PHP_ARG_WITH(xslt-sablot, for XSLT Sablotron backend,
--[  --with-xslt-sablot=DIR    XSLT: Enable the sablotron backend.])
--
--PHP_ARG_WITH(expat-dir, libexpat dir for Sablotron XSL support,
--[  --with-expat-dir=DIR      XSLT: libexpat dir for Sablotron])
--
--PHP_ARG_WITH(sablot-js, enable JavaScript for Sablotron,
--[  --with-sablot-js=DIR    Sablotron: enable JavaScript support for Sablotron])
-+remember_xslt_ext_shared=$ext_shared
- 
- if test "$PHP_XSLT" != "no"; then
- 
-   PHP_EXTENSION(xslt, $ext_shared)
-   PHP_SUBST(XSLT_SHARED_LIBADD)
- 
-+  PHP_ARG_WITH(xslt-sablot, for XSLT Sablotron backend,
-+  [  --with-xslt-sablot=DIR    XSLT: Enable the sablotron backend.])
-+
-   if test "$PHP_XSLT_SABLOT" != "no"; then
-     XSLT_CHECK_DIR=$PHP_XSLT_SABLOT
-     XSLT_TEST_FILE=/include/sablot.h
-@@ -54,6 +49,9 @@ if test "$PHP_XSLT" != "no"; then
-   fi
- 					
-   if test "$PHP_XSLT_SABLOT" != "no"; then
-+    PHP_ARG_WITH(expat-dir, libexpat dir for Sablotron XSL support,
-+    [  --with-expat-dir=DIR      XSLT: libexpat dir for Sablotron])
-+
-     found_expat=no
-     for i in $PHP_EXPAT_DIR $XSLT_DIR /usr/local /usr; do
-       if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
-@@ -76,6 +74,9 @@ if test "$PHP_XSLT" != "no"; then
-     PHP_SETUP_ICONV(XSLT_SHARED_LIBADD, [], [
-       AC_MSG_ERROR([iconv not found, in order to build sablotron you need the iconv library])
-     ])
-+
-+    PHP_ARG_WITH(sablot-js, enable JavaScript for Sablotron,
-+    [  --with-sablot-js=DIR    Sablotron: enable JavaScript support for Sablotron])
-  
-     if test "$PHP_SABLOT_JS" != "no"; then
-       found_js=no
-@@ -94,6 +95,7 @@ if test "$PHP_XSLT" != "no"; then
-     fi
-   fi
- 
-+  ext_shared=$remember_xslt_ext_shared
-   PHP_ADD_INCLUDE($XSLT_DIR/include)
-   PHP_ADD_LIBRARY_WITH_PATH($XSLT_LIBNAME, $XSLT_DIR/lib, XSLT_SHARED_LIBADD)
- 
Index: extensions/patches/patch-ext_xslt_sablot_c
===================================================================
RCS file: extensions/patches/patch-ext_xslt_sablot_c
diff -N extensions/patches/patch-ext_xslt_sablot_c
--- extensions/patches/patch-ext_xslt_sablot_c	17 Aug 2002 01:33:33 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,118 +0,0 @@
-$OpenBSD: patch-ext_xslt_sablot_c,v 1.1 2002/08/17 01:33:33 avsm Exp $
---- ext/xslt/sablot.c.orig	Thu Feb 28 08:27:00 2002
-+++ ext/xslt/sablot.c	Sat Aug 17 01:53:32 2002
-@@ -52,15 +52,15 @@ static int  scheme_put(void *, SablotHan
- static int  scheme_close(void *, SablotHandle, int);
- 
- /* Sax handler functions */
--static SAX_RETURN sax_startdoc(void *);
--static SAX_RETURN sax_startelement(void *, const char *, const char **);
--static SAX_RETURN sax_endelement(void *, const char *);
--static SAX_RETURN sax_startnamespace(void *, const char *, const char *);
--static SAX_RETURN sax_endnamespace(void *, const char *);
--static SAX_RETURN sax_comment(void *, const char *);
--static SAX_RETURN sax_pi(void *, const char *, const char *);
--static SAX_RETURN sax_characters(void *, const char *, int);
--static SAX_RETURN sax_enddoc(void *);
-+static SAX_RETURN sax_startdoc(void *, SablotHandle);
-+static SAX_RETURN sax_startelement(void *, SablotHandle, const char *, const char **);
-+static SAX_RETURN sax_endelement(void *, SablotHandle, const char *);
-+static SAX_RETURN sax_startnamespace(void *, SablotHandle, const char *, const char *);
-+static SAX_RETURN sax_endnamespace(void *, SablotHandle, const char *);
-+static SAX_RETURN sax_comment(void *, SablotHandle, const char *);
-+static SAX_RETURN sax_pi(void *, SablotHandle, const char *, const char *);
-+static SAX_RETURN sax_characters(void *, SablotHandle, const char *, int);
-+static SAX_RETURN sax_enddoc(void *, SablotHandle);
- 
- /* Error handlers */
- static MH_ERROR error_makecode(void *, SablotHandle, int, unsigned short, unsigned short);
-@@ -509,7 +509,7 @@ PHP_FUNCTION(xslt_process)
- 	}
- 	
- 	/* Perform transformation */
--	error = SablotRunProcessor(XSLT_PROCESSOR(handle), xslt, xml, result, params, args);
-+	error = SablotRunProcessor(XSLT_PROCESSOR(handle), xslt, xml, result, (const char**)params, (const char**)args);
- 	if (error) {
- 		XSLT_ERRNO(handle) = error;
- 
-@@ -938,7 +938,7 @@ static int  scheme_close(void *user_data
- 
- /* {{{ sax_startdoc()
-    Called when the document starts to be processed */
--static SAX_RETURN sax_startdoc(void *ctx)
-+static SAX_RETURN sax_startdoc(void *ctx, SablotHandle processor)
- {
- 	zval       *argv[1];                    /* Arguments to the sax start doc function */
- 	zval       *retval;                     /* Return value from sax start doc function */
-@@ -968,7 +968,7 @@ static SAX_RETURN sax_startdoc(void *ctx
- 
- /* {{{ sax_startelement()
-    Called when an element is begun to be processed */
--static SAX_RETURN sax_startelement(void *ctx, 
-+static SAX_RETURN sax_startelement(void *ctx, SablotHandle processor,
-                                    const char  *name, 
-                                    const char **attr)
- {
-@@ -1016,7 +1016,7 @@ static SAX_RETURN sax_startelement(void 
- 
- /* {{{ xslt_sax_endelement()
-    Called when an ending XML element is encountered */
--static SAX_RETURN sax_endelement(void *ctx, const char *name)
-+static SAX_RETURN sax_endelement(void *ctx, SablotHandle processor, const char *name)
- {
- 	zval        *argv[2];                   /* Arguments to the sax end element function */
- 	zval        *retval;                    /* Return value from the sax end element function */
-@@ -1050,7 +1050,7 @@ static SAX_RETURN sax_endelement(void *c
- 
- /* {{{ sax_startnamespace()
-    Called at the beginning of the parsing of a new namespace */
--static SAX_RETURN sax_startnamespace(void *ctx, 
-+static SAX_RETURN sax_startnamespace(void *ctx, SablotHandle processor, 
-                                      const char *prefix, 
-                                      const char *uri)
- {
-@@ -1089,7 +1089,7 @@ static SAX_RETURN sax_startnamespace(voi
- 
- /* {{{ sax_endnamespace()
-    Called when a new namespace is finished being parsed */
--static SAX_RETURN sax_endnamespace(void *ctx, const char *prefix)
-+static SAX_RETURN sax_endnamespace(void *ctx, SablotHandle processor, const char *prefix)
- {
- 	zval        *argv[2];                    /* Arguments to the sax end namespace function */
- 	zval        *retval;                     /* Return value from the sax end namespace function */
-@@ -1123,7 +1123,7 @@ static SAX_RETURN sax_endnamespace(void 
- 
- /* {{{ sax_comment()
-    Called when a comment is found */
--static SAX_RETURN sax_comment(void *ctx, const char *contents)
-+static SAX_RETURN sax_comment(void *ctx, SablotHandle processor, const char *contents)
- {
- 	zval        *argv[2];                    /* Arguments to the sax comment function */
- 	zval        *retval;                     /* Return value from the sax comment function */
-@@ -1157,7 +1157,7 @@ static SAX_RETURN sax_comment(void *ctx,
- 
- /* {{{ sax_pi()
-    Called when processing instructions are found */
--static SAX_RETURN sax_pi(void *ctx, 
-+static SAX_RETURN sax_pi(void *ctx, SablotHandle processor,
-                          const char *target, 
-                          const char *contents)
- {
-@@ -1196,7 +1196,7 @@ static SAX_RETURN sax_pi(void *ctx, 
- 
- /* {{{ sax_characters()
-    Called when characters are come upon */
--static SAX_RETURN sax_characters(void *ctx,
-+static SAX_RETURN sax_characters(void *ctx, SablotHandle processor,
-                                  const char *contents, 
-                                  int length)
- {
-@@ -1232,7 +1232,7 @@ static SAX_RETURN sax_characters(void *c
- 
- /* {{{ sax_enddoc()
-    Called when the document is finished being parsed */
--static SAX_RETURN sax_enddoc(void *ctx)
-+static SAX_RETURN sax_enddoc(void *ctx, SablotHandle processor)
- {
- 	zval        *argv[1];                    /* Arguments to the end document function */
- 	zval        *retval;                     /* Return value from the end document function */
Index: extensions/patches/patch-ltmain_sh
===================================================================
RCS file: extensions/patches/patch-ltmain_sh
diff -N extensions/patches/patch-ltmain_sh
--- extensions/patches/patch-ltmain_sh	24 Jun 2002 19:27:48 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,89 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2002/06/24 19:27:48 avsm Exp $
---- ltmain.sh.orig	Sat Dec  8 19:40:14 2001
-+++ ltmain.sh	Mon Dec 17 18:47:05 2001
-@@ -1031,12 +1031,34 @@ compiler."
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-+	  *-*-openbsd*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    continue
-+	    ;;
-+	  esac
-+	elif test "$arg" = "-lc_r"; then
-+	  case "$host" in
-+	  *-*-openbsd*)
-+	    # Do not include libc_r directly, use -pthread flag.
-+	    continue
-+	    ;;
- 	  esac
- 	fi
- 	deplibs="$deplibs $arg"
- 	continue
- 	;;
- 
-+      -pthread)
-+	case $host in
-+	*-*-openbsd*)
-+	  deplibs="$deplibs $arg"
-+	  ;;
-+	*)
-+	  continue
-+	  ;;
-+	esac
-+	;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -2401,6 +2423,9 @@ compiler."
- 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
- 	    # these systems don't actually have a c library (as such)!
- 	    ;;
-+          *-*-openbsd*)
-+            # Do not include libc due to us having libc/libc_r.
-+            ;;
- 	  *-*-rhapsody* | *-*-darwin1.[012])
- 	    # Rhapsody C library is in the System framework
- 	    deplibs="$deplibs -framework System"
-@@ -4412,40 +4437,6 @@ relink_command=\"$relink_command\""
-     # Exit here if they wanted silent mode.
-     test "$show" = ":" && exit 0
- 
--    echo "----------------------------------------------------------------------"
--    echo "Libraries have been installed in:"
--    for libdir in $libdirs; do
--      echo "   $libdir"
--    done
--    echo
--    echo "If you ever happen to want to link against installed libraries"
--    echo "in a given directory, LIBDIR, you must either use libtool, and"
--    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
--    echo "flag during linking and do at least one of the following:"
--    if test -n "$shlibpath_var"; then
--      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--      echo "     during execution"
--    fi
--    if test -n "$runpath_var"; then
--      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
--      echo "     during linking"
--    fi
--    if test -n "$hardcode_libdir_flag_spec"; then
--      libdir=LIBDIR
--      eval flag=\"$hardcode_libdir_flag_spec\"
--
--      echo "   - use the \`$flag' linker flag"
--    fi
--    if test -n "$admincmds"; then
--      echo "   - have your system administrator run these commands:$admincmds"
--    fi
--    if test -f /etc/ld.so.conf; then
--      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
--    fi
--    echo
--    echo "See any operating system documentation about shared libraries for"
--    echo "more information, such as the ld(1) and ld.so(8) manual pages."
--    echo "----------------------------------------------------------------------"
-     exit 0
-     ;;
- 
Index: extensions/patches/patch-main_php_config_h_in
===================================================================
RCS file: extensions/patches/patch-main_php_config_h_in
diff -N extensions/patches/patch-main_php_config_h_in
--- extensions/patches/patch-main_php_config_h_in	11 Sep 2002 23:16:48 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-main_php_config_h_in,v 1.3 2002/09/11 23:16:48 avsm Exp $
---- main/php_config.h.in.orig	Sat Sep  7 19:56:37 2002
-+++ main/php_config.h.in	Sat Sep  7 19:56:45 2002
-@@ -996,7 +996,7 @@
- #undef HAVE_BZ2
- 
- /* Whether to build bz2 as dynamic module */
--#undef COMPILE_DL_BZ
-+#undef COMPILE_DL_BZ2
- 
- /*   */
- #undef HAVE_CALENDAR
Index: pear/Makefile
===================================================================
RCS file: /cvs/ports/www/php4/pear/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- pear/Makefile	24 Jun 2002 19:40:55 -0000	1.2
+++ pear/Makefile	16 Feb 2003 23:24:53 -0000
@@ -5,10 +5,19 @@
 HOMEPAGE=	http://pear.php.net/
 
 ALL_TARGET=	pear
-CONFIGURE_ARGS= --with-pear --without-mysql --without-xml
+CONFIGURE_ARGS= --with-pear=${PEAR_DIR} --disable-all
 
-do-install:
-	cd ${WRKSRC}/pear && env INSTALL_ROOT=${DESTDIR} make install
-	cd ${PREFIX}/lib && tar -zxvf ${FILESDIR}/pear-412-421.tgz
+PATCH_LIST=	${PORTSDIR}/www/php4/core/patches/patch-* \
+		patch-*
+
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	php::www/php4/core
+NO_REGRESS=	Yes
+
+INSTALL_TARGET=	install-pear install-headers install-build install-programs
+FAKE_FLAGS=	INSTALL_ROOT=${DESTDIR} 
+
+pre-fake:
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/php
 
 .include <bsd.port.mk>
Index: pear/distinfo
===================================================================
RCS file: /cvs/ports/www/php4/pear/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- pear/distinfo	11 Sep 2002 23:16:48 -0000	1.3
+++ pear/distinfo	16 Feb 2003 23:24:53 -0000
@@ -1,3 +1,3 @@
-MD5 (php-4.2.3.tar.gz) = 2a4a963d79d97ea2725c860c77e908a2
-RMD160 (php-4.2.3.tar.gz) = 37a2ede463cd9af1874fec4a5cfc874dead865ca
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
+MD5 (php-4.3.0.tar.gz) = 9e0eb9ee8e9193ee0a8aea2f428ec3de
+RMD160 (php-4.3.0.tar.gz) = e618b6b3cce929d3a5d104c85cd75b69186cee63
+SHA1 (php-4.3.0.tar.gz) = 8b7ba26adc38a4c97641002705af5c4b19dfd786
Index: pear/files/Makefile.pear
===================================================================
RCS file: pear/files/Makefile.pear
diff -N pear/files/Makefile.pear
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pear/files/Makefile.pear	16 Feb 2003 23:24:54 -0000
@@ -0,0 +1,9 @@
+# $OpenBSD$
+# Default Makefile to install a PHP PEAR module
+
+default:
+
+install:
+	cp ${WRKDIR}/package.xml ${.CURDIR}
+	mkdir -p ${PREFIX}/lib/php
+	${LOCALBASE}/bin/pear install -R ${WRKINST} -n ${.CURDIR}/package.xml
Index: pear/files/pear-412-421.tgz
===================================================================
RCS file: pear/files/pear-412-421.tgz
diff -N pear/files/pear-412-421.tgz
Binary files /tmp/cvsCn2353 and /dev/null differ
Index: pear/files/pear.port.mk
===================================================================
RCS file: pear/files/pear.port.mk
diff -N pear/files/pear.port.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pear/files/pear.port.mk	16 Feb 2003 23:24:54 -0000
@@ -0,0 +1,12 @@
+# $OpenBSD$
+# PHP PEAR module
+
+RUN_DEPENDS=    pear:php4-pear-4.3.*:www/php4/pear
+BUILD_DEPENDS=  ${RUN_DEPENDS}
+
+NO_BUILD=       Yes
+NO_REGRESS=     Yes
+NO_CONFIGURE=	Yes
+
+MAKE_FILE=	${PORTSDIR}/www/php4/pear/files/Makefile.pear
+FAKE_FLAGS+=	WRKINST=${WRKINST} WRKDIR=${WRKDIR}
Index: pear/patches/patch-pear_Makefile_frag
===================================================================
RCS file: pear/patches/patch-pear_Makefile_frag
diff -N pear/patches/patch-pear_Makefile_frag
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pear/patches/patch-pear_Makefile_frag	16 Feb 2003 23:24:54 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- pear/Makefile.frag.orig	Tue Nov 19 14:43:42 2002
++++ pear/Makefile.frag	Sat Feb 15 17:09:24 2003
+@@ -11,11 +11,11 @@ peardir=$(PEAR_INSTALLDIR)
+ # Skip all php.ini files altogether
+ PEAR_INSTALL_FLAGS = -n -dsafe_mode=0
+ 
+-install-pear-installer: $(top_builddir)/sapi/cli/php
+-	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php $(srcdir)/package-*.xml
++install-pear-installer: 
++	$(LOCALBASE)/bin/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php $(srcdir)/package-*.xml
+ 
+-install-pear-packages: $(top_builddir)/sapi/cli/php
+-	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php $(srcdir)/packages/*.tar
++install-pear-packages: 
++	$(LOCALBASE)/bin/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php $(srcdir)/packages/*.tar
+ 
+ install-pear:
+ 	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
Index: pear/patches/patch-pear_PEAR_Config_php
===================================================================
RCS file: pear/patches/patch-pear_PEAR_Config_php
diff -N pear/patches/patch-pear_PEAR_Config_php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pear/patches/patch-pear_PEAR_Config_php	16 Feb 2003 23:24:54 -0000
@@ -0,0 +1,50 @@
+$OpenBSD$
+--- pear/PEAR/Config.php.orig	Sat Feb 15 21:08:35 2003
++++ pear/PEAR/Config.php	Sun Feb 16 01:20:55 2003
+@@ -81,7 +81,7 @@ if (isset($_ENV['PHP_PEAR_DOC_DIR'])) {
+     define('PEAR_CONFIG_DEFAULT_DOC_DIR', $_ENV['PHP_PEAR_DOC_DIR']);
+ } else {
+     define('PEAR_CONFIG_DEFAULT_DOC_DIR',
+-           PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'docs');
++           PHP_PREFIX.'/share/doc/pear');
+ }
+ 
+ // Default for bin_dir
+@@ -96,7 +96,7 @@ if (isset($_ENV['PHP_PEAR_DATA_DIR'])) {
+     define('PEAR_CONFIG_DEFAULT_DATA_DIR', $_ENV['PHP_PEAR_DATA_DIR']);
+ } else {
+     define('PEAR_CONFIG_DEFAULT_DATA_DIR',
+-           PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'data');
++           PHP_PREFIX.'/share/pear');
+ }
+ 
+ // Default for test_dir
+@@ -104,7 +104,7 @@ if (isset($_ENV['PHP_PEAR_TEST_DIR'])) {
+     define('PEAR_CONFIG_DEFAULT_TEST_DIR', $_ENV['PHP_PEAR_TEST_DIR']);
+ } else {
+     define('PEAR_CONFIG_DEFAULT_TEST_DIR',
+-           PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'tests');
++           PHP_PREFIX.'/share/pear/tests');
+ }
+ 
+ // Default for cache_dir
+@@ -112,8 +112,7 @@ if (isset($_ENV['PHP_PEAR_CACHE_DIR'])) 
+     define('PEAR_CONFIG_DEFAULT_CACHE_DIR', $_ENV['PHP_PEAR_CACHE_DIR']);
+ } else {
+     define('PEAR_CONFIG_DEFAULT_CACHE_DIR',
+-           System::tmpdir() . DIRECTORY_SEPARATOR . 'pear' .
+-           DIRECTORY_SEPARATOR . 'cache');
++           '/var/www/pear/cache');
+ }
+ 
+ // Default for php_bin
+@@ -164,8 +163,7 @@ if (isset($_ENV['PHP_PEAR_SIG_BIN'])) {
+     define('PEAR_CONFIG_DEFAULT_SIG_BIN', $_ENV['PHP_PEAR_SIG_BIN']);
+ } else {
+     define('PEAR_CONFIG_DEFAULT_SIG_BIN',
+-           System::which(
+-               'gpg', OS_WINDOWS ? 'c:\gnupg\gpg.exe' : '/usr/local/bin/gpg'));
++            PHP_PREFIX . '/bin/gpg');
+ }
+ 
+ // Default for sig_keydir
Index: pear/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/php4/pear/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pear/pkg/PLIST	11 Sep 2002 23:16:48 -0000	1.2
+++ pear/pkg/PLIST	16 Feb 2003 23:24:54 -0000
@@ -1,16 +1,16 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/09/11 23:16:48 avsm Exp $
+@comment $OpenBSD$
 bin/pear
-bin/pearize
 bin/php-config
 bin/phpextdist
 bin/phpize
-bin/phptar
 include/php/TSRM/TSRM.h
 include/php/TSRM/acconfig.h
 include/php/TSRM/readdir.h
 include/php/TSRM/tsrm_config.h
+include/php/TSRM/tsrm_config.nw.h
 include/php/TSRM/tsrm_config.w32.h
 include/php/TSRM/tsrm_config_common.h
+include/php/TSRM/tsrm_nw.h
 include/php/TSRM/tsrm_strtok_r.h
 include/php/TSRM/tsrm_virtual_cwd.h
 include/php/TSRM/tsrm_win32.h
@@ -27,6 +27,7 @@
 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
@@ -44,20 +45,34 @@
 include/php/Zend/zend_list.h
 include/php/Zend/zend_llist.h
 include/php/Zend/zend_modules.h
+include/php/Zend/zend_multibyte.h
 include/php/Zend/zend_operators.h
 include/php/Zend/zend_ptr_stack.h
 include/php/Zend/zend_qsort.h
 include/php/Zend/zend_stack.h
 include/php/Zend/zend_static_allocator.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/mbfilter.h
+include/php/ext/mbstring/mbfilter_cn.h
 include/php/ext/mbstring/mbfilter_ja.h
+include/php/ext/mbstring/mbfilter_kr.h
+include/php/ext/mbstring/mbfilter_ru.h
+include/php/ext/mbstring/mbfilter_tw.h
 include/php/ext/mbstring/mbregex.h
 include/php/ext/mbstring/mbstring.h
+include/php/ext/mbstring/php_mbregex.h
+include/php/ext/mbstring/php_unicode.h
+include/php/ext/mbstring/unicode_data.h
 include/php/ext/mbstring/unicode_table.h
+include/php/ext/mbstring/unicode_table_cn.h
 include/php/ext/mbstring/unicode_table_ja.h
+include/php/ext/mbstring/unicode_table_kr.h
+include/php/ext/mbstring/unicode_table_ru.h
+include/php/ext/mbstring/unicode_table_tw.h
+include/php/ext/pgsql/php_pgsql.h
 include/php/ext/session/mod_files.h
 include/php/ext/session/mod_mm.h
 include/php/ext/session/mod_user.h
@@ -69,6 +84,7 @@
 include/php/ext/standard/credits.h
 include/php/ext/standard/credits_ext.h
 include/php/ext/standard/credits_sapi.h
+include/php/ext/standard/css.h
 include/php/ext/standard/cyr_convert.h
 include/php/ext/standard/datetime.h
 include/php/ext/standard/dl.h
@@ -114,6 +130,7 @@
 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/uniqid.h
 include/php/ext/standard/url.h
 include/php/ext/standard/url_scanner.h
@@ -132,7 +149,7 @@
 include/php/ext/xml/php_xml.h
 include/php/main/SAPI.h
 include/php/main/build-defs.h
-include/php/main/config.w32.h
+include/php/main/config.nw.h
 include/php/main/fopen_wrappers.h
 include/php/main/internal_functions_registry.h
 include/php/main/logos.h
@@ -141,10 +158,12 @@
 include/php/main/php_compat.h
 include/php/main/php_config.h
 include/php/main/php_content_types.h
+include/php/main/php_embed.h
 include/php/main/php_globals.h
 include/php/main/php_ini.h
 include/php/main/php_logos.h
 include/php/main/php_main.h
+include/php/main/php_memory_streams.h
 include/php/main/php_network.h
 include/php/main/php_open_temporary_file.h
 include/php/main/php_output.h
@@ -158,6 +177,7 @@
 include/php/main/rfc1867.h
 include/php/main/safe_mode.h
 include/php/main/snprintf.h
+include/php/main/spprintf.h
 include/php/main/win95nt.h
 include/php/php_version.h
 include/php/regex/cclass.h
@@ -166,12 +186,21 @@
 include/php/regex/regex2.h
 include/php/regex/regex_extra.h
 include/php/regex/utils.h
+lib/php/.registry/Archive_Tar.reg
+lib/php/.registry/Console_Getopt.reg
+lib/php/.registry/DB.reg
+lib/php/.registry/HTTP.reg
+lib/php/.registry/Mail.reg
+lib/php/.registry/Net_SMTP.reg
+lib/php/.registry/Net_Socket.reg
+lib/php/.registry/PEAR.reg
+lib/php/.registry/XML_Parser.reg
+lib/php/.registry/XML_RPC.reg
 lib/php/Archive/Tar.php
 lib/php/Console/Getopt.php
-lib/php/Crypt/CBC.php
-lib/php/Crypt/HCEMD5.php
 lib/php/DB.php
 lib/php/DB/common.php
+lib/php/DB/dbase.php
 lib/php/DB/fbsql.php
 lib/php/DB/ibase.php
 lib/php/DB/ifx.php
@@ -183,49 +212,21 @@
 lib/php/DB/pgsql.php
 lib/php/DB/storage.php
 lib/php/DB/sybase.php
-lib/php/Date/Calc.php
-lib/php/Date/Human.php
-lib/php/File.php
-lib/php/File/CSV.php
-lib/php/File/Find.php
-lib/php/File/Passwd.php
-lib/php/File/SearchReplace.php
-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
-lib/php/HTML/Table.php
 lib/php/HTTP.php
-lib/php/HTTP/Compress.php
-lib/php/Log.php
-lib/php/Log/composite.php
-lib/php/Log/console.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/mimeDecode.php
-lib/php/Mail/mimePart.php
+lib/php/Mail/mail.php
 lib/php/Mail/sendmail.php
 lib/php/Mail/smtp.php
-lib/php/Mail/xmail.dtd
-lib/php/Mail/xmail.xsl
-lib/php/Net/Curl.php
-lib/php/Net/Dig.php
 lib/php/Net/SMTP.php
 lib/php/Net/Socket.php
+lib/php/OS/Guess.php
 lib/php/PEAR.php
 lib/php/PEAR/Autoloader.php
+lib/php/PEAR/Builder.php
 lib/php/PEAR/Command.php
 lib/php/PEAR/Command/Auth.php
+lib/php/PEAR/Command/Build.php
 lib/php/PEAR/Command/Common.php
 lib/php/PEAR/Command/Config.php
 lib/php/PEAR/Command/Install.php
@@ -240,47 +241,137 @@
 lib/php/PEAR/Packager.php
 lib/php/PEAR/Registry.php
 lib/php/PEAR/Remote.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/Makefile.global
 lib/php/build/acinclude.m4
-lib/php/build/dynlib.m4
-lib/php/build/dynlib.mk
-lib/php/build/fastgen.sh
-lib/php/build/library.mk
-lib/php/build/ltlib.mk
 lib/php/build/mkdep.awk
 lib/php/build/pear.m4
-lib/php/build/program.mk
-lib/php/build/rules.mk
-lib/php/build/rules_common.mk
-lib/php/build/rules_pear.mk
+lib/php/build/scan_makefile_in.awk
 lib/php/build/shtool
+share/doc/pear/Archive_Tar/docs/Archive_Tar.txt
+share/doc/pear/DB/DB/IDEAS
+share/doc/pear/DB/DB/MAINTAINERS
+share/doc/pear/DB/DB/STATUS
+share/doc/pear/DB/DB/TESTERS
+share/pear/PEAR/package.dtd
+share/pear/PEAR/template.spec
+share/pear/tests/DB/tests/db_error.phpt
+share/pear/tests/DB/tests/db_error2.phpt
+share/pear/tests/DB/tests/db_factory.phpt
+share/pear/tests/DB/tests/db_ismanip.phpt
+share/pear/tests/DB/tests/db_parsedsn.phpt
+share/pear/tests/DB/tests/driver/01connect.phpt
+share/pear/tests/DB/tests/driver/02fetch.phpt
+share/pear/tests/DB/tests/driver/03simplequery.phpt
+share/pear/tests/DB/tests/driver/04numcols.phpt
+share/pear/tests/DB/tests/driver/05sequences.phpt
+share/pear/tests/DB/tests/driver/06prepexec.phpt
+share/pear/tests/DB/tests/driver/08affectedrows.phpt
+share/pear/tests/DB/tests/driver/09numrows.phpt
+share/pear/tests/DB/tests/driver/10errormap.phpt
+share/pear/tests/DB/tests/driver/13limit.phpt
+share/pear/tests/DB/tests/driver/14fetchmode_object.phpt
+share/pear/tests/DB/tests/driver/15quote.phpt
+share/pear/tests/DB/tests/ibase/01connect.phpt
+share/pear/tests/DB/tests/ibase/02fetch.phpt
+share/pear/tests/DB/tests/ibase/03simplequery.phpt
+share/pear/tests/DB/tests/ibase/04numcols.phpt
+share/pear/tests/DB/tests/ibase/05sequences.phpt
+share/pear/tests/DB/tests/ibase/06prepexec.phpt
+share/pear/tests/DB/tests/ibase/10errormap.phpt
+share/pear/tests/DB/tests/mysql/01connect.phpt
+share/pear/tests/DB/tests/mysql/02fetch.phpt
+share/pear/tests/DB/tests/mysql/03simplequery.phpt
+share/pear/tests/DB/tests/mysql/04numcols.phpt
+share/pear/tests/DB/tests/mysql/05sequences.phpt
+share/pear/tests/DB/tests/mysql/06prepexec.phpt
+share/pear/tests/DB/tests/mysql/07errornative.phpt
+share/pear/tests/DB/tests/mysql/08affectedrows.phpt
+share/pear/tests/DB/tests/mysql/09numrows.phpt
+share/pear/tests/DB/tests/mysql/10errormap.phpt
+share/pear/tests/DB/tests/mysql/12tableinfo.phpt
+share/pear/tests/DB/tests/mysql/13limit.phpt
+share/pear/tests/DB/tests/mysql/14fetchmode_object.phpt
+share/pear/tests/DB/tests/oci8/01connect.phpt
+share/pear/tests/DB/tests/oci8/02fetch.phpt
+share/pear/tests/DB/tests/oci8/03simplequery.phpt
+share/pear/tests/DB/tests/oci8/04numcols.phpt
+share/pear/tests/DB/tests/oci8/05sequences.phpt
+share/pear/tests/DB/tests/oci8/06prepexec.phpt
+share/pear/tests/DB/tests/oci8/07errornative.phpt
+share/pear/tests/DB/tests/oci8/08affectedrows.phpt
+share/pear/tests/DB/tests/oci8/09numrows.phpt
+share/pear/tests/DB/tests/oci8/10errormap.phpt
+share/pear/tests/DB/tests/oci8/13limit.phpt
+share/pear/tests/DB/tests/odbc/01connect.phpt
+share/pear/tests/DB/tests/odbc/02fetch.phpt
+share/pear/tests/DB/tests/odbc/03simplequery.phpt
+share/pear/tests/DB/tests/odbc/04numcols.phpt
+share/pear/tests/DB/tests/odbc/06prepexec.phpt
+share/pear/tests/DB/tests/odbc/07errornative.phpt
+share/pear/tests/DB/tests/odbc/09numrows.phpt
+share/pear/tests/DB/tests/odbc/10errormap.phpt
+share/pear/tests/DB/tests/pgsql/01connect.phpt
+share/pear/tests/DB/tests/pgsql/02fetch.phpt
+share/pear/tests/DB/tests/pgsql/03simplequery.phpt
+share/pear/tests/DB/tests/pgsql/04numcols.phpt
+share/pear/tests/DB/tests/pgsql/05sequences.phpt
+share/pear/tests/DB/tests/pgsql/06prepexec.phpt
+share/pear/tests/DB/tests/pgsql/07errornative.phpt
+share/pear/tests/DB/tests/pgsql/08affectedrows.phpt
+share/pear/tests/DB/tests/pgsql/09numrows.phpt
+share/pear/tests/DB/tests/pgsql/10errormap.phpt
+share/pear/tests/DB/tests/pgsql/11transact.phpt
+share/pear/tests/DB/tests/pgsql/13limit.phpt
+share/pear/tests/DB/tests/pgsql/14fetchmode_object.phpt
+share/pear/tests/XML_Parser/tests/001.phpt
+share/pear/tests/XML_Parser/tests/002.phpt
+share/pear/tests/XML_Parser/tests/003.phpt
+share/pear/tests/XML_Parser/tests/004.phpt
+share/pear/tests/XML_Parser/tests/005.phpt
+share/pear/tests/XML_Parser/tests/test2.xml
+share/pear/tests/XML_Parser/tests/test3.xml
+@dirrm share/pear/tests/XML_Parser/tests
+@dirrm share/pear/tests/XML_Parser
+@dirrm share/pear/tests/DB/tests/pgsql
+@dirrm share/pear/tests/DB/tests/odbc
+@dirrm share/pear/tests/DB/tests/oci8
+@dirrm share/pear/tests/DB/tests/mysql
+@dirrm share/pear/tests/DB/tests/ibase
+@dirrm share/pear/tests/DB/tests/driver
+@dirrm share/pear/tests/DB/tests
+@dirrm share/pear/tests/DB
+@dirrm share/pear/tests
+@dirrm share/pear/PEAR
+@dirrm share/pear
+@dirrm share/doc/pear/DB/DB
+@dirrm share/doc/pear/DB
+@dirrm share/doc/pear/Archive_Tar/docs
+@dirrm share/doc/pear/Archive_Tar
+@dirrm share/doc/pear
 @dirrm lib/php/build
+@dirrm lib/php/XML/RPC
 @dirrm lib/php/XML
-@dirrm lib/php/Schedule
 @dirrm lib/php/PEAR/Frontend
 @dirrm lib/php/PEAR/Command
 @dirrm lib/php/PEAR
+@dirrm lib/php/OS
 @dirrm lib/php/Net
 @dirrm lib/php/Mail
-@dirrm lib/php/Log
-@exec mkdir -p %D/lib/php/Image
-@dirrm lib/php/Image
-@dirrm lib/php/HTTP
-@dirrm lib/php/HTML
-@dirrm lib/php/File
-@dirrm lib/php/Date
 @dirrm lib/php/DB
-@dirrm lib/php/Crypt
 @dirrm lib/php/Console
 @dirrm lib/php/Archive
+@dirrm lib/php/.registry
 @dirrm include/php/regex
 @dirrm include/php/main
 @dirrm include/php/ext/xml/expat
 @dirrm include/php/ext/xml
 @dirrm include/php/ext/standard
 @dirrm include/php/ext/session
+@dirrm include/php/ext/pgsql
 @dirrm include/php/ext/mbstring
 @dirrm include/php/ext
 @dirrm include/php/Zend

pear-Log.tgz