diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2010-08-25 08:38:44 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2010-08-25 08:38:44 +0000 |
| commit | d0f6b75a0a5a620cb27e414a19db99de0d81de1a (patch) | |
| tree | f0406c6939724ae843a85bcf139bf41ed523ac02 /devel/pear/files | |
| parent | 5e78c3b937160f5b938427e81884188b39f9db9c (diff) | |
| download | ports-d0f6b75a0a5a620cb27e414a19db99de0d81de1a.tar.gz ports-d0f6b75a0a5a620cb27e414a19db99de0d81de1a.zip | |
- Update to 1.9.1
- Update bundled Archive_Tar to 1.3.7
- Update bundled Structures_Graph to 1.0.3
- Use TMPDIR for temporary directory
PR: ports/149615
Approved by: miwi (maintainer, IM)
Notes
Notes:
svn path=/head/; revision=259959
Diffstat (limited to 'devel/pear/files')
| -rw-r--r-- | devel/pear/files/patch-go-pear | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/devel/pear/files/patch-go-pear b/devel/pear/files/patch-go-pear index ee0cd5100d60..3e33a11a2e8c 100644 --- a/devel/pear/files/patch-go-pear +++ b/devel/pear/files/patch-go-pear @@ -1,5 +1,5 @@ ---- go-pear.orig 2009-04-08 12:20:28.000000000 +0200 -+++ go-pear 2009-04-26 20:51:39.000000000 +0200 +--- go-pear.orig 2010-08-05 23:26:55.000000000 +0200 ++++ go-pear 2010-08-13 15:05:29.753811744 +0200 @@ -116,7 +116,7 @@ ); @@ -54,7 +54,7 @@ if (!WEBINSTALLER) { $msg = "The following PEAR packages are bundled with PHP: " . implode(', ', array_keys($pfc_packages)); -@@ -571,7 +571,7 @@ +@@ -571,17 +571,17 @@ $install_optional_packages = array(); print "\n"; } @@ -63,9 +63,13 @@ #### # Download #### -@@ -581,7 +581,7 @@ + + if (function_exists('set_include_path')) { +- set_include_path($ptmp); ++ set_include_path($ptmp . PATH_SEPARATOR . "%%BUNDLEDIR%%"); } else { - ini_set('include_path', $ptmp); +- ini_set('include_path', $ptmp); ++ ini_set('include_path', $ptmp . PATH_SEPARATOR . "%%BUNDLEDIR%%"); } - +/* @@ -94,6 +98,18 @@ } // gopear_bundle usage +@@ -655,9 +656,9 @@ + if ($nobootstrap) { + print('Using previously install ... '); + if (function_exists('set_include_path')) { +- set_include_path($php_dir); ++ set_include_path($php_dir . PATH_SEPARATOR . "%%BUNDLEDIR%%"); + } else { +- ini_set('include_path', $php_dir); ++ ini_set('include_path', $php_dir . PATH_SEPARATOR . "%%BUNDLEDIR%%"); + } + include_once 'PEAR.php'; + print "ok\n"; @@ -750,7 +751,7 @@ if (WEBINSTALLER || isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == 'local') { $config = &PEAR_Config::singleton($prefix."/pear.conf", ''); @@ -140,7 +156,7 @@ $test_dir = '$php_dir/tests'; - $temp_dir = '$prefix/temp'; - -+ $temp_dir = '/tmp/go-pear'; ++ $temp_dir = '%%TMPDIR%%'; +/* // check if the user has installed PHP with PHP or GNU layout if (@is_dir("$prefix/lib/php/.registry")) { |