cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix blasted installroot ignored.

Browse Source
This commit is contained in:
espie 2003-08-21 15:05:21 +00:00
parent 8fb6e7c1cf
commit b02d54b692
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/php4/core/Makefile
View File

@ -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"

22
www/php4/core/patches/patch-pear_PEAR_Installer_php Normal file
View File

@ -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);
}
// }}}

12
www/php4/core/patches/patch-pear_install-pear_php Normal file
View File

@ -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) {