diff --git a/www/php4/Makefile b/www/php4/Makefile
index 8562e1473ec..e8406e420dd 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2001/06/23 23:36:35 avsm Exp $
+# $OpenBSD: Makefile,v 1.44 2001/07/05 22:55:38 avsm Exp $
 
 MULTI_PACKAGES=	-pear
 SUBPACKAGE?=
@@ -206,6 +206,6 @@ do-install:
 		<${FILESDIR}/php4-enable >${PREFIX}/sbin/php4-enable
 	@chown ${BINOWN}:${BINGRP} ${PREFIX}/sbin/php4-enable
 	@chmod ${BINMODE} ${PREFIX}/sbin/php4-enable
-	cd ${WRKSRC}/pear && make install
+	cd ${WRKSRC}/pear && env INSTALL_ROOT=${DESTDIR} make install
 
 .include <bsd.port.mk>
diff --git a/www/php4/patches/patch-pear_Makefile_in b/www/php4/patches/patch-pear_Makefile_in
deleted file mode 100644
index 78700faf8cf..00000000000
--- a/www/php4/patches/patch-pear_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-pear_Makefile_in,v 1.1 2001/06/12 15:08:03 avsm Exp $
---- pear/Makefile.in.orig	Tue Jun 12 15:44:00 2001
-+++ pear/Makefile.in	Tue Jun 12 15:44:08 2001
-@@ -7,7 +7,7 @@ install_targets = \
- 
- include $(top_srcdir)/build/rules.mk
- 
--peardir=$(PEAR_INSTALLDIR)
-+peardir=${DESTDIR}$(PEAR_INSTALLDIR)
- 
- PEAR_SUBDIRS = \
- 	Benchmark \
diff --git a/www/php4/pkg/PLIST-pear b/www/php4/pkg/PLIST-pear
index a3d45e4d805..7b009e169a5 100644
--- a/www/php4/pkg/PLIST-pear
+++ b/www/php4/pkg/PLIST-pear
@@ -1,4 +1,152 @@
-@comment $OpenBSD: PLIST-pear,v 1.2 2001/06/23 23:36:37 avsm Exp $
+@comment $OpenBSD: PLIST-pear,v 1.3 2001/07/05 22:55:40 avsm Exp $
+bin/pear
+bin/php-config
+bin/phpextdist
+bin/phpize
+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.w32.h
+include/php/TSRM/tsrm_config_common.h
+include/php/TSRM/tsrm_strtok_r.h
+include/php/TSRM/tsrm_virtual_cwd.h
+include/php/TSRM/tsrm_win32.h
+include/php/Zend/FlexLexer.h
+include/php/Zend/acconfig.h
+include/php/Zend/zend.h
+include/php/Zend/zend_API.h
+include/php/Zend/zend_alloc.h
+include/php/Zend/zend_builtin_functions.h
+include/php/Zend/zend_compile.h
+include/php/Zend/zend_config.h
+include/php/Zend/zend_config.w32.h
+include/php/Zend/zend_constants.h
+include/php/Zend/zend_dynamic_array.h
+include/php/Zend/zend_errors.h
+include/php/Zend/zend_execute.h
+include/php/Zend/zend_execute_locks.h
+include/php/Zend/zend_extensions.h
+include/php/Zend/zend_fast_cache.h
+include/php/Zend/zend_globals.h
+include/php/Zend/zend_globals_macros.h
+include/php/Zend/zend_hash.h
+include/php/Zend/zend_highlight.h
+include/php/Zend/zend_indent.h
+include/php/Zend/zend_ini.h
+include/php/Zend/zend_ini_parser.h
+include/php/Zend/zend_ini_scanner.h
+include/php/Zend/zend_istdiostream.h
+include/php/Zend/zend_language_parser.h
+include/php/Zend/zend_language_scanner.h
+include/php/Zend/zend_list.h
+include/php/Zend/zend_llist.h
+include/php/Zend/zend_modules.h
+include/php/Zend/zend_operators.h
+include/php/Zend/zend_ptr_stack.h
+include/php/Zend/zend_stack.h
+include/php/Zend/zend_static_allocator.h
+include/php/Zend/zend_variables.h
+include/php/acconfig.h
+include/php/ext/standard/base64.h
+include/php/ext/standard/basic_functions.h
+include/php/ext/standard/credits.h
+include/php/ext/standard/credits_ext.h
+include/php/ext/standard/credits_sapi.h
+include/php/ext/standard/cyr_convert.h
+include/php/ext/standard/datetime.h
+include/php/ext/standard/dl.h
+include/php/ext/standard/dns.h
+include/php/ext/standard/exec.h
+include/php/ext/standard/file.h
+include/php/ext/standard/flock_compat.h
+include/php/ext/standard/fsock.h
+include/php/ext/standard/head.h
+include/php/ext/standard/html.h
+include/php/ext/standard/info.h
+include/php/ext/standard/md5.h
+include/php/ext/standard/microtime.h
+include/php/ext/standard/pack.h
+include/php/ext/standard/pageinfo.h
+include/php/ext/standard/php_array.h
+include/php/ext/standard/php_assert.h
+include/php/ext/standard/php_browscap.h
+include/php/ext/standard/php_crypt.h
+include/php/ext/standard/php_dir.h
+include/php/ext/standard/php_ext_syslog.h
+include/php/ext/standard/php_filestat.h
+include/php/ext/standard/php_fopen_wrappers.h
+include/php/ext/standard/php_image.h
+include/php/ext/standard/php_incomplete_class.h
+include/php/ext/standard/php_iptc.h
+include/php/ext/standard/php_lcg.h
+include/php/ext/standard/php_link.h
+include/php/ext/standard/php_mail.h
+include/php/ext/standard/php_math.h
+include/php/ext/standard/php_metaphone.h
+include/php/ext/standard/php_output.h
+include/php/ext/standard/php_parsedate.h
+include/php/ext/standard/php_rand.h
+include/php/ext/standard/php_smart_str.h
+include/php/ext/standard/php_smart_str_public.h
+include/php/ext/standard/php_standard.h
+include/php/ext/standard/php_string.h
+include/php/ext/standard/php_var.h
+include/php/ext/standard/quot_print.h
+include/php/ext/standard/reg.h
+include/php/ext/standard/scanf.h
+include/php/ext/standard/type.h
+include/php/ext/standard/uniqid.h
+include/php/ext/standard/url.h
+include/php/ext/standard/url_scanner.h
+include/php/ext/standard/url_scanner_ex.h
+include/php/ext/xml/expat/xmlparse/expat_hashtable.h
+include/php/ext/xml/expat/xmlparse/xmlparse.h
+include/php/ext/xml/expat/xmltok/asciitab.h
+include/php/ext/xml/expat/xmltok/iasciitab.h
+include/php/ext/xml/expat/xmltok/latin1tab.h
+include/php/ext/xml/expat/xmltok/nametab.h
+include/php/ext/xml/expat/xmltok/utf8tab.h
+include/php/ext/xml/expat/xmltok/xmldef.h
+include/php/ext/xml/expat/xmltok/xmlrole.h
+include/php/ext/xml/expat/xmltok/xmltok.h
+include/php/ext/xml/expat/xmltok/xmltok_impl.h
+include/php/ext/xml/php_xml.h
+include/php/main/SAPI.h
+include/php/main/build-defs.h
+include/php/main/config.w32.h
+include/php/main/fopen_wrappers.h
+include/php/main/internal_functions_registry.h
+include/php/main/logos.h
+include/php/main/php.h
+include/php/main/php3_compat.h
+include/php/main/php_compat.h
+include/php/main/php_config.h
+include/php/main/php_content_types.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_network.h
+include/php/main/php_open_temporary_file.h
+include/php/main/php_reentrancy.h
+include/php/main/php_regex.h
+include/php/main/php_streams.h
+include/php/main/php_syslog.h
+include/php/main/php_ticks.h
+include/php/main/php_variables.h
+include/php/main/php_version.h
+include/php/main/rfc1867.h
+include/php/main/safe_mode.h
+include/php/main/snprintf.h
+include/php/main/win95nt.h
+include/php/php_version.h
+include/php/regex/cclass.h
+include/php/regex/cname.h
+include/php/regex/regex.h
+include/php/regex/regex2.h
+include/php/regex/regex_extra.h
+include/php/regex/utils.h
 lib/php/Benchmark/Iterate.php
 lib/php/Benchmark/Timer.php
 lib/php/Cache.php
@@ -72,6 +220,20 @@ lib/php/Schedule/At.php
 lib/php/XML/Parser.php
 lib/php/XML/RPC.php
 lib/php/XML/RPC/Server.php
+lib/php/build/acinclude.m4
+lib/php/build/dynlib.m4
+lib/php/build/dynlib.mk
+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/shtool
+@dirrm lib/php/build
 @dirrm lib/php/XML/RPC
 @dirrm lib/php/XML
 @dirrm lib/php/Schedule
@@ -93,3 +255,15 @@ lib/php/XML/RPC/Server.php
 @dirrm lib/php/Cache/Container
 @dirrm lib/php/Cache
 @dirrm lib/php/Benchmark
+@dirrm lib/php
+@dirrm include/php/regex
+@dirrm include/php/main
+@dirrm include/php/ext/xml/expat/xmltok
+@dirrm include/php/ext/xml/expat/xmlparse
+@dirrm include/php/ext/xml/expat
+@dirrm include/php/ext/xml
+@dirrm include/php/ext/standard
+@dirrm include/php/ext
+@dirrm include/php/Zend
+@dirrm include/php/TSRM
+@dirrm include/php