From owner-svn-ports-all@freebsd.org Wed Nov 4 14:22:48 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D14B445DF69; Wed, 4 Nov 2020 14:22:48 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CR84m3Ncnz3Z4k; Wed, 4 Nov 2020 14:22:48 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9DB4CEDCC; Wed, 4 Nov 2020 14:22:47 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A4EMlOu023676; Wed, 4 Nov 2020 14:22:47 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A4EMkJm023673; Wed, 4 Nov 2020 14:22:46 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202011041422.0A4EMkJm023673@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Wed, 4 Nov 2020 14:22:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554082 - in head/devel/pear: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: in head/devel/pear: . files X-SVN-Commit-Revision: 554082 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Nov 2020 14:22:49 -0000 Author: fluffy Date: Wed Nov 4 14:22:46 2020 New Revision: 554082 URL: https://svnweb.freebsd.org/changeset/ports/554082 Log: devel/pear: update to 1.10.12 release PEAR 1.10.6 => 1.10.12 Bundled packages: Archive_Tar 1.4.3 => 1.4.10 Console_Getopt 1.4.1 => 1.4.3 XML_Util 1.4.3 => 1.4.5 Respect PHPBASE Allow build with php80 While here, take maintainership PR: 250809 Submitted by: myself (fluffy) Approved by: maintainer (miwi) Deleted: head/devel/pear/files/patch-php72 Modified: head/devel/pear/Makefile head/devel/pear/distinfo head/devel/pear/files/extra-patch-PEAR-Config.php head/devel/pear/files/patch-go-pear Modified: head/devel/pear/Makefile ============================================================================== --- head/devel/pear/Makefile Wed Nov 4 14:21:43 2020 (r554081) +++ head/devel/pear/Makefile Wed Nov 4 14:22:46 2020 (r554082) @@ -2,19 +2,20 @@ # $FreeBSD$ PORTNAME= pear -PORTVERSION= 1.10.6 +PORTVERSION= 1.10.12 PORTREVISION= 0 CATEGORIES= devel -MASTER_SITES= http://mirror.bsdproject.de/ \ - LOCAL/joneum +MASTER_SITES= http://build.dimapanov.com/~fluffy/distfiles/ \ + LOCAL/fluffy \ + LOCAL/joneum PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} -MAINTAINER= miwi@FreeBSD.org +MAINTAINER= fluffy@FreeBSD.org COMMENT= PEAR framework for PHP LICENSE= PHP301 -USES= cpe php:cli,flavors tar:bzip2 +USES= cpe php:cli,flavors tar:xz CPE_VENDOR= php NO_BUILD= yes NO_ARCH= yes Modified: head/devel/pear/distinfo ============================================================================== --- head/devel/pear/distinfo Wed Nov 4 14:21:43 2020 (r554081) +++ head/devel/pear/distinfo Wed Nov 4 14:22:46 2020 (r554082) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542993311 -SHA256 (pear-1.10.6.tar.bz2) = 6753da2eb3bd1820f40f366cfc9ebf978c5baabb84652199f5a64a9bf7ae11bd -SIZE (pear-1.10.6.tar.bz2) = 416310 +TIMESTAMP = 1604325145 +SHA256 (pear-1.10.12.tar.xz) = 99b08268edf40df39455e10ec2a747e7eeb1a341163ecdfe5bd46122cd125fed +SIZE (pear-1.10.12.tar.xz) = 307068 Modified: head/devel/pear/files/extra-patch-PEAR-Config.php ============================================================================== --- head/devel/pear/files/extra-patch-PEAR-Config.php Wed Nov 4 14:21:43 2020 (r554081) +++ head/devel/pear/files/extra-patch-PEAR-Config.php Wed Nov 4 14:22:46 2020 (r554082) @@ -1,6 +1,6 @@ ---- PEAR/Config.php.orig 2011-11-15 10:23:32.384650640 +0100 -+++ PEAR/Config.php 2011-11-15 10:23:35.145650207 +0100 -@@ -29,7 +29,7 @@ +--- PEAR/Config.php.orig 2020-04-19 18:02:46 UTC ++++ PEAR/Config.php +@@ -28,7 +28,7 @@ require_once 'System.php'; */ $GLOBALS['_PEAR_Config_instance'] = null; if (!defined('PEAR_INSTALL_DIR') || !PEAR_INSTALL_DIR) { @@ -9,7 +9,7 @@ } else { $PEAR_INSTALL_DIR = PEAR_INSTALL_DIR; } -@@ -108,7 +108,7 @@ +@@ -114,7 +114,7 @@ if (getenv('PHP_PEAR_DOC_DIR')) { define('PEAR_CONFIG_DEFAULT_DOC_DIR', getenv('PHP_PEAR_DOC_DIR')); } else { define('PEAR_CONFIG_DEFAULT_DOC_DIR', @@ -18,7 +18,7 @@ } // Default for bin_dir -@@ -131,7 +131,7 @@ +@@ -137,7 +137,7 @@ if (getenv('PHP_PEAR_CFG_DIR')) { define('PEAR_CONFIG_DEFAULT_CFG_DIR', getenv('PHP_PEAR_CFG_DIR')); } else { define('PEAR_CONFIG_DEFAULT_CFG_DIR', @@ -27,7 +27,7 @@ } // Default for www_dir -@@ -139,7 +139,7 @@ +@@ -145,7 +145,7 @@ if (getenv('PHP_PEAR_WWW_DIR')) { define('PEAR_CONFIG_DEFAULT_WWW_DIR', getenv('PHP_PEAR_WWW_DIR')); } else { define('PEAR_CONFIG_DEFAULT_WWW_DIR', @@ -35,4 +35,4 @@ + PHP_PREFIX.DIRECTORY_SEPARATOR.'www'); } - // Default for test_dir + // Default for man_dir Modified: head/devel/pear/files/patch-go-pear ============================================================================== --- head/devel/pear/files/patch-go-pear Wed Nov 4 14:21:43 2020 (r554081) +++ head/devel/pear/files/patch-go-pear Wed Nov 4 14:22:46 2020 (r554082) @@ -1,6 +1,6 @@ ---- go-pear.orig 2013-07-18 07:18:00 UTC +--- go-pear.orig 2017-08-03 16:38:00 UTC +++ go-pear -@@ -57,6 +57,8 @@ +@@ -57,6 +57,8 @@ define('GO_PEAR_VER', '1.1.2'); define('WIN32GUI', !WEBINSTALLER && WINDOWS && $sapi_name=='cli' && which('cscript')); @@ -9,7 +9,7 @@ /* * See bug #23069 */ -@@ -116,7 +118,7 @@ +@@ -116,7 +118,7 @@ $bootstrap_pkgs = array( // uses URL like http://pear. ); $installer_packages = array( @@ -18,7 +18,7 @@ 'Structures_Graph-stable', 'Archive_Tar-stable', 'Console_Getopt-stable', -@@ -250,7 +252,7 @@ +@@ -250,7 +252,7 @@ if (WEBINSTALLER) { } // 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 @@ +@@ -294,7 +296,7 @@ If you wish to abort, press Control-C now, or press En $http_proxy = $tmp; } } @@ -36,7 +36,7 @@ $origpwd = getcwd(); $config_vars = array_keys($config_desc); -@@ -345,7 +347,7 @@ +@@ -345,7 +347,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 @@ +@@ -428,7 +430,7 @@ If you have a CLI (or CGI) php.exe available, we stron } } } @@ -54,7 +54,7 @@ #### # Installation stuff #### -@@ -488,7 +490,7 @@ +@@ -488,7 +490,7 @@ full write access to this directory and the install di continue; } @@ -63,7 +63,7 @@ if (!@is_dir($dir)) { if (!mkdir_p($dir)) { if (!WEBINSTALLER) { -@@ -561,7 +563,7 @@ +@@ -561,7 +563,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 @@ +@@ -571,17 +573,19 @@ if (!WEBINSTALLER) { $install_optional_packages = array(); print "\n"; } @@ -96,7 +96,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 @@ +@@ -606,18 +610,19 @@ print "Loading zlib: ".($have_gzip ? 'ok' : 'failed'). if (!$have_gzip) { print "Downloading uncompressed packages\n"; }; @@ -118,7 +118,7 @@ } // gopear_bundle usage -@@ -645,19 +650,21 @@ +@@ -645,19 +650,21 @@ displayHTMLProgress($progress = 5); // Bootstrap needed ? $nobootstrap = false; @@ -142,7 +142,7 @@ } include_once 'PEAR.php'; print "ok\n"; -@@ -691,6 +698,7 @@ +@@ -691,6 +698,7 @@ displayHTMLProgress($progress = 20); // Extract needed ? $noextract = false; @@ -150,7 +150,7 @@ if (is_dir($php_dir)) { $noextract = @include_once 'PEAR/Registry.php'; -@@ -701,6 +709,7 @@ +@@ -701,6 +709,7 @@ if (is_dir($php_dir)) { } } } @@ -158,7 +158,7 @@ if ($noextract) { print('Using previously installed installer ... '); -@@ -722,7 +731,7 @@ +@@ -722,7 +731,7 @@ if ($noextract) { displayHTMLProgress($progress += round(19 / count($bootstrap_pkgs))); $fullpkg = substr($tarball, 0, strrpos($tarball, '.')); @@ -167,7 +167,7 @@ if (!$tar->extractModify($ptmp, $fullpkg)) { bail("Extraction for $fullpkg failed!\n"); } -@@ -747,12 +756,7 @@ +@@ -747,13 +756,8 @@ include_once "PEAR/Config.php"; include_once "PEAR/Command.php"; include_once "PEAR/Registry.php"; @@ -176,12 +176,13 @@ -} else { - $config = &PEAR_Config::singleton(); -} -- +$config = &PEAR_Config::singleton(($destdir ? $destdir : '').$prefix."/etc/pear.conf.sample", ''); +- $config->set('preferred_state', 'stable'); foreach ($config_vars as $var) { -@@ -765,7 +769,7 @@ + if (isset($$var) && $$var != '') { +@@ -765,7 +769,7 @@ $config->set('temp_dir', $temp_dir); $config->set('http_proxy', $http_proxy); $config->store(); @@ -190,7 +191,7 @@ PEAR_Command::setFrontendType('CLI'); PEAR::staticPushErrorHandling(PEAR_ERROR_DIE); //fail silently -@@ -787,6 +791,11 @@ +@@ -787,6 +791,11 @@ foreach ($to_install as $pkg) { } else { $options = array('onlyreqdeps' => true); } @@ -202,7 +203,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 @@ +@@ -821,7 +830,7 @@ displayHTMLProgress($progress = 99); // Base installation finished @@ -211,7 +212,7 @@ ini_restore("include_path"); if (!WEBINSTALLER) { -@@ -980,6 +989,7 @@ +@@ -980,6 +989,7 @@ if ( WINDOWS ) { if (WINDOWS && !WEBINSTALLER) { win32CreateRegEnv(); } @@ -219,7 +220,16 @@ // Set of functions following /** * Parse the given dirname -@@ -1418,19 +1428,17 @@ +@@ -1134,7 +1144,7 @@ function which($program, $dont_search_in = false) + if (!strlen($dir)) { + continue; + } +- if ($dir{strlen($dir) - 1} != '\\') { ++ if ($dir[strlen($dir) - 1] != '\\') { + $dir .= '\\'; + } + $tmp = $dir . $program; +@@ -1418,19 +1428,17 @@ function detect_install_dirs($_prefix = null) { } } else { if ($_prefix === null) { @@ -244,7 +254,7 @@ // 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 @@ +@@ -1442,6 +1450,7 @@ function detect_install_dirs($_prefix = null) { } elseif (@is_dir("$prefix/share/php/.registry")) { $php_dir = '$prefix/share/php'; }