Index: Makefile =================================================================== --- Makefile (revision 483457) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pear -PORTVERSION= 1.10.5 -PORTREVISION= 1 +PORTVERSION= 1.10.6 CATEGORIES= devel MASTER_SITES= http://mirror.bsdproject.de/ PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} Index: distinfo =================================================================== --- distinfo (revision 483457) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501779031 -SHA256 (pear-1.10.5.tar.bz2) = d091520156b1576eb838a963bcd7e402645396d9b279522d6c3504f71bc556ad -SIZE (pear-1.10.5.tar.bz2) = 416262 +TIMESTAMP = 1540920746 +SHA256 (pear-1.10.6.tar.bz2) = 9a96e6a84f5959eb22da31dd19cd10d0c134b23ae38a419a7fa1d7a3ebad7dc2 +SIZE (pear-1.10.6.tar.bz2) = 416106 Index: files/patch-go-pear =================================================================== --- files/patch-go-pear (revision 483457) +++ files/patch-go-pear (working copy) @@ -1,6 +1,6 @@ ---- go-pear.orig 2013-07-18 07:18:00 UTC -+++ go-pear -@@ -57,6 +57,8 @@ +--- go-pear.orig 2018-10-30 18:35:55.982659000 +0100 ++++ go-pear 2018-10-30 22:13:19.168338000 +0100 +@@ -57,6 +57,8 @@ define('GO_PEAR_VER', '1.1.6'); define('WIN32GUI', !WEBINSTALLER && WINDOWS && $sapi_name=='cli' && which('cscript')); @@ -9,7 +9,7 @@ /* * See bug #23069 */ -@@ -116,7 +118,7 @@ +@@ -125,7 +127,7 @@ $bootstrap_pkgs = array( // uses URL lik ); $installer_packages = array( @@ -18,9 +18,9 @@ 'Structures_Graph-stable', 'Archive_Tar-stable', 'Console_Getopt-stable', -@@ -250,7 +252,7 @@ +@@ -259,7 +261,7 @@ if (WEBINSTALLER) { } - // Anything past this step has something to do with the installation + // Anything past this step has something to do with the installation } - +/* @@ -27,7 +27,7 @@ if (!WEBINSTALLER) { $tty = WINDOWS ? @fopen('\con', 'r') : @fopen('/dev/tty', 'r'); -@@ -294,7 +296,7 @@ +@@ -303,7 +305,7 @@ If you wish to abort, press Control-C no $http_proxy = $tmp; } } @@ -36,7 +36,7 @@ $origpwd = getcwd(); $config_vars = array_keys($config_desc); -@@ -345,7 +347,7 @@ +@@ -354,7 +356,7 @@ we strongly recommand to use it. break; } } @@ -45,7 +45,7 @@ while (!WEBINSTALLER) { print " Below is a suggested file layout for your new PEAR installation. To -@@ -428,7 +430,7 @@ +@@ -437,7 +439,7 @@ If you have a CLI (or CGI) php.exe avail } } } @@ -54,7 +54,7 @@ #### # Installation stuff #### -@@ -488,7 +490,7 @@ +@@ -497,7 +499,7 @@ full write access to this directory and continue; } @@ -63,7 +63,7 @@ if (!@is_dir($dir)) { if (!mkdir_p($dir)) { if (!WEBINSTALLER) { -@@ -561,7 +563,7 @@ +@@ -570,7 +572,7 @@ if (WEBINSTALLER) { ob_start(); } } @@ -72,7 +72,7 @@ if (!WEBINSTALLER) { $msg = "The following PEAR packages are bundled with PHP: " . implode(', ', array_keys($pfc_packages)); -@@ -571,17 +573,19 @@ +@@ -580,17 +582,18 @@ if (!WEBINSTALLER) { $install_optional_packages = array(); print "\n"; } @@ -83,7 +83,6 @@ #### +dl('xml.so'); -+ if (function_exists('set_include_path')) { - set_include_path($ptmp); + set_include_path($ptmp . PATH_SEPARATOR . "%%BUNDLEDIR%%"); @@ -96,7 +95,7 @@ if (!extension_loaded('zlib') && !WEBINSTALLER) { // In Web context we could be in multithread env which makes dl() end up with a fatal error. if (WINDOWS) { @dl('php_zlib.dll'); -@@ -606,18 +610,19 @@ +@@ -615,18 +618,19 @@ print "Loading zlib: ".($have_gzip ? 'ok if (!$have_gzip) { print "Downloading uncompressed packages\n"; }; @@ -118,7 +117,7 @@ } // gopear_bundle usage -@@ -645,19 +650,21 @@ +@@ -654,19 +658,21 @@ displayHTMLProgress($progress = 5); // Bootstrap needed ? $nobootstrap = false; @@ -142,7 +141,7 @@ } include_once 'PEAR.php'; print "ok\n"; -@@ -691,6 +698,7 @@ +@@ -700,6 +706,7 @@ displayHTMLProgress($progress = 20); // Extract needed ? $noextract = false; @@ -149,25 +148,17 @@ +/* if (is_dir($php_dir)) { $noextract = @include_once 'PEAR/Registry.php'; - -@@ -701,6 +709,7 @@ + +@@ -710,7 +717,7 @@ if (is_dir($php_dir)) { } } } +- +*/ - if ($noextract) { print('Using previously installed installer ... '); -@@ -722,7 +731,7 @@ - displayHTMLProgress($progress += round(19 / count($bootstrap_pkgs))); - - $fullpkg = substr($tarball, 0, strrpos($tarball, '.')); -- $tar = &new Archive_Tar($tarball, $have_gzip); -+ $tar = new Archive_Tar($tarball, $have_gzip); - if (!$tar->extractModify($ptmp, $fullpkg)) { - bail("Extraction for $fullpkg failed!\n"); - } -@@ -747,12 +756,7 @@ + print "ok\n"; +@@ -756,12 +763,7 @@ include_once "PEAR/Config.php"; include_once "PEAR/Command.php"; include_once "PEAR/Registry.php"; @@ -181,7 +172,7 @@ $config->set('preferred_state', 'stable'); foreach ($config_vars as $var) { -@@ -765,7 +769,7 @@ +@@ -774,7 +776,7 @@ $config->set('temp_dir', $temp_dir); $config->set('http_proxy', $http_proxy); $config->store(); @@ -190,7 +181,7 @@ PEAR_Command::setFrontendType('CLI'); PEAR::staticPushErrorHandling(PEAR_ERROR_DIE); //fail silently -@@ -787,6 +791,11 @@ +@@ -796,6 +798,11 @@ foreach ($to_install as $pkg) { } else { $options = array('onlyreqdeps' => true); } @@ -202,7 +193,7 @@ if ($registry->packageExists($pkg) || $registry->packageExists($pkg_basename)) { print(str_pad("Package: $pkg", max(50,9+strlen($pkg)+4), '.').' already installed ... ok'."\n"); displayHTMLProgress($progress += round(50 / count($to_install))); -@@ -821,7 +830,7 @@ +@@ -830,7 +837,7 @@ displayHTMLProgress($progress = 99); // Base installation finished @@ -211,7 +202,7 @@ ini_restore("include_path"); if (!WEBINSTALLER) { -@@ -980,6 +989,7 @@ +@@ -993,6 +1000,7 @@ if ( WINDOWS ) { if (WINDOWS && !WEBINSTALLER) { win32CreateRegEnv(); } @@ -219,13 +210,13 @@ // Set of functions following /** * Parse the given dirname -@@ -1418,19 +1428,17 @@ +@@ -1463,19 +1471,17 @@ function detect_install_dirs($_prefix = } } else { if ($_prefix === null) { - #$prefix = dirname(PHP_BINDIR); - $prefix = dirname(__FILE__); -+ $prefix = '%%PREFIX%%'; ++ $prefix = '%%PREFIX%%'; } else { $prefix = $_prefix; } @@ -239,16 +230,16 @@ $test_dir = '$php_dir/tests'; - $temp_dir = '$prefix/temp'; - -+ $temp_dir = '%%TMPDIR%%'; ++ $temp_dir = '%%TMPDIR%%'; +/* // check if the user has installed PHP with PHP or GNU layout if (@is_dir("$prefix/lib/php/.registry")) { $php_dir = '$prefix/lib/php'; -@@ -1442,6 +1450,7 @@ +@@ -1487,6 +1493,7 @@ function detect_install_dirs($_prefix = } elseif (@is_dir("$prefix/share/php/.registry")) { $php_dir = '$prefix/share/php'; } -+*/ ++*/ } }