Remove PEAR from the default PHP install

4 files changed, 10 insertions, 149 deletions

diff --git a/lang/php5/MESSAGE b/lang/php5/MESSAGE
index eb564385383..728aecd0a96 100644
--- a/lang/php5/MESSAGE
+++ b/lang/php5/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.7 2007/04/08 10:49:21 ghen Exp $
+$NetBSD: MESSAGE,v 1.8 2007/05/05 21:45:12 adrianp Exp $
 
 To process PHP scripts, you will need a PHP-enabled HTTP server.  You may
 either configure the HTTP server to use the PHP CGI binary located in
@@ -10,4 +10,8 @@ or you may install a PHP module for your HTTP server, e.g. www/ap-php.
 
 Note that php-openssl is no longer a separate package as of version
 5.0.5nb1 because the main PHP5 package has it built-in now.
+
+As of version 5.2.1nb3 PEAR is no longer installed by default with the 
+php package.  In order to use PEAR packages with PHP you will need to 
+install the lang/pear package.
 ===========================================================================
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 02152413ebe..dae6b65fe78 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2007/04/28 22:05:50 sborrill Exp $
+# $NetBSD: Makefile,v 1.50 2007/05/05 21:45:12 adrianp Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php
index 0ad6f733691..d4f78cdf8ff 100644
--- a/lang/php5/Makefile.php
+++ b/lang/php5/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.24 2007/02/25 20:05:11 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.25 2007/05/05 21:45:12 adrianp Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -26,6 +26,7 @@ CONFIGURE_ARGS+=	--with-regex=system
 CONFIGURE_ARGS+=	--without-mysql
 CONFIGURE_ARGS+=	--without-sqlite
 CONFIGURE_ARGS+=	--without-iconv
+CONFIGURE_ARGS+=	--without-pear
 
 CONFIGURE_ARGS+=	--disable-posix
 CONFIGURE_ARGS+=	--disable-dom
diff --git a/lang/php5/PLIST b/lang/php5/PLIST
index 5f9d016e8ba..03a33945731 100644
--- a/lang/php5/PLIST
+++ b/lang/php5/PLIST
@@ -1,11 +1,7 @@
-@comment $NetBSD: PLIST,v 1.14 2007/02/20 20:46:20 jdolecek Exp $
-bin/pear
-bin/peardev
-bin/pecl
+@comment $NetBSD: PLIST,v 1.15 2007/05/05 21:45:12 adrianp Exp $
 bin/php
 bin/php-config
 bin/phpize
-etc/pear.conf
 include/php/TSRM/TSRM.h
 include/php/TSRM/acconfig.h
 include/php/TSRM/readdir.h
@@ -214,109 +210,6 @@ include/php/regex/regex.h
 include/php/regex/regex2.h
 include/php/regex/regex_extra.h
 include/php/regex/utils.h
-lib/php/.channels/.alias/pear.txt
-lib/php/.channels/.alias/pecl.txt
-lib/php/.channels/__uri.reg
-lib/php/.channels/pear.php.net.reg
-lib/php/.channels/pecl.php.net.reg
-lib/php/.depdb
-lib/php/.depdblock
-lib/php/.filemap
-lib/php/.lock
-@exec ${MKDIR} %D/lib/php/.registry/.channel.__uri
-@exec ${MKDIR} %D/lib/php/.registry/.channel.pecl.php.net
-lib/php/.registry/archive_tar.reg
-lib/php/.registry/console_getopt.reg
-lib/php/.registry/pear.reg
-lib/php/Archive/Tar.php
-lib/php/Console/Getopt.php
-lib/php/OS/Guess.php
-lib/php/PEAR.php
-lib/php/PEAR/Autoloader.php
-lib/php/PEAR/Builder.php
-lib/php/PEAR/ChannelFile.php
-lib/php/PEAR/ChannelFile/Parser.php
-lib/php/PEAR/Command.php
-lib/php/PEAR/Command/Auth.php
-lib/php/PEAR/Command/Auth.xml
-lib/php/PEAR/Command/Build.php
-lib/php/PEAR/Command/Build.xml
-lib/php/PEAR/Command/Channels.php
-lib/php/PEAR/Command/Channels.xml
-lib/php/PEAR/Command/Common.php
-lib/php/PEAR/Command/Config.php
-lib/php/PEAR/Command/Config.xml
-lib/php/PEAR/Command/Install.php
-lib/php/PEAR/Command/Install.xml
-lib/php/PEAR/Command/Mirror.php
-lib/php/PEAR/Command/Mirror.xml
-lib/php/PEAR/Command/Package.php
-lib/php/PEAR/Command/Package.xml
-lib/php/PEAR/Command/Pickle.php
-lib/php/PEAR/Command/Pickle.xml
-lib/php/PEAR/Command/Registry.php
-lib/php/PEAR/Command/Registry.xml
-lib/php/PEAR/Command/Remote.php
-lib/php/PEAR/Command/Remote.xml
-lib/php/PEAR/Command/Test.php
-lib/php/PEAR/Command/Test.xml
-lib/php/PEAR/Common.php
-lib/php/PEAR/Config.php
-lib/php/PEAR/Dependency.php
-lib/php/PEAR/Dependency2.php
-lib/php/PEAR/DependencyDB.php
-lib/php/PEAR/Downloader.php
-lib/php/PEAR/Downloader/Package.php
-lib/php/PEAR/ErrorStack.php
-lib/php/PEAR/Exception.php
-lib/php/PEAR/Frontend.php
-lib/php/PEAR/Frontend/CLI.php
-lib/php/PEAR/Installer.php
-lib/php/PEAR/Installer/Role.php
-lib/php/PEAR/Installer/Role/Common.php
-lib/php/PEAR/Installer/Role/Data.php
-lib/php/PEAR/Installer/Role/Data.xml
-lib/php/PEAR/Installer/Role/Doc.php
-lib/php/PEAR/Installer/Role/Doc.xml
-lib/php/PEAR/Installer/Role/Ext.php
-lib/php/PEAR/Installer/Role/Ext.xml
-lib/php/PEAR/Installer/Role/Php.php
-lib/php/PEAR/Installer/Role/Php.xml
-lib/php/PEAR/Installer/Role/Script.php
-lib/php/PEAR/Installer/Role/Script.xml
-lib/php/PEAR/Installer/Role/Src.php
-lib/php/PEAR/Installer/Role/Src.xml
-lib/php/PEAR/Installer/Role/Test.php
-lib/php/PEAR/Installer/Role/Test.xml
-lib/php/PEAR/PackageFile.php
-lib/php/PEAR/PackageFile/Generator/v1.php
-lib/php/PEAR/PackageFile/Generator/v2.php
-lib/php/PEAR/PackageFile/Parser/v1.php
-lib/php/PEAR/PackageFile/Parser/v2.php
-lib/php/PEAR/PackageFile/v1.php
-lib/php/PEAR/PackageFile/v2.php
-lib/php/PEAR/PackageFile/v2/Validator.php
-lib/php/PEAR/PackageFile/v2/rw.php
-lib/php/PEAR/Packager.php
-lib/php/PEAR/REST.php
-lib/php/PEAR/REST/10.php
-lib/php/PEAR/REST/11.php
-lib/php/PEAR/Registry.php
-lib/php/PEAR/Remote.php
-lib/php/PEAR/RunTest.php
-lib/php/PEAR/Task/Common.php
-lib/php/PEAR/Task/Postinstallscript.php
-lib/php/PEAR/Task/Postinstallscript/rw.php
-lib/php/PEAR/Task/Replace.php
-lib/php/PEAR/Task/Replace/rw.php
-lib/php/PEAR/Task/Unixeol.php
-lib/php/PEAR/Task/Unixeol/rw.php
-lib/php/PEAR/Task/Windowseol.php
-lib/php/PEAR/Task/Windowseol/rw.php
-lib/php/PEAR/Validate.php
-lib/php/PEAR/Validator/PECL.php
-lib/php/PEAR/XMLParser.php
-lib/php/System.php
 lib/php/build/Makefile.global
 lib/php/build/acinclude.m4
 lib/php/build/config.guess
@@ -328,11 +221,6 @@ lib/php/build/phpize.m4
 lib/php/build/run-tests.php
 lib/php/build/scan_makefile_in.awk
 lib/php/build/shtool
-lib/php/data/PEAR/package.dtd
-lib/php/data/PEAR/template.spec
-lib/php/doc/Archive_Tar/docs/Archive_Tar.txt
-lib/php/pearcmd.php
-lib/php/peclcmd.php
 libexec/cgi-bin/php
 man/man1/php-config.1
 man/man1/php.1
@@ -342,39 +230,7 @@ share/examples/php/php.ini-recommended
 share/php/php.gif
 @dirrm share/php
 @dirrm share/examples/php
-@dirrm lib/php/doc/Archive_Tar/docs
-@dirrm lib/php/doc/Archive_Tar
-@dirrm lib/php/doc
-@dirrm lib/php/data/PEAR
-@dirrm lib/php/data
 @dirrm lib/php/build
-@dirrm lib/php/PEAR/Validator
-@dirrm lib/php/PEAR/Task/Windowseol
-@dirrm lib/php/PEAR/Task/Unixeol
-@dirrm lib/php/PEAR/Task/Replace
-@dirrm lib/php/PEAR/Task/Postinstallscript
-@dirrm lib/php/PEAR/Task
-@dirrm lib/php/PEAR/REST
-@dirrm lib/php/PEAR/PackageFile/v2
-@dirrm lib/php/PEAR/PackageFile/Parser
-@dirrm lib/php/PEAR/PackageFile/Generator
-@dirrm lib/php/PEAR/PackageFile
-@dirrm lib/php/PEAR/Installer/Role
-@dirrm lib/php/PEAR/Installer
-@dirrm lib/php/PEAR/Frontend
-@dirrm lib/php/PEAR/Downloader
-@dirrm lib/php/PEAR/Command
-@dirrm lib/php/PEAR/ChannelFile
-@dirrm lib/php/PEAR
-@dirrm lib/php/OS
-@dirrm lib/php/Console
-@dirrm lib/php/Archive
-@dirrm lib/php/.registry/.channel.pecl.php.net
-@dirrm lib/php/.registry/.channel.__uri
-@dirrm lib/php/.registry
-@dirrm lib/php/.channels/.alias
-@dirrm lib/php/.channels
-@unexec ${RM} -rf %D/lib/php/Net
 @dirrm include/php/regex
 @dirrm include/php/main/streams
 @dirrm include/php/main