Update to version 5.1.4;

Add a hardened flavor for both core and extensions (inspired by niallo@); Use our own way to install pear because the bundled installer is totally broken and upstream refuses to fix it. Add a mysqli subpackage which can be used to access the functionality provided by MySQL 4.1 and above. Other minor changes and fixes are also included. ok sturm@; tested by many
2006-05-09 14:15:40 +00:00 · 2006-05-09 14:15:40 +00:00 · 151101789e
commit 151101789e
parent f249cc4e46
25 changed files with 343 additions and 390 deletions
--- a/www/php5/Makefile
+++ b/www/php5/Makefile
@ -1,7 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2004/10/02 11:32:35 robert Exp $
+# $OpenBSD: Makefile,v 1.2 2006/05/09 14:15:40 robert Exp $

 SUBDIR += core
+SUBDIR += core,hardened
 SUBDIR += extensions
+SUBDIR += extensions,hardened
 SUBDIR += extensions,no_x11

 .include <bsd.port.subdir.mk>
--- a/www/php5/Makefile.inc
+++ b/www/php5/Makefile.inc
@ -1,24 +1,25 @@
-# $OpenBSD: Makefile.inc,v 1.7 2005/12/29 23:03:29 sturm Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2006/05/09 14:15:40 robert Exp $

 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
-NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
+NOT_FOR_ARCHS=		${NO_SHARED_ARCHS}

-V=		5.0.5
-DISTNAME=	php-${V}
-CATEGORIES=	www lang
+V=			5.1.4
+DISTNAME?=		php-${V}
+CATEGORIES=		www lang

-MAINTAINER=	Robert Nagy <robert@openbsd.org>
-HOMEPAGE=	http://www.php.net/
+MAINTAINER=		Robert Nagy <robert@openbsd.org>
+HOMEPAGE=		http://www.php.net/

-MASTER_SITES=	http://us2.php.net/distributions/ \
-		http://se.php.net/distributions/ \
-		http://no.php.net/distributions/ \
-		http://uk.php.net/distributions/
+MASTER_SITES=		http://us2.php.net/distributions/ \
+			http://se.php.net/distributions/ \
+			http://no.php.net/distributions/ \
+			http://uk.php.net/distributions/
+MASTER_SITES0=		http://anoncvs.silihost.hu/
+MASTER_SITES1=		http://www.hardened-php.net/

 # UPGRADERS: please read BOTH the PHP and Zend licenses
 # and make sure they are safe before an upgrade
-
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
@ -65,3 +66,15 @@ REGRESS_FLAGS=		NO_INTERACTION=1
 CHECKSUM_FILE=		${.CURDIR}/../distinfo
 PATCH_LIST=		${.CURDIR}/../patches/patch-* \
 			patch-*
+
+# the hardened flavor is used by both core and extensions
+FLAVORS+=		hardened
+FLAVOR?=
+
+HARDENED_V=		0.4.9
+.if ${FLAVOR:L:Mhardened}
+PATCHFILES=		hardening-patch-${V}-${HARDENED_V}.patch.gz:1
+PATCH_DIST_STRIP=	-p1
+.else
+SUPDISTFILES=		hardening-patch-${V}-${HARDENED_V}.patch.gz:1
+.endif
--- a/www/php5/core/Makefile
+++ b/www/php5/core/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2006/02/08 04:54:50 david Exp $
+# $OpenBSD: Makefile,v 1.14 2006/05/09 14:15:40 robert Exp $

 MULTI_PACKAGES=	-pear
 SUBPACKAGE?=
@ -7,8 +7,10 @@ COMMENT=	"server-side HTML-embedded scripting language"
 COMMENT-pear=	"base classes for common PHP tasks"
 PKGNAME=	php5-core-${V}
 FULLPKGNAME-pear= php5-pear-${V}
+DISTFILES=	php-${V}.tar.gz \
+		pear-20060428.tar.gz:0

-CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
+CONFIGURE_ARGS+=--with-apxs=/usr/sbin/apxs \
 		--without-mysql \
 		--enable-xml \
 		--enable-wddx \
@ -31,7 +33,7 @@ CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
 		--enable-yp \
 		--enable-exif \
 		--without-sqlite
-
+		
 MODULES=	devel/gettext

 # some variables to substitute
@ -42,7 +44,7 @@ PHP_VERSION=	${V}
 PHPXS_SUBST+= -e 's,${i},${${i}},'
 .endfor

-WANTLIB=	c crypto des m ssl stdc++ z
+WANTLIB=	c crypto m ssl stdc++ z

 .if defined(PACKAGING) && !empty(SUBPACKAGE)
 PREFIX=		${CHROOT_DIR}
@ -55,19 +57,36 @@ LIB_DEPENDS=	xml2.8::textproc/libxml

 pre-fake:
 	${INSTALL_DATA_DIR} ${PREFIX}/${APACHE_MODULE_SUBDIR}
-
-INSTALL_TARGET= install-pear install-headers install-build install-programs
-FAKE_FLAGS= 	INSTALL_ROOT=${DESTDIR}
+INSTALL_TARGET= install-headers install-build install-programs
+FAKE_FLAGS=	INSTALL_ROOT=${DESTDIR}

 pre-configure:
-	@perl -p -i.orig -e "s,OPENBSD_PEAR_ROOT,'${CHROOT_DIR}/pear',g" \
-		${WRKSRC}/pear/PEAR/Config.php ${WRKSRC}/scripts/phpize.in \
+	@cd ${WRKDIR}/pear && ${PATCH} -p0 --quiet < patch-OpenBSD 
+	@perl -pi -e "s,OPENBSD_PEAR_ROOT,'${CHROOT_DIR}/pear',g" \
+		${WRKDIR}/pear/PEAR/Config.php ${WRKSRC}/scripts/phpize.in \
 		${WRKSRC}/scripts/php-config.in

 post-install:
-	${INSTALL_DATA} ${WRKBUILD}/.libs/libphp5.so ${PREFIX}/${APACHE_MODULE_SUBDIR}
+	${INSTALL_DATA} ${WRKBUILD}/.libs/libphp5.so \
+		${PREFIX}/${APACHE_MODULE_SUBDIR}
+	${INSTALL_DATA_DIR} ${WRKINST}/${CHROOT_DIR}/pear/lib
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php5
 	${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cli/php ${PREFIX}/bin
+	
+	@cd ${WRKDIR}/pear && ${PREFIX}/bin/php \
+		-n -dshort_open_tag=0 -dsafe_mode=0 -derror_reporting=E_ALL \
+		-ddetect_unicode=0 install-pear.php -b ${PREFIX}/bin \
+		-c ${WRKINST} -d ${WRKINST}${CHROOT_DIR}/pear *.tar 
+
+	@cp ${WRKDIR}/pear/PEAR/Config.php \
+		${WRKINST}${CHROOT_DIR}/pear/lib/PEAR/Config.php
+	@perl -pi -e "s,${WRKINST},,g" ${PREFIX}/bin/pear \
+				${PREFIX}/bin/peardev \
+				${PREFIX}/bin/pecl \
+				${WRKINST}${PEAR_DIR}/lib/pearcmd.php \
+				${WRKINST}${PEAR_DIR}/lib/peclcmd.php \
+				${WRKINST}${PEAR_DIR}/lib/PEAR/Command/Package.php
+
 .for i in dist recommended
 	@sed -e 's,MODULES_DIR,${MODULES_DIR},' \
 	     -e 's,OPENBSD_INCLUDE_PATH,/pear/lib:${CHROOT_DIR}/pear/lib,' \
--- a/www/php5/core/patches/patch-ext_yp_yp_c
+++ b/www/php5/core/patches/patch-ext_yp_yp_c
@ -1,21 +0,0 @@
-$OpenBSD: patch-ext_yp_yp_c,v 1.3 2005/12/29 23:06:28 sturm 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);
--- a/www/php5/core/patches/patch-pear_PEAR_Config_php
+++ b/www/php5/core/patches/patch-pear_PEAR_Config_php
@ -1,57 +0,0 @@
-$OpenBSD: patch-pear_PEAR_Config_php,v 1.3 2005/12/29 23:06:28 sturm 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
--- a/www/php5/core/patches/patch-pear_install-pear_php
+++ b/www/php5/core/patches/patch-pear_install-pear_php
@ -1,16 +0,0 @@
-$OpenBSD: patch-pear_install-pear_php,v 1.3 2005/12/29 23:06:28 sturm 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);
--- a/www/php5/core/patches/patch-scripts_php-config_in
+++ b/www/php5/core/patches/patch-scripts_php-config_in
@ -1,14 +0,0 @@
-$OpenBSD: patch-scripts_php-config_in,v 1.4 2005/12/29 23:06:28 sturm 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@"
--- a/www/php5/core/patches/patch-scripts_php_config_in
+++ b/www/php5/core/patches/patch-scripts_php_config_in
@ -0,0 +1,14 @@
+--- scripts/php-config.in.orig	Fri Apr 28 00:49:53 2006
+++ scripts/php-config.in	Fri Apr 28 01:03:19 2006
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ 
+-prefix="@prefix@"
+prefix=OPENBSD_PEAR_ROOT
+ exec_prefix="@exec_prefix@"
+ version="@PHP_VERSION@"
+-includedir="@includedir@/php"
+includedir="@PEAR_INSTALLDIR@/include"
+ includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I$includedir/ext"
+ ldflags="@PHP_LDFLAGS@"
+ libs="@EXTRA_LIBS@"
--- a/www/php5/core/patches/patch-scripts_phpize_in
+++ b/www/php5/core/patches/patch-scripts_phpize_in
@ -1,6 +1,6 @@
-$OpenBSD: patch-scripts_phpize_in,v 1.4 2005/12/29 23:06:28 sturm Exp $
--- scripts/phpize.in.orig	Wed Jun 15 19:19:41 2005
-+++ scripts/phpize.in	Wed Sep 14 16:50:39 2005
+$OpenBSD: patch-scripts_phpize_in,v 1.5 2006/05/09 14:15:40 robert Exp $
+--- 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
 
--- a/www/php5/core/pkg/PLIST
+++ b/www/php5/core/pkg/PLIST
@ -1,7 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.6 2005/12/29 23:06:28 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.7 2006/05/09 14:15:40 robert Exp $
@conflict php4-core-*
 %%SHARED%%
 bin/pear
+bin/peardev
+bin/pecl
 bin/php
 bin/php-config
 bin/phpize
--- a/www/php5/core/pkg/PLIST-pear
+++ b/www/php5/core/pkg/PLIST-pear
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-pear,v 1.7 2005/12/29 23:06:28 sturm Exp $
+@comment $OpenBSD: PLIST-pear,v 1.8 2006/05/09 14:15:40 robert Exp $
@conflict php4-pear-*
 pear/
 pear/build/
@ -10,6 +10,7 @@ pear/build/libtool.m4
 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/
 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
@ -81,7 +76,6 @@ pear/include/Zend/zend_objects_API.h
 pear/include/Zend/zend_operators.h
 pear/include/Zend/zend_ptr_stack.h
 pear/include/Zend/zend_qsort.h
-pear/include/Zend/zend_reflection_api.h
 pear/include/Zend/zend_stack.h
 pear/include/Zend/zend_static_allocator.h
 pear/include/Zend/zend_stream.h
@ -89,10 +83,32 @@ pear/include/Zend/zend_strtod.h
 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/hash/
+pear/include/ext/hash/php_hash.h
+pear/include/ext/hash/php_hash_adler32.h
+pear/include/ext/hash/php_hash_crc32.h
+pear/include/ext/hash/php_hash_gost.h
+pear/include/ext/hash/php_hash_haval.h
+pear/include/ext/hash/php_hash_md.h
+pear/include/ext/hash/php_hash_ripemd.h
+pear/include/ext/hash/php_hash_sha.h
+pear/include/ext/hash/php_hash_snefru.h
+pear/include/ext/hash/php_hash_tiger.h
+pear/include/ext/hash/php_hash_types.h
+pear/include/ext/hash/php_hash_whirlpool.h
 pear/include/ext/iconv/
 pear/include/ext/iconv/php_have_bsd_iconv.h
 pear/include/ext/iconv/php_have_glibc_iconv.h
@ -104,37 +120,26 @@ pear/include/ext/iconv/php_php_iconv_h_path.h
 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/pcrecpparg.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 +163,6 @@ pear/include/ext/standard/md5.h
 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,13 +181,11 @@ pear/include/ext/standard/php_link.h
 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
 pear/include/ext/standard/php_standard.h
 pear/include/ext/standard/php_string.h
-pear/include/ext/standard/php_sunfuncs.h
 pear/include/ext/standard/php_type.h
 pear/include/ext/standard/php_uuencode.h
 pear/include/ext/standard/php_var.h
@ -199,7 +201,6 @@ pear/include/ext/standard/url.h
 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 +209,12 @@ pear/include/main/SAPI.h
 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,55 +252,131 @@ pear/include/regex/regex2.h
 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/
@ -309,25 +384,14 @@ pear/lib/XML/RPC.php
 pear/lib/XML/RPC/Dump.php
 pear/lib/XML/RPC/Server.php
 pear/lib/pearcmd.php
+pear/lib/peclcmd.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/allgot.inc
+pear/tests/XML_RPC/tests/empty-value-struct.php
+pear/tests/XML_RPC/tests/empty-value.php
+pear/tests/XML_RPC/tests/extra-lines.php
 pear/tests/XML_RPC/tests/protoport.php
 pear/tests/XML_RPC/tests/test_Dump.php
+pear/tests/XML_RPC/tests/types.php
--- a/www/php5/distinfo
+++ b/www/php5/distinfo
@ -1,4 +1,12 @@
-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 (hardening-patch-5.1.4-0.4.9.patch.gz) = 12eb5eb043afcae99e7da668a6bd411d
+MD5 (pear-20060428.tar.gz) = 28ab6f44a90cbcb5dd9ed0aef32d2fa9
+MD5 (php-5.1.4.tar.gz) = 4b7c93c9730ef7807f59732697470dad
+RMD160 (hardening-patch-5.1.4-0.4.9.patch.gz) = b02533b8e9b56d81233c0eb783bd36e0e5adf082
+RMD160 (pear-20060428.tar.gz) = 34bac3122dfc8218efdce0ea7df046da031e72e7
+RMD160 (php-5.1.4.tar.gz) = 9b61cb290d035c91923d991eafbfe7d9d774b91e
+SHA1 (hardening-patch-5.1.4-0.4.9.patch.gz) = b20f67186d87f03ba34ce9f65e20967dc24e79f8
+SHA1 (pear-20060428.tar.gz) = 09713b3052904c1c45acba015dc067ddad0136cb
+SHA1 (php-5.1.4.tar.gz) = a44c06d5954b29a6e33d3c803a78765d8fc6e993
+SIZE (hardening-patch-5.1.4-0.4.9.patch.gz) = 57671
+SIZE (pear-20060428.tar.gz) = 619353
+SIZE (php-5.1.4.tar.gz) = 7593350
--- a/www/php5/extensions/Makefile
+++ b/www/php5/extensions/Makefile
@ -1,22 +1,26 @@
-# $OpenBSD: Makefile,v 1.20 2006/04/15 14:57:24 naddy Exp $
+# $OpenBSD: Makefile,v 1.21 2006/05/09 14:15:40 robert Exp $

-FULLPKGNAME=	php5-extensions-${V}p0
-COMMENT=	"informational package about PHP5 extensions"
+FULLPKGNAME=		php5-extensions-${V}
+COMMENT=		"informational package about PHP5 extensions"

 MULTI_PACKAGES=
 SUBPACKAGE?=

 # extensions get installed under the apache chroot
-PREFIX?=	${CHROOT_DIR}
+PREFIX?=		${CHROOT_DIR}

-FLAVORS=	no_x11
+FLAVORS=		no_x11
 FLAVOR?=

-WANTLIB=	stdc++ m
+WANTLIB=		stdc++ m

-RUN_DEPENDS=	:php5-core-${V}:www/php5/core
+.if ${FLAVOR:L:Mhardened}
+RUN_DEPENDS=		:php5-core-${V}-hardened:www/php5/core,hardened
+.else
+RUN_DEPENDS=		:php5-core-${V}-!hardened:www/php5/core
+.endif
 .if !defined(PACKAGING)
-MODULES=	devel/gettext
+MODULES=		devel/gettext
 .endif

 CONFIGURE_ARGS+=	--with-apxs=/usr/sbin/apxs \
@ -75,16 +79,6 @@ COMMENT-dbase=		"dBase database access extensions for php5"
 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}
@ -104,18 +98,19 @@ CONFIGURE_ARGS+=	--without-gd --without-xpm-dir --without-ttf \
 MULTI_PACKAGES+=	-gd
 COMMENT-gd=		"image manipulation extensions for php5"
 GD_DEPENDS=		${GRAPHIC_DEPENDS} t1.5::devel/t1lib
-GD_WANTLIB=		z
+GD_WANTLIB=		freetype z
+CONFIGURE_ENV+=		CPPFLAGS="${LOCALBASE}/include/libpng
 CONFIGURE_ARGS+=	--with-gd=shared ${GRAPHIC_CONFIG} \
 			--with-t1lib=${LOCALBASE} \
 			--with-freetype-dir=${X11BASE}

 . if ${FLAVOR:L:Mno_x11}
-CONFIGURE_ARGS+=       --without-xpm-dir
-FULLPKGNAME-gd=		php5-gd-${V}p3-no_x11
+CONFIGURE_ARGS+=	--without-xpm-dir
+FULLPKGNAME-gd=		php5-gd-${V}-no_x11
 . else
-USE_X11=               yes
-CONFIGURE_ARGS+=       --with-xpm-dir=${X11BASE}
-FULLPKGNAME-gd=		php5-gd-${V}p1
+USE_X11=		yes
+CONFIGURE_ARGS+=	--with-xpm-dir=${X11BASE}
+FULLPKGNAME-gd=		php5-gd-${V}
 .  if !defined(PACKAGING) || ${SUBPACKAGE} == "-gd"
 GD_WANTLIB+=		X11 Xpm
 .  endif
@ -143,8 +138,8 @@ COMMENT-imap=		"imap, pop3 and nntp extensions for php5"
 CONFIGURE_ARGS+=	--with-imap=shared,${LOCALBASE} \
 			--with-kerberos=/usr --with-imap-ssl
 IMAP_DEPENDS=		c-client.3::mail/c-client
-IMAP_WANTLIB=		gssapi crypto krb5 ssl des
-FULLPKGNAME-imap=	php5-imap-${V}p1
+IMAP_WANTLIB=		gssapi crypto krb5 ssl
+FULLPKGNAME-imap=	php5-imap-${V}
 .endif

 # ldap
@ -201,6 +196,18 @@ CONFIGURE_ARGS+=	--with-mysql=shared,${LOCALBASE}
 MYSQL_DEPENDS=		lib/mysql/mysqlclient.10::databases/mysql
 .endif

+# mysqli
+PSEUDO_FLAVORS+=	no_mysqli
+.if ${FLAVOR:L:Mno_mysqli}
+CONFIGURE_ARGS+=	--without-mysqli
+.else
+MULTI_PACKAGES+=	-mysqli
+COMMENT-mysqli=		"mysql database access extensions for php5"
+CONFIGURE_ARGS+=	--with-mysqli=shared,${LOCALBASE}/bin/mysql_config
+MYSQLI_DEPENDS=		lib/mysql/mysqlclient.10::databases/mysql
+MYSQLI_WANTLIB=		crypto ssl z
+.endif
+
 # ncurses
 PSEUDO_FLAVORS+=	no_ncurses
 .if ${FLAVOR:L:Mno_ncurses}
@ -253,7 +260,7 @@ MULTI_PACKAGES+=	-soap
 COMMENT-soap=		"SOAP functions for php5"
 CONFIGURE_ARGS+=	--enable-soap=shared
 SOAP_WANTLIB=		xml2 z iconv
-FULLPKGNAME-soap=	php5-soap-${V}p1
+FULLPKGNAME-soap=	php5-soap-${V}
 .endif

 # snmp
@ -298,8 +305,7 @@ CONFIGURE_ARGS+=	--without-xmlrpc
 MULTI_PACKAGES+=	-xmlrpc
 COMMENT-xmlrpc=		"XML RPC functions for php5"
 CONFIGURE_ARGS+=	--with-xmlrpc=shared
-XMLRPC_DEPENDS=		expat.2::textproc/expat
-XMLRPC_WANTLIB=		iconv
+XMLRPC_WANTLIB=		iconv xml2 z
 .endif

 # xsl
@ -311,14 +317,17 @@ MULTI_PACKAGES+=	-xsl
 COMMENT-xsl=		"XSL functions for php5"
 CONFIGURE_ARGS+=	--with-xsl=shared --enable-dom
 XSL_DEPENDS=		xslt.3,exslt::textproc/libxslt
-XSL_WANTLIB=		xml2 z iconv
-FULLPKGNAME-xsl=	php5-xsl-${V}p1
+XSL_WANTLIB=		iconv xml2 z
+FULLPKGNAME-xsl=	php5-xsl-${V}
 .endif

 .for i in ${MULTI_PACKAGES}
-.if !defined(FULLPKGNAME${i})
-FULLPKGNAME${i}=	php5${i}-${V}p0
-.endif
+.  if !defined(FULLPKGNAME${i})
+FULLPKGNAME${i}=	php5${i}-${V}
+.  endif
+.  if ${FLAVOR:L:Mhardened}
+FULLPKGNAME${i}:=	${FULLPKGNAME${i}}-hardened
+.  endif
 .endfor

 .if defined(PACKAGING) && !empty(SUBPACKAGE)
--- a/www/php5/extensions/patches/patch-ext_gd_config_m4
+++ b/www/php5/extensions/patches/patch-ext_gd_config_m4
@ -1,6 +1,6 @@
-$OpenBSD: patch-ext_gd_config_m4,v 1.3 2005/12/29 23:06:28 sturm Exp $
--- ext/gd/config.m4.orig	Thu Dec 25 23:12:08 2003
-+++ ext/gd/config.m4	Tue Jul 27 00:41:56 2004
+$OpenBSD: patch-ext_gd_config_m4,v 1.4 2006/05/09 14:15:40 robert Exp $
+--- ext/gd/config.m4.orig	Fri Apr 28 00:56:27 2006
+++ ext/gd/config.m4	Fri Apr 28 00:57:11 2006
@@ -87,13 +87,13 @@
       AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>])
     fi
@ -14,6 +14,6 @@ $OpenBSD: patch-ext_gd_config_m4,v 1.3 2005/12/29 23:06:28 sturm Exp $
     [
 -      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)
+       PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+       PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
     ],[
--- a/www/php5/extensions/pkg/DESCR-dbx
+++ b/www/php5/extensions/pkg/DESCR-dbx
@ -1,3 +0,0 @@
-Database abstraction layer, allowing database-independent PHP code
-with some semblance of efficiency.
-
--- a/www/php5/extensions/pkg/DESCR-mysql
+++ b/www/php5/extensions/pkg/DESCR-mysql
@ -1,5 +1,11 @@
-These functions allow you to access MySQL database servers. More
-information about MySQL can be found at http://www.mysql.com/.
+These functions allow you to access MySQL database servers.
+More information about the mysql extension can be found at
+http://www.php.net/mysql.
+
+If you want to use functionality provided by MySQL 4.1 and
+above, please consider using the mysqli extension.
+
+Information about MySQL can be found at http://www.mysql.com/.

 Documentation for MySQL can be found at
 http://www.mysql.com/documentation/.
--- a/www/php5/extensions/pkg/DESCR-mysqli
+++ b/www/php5/extensions/pkg/DESCR-mysqli
@ -0,0 +1,9 @@
+These improved functions allow you to access the functionality provided
+by MySQL 4.1 and above. 
+More information about the mysqli extension can be found at
+http://www.php.net/mysqli.
+
+Information about MySQL can be found at http://www.mysql.com/.
+
+Documentation for MySQL can be found at
+http://www.mysql.com/documentation/.
--- a/www/php5/extensions/pkg/PLIST-dbx
+++ b/www/php5/extensions/pkg/PLIST-dbx
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-dbx,v 1.4 2005/12/29 23:07:19 sturm Exp $
-@conflict php4-dbx-*
-lib/php/modules/dbx.so
--- a/www/php5/extensions/pkg/PLIST-mysqli
+++ b/www/php5/extensions/pkg/PLIST-mysqli
@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST-mysqli,v 1.1 2006/05/09 14:15:40 robert Exp $
+lib/php/modules/mysqli.so
--- a/www/php5/patches/patch-aclocal_m4
+++ b/www/php5/patches/patch-aclocal_m4
@ -1,10 +1,10 @@
-$OpenBSD: patch-aclocal_m4,v 1.5 2005/12/29 23:07:19 sturm 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: patch-aclocal_m4,v 1.6 2006/05/09 14:15:40 robert Exp $
+--- 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 @@ $OpenBSD: patch-aclocal_m4,v 1.5 2005/12/29 23:07:19 sturm Exp $
       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
--- a/www/php5/patches/patch-configure_in
+++ b/www/php5/patches/patch-configure_in
@ -1,27 +1,16 @@
-$OpenBSD: patch-configure_in,v 1.4 2005/12/29 23:07:19 sturm 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: patch-configure_in,v 1.5 2006/05/09 14:15:40 robert Exp $
+--- 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 @@ $OpenBSD: patch-configure_in,v 1.4 2005/12/29 23:07:19 sturm Exp $
     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"`
--- a/www/php5/patches/patch-ltmain_sh
+++ b/www/php5/patches/patch-ltmain_sh
@ -1,44 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.3 2005/12/29 23:07:19 sturm Exp $
--- ltmain.sh.orig	Mon Jul 26 23:13:52 2004
-+++ ltmain.sh	Mon Jul 26 23:14:18 2004
-@@ -4524,40 +4524,6 @@
-     # 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
-     ;;
- 
--- a/www/php5/patches/patch-php_ini-dist
+++ b/www/php5/patches/patch-php_ini-dist
@ -1,7 +1,7 @@
-$OpenBSD: patch-php_ini-dist,v 1.5 2005/12/29 23:07:19 sturm 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: patch-php_ini-dist,v 1.6 2006/05/09 14:15:40 robert Exp $
+--- 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 @@ $OpenBSD: patch-php_ini-dist,v 1.5 2005/12/29 23:07:19 sturm Exp $
 
 ; 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 @@ $OpenBSD: patch-php_ini-dist,v 1.5 2005/12/29 23:07:19 sturm Exp $
 
 ; 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 @@ $OpenBSD: patch-php_ini-dist,v 1.5 2005/12/29 23:07:19 sturm Exp $
 
 ; Define the anonymous ftp password (your email address)
 ;from="john@doe.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 @@ $OpenBSD: patch-php_ini-dist,v 1.5 2005/12/29 23:07:19 sturm Exp $
 -; 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 @@ $OpenBSD: patch-php_ini-dist,v 1.5 2005/12/29 23:07:19 sturm Exp $
 -;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 @@ $OpenBSD: patch-php_ini-dist,v 1.5 2005/12/29 23:07:19 sturm Exp $
 ; 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
 
--- a/www/php5/patches/patch-php_ini-recommended
+++ b/www/php5/patches/patch-php_ini-recommended
@ -1,7 +1,7 @@
-$OpenBSD: patch-php_ini-recommended,v 1.5 2005/12/29 23:07:19 sturm 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: patch-php_ini-recommended,v 1.6 2006/05/09 14:15:40 robert Exp $
+--- 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 @@ $OpenBSD: patch-php_ini-recommended,v 1.5 2005/12/29 23:07:19 sturm Exp $
 
 ; 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 @@ $OpenBSD: patch-php_ini-recommended,v 1.5 2005/12/29 23:07:19 sturm Exp $
 
 ; 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 @@ $OpenBSD: patch-php_ini-recommended,v 1.5 2005/12/29 23:07:19 sturm Exp $
 
 ; Define the anonymous ftp password (your email address)
 ;from="john@doe.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 @@ $OpenBSD: patch-php_ini-recommended,v 1.5 2005/12/29 23:07:19 sturm Exp $
 -; 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 @@ $OpenBSD: patch-php_ini-recommended,v 1.5 2005/12/29 23:07:19 sturm Exp $
 -;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 @@ $OpenBSD: patch-php_ini-recommended,v 1.5 2005/12/29 23:07:19 sturm Exp $
 ; 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
 
--- a/www/php5/pear/pear.port.mk
+++ b/www/php5/pear/pear.port.mk
@ -1,10 +1,10 @@
-# $OpenBSD: pear.port.mk,v 1.2 2005/02/04 21:23:39 alek Exp $
+# $OpenBSD: pear.port.mk,v 1.3 2006/05/09 14:15:40 robert Exp $
 # PHP PEAR module

-RUN_DEPENDS+=    :php5-pear-5.0.*:www/php5/core,-pear
-BUILD_DEPENDS+=  :php5-pear-5.0.*:www/php5/core,-pear
+RUN_DEPENDS+=	:php5-pear-*:www/php5/core,-pear
+BUILD_DEPENDS+=	${RUN_DEPENDS}

-NO_BUILD=       Yes
+NO_BUILD=	Yes
 .if !target(do-regress)
 NO_REGRESS=	Yes
 .endif