cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to pear 1.7.2 which is the current stable

Browse Source 
version.
This commit is contained in:
robert 2008-08-22 14:48:53 +00:00
parent 7117b44c59
commit d7604a28d0
5 changed files with 45 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
www/pear/Makefile
View File

@ -1,19 +1,20 @@
# $OpenBSD: Makefile,v 1.5 2007/09/13 14:30:23 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2008/08/22 14:48:53 robert Exp $
COMMENT-main= base classes for common PHP tasks
COMMENT-utils= utilities for managing pear extensions
VERSION= 1.5.0
VERSION= 1.7.2
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 <robert@openbsd.org>
@ -49,5 +50,6 @@ do-install:
@patch -d ${WRKINST}${PREFIX-main}/pear < ${FILESDIR}/patch-lib_PEAR_Config_php
@perl -pi -e "s,OPENBSD_PEAR_ROOT,'${PREFIX-main}/pear',g" \
${WRKINST}${PREFIX-main}/pear/lib/PEAR/Config.php
@touch ${WRKINST}${PREFIX-main}/pear/.lock
.include <bsd.port.mk>

10
www/pear/distinfo
View File

@ -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.2.tar.bz2) = hRVDeDsPcifKSCeUYlJzgg==
RMD160 (pear-1.7.2.tar.bz2) = XokTRvvkaA08e6IBFQaty7zpidM=
SHA1 (pear-1.7.2.tar.bz2) = T2mFAv4rME04SK/T8LJWlLBs98M=
SHA256 (pear-1.7.2.tar.bz2) = //FwuvKMjCe8S4lEO0AvxjrByPLPoPW8THDYNzGJ7ho=
SIZE (pear-1.7.2.tar.bz2) = 296233

15
www/pear/files/patch-lib_PEAR_Config_php
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-lib_PEAR_Config_php,v 1.2 2008/08/22 14:48:53 robert Exp $
--- lib/PEAR/Config.php.orig Fri Aug 22 16:30:55 2008
+++ lib/PEAR/Config.php Fri Aug 22 16:38:49 2008
@@ -84,12 +84,7 @@
if (getenv('PHP_PEAR_INSTALL_DIR')) {
define('PEAR_CONFIG_DEFAULT_PHP_DIR', getenv('PHP_PEAR_INSTALL_DIR'));
@ -25,7 +25,7 @@ $OpenBSD: patch-lib_PEAR_Config_php,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
}
// Default for bin_dir
@@ -127,16 +121,14 @@
@@ -127,8 +121,7 @@
if (getenv('PHP_PEAR_DATA_DIR')) {
define('PEAR_CONFIG_DEFAULT_DATA_DIR', getenv('PHP_PEAR_DATA_DIR'));
} else {
@ -34,7 +34,8 @@ $OpenBSD: patch-lib_PEAR_Config_php,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
+ define('PEAR_CONFIG_DEFAULT_DATA_DIR', OPENBSD_PEAR_ROOT.'/data');
}
// Default for test_dir
// Default for cfg_dir
@@ -151,8 +144,7 @@
if (getenv('PHP_PEAR_TEST_DIR')) {
define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR'));
} else {
@ -44,7 +45,7 @@ $OpenBSD: patch-lib_PEAR_Config_php,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
}
// Default for temp_dir
@@ -152,9 +144,7 @@
@@ -168,9 +160,7 @@
if (getenv('PHP_PEAR_CACHE_DIR')) {
define('PEAR_CONFIG_DEFAULT_CACHE_DIR', getenv('PHP_PEAR_CACHE_DIR'));
} else {
@ -55,7 +56,7 @@ $OpenBSD: patch-lib_PEAR_Config_php,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
}
// Default for download_dir
@@ -213,9 +203,7 @@
@@ -229,9 +219,7 @@
if (getenv('PHP_PEAR_SIG_BIN')) {
define('PEAR_CONFIG_DEFAULT_SIG_BIN', getenv('PHP_PEAR_SIG_BIN'));
} else {

54
www/pear/patches/patch-go-pear
View File

@ -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
$OpenBSD: patch-go-pear,v 1.2 2008/08/22 14:48:53 robert Exp $
--- 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 @@ $OpenBSD: patch-go-pear,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
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 @@ $OpenBSD: patch-go-pear,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
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 @@ $OpenBSD: patch-go-pear,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
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 @@ $OpenBSD: patch-go-pear,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
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 @@ $OpenBSD: patch-go-pear,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
####
# 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 @@ $OpenBSD: patch-go-pear,v 1.1.1.1 2007/03/19 23:13:23 robert 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');
@@ -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 @@ $OpenBSD: patch-go-pear,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
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 @@ $OpenBSD: patch-go-pear,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
}
@@ -824,6 +819,7 @@ displayHTMLProgress($progress = 99);
@@ -812,6 +820,7 @@ displayHTMLProgress($progress = 99);
// Base installation finished
@ -102,15 +82,15 @@ $OpenBSD: patch-go-pear,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
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 @@ $OpenBSD: patch-go-pear,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
// 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 @@ $OpenBSD: patch-go-pear,v 1.1.1.1 2007/03/19 23:13:23 robert Exp $
}
}
@@ -2504,3 +2502,4 @@ php.ini <$pathIni> include_path updated.
@@ -2530,3 +2541,4 @@ php.ini <$pathIni> include_path updated.
}
return true;
}

9
www/pear/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2007/05/07 13:46:59 bernd Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2008/08/22 14:48:53 robert Exp $
@conflict php5-pear-*
@conflict php4-pear-*
@pkgpath www/php5/core,-pear
@ -23,6 +23,7 @@ pear/lib/.channels/pear.php.net.reg
pear/lib/.channels/pecl.php.net.reg
pear/lib/.depdb
pear/lib/.depdblock
pear/lib/.lock
pear/lib/.registry/
pear/lib/.registry/.channel.__uri/
pear/lib/.registry/.channel.pecl.php.net/
@ -79,6 +80,7 @@ pear/lib/PEAR/Downloader.php
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 +88,8 @@ pear/lib/PEAR/Installer/
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 +105,8 @@ pear/lib/PEAR/Installer/Role/Src.php
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 +125,7 @@ pear/lib/PEAR/REST/
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