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

[UPDATE] php5 to version 5.1.1



Hey.

Finally here is a diff that takes php5 to version 5.1.1.
Since 5.1.0 php uses a PHP Archive to install PEAR.
To have the correct dirs/paths we fetch a pear CVS snapshot
and modify that before recreating the php archive with
the correct dirs/paths in it.
This diff needs a lot of testing, so please go ahead and do it.
Thanks.

Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/www/php5/Makefile.inc,v
retrieving revision 1.5
diff -u -r1.5 Makefile.inc
--- Makefile.inc	14 Sep 2005 15:44:19 -0000	1.5
+++ Makefile.inc	16 Dec 2005 19:58:17 -0000
@@ -4,7 +4,7 @@
 # and has Apache that supports DSO's.
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
-V=		5.0.5
+V=			5.1.1
 DISTNAME=	php-${V}
 CATEGORIES=	www lang
 
@@ -15,6 +15,7 @@
 		http://se.php.net/distributions/ \
 		http://no.php.net/distributions/ \
 		http://uk.php.net/distributions/
+MASTER_SITES0=	http://www.bsd.hu/~robert/
 
 # UPGRADERS: please read BOTH the PHP and Zend licenses
 # and make sure they are safe before an upgrade
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/php5/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	14 Sep 2005 15:44:19 -0000	1.5
+++ distinfo	16 Dec 2005 19:58:17 -0000
@@ -1,4 +1,8 @@
-MD5 (php-5.0.5.tar.gz) = ae36a2aa35cfaa58bdc5b9a525e6f451
-RMD160 (php-5.0.5.tar.gz) = f94cd33d13a298b5b5d2389a2d2b2079fe231fce
-SHA1 (php-5.0.5.tar.gz) = 031ac2b1f56f4f6b20b17206a52627790b51f3bb
-SIZE (php-5.0.5.tar.gz) = 6082082
+MD5 (pear-core-20051215.tar.gz) = 8da3703d2d3a495535a71f7b51e04732
+MD5 (php-5.1.1.tar.gz) = ed3d099828282e66c66cadd8d879d739
+RMD160 (pear-core-20051215.tar.gz) = 00139a3a03a9a7aedc013f8332a5d32c13ed631e
+RMD160 (php-5.1.1.tar.gz) = a122e775cb928f5b972573867d321653cb05279d
+SHA1 (pear-core-20051215.tar.gz) = 0da8408b02e6e0ba13d9bd953f54b07366d33009
+SHA1 (php-5.1.1.tar.gz) = 88e48e47c11351b2fa9d5649343f839800acb1bf
+SIZE (pear-core-20051215.tar.gz) = 5720460
+SIZE (php-5.1.1.tar.gz) = 7852249
Index: core/Makefile
===================================================================
RCS file: /cvs/ports/www/php5/core/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- core/Makefile	14 Sep 2005 15:44:19 -0000	1.10
+++ core/Makefile	16 Dec 2005 19:58:17 -0000
@@ -7,6 +7,8 @@
 COMMENT-pear=	"base classes for common PHP tasks"
 PKGNAME=	php5-core-${V}
 FULLPKGNAME-pear= php5-pear-${V}
+DISTFILES=	php-${V}.tar.gz \
+			pear-core-20051215.tar.gz:0
 
 CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
 		--without-mysql \
@@ -55,14 +57,17 @@
 
 pre-fake:
 	${INSTALL_DATA_DIR} ${PREFIX}/${APACHE_MODULE_SUBDIR}
+	@perl -p -i.orig -e "s,OPENBSD_PEAR_ROOT,'${CHROOT_DIR}/pear',g" \
+		${WRKDIR}/pear-core/PEAR/Config.php ${WRKDIR}/pear-core/install-pear.php
+	@cd ${WRKDIR}/pear-core && ${WRKSRC}/sapi/cli/php -n make-installpear-nozlib-phar.php
+	@cp ${WRKDIR}/pear-core/install-pear-nozlib.phar ${WRKSRC}/pear/
 
 INSTALL_TARGET= install-pear install-headers install-build install-programs
-FAKE_FLAGS= 	INSTALL_ROOT=${DESTDIR}
+FAKE_FLAGS=     INSTALL_ROOT=${DESTDIR}
 
 post-patch:
 	@perl -p -i.orig -e "s,OPENBSD_PEAR_ROOT,'${CHROOT_DIR}/pear',g" \
-		${WRKSRC}/pear/PEAR/Config.php ${WRKSRC}/scripts/phpize.in \
-		${WRKSRC}/scripts/php-config.in
+		${WRKSRC}/scripts/phpize.in ${WRKSRC}/scripts/php-config.in 
 
 post-install:
 	${INSTALL_DATA} ${WRKBUILD}/.libs/libphp5.so ${PREFIX}/${APACHE_MODULE_SUBDIR}
Index: core/patches/patch-ext_ming_config_m4
===================================================================
RCS file: core/patches/patch-ext_ming_config_m4
diff -N core/patches/patch-ext_ming_config_m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ core/patches/patch-ext_ming_config_m4	16 Dec 2005 19:58:17 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- ext/ming/config.m4.orig	Tue Nov 29 16:14:37 2005
++++ ext/ming/config.m4	Tue Nov 29 16:15:12 2005
+@@ -72,13 +72,6 @@
+     AC_DEFINE(HAVE_NEW_MING,  1, [ ]) 
+     dnl FIXME: This is now unconditional..better check coming later.
+     AC_DEFINE(HAVE_MING_ZLIB, 1, [ ])
+-    AC_TRY_COMPILE([
+-#include <ming.h>
+-int main(int,void) {
+-  SWFMovie_output(NULL, NULL, NULL, 0));
+-  return 0;
+-}
+-	], [ AC_DEFINE(HAVE_MING_MOVIE_LEVEL, 1, []) ])
+   ])
+   CPPFLAGS=$old_CPPFLAGS
+ 
Index: core/patches/patch-ext_yp_yp_c
===================================================================
RCS file: core/patches/patch-ext_yp_yp_c
diff -N core/patches/patch-ext_yp_yp_c
--- core/patches/patch-ext_yp_yp_c	2 Oct 2004 12:36:49 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-ext_yp_yp_c,v 1.1.1.1 2004/10/02 12:36:49 robert Exp $
---- ext/yp/yp.c.orig	Mon Jul 26 22:49:33 2004
-+++ ext/yp/yp.c	Mon Jul 26 22:51:22 2004
-@@ -280,7 +280,7 @@
- 	convert_to_string_ex(domain);
- 	convert_to_string_ex(map);
- 
--	callback.foreach = php_foreach_all;
-+	(char *) callback.foreach = php_foreach_all;
- 	callback.data = (char *) php_callback;
- 
- 	yp_all(Z_STRVAL_PP(domain),Z_STRVAL_PP(map),&callback);
-@@ -337,7 +337,7 @@
- 
- 	array_init(return_value);
- 
--	callback.foreach = php_foreach_cat;
-+	(char *) callback.foreach = php_foreach_cat;
- 	callback.data = (char *) return_value;
- 
- 	yp_all(Z_STRVAL_PP(domain),Z_STRVAL_PP(map),&callback);
Index: core/patches/patch-pear_PEAR_Config_php
===================================================================
RCS file: core/patches/patch-pear_PEAR_Config_php
diff -N core/patches/patch-pear_PEAR_Config_php
--- core/patches/patch-pear_PEAR_Config_php	2 Oct 2004 12:36:49 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
-$OpenBSD: patch-pear_PEAR_Config_php,v 1.1.1.1 2004/10/02 12:36:49 robert Exp $
---- pear/PEAR/Config.php.orig	Thu Jan  8 18:33:12 2004
-+++ pear/PEAR/Config.php	Mon Jul 26 23:01:21 2004
-@@ -66,12 +66,7 @@
- if (getenv('PHP_PEAR_INSTALL_DIR')) {
-     define('PEAR_CONFIG_DEFAULT_PHP_DIR', getenv('PHP_PEAR_INSTALL_DIR'));
- } else {
--    if (@is_dir($PEAR_INSTALL_DIR)) {
--        define('PEAR_CONFIG_DEFAULT_PHP_DIR',
--               $PEAR_INSTALL_DIR);
--    } else {
--        define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR);
--    }
-+    define('PEAR_CONFIG_DEFAULT_PHP_DIR', OPENBSD_PEAR_ROOT.'/lib');
- }
- 
- // Default for ext_dir
-@@ -93,8 +88,7 @@
- if (getenv('PHP_PEAR_DOC_DIR')) {
-     define('PEAR_CONFIG_DEFAULT_DOC_DIR', getenv('PHP_PEAR_DOC_DIR'));
- } else {
--    define('PEAR_CONFIG_DEFAULT_DOC_DIR',
--           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'docs');
-+    define('PEAR_CONFIG_DEFAULT_DOC_DIR', OPENBSD_PEAR_ROOT.'/doc');
- }
- 
- // Default for bin_dir
-@@ -108,16 +102,14 @@
- if (getenv('PHP_PEAR_DATA_DIR')) {
-     define('PEAR_CONFIG_DEFAULT_DATA_DIR', getenv('PHP_PEAR_DATA_DIR'));
- } else {
--    define('PEAR_CONFIG_DEFAULT_DATA_DIR',
--           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'data');
-+    define('PEAR_CONFIG_DEFAULT_DATA_DIR', OPENBSD_PEAR_ROOT.'/data');
- }
- 
- // Default for test_dir
- if (getenv('PHP_PEAR_TEST_DIR')) {
-     define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR'));
- } else {
--    define('PEAR_CONFIG_DEFAULT_TEST_DIR',
--           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'tests');
-+    define('PEAR_CONFIG_DEFAULT_TEST_DIR', OPENBSD_PEAR_ROOT.'/tests');
- }
- 
- // Default for cache_dir
-@@ -176,9 +168,7 @@
- if (getenv('PHP_PEAR_SIG_BIN')) {
-     define('PEAR_CONFIG_DEFAULT_SIG_BIN', getenv('PHP_PEAR_SIG_BIN'));
- } else {
--    define('PEAR_CONFIG_DEFAULT_SIG_BIN',
--           System::which(
--               'gpg', OS_WINDOWS ? 'c:\gnupg\gpg.exe' : '/usr/local/bin/gpg'));
-+    define('PEAR_CONFIG_DEFAULT_SIG_BIN', PHP_PREFIX . '/bin/gpg');
- }
- 
- // Default for sig_keydir
Index: core/patches/patch-pear_install-pear_php
===================================================================
RCS file: core/patches/patch-pear_install-pear_php
diff -N core/patches/patch-pear_install-pear_php
--- core/patches/patch-pear_install-pear_php	2 Oct 2004 12:36:49 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-pear_install-pear_php,v 1.1.1.1 2004/10/02 12:36:49 robert Exp $
---- pear/install-pear.php.orig	Mon Jul 26 23:02:15 2004
-+++ pear/install-pear.php	Mon Jul 26 23:02:59 2004
-@@ -46,10 +46,11 @@
- // User supplied a dir prefix
- if (!empty($with_dir)) {
-     $ds = DIRECTORY_SEPARATOR;
--    $config->set('php_dir', $with_dir, 'default');
-+    $config->set('php_dir', $with_dir . $ds . 'lib', 'default');
-     $config->set('doc_dir', $with_dir . $ds . 'doc', 'default');
-     $config->set('data_dir', $with_dir . $ds . 'data', 'default');
-     $config->set('test_dir', $with_dir . $ds . 'test', 'default');
-+    $config->set('test_dir', $with_dir . $ds . 'tests', 'default');
- }
- /* Print PEAR Conf (useful for debuging do NOT REMOVE)
- sort($keys);
Index: core/patches/patch-scripts_php-config_in
===================================================================
RCS file: core/patches/patch-scripts_php-config_in
diff -N core/patches/patch-scripts_php-config_in
--- core/patches/patch-scripts_php-config_in	4 Apr 2005 21:13:22 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-scripts_php-config_in,v 1.2 2005/04/04 21:13:22 robert Exp $
---- scripts/php-config.in.orig	Wed Mar 16 07:36:54 2005
-+++ scripts/php-config.in	Sun Apr  3 12:39:04 2005
-@@ -1,8 +1,8 @@
- #! /bin/sh
- 
--prefix="@prefix@"
-+prefix=OPENBSD_PEAR_ROOT
- version="@PHP_VERSION@"
--includedir="@includedir@/php"
-+includedir="@includedir@"
- includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend"
- ldflags="@PHP_LDFLAGS@"
- libs="@EXTRA_LIBS@"
Index: core/patches/patch-scripts_phpize_in
===================================================================
RCS file: /cvs/ports/www/php5/core/patches/patch-scripts_phpize_in,v
retrieving revision 1.2
diff -u -r1.2 patch-scripts_phpize_in
--- core/patches/patch-scripts_phpize_in	14 Sep 2005 15:44:19 -0000	1.2
+++ core/patches/patch-scripts_phpize_in	16 Dec 2005 19:58:17 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-scripts_phpize_in,v 1.2 2005/09/14 15:44:19 robert Exp $
---- scripts/phpize.in.orig	Wed Jun 15 19:19:41 2005
-+++ scripts/phpize.in	Wed Sep 14 16:50:39 2005
+$OpenBSD$
+--- scripts/phpize.in.orig	Thu Sep  1 15:59:03 2005
++++ scripts/phpize.in	Sat Nov 26 13:07:08 2005
 @@ -1,10 +1,10 @@
  #!/bin/sh
  
Index: core/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/php5/core/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- core/pkg/PLIST	14 Sep 2005 15:44:19 -0000	1.4
+++ core/pkg/PLIST	16 Dec 2005 19:58:17 -0000
@@ -2,6 +2,8 @@
 @conflict php4-core-*
 %%SHARED%%
 bin/pear
+bin/peardev
+bin/pecl
 bin/php
 bin/php-config
 bin/phpize
Index: core/pkg/PLIST-pear
===================================================================
RCS file: /cvs/ports/www/php5/core/pkg/PLIST-pear,v
retrieving revision 1.5
diff -u -r1.5 PLIST-pear
--- core/pkg/PLIST-pear	14 Sep 2005 15:44:19 -0000	1.5
+++ core/pkg/PLIST-pear	16 Dec 2005 19:58:18 -0000
@@ -10,6 +10,7 @@
 pear/build/ltmain.sh
 pear/build/mkdep.awk
 pear/build/phpize.m4
+pear/build/run-tests.php
 pear/build/scan_makefile_in.awk
 pear/build/shtool
 pear/data/
@@ -20,18 +21,12 @@
 pear/doc/Archive_Tar/
 pear/doc/Archive_Tar/docs/
 pear/doc/Archive_Tar/docs/Archive_Tar.txt
-pear/doc/HTML_Template_IT/
-pear/doc/HTML_Template_IT/examples/
-pear/doc/HTML_Template_IT/examples/sample_it.php
-pear/doc/HTML_Template_IT/examples/templates/
-pear/doc/HTML_Template_IT/examples/templates/main.tpl.htm
 pear/include/
 pear/include/TSRM/
 pear/include/TSRM/TSRM.h
 pear/include/TSRM/acconfig.h
 pear/include/TSRM/readdir.h
 pear/include/TSRM/tsrm_config.h
-pear/include/TSRM/tsrm_config.nw.h
 pear/include/TSRM/tsrm_config.w32.h
 pear/include/TSRM/tsrm_config_common.h
 pear/include/TSRM/tsrm_nw.h
@@ -89,8 +84,17 @@
 pear/include/Zend/zend_ts_hash.h
 pear/include/Zend/zend_types.h
 pear/include/Zend/zend_variables.h
-pear/include/acconfig.h
+pear/include/Zend/zend_vm.h
+pear/include/Zend/zend_vm_def.h
+pear/include/Zend/zend_vm_execute.h
+pear/include/Zend/zend_vm_opcodes.h
 pear/include/ext/
+pear/include/ext/date/
+pear/include/ext/date/lib/
+pear/include/ext/date/lib/timelib.h
+pear/include/ext/date/lib/timelib_config.h
+pear/include/ext/date/lib/timelib_structs.h
+pear/include/ext/date/php_date.h
 pear/include/ext/dom/
 pear/include/ext/dom/xml_common.h
 pear/include/ext/iconv/
@@ -104,37 +108,25 @@
 pear/include/ext/iconv/php_php_iconv_impl.h
 pear/include/ext/libxml/
 pear/include/ext/libxml/php_libxml.h
-pear/include/ext/mbstring/
-pear/include/ext/mbstring/libmbfl/
-pear/include/ext/mbstring/libmbfl/mbfl/
-pear/include/ext/mbstring/libmbfl/mbfl/eaw_table.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfilter.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_language.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_string.h
-pear/include/ext/mbstring/mb_gpc.h
-pear/include/ext/mbstring/mbstring.h
-pear/include/ext/mbstring/php_mbregex.h
-pear/include/ext/mbstring/php_unicode.h
-pear/include/ext/mbstring/unicode_data.h
+pear/include/ext/pcre/
+pear/include/ext/pcre/pcrelib/
+pear/include/ext/pcre/pcrelib/internal.h
+pear/include/ext/pcre/pcrelib/pcre.h
+pear/include/ext/pcre/pcrelib/pcre_internal.h
+pear/include/ext/pcre/pcrelib/pcre_scanner.h
+pear/include/ext/pcre/pcrelib/pcre_stringpiece.h
+pear/include/ext/pcre/pcrelib/pcrecpp.h
+pear/include/ext/pcre/pcrelib/pcreposix.h
+pear/include/ext/pcre/pcrelib/ucp.h
+pear/include/ext/pcre/pcrelib/ucpinternal.h
+pear/include/ext/pcre/php_pcre.h
+pear/include/ext/pdo/
+pear/include/ext/pdo/php_pdo.h
+pear/include/ext/pdo/php_pdo_driver.h
 pear/include/ext/session/
 pear/include/ext/session/mod_files.h
-pear/include/ext/session/mod_mm.h
 pear/include/ext/session/mod_user.h
 pear/include/ext/session/php_session.h
-pear/include/ext/sqlite/
-pear/include/ext/sqlite/libsqlite/
-pear/include/ext/sqlite/libsqlite/src/
 pear/include/ext/standard/
 pear/include/ext/standard/base64.h
 pear/include/ext/standard/basic_functions.h
@@ -158,7 +150,6 @@
 pear/include/ext/standard/microtime.h
 pear/include/ext/standard/pack.h
 pear/include/ext/standard/pageinfo.h
-pear/include/ext/standard/parsedate.h
 pear/include/ext/standard/php_array.h
 pear/include/ext/standard/php_assert.h
 pear/include/ext/standard/php_browscap.h
@@ -177,7 +168,6 @@
 pear/include/ext/standard/php_mail.h
 pear/include/ext/standard/php_math.h
 pear/include/ext/standard/php_metaphone.h
-pear/include/ext/standard/php_parsedate.h
 pear/include/ext/standard/php_rand.h
 pear/include/ext/standard/php_smart_str.h
 pear/include/ext/standard/php_smart_str_public.h
@@ -199,7 +189,6 @@
 pear/include/ext/standard/url_scanner.h
 pear/include/ext/standard/url_scanner_ex.h
 pear/include/ext/xml/
-pear/include/ext/xml/expat/
 pear/include/ext/xml/expat_compat.h
 pear/include/ext/xml/php_xml.h
 pear/include/include/
@@ -208,14 +197,12 @@
 pear/include/main/build-defs.h
 pear/include/main/config.w32.h
 pear/include/main/fopen_wrappers.h
-pear/include/main/internal_functions_registry.h
 pear/include/main/logos.h
 pear/include/main/php.h
 pear/include/main/php3_compat.h
 pear/include/main/php_compat.h
 pear/include/main/php_config.h
 pear/include/main/php_content_types.h
-pear/include/main/php_embed.h
 pear/include/main/php_globals.h
 pear/include/main/php_ini.h
 pear/include/main/php_logos.h
@@ -253,81 +240,130 @@
 pear/include/regex/regex_extra.h
 pear/include/regex/utils.h
 pear/lib/
+pear/lib/.channels/
+pear/lib/.channels/.alias/
+pear/lib/.channels/.alias/pear.txt
+pear/lib/.channels/.alias/pecl.txt
+pear/lib/.channels/__uri.reg
+pear/lib/.channels/pear.php.net.reg
+pear/lib/.channels/pecl.php.net.reg
+pear/lib/.depdb
+pear/lib/.depdblock
 pear/lib/.registry/
+pear/lib/.registry/.channel.__uri/
+pear/lib/.registry/.channel.pecl.php.net/
 pear/lib/.registry/archive_tar.reg
 pear/lib/.registry/console_getopt.reg
-pear/lib/.registry/html_template_it.reg
-pear/lib/.registry/net_useragent_detect.reg
 pear/lib/.registry/pear.reg
-pear/lib/.registry/xml_rpc.reg
 pear/lib/Archive/
 pear/lib/Archive/Tar.php
 pear/lib/Console/
 pear/lib/Console/Getopt.php
-pear/lib/HTML/
-pear/lib/HTML/Template/
-pear/lib/HTML/Template/IT.php
-pear/lib/HTML/Template/ITX.php
-pear/lib/HTML/Template/IT_Error.php
-pear/lib/Net/
-pear/lib/Net/UserAgent/
-pear/lib/Net/UserAgent/Detect.php
 pear/lib/OS/
 pear/lib/OS/Guess.php
 pear/lib/PEAR/
 pear/lib/PEAR.php
 pear/lib/PEAR/Autoloader.php
 pear/lib/PEAR/Builder.php
+pear/lib/PEAR/ChannelFile/
+pear/lib/PEAR/ChannelFile.php
+pear/lib/PEAR/ChannelFile/Parser.php
 pear/lib/PEAR/Command/
 pear/lib/PEAR/Command.php
 pear/lib/PEAR/Command/Auth.php
+pear/lib/PEAR/Command/Auth.xml
 pear/lib/PEAR/Command/Build.php
+pear/lib/PEAR/Command/Build.xml
+pear/lib/PEAR/Command/Channels.php
+pear/lib/PEAR/Command/Channels.xml
 pear/lib/PEAR/Command/Common.php
 pear/lib/PEAR/Command/Config.php
+pear/lib/PEAR/Command/Config.xml
 pear/lib/PEAR/Command/Install.php
+pear/lib/PEAR/Command/Install.xml
 pear/lib/PEAR/Command/Mirror.php
+pear/lib/PEAR/Command/Mirror.xml
 pear/lib/PEAR/Command/Package.php
+pear/lib/PEAR/Command/Package.xml
+pear/lib/PEAR/Command/Pickle.php
+pear/lib/PEAR/Command/Pickle.xml
 pear/lib/PEAR/Command/Registry.php
+pear/lib/PEAR/Command/Registry.xml
 pear/lib/PEAR/Command/Remote.php
+pear/lib/PEAR/Command/Remote.xml
+pear/lib/PEAR/Command/Test.php
+pear/lib/PEAR/Command/Test.xml
 pear/lib/PEAR/Common.php
 pear/lib/PEAR/Config.php
 pear/lib/PEAR/Dependency.php
+pear/lib/PEAR/Dependency2.php
+pear/lib/PEAR/DependencyDB.php
+pear/lib/PEAR/Downloader/
 pear/lib/PEAR/Downloader.php
+pear/lib/PEAR/Downloader/Package.php
 pear/lib/PEAR/ErrorStack.php
 pear/lib/PEAR/Exception.php
 pear/lib/PEAR/Frontend/
+pear/lib/PEAR/Frontend.php
 pear/lib/PEAR/Frontend/CLI.php
+pear/lib/PEAR/Installer/
 pear/lib/PEAR/Installer.php
+pear/lib/PEAR/Installer/Role/
+pear/lib/PEAR/Installer/Role.php
+pear/lib/PEAR/Installer/Role/Common.php
+pear/lib/PEAR/Installer/Role/Data.php
+pear/lib/PEAR/Installer/Role/Data.xml
+pear/lib/PEAR/Installer/Role/Doc.php
+pear/lib/PEAR/Installer/Role/Doc.xml
+pear/lib/PEAR/Installer/Role/Ext.php
+pear/lib/PEAR/Installer/Role/Ext.xml
+pear/lib/PEAR/Installer/Role/Php.php
+pear/lib/PEAR/Installer/Role/Php.xml
+pear/lib/PEAR/Installer/Role/Script.php
+pear/lib/PEAR/Installer/Role/Script.xml
+pear/lib/PEAR/Installer/Role/Src.php
+pear/lib/PEAR/Installer/Role/Src.xml
+pear/lib/PEAR/Installer/Role/Test.php
+pear/lib/PEAR/Installer/Role/Test.xml
+pear/lib/PEAR/PackageFile/
+pear/lib/PEAR/PackageFile.php
+pear/lib/PEAR/PackageFile/Generator/
+pear/lib/PEAR/PackageFile/Generator/v1.php
+pear/lib/PEAR/PackageFile/Generator/v2.php
+pear/lib/PEAR/PackageFile/Parser/
+pear/lib/PEAR/PackageFile/Parser/v1.php
+pear/lib/PEAR/PackageFile/Parser/v2.php
+pear/lib/PEAR/PackageFile/v1.php
+pear/lib/PEAR/PackageFile/v2/
+pear/lib/PEAR/PackageFile/v2.php
+pear/lib/PEAR/PackageFile/v2/Validator.php
+pear/lib/PEAR/PackageFile/v2/rw.php
 pear/lib/PEAR/Packager.php
+pear/lib/PEAR/REST/
+pear/lib/PEAR/REST.php
+pear/lib/PEAR/REST/10.php
+pear/lib/PEAR/REST/11.php
 pear/lib/PEAR/Registry.php
 pear/lib/PEAR/Remote.php
 pear/lib/PEAR/RunTest.php
+pear/lib/PEAR/Task/
+pear/lib/PEAR/Task/Common.php
+pear/lib/PEAR/Task/Postinstallscript/
+pear/lib/PEAR/Task/Postinstallscript.php
+pear/lib/PEAR/Task/Postinstallscript/rw.php
+pear/lib/PEAR/Task/Replace/
+pear/lib/PEAR/Task/Replace.php
+pear/lib/PEAR/Task/Replace/rw.php
+pear/lib/PEAR/Task/Unixeol/
+pear/lib/PEAR/Task/Unixeol.php
+pear/lib/PEAR/Task/Unixeol/rw.php
+pear/lib/PEAR/Task/Windowseol/
+pear/lib/PEAR/Task/Windowseol.php
+pear/lib/PEAR/Task/Windowseol/rw.php
+pear/lib/PEAR/Validate.php
+pear/lib/PEAR/Validator/
+pear/lib/PEAR/Validator/PECL.php
+pear/lib/PEAR/XMLParser.php
 pear/lib/System.php
-pear/lib/XML/
-pear/lib/XML/RPC/
-pear/lib/XML/RPC.php
-pear/lib/XML/RPC/Dump.php
-pear/lib/XML/RPC/Server.php
 pear/lib/pearcmd.php
-pear/tests/
-pear/tests/HTML_Template_IT/
-pear/tests/HTML_Template_IT/tests/
-pear/tests/HTML_Template_IT/tests/Console_TestListener.php
-pear/tests/HTML_Template_IT/tests/ITX_api_testcase.php
-pear/tests/HTML_Template_IT/tests/ITX_usage_testcase.php
-pear/tests/HTML_Template_IT/tests/IT_api_testcase.php
-pear/tests/HTML_Template_IT/tests/IT_usage_testcase.php
-pear/tests/HTML_Template_IT/tests/templates/
-pear/tests/HTML_Template_IT/tests/templates/__include.html
-pear/tests/HTML_Template_IT/tests/templates/addblock.html
-pear/tests/HTML_Template_IT/tests/templates/blockiteration.html
-pear/tests/HTML_Template_IT/tests/templates/blocks.html
-pear/tests/HTML_Template_IT/tests/templates/globals.html
-pear/tests/HTML_Template_IT/tests/templates/include.html
-pear/tests/HTML_Template_IT/tests/templates/loadtemplatefile.html
-pear/tests/HTML_Template_IT/tests/templates/replaceblock.html
-pear/tests/HTML_Template_IT/tests/test.php
-pear/tests/XML_RPC/
-pear/tests/XML_RPC/tests/
-pear/tests/XML_RPC/tests/protoport.php
-pear/tests/XML_RPC/tests/test_Dump.php
+pear/lib/peclcmd.php
Index: extensions/Makefile
===================================================================
RCS file: /cvs/ports/www/php5/extensions/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- extensions/Makefile	16 Sep 2005 09:51:28 -0000	1.15
+++ extensions/Makefile	16 Dec 2005 19:58:18 -0000
@@ -1,6 +1,6 @@
 # $OpenBSD: Makefile,v 1.15 2005/09/16 09:51:28 espie Exp $
 
-FULLPKGNAME=	php5-extensions-${V}p0
+FULLPKGNAME=	php5-extensions-${V}
 COMMENT=	"informational package about PHP5 extensions"
 
 MULTI_PACKAGES=
@@ -75,16 +75,6 @@
 CONFIGURE_ARGS+=	--enable-dbase=shared
 .endif
 
-# dbx
-PSEUDO_FLAVORS+=	no_dbx
-.if ${FLAVOR:L:Mno_dbx}
-CONFIGURE_ARGS+=	--disable-dbx
-.else
-MULTI_PACKAGES+=	-dbx
-COMMENT-dbx=		"dbx database abstraction interface for php5"
-CONFIGURE_ARGS+=	--enable-dbx=shared
-.endif
-
 # filepro
 PSEUDO_FLAVORS+=	no_filepro
 .if ${FLAVOR:L:Mno_filepro}
@@ -316,7 +306,7 @@
 
 .for i in ${MULTI_PACKAGES}
 .if !defined(FULLPKGNAME${i})
-FULLPKGNAME${i}=	php5${i}-${V}p0
+FULLPKGNAME${i}=	php5${i}-${V}
 .endif
 .endfor
 
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	2 Oct 2004 11:32:35 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-ext_gd_config_m4,v 1.1.1.1 2004/10/02 11:32:35 robert Exp $
---- ext/gd/config.m4.orig	Thu Dec 25 23:12:08 2003
-+++ ext/gd/config.m4	Tue Jul 27 00:41:56 2004
-@@ -87,13 +87,13 @@
-       AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>])
-     fi
- 
--    if test ! -f $GD_PNG_DIR/include/png.h; then
-+    if test ! -f $GD_PNG_DIR/include/libpng/png.h; then
-       AC_MSG_ERROR([png.h not found.])
-     fi
- 
-     PHP_CHECK_LIBRARY(png,png_write_image,
-     [
--      PHP_ADD_INCLUDE($GD_PNG_DIR/include)
-+      PHP_ADD_INCLUDE($GD_PNG_DIR/include/libpng)
-       PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD)
-       PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD)
-     ],[
Index: extensions/pkg/DESCR-dbx
===================================================================
RCS file: extensions/pkg/DESCR-dbx
diff -N extensions/pkg/DESCR-dbx
--- extensions/pkg/DESCR-dbx	2 Oct 2004 11:32:35 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-Database abstraction layer, allowing database-independent PHP code
-with some semblance of efficiency.
-
Index: extensions/pkg/PLIST-dbx
===================================================================
RCS file: extensions/pkg/PLIST-dbx
diff -N extensions/pkg/PLIST-dbx
--- extensions/pkg/PLIST-dbx	21 Dec 2004 12:15:02 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-_(_at_)_comment $OpenBSD: PLIST-dbx,v 1.2 2004/12/21 12:15:02 espie Exp $
-_(_at_)_conflict php4-dbx-*
-lib/php/modules/dbx.so
Index: patches/patch-aclocal_m4
===================================================================
RCS file: /cvs/ports/www/php5/patches/patch-aclocal_m4,v
retrieving revision 1.3
diff -u -r1.3 patch-aclocal_m4
--- patches/patch-aclocal_m4	4 Apr 2005 21:13:22 -0000	1.3
+++ patches/patch-aclocal_m4	16 Dec 2005 19:58:18 -0000
@@ -1,10 +1,10 @@
-$OpenBSD: patch-aclocal_m4,v 1.3 2005/04/04 21:13:22 robert Exp $
---- aclocal.m4.orig	Wed Mar 30 23:45:38 2005
-+++ aclocal.m4	Sun Apr  3 21:38:56 2005
-@@ -1656,10 +1656,9 @@
+$OpenBSD$
+--- aclocal.m4.orig	Wed Nov 23 22:37:40 2005
++++ aclocal.m4	Sat Nov 26 12:59:21 2005
+@@ -2100,10 +2100,9 @@
      if test "$PHP_KERBEROS_DIR"; then
        found_kerberos=yes
-       PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, $1)
+       PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/$PHP_LIBDIR, $1)
 -      PHP_ADD_LIBRARY(gssapi_krb5, 1, $1)
        PHP_ADD_LIBRARY(krb5, 1, $1)
 -      PHP_ADD_LIBRARY(k5crypto, 1, $1)
@@ -14,29 +14,12 @@
        PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
      fi
    fi
-@@ -1753,6 +1752,7 @@
-   
-     PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
-       PHP_ADD_LIBRARY(crypto,,$1)
-+      PHP_ADD_LIBRARY(des,,$1)
-     ],[
-       AC_MSG_ERROR([libcrypto not found!])
-     ],[
-@@ -4083,7 +4083,7 @@
-   need_version=no
-   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-   soname_spec='${libname}${release}.so$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  finish_cmds=
-   shlibpath_var=LD_LIBRARY_PATH
-   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-   sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-@@ -4313,7 +4313,7 @@
-     shlibpath_overrides_runpath=yes
-   fi
-   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+@@ -4165,7 +4164,7 @@
+     *)                         need_version=no  ;;
+   esac
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 -  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 +  finish_cmds=
    shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+     case $host_os in
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/www/php5/patches/patch-configure_in,v
retrieving revision 1.2
diff -u -r1.2 patch-configure_in
--- patches/patch-configure_in	4 Apr 2005 21:13:22 -0000	1.2
+++ patches/patch-configure_in	16 Dec 2005 19:58:18 -0000
@@ -1,27 +1,16 @@
-$OpenBSD: patch-configure_in,v 1.2 2005/04/04 21:13:22 robert Exp $
---- configure.in.orig	Wed Mar 30 23:43:12 2005
-+++ configure.in	Sun Apr  3 12:37:35 2005
-@@ -31,9 +31,7 @@
- AC_INIT(README.CVS-RULES)
- 
- PHP_CONFIG_NICE(config.nice)
--for arg in $0 "$@"; do
--  CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
--done
-+CONFIGURE_COMMAND="Built via the OpenBSD Ports Tree"
- 
- PHP_CANONICAL_HOST
- AC_CONFIG_HEADER(main/php_config.h)
-@@ -876,7 +874,7 @@
+$OpenBSD$
+--- configure.in.orig	Tue Nov 29 16:01:38 2005
++++ configure.in	Tue Nov 29 16:02:41 2005
+@@ -816,7 +816,7 @@
  
  case $php_build_target in
  program|static)
 -    standard_libtool_flag='-prefer-non-pic -static'
-+    standard_libtool_flag='-static'
++    standard_libtool_flag=''
      if test -z "$PHP_MODULES"; then
          enable_shared=no
      fi
-@@ -884,8 +882,8 @@
+@@ -824,8 +824,8 @@
  shared)
      enable_static=no
      case $with_pic in
@@ -32,7 +21,7 @@
      esac
      EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
  ;;
-@@ -1070,7 +1068,7 @@
+@@ -1009,7 +1009,7 @@
  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"`
Index: patches/patch-ltmain_sh
===================================================================
RCS file: /cvs/ports/www/php5/patches/patch-ltmain_sh,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ltmain_sh
--- patches/patch-ltmain_sh	2 Oct 2004 11:32:37 -0000	1.1.1.1
+++ patches/patch-ltmain_sh	16 Dec 2005 19:58:18 -0000
@@ -1,44 +1,44 @@
-$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2004/10/02 11:32:37 robert Exp $
---- ltmain.sh.orig	Mon Jul 26 23:13:52 2004
-+++ ltmain.sh	Mon Jul 26 23:14:18 2004
-@@ -4524,40 +4524,6 @@
+$OpenBSD$
+--- ltmain.sh.orig	Fri May 27 15:06:04 2005
++++ ltmain.sh	Sat Nov 26 13:03:08 2005
+@@ -5902,40 +5902,6 @@
      # Exit here if they wanted silent mode.
-     test "$show" = ":" && exit 0
+     test "$show" = : && exit $EXIT_SUCCESS
  
--    echo "----------------------------------------------------------------------"
--    echo "Libraries have been installed in:"
+-    $echo "----------------------------------------------------------------------"
+-    $echo "Libraries have been installed in:"
 -    for libdir in $libdirs; do
--      echo "   $libdir"
+-      $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:"
+-    $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"
+-      $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"
+-      $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"
+-      $echo "   - use the \`$flag' linker flag"
 -    fi
 -    if test -n "$admincmds"; then
--      echo "   - have your system administrator run these commands:$admincmds"
+-      $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'"
+-      $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
+-    $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 $EXIT_SUCCESS
      ;;
  
Index: patches/patch-php_ini-dist
===================================================================
RCS file: /cvs/ports/www/php5/patches/patch-php_ini-dist,v
retrieving revision 1.3
diff -u -r1.3 patch-php_ini-dist
--- patches/patch-php_ini-dist	14 Sep 2005 15:44:19 -0000	1.3
+++ patches/patch-php_ini-dist	16 Dec 2005 19:58:18 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-php_ini-dist,v 1.3 2005/09/14 15:44:19 robert Exp $
---- php.ini-dist.orig	Thu May  5 14:33:56 2005
-+++ php.ini-dist	Wed Sep 14 16:43:30 2005
-@@ -437,10 +437,7 @@
+$OpenBSD$
+--- php.ini-dist.orig	Tue Nov 15 00:14:23 2005
++++ php.ini-dist	Sat Nov 26 13:18:08 2005
+@@ -441,10 +441,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -13,7 +13,7 @@
  
  ; The root of the PHP pages, used only if nonempty.
  ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-@@ -454,7 +451,7 @@
+@@ -458,7 +455,7 @@
  user_dir =
  
  ; Directory in which the loadable extensions (modules) reside.
@@ -22,7 +22,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
-@@ -515,7 +512,7 @@
+@@ -519,7 +516,7 @@
  ;;;;;;;;;;;;;;;;;;
  
  ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
@@ -31,10 +31,11 @@
  
  ; Define the anonymous ftp password (your email address)
  ;from="john_(_at_)_doe_(_dot_)_com"
-@@ -534,74 +531,6 @@
+@@ -537,70 +534,6 @@
+ ; fgets() and file() will work regardless of the source of the file.
  ; auto_detect_line_endings = Off
  
- 
+-
 -;;;;;;;;;;;;;;;;;;;;;;
 -; Dynamic Extensions ;
 -;;;;;;;;;;;;;;;;;;;;;;
@@ -57,27 +58,25 @@
 -; extension_dir directive above.
 -
 -
--;Windows Extensions
--;Note that ODBC support is built in, so no dll is needed for it.
--;
+-; Windows Extensions
+-; Note that ODBC support is built in, so no dll is needed for it.
+-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
+-; extension folders as well as the separate PECL DLL download (PHP 5).
+-; Be sure to appropriately set the extension_dir directive.
 -
 -;extension=php_mbstring.dll
 -;extension=php_bz2.dll
--;extension=php_cpdf.dll
 -;extension=php_curl.dll
 -;extension=php_dba.dll
 -;extension=php_dbase.dll
--;extension=php_dbx.dll
 -;extension=php_exif.dll
 -;extension=php_fdf.dll
 -;extension=php_filepro.dll
 -;extension=php_gd2.dll
 -;extension=php_gettext.dll
 -;extension=php_ifx.dll
--;extension=php_iisfunc.dll
 -;extension=php_imap.dll
 -;extension=php_interbase.dll
--;extension=php_java.dll
 -;extension=php_ldap.dll
 -;extension=php_mcrypt.dll
 -;extension=php_mhash.dll
@@ -89,24 +88,21 @@
 -;extension=php_oci8.dll
 -;extension=php_openssl.dll
 -;extension=php_oracle.dll
--;extension=php_pdf.dll
 -;extension=php_pgsql.dll
 -;extension=php_shmop.dll
 -;extension=php_snmp.dll
 -;extension=php_sockets.dll
+-;extension=php_sqlite.dll
 -;extension=php_sybase_ct.dll
 -;extension=php_tidy.dll
--;extension=php_w32api.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
--;extension=php_yaz.dll
--;extension=php_zip.dll
 -
 -
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
  ;;;;;;;;;;;;;;;;;;;
-@@ -613,13 +542,6 @@
+@@ -616,13 +549,6 @@
  define_syslog_variables  = Off
  
  [mail function]
@@ -120,7 +116,7 @@
  ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
  ;sendmail_path =
  
-@@ -1197,6 +1119,53 @@
+@@ -1173,6 +1099,53 @@
  ; instead of original one.
  soap.wsdl_cache_ttl=86400
  
Index: patches/patch-php_ini-recommended
===================================================================
RCS file: /cvs/ports/www/php5/patches/patch-php_ini-recommended,v
retrieving revision 1.3
diff -u -r1.3 patch-php_ini-recommended
--- patches/patch-php_ini-recommended	14 Sep 2005 15:44:19 -0000	1.3
+++ patches/patch-php_ini-recommended	16 Dec 2005 19:58:18 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-php_ini-recommended,v 1.3 2005/09/14 15:44:19 robert Exp $
---- php.ini-recommended.orig	Wed Sep 14 16:40:29 2005
-+++ php.ini-recommended	Wed Sep 14 16:46:06 2005
-@@ -495,10 +495,7 @@
+$OpenBSD$
+--- php.ini-recommended.orig	Tue Nov 15 00:14:23 2005
++++ php.ini-recommended	Sat Nov 26 13:19:47 2005
+@@ -499,10 +499,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -13,7 +13,7 @@
  
  ; The root of the PHP pages, used only if nonempty.
  ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-@@ -512,7 +509,7 @@
+@@ -516,7 +513,7 @@
  user_dir =
  
  ; Directory in which the loadable extensions (modules) reside.
@@ -22,7 +22,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
-@@ -573,7 +570,7 @@
+@@ -577,7 +574,7 @@
  ;;;;;;;;;;;;;;;;;;
  
  ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
@@ -31,7 +31,7 @@
  
  ; Define the anonymous ftp password (your email address)
  ;from="john_(_at_)_doe_(_dot_)_com"
-@@ -591,75 +588,6 @@
+@@ -595,70 +592,6 @@
  ; fgets() and file() will work regardless of the source of the file.
  ; auto_detect_line_endings = Off
  
@@ -58,27 +58,25 @@
 -; extension_dir directive above.
 -
 -
--;Windows Extensions
--;Note that ODBC support is built in, so no dll is needed for it.
--;
+-; Windows Extensions
+-; Note that ODBC support is built in, so no dll is needed for it.
+-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
+-; extension folders as well as the separate PECL DLL download (PHP 5).
+-; Be sure to appropriately set the extension_dir directive.
 -
 -;extension=php_mbstring.dll
 -;extension=php_bz2.dll
--;extension=php_cpdf.dll
 -;extension=php_curl.dll
 -;extension=php_dba.dll
 -;extension=php_dbase.dll
--;extension=php_dbx.dll
 -;extension=php_exif.dll
 -;extension=php_fdf.dll
 -;extension=php_filepro.dll
 -;extension=php_gd2.dll
 -;extension=php_gettext.dll
 -;extension=php_ifx.dll
--;extension=php_iisfunc.dll
 -;extension=php_imap.dll
 -;extension=php_interbase.dll
--;extension=php_java.dll
 -;extension=php_ldap.dll
 -;extension=php_mcrypt.dll
 -;extension=php_mhash.dll
@@ -90,24 +88,21 @@
 -;extension=php_oci8.dll
 -;extension=php_openssl.dll
 -;extension=php_oracle.dll
--;extension=php_pdf.dll
 -;extension=php_pgsql.dll
 -;extension=php_shmop.dll
 -;extension=php_snmp.dll
 -;extension=php_sockets.dll
+-;extension=php_sqlite.dll
 -;extension=php_sybase_ct.dll
 -;extension=php_tidy.dll
--;extension=php_w32api.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
--;extension=php_yaz.dll
--;extension=php_zip.dll
 -
 -
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
  ;;;;;;;;;;;;;;;;;;;
-@@ -671,13 +599,6 @@
+@@ -674,13 +607,6 @@
  define_syslog_variables  = Off
  
  [mail function]
@@ -121,7 +116,7 @@
  ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
  ;sendmail_path =
  
-@@ -1255,6 +1176,53 @@
+@@ -1231,6 +1157,53 @@
  ; instead of original one.
  soap.wsdl_cache_ttl=86400