Date: Wed, 3 Sep 2014 10:40:52 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367185 - in head/archivers/pear-Horde_Pack: . files Message-ID: <201409031040.s83AeqpG054709@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Wed Sep 3 10:40:51 2014 New Revision: 367185 URL: http://svnweb.freebsd.org/changeset/ports/367185 QAT: https://qat.redports.org/buildarchive/r367185/ Log: Workaround for broken FilesystemIterator class in recent 10-stable Added: head/archivers/pear-Horde_Pack/files/ head/archivers/pear-Horde_Pack/files/patch-Horde_Pack-1.0.3__lib__Horde_Pack.php (contents, props changed) head/archivers/pear-Horde_Pack/files/patch-package.xml (contents, props changed) Modified: head/archivers/pear-Horde_Pack/Makefile Modified: head/archivers/pear-Horde_Pack/Makefile ============================================================================== --- head/archivers/pear-Horde_Pack/Makefile Wed Sep 3 10:14:35 2014 (r367184) +++ head/archivers/pear-Horde_Pack/Makefile Wed Sep 3 10:40:51 2014 (r367185) @@ -2,6 +2,7 @@ PORTNAME= Horde_Pack PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= archivers www pear PKGNAMEPREFIX= pear- @@ -11,6 +12,8 @@ COMMENT= Horde Pack Utility USE_HORDE_RUN= Horde_Compress_Fast \ Horde_Exception +PATCH_WRKSRC= ${WRKDIR} + .include <bsd.port.pre.mk> .include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" .include <bsd.port.post.mk> Added: head/archivers/pear-Horde_Pack/files/patch-Horde_Pack-1.0.3__lib__Horde_Pack.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/pear-Horde_Pack/files/patch-Horde_Pack-1.0.3__lib__Horde_Pack.php Wed Sep 3 10:40:51 2014 (r367185) @@ -0,0 +1,26 @@ +--- Horde_Pack-1.0.3/lib/Horde/Pack.php.orig 2014-09-03 12:17:27.201458631 +0200 ++++ Horde_Pack-1.0.3/lib/Horde/Pack.php 2014-09-03 12:19:10.869687370 +0200 +@@ -49,18 +49,19 @@ + public function __construct() + { + if (empty(self::$_drivers)) { +- $fi = new FilesystemIterator(__DIR__ . '/Pack/Driver'); + $class_prefix = __CLASS__ . '_Driver_'; + +- foreach ($fi as $val) { +- if ($val->isFile()) { +- $cname = $class_prefix . $val->getBasename('.php'); ++ $handle = opendir(__DIR__ . '/Pack/Driver'); ++ while ($val = readdir($handle)) { ++ if (is_file(__DIR__ . '/Pack/Driver/' . $val)) { ++ $cname = $class_prefix . basename($val,'.php'); + if (class_exists($cname) && $cname::supported()) { + $ob = new $cname(); + self::$_drivers[$ob->id] = $ob; + } + } + } ++ closedir($handle); + + krsort(self::$_drivers, SORT_NUMERIC); + Added: head/archivers/pear-Horde_Pack/files/patch-package.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/pear-Horde_Pack/files/patch-package.xml Wed Sep 3 10:40:51 2014 (r367185) @@ -0,0 +1,11 @@ +--- package.xml.bak 2014-09-03 12:17:12.089477176 +0200 ++++ package.xml 2014-09-03 12:20:36.548435330 +0200 +@@ -35,7 +35,7 @@ + <file baseinstalldir="/" md5sum="c5ee864bfd2d2b866d82bf6f942743ad" name="lib/Horde/Pack/Autodetermine.php" role="php" /> + <file baseinstalldir="/" md5sum="c5d6ea0030d659ee75755f5a14bf9153" name="lib/Horde/Pack/Driver.php" role="php" /> + <file baseinstalldir="/" md5sum="70194aa896444794e78e6b85d6f3d1ec" name="lib/Horde/Pack/Exception.php" role="php" /> +- <file baseinstalldir="/" md5sum="6930e9f26cb49ac7eae3acce808d07cb" name="lib/Horde/Pack.php" role="php" /> ++ <file baseinstalldir="/" md5sum="13838721e5bf193fa12735c737e52deb" name="lib/Horde/Pack.php" role="php" /> + <file baseinstalldir="/" md5sum="cb37ee0c475c196a91fed183ca326ff7" name="test/Horde/Pack/Driver/IgbinaryTest.php" role="test" /> + <file baseinstalldir="/" md5sum="1b1d681efa25b37cc51a2e322874d2e1" name="test/Horde/Pack/Driver/JsonTest.php" role="test" /> + <file baseinstalldir="/" md5sum="b1176a21c9c2fb833dae0e1b07df8d97" name="test/Horde/Pack/Driver/MsgpackserializeTest.php" role="test" />
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409031040.s83AeqpG054709>