Remove PEAR from the default PHP install

7 files changed, 12 insertions, 271 deletions

diff --git a/www/php4/MESSAGE b/www/php4/MESSAGE
index 36f9f086535..396faaf290c 100644
--- a/www/php4/MESSAGE
+++ b/www/php4/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.11 2006/06/06 16:42:02 jlam Exp $
+$NetBSD: MESSAGE,v 1.12 2007/05/05 21:35:05 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
@@ -19,4 +19,8 @@ built-in now.
 
 Note that php-openssl is no longer a separate package as of version
 4.4.0nb2 because the main PHP4 package has it built-in now.
+
+As of version 4.4.6nb1 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/www/php4/Makefile b/www/php4/Makefile
index d58425351cf..1b73f7c32de 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2007/03/03 13:19:52 adrianp Exp $
+# $NetBSD: Makefile,v 1.76 2007/05/05 21:35:05 adrianp Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
+PKGREVISION=		1
 CATEGORIES+=		lang
 COMMENT=		HTML-embedded scripting language
 
@@ -47,19 +48,6 @@ MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
 CONF_FILES=	${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini
 OWN_DIRS=	${PREFIX}/${PHP_EXTENSION_DIR}
 
-USE_TOOLS+=	gzcat
-
-SUBST_CLASSES=		pear
-SUBST_STAGE.pear=	pre-install
-SUBST_FILES.pear=	${WRKDIR}/pear.sh
-SUBST_SED.pear=		-e "s|@php_bin@|${PREFIX}/bin/php|g"
-SUBST_SED.pear+=	-e "s|@php_dir@|${PREFIX}/lib/php|g"
-SUBST_SED.pear+=	-e "s|@SH@|${SH}|g"
-SUBST_MESSAGE.pear=	Fixing pear installation script.
-
-post-extract:
-	${CP} ${FILESDIR}/pear.sh ${WRKDIR}
-
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php
 	${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/${PKGMANDIR}/man1/php.1
@@ -69,6 +57,5 @@ post-install:
 	cd ${WRKSRC}; ${INSTALL_DATA} php.ini-dist php.ini-recommended ${EGDIR}
 	${INSTALL_DATA_DIR} ${PREFIX}/share/php
 	${INSTALL_DATA} ${WRKSRC}/php.gif ${PREFIX}/share/php
-	${INSTALL_SCRIPT} ${WRKDIR}/pear.sh ${PREFIX}/bin/pear
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index 4b3fb00683d..35f5103400f 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.36 2006/10/20 22:10:33 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.37 2007/05/05 21:35:05 adrianp Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -13,6 +13,7 @@ GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--without-mysql
 CONFIGURE_ARGS+=	--without-iconv
+CONFIGURE_ARGS+=	--without-pear
 
 CONFIGURE_ARGS+=	--disable-posix
 
diff --git a/www/php4/PLIST b/www/php4/PLIST
index 8199d28badd..9f032074631 100644
--- a/www/php4/PLIST
+++ b/www/php4/PLIST
@@ -1,11 +1,7 @@
-@comment $NetBSD: PLIST,v 1.16 2007/03/03 13:19:53 adrianp Exp $
-bin/pear
-bin/peardev
-bin/pecl
+@comment $NetBSD: PLIST,v 1.17 2007/05/05 21:35:05 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
@@ -195,117 +191,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/html_template_it.reg
-lib/php/.registry/net_useragent_detect.reg
-lib/php/.registry/pear.reg
-lib/php/.registry/structures_graph.reg
-@exec ${MKDIR} %D/lib/php/20020429
-lib/php/Archive/Tar.php
-lib/php/Console/Getopt.php
-lib/php/HTML/Template/IT.php
-lib/php/HTML/Template/ITX.php
-lib/php/HTML/Template/IT_Error.php
-lib/php/Net/UserAgent/Detect.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
@@ -316,61 +201,7 @@ lib/php/build/mkdep.awk
 lib/php/build/phpize.m4
 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/data/Structures_Graph/LICENSE
-lib/php/data/Structures_Graph/package.sh
-lib/php/data/Structures_Graph/publish.sh
-lib/php/data/Structures_Graph/genpackage.xml.pl
-lib/php/doc/Archive_Tar/docs/Archive_Tar.txt
-lib/php/doc/HTML_Template_IT/examples/sample_it.php
-lib/php/doc/HTML_Template_IT/examples/templates/main.tpl.htm
-lib/php/doc/PEAR/README
-lib/php/doc/PEAR/INSTALL
-lib/php/doc/Structures_Graph/docs/html/media/stylesheet.css
-lib/php/doc/Structures_Graph/docs/html/media/banner.css
-lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Manipulator_TopologicalSorter.html
-lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Node.html
-lib/php/doc/Structures_Graph/docs/html/Structures_Graph/tutorial_Structures_Graph.pkg.html
-lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Manipulator_AcyclicTest_php.html
-lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Manipulator_TopologicalSorter_php.html
-lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Node_php.html
-lib/php/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_php.html
-lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph.html
-lib/php/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Manipulator_AcyclicTest.html
-lib/php/doc/Structures_Graph/docs/html/elementindex.html
-lib/php/doc/Structures_Graph/docs/html/elementindex_Structures_Graph.html
-lib/php/doc/Structures_Graph/docs/html/errors.html
-lib/php/doc/Structures_Graph/docs/html/index.html
-lib/php/doc/Structures_Graph/docs/html/li_Structures_Graph.html
-lib/php/doc/Structures_Graph/docs/html/packages.html
-lib/php/doc/Structures_Graph/docs/html/todolist.html
-lib/php/doc/Structures_Graph/docs/html/classtrees_Structures_Graph.html
-lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph/Structures_Graph.pkg
-lib/php/doc/Structures_Graph/docs/generate.sh
-lib/php/pearcmd.php
-lib/php/peclcmd.php
-lib/php/test/HTML_Template_IT/tests/Console_TestListener.php
-lib/php/test/HTML_Template_IT/tests/ITX_api_testcase.php
-lib/php/test/HTML_Template_IT/tests/ITX_usage_testcase.php
-lib/php/test/HTML_Template_IT/tests/IT_api_testcase.php
-lib/php/test/HTML_Template_IT/tests/IT_usage_testcase.php
-lib/php/test/HTML_Template_IT/tests/templates/__include.html
-lib/php/test/HTML_Template_IT/tests/templates/addblock.html
-lib/php/test/HTML_Template_IT/tests/templates/blockiteration.html
-lib/php/test/HTML_Template_IT/tests/templates/blocks.html
-lib/php/test/HTML_Template_IT/tests/templates/globals.html
-lib/php/test/HTML_Template_IT/tests/templates/include.html
-lib/php/test/HTML_Template_IT/tests/templates/loadtemplatefile.html
-lib/php/test/HTML_Template_IT/tests/templates/replaceblock.html
-lib/php/test/HTML_Template_IT/tests/test.php
-lib/php/test/Structures_Graph/tests/testCase/BasicGraph.php
-lib/php/test/Structures_Graph/tests/README
-lib/php/test/Structures_Graph/tests/all-tests.php
-lib/php/Structures/Graph/Manipulator/AcyclicTest.php
-lib/php/Structures/Graph/Manipulator/TopologicalSorter.php
-lib/php/Structures/Graph/Node.php
-lib/php/Structures/Graph.php
+@exec ${MKDIR} %D/lib/php/20020429
 libexec/cgi-bin/php
 man/man1/php-config.1
 man/man1/php.1
@@ -380,65 +211,8 @@ share/examples/php/php.ini-recommended
 share/php/php.gif
 @dirrm share/php
 @dirrm share/examples/php
-@dirrm lib/php/data/Structures_Graph
-@dirrm lib/php/data/PEAR
-@dirrm lib/php/data
-@dirrm lib/php/doc/Structures_Graph/docs/tutorials/Structures_Graph
-@dirrm lib/php/doc/Structures_Graph/docs/tutorials
-@dirrm lib/php/doc/Structures_Graph/docs/html/media
-@dirrm lib/php/doc/Structures_Graph/docs/html/Structures_Graph
-@dirrm lib/php/doc/Structures_Graph/docs/html
-@dirrm lib/php/doc/Structures_Graph/docs
-@dirrm lib/php/doc/Structures_Graph
-@dirrm lib/php/doc/HTML_Template_IT/examples/templates
-@dirrm lib/php/doc/HTML_Template_IT/examples
-@dirrm lib/php/doc/HTML_Template_IT
-@dirrm lib/php/doc/Archive_Tar/docs
-@dirrm lib/php/doc/Archive_Tar
-@dirrm lib/php/doc/PEAR
-@dirrm lib/php/doc
-@dirrm lib/php/test/HTML_Template_IT/tests/templates
-@dirrm lib/php/test/HTML_Template_IT/tests
-@dirrm lib/php/test/HTML_Template_IT
-@dirrm lib/php/test/Structures_Graph/tests/testCase
-@dirrm lib/php/test/Structures_Graph/tests
-@dirrm lib/php/test/Structures_Graph
-@dirrm lib/php/test
 @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/Net/UserAgent
-@dirrm lib/php/Net
-@dirrm lib/php/Structures/Graph/Manipulator
-@dirrm lib/php/Structures/Graph
-@dirrm lib/php/Structures
-@dirrm lib/php/.channels/.alias
-@dirrm lib/php/.channels
-@dirrm lib/php/.registry/.channel.pecl.php.net
-@dirrm lib/php/.registry/.channel.__uri
-@dirrm lib/php/.registry
 @dirrm lib/php/20020429
-@dirrm lib/php/Archive
-@dirrm lib/php/Console
-@dirrm lib/php/HTML/Template
-@dirrm lib/php/HTML
 @dirrm lib/php
 @dirrm include/php/regex
 @dirrm include/php/main
diff --git a/www/php4/distinfo b/www/php4/distinfo
index d1541c57d61..bc9dbeea525 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2007/03/11 16:43:49 grant Exp $
+$NetBSD: distinfo,v 1.63 2007/05/05 21:35:05 adrianp Exp $
 
 SHA1 (php-4.4.6.tar.bz2) = e9c11ae084e2d505568d672afd06d4e6fc431621
 RMD160 (php-4.4.6.tar.bz2) = 16a81ee94d1f8f56adf3e76dde32c62597130674
@@ -12,8 +12,6 @@ SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931
 SHA1 (patch-ai) = 0b9c1c9fb75a64026f2fb3cbd44cc19e0a1f186c
 SHA1 (patch-aj) = cc68ce876dc5998becbe2f1f74288b5da5bbaca3
 SHA1 (patch-ak) = 1f9fbe26c7329e1d18eec053499ee2d574b5b970
-SHA1 (patch-al) = 28ad9006b387e2b9984ad49beea21c9d46e63b46
-SHA1 (patch-ao) = 0fd4becf023451ac8cb185df354830efc86c1344
 SHA1 (patch-ap) = 2f852abd1e9d0f089add18b2eade2831253ad00e
 SHA1 (patch-at) = f8b3aebd61fe2d5b5a994e1d973424a1ed397f63
 SHA1 (patch-au) = f9798aa440e174f65dde574c4f3b28183b3d18bc
diff --git a/www/php4/patches/patch-al b/www/php4/patches/patch-al
deleted file mode 100644
index cd7ca10e362..00000000000
--- a/www/php4/patches/patch-al
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-al,v 1.1 2004/12/12 11:03:33 jdolecek Exp $
-
---- pear/scripts/pear.sh.orig	2004-12-12 10:44:13.000000000 +0100
-+++ pear/scripts/pear.sh	2004-12-12 10:44:21.000000000 +0100
-@@ -25,4 +25,4 @@
-   fi
- fi
- 
--exec $PHP -C -q $INCARG -d output_buffering=1 $INCDIR/pearcmd.php "$@"
-+exec $PHP -C -q $INCARG -d output_buffering=1 -n $INCDIR/pearcmd.php "$@"
diff --git a/www/php4/patches/patch-ao b/www/php4/patches/patch-ao
deleted file mode 100644
index f65f1fca145..00000000000
--- a/www/php4/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2006/08/10 23:01:39 adrianp Exp $
-
---- pear/Makefile.frag.orig	2006-05-07 17:33:41.000000000 +0100
-+++ pear/Makefile.frag
-@@ -6,7 +6,7 @@ peardir=$(PEAR_INSTALLDIR)
- PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dopen_basedir= -dsafe_mode=0 -dmemory_limit=-1
- 
- install-pear-packages: $(top_builddir)/sapi/cli/php
--	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" $(srcdir)/packages/*.tar
-+	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" --force $(srcdir)/packages/*.tar
- 
- install-pear:
- 	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"