5 files changed, 55 insertions, 38 deletions

diff --git a/devel/pear/Makefile b/devel/pear/Makefile
index 20915332e617..3cc4f006b7b7 100644
--- a/devel/pear/Makefile
+++ b/devel/pear/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pear
-PORTVERSION=	1.4.6
+PORTVERSION=	1.4.11
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ale
@@ -23,11 +23,15 @@ USE_PHP=	pcre xml
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+PEARDIR=	${PREFIX}/share/pear
+
 post-patch:
 	@${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/go-pear
 
 do-install:
 	@${LOCALBASE}/bin/php -q ${WRKSRC}/go-pear
+	@${PATCH} -p0 -s -b .orig -d ${PEARDIR} < ${PATCHDIR}/PEAR_Installer.php.patch
+	@${RM} -f ${PEARDIR}/PEAR/Installer.php.orig
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/devel/pear/distinfo b/devel/pear/distinfo
index 6022c31edebf..ca2f7d1252d0 100644
--- a/devel/pear/distinfo
+++ b/devel/pear/distinfo
@@ -1,3 +1,3 @@
-MD5 (pear-1.4.6.tar.bz2) = 3827d05d1443c5ca215f59840feef7a7
-SHA256 (pear-1.4.6.tar.bz2) = a0c7dbc6ff606c27fc18a37bcad66716da5baf0e89c1fc4de2bfdb8739b375cd
-SIZE (pear-1.4.6.tar.bz2) = 273056
+MD5 (pear-1.4.11.tar.bz2) = fe0953c0443ed7de1c1c4d6bdeda4c70
+SHA256 (pear-1.4.11.tar.bz2) = e68429c7fd5da250c472d8f78cf8605b6207d7b4a5465a6f597bf24332d47ac6
+SIZE (pear-1.4.11.tar.bz2) = 279164
diff --git a/devel/pear/files/PEAR_Installer.php.patch b/devel/pear/files/PEAR_Installer.php.patch
new file mode 100644
index 000000000000..5ecbcd097210
--- /dev/null
+++ b/devel/pear/files/PEAR_Installer.php.patch
@@ -0,0 +1,20 @@
+--- PEAR/Installer.php.orig	Mon Aug 21 10:20:13 2006
++++ PEAR/Installer.php	Mon Aug 21 10:20:53 2006
+@@ -1464,7 +1464,8 @@
+                 $this->log(0, $e[0]);
+             }
+         }
+-        // {{{ Delete the files
++        // {{{ Delete the files, if not set 'register-only' option
++        if (!isset($options['register-only'])) {
+         $this->startFileTransaction();
+         PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
+         if (PEAR::isError($err = $this->_deletePackageFiles($package, $channel))) {
+@@ -1505,6 +1506,7 @@
+             }
+         }
+         // }}}
++        }
+ 
+         $this->configSet('default_channel', $savechannel);
+         // Register that the package is no longer installed
diff --git a/devel/pear/files/patch-go-pear b/devel/pear/files/patch-go-pear
index f228c055b3f4..0f537e780a66 100644
--- a/devel/pear/files/patch-go-pear
+++ b/devel/pear/files/patch-go-pear
@@ -1,6 +1,6 @@
---- go-pear.orig	Mon Dec  5 07:50:50 2005
-+++ go-pear	Thu Dec  8 10:04:09 2005
-@@ -278,6 +278,7 @@
+--- go-pear.orig	Fri Aug 18 21:14:19 2006
++++ go-pear	Mon Aug 21 09:31:30 2006
+@@ -308,6 +308,7 @@
      $install_pfc = $_SESSION['go-pear']['install_pfc'];
  }
  
@@ -8,7 +8,7 @@
  if (!WEBINSTALLER) {
      $tty = WINDOWS ? @fopen('\con', 'r') : @fopen('/dev/tty', 'r');
  
-@@ -321,6 +322,7 @@
+@@ -351,6 +352,7 @@
          $http_proxy = $tmp;
      }
  }
@@ -16,15 +16,15 @@
  
  $origpwd = getcwd();
  
-@@ -415,6 +417,7 @@
- mkdir_p($ptmp, 0700);
- $ok = @chdir($ptmp);
+@@ -423,6 +425,7 @@
+     }
+ }
  
 +/*
  while (!WEBINSTALLER) {
      print "
  Below is a suggested file layout for your new PEAR installation.  To
-@@ -495,6 +498,7 @@
+@@ -505,6 +508,7 @@
          }
      }
  }
@@ -32,7 +32,7 @@
  
  foreach ($config_vars as $n => $var) {
      for ($m = 1; $m <= count($config_vars); $m++) {
-@@ -519,6 +523,7 @@
+@@ -573,6 +577,7 @@
      }
  }
  
@@ -40,7 +40,7 @@
  if (!WEBINSTALLER) {
      $msg = "The following PEAR packages are bundled with PHP: " .
          implode(', ', $pfc_packages);
-@@ -527,6 +532,7 @@
+@@ -581,6 +586,7 @@
      $install_pfc = !stristr(fgets($tty, 1024), "n");
      print "\n";
  }
@@ -48,15 +48,15 @@
  
  ####
  # Download
-@@ -534,6 +540,7 @@
- 
- ini_set("include_path", $ptmp);
+@@ -592,6 +598,7 @@
+    ini_set('include_path', $ptmp);
+ }
  
 +/*
  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');
-@@ -556,6 +563,7 @@
+@@ -616,6 +623,7 @@
  if (!$have_gzip) {
      print "Downloading uncompressed packages\n";
  };
@@ -64,25 +64,16 @@
  
  if ($install_pfc) {
      $to_install = array_merge($installer_packages, $pfc_packages);
-@@ -580,7 +588,7 @@
- 
- foreach ($installer_packages as $pkg) {
-     foreach($local_dir as $file) {
--        if (substr($file, 0, strlen(str_replace('-stable', '', $pkg))) == str_replace('-stable', '', $pkg)) {
-+        if (substr($file, 0, strlen(str_replace('stable', '', $pkg))) == str_replace('stable', '', $pkg)) {
-             $pkg = str_replace('-stable', '', $pkg);
-             echo str_pad("Using local package: $pkg", max(38,21+strlen($pkg)+4), '.');
-             copy(dirname(__FILE__).'/go-pear-bundle/'.$file, $file);
-@@ -688,7 +696,7 @@
+@@ -765,7 +773,7 @@
  if (WEBINSTALLER || isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == 'local') {
      $config = &PEAR_Config::singleton($prefix."/pear.conf", '');
  } else {
 -    $config = &PEAR_Config::singleton();
 +    $config = &PEAR_Config::singleton($prefix."/etc/pear.conf", '');
- };
- $config->set('preferred_state', 'stable');
- foreach ($config_vars as $var) {
-@@ -719,6 +727,7 @@
+ }
+ 
+ 
+@@ -801,6 +809,7 @@
  
  // Base installation finished
  
@@ -90,7 +81,7 @@
  ini_restore("include_path");
  
  if (!WEBINSTALLER) {
-@@ -876,6 +885,7 @@
+@@ -958,6 +967,7 @@
  if (WINDOWS && !WEBINSTALLER) {
      win32CreateRegEnv();
  }
@@ -98,7 +89,7 @@
  // Set of functions following
  
  // {{{ download_url()
-@@ -1248,15 +1258,16 @@
+@@ -1354,17 +1364,17 @@
          }
      } else {
          if ($_prefix === null) {
@@ -113,11 +104,14 @@
 +        $doc_dir   = '$prefix/share/doc/pear';
          $data_dir  = '$php_dir/data';
          $test_dir  = '$php_dir/tests';
+-        $temp_dir   = '$prefix/temp';
+-
++        $temp_dir   = '/tmp';
 +/*
          // check if the user has installed PHP with PHP or GNU layout
          if (@is_dir("$prefix/lib/php/.registry")) {
              $php_dir = '$prefix/lib/php';
-@@ -1268,6 +1279,7 @@
+@@ -1376,6 +1386,7 @@
          } elseif (@is_dir("$prefix/share/php/.registry")) {
              $php_dir = '$prefix/share/php';
          }
@@ -125,10 +119,8 @@
      }
  }
  
-@@ -2373,4 +2385,4 @@
+@@ -2481,3 +2492,4 @@
      }
      return true;
  }
--?>
-\ No newline at end of file
 +?>
diff --git a/devel/pear/pkg-plist b/devel/pear/pkg-plist
index 9784f3a54e89..9e1cf001006f 100644
--- a/devel/pear/pkg-plist
+++ b/devel/pear/pkg-plist
@@ -118,6 +118,7 @@ etc/pear.conf
 %%DATADIR%%/tests/XML_RPC/tests/allgot.inc
 %%DATADIR%%/tests/XML_RPC/tests/empty-value-struct.php
 %%DATADIR%%/tests/XML_RPC/tests/empty-value.php
+%%DATADIR%%/tests/XML_RPC/tests/extra-lines.php
 %%DATADIR%%/tests/XML_RPC/tests/protoport.php
 %%DATADIR%%/tests/XML_RPC/tests/test_Dump.php
 %%DATADIR%%/tests/XML_RPC/tests/types.php