pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/pear Update pear to 1.10.4.
details: https://anonhg.NetBSD.org/pkgsrc/rev/33ddf2102925
branches: trunk
changeset: 362865:33ddf2102925
user: taca <taca%pkgsrc.org@localhost>
date: Sun May 28 11:18:08 2017 +0000
description:
Update pear to 1.10.4.
pkgsrc change: instead of using old PEAR.php, use PEAR.php included in
a distfile.
PEAR 1.10.4 2017-04-26 14:39 UTC
Changelog:
* Bug #18102: pear install does not fail on error
* PR #67: fix warning during pecl list-all
diffstat:
lang/pear/Makefile | 8 +-
lang/pear/distinfo | 10 +-
lang/pear/files/PEAR.php | 1110 ----------------------------------------------
3 files changed, 9 insertions(+), 1119 deletions(-)
diffs (truncated from 1166 to 300 lines):
diff -r 177f4e787ee2 -r 33ddf2102925 lang/pear/Makefile
--- a/lang/pear/Makefile Sun May 28 10:44:48 2017 +0000
+++ b/lang/pear/Makefile Sun May 28 11:18:08 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2017/03/12 13:19:12 taca Exp $
+# $NetBSD: Makefile,v 1.39 2017/05/28 11:18:08 taca Exp $
#
-DISTNAME= PEAR-1.10.3
+DISTNAME= PEAR-1.10.4
PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/}
CATEGORIES= lang
MASTER_SITES= http://download.pear.php.net/package/
@@ -63,12 +63,12 @@
INSTALLATION_DIRS+= share/examples/pear
-post-extract:
+pre-patch:
${RM} ${WRKSRC}/INSTALL
${MKDIR} ${WRKSRC}/install
${MKDIR} ${BUNDLE}
${CP} ${FILESDIR}/go-pear.php ${WRKSRC}/install
- ${CP} ${FILESDIR}/PEAR.php ${BUNDLE}
+ ${CP} ${WRKSRC}/PEAR.php ${BUNDLE}
do-build:
.for f in ${DISTFILES}
diff -r 177f4e787ee2 -r 33ddf2102925 lang/pear/distinfo
--- a/lang/pear/distinfo Sun May 28 10:44:48 2017 +0000
+++ b/lang/pear/distinfo Sun May 28 11:18:08 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2017/03/12 13:19:12 taca Exp $
+$NetBSD: distinfo,v 1.27 2017/05/28 11:18:08 taca Exp $
SHA1 (pear20151210/Archive_Tar-1.4.2.tgz) = 07a93681a14fcc764fc6396cf66d9f4ec6db0bed
RMD160 (pear20151210/Archive_Tar-1.4.2.tgz) = 003289c0950cf587c8925e35da86bc6ec4d1b282
@@ -8,10 +8,10 @@
RMD160 (pear20151210/Console_Getopt-1.4.1.tgz) = 54d397e321a0168a33a92c98cf39f9f6456d49ea
SHA512 (pear20151210/Console_Getopt-1.4.1.tgz) = e66a78077593ade78a40c59297a24242b0177d21b0e02b08d4fb5e25d8a57a96353c50a9dcc968f60af7458d40443061e0c1cdb11ad3180c7ffed8f0b314b089
Size (pear20151210/Console_Getopt-1.4.1.tgz) = 5672 bytes
-SHA1 (pear20151210/PEAR-1.10.3.tgz) = f0f848e2b9dec270fb457512c92203524791c351
-RMD160 (pear20151210/PEAR-1.10.3.tgz) = 164b31cbfb49bb26ffcb229e8b1b59246f54381e
-SHA512 (pear20151210/PEAR-1.10.3.tgz) = 1ad531a6e0ac30719b05e58f0758393bc6cdb0e89b4f99f843e7318a40ef18e74767e8ed63346b0ece9d6e8e71c8ebe15b08eaeb6f0c4f3169814bb4bb524332
-Size (pear20151210/PEAR-1.10.3.tgz) = 291095 bytes
+SHA1 (pear20151210/PEAR-1.10.4.tgz) = d2f27706ee246dac307cfa1d25abca8e22046433
+RMD160 (pear20151210/PEAR-1.10.4.tgz) = c3f32b75638fa1b8568dc2e44c229c3f0d21fe80
+SHA512 (pear20151210/PEAR-1.10.4.tgz) = 6c191eef1ab20522485c7709af748f48b34397c4e1c3618aecfb5489c168cec43111588cf717fcc6ead18f220ad723457cbd62289bd67e614fab089c4b88f3b3
+Size (pear20151210/PEAR-1.10.4.tgz) = 291106 bytes
SHA1 (pear20151210/Structures_Graph-1.1.1.tgz) = 2a9e5999e035aa3a6789011238b0a9a54806124a
RMD160 (pear20151210/Structures_Graph-1.1.1.tgz) = fff02cabb75ee3531eedae19a2dffe999258a96c
SHA512 (pear20151210/Structures_Graph-1.1.1.tgz) = 28465396cd540fd1619e0c1bec68fa8c3dff440a6e89c3c5583570edbd3de285e101de7c00e60d49d791ff10d8311f8a38d73ea3cdf52cfc74ecbe2f1842693f
diff -r 177f4e787ee2 -r 33ddf2102925 lang/pear/files/PEAR.php
--- a/lang/pear/files/PEAR.php Sun May 28 10:44:48 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1110 +0,0 @@
-<?php
-/**
- * PEAR, the PHP Extension and Application Repository
- *
- * PEAR class and PEAR_Error class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt. If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license%php.net@localhost so we can mail you a copy immediately.
- *
- * @category pear
- * @package PEAR
- * @author Sterling Hughes <sterling%php.net@localhost>
- * @author Stig Bakken <ssb%php.net@localhost>
- * @author Tomas V.V.Cox <cox%idecnet.com@localhost>
- * @author Greg Beaver <cellog%php.net@localhost>
- * @copyright 1997-2006 The PHP Group
- * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: Id: PEAR.php,v 1.97 2006/01/06 04:47:36 cellog Exp
- * @link http://pear.php.net/package/PEAR
- * @since File available since Release 0.1
- */
-
-/*
- * $NetBSD: PEAR.php,v 1.2 2011/08/20 14:02:29 taca Exp $
- *
- * This is http://cvs.php.net/viewvc.cgi/pear-core/PEAR.php?view=co&pathrev=PEAR_1_4
- *
- * See $bootstrap_files definition in go-pear.php
- *
- */
-
-/**#@+
- * ERROR constants
- */
-define('PEAR_ERROR_RETURN', 1);
-define('PEAR_ERROR_PRINT', 2);
-define('PEAR_ERROR_TRIGGER', 4);
-define('PEAR_ERROR_DIE', 8);
-define('PEAR_ERROR_CALLBACK', 16);
-/**
- * WARNING: obsolete
- * @deprecated
- */
-define('PEAR_ERROR_EXCEPTION', 32);
-/**#@-*/
-define('PEAR_ZE2', (function_exists('version_compare') &&
- version_compare(zend_version(), "2-dev", "ge")));
-
-if (substr(PHP_OS, 0, 3) == 'WIN') {
- define('OS_WINDOWS', true);
- define('OS_UNIX', false);
- define('PEAR_OS', 'Windows');
-} else {
- define('OS_WINDOWS', false);
- define('OS_UNIX', true);
- define('PEAR_OS', 'Unix'); // blatant assumption
-}
-
-// instant backwards compatibility
-if (!defined('PATH_SEPARATOR')) {
- if (OS_WINDOWS) {
- define('PATH_SEPARATOR', ';');
- } else {
- define('PATH_SEPARATOR', ':');
- }
-}
-
-$GLOBALS['_PEAR_default_error_mode'] = PEAR_ERROR_RETURN;
-$GLOBALS['_PEAR_default_error_options'] = E_USER_NOTICE;
-$GLOBALS['_PEAR_destructor_object_list'] = array();
-$GLOBALS['_PEAR_shutdown_funcs'] = array();
-$GLOBALS['_PEAR_error_handler_stack'] = array();
-
-@ini_set('track_errors', true);
-
-/**
- * Base class for other PEAR classes. Provides rudimentary
- * emulation of destructors.
- *
- * If you want a destructor in your class, inherit PEAR and make a
- * destructor method called _yourclassname (same name as the
- * constructor, but with a "_" prefix). Also, in your constructor you
- * have to call the PEAR constructor: $this->PEAR();.
- * The destructor method will be called without parameters. Note that
- * at in some SAPI implementations (such as Apache), any output during
- * the request shutdown (in which destructors are called) seems to be
- * discarded. If you need to get any debug information from your
- * destructor, use error_log(), syslog() or something similar.
- *
- * IMPORTANT! To use the emulated destructors you need to create the
- * objects by reference: $obj =& new PEAR_child;
- *
- * @category pear
- * @package PEAR
- * @author Stig Bakken <ssb%php.net@localhost>
- * @author Tomas V.V. Cox <cox%idecnet.com@localhost>
- * @author Greg Beaver <cellog%php.net@localhost>
- * @copyright 1997-2006 The PHP Group
- * @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: @package_version@
- * @link http://pear.php.net/package/PEAR
- * @see PEAR_Error
- * @since Class available since PHP 4.0.2
- * @link http://pear.php.net/manual/en/core.pear.php#core.pear.pear
- */
-class PEAR
-{
- // {{{ properties
-
- /**
- * Whether to enable internal debug messages.
- *
- * @var bool
- * @access private
- */
- var $_debug = false;
-
- /**
- * Default error mode for this object.
- *
- * @var int
- * @access private
- */
- var $_default_error_mode = null;
-
- /**
- * Default error options used for this object when error mode
- * is PEAR_ERROR_TRIGGER.
- *
- * @var int
- * @access private
- */
- var $_default_error_options = null;
-
- /**
- * Default error handler (callback) for this object, if error mode is
- * PEAR_ERROR_CALLBACK.
- *
- * @var string
- * @access private
- */
- var $_default_error_handler = '';
-
- /**
- * Which class to use for error objects.
- *
- * @var string
- * @access private
- */
- var $_error_class = 'PEAR_Error';
-
- /**
- * An array of expected errors.
- *
- * @var array
- * @access private
- */
- var $_expected_errors = array();
-
- // }}}
-
- // {{{ constructor
-
- /**
- * Constructor. Registers this object in
- * $_PEAR_destructor_object_list for destructor emulation if a
- * destructor object exists.
- *
- * @param string $error_class (optional) which class to use for
- * error objects, defaults to PEAR_Error.
- * @access public
- * @return void
- */
- function PEAR($error_class = null)
- {
- $classname = strtolower(get_class($this));
- if ($this->_debug) {
- print "PEAR constructor called, class=$classname\n";
- }
- if ($error_class !== null) {
- $this->_error_class = $error_class;
- }
- while ($classname && strcasecmp($classname, "pear")) {
- $destructor = "_$classname";
- if (method_exists($this, $destructor)) {
- global $_PEAR_destructor_object_list;
- $_PEAR_destructor_object_list[] = &$this;
- if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
- register_shutdown_function("_PEAR_call_destructors");
- $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
- }
- break;
- } else {
- $classname = get_parent_class($classname);
- }
- }
- }
-
- // }}}
- // {{{ destructor
-
- /**
- * Destructor (the emulated type of...). Does nothing right now,
- * but is included for forward compatibility, so subclass
- * destructors should always call it.
- *
- * See the note in the class desciption about output from
- * destructors.
- *
- * @access public
- * @return void
- */
- function _PEAR() {
- if ($this->_debug) {
- printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
- }
- }
-
- // }}}
- // {{{ getStaticProperty()
-
- /**
- * If you have a class that's mostly/entirely static, and you need static
- * properties, you can use this method to simulate them. Eg. in your method(s)
- * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
- * You MUST use a reference, or they will not persist!
- *
- * @access public
- * @param string $class The calling classname, to prevent clashes
- * @param string $var The variable to retrieve.
- * @return mixed A reference to the variable. If not set it will be
- * auto initialised to NULL.
- */
- function &getStaticProperty($class, $var)
- {
- static $properties;
- return $properties[$class][$var];
- }
-
Home |
Main Index |
Thread Index |
Old Index