1 files changed, 6 insertions, 101 deletions

diff --git a/lang/php4/pkg-plist b/lang/php4/pkg-plist
index 714cf84eacf6..6123c9682e99 100644
--- a/lang/php4/pkg-plist
+++ b/lang/php4/pkg-plist
@@ -1,9 +1,10 @@
-%%CLI%%%%PEAR%%bin/pear
 %%CLI%%bin/php
 bin/php-config
 bin/phpextdist
 bin/phpize
 etc/php.conf
+@exec touch %D/etc/php.ini
+@unexec [ -s %D/etc/php.ini ] || rm %D/etc/php.ini
 etc/php.ini-dist
 etc/php.ini-recommended
 include/php/TSRM/TSRM.h
@@ -58,43 +59,6 @@ include/php/Zend/zend_static_allocator.h
 include/php/Zend/zend_types.h
 include/php/Zend/zend_variables.h
 include/php/acconfig.h
-include/php/ext/gd/gdcache.h
-include/php/ext/gd/gdttf.h
-include/php/ext/gd/libgd/gd.h
-include/php/ext/gd/libgd/gd_io.h
-include/php/ext/gd/libgd/gdcache.h
-include/php/ext/gd/libgd/gdfontg.h
-include/php/ext/gd/libgd/gdfontl.h
-include/php/ext/gd/libgd/gdfontmb.h
-include/php/ext/gd/libgd/gdfonts.h
-include/php/ext/gd/libgd/gdfontt.h
-include/php/ext/gd/libgd/gdhelpers.h
-include/php/ext/gd/libgd/jisx0208.h
-include/php/ext/gd/libgd/wbmp.h
-include/php/ext/gd/php_gd.h
-include/php/ext/mbstring/mbstring.h
-include/php/ext/mbstring/php_mbregex.h
-include/php/ext/mbstring/php_unicode.h
-include/php/ext/mbstring/unicode_data.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfilter.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_language.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_string.h
-include/php/ext/pgsql/php_pgsql.h
-include/php/ext/session/mod_files.h
-include/php/ext/session/mod_mm.h
-include/php/ext/session/mod_user.h
-include/php/ext/session/php_session.h
 include/php/ext/standard/aggregation.h
 include/php/ext/standard/base64.h
 include/php/ext/standard/basic_functions.h
@@ -153,19 +117,8 @@ 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/ascii.h
-include/php/ext/xml/expat/asciitab.h
-include/php/ext/xml/expat/expat.h
-include/php/ext/xml/expat/iasciitab.h
-include/php/ext/xml/expat/internal.h
-include/php/ext/xml/expat/latin1tab.h
-include/php/ext/xml/expat/nametab.h
-include/php/ext/xml/expat/utf8tab.h
-include/php/ext/xml/expat/winconfig.h
-include/php/ext/xml/expat/xmlrole.h
-include/php/ext/xml/expat/xmltok.h
-include/php/ext/xml/expat/xmltok_impl.h
-include/php/ext/xml/php_xml.h
+@exec touch %D/include/php/ext/php_config.h
+@unexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h
 include/php/main/SAPI.h
 include/php/main/build-defs.h
 include/php/main/config.nw.h
@@ -215,60 +168,12 @@ lib/php/build/shtool
 %%SAPI_FILE%%
 %%APACHE%%@exec %D/sbin/apxs -e -a -n php4 %f
 %%APACHE%%@unexec %D/sbin/apxs -e -A -n php4 %f
-%%CLI%%%%PEAR%%share/pear/bootstrap/Archive/Tar.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/System.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/Console/Getopt.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/OS/Guess.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Auth.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Build.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Common.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Config.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Install.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Mirror.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Package.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Registry.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command/Remote.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Autoloader.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Builder.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Command.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Common.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Config.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Dependency.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Downloader.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/ErrorStack.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Frontend/CLI.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Installer.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Packager.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Registry.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/PEAR/Remote.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/XML/RPC.php
-%%CLI%%%%PEAR%%share/pear/bootstrap/XML/RPC/Server.php
 @dirrm include/php/TSRM
 @dirrm include/php/Zend
-@dirrm include/php/ext/gd/libgd
-@dirrm include/php/ext/gd
-@dirrm include/php/ext/mbstring/libmbfl/mbfl
-@dirrm include/php/ext/mbstring/libmbfl
-@dirrm include/php/ext/mbstring
-@dirrm include/php/ext/pgsql
-@dirrm include/php/ext/session
 @dirrm include/php/ext/standard
-@dirrm include/php/ext/xml/expat
-@dirrm include/php/ext/xml
-@dirrm include/php/ext
+@unexec rmdir %D/include/php/ext 2> /dev/null || true
 @dirrm include/php/main
 @dirrm include/php/regex
-@dirrm include/php/
+@unexec rmdir %D/include/php 2> /dev/null || true
 @dirrm lib/php/build
 @unexec rmdir %D/lib/php 2> /dev/null || true
-%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/Archive
-%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/Console
-%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/OS
-%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR/Command
-%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR/Frontend
-%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/PEAR
-%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/XML/RPC
-%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap/XML
-%%CLI%%%%PEAR%%@dirrm share/pear/bootstrap
-%%CLI%%%%PEAR%%@unexec rmdir %D/share/pear 2> /dev/null || true