diff --git a/www/php4/pkg/PLIST b/www/php4/pkg/PLIST
index d3191696cfe..c36c3caf2b3 100644
--- a/www/php4/pkg/PLIST
+++ b/www/php4/pkg/PLIST
@@ -1,264 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.5 2001/12/18 01:40:48 avsm Exp $
-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_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/php_versioning.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/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_output.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/Archive/Tar.php
-lib/php/Benchmark/Iterate.php
-lib/php/Benchmark/Timer.php
-lib/php/Cache.php
-lib/php/Cache/Container.php
-lib/php/Cache/Container/db.php
-lib/php/Cache/Container/dbx.php
-lib/php/Cache/Container/file.php
-lib/php/Cache/Container/phplib.php
-lib/php/Cache/Container/shm.php
-lib/php/Cache/DB.php
-lib/php/Cache/Error.php
-lib/php/Cache/Function.php
-lib/php/Cache/Graphics.php
-lib/php/Cache/Output.php
-lib/php/Cache/OutputCompression.php
-lib/php/Console/Getopt.php
-lib/php/Crypt/CBC.php
-lib/php/Crypt/HCEMD5.php
-lib/php/DB.php
-lib/php/DB/common.php
-lib/php/DB/fbsql.php
-lib/php/DB/ibase.php
-lib/php/DB/ifx.php
-lib/php/DB/msql.php
-lib/php/DB/mssql.php
-lib/php/DB/mysql.php
-lib/php/DB/oci8.php
-lib/php/DB/odbc.php
-lib/php/DB/pgsql.php
-lib/php/DB/storage.php
-lib/php/DB/sybase.php
-lib/php/Date/Calc.php
-lib/php/Date/Human.php
-lib/php/File/Find.php
-lib/php/File/Passwd.php
-lib/php/File/SearchReplace.php
-lib/php/HTML/Common.php
-lib/php/HTML/Form.php
-lib/php/HTML/IT.php
-lib/php/HTML/ITX.php
-lib/php/HTML/IT_Error.php
-lib/php/HTML/Page.php
-lib/php/HTML/Processor.php
-lib/php/HTML/Select.php
-lib/php/HTML/Table.php
-lib/php/HTTP.php
-lib/php/HTTP/Compress.php
-lib/php/Image/Remote.php
-lib/php/Log.php
-lib/php/Log/Observer.php
-lib/php/Log/composite.php
-lib/php/Log/file.php
-lib/php/Log/mcal.php
-lib/php/Log/sql.php
-lib/php/Log/syslog.php
-lib/php/Mail.php
-lib/php/Mail/RFC822.php
-lib/php/Mail/mime.php
-lib/php/Mail/sendmail.php
-lib/php/Mail/smtp.php
-lib/php/Math/Fraction.php
-lib/php/Math/Util.php
-lib/php/Net/Curl.php
-lib/php/Net/Dig.php
-lib/php/Net/SMTP.php
-lib/php/Net/Socket.php
-lib/php/Numbers/Roman.php
-lib/php/PEAR.php
-lib/php/PEAR/Common.php
-lib/php/PEAR/Config.php
-lib/php/PEAR/Installer.php
-lib/php/PEAR/Packager.php
-lib/php/PEAR/Registry.php
-lib/php/PEAR/Remote.php
-lib/php/PEAR/Uploader.php
-lib/php/Payment/Verisign.php
-lib/php/Schedule/At.php
-lib/php/System.php
-lib/php/XML/Parser.php
-lib/php/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
-@dirrm lib/php/Schedule
-@dirrm lib/php/Payment
-@dirrm lib/php/PEAR
-@dirrm lib/php/Numbers
-@dirrm lib/php/Net
-@dirrm lib/php/Math
-@dirrm lib/php/Mail
-@dirrm lib/php/Log
-@dirrm lib/php/Image
-@dirrm lib/php/HTTP
-@dirrm lib/php/HTML
-@dirrm lib/php/File
-@dirrm lib/php/Date
-@dirrm lib/php/DB
-@dirrm lib/php/Crypt
-@dirrm lib/php/Console
-@dirrm lib/php/Cache/Container
-@dirrm lib/php/Cache
-@dirrm lib/php/Benchmark
-@dirrm lib/php/Archive
-@dirrm lib/php
-@dirrm include/php/regex
-@dirrm include/php/main
-@exec mkdir -p %D/include/php/ext/xml/expat/xmltok
-@dirrm include/php/ext/xml/expat/xmltok
-@exec mkdir -p %D/include/php/ext/xml/expat/xmlparse
-@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
+@comment $OpenBSD: PLIST,v 1.6 2001/12/18 12:38:19 avsm Exp $
+@pkgcfl php3-*
+lib/libphp4.so
+sbin/php4-enable
+share/doc/php4/php.ini-dist
+share/doc/php4/php.ini-recommended
+@dirrm share/doc/php4
diff --git a/www/php4/pkg/PLIST-pear b/www/php4/pkg/PLIST-pear
index 006f48ac50c..012bb88f0ed 100644
--- a/www/php4/pkg/PLIST-pear
+++ b/www/php4/pkg/PLIST-pear
@@ -1,7 +1,264 @@
-@comment $OpenBSD: PLIST-pear,v 1.4 2001/12/18 01:40:48 avsm Exp $
-@pkgcfl php3-*
-lib/libphp4.so
-sbin/php4-enable
-share/doc/php4/php.ini-dist
-share/doc/php4/php.ini-recommended
-@dirrm share/doc/php4
+@comment $OpenBSD: PLIST-pear,v 1.5 2001/12/18 12:38:19 avsm Exp $
+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_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/php_versioning.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/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_output.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/Archive/Tar.php
+lib/php/Benchmark/Iterate.php
+lib/php/Benchmark/Timer.php
+lib/php/Cache.php
+lib/php/Cache/Container.php
+lib/php/Cache/Container/db.php
+lib/php/Cache/Container/dbx.php
+lib/php/Cache/Container/file.php
+lib/php/Cache/Container/phplib.php
+lib/php/Cache/Container/shm.php
+lib/php/Cache/DB.php
+lib/php/Cache/Error.php
+lib/php/Cache/Function.php
+lib/php/Cache/Graphics.php
+lib/php/Cache/Output.php
+lib/php/Cache/OutputCompression.php
+lib/php/Console/Getopt.php
+lib/php/Crypt/CBC.php
+lib/php/Crypt/HCEMD5.php
+lib/php/DB.php
+lib/php/DB/common.php
+lib/php/DB/fbsql.php
+lib/php/DB/ibase.php
+lib/php/DB/ifx.php
+lib/php/DB/msql.php
+lib/php/DB/mssql.php
+lib/php/DB/mysql.php
+lib/php/DB/oci8.php
+lib/php/DB/odbc.php
+lib/php/DB/pgsql.php
+lib/php/DB/storage.php
+lib/php/DB/sybase.php
+lib/php/Date/Calc.php
+lib/php/Date/Human.php
+lib/php/File/Find.php
+lib/php/File/Passwd.php
+lib/php/File/SearchReplace.php
+lib/php/HTML/Common.php
+lib/php/HTML/Form.php
+lib/php/HTML/IT.php
+lib/php/HTML/ITX.php
+lib/php/HTML/IT_Error.php
+lib/php/HTML/Page.php
+lib/php/HTML/Processor.php
+lib/php/HTML/Select.php
+lib/php/HTML/Table.php
+lib/php/HTTP.php
+lib/php/HTTP/Compress.php
+lib/php/Image/Remote.php
+lib/php/Log.php
+lib/php/Log/Observer.php
+lib/php/Log/composite.php
+lib/php/Log/file.php
+lib/php/Log/mcal.php
+lib/php/Log/sql.php
+lib/php/Log/syslog.php
+lib/php/Mail.php
+lib/php/Mail/RFC822.php
+lib/php/Mail/mime.php
+lib/php/Mail/sendmail.php
+lib/php/Mail/smtp.php
+lib/php/Math/Fraction.php
+lib/php/Math/Util.php
+lib/php/Net/Curl.php
+lib/php/Net/Dig.php
+lib/php/Net/SMTP.php
+lib/php/Net/Socket.php
+lib/php/Numbers/Roman.php
+lib/php/PEAR.php
+lib/php/PEAR/Common.php
+lib/php/PEAR/Config.php
+lib/php/PEAR/Installer.php
+lib/php/PEAR/Packager.php
+lib/php/PEAR/Registry.php
+lib/php/PEAR/Remote.php
+lib/php/PEAR/Uploader.php
+lib/php/Payment/Verisign.php
+lib/php/Schedule/At.php
+lib/php/System.php
+lib/php/XML/Parser.php
+lib/php/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
+@dirrm lib/php/Schedule
+@dirrm lib/php/Payment
+@dirrm lib/php/PEAR
+@dirrm lib/php/Numbers
+@dirrm lib/php/Net
+@dirrm lib/php/Math
+@dirrm lib/php/Mail
+@dirrm lib/php/Log
+@dirrm lib/php/Image
+@dirrm lib/php/HTTP
+@dirrm lib/php/HTML
+@dirrm lib/php/File
+@dirrm lib/php/Date
+@dirrm lib/php/DB
+@dirrm lib/php/Crypt
+@dirrm lib/php/Console
+@dirrm lib/php/Cache/Container
+@dirrm lib/php/Cache
+@dirrm lib/php/Benchmark
+@dirrm lib/php/Archive
+@dirrm lib/php
+@dirrm include/php/regex
+@dirrm include/php/main
+@exec mkdir -p %D/include/php/ext/xml/expat/xmltok
+@dirrm include/php/ext/xml/expat/xmltok
+@exec mkdir -p %D/include/php/ext/xml/expat/xmlparse
+@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