From b02d54b692cc37b8e9f388ae14c4fc4e6f364ff8 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Thu, 21 Aug 2003 15:05:21 +0000
Subject: [PATCH] fix blasted installroot ignored.

---
 www/php4/core/Makefile                        |  4 ++--
 .../patches/patch-pear_PEAR_Installer_php     | 22 +++++++++++++++++++
 .../core/patches/patch-pear_install-pear_php  | 12 ++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 www/php4/core/patches/patch-pear_PEAR_Installer_php
 create mode 100644 www/php4/core/patches/patch-pear_install-pear_php

diff --git a/www/php4/core/Makefile b/www/php4/core/Makefile
index 14c06db20e0..7551858bd0a 100644
--- a/www/php4/core/Makefile
+++ b/www/php4/core/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.14 2003/08/21 13:42:22 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2003/08/21 15:05:21 espie Exp $
 
 MULTI_PACKAGES=	-pear
 SUBPACKAGE?=
-BROKEN=	'writes all over /var/www'
+#BROKEN=	'writes all over /var/www'
 
 COMMENT=	"server-side HTML-embedded scripting language"
 COMMENT-pear=	"base classes for common PHP tasks"
diff --git a/www/php4/core/patches/patch-pear_PEAR_Installer_php b/www/php4/core/patches/patch-pear_PEAR_Installer_php
new file mode 100644
index 00000000000..5c795e76cba
--- /dev/null
+++ b/www/php4/core/patches/patch-pear_PEAR_Installer_php
@@ -0,0 +1,22 @@
+$OpenBSD: patch-pear_PEAR_Installer_php,v 1.1 2003/08/21 15:05:21 espie Exp $
+--- pear/PEAR/Installer.php.orig	2003-08-21 16:57:40.000000000 +0200
++++ pear/PEAR/Installer.php	2003-08-21 16:58:58.000000000 +0200
+@@ -110,12 +110,16 @@ class PEAR_Installer extends PEAR_Common
+      *
+      * @access public
+      */
+-    function PEAR_Installer(&$ui)
++    function PEAR_Installer(&$ui, $options = array())
+     {
+         parent::PEAR_Common();
+         $this->setFrontendObject($ui);
+         $this->debug = $this->config->get('verbose');
+-        $this->registry = &new PEAR_Registry($this->config->get('php_dir'));
++	$v = $this->config->get('php_dir');
++        if (isset($options['installroot'])) {
++		$v = $this->_prependPath($v, $options['installroot']);
++	}
++        $this->registry = &new PEAR_Registry($v);
+     }
+ 
+     // }}}
diff --git a/www/php4/core/patches/patch-pear_install-pear_php b/www/php4/core/patches/patch-pear_install-pear_php
new file mode 100644
index 00000000000..1d4616acbac
--- /dev/null
+++ b/www/php4/core/patches/patch-pear_install-pear_php
@@ -0,0 +1,12 @@
+$OpenBSD: patch-pear_install-pear_php,v 1.1 2003/08/21 15:05:21 espie Exp $
+--- pear/install-pear.php.orig	2003-08-21 16:59:24.000000000 +0200
++++ pear/install-pear.php	2003-08-21 16:59:41.000000000 +0200
+@@ -61,7 +61,7 @@ if (!empty($install_root)) {
+ 
+ $reg = &new PEAR_Registry($reg_dir);
+ $ui = &new PEAR_Frontend_CLI();
+-$installer = &new PEAR_Installer($ui);
++$installer = &new PEAR_Installer($ui, $options);
+ $installer->registry = &$reg;
+ 
+ foreach ($install_files as $package => $instfile) {