OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Jul-2003 15:23:43
Branch: OPENPKG_1_STABLE HEAD Handle: 2003072814234201
Modified files:
openpkg-web news.txt
Modified files: (Branch: OPENPKG_1_STABLE)
openpkg-src/php php.patch php.spec
Log:
MFC: changes to PHP since last merge
Summary:
Revision Changes Path
1.3.2.2 +30 -0 openpkg-src/php/php.patch
1.34.2.4 +1 -1 openpkg-src/php/php.spec
1.5867 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.patch
============================================================================
$ cvs diff -u -r1.3.2.1 -r1.3.2.2 php.patch
--- openpkg-src/php/php.patch 24 Jul 2003 20:44:58 -0000 1.3.2.1
+++ openpkg-src/php/php.patch 28 Jul 2003 13:23:43 -0000 1.3.2.2
@@ -21,3 +21,33 @@
save_old_LDFLAGS=$LDFLAGS
+--- php-4.3.2/pear/PEAR/Installer.php.dist 2003-07-28 13:57:01.000000000 +0200
++++ php-4.3.2/pear/PEAR/Installer.php 2003-07-28 14:00:12.000000000 +0200
+@@ -115,7 +115,6 @@
+ parent::PEAR_Common();
+ $this->setFrontendObject($ui);
+ $this->debug = $this->config->get('verbose');
+- $this->registry = &new PEAR_Registry($this->config->get('php_dir'));
+ }
+
+ // }}}
+@@ -786,6 +785,19 @@
+
+ function checkDeps(&$pkginfo)
+ {
++ if ($this->registry == null) {
++ $php_dir = $this->config->get('php_dir');
++ if (isset($options['installroot'])) {
++ if (substr($options['installroot'], -1) == DIRECTORY_SEPARATOR) {
++ $options['installroot'] = substr($options['installroot'], 0,
-1);
++ }
++ $this->installroot = $options['installroot'];
++ $php_dir = $this->_prependPath($php_dir, $this->installroot);
++ } else {
++ $this->installroot = '';
++ }
++ $this->registry = &new PEAR_Registry($php_dir);
++ }
+ $depchecker = &new PEAR_Dependency($this->registry);
+ $error = $errors = '';
+ $failed_deps = array();
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
============================================================================
$ cvs diff -u -r1.34.2.3 -r1.34.2.4 php.spec
--- openpkg-src/php/php.spec 25 Jul 2003 09:18:39 -0000 1.34.2.3
+++ openpkg-src/php/php.spec 28 Jul 2003 13:23:43 -0000 1.34.2.4
@@ -33,7 +33,7 @@
Group: Language
License: PHP
Version: 4.3.2
-Release: 1.20030725
+Release: 1.20030728
# package options (analog to apache.spec)
%option with_calendar no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5866 -r1.5867 news.txt
--- openpkg-web/news.txt 28 Jul 2003 13:11:18 -0000 1.5866
+++ openpkg-web/news.txt 28 Jul 2003 13:23:42 -0000 1.5867
@@ -1,3 +1,4 @@
+28-Jul-2003: Upgraded package: P<php-4.3.2-1.20030728>
28-Jul-2003: Upgraded package: P<gpp-2.1-1.20030728>
28-Jul-2003: Upgraded package: P<php-4.3.2-20030728>
28-Jul-2003: Upgraded package: P<unrar-3.2.2-1.20030728>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
