Hi folks, here is a diff for www/pear to update it
to the latest version. Please TEST it as much as you
can. THank you.
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/pear/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile 13 Sep 2007 14:30:23 -0000 1.5
+++ Makefile 20 May 2008 14:08:59 -0000
@@ -3,17 +3,18 @@
COMMENT-main= base classes for common PHP tasks
COMMENT-utils= utilities for managing pear extensions
-VERSION= 1.5.0
+VERSION= 1.7.1
DISTNAME= pear-${VERSION}
PKGNAME= ${DISTNAME}
-PKGNAME-main= ${DISTNAME}p1
-PKGNAME-utils= pear-utils-${VERSION}p0
+PKGNAME-main= ${DISTNAME}
+PKGNAME-utils= pear-utils-${VERSION}
CATEGORIES= www devel
EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://pear.php.net/
-MASTER_SITES= ${MASTER_SITE_FREEBSD_LOCAL:=ale/}
+MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
+ ${MASTER_SITE_FREEBSD_LOCAL:=miwi/}
MAINTAINER= Robert Nagy <[EMAIL PROTECTED]>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/pear/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 5 Apr 2007 17:26:25 -0000 1.2
+++ distinfo 20 May 2008 14:08:59 -0000
@@ -1,5 +1,5 @@
-MD5 (pear-1.5.0.tar.bz2) = sLAmeJkRt1RkvF6D4bj19w==
-RMD160 (pear-1.5.0.tar.bz2) = ALitn4+ufV5drS8dtMq9Q2vzz2M=
-SHA1 (pear-1.5.0.tar.bz2) = cEClJLWyO+vG0gK2qS6TYR8FEk0=
-SHA256 (pear-1.5.0.tar.bz2) = fOQinmBq90xwJ8MFAiNy6v5Q25nS+ZVwrGR8faRP5BY=
-SIZE (pear-1.5.0.tar.bz2) = 291923
+MD5 (pear-1.7.1.tar.bz2) = Ml2Ct/ExpJQegu6eTlvkjw==
+RMD160 (pear-1.7.1.tar.bz2) = wNKGiEYyMBm5CkXSm9l1jtCrqZw=
+SHA1 (pear-1.7.1.tar.bz2) = ZSyoQJqnmXepPw3pyU0oGEYnyxM=
+SHA256 (pear-1.7.1.tar.bz2) = 82NOeenceAtXgKNl+KcJOWau1rKe2wnEB85rcAgwfOU=
+SIZE (pear-1.7.1.tar.bz2) = 295412
Index: files/patch-lib_PEAR_Config_php
===================================================================
RCS file: /cvs/ports/www/pear/files/patch-lib_PEAR_Config_php,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-lib_PEAR_Config_php
--- files/patch-lib_PEAR_Config_php 19 Mar 2007 23:13:23 -0000 1.1.1.1
+++ files/patch-lib_PEAR_Config_php 20 May 2008 14:08:59 -0000
@@ -1,68 +1,69 @@
-$OpenBSD: patch-lib_PEAR_Config_php,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
---- lib/PEAR/Config.php.orig Tue Mar 20 00:01:00 2007
-+++ lib/PEAR/Config.php Tue Mar 20 00:03:08 2007
-@@ -84,12 +84,7 @@
- if (getenv('PHP_PEAR_INSTALL_DIR')) {
- define('PEAR_CONFIG_DEFAULT_PHP_DIR', getenv('PHP_PEAR_INSTALL_DIR'));
- } else {
-- if (file_exists($PEAR_INSTALL_DIR) && is_dir($PEAR_INSTALL_DIR)) {
-- define('PEAR_CONFIG_DEFAULT_PHP_DIR',
-- $PEAR_INSTALL_DIR);
-- } else {
-- define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR);
-- }
+$OpenBSD$
+--- lib/PEAR/Config.php.orig Tue May 20 15:51:26 2008
++++ lib/PEAR/Config.php Tue May 20 15:56:35 2008
+@@ -84,12 +84,7 @@ if (getenv('PHP_PEAR_HTTP_PROXY')) {
+ if (getenv('PHP_PEAR_INSTALL_DIR')) {
+ define('PEAR_CONFIG_DEFAULT_PHP_DIR', getenv('PHP_PEAR_INSTALL_DIR'));
+ } else {
+- if (file_exists($PEAR_INSTALL_DIR) && is_dir($PEAR_INSTALL_DIR)) {
+- define('PEAR_CONFIG_DEFAULT_PHP_DIR',
+- $PEAR_INSTALL_DIR);
+- } else {
+- define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR);
+- }
+ define('PEAR_CONFIG_DEFAULT_PHP_DIR', OPENBSD_PEAR_ROOT.'/lib');
- }
-
- // Default for ext_dir
-@@ -112,8 +107,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',
-- $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'docs');
+ }
+
+ // Default for ext_dir
+@@ -112,8 +107,7 @@ if (getenv('PHP_PEAR_EXTENSION_DIR')) {
+ if (getenv('PHP_PEAR_DOC_DIR')) {
+ define('PEAR_CONFIG_DEFAULT_DOC_DIR', getenv('PHP_PEAR_DOC_DIR'));
+ } else {
+- define('PEAR_CONFIG_DEFAULT_DOC_DIR',
+- $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'docs');
+ define('PEAR_CONFIG_DEFAULT_DOC_DIR', OPENBSD_PEAR_ROOT.'/doc');
- }
-
- // Default for bin_dir
-@@ -127,16 +121,14 @@
- if (getenv('PHP_PEAR_DATA_DIR')) {
- define('PEAR_CONFIG_DEFAULT_DATA_DIR', getenv('PHP_PEAR_DATA_DIR'));
- } else {
-- define('PEAR_CONFIG_DEFAULT_DATA_DIR',
-- $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'data');
+ }
+
+ // Default for bin_dir
+@@ -127,8 +121,7 @@ if (getenv('PHP_PEAR_BIN_DIR')) {
+ if (getenv('PHP_PEAR_DATA_DIR')) {
+ define('PEAR_CONFIG_DEFAULT_DATA_DIR', getenv('PHP_PEAR_DATA_DIR'));
+ } else {
+- define('PEAR_CONFIG_DEFAULT_DATA_DIR',
+- $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'data');
+ define('PEAR_CONFIG_DEFAULT_DATA_DIR', OPENBSD_PEAR_ROOT.'/data');
- }
-
- // Default for test_dir
- if (getenv('PHP_PEAR_TEST_DIR')) {
- define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR'));
- } else {
-- define('PEAR_CONFIG_DEFAULT_TEST_DIR',
-- $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'tests');
+ }
+
+ // Default for cfg_dir
+@@ -151,8 +144,7 @@ if (getenv('PHP_PEAR_WWW_DIR')) {
+ if (getenv('PHP_PEAR_TEST_DIR')) {
+ define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR'));
+ } else {
+- define('PEAR_CONFIG_DEFAULT_TEST_DIR',
+- $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'tests');
+ define('PEAR_CONFIG_DEFAULT_TEST_DIR', OPENBSD_PEAR_ROOT.'/tests');
- }
-
- // Default for temp_dir
-@@ -152,9 +144,7 @@
- if (getenv('PHP_PEAR_CACHE_DIR')) {
- define('PEAR_CONFIG_DEFAULT_CACHE_DIR', getenv('PHP_PEAR_CACHE_DIR'));
- } else {
-- define('PEAR_CONFIG_DEFAULT_CACHE_DIR',
-- System::tmpdir() . DIRECTORY_SEPARATOR . 'pear' .
-- DIRECTORY_SEPARATOR . 'cache');
+ }
+
+ // Default for temp_dir
+@@ -168,9 +160,7 @@ if (getenv('PHP_PEAR_TEMP_DIR')) {
+ if (getenv('PHP_PEAR_CACHE_DIR')) {
+ define('PEAR_CONFIG_DEFAULT_CACHE_DIR', getenv('PHP_PEAR_CACHE_DIR'));
+ } else {
+- define('PEAR_CONFIG_DEFAULT_CACHE_DIR',
+- System::tmpdir() . DIRECTORY_SEPARATOR . 'pear' .
+- DIRECTORY_SEPARATOR . 'cache');
+ define('PEAR_CONFIG_DEFAULT_CACHE_DIR', OPENBSD_PEAR_ROOT.'/cache');
- }
-
- // Default for download_dir
-@@ -213,9 +203,7 @@
- if (getenv('PHP_PEAR_SIG_BIN')) {
- define('PEAR_CONFIG_DEFAULT_SIG_BIN', getenv('PHP_PEAR_SIG_BIN'));
- } else {
-- define('PEAR_CONFIG_DEFAULT_SIG_BIN',
-- System::which(
-- 'gpg', OS_WINDOWS ? 'c:\gnupg\gpg.exe' :
'/usr/local/bin/gpg'));
+ }
+
+ // Default for download_dir
+@@ -229,9 +219,7 @@ if (getenv('PHP_PEAR_SIG_TYPE')) {
+ if (getenv('PHP_PEAR_SIG_BIN')) {
+ define('PEAR_CONFIG_DEFAULT_SIG_BIN', getenv('PHP_PEAR_SIG_BIN'));
+ } else {
+- define('PEAR_CONFIG_DEFAULT_SIG_BIN',
+- System::which(
+- 'gpg', OS_WINDOWS ? 'c:\gnupg\gpg.exe' :
'/usr/local/bin/gpg'));
+ define('PEAR_CONFIG_DEFAULT_SIG_BIN', PHP_PREFIX . '/bin/gpg');
- }
-
- // Default for sig_keydir
+ }
+
+ // Default for sig_keydir
Index: patches/patch-go-pear
===================================================================
RCS file: /cvs/ports/www/pear/patches/patch-go-pear,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-go-pear
--- patches/patch-go-pear 19 Mar 2007 23:13:23 -0000 1.1.1.1
+++ patches/patch-go-pear 20 May 2008 14:08:59 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-go-pear,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
---- go-pear.orig Tue Feb 6 18:30:15 2007
-+++ go-pear Mon Mar 19 12:23:42 2007
+--- go-pear.orig Mon Sep 10 19:21:57 2007
++++ go-pear Tue May 20 15:51:12 2008
@@ -308,6 +308,7 @@ if (WEBINSTALLER) {
$install_pfc = $_SESSION['go-pear']['install_pfc'];
}
@@ -9,7 +9,7 @@
if (!WEBINSTALLER) {
$tty = WINDOWS ? @fopen('\con', 'r') : @fopen('/dev/tty', 'r');
-@@ -351,6 +352,7 @@ If you wish to abort, press Control-C no
+@@ -351,6 +352,7 @@ If you wish to abort, press Control-C now, or press En
$http_proxy = $tmp;
}
}
@@ -25,7 +25,7 @@
while (!WEBINSTALLER) {
print "
Below is a suggested file layout for your new PEAR installation. To
-@@ -505,6 +508,7 @@ If you have a CLI (or CGI) php.exe avail
+@@ -505,6 +508,7 @@ If you have a CLI (or CGI) php.exe available, we stron
}
}
}
@@ -33,7 +33,7 @@
foreach ($config_vars as $n => $var) {
for ($m = 1; $m <= count($config_vars); $m++) {
-@@ -573,6 +577,7 @@ Run this script as $root or pick another
+@@ -574,6 +578,7 @@ Run this script as $root or pick another location.\n")
}
}
@@ -41,7 +41,7 @@
if (!WEBINSTALLER) {
$msg = "The following PEAR packages are bundled with PHP: " .
implode(', ', $pfc_packages);
-@@ -581,6 +586,7 @@ if (!WEBINSTALLER) {
+@@ -582,6 +587,7 @@ if (!WEBINSTALLER) {
$install_pfc = !stristr(fgets($tty, 1024), "n");
print "\n";
}
@@ -49,7 +49,7 @@
####
# Download
-@@ -592,6 +598,7 @@ if (function_exists('set_include_path'))
+@@ -593,6 +599,7 @@ if (function_exists('set_include_path')) {
ini_set('include_path', $ptmp);
}
@@ -57,7 +57,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');
-@@ -616,6 +623,7 @@ print "Loading zlib: ".($have_gzip ? 'ok
+@@ -617,6 +624,7 @@ print "Loading zlib: ".($have_gzip ? 'ok' : 'failed').
if (!$have_gzip) {
print "Downloading uncompressed packages\n";
};
@@ -65,27 +65,7 @@
if ($install_pfc) {
$to_install = array_merge($installer_packages, $pfc_packages);
-@@ -710,19 +718,6 @@ if (in_array('Getopt.php', $local_dir))
- }
- print "ok\n";
-
--print 'Bootstrapping: Console_Getopt.........';
--$r = 'RELEASE_' . ereg_replace('[^A-Za-z0-9]', '_',
substr(substr($tarball['Console_Getopt'], 15), 0, -4));
--$url =
"http://cvs.php.net/viewcvs.cgi/pear-core/Console/Getopt.php?view=co&pathrev=PEAR_1_4";;
--mkdir('Console', 0700);
--if (in_array('Getopt.php', $local_dir)) {
-- copy(dirname(__FILE__).'/go-pear-bundle/Getopt.php',
'Console/Getopt.php');
-- echo "(local) ";
--} else {
-- download_url($url, 'Console/Getopt.php', $http_proxy);
-- echo "(remote) ";
--}
--print "ok\n";
--
- if ($install_pfc) {
- foreach ($pfc_packages as $pkg) {
- foreach($local_dir as $file) {
-@@ -788,7 +783,7 @@ include_once "PEAR/Registry.php";
+@@ -776,7 +784,7 @@ include_once "PEAR/Registry.php";
if (WEBINSTALLER || isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] ==
'local') {
$config = &PEAR_Config::singleton($prefix."/pear.conf", '');
} else {
@@ -94,7 +74,7 @@
}
-@@ -824,6 +819,7 @@ displayHTMLProgress($progress = 99);
+@@ -812,6 +820,7 @@ displayHTMLProgress($progress = 99);
// Base installation finished
@@ -102,15 +82,15 @@
ini_restore("include_path");
if (!WEBINSTALLER) {
-@@ -981,6 +977,7 @@ if ( WINDOWS ) {
+@@ -969,6 +978,7 @@ if ( WINDOWS ) {
if (WINDOWS && !WEBINSTALLER) {
win32CreateRegEnv();
}
+*/
// Set of functions following
-
- // {{{ download_url()
-@@ -1377,17 +1374,17 @@ function detect_install_dirs($_prefix =
+ /**
+ * Parse the given dirname
+@@ -1403,17 +1413,17 @@ function detect_install_dirs($_prefix = null) {
}
} else {
if ($_prefix === null) {
@@ -135,7 +115,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';
-@@ -1399,6 +1396,7 @@ function detect_install_dirs($_prefix =
+@@ -1425,6 +1435,7 @@ function detect_install_dirs($_prefix = null) {
} elseif (@is_dir("$prefix/share/php/.registry")) {
$php_dir = '$prefix/share/php';
}
@@ -143,7 +123,7 @@
}
}
-@@ -2504,3 +2502,4 @@ php.ini <$pathIni> include_path updated.
+@@ -2530,3 +2541,4 @@ php.ini <$pathIni> include_path updated.
}
return true;
}
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/www/pear/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -r1.2 PLIST-main
--- pkg/PLIST-main 7 May 2007 13:46:59 -0000 1.2
+++ pkg/PLIST-main 20 May 2008 14:08:59 -0000
@@ -79,6 +79,7 @@
pear/lib/PEAR/Downloader/Package.php
pear/lib/PEAR/ErrorStack.php
pear/lib/PEAR/Exception.php
+pear/lib/PEAR/FixPHP5PEARWarnings.php
pear/lib/PEAR/Frontend/
pear/lib/PEAR/Frontend.php
pear/lib/PEAR/Frontend/CLI.php
@@ -86,6 +87,8 @@
pear/lib/PEAR/Installer.php
pear/lib/PEAR/Installer/Role/
pear/lib/PEAR/Installer/Role.php
+pear/lib/PEAR/Installer/Role/Cfg.php
+pear/lib/PEAR/Installer/Role/Cfg.xml
pear/lib/PEAR/Installer/Role/Common.php
pear/lib/PEAR/Installer/Role/Data.php
pear/lib/PEAR/Installer/Role/Data.xml
@@ -101,6 +104,8 @@
pear/lib/PEAR/Installer/Role/Src.xml
pear/lib/PEAR/Installer/Role/Test.php
pear/lib/PEAR/Installer/Role/Test.xml
+pear/lib/PEAR/Installer/Role/Www.php
+pear/lib/PEAR/Installer/Role/Www.xml
pear/lib/PEAR/PackageFile/
pear/lib/PEAR/PackageFile.php
pear/lib/PEAR/PackageFile/Generator/
@@ -119,6 +124,7 @@
pear/lib/PEAR/REST.php
pear/lib/PEAR/REST/10.php
pear/lib/PEAR/REST/11.php
+pear/lib/PEAR/REST/13.php
pear/lib/PEAR/Registry.php
pear/lib/PEAR/Remote.php
pear/lib/PEAR/RunTest.php
