Enable pear support.

4 files changed, 514 insertions, 6 deletions

diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 35eb0477d115..22b2bc8749dd 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	mod_php4
 PORTVERSION=	4.0.6
+PORTREVISION?=	1
 CATEGORIES?=	www
 MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
 		http://php.he.net/${PHP_DISTDIR}/ \
@@ -33,7 +34,8 @@ SLAVEDIRS=	lang/php4
 USE_LIBTOOL=	yes
 
 .if defined(STANDALONE)
-CONFIGURE_ARGS=	--with-config-file-path=${PREFIX}/etc/php.standalone
+CONFIGURE_ARGS=	--with-config-file-path=${PREFIX}/etc/php.standalone \
+		--disable-pear
 .else
 CONFIGURE_ARGS=	--with-apxs=${PREFIX}/sbin/apxs \
 		--with-config-file-path=${PREFIX}/etc
@@ -44,7 +46,6 @@ CONFIGURE_ARGS+=--enable-versioning \
 		--disable-debug \
 		--enable-track-vars \
 		--without-gd \
-		--disable-pear \
 		--without-mysql
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
index 590514a856b1..81d7e44518d5 100644
--- a/www/mod_php4/pkg-plist
+++ b/www/mod_php4/pkg-plist
@@ -1,4 +1,257 @@
+bin/pear
+bin/php-config
+bin/phpextdist
+bin/phpize
 etc/php.ini-dist
-%%AP_LIBEXEC%%/libphp4.so
+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/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_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
+lib/php/Cache/Container.php
+lib/php/Cache/Container/db.php
+lib/php/Cache/Container/file.php
+lib/php/Cache/Container/phplib.php
+lib/php/Cache/Container/shm.php
+lib/php/Cache/Function.php
+lib/php/Cache/Graphics.php
+lib/php/Cache/Output.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/ibase.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/Form.php
+lib/php/HTML/IT.php
+lib/php/HTML/ITX.php
+lib/php/HTML/Processor.php
+lib/php/HTTP.php
+lib/php/HTTP/Compress.php
+lib/php/Image/Remote.php
+lib/php/Log.php
+lib/php/Log/composite.php
+lib/php/Log/file.php
+lib/php/Log/mcal.php
+lib/php/Log/observer.php
+lib/php/Log/sql.php
+lib/php/Log/syslog.php
+lib/php/Mail.php
+lib/php/Mail/RFC822.php
+lib/php/Mail/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/Installer.php
+lib/php/Payment/Verisign.php
+lib/php/Schedule/At.php
+lib/php/XML/Parser.php
+lib/php/XML/RPC.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
+libexec/apache/libphp4.so
 @exec %D/sbin/apxs -e -a -n php4 %f
 @unexec %D/sbin/apxs -e -A -n php4 %f
+@dirrm include/php/Zend
+@dirrm include/php/TSRM
+@dirrm include/php/ext/standard
+@dirrm include/php/ext/xml/expat/xmlparse
+@dirrm include/php/ext/xml/expat/xmltok
+@dirrm include/php/ext/xml/expat
+@dirrm include/php/ext/xml
+@dirrm include/php/ext
+@dirrm include/php/main
+@dirrm include/php/regex
+@dirrm include/php
+@dirrm lib/php/Benchmark
+@dirrm lib/php/Cache/Container
+@dirrm lib/php/Cache
+@dirrm lib/php/Console
+@dirrm lib/php/Crypt
+@dirrm lib/php/Date
+@dirrm lib/php/DB
+@dirrm lib/php/File
+@dirrm lib/php/HTML
+@dirrm lib/php/HTTP
+@dirrm lib/php/Image
+@dirrm lib/php/Log
+@dirrm lib/php/Mail
+@dirrm lib/php/Math
+@dirrm lib/php/Net
+@dirrm lib/php/Numbers
+@dirrm lib/php/Payment
+@dirrm lib/php/PEAR
+@dirrm lib/php/Schedule
+@dirrm lib/php/XML
+@dirrm lib/php/build
+@dirrm lib/php
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 35eb0477d115..22b2bc8749dd 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	mod_php4
 PORTVERSION=	4.0.6
+PORTREVISION?=	1
 CATEGORIES?=	www
 MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
 		http://php.he.net/${PHP_DISTDIR}/ \
@@ -33,7 +34,8 @@ SLAVEDIRS=	lang/php4
 USE_LIBTOOL=	yes
 
 .if defined(STANDALONE)
-CONFIGURE_ARGS=	--with-config-file-path=${PREFIX}/etc/php.standalone
+CONFIGURE_ARGS=	--with-config-file-path=${PREFIX}/etc/php.standalone \
+		--disable-pear
 .else
 CONFIGURE_ARGS=	--with-apxs=${PREFIX}/sbin/apxs \
 		--with-config-file-path=${PREFIX}/etc
@@ -44,7 +46,6 @@ CONFIGURE_ARGS+=--enable-versioning \
 		--disable-debug \
 		--enable-track-vars \
 		--without-gd \
-		--disable-pear \
 		--without-mysql
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index 590514a856b1..81d7e44518d5 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -1,4 +1,257 @@
+bin/pear
+bin/php-config
+bin/phpextdist
+bin/phpize
 etc/php.ini-dist
-%%AP_LIBEXEC%%/libphp4.so
+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/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_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
+lib/php/Cache/Container.php
+lib/php/Cache/Container/db.php
+lib/php/Cache/Container/file.php
+lib/php/Cache/Container/phplib.php
+lib/php/Cache/Container/shm.php
+lib/php/Cache/Function.php
+lib/php/Cache/Graphics.php
+lib/php/Cache/Output.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/ibase.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/Form.php
+lib/php/HTML/IT.php
+lib/php/HTML/ITX.php
+lib/php/HTML/Processor.php
+lib/php/HTTP.php
+lib/php/HTTP/Compress.php
+lib/php/Image/Remote.php
+lib/php/Log.php
+lib/php/Log/composite.php
+lib/php/Log/file.php
+lib/php/Log/mcal.php
+lib/php/Log/observer.php
+lib/php/Log/sql.php
+lib/php/Log/syslog.php
+lib/php/Mail.php
+lib/php/Mail/RFC822.php
+lib/php/Mail/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/Installer.php
+lib/php/Payment/Verisign.php
+lib/php/Schedule/At.php
+lib/php/XML/Parser.php
+lib/php/XML/RPC.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
+libexec/apache/libphp4.so
 @exec %D/sbin/apxs -e -a -n php4 %f
 @unexec %D/sbin/apxs -e -A -n php4 %f
+@dirrm include/php/Zend
+@dirrm include/php/TSRM
+@dirrm include/php/ext/standard
+@dirrm include/php/ext/xml/expat/xmlparse
+@dirrm include/php/ext/xml/expat/xmltok
+@dirrm include/php/ext/xml/expat
+@dirrm include/php/ext/xml
+@dirrm include/php/ext
+@dirrm include/php/main
+@dirrm include/php/regex
+@dirrm include/php
+@dirrm lib/php/Benchmark
+@dirrm lib/php/Cache/Container
+@dirrm lib/php/Cache
+@dirrm lib/php/Console
+@dirrm lib/php/Crypt
+@dirrm lib/php/Date
+@dirrm lib/php/DB
+@dirrm lib/php/File
+@dirrm lib/php/HTML
+@dirrm lib/php/HTTP
+@dirrm lib/php/Image
+@dirrm lib/php/Log
+@dirrm lib/php/Mail
+@dirrm lib/php/Math
+@dirrm lib/php/Net
+@dirrm lib/php/Numbers
+@dirrm lib/php/Payment
+@dirrm lib/php/PEAR
+@dirrm lib/php/Schedule
+@dirrm lib/php/XML
+@dirrm lib/php/build
+@dirrm lib/php