Update PEAR to 1.9.1.

pkgsrc changes,
* Update base pear packages:Archive_Tar-1.3.7 (recommented)
* Remove ${FILESDIR}/pear.sh, same as bundled one.
* set LICENSE=2-clause-bsd
* add user-destdir support

Upstream Changelog:

* svntag improvements, tag package files passed into the command and better
  directory checks [dufuz]
* rely on Structures_Graph minimum version instead of recommended version
  [saltybeagle]
* Fix Bug #12613: running go-pear.phar from C:\ fails [dufuz]
* Fix Bug #14841: Installing pear into directory with space fails [dufuz]
* Fix Bug #16644: pear.bat returns syntax error when parenthesis are in install
  path. [dufuz] [patch by bwaters (Bryan Waters)]
* Fix Bug #16767: Use of Depreciated HTML Attributes in the Exception class
  [dufuz] [patch by fuhrysteve (Stephen J. Fuhry)]
* Fix Bug #16864: "pear list-upgrades -i" issues E_WARNINGS [dufuz] [patch by
  rquadling (Richard Quadling)]
* Fix Bug #17220: command `pear help` outputs to stderr instead of stdout
  [dufuz]
* Fix Bug #17234: channel-discover adds port to HTTP Host header [dufuz]
* Fix Bug #17292: Code Coverage in PEAR_RunTest does not work with namespaces
  [sebastian]
* Fix Bug #17359: loadExtension() fails over missing dl() when used in
  multithread env [dufuz]
* Fix Bug #17378: pear info $package fails if directory with that name exists
  [dufuz]

4 files changed, 101 insertions, 72 deletions

diff --git a/lang/pear/Makefile b/lang/pear/Makefile
index 28e041396c0..9fb0dd436c6 100644
--- a/lang/pear/Makefile
+++ b/lang/pear/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2010/03/15 16:50:15 taca Exp $
+# $NetBSD: Makefile,v 1.14 2010/08/24 11:33:51 obache Exp $
 #
 
-DISTNAME=	PEAR-1.9.0
-#PKGREVISION=	1
+DISTNAME=	PEAR-1.9.1
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME:S/PEAR/pear/}
 CATEGORIES=	lang
 MASTER_SITES=	http://download.pear.php.net/package/
@@ -11,6 +10,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pear.php.net/
 COMMENT=	PEAR Base System for PHP
+LICENSE=	2-clause-bsd
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	# none
 EXTRACT_ONLY=	# none
@@ -27,11 +29,11 @@ BUNDLE=		${WRKSRC}/install/go-pear-bundle
 
 # everything else that forms a part of the "base" PEAR install
 #
-PEAR_SRCS=		PEAR-1.9.0${EXTRACT_SUFX}
+PEAR_SRCS=		${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=		${PEAR_SRCS}
 EXTRACT_ONLY+=		${PEAR_SRCS}
 
-ARCHIVE_SRCS=		Archive_Tar-1.3.3${EXTRACT_SUFX}
+ARCHIVE_SRCS=		Archive_Tar-1.3.7${EXTRACT_SUFX}
 ARCHIVE_WRKSRC=		${WRKDIR}/${ARCHIVE_SRCS:S/${EXTRACT_SUFX}//}
 DISTFILES+=		${ARCHIVE_SRCS}
 EXTRACT_ONLY+=		${ARCHIVE_SRCS}
@@ -53,13 +55,7 @@ SUBST_SED.config=	-e "s|@WRKSRC@|${WRKSRC}|g"
 SUBST_SED.config+=	-e "s|@PREFIX@|${PREFIX}|g"
 SUBST_MESSAGE.config=	Fixing configuration files.
 
-SUBST_CLASSES+=		pear
-SUBST_STAGE.pear=	post-patch
-SUBST_FILES.pear=	pear.sh
-SUBST_SED.pear=		-e "s|@php_bin@|${PREFIX}/bin/php|g"
-SUBST_SED.pear+=	-e "s|@php_dir@|${PREFIX}/lib/php|g"
-SUBST_SED.pear+=	-e "s|@SH@|${SH}|g"
-SUBST_MESSAGE.pear=	Fixing pear installation script.
+REPLACE_SH+=		script/pear.sh
 
 INSTALLATION_DIRS+=	share/examples/pear
 
@@ -68,7 +64,6 @@ post-extract:
 	${MKDIR} ${WRKSRC}/install
 	${MKDIR} ${BUNDLE}
 	${CP} ${FILESDIR}/go-pear.php ${WRKSRC}/install
-	${CP} ${FILESDIR}/pear.sh ${WRKSRC}
 	${CP} ${FILESDIR}/PEAR.php ${BUNDLE}
 
 do-build:
@@ -85,8 +80,7 @@ do-build:
 	${CP} ${CONSOLE_WRKSRC}/Console/Getopt.php ${BUNDLE}
 
 do-install:
-	${PREFIX}/bin/php ${WRKSRC}/install/go-pear.php local
-	${INSTALL_SCRIPT} ${WRKSRC}/pear.sh ${DESTDIR}${PREFIX}/bin/pear
+	${SETENV} ${INSTALL_ENV} ${PREFIX}/bin/php ${WRKSRC}/install/go-pear.php local
 	${INSTALL_DATA} ${WRKSRC}/pear.conf \
 		${DESTDIR}${PREFIX}/share/examples/pear/pear.conf
 
diff --git a/lang/pear/distinfo b/lang/pear/distinfo
index b6c57f12f67..f4d9449f751 100644
--- a/lang/pear/distinfo
+++ b/lang/pear/distinfo
@@ -1,18 +1,15 @@
-$NetBSD: distinfo,v 1.5 2009/10/29 08:29:03 seb Exp $
+$NetBSD: distinfo,v 1.6 2010/08/24 11:33:51 obache Exp $
 
-SHA1 (Archive_Tar-1.3.3.tgz) = b49de079aee8c087c19b718534503234670598cb
-RMD160 (Archive_Tar-1.3.3.tgz) = 3abe03b42ee81b6ddf5449db6277806f664aec6b
-Size (Archive_Tar-1.3.3.tgz) = 18119 bytes
+SHA1 (Archive_Tar-1.3.7.tgz) = 5b35a8c3bfa34ba8b29c5208f8f37504d0ce280c
+RMD160 (Archive_Tar-1.3.7.tgz) = 0b018556bf4d916440e0e661e714986edd728de2
+Size (Archive_Tar-1.3.7.tgz) = 17610 bytes
 SHA1 (Console_Getopt-1.2.3.tgz) = 2f4ea028f478123164c3f6588f8a505dc35915df
 RMD160 (Console_Getopt-1.2.3.tgz) = d1624dbcb223395ded9e46285f896d6f5bb5ca74
 Size (Console_Getopt-1.2.3.tgz) = 4011 bytes
-SHA1 (PEAR-1.9.0.tgz) = a268b9af85a3daad047c77947838932f2737e6aa
-RMD160 (PEAR-1.9.0.tgz) = cfac92b7569676783b44a38309f8a156f49a35e8
-Size (PEAR-1.9.0.tgz) = 291634 bytes
+SHA1 (PEAR-1.9.1.tgz) = dec038a23f7062a1ba7846e116d5d3d3b737d229
+RMD160 (PEAR-1.9.1.tgz) = 159cca1d7588896aa329c4c5aa7ce1b8b494485c
+Size (PEAR-1.9.1.tgz) = 293587 bytes
 SHA1 (Structures_Graph-1.0.3.tgz) = 13761cc4788f6c272730abe110a5a5048be18643
 RMD160 (Structures_Graph-1.0.3.tgz) = 835cfc8c4cd7475f5486c710abe5dd9737c1b476
 Size (Structures_Graph-1.0.3.tgz) = 30191 bytes
-SHA1 (XML_Util-1.2.1.tgz) = 8072216577fb9ad684f15e0388ab0b1c0b57e2d4
-RMD160 (XML_Util-1.2.1.tgz) = 9d9dd43889312f46f39c9a43a800a8f2d8f6e9b2
-Size (XML_Util-1.2.1.tgz) = 17729 bytes
-SHA1 (patch-aa) = 8d4d9762c26e878ab78e465eace3c4bac1a7ef5f
+SHA1 (patch-aa) = 974a96bdc354156a88ce30f0ab7f9ff14ee43e30
diff --git a/lang/pear/files/pear.sh b/lang/pear/files/pear.sh
deleted file mode 100644
index ae84cdbbf4f..00000000000
--- a/lang/pear/files/pear.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!@SH@
-#
-# $Id: pear.sh,v 1.3 2009/10/29 08:29:03 seb Exp $
-
-# first find which PHP binary to use
-if test "x$PHP_PEAR_PHP_BIN" != "x"; then
-  PHP="$PHP_PEAR_PHP_BIN"
-else
-  if test "@php_bin@" = '@'php_bin'@'; then
-    PHP=php 
-  else
-    PHP="@php_bin@"
-  fi
-fi
-
-# then look for the right pear include dir
-if test "x$PHP_PEAR_INSTALL_DIR" != "x"; then
-  INCDIR=$PHP_PEAR_INSTALL_DIR
-  INCARG="-d include_path=$PHP_PEAR_INSTALL_DIR"
-else
-  if test "@php_dir@" = '@'php_dir'@'; then
-    INCDIR=`dirname $0`
-    INCARG=""  
-  else
-    INCDIR="@php_dir@"
-    INCARG="-d include_path=@php_dir@"
-  fi
-fi
-
-exec $PHP -C -q $INCARG -d output_buffering=1 -d variables_order=EGPCS -d open_basedir="" -d safe_mode=0 -d register_argc_argv="On" -d auto_prepend_file="" -d auto_append_file="" $INCDIR/pearcmd.php "$@"
diff --git a/lang/pear/patches/patch-aa b/lang/pear/patches/patch-aa
index f67a3c73649..dc86458e672 100644
--- a/lang/pear/patches/patch-aa
+++ b/lang/pear/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2009/10/29 08:29:03 seb Exp $
+$NetBSD: patch-aa,v 1.5 2010/08/24 11:33:52 obache Exp $
 
---- install/go-pear.php.orig	2009-10-17 09:56:43.000000000 +0000
+--- install/go-pear.php.orig	2010-08-24 08:12:01.000000000 +0000
 +++ install/go-pear.php
-@@ -252,6 +252,8 @@ if (WEBINSTALLER) {
+@@ -58,6 +58,8 @@ define('GO_PEAR_VER', '1.1.2');
+ 
+ define('WIN32GUI', !WEBINSTALLER && WINDOWS && $sapi_name=='cli' && which('cscript'));
+ 
++$destdir = getenv('DESTDIR');
++
+ /*
+  * See bug #23069
+  */
+@@ -252,6 +254,8 @@ if (WEBINSTALLER) {
      // Anything past this step has something to do with the installation    
  }
  
@@ -11,7 +20,7 @@ $NetBSD: patch-aa,v 1.4 2009/10/29 08:29:03 seb Exp $
  if (!WEBINSTALLER) {
      $tty = WINDOWS ? @fopen('\con', 'r') : @fopen('/dev/tty', 'r');
  
-@@ -296,6 +298,8 @@ If you wish to abort, press Control-C no
+@@ -296,6 +300,8 @@ If you wish to abort, press Control-C no
      }
  }
  
@@ -20,7 +29,7 @@ $NetBSD: patch-aa,v 1.4 2009/10/29 08:29:03 seb Exp $
  $origpwd = getcwd();
  
  $config_vars = array_keys($config_desc);
-@@ -347,6 +351,8 @@ we strongly recommand to use it.
+@@ -347,6 +353,8 @@ we strongly recommand to use it.
      }
  }
  
@@ -29,7 +38,7 @@ $NetBSD: patch-aa,v 1.4 2009/10/29 08:29:03 seb Exp $
  while (!WEBINSTALLER) {
      print "
  Below is a suggested file layout for your new PEAR installation.  To
-@@ -430,6 +436,8 @@ If you have a CLI (or CGI) php.exe avail
+@@ -430,6 +438,8 @@ If you have a CLI (or CGI) php.exe avail
      }
  }
  
@@ -38,7 +47,16 @@ $NetBSD: patch-aa,v 1.4 2009/10/29 08:29:03 seb Exp $
  ####
  # Installation stuff
  ####
-@@ -564,13 +572,17 @@ if (WEBINSTALLER) {
+@@ -489,7 +499,7 @@ full write access to this directory and 
+             continue;
+         }
+ 
+-        $dir = $$var;
++        $dir = ($destdir ? $destdir : '').$$var;
+         if (!@is_dir($dir)) {
+             if (!mkdir_p($dir)) {
+                 if (!WEBINSTALLER) {
+@@ -564,13 +574,17 @@ if (WEBINSTALLER) {
  }
  
  if (!WEBINSTALLER) {
@@ -56,7 +74,7 @@ $NetBSD: patch-aa,v 1.4 2009/10/29 08:29:03 seb Exp $
  }
  
  ####
-@@ -583,6 +595,8 @@ if (function_exists('set_include_path'))
+@@ -583,6 +597,8 @@ if (function_exists('set_include_path'))
     ini_set('include_path', $ptmp);
  }
  
@@ -65,7 +83,7 @@ $NetBSD: patch-aa,v 1.4 2009/10/29 08:29:03 seb Exp $
  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');
-@@ -608,6 +622,8 @@ if (!$have_gzip) {
+@@ -608,6 +624,8 @@ if (!$have_gzip) {
      print "Downloading uncompressed packages\n";
  };
  
@@ -74,7 +92,38 @@ $NetBSD: patch-aa,v 1.4 2009/10/29 08:29:03 seb Exp $
  if ($install_pfc) {
      $to_install = array_merge($installer_packages, array_keys($pfc_packages));
  } else {
-@@ -749,7 +765,7 @@ include_once "PEAR/Command.php";
+@@ -646,12 +664,14 @@ displayHTMLProgress($progress = 5);
+ 
+ // Bootstrap needed ?
+ $nobootstrap = false;
++/*
+ if (is_dir($php_dir)) {
+     $nobootstrap = true;
+     foreach ($bootstrap_files as $file => $url) {
+         $nobootstrap &= is_file($php_dir.'/'.$file);
+     }
+ }
++*/
+ 
+ if ($nobootstrap) {
+     print('Using previously install ... ');
+@@ -692,6 +712,7 @@ displayHTMLProgress($progress = 20);
+ 
+ // Extract needed ?
+ $noextract = false;
++/*
+ if (is_dir($php_dir)) {
+     $noextract = @include_once 'PEAR/Registry.php';
+     
+@@ -702,6 +723,7 @@ if (is_dir($php_dir)) {
+         }
+     }
+ }
++*/
+ 
+ if ($noextract) {
+     print('Using previously installed installer ... ');
+@@ -749,7 +771,7 @@ include_once "PEAR/Command.php";
  include_once "PEAR/Registry.php";
  
  if (WEBINSTALLER || isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == 'local') {
@@ -83,7 +132,16 @@ $NetBSD: patch-aa,v 1.4 2009/10/29 08:29:03 seb Exp $
  } else {
      $config = &PEAR_Config::singleton();
  }
-@@ -781,7 +797,11 @@ displayHTMLProgress($progress = 45);
+@@ -766,7 +788,7 @@ $config->set('temp_dir', $temp_dir);
+ $config->set('http_proxy', $http_proxy);
+ $config->store();
+ 
+-$registry = new PEAR_Registry($php_dir);
++$registry = new PEAR_Registry(($destdir ? $destdir : '').$php_dir);
+ PEAR_Command::setFrontendType('CLI');
+ 
+ PEAR::staticPushErrorHandling(PEAR_ERROR_DIE); //fail silently
+@@ -781,20 +803,28 @@ displayHTMLProgress($progress = 45);
  
  $install = &PEAR_Command::factory('install', $config);
  foreach ($to_install as $pkg) {
@@ -96,7 +154,17 @@ $NetBSD: patch-aa,v 1.4 2009/10/29 08:29:03 seb Exp $
  
      if (in_array($pkg, $installer_packages)) {
          $options = array('nodeps' => true);
-@@ -794,7 +814,6 @@ foreach ($to_install as $pkg) {
+     } else {
+         $options = array('onlyreqdeps' => true);
+     }
++    if ($destdir) {
++        $options['packagingroot'] = $destdir;
++	$options['force'] = true;
++	$options['nodeps'] = true;
++    }
+     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)));
          continue;
      }
      
@@ -104,7 +172,7 @@ $NetBSD: patch-aa,v 1.4 2009/10/29 08:29:03 seb Exp $
      if (in_array($pkg_basename, $bootstrap_pkgs)) {
          print(str_pad("Installing bootstrap package: $pkg_basename", max(50,30+strlen($pkg_basename)+4), '.')."...");
          displayHTMLProgress($progress += round(25 / count($to_install)));
-@@ -817,12 +836,17 @@ print "\n".'Making sure every package is
+@@ -817,12 +847,17 @@ print "\n".'Making sure every package is
  $install->run('upgrade-all', array('soft' => true), array());
  print "ok\n";
  */
@@ -122,7 +190,7 @@ $NetBSD: patch-aa,v 1.4 2009/10/29 08:29:03 seb Exp $
  ini_restore("include_path");
  
  if (!WEBINSTALLER) {
-@@ -981,6 +1005,9 @@ if ( WINDOWS ) {
+@@ -981,6 +1016,9 @@ if ( WINDOWS ) {
  if (WINDOWS && !WEBINSTALLER) {
      win32CreateRegEnv();
  }
@@ -132,7 +200,7 @@ $NetBSD: patch-aa,v 1.4 2009/10/29 08:29:03 seb Exp $
  // Set of functions following
  /**
   * Parse the given dirname
-@@ -1420,17 +1447,19 @@ function detect_install_dirs($_prefix = 
+@@ -1420,17 +1458,19 @@ function detect_install_dirs($_prefix = 
      } else {
          if ($_prefix === null) {
              #$prefix    = dirname(PHP_BINDIR);
@@ -157,7 +225,7 @@ $NetBSD: patch-aa,v 1.4 2009/10/29 08:29:03 seb Exp $
  
          // check if the user has installed PHP with PHP or GNU layout
          if (@is_dir("$prefix/lib/php/.registry")) {
-@@ -1443,6 +1472,8 @@ function detect_install_dirs($_prefix = 
+@@ -1443,6 +1483,8 @@ function detect_install_dirs($_prefix = 
          } elseif (@is_dir("$prefix/share/php/.registry")) {
              $php_dir = '$prefix/share/php';
          }