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

update to 1.9.4

Browse Source
This commit is contained in:
robert 2011-11-16 13:29:13 +00:00
parent 1dac86efa7
commit 4036c0a4b7
9 changed files with 152 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
www/pear/Makefile
View File

@ -1,22 +1,16 @@
# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:07 espie Exp $
# $OpenBSD: Makefile,v 1.13 2011/11/16 13:29:13 robert Exp $
COMMENT-main= base classes for common PHP tasks
COMMENT-utils= utilities for managing pear extensions
VERSION= 1.7.2
VERSION= 1.9.4
DISTNAME= pear-${VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-utils= pear-utils-${VERSION}
CATEGORIES= www devel
EXTRACT_SUFX= .tar.bz2
REVISION-main= 2
REVISION-utils= 3
HOMEPAGE= http://pear.php.net/
MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
${MASTER_SITE_FREEBSD_LOCAL:=miwi/}
MASTER_SITES= http://blade2k.humppa.hu/
MAINTAINER= Robert Nagy <robert@openbsd.org>
@ -40,9 +34,13 @@ NO_REGRESS= Yes
SUBST_VARS= MODPHP_BIN
do-install:
pre-fake:
@perl -pi -e "s,%%BUNDLEDIR%%,${WRKSRC}/go-pear-bundle,g" ${WRKSRC}/go-pear
@perl -pi -e "s,%%PREFIX%%,${WRKINST}${PREFIX-main},g" ${WRKSRC}/go-pear
@${MODPHP_BIN} -nq ${WRKSRC}/go-pear
@perl -pi -e "s,%%TMPDIR%%,${TMPDIR}/go-pear,g" ${WRKSRC}/go-pear
do-install:
@${MODPHP_BIN} -q ${WRKSRC}/go-pear
@mv ${WRKINST}${PREFIX-main}/bin ${WRKINST}${PREFIX-utils}/
@mv ${WRKINST}${PREFIX-main}/share/doc/pear ${WRKINST}${PREFIX-utils}/share/doc/
@ -51,10 +49,10 @@ do-install:
@find ${WRKINST}${PREFIX-main} -name "*.php" -exec perl -pi -e "s,${WRKINST},,g" {} \;
@find ${WRKINST}${PREFIX-utils}/bin -type f -exec perl -pi -e "s,${WRKINST},,g" {} \;
for _f in patch-usr_local_bin_pear patch-usr_local_bin_peardev \
@for _f in patch-usr_local_bin_pear patch-usr_local_bin_peardev \
patch-usr_local_bin_pecl patch-var_www_pear_lib_PEAR_Config_php; do \
patch -d ${WRKINST} < ${FILESDIR}/$${_f}; done
find ${WRKINST}/usr/local/bin -type f -exec ${SUBST_CMD} {} \;
@find ${WRKINST}/usr/local/bin -type f -exec ${SUBST_CMD} {} \;
@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

10
www/pear/distinfo
View File

@ -1,5 +1,5 @@
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
MD5 (pear-1.9.4.tar.gz) = WeH/sl6sZXQljLabgjkhmA==
RMD160 (pear-1.9.4.tar.gz) = zFrup6qDGSvlAgd9Nyc/4WRDHbs=
SHA1 (pear-1.9.4.tar.gz) = kwBB43LQdTn98+8p/cT6NTow1zg=
SHA256 (pear-1.9.4.tar.gz) = Phn0VDYTcUmYBqQMrRkEccmFXsiMJFq/bwNDS/bEQos=
SIZE (pear-1.9.4.tar.gz) = 781269

7
www/pear/files/patch-usr_local_bin_pear
View File

@ -1,12 +1,13 @@
--- usr/local/bin/pear.orig Fri Jul 8 20:29:55 2011
+++ usr/local/bin/pear Fri Jul 8 20:30:19 2011
$OpenBSD: patch-usr_local_bin_pear,v 1.2 2011/11/16 13:29:13 robert Exp $
--- usr/local/bin/pear.orig Wed Nov 16 14:15:00 2011
+++ usr/local/bin/pear Wed Nov 16 14:15:49 2011
@@ -4,10 +4,10 @@
if test "x$PHP_PEAR_PHP_BIN" != "x"; then
PHP="$PHP_PEAR_PHP_BIN"
else
- if test "/usr/local/bin/php" = '@'php_bin'@'; then
+ if test "php-${MODPHP_BIN}" = '@'php_bin'@'; then
PHP=php
PHP=php
else
- PHP="/usr/local/bin/php"
+ PHP="${MODPHP_BIN}"

7
www/pear/files/patch-usr_local_bin_peardev
View File

@ -1,12 +1,13 @@
--- usr/local/bin/peardev.orig Fri Jul 8 20:30:24 2011
+++ usr/local/bin/peardev Fri Jul 8 20:30:39 2011
$OpenBSD: patch-usr_local_bin_peardev,v 1.2 2011/11/16 13:29:13 robert Exp $
--- usr/local/bin/peardev.orig Wed Nov 16 14:16:34 2011
+++ usr/local/bin/peardev Wed Nov 16 14:17:14 2011
@@ -4,10 +4,10 @@
if test "x$PHP_PEAR_PHP_BIN" != "x"; then
PHP="$PHP_PEAR_PHP_BIN"
else
- if test "/usr/local/bin/php" = '@'php_bin'@'; then
+ if test "${MODPHP_BIN}" = '@'php_bin'@'; then
PHP=php
PHP=php
else
- PHP="/usr/local/bin/php"
+ PHP="${MODPHP_BIN}"

7
www/pear/files/patch-usr_local_bin_pecl
View File

@ -1,12 +1,13 @@
--- usr/local/bin/pecl.orig Fri Jul 8 20:30:48 2011
+++ usr/local/bin/pecl Fri Jul 8 20:31:01 2011
$OpenBSD: patch-usr_local_bin_pecl,v 1.2 2011/11/16 13:29:13 robert Exp $
--- usr/local/bin/pecl.orig Wed Nov 16 14:17:44 2011
+++ usr/local/bin/pecl Wed Nov 16 14:18:02 2011
@@ -4,10 +4,10 @@
if test "x$PHP_PEAR_PHP_BIN" != "x"; then
PHP="$PHP_PEAR_PHP_BIN"
else
- if test "/usr/local/bin/php" = '@'php_bin'@'; then
+ if test "${MODPHP_BIN}" = '@'php_bin'@'; then
PHP=php
PHP=php
else
- PHP="/usr/local/bin/php"
+ PHP="${MODPHP_BIN}"

31
www/pear/files/patch-var_www_pear_lib_PEAR_Config_php
View File

@ -1,12 +1,12 @@
--- ./var/www/pear/lib/PEAR/Config.php.orig Fri Jul 8 20:29:44 2011
+++ ./var/www/pear/lib/PEAR/Config.php Fri Jul 8 20:29:44 2011
@@ -84,12 +84,7 @@
$OpenBSD: patch-var_www_pear_lib_PEAR_Config_php,v 1.2 2011/11/16 13:29:13 robert Exp $
--- var/www/pear/lib/PEAR/Config.php.orig Wed Nov 16 14:18:34 2011
+++ var/www/pear/lib/PEAR/Config.php Wed Nov 16 14:20:26 2011
@@ -80,11 +80,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);
- 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);
- }
@ -14,7 +14,7 @@
}
// Default for ext_dir
@@ -112,8 +107,7 @@
@@ -107,8 +103,7 @@
if (getenv('PHP_PEAR_DOC_DIR')) {
define('PEAR_CONFIG_DEFAULT_DOC_DIR', getenv('PHP_PEAR_DOC_DIR'));
} else {
@ -24,7 +24,7 @@
}
// Default for bin_dir
@@ -127,8 +121,7 @@
@@ -122,8 +117,7 @@
if (getenv('PHP_PEAR_DATA_DIR')) {
define('PEAR_CONFIG_DEFAULT_DATA_DIR', getenv('PHP_PEAR_DATA_DIR'));
} else {
@ -34,7 +34,7 @@
}
// Default for cfg_dir
@@ -151,8 +144,7 @@
@@ -146,8 +140,7 @@
if (getenv('PHP_PEAR_TEST_DIR')) {
define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR'));
} else {
@ -44,18 +44,7 @@
}
// Default for temp_dir
@@ -168,9 +160,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');
+ define('PEAR_CONFIG_DEFAULT_CACHE_DIR', '/var/www/pear'.'/cache');
}
// Default for download_dir
@@ -229,9 +219,7 @@
@@ -224,9 +217,7 @@
if (getenv('PHP_PEAR_SIG_BIN')) {
define('PEAR_CONFIG_DEFAULT_SIG_BIN', getenv('PHP_PEAR_SIG_BIN'));
} else {

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

@ -1,15 +1,33 @@
$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'];
$OpenBSD: patch-go-pear,v 1.3 2011/11/16 13:29:14 robert Exp $
--- go-pear.orig Sun Nov 6 20:54:16 2011
+++ go-pear Wed Nov 16 14:12:55 2011
@@ -50,7 +50,7 @@ define('WEBINSTALLER', ($sapi_name != 'cli' && !(subst
ini_set('track_errors', true);
ini_set('html_errors', WEBINSTALLER);
ini_set('magic_quotes_runtime', false);
-error_reporting( E_ALL & ~E_NOTICE);
+error_reporting( E_ALL & ~E_NOTICE & ~E_DEPRECATED );
define('WINDOWS', (substr(PHP_OS, 0, 3) == 'WIN'));
define('GO_PEAR_VER', '1.1.2');
@@ -116,7 +116,7 @@ $bootstrap_pkgs = array( // uses URL like http://pear.
);
$installer_packages = array(
- 'PEAR',
+ 'PEAR-stable',
'Structures_Graph-stable',
'Archive_Tar-stable',
'Console_Getopt-stable',
@@ -251,6 +251,7 @@ if (WEBINSTALLER) {
// Anything past this step has something to do with the installation
}
+/*
if (!WEBINSTALLER) {
$tty = WINDOWS ? @fopen('\con', 'r') : @fopen('/dev/tty', 'r');
@@ -351,6 +352,7 @@ If you wish to abort, press Control-C now, or press En
@@ -294,6 +295,7 @@ If you wish to abort, press Control-C now, or press En
$http_proxy = $tmp;
}
}
@ -17,7 +35,7 @@ $OpenBSD: patch-go-pear,v 1.2 2008/08/22 14:48:53 robert Exp $
$origpwd = getcwd();
@@ -423,6 +425,7 @@ we strongly recommand to use it.
@@ -346,6 +348,7 @@ we strongly recommand to use it.
}
}
@ -25,47 +43,79 @@ $OpenBSD: patch-go-pear,v 1.2 2008/08/22 14:48:53 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 available, we stron
@@ -428,6 +431,7 @@ If you have a CLI (or CGI) php.exe available, we stron
}
}
}
+*/
foreach ($config_vars as $n => $var) {
for ($m = 1; $m <= count($config_vars); $m++) {
@@ -574,6 +578,7 @@ Run this script as $root or pick another location.\n")
####
# Installation stuff
@@ -562,6 +566,7 @@ if (WEBINSTALLER) {
}
}
+/*
if (!WEBINSTALLER) {
$msg = "The following PEAR packages are bundled with PHP: " .
implode(', ', $pfc_packages);
@@ -582,6 +587,7 @@ if (!WEBINSTALLER) {
$install_pfc = !stristr(fgets($tty, 1024), "n");
implode(', ', array_keys($pfc_packages));
@@ -571,17 +576,19 @@ if (!WEBINSTALLER) {
$install_optional_packages = array();
print "\n";
}
+*/
####
# Download
@@ -593,6 +599,7 @@ if (function_exists('set_include_path')) {
ini_set('include_path', $ptmp);
####
if (function_exists('set_include_path')) {
- set_include_path($ptmp);
+ set_include_path($ptmp . PATH_SEPARATOR . "%%BUNDLEDIR%%");
} else {
- ini_set('include_path', $ptmp);
+ ini_set('include_path', $ptmp . PATH_SEPARATOR . "%%BUNDLEDIR%%");
}
+/*
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');
@@ -617,6 +624,7 @@ print "Loading zlib: ".($have_gzip ? 'ok' : 'failed').
@@ -606,18 +613,21 @@ print "Loading zlib: ".($have_gzip ? 'ok' : 'failed').
if (!$have_gzip) {
print "Downloading uncompressed packages\n";
};
+*/
if ($install_pfc) {
$to_install = array_merge($installer_packages, $pfc_packages);
@@ -776,7 +784,7 @@ include_once "PEAR/Registry.php";
$to_install = array_merge($installer_packages, array_keys($pfc_packages));
} else {
$to_install = $installer_packages;
+/*
// webinstaller allows to choose pfc packages individually
foreach ($pfc_packages as $pkg => $desc) {
if (in_array($pkg, $install_optional_packages)) {
array_push($to_install, $pkg);
}
}
+*/
}
// gopear_bundle usage
@@ -655,9 +665,9 @@ if (is_dir($php_dir)) {
if ($nobootstrap) {
print('Using previously install ... ');
if (function_exists('set_include_path')) {
- set_include_path($php_dir);
+ set_include_path($php_dir . PATH_SEPARATOR . "%%BUNDLEDIR%%");
} else {
- ini_set('include_path', $php_dir);
+ ini_set('include_path', $php_dir . PATH_SEPARATOR . "%%BUNDLEDIR%%");
}
include_once 'PEAR.php';
print "ok\n";
@@ -750,7 +760,7 @@ include_once "PEAR/Registry.php";
if (WEBINSTALLER || isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == 'local') {
$config = &PEAR_Config::singleton($prefix."/pear.conf", '');
} else {
@ -74,33 +124,51 @@ $OpenBSD: patch-go-pear,v 1.2 2008/08/22 14:48:53 robert Exp $
}
@@ -812,6 +820,7 @@ displayHTMLProgress($progress = 99);
@@ -768,11 +778,13 @@ $config->store();
$registry = new PEAR_Registry($php_dir);
PEAR_Command::setFrontendType('CLI');
+/*
PEAR::staticPushErrorHandling(PEAR_ERROR_DIE); //fail silently
$ch_cmd = &PEAR_Command::factory('update-channels', $config);
$ch_cmd->run('update-channels', $options, array());
PEAR::staticPopErrorHandling(); // reset error handling
unset($ch_cmd);
+*/
print "\n".'Installing selected packages..................'."\n";
@@ -821,7 +833,7 @@ displayHTMLProgress($progress = 99);
// Base installation finished
-
+/*
ini_restore("include_path");
if (!WEBINSTALLER) {
@@ -969,6 +978,7 @@ if ( WINDOWS ) {
@@ -980,6 +992,8 @@ if ( WINDOWS ) {
if (WINDOWS && !WEBINSTALLER) {
win32CreateRegEnv();
}
+*/
+
// Set of functions following
/**
* Parse the given dirname
@@ -1403,17 +1413,17 @@ function detect_install_dirs($_prefix = null) {
@@ -1418,19 +1432,18 @@ function detect_install_dirs($_prefix = null) {
}
} else {
if ($_prefix === null) {
- $prefix = dirname(PHP_BINDIR);
+ $prefix = "%%PREFIX%%";
- #$prefix = dirname(PHP_BINDIR);
- $prefix = dirname(__FILE__);
+ $prefix = '%%PREFIX%%';
} else {
$prefix = $_prefix;
}
$bin_dir = '$prefix/bin';
- $php_dir = '$prefix/share/pear';
#$php_dir = '$prefix/share/pear';
- $php_dir = '$prefix/PEAR';
- $doc_dir = '$php_dir/docs';
- $data_dir = '$php_dir/data';
- $test_dir = '$php_dir/tests';
@ -110,12 +178,12 @@ $OpenBSD: patch-go-pear,v 1.2 2008/08/22 14:48:53 robert Exp $
+ $doc_dir = '$prefix/share/doc/pear';
+ $data_dir = '$prefix/pear/data';
+ $test_dir = '$prefix/pear/tests';
+ $temp_dir = '/tmp';
+ $temp_dir = '%%TMPDIR%%';
+/*
// check if the user has installed PHP with PHP or GNU layout
if (@is_dir("$prefix/lib/php/.registry")) {
$php_dir = '$prefix/lib/php';
@@ -1425,6 +1435,7 @@ function detect_install_dirs($_prefix = null) {
@@ -1442,6 +1455,7 @@ function detect_install_dirs($_prefix = null) {
} elseif (@is_dir("$prefix/share/php/.registry")) {
$php_dir = '$prefix/share/php';
}
@ -123,8 +191,3 @@ $OpenBSD: patch-go-pear,v 1.2 2008/08/22 14:48:53 robert Exp $
}
}
@@ -2530,3 +2541,4 @@ php.ini <$pathIni> include_path updated.
}
return true;
}
+?>

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

@ -1,31 +1,31 @@
@comment $OpenBSD: PLIST-main,v 1.3 2008/08/22 14:48:53 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.4 2011/11/16 13:29:14 robert Exp $
@conflict php5-pear-*
@conflict php4-pear-*
@pkgpath www/php5/core,-pear
@group daemon
pear/
pear/.lock
pear/data/
pear/data/PEAR/
pear/data/PEAR/package.dtd
pear/data/PEAR/template.spec
pear/data/Structures_Graph/
pear/data/Structures_Graph/LICENSE
pear/data/Structures_Graph/genpackage.xml.pl
pear/data/Structures_Graph/package.sh
pear/data/Structures_Graph/publish.sh
pear/lib/
pear/lib/.channels/
pear/lib/.channels/.alias/
pear/lib/.channels/.alias/pear.txt
pear/lib/.channels/.alias/pecl.txt
pear/lib/.channels/.alias/phpdocs.txt
pear/lib/.channels/__uri.reg
pear/lib/.channels/doc.php.net.reg
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.doc.php.net/
pear/lib/.registry/.channel.pecl.php.net/
pear/lib/.registry/archive_tar.reg
pear/lib/.registry/console_getopt.reg
@ -72,7 +72,6 @@ pear/lib/PEAR/Command/Test.xml
pear/lib/PEAR/Common.php
pear/lib/PEAR/Config.php
@comment pear/lib/PEAR/Config.php.orig
pear/lib/PEAR/Dependency.php
pear/lib/PEAR/Dependency2.php
pear/lib/PEAR/DependencyDB.php
pear/lib/PEAR/Downloader/
@ -127,7 +126,6 @@ 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
pear/lib/PEAR/Task/
pear/lib/PEAR/Task/Common.php
@ -147,6 +145,7 @@ pear/lib/PEAR/Validate.php
pear/lib/PEAR/Validator/
pear/lib/PEAR/Validator/PECL.php
pear/lib/PEAR/XMLParser.php
pear/lib/PEAR5.php
pear/lib/Structures/
pear/lib/Structures/Graph/
pear/lib/Structures/Graph.php
@ -160,7 +159,6 @@ pear/lib/peclcmd.php
pear/tests/
pear/tests/Structures_Graph/
pear/tests/Structures_Graph/tests/
pear/tests/Structures_Graph/tests/README
pear/tests/Structures_Graph/tests/all-tests.php
pear/tests/Structures_Graph/tests/AllTests.php
pear/tests/Structures_Graph/tests/testCase/
pear/tests/Structures_Graph/tests/testCase/BasicGraph.php

12
www/pear/pkg/PLIST-utils
View File

@ -1,15 +1,25 @@
@comment $OpenBSD: PLIST-utils,v 1.3 2007/05/07 13:46:59 bernd Exp $
@comment $OpenBSD: PLIST-utils,v 1.4 2011/11/16 13:29:14 robert Exp $
@conflict php4-core-*
@group daemon
bin/pear
@comment bin/pear.beforesubst
@comment bin/pear.orig
@comment bin/pear.orig.beforesubst
bin/peardev
@comment bin/peardev.beforesubst
@comment bin/peardev.orig
@comment bin/peardev.orig.beforesubst
bin/pecl
@comment bin/pecl.beforesubst
@comment bin/pecl.orig
@comment bin/pecl.orig.beforesubst
share/doc/pear/
share/doc/pear/Archive_Tar/
share/doc/pear/Archive_Tar/docs/
share/doc/pear/Archive_Tar/docs/Archive_Tar.txt
share/doc/pear/PEAR/
share/doc/pear/PEAR/INSTALL
share/doc/pear/PEAR/LICENSE
share/doc/pear/PEAR/README
share/doc/pear/Structures_Graph/
share/doc/pear/Structures_Graph/docs/