[Midnightbsd-cvs] mports [15521] U trunk/devel/pear/pkg-plist: pear 1.9.4
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Sep 25 21:24:07 EDT 2013
Revision: 15521
http://svnweb.midnightbsd.org/mports/?rev=15521
Author: laffer1
Date: 2013-09-25 21:24:06 -0400 (Wed, 25 Sep 2013)
Log Message:
-----------
pear 1.9.4
Modified Paths:
--------------
trunk/devel/pear/Makefile
trunk/devel/pear/distinfo
trunk/devel/pear/files/patch-go-pear
trunk/devel/pear/pkg-plist
Added Paths:
-----------
trunk/devel/pear/files/extra-patch-PEAR-Config.php
Property Changed:
----------------
trunk/devel/pear/distinfo
trunk/devel/pear/files/patch-go-pear
trunk/devel/pear/pkg-plist
Modified: trunk/devel/pear/Makefile
===================================================================
--- trunk/devel/pear/Makefile 2013-09-26 01:07:53 UTC (rev 15520)
+++ trunk/devel/pear/Makefile 2013-09-26 01:24:06 UTC (rev 15521)
@@ -1,13 +1,13 @@
# $MidnightBSD$
PORTNAME= pear
-PORTVERSION= 1.7.2
-PORTREVISION= 1
+PORTVERSION= 1.9.4
CATEGORIES= devel
-MASTER_SITES= http://cvsup13.tw.freebsd.org/pub/FreeBSD/distfiles/
+MASTER_SITES= http://miwibox.org/distfiles/
MAINTAINER= ports at MidnightBSD.org
COMMENT= PEAR framework for PHP
+
LICENSE= php
USE_BZIP2= yes
@@ -14,8 +14,8 @@
NO_BUILD= yes
WANT_PHP_CLI= yes
-USE_PHP_BUILD= xml
-USE_PHP= xml
+USE_PHP_BUILD= yes
+USE_PHP= pcre xml
FAKE_OPTS+= prefixhack
@@ -23,7 +23,17 @@
post-patch:
@${MKDIR} ${FAKE_DESTDIR}${PEARDIR}
- @${REINPLACE_CMD} "s|%%PREFIX%%|${FAKE_DESTDIR}${PREFIX}|" ${WRKSRC}/go-pear
+ @${REINPLACE_CMD} -e "s|%%PREFIX%%|${FAKE_DESTDIR}${PREFIX}|" \
+ -e "s|%%BUNDLEDIR%%|${WRKSRC}/go-pear-bundle|" \
+ -e "s|%%TMPDIR%%|/tmp/pear|" \
+ ${WRKSRC}/go-pear
+ @cd ${WRKSRC}/go-pear-bundle && ${MKDIR} tmp && ${TAR} -C tmp -xf PEAR-${PORTVERSION}.tar
+ @cd ${WRKSRC}/go-pear-bundle/tmp/PEAR-${PORTVERSION} && ${PATCH} -s -p0 < ${FILESDIR}/extra-patch-PEAR-Config.php
+ @${RM} ${WRKSRC}/go-pear-bundle/tmp/PEAR-${PORTVERSION}/PEAR/Config.php.orig
+ @${MD5} -q ${WRKSRC}/go-pear-bundle/tmp/PEAR-${PORTVERSION}/PEAR/Config.php > ${WRKSRC}/Config.php.md5
+ @${REINPLACE_CMD} -E -e "s|(file md5sum=\").*(\" name=\"PEAR/Config.php\" role=\"php\")|\1`${CAT} ${WRKSRC}/Config.php.md5`\2|g" \
+ ${WRKSRC}/go-pear-bundle/tmp/package2.xml ${WRKSRC}/go-pear-bundle/package2.xml
+ @cd ${WRKSRC}/go-pear-bundle/tmp && ${TAR} -cf ../PEAR-${PORTVERSION}.tar package2.xml PEAR-${PORTVERSION} package.xml
do-install:
${LOCALBASE}/bin/php -q ${WRKSRC}/go-pear
@@ -31,6 +41,7 @@
${PEARDIR}/peclcmd.php
post-install:
+ @${CP} -n ${PREFIX}/etc/pear.conf.sample ${PREFIX}/etc/pear.conf || ${TRUE}
${SED} -i "" "s|${FAKE_DESTDIR}||g" \
${PREFIX}/bin/pear \
${PREFIX}/bin/peardev \
@@ -40,7 +51,8 @@
${PEARDIR}/.registry/archive_tar.reg \
${PEARDIR}/.registry/console_getopt.reg \
${PEARDIR}/.registry/pear.reg \
- ${PEARDIR}/.registry/structures_graph.reg
- @${RM} ${PREFIX}/etc/pear.conf
+ ${PEARDIR}/.registry/structures_graph.reg \
+ ${PREFIX}/etc/pear.conf \
+ ${PREFIX}/etc/pear.conf.sample
.include <bsd.port.mk>
Modified: trunk/devel/pear/distinfo
===================================================================
--- trunk/devel/pear/distinfo 2013-09-26 01:07:53 UTC (rev 15520)
+++ trunk/devel/pear/distinfo 2013-09-26 01:24:06 UTC (rev 15521)
@@ -1,3 +1,2 @@
-SHA256 (pear-1.7.2.tar.bz2) = fff170baf28c8c27bc4b89443b402fc63ac1c8f2cfa0f5bc4c70d8373189ee1a
-RMD160 (pear-1.7.2.tar.bz2) = 5e891346fbe4680d3c7ba2011506adcbbce989d3
-SIZE (pear-1.7.2.tar.bz2) = 296233
+SHA256 (pear-1.9.4.tar.bz2) = dbff7047b70035e9b65adf8e0beaf834db2e1bf161f526bd4d87e204fd47b604
+SIZE (pear-1.9.4.tar.bz2) = 322695
Property changes on: trunk/devel/pear/distinfo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Added: trunk/devel/pear/files/extra-patch-PEAR-Config.php
===================================================================
--- trunk/devel/pear/files/extra-patch-PEAR-Config.php (rev 0)
+++ trunk/devel/pear/files/extra-patch-PEAR-Config.php 2013-09-26 01:24:06 UTC (rev 15521)
@@ -0,0 +1,38 @@
+--- PEAR/Config.php.orig 2011-11-15 10:23:32.384650640 +0100
++++ PEAR/Config.php 2011-11-15 10:23:35.145650207 +0100
+@@ -29,7 +29,7 @@
+ */
+ $GLOBALS['_PEAR_Config_instance'] = null;
+ if (!defined('PEAR_INSTALL_DIR') || !PEAR_INSTALL_DIR) {
+- $PEAR_INSTALL_DIR = PHP_LIBDIR . DIRECTORY_SEPARATOR . 'pear';
++ $PEAR_INSTALL_DIR = PHP_PREFIX . DIRECTORY_SEPARATOR . 'share' . DIRECTORY_SEPARATOR . 'pear';
+ } else {
+ $PEAR_INSTALL_DIR = PEAR_INSTALL_DIR;
+ }
+@@ -108,7 +108,7 @@
+ define('PEAR_CONFIG_DEFAULT_DOC_DIR', getenv('PHP_PEAR_DOC_DIR'));
+ } else {
+ define('PEAR_CONFIG_DEFAULT_DOC_DIR',
+- $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'docs');
++ PHP_PREFIX.DIRECTORY_SEPARATOR.'share'.DIRECTORY_SEPARATOR.'doc'.DIRECTORY_SEPARATOR.'pear');
+ }
+
+ // Default for bin_dir
+@@ -131,7 +131,7 @@
+ define('PEAR_CONFIG_DEFAULT_CFG_DIR', getenv('PHP_PEAR_CFG_DIR'));
+ } else {
+ define('PEAR_CONFIG_DEFAULT_CFG_DIR',
+- $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'cfg');
++ PHP_PREFIX.DIRECTORY_SEPARATOR.'etc'.DIRECTORY_SEPARATOR.'pear');
+ }
+
+ // Default for www_dir
+@@ -139,7 +139,7 @@
+ define('PEAR_CONFIG_DEFAULT_WWW_DIR', getenv('PHP_PEAR_WWW_DIR'));
+ } else {
+ define('PEAR_CONFIG_DEFAULT_WWW_DIR',
+- $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'www');
++ PHP_PREFIX.DIRECTORY_SEPARATOR.'www');
+ }
+
+ // Default for test_dir
Modified: trunk/devel/pear/files/patch-go-pear
===================================================================
--- trunk/devel/pear/files/patch-go-pear 2013-09-26 01:07:53 UTC (rev 15520)
+++ trunk/devel/pear/files/patch-go-pear 2013-09-26 01:24:06 UTC (rev 15521)
@@ -1,117 +1,172 @@
---- go-pear.orig Fri Apr 27 23:07:03 2007
-+++ go-pear Mon Apr 30 10:15:47 2007
-@@ -308,6 +308,7 @@
- $install_pfc = $_SESSION['go-pear']['install_pfc'];
+--- go-pear.orig 2011-11-06 20:54:16.000000000 +0100
++++ go-pear 2011-11-15 08:46:12.988647172 +0100
+@@ -116,7 +116,7 @@
+ );
+
+ $installer_packages = array(
+- 'PEAR',
++ 'PEAR-stable',
+ 'Structures_Graph-stable',
+ 'Archive_Tar-stable',
+ 'Console_Getopt-stable',
+@@ -250,7 +250,7 @@
+ }
+ // 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 @@
+@@ -294,7 +294,7 @@
$http_proxy = $tmp;
}
}
+-
+*/
-
$origpwd = getcwd();
-@@ -423,6 +425,7 @@
+ $config_vars = array_keys($config_desc);
+@@ -345,7 +345,7 @@
+ break;
}
}
-
+-
+/*
while (!WEBINSTALLER) {
print "
Below is a suggested file layout for your new PEAR installation. To
-@@ -505,6 +508,7 @@
+@@ -428,7 +428,7 @@
}
}
}
+-
+*/
-
- foreach ($config_vars as $n => $var) {
- for ($m = 1; $m <= count($config_vars); $m++) {
-@@ -573,6 +577,7 @@
+ ####
+ # Installation stuff
+ ####
+@@ -561,7 +561,7 @@
+ ob_start();
}
}
-
+-
+/*
if (!WEBINSTALLER) {
$msg = "The following PEAR packages are bundled with PHP: " .
- implode(', ', $pfc_packages);
-@@ -581,6 +586,7 @@
- $install_pfc = !stristr(fgets($tty, 1024), "n");
+ implode(', ', array_keys($pfc_packages));
+@@ -571,17 +571,17 @@
+ $install_optional_packages = array();
print "\n";
}
+-
+*/
-
####
# Download
-@@ -592,6 +598,7 @@
- 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');
-@@ -616,6 +623,7 @@
+@@ -606,18 +606,19 @@
if (!$have_gzip) {
print "Downloading uncompressed packages\n";
};
+-
+*/
-
if ($install_pfc) {
- $to_install = array_merge($installer_packages, $pfc_packages);
-@@ -775,7 +783,7 @@
- if (WEBINSTALLER || isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == 'local') {
- $config = &PEAR_Config::singleton($prefix."/pear.conf", '');
+ $to_install = array_merge($installer_packages, array_keys($pfc_packages));
} else {
-- $config = &PEAR_Config::singleton();
-+ $config = &PEAR_Config::singleton($prefix."/etc/pear.conf", '');
+ $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 +656,9 @@
+ 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";
+@@ -747,12 +748,7 @@
+ include_once "PEAR/Command.php";
+ include_once "PEAR/Registry.php";
-@@ -811,6 +819,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.sample", '');
+ $config->set('preferred_state', 'stable');
+ foreach ($config_vars as $var) {
+@@ -821,7 +817,7 @@
+
+
// Base installation finished
-
+-
+/*
ini_restore("include_path");
if (!WEBINSTALLER) {
-@@ -968,6 +977,7 @@
+@@ -980,6 +976,7 @@
if (WINDOWS && !WEBINSTALLER) {
win32CreateRegEnv();
}
+*/
// Set of functions following
-
- // {{{ download_url()
-@@ -1364,17 +1374,17 @@
+ /**
+ * Parse the given dirname
+@@ -1418,19 +1415,17 @@
}
} 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';
++ $php_dir = '$prefix/share/pear';
+ $doc_dir = '$prefix/share/doc/pear';
$data_dir = '$php_dir/data';
$test_dir = '$php_dir/tests';
- $temp_dir = '$prefix/temp';
-
-+ $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';
-@@ -1386,6 +1396,7 @@
+@@ -1442,6 +1437,7 @@
} elseif (@is_dir("$prefix/share/php/.registry")) {
$php_dir = '$prefix/share/php';
}
@@ -119,8 +174,3 @@
}
}
-@@ -2491,3 +2502,4 @@
- }
- return true;
- }
-+?>
Property changes on: trunk/devel/pear/files/patch-go-pear
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/devel/pear/pkg-plist
===================================================================
--- trunk/devel/pear/pkg-plist 2013-09-26 01:07:53 UTC (rev 15520)
+++ trunk/devel/pear/pkg-plist 2013-09-26 01:24:06 UTC (rev 15521)
@@ -1,10 +1,12 @@
- at comment $MidnightBSD$
bin/pear
bin/peardev
bin/pecl
- at comment etc/pear.conf
+ at unexec if cmp -s %D/etc/pear.conf %D/etc/pear.conf.sample; then rm -f %D/etc/pear.conf; fi
+etc/pear.conf.sample
+ at exec [ -f %B/pear.conf ] || cp %B/%f %B/pear.conf
%%DOCSDIR%%/Archive_Tar/docs/Archive_Tar.txt
%%DOCSDIR%%/PEAR/INSTALL
+%%DOCSDIR%%/PEAR/LICENSE
%%DOCSDIR%%/PEAR/README
%%DOCSDIR%%/Structures_Graph/docs/generate.sh
%%DOCSDIR%%/Structures_Graph/docs/html/Structures_Graph/Structures_Graph.html
@@ -29,7 +31,9 @@
%%DOCSDIR%%/Structures_Graph/docs/tutorials/Structures_Graph/Structures_Graph.pkg
%%DATADIR%%/.channels/.alias/pear.txt
%%DATADIR%%/.channels/.alias/pecl.txt
+%%DATADIR%%/.channels/.alias/phpdocs.txt
%%DATADIR%%/.channels/__uri.reg
+%%DATADIR%%/.channels/doc.php.net.reg
%%DATADIR%%/.channels/pear.php.net.reg
%%DATADIR%%/.channels/pecl.php.net.reg
@exec touch %D/share/pear/.depdb
@@ -73,7 +77,6 @@
%%DATADIR%%/PEAR/Command.php
%%DATADIR%%/PEAR/Common.php
%%DATADIR%%/PEAR/Config.php
-%%DATADIR%%/PEAR/Dependency.php
%%DATADIR%%/PEAR/Dependency2.php
%%DATADIR%%/PEAR/DependencyDB.php
%%DATADIR%%/PEAR/Downloader/Package.php
@@ -119,7 +122,6 @@
%%DATADIR%%/PEAR/FixPHP5PEARWarnings.php
%%DATADIR%%/PEAR/REST.php
%%DATADIR%%/PEAR/Registry.php
-%%DATADIR%%/PEAR/Remote.php
%%DATADIR%%/PEAR/RunTest.php
%%DATADIR%%/PEAR/Task/Common.php
%%DATADIR%%/PEAR/Task/Postinstallscript/rw.php
@@ -134,6 +136,7 @@
%%DATADIR%%/PEAR/Validator/PECL.php
%%DATADIR%%/PEAR/XMLParser.php
%%DATADIR%%/PEAR.php
+%%DATADIR%%/PEAR5.php
%%DATADIR%%/Structures/Graph/Manipulator/AcyclicTest.php
%%DATADIR%%/Structures/Graph/Manipulator/TopologicalSorter.php
%%DATADIR%%/Structures/Graph/Node.php
@@ -142,13 +145,9 @@
%%DATADIR%%/data/PEAR/package.dtd
%%DATADIR%%/data/PEAR/template.spec
%%DATADIR%%/data/Structures_Graph/LICENSE
-%%DATADIR%%/data/Structures_Graph/genpackage.xml.pl
-%%DATADIR%%/data/Structures_Graph/package.sh
-%%DATADIR%%/data/Structures_Graph/publish.sh
%%DATADIR%%/pearcmd.php
%%DATADIR%%/peclcmd.php
-%%DATADIR%%/tests/Structures_Graph/tests/README
-%%DATADIR%%/tests/Structures_Graph/tests/all-tests.php
+%%DATADIR%%/tests/Structures_Graph/tests/AllTests.php
%%DATADIR%%/tests/Structures_Graph/tests/testCase/BasicGraph.php
@dirrm %%DOCSDIR%%/Archive_Tar/docs
@dirrm %%DOCSDIR%%/Archive_Tar
@@ -168,6 +167,7 @@
@dirrmtry share/pear/.channels/.alias
@dirrmtry share/pear/.channels
@dirrmtry share/pear/.registry/.channel.__uri
+ at dirrmtry share/pear/.registry/.channel.doc.php.net
@dirrmtry share/pear/.registry/.channel.pecl.php.net
@dirrmtry share/pear/.registry
@dirrm %%DATADIR%%/Archive
Property changes on: trunk/devel/pear/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list