From 31654e18512f2c8751cc90413b9dadb17f3a71ed Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 1 Apr 2016 18:46:06 +0000 Subject: [PATCH] Switch pear to a newer version. We previously used a tarball with a slightly modified version of the go-pear php script but this was awkward to generate and newer versions no longer support recent PHP. So instead I have changed to using an unmodified go-pear.phar archive (mirrored to include a version number, but there are no changes to the upstream file). go-pear.phar is normally interactive and doesn't allow presetting parameters or just piping a simple list of answers, so I am driving it with Expect.pm instead. Some bumps/updates to follow as XML-Util moved to the main pear distro. ok robert@ --- www/pear/Makefile | 33 ++- www/pear/Makefile.pear | 5 +- www/pear/distinfo | 4 +- .../patch-var_www_pear_lib_PEAR_Config_php | 18 +- www/pear/files/run-go-pear | 40 ++++ www/pear/patches/patch-go-pear | 193 ------------------ www/pear/pkg/PLIST-main | 46 ++++- www/pear/pkg/PLIST-utils | 41 +--- 8 files changed, 116 insertions(+), 264 deletions(-) create mode 100644 www/pear/files/run-go-pear delete mode 100644 www/pear/patches/patch-go-pear diff --git a/www/pear/Makefile b/www/pear/Makefile index 6ef08d5bee0..d58aec6a912 100644 --- a/www/pear/Makefile +++ b/www/pear/Makefile @@ -1,15 +1,17 @@ -# $OpenBSD: Makefile,v 1.23 2015/12/03 21:24:32 sthen Exp $ +# $OpenBSD: Makefile,v 1.24 2016/04/01 18:46:06 sthen Exp $ COMMENT-main= base classes for common PHP tasks COMMENT-utils= utilities for managing pear extensions -VERSION= 1.9.5 -DISTNAME= pear-${VERSION} -PKGNAME-main= ${DISTNAME} +VERSION= 1.10.1 +DISTNAME= go-pear-${VERSION} +PKGNAME= pear-${VERSION} +EXTRACT_SUFX= .phar +EXTRACT_ONLY= +PKGNAME-main= pear-${VERSION} PKGNAME-utils= pear-utils-${VERSION} +WRKDIST= ${WRKDIR} CATEGORIES= www devel -REVISION-main= 0 -REVISION-utils= 1 HOMEPAGE= http://pear.php.net/ MASTER_SITES= https://spacehopper.org/mirrors/ @@ -28,23 +30,18 @@ RUN_DEPENDS-main= www/pear,-utils PREFIX-main= ${VARBASE}/www PREFIX-utils= /usr/local -NO_BUILD= Yes NO_TEST= Yes +BUILD_DEPENDS= devel/p5-Expect SUBST_VARS= MODPHP_BIN -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 - @perl -pi -e "s,%%TMPDIR%%,${TMPDIR}/go-pear,g" ${WRKSRC}/go-pear +do-extract: + cp ${FULLDISTDIR}/${DISTFILES} ${WRKSRC}/go-pear.phar + +do-build: + cd ${WRKSRC}; perl ${FILESDIR}/run-go-pear ${WRKINST} ${PREFIX} ${MODPHP_BIN} 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/ - @rm -rf ${WRKINST}${PREFIX-main}/share ${WRKINST}${PREFIX-main}/etc - @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" {} \; @@ -56,5 +53,7 @@ do-install: ${WRKINST}${PREFIX-main}/pear/lib/PEAR/Config.php @touch ${WRKINST}${PREFIX-main}/pear/.lock @touch ${WRKINST}${PREFIX-main}/pear/lib/.lock + @rm ${PREFIX}/bin/{pear,peardev,pecl}{.beforesubst,.orig}* + @rmdir ${WRKINST}${PREFIX-main}/pear/{cfg,htdocs} .include diff --git a/www/pear/Makefile.pear b/www/pear/Makefile.pear index c7b0649fecc..d6653684ff1 100644 --- a/www/pear/Makefile.pear +++ b/www/pear/Makefile.pear @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.pear,v 1.3 2008/10/26 15:20:51 robert Exp $ +# $OpenBSD: Makefile.pear,v 1.4 2016/04/01 18:46:06 sthen Exp $ # Default Makefile to install a PHP PEAR module default: @@ -6,7 +6,8 @@ default: install: cp ${WRKDIR}/package.xml ${.CURDIR} mkdir -p ${PREFIX}/lib/php - ${LOCALBASE}/bin/pear install -f -n -R ${WRKINST} -n ${.CURDIR}/package.xml + env PHP_PEAR_METADATA_DIR=/var/www/pear/lib ${LOCALBASE}/bin/pear \ + install -f -n -R ${WRKINST} -n ${.CURDIR}/package.xml # These directories and files are not needed @cd ${WRKINST}/var/www/pear && rm -rf cache lib/.channels lib/.channels/__uri.reg \ diff --git a/www/pear/distinfo b/www/pear/distinfo index af7999263e7..fb9f0f24d71 100644 --- a/www/pear/distinfo +++ b/www/pear/distinfo @@ -1,2 +1,2 @@ -SHA256 (pear-1.9.5.tar.gz) = Vk//9+sDzjTZhSxGqYIBNFxZyariUm+Ag7656g/KLho= -SIZE (pear-1.9.5.tar.gz) = 425451 +SHA256 (go-pear-1.10.1.phar) = N4N0DE8jSZGSRavXVnUPWHkka1A8VhZZzGRInwtDxYI= +SIZE (go-pear-1.10.1.phar) = 3566292 diff --git a/www/pear/files/patch-var_www_pear_lib_PEAR_Config_php b/www/pear/files/patch-var_www_pear_lib_PEAR_Config_php index 11bcac6a93e..464551c0526 100644 --- a/www/pear/files/patch-var_www_pear_lib_PEAR_Config_php +++ b/www/pear/files/patch-var_www_pear_lib_PEAR_Config_php @@ -1,7 +1,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 @@ +$OpenBSD: patch-var_www_pear_lib_PEAR_Config_php,v 1.3 2016/04/01 18:46:06 sthen Exp $ +--- var/www/pear/lib/PEAR/Config.php.orig Wed Mar 30 22:25:04 2016 ++++ var/www/pear/lib/PEAR/Config.php Wed Mar 30 22:25:05 2016 +@@ -79,11 +79,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 { @@ -13,8 +13,8 @@ $OpenBSD: patch-var_www_pear_lib_PEAR_Config_php,v 1.2 2011/11/16 13:29:13 rober + define('PEAR_CONFIG_DEFAULT_PHP_DIR', '/var/www/pear'.'/lib'); } - // Default for ext_dir -@@ -107,8 +103,7 @@ + // Default for metadata_dir +@@ -113,8 +109,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 { @@ -24,7 +24,7 @@ $OpenBSD: patch-var_www_pear_lib_PEAR_Config_php,v 1.2 2011/11/16 13:29:13 rober } // Default for bin_dir -@@ -122,8 +117,7 @@ +@@ -128,8 +123,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 { @@ -34,7 +34,7 @@ $OpenBSD: patch-var_www_pear_lib_PEAR_Config_php,v 1.2 2011/11/16 13:29:13 rober } // Default for cfg_dir -@@ -146,8 +140,7 @@ +@@ -164,8 +158,7 @@ if (getenv('PHP_PEAR_MAN_DIR')) { if (getenv('PHP_PEAR_TEST_DIR')) { define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR')); } else { @@ -44,7 +44,7 @@ $OpenBSD: patch-var_www_pear_lib_PEAR_Config_php,v 1.2 2011/11/16 13:29:13 rober } // Default for temp_dir -@@ -224,9 +217,7 @@ +@@ -242,9 +235,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 { diff --git a/www/pear/files/run-go-pear b/www/pear/files/run-go-pear new file mode 100644 index 00000000000..d0879cedaa6 --- /dev/null +++ b/www/pear/files/run-go-pear @@ -0,0 +1,40 @@ +#!/usr/bin/perl -W + +use Cwd; +use Expect; + +my $wrkinst = shift; +my $prefix = $wrkinst . shift; +my $varwww = $wrkinst . '/var/www'; +my $phpbin = shift; +my $spawn = new Expect; + +$spawn = Expect->spawn("$phpbin -d suhosin.executor.include.whitelist=phar go-pear.phar"); +$spawn->log_file("/tmp/go-pear.log.$$"); + +my $ret = $spawn->expect( + 10, + '-re', "^1-12, 'all' or Enter", sub { $spawn->send("all\n"); } +); + +$ret = $spawn->expect( + 10, + '-re', "^Installation base", sub { $spawn->send("$prefix\n"); exp_continue; }, + '-re', "^Temporary dir", sub { $spawn->send(cwd."/tmp\n"); exp_continue; }, + '-re', "^Binaries dir", sub { $spawn->send("\n"); exp_continue; }, + '-re', "^PHP code dir", sub { $spawn->send("$varwww/pear/lib\n"); exp_continue; }, + '-re', "^Documentation dir", sub { $spawn->send("$prefix/share/doc/pear\n"); exp_continue; }, + '-re', "^Data dir", sub { $spawn->send("$varwww/pear/data\n"); exp_continue; }, + '-re', "^User-modifiable config", sub { $spawn->send("$varwww/pear/cfg\n"); exp_continue; }, + '-re', "^Public Web Files dir", sub { $spawn->send("$varwww/pear/htdocs\n"); exp_continue; }, + '-re', "^System manual pages", sub { $spawn->send("$prefix/man\n"); exp_continue; }, + '-re', "^Tests dir", sub { $spawn->send("$varwww/pear/tests\n"); exp_continue; }, + '-re', "^Name of config", sub { $spawn->send(cwd."/tmp.pearrc\n"); exp_continue; }, + '-re', "^1-12, 'all' or Enter", sub { $spawn->send("\n"); exp_continue; }, + '-re', "^Would you like to alter php.ini", sub { $spawn->send("n\n"); exp_continue; }, + '-re', "^Press Enter to continue:", sub { $spawn->send("\n"); } +); + +print "\n...done...\n"; + +exit; diff --git a/www/pear/patches/patch-go-pear b/www/pear/patches/patch-go-pear deleted file mode 100644 index fd74ba55d6e..00000000000 --- a/www/pear/patches/patch-go-pear +++ /dev/null @@ -1,193 +0,0 @@ -$OpenBSD: patch-go-pear,v 1.4 2014/10/30 11:57:59 sthen Exp $ ---- go-pear.orig Wed Oct 29 14:15:56 2014 -+++ go-pear Wed Oct 29 14:16:09 2014 -@@ -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'); - -@@ -294,6 +295,7 @@ If you wish to abort, press Control-C now, or press En - $http_proxy = $tmp; - } - } -+*/ - - $origpwd = getcwd(); - -@@ -346,6 +348,7 @@ we strongly recommand to use it. - } - } - -+/* - while (!WEBINSTALLER) { - print " - Below is a suggested file layout for your new PEAR installation. To -@@ -428,6 +431,7 @@ If you have a CLI (or CGI) php.exe available, we stron - } - } - } -+*/ - - #### - # Installation stuff -@@ -562,6 +566,7 @@ if (WEBINSTALLER) { - } - } - -+/* - if (!WEBINSTALLER) { - $msg = "The following PEAR packages are bundled with PHP: " . - implode(', ', array_keys($pfc_packages)); -@@ -571,17 +576,19 @@ if (!WEBINSTALLER) { - $install_optional_packages = array(); - print "\n"; - } -+*/ - - #### - # Download - #### - - 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'); -@@ -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, 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 { -- $config = &PEAR_Config::singleton(); -+ $config = &PEAR_Config::singleton($prefix."/etc/pear.conf", ''); - } - - -@@ -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) { -@@ -980,6 +992,8 @@ if ( WINDOWS ) { - if (WINDOWS && !WEBINSTALLER) { - win32CreateRegEnv(); - } -+*/ -+ - // Set of functions following - /** - * Parse the given dirname -@@ -1418,19 +1432,18 @@ function detect_install_dirs($_prefix = null) { - } - } else { - if ($_prefix === null) { -- #$prefix = dirname(PHP_BINDIR); -- $prefix = dirname(__FILE__); -+ $prefix = '%%PREFIX%%'; - } else { - $prefix = $_prefix; - } - $bin_dir = '$prefix/bin'; - #$php_dir = '$prefix/share/pear'; -- $php_dir = '$prefix/PEAR'; -- $doc_dir = '$php_dir/docs'; -- $data_dir = '$php_dir/data'; -- $test_dir = '$php_dir/tests'; -- $temp_dir = '$prefix/temp'; -- -+ $php_dir = '$prefix/pear/lib'; -+ $doc_dir = '$prefix/share/doc/pear'; -+ $data_dir = '$prefix/pear/data'; -+ $test_dir = '$prefix/pear/tests'; -+ $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'; -@@ -1442,6 +1455,7 @@ function detect_install_dirs($_prefix = null) { - } elseif (@is_dir("$prefix/share/php/.registry")) { - $php_dir = '$prefix/share/php'; - } -+*/ - } - } - diff --git a/www/pear/pkg/PLIST-main b/www/pear/pkg/PLIST-main index 4300893fd45..1f49ec14574 100644 --- a/www/pear/pkg/PLIST-main +++ b/www/pear/pkg/PLIST-main @@ -1,7 +1,9 @@ -@comment $OpenBSD: PLIST-main,v 1.5 2011/12/20 15:21:30 giovanni Exp $ +@comment $OpenBSD: PLIST-main,v 1.6 2016/04/01 18:46:06 sthen Exp $ @conflict php5-pear-* @conflict php4-pear-* +@conflict pear-XML-Util-* @pkgpath www/php5/core,-pear +@pkgpath textproc/pear-XML-Util @group daemon pear/ pear/.lock @@ -9,8 +11,6 @@ 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/lib/ pear/lib/.channels/ pear/lib/.channels/.alias/ @@ -32,6 +32,7 @@ pear/lib/.registry/archive_tar.reg pear/lib/.registry/console_getopt.reg pear/lib/.registry/pear.reg pear/lib/.registry/structures_graph.reg +pear/lib/.registry/xml_util.reg pear/lib/Archive/ pear/lib/Archive/Tar.php pear/lib/Console/ @@ -80,7 +81,6 @@ 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 @@ -97,6 +97,8 @@ pear/lib/PEAR/Installer/Role/Doc.php pear/lib/PEAR/Installer/Role/Doc.xml pear/lib/PEAR/Installer/Role/Ext.php pear/lib/PEAR/Installer/Role/Ext.xml +pear/lib/PEAR/Installer/Role/Man.php +pear/lib/PEAR/Installer/Role/Man.xml pear/lib/PEAR/Installer/Role/Php.php pear/lib/PEAR/Installer/Role/Php.xml pear/lib/PEAR/Installer/Role/Script.php @@ -146,7 +148,6 @@ 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 @@ -155,11 +156,42 @@ pear/lib/Structures/Graph/Manipulator/AcyclicTest.php pear/lib/Structures/Graph/Manipulator/TopologicalSorter.php pear/lib/Structures/Graph/Node.php pear/lib/System.php +pear/lib/XML/ +pear/lib/XML/Util.php pear/lib/pearcmd.php pear/lib/peclcmd.php pear/tests/ +pear/tests/Console_Getopt/ +pear/tests/Console_Getopt/tests/ +pear/tests/Console_Getopt/tests/001-getopt.phpt +pear/tests/Console_Getopt/tests/bug10557.phpt +pear/tests/Console_Getopt/tests/bug11068.phpt +pear/tests/Console_Getopt/tests/bug13140.phpt pear/tests/Structures_Graph/ pear/tests/Structures_Graph/tests/ +pear/tests/Structures_Graph/tests/AcyclicTestTest.php pear/tests/Structures_Graph/tests/AllTests.php -pear/tests/Structures_Graph/tests/testCase/ -pear/tests/Structures_Graph/tests/testCase/BasicGraph.php +pear/tests/Structures_Graph/tests/BasicGraphTest.php +pear/tests/Structures_Graph/tests/TopologicalSorterTest.php +pear/tests/Structures_Graph/tests/helper.inc +pear/tests/XML_Util/ +pear/tests/XML_Util/tests/ +pear/tests/XML_Util/tests/testBasic_apiVersion.phpt +pear/tests/XML_Util/tests/testBasic_attributesToString.phpt +pear/tests/XML_Util/tests/testBasic_collapseEmptyTags.phpt +pear/tests/XML_Util/tests/testBasic_createCDataSection.phpt +pear/tests/XML_Util/tests/testBasic_createComment.phpt +pear/tests/XML_Util/tests/testBasic_createEndElement.phpt +pear/tests/XML_Util/tests/testBasic_createStartElement.phpt +pear/tests/XML_Util/tests/testBasic_createTag.phpt +pear/tests/XML_Util/tests/testBasic_createTagFromArray.phpt +pear/tests/XML_Util/tests/testBasic_getDocTypeDeclaration.phpt +pear/tests/XML_Util/tests/testBasic_getXmlDeclaration.phpt +pear/tests/XML_Util/tests/testBasic_isValidName.phpt +pear/tests/XML_Util/tests/testBasic_raiseError.phpt +pear/tests/XML_Util/tests/testBasic_replaceEntities.phpt +pear/tests/XML_Util/tests/testBasic_reverseEntities.phpt +pear/tests/XML_Util/tests/testBasic_splitQualifiedName.phpt +pear/tests/XML_Util/tests/testBug_18343.phpt +pear/tests/XML_Util/tests/testBug_4950.phpt +pear/tests/XML_Util/tests/testBug_5392.phpt diff --git a/www/pear/pkg/PLIST-utils b/www/pear/pkg/PLIST-utils index 7d4d305c031..3ed89522e4a 100644 --- a/www/pear/pkg/PLIST-utils +++ b/www/pear/pkg/PLIST-utils @@ -1,18 +1,9 @@ -@comment $OpenBSD: PLIST-utils,v 1.4 2011/11/16 13:29:14 robert Exp $ +@comment $OpenBSD: PLIST-utils,v 1.5 2016/04/01 18:46:06 sthen 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/ @@ -20,32 +11,14 @@ 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/PEAR/README.rst share/doc/pear/Structures_Graph/ +share/doc/pear/Structures_Graph/LICENSE share/doc/pear/Structures_Graph/docs/ -share/doc/pear/Structures_Graph/docs/generate.sh -share/doc/pear/Structures_Graph/docs/html/ -share/doc/pear/Structures_Graph/docs/html/Structures_Graph/ -share/doc/pear/Structures_Graph/docs/html/Structures_Graph/Structures_Graph.html -share/doc/pear/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Manipulator_AcyclicTest.html -share/doc/pear/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Manipulator_TopologicalSorter.html -share/doc/pear/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Node.html -share/doc/pear/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Manipulator_AcyclicTest_php.html -share/doc/pear/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Manipulator_TopologicalSorter_php.html -share/doc/pear/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Node_php.html -share/doc/pear/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_php.html -share/doc/pear/Structures_Graph/docs/html/Structures_Graph/tutorial_Structures_Graph.pkg.html -share/doc/pear/Structures_Graph/docs/html/classtrees_Structures_Graph.html -share/doc/pear/Structures_Graph/docs/html/elementindex.html -share/doc/pear/Structures_Graph/docs/html/elementindex_Structures_Graph.html -share/doc/pear/Structures_Graph/docs/html/errors.html -share/doc/pear/Structures_Graph/docs/html/index.html -share/doc/pear/Structures_Graph/docs/html/li_Structures_Graph.html -share/doc/pear/Structures_Graph/docs/html/media/ -share/doc/pear/Structures_Graph/docs/html/media/banner.css -share/doc/pear/Structures_Graph/docs/html/media/stylesheet.css -share/doc/pear/Structures_Graph/docs/html/packages.html -share/doc/pear/Structures_Graph/docs/html/todolist.html share/doc/pear/Structures_Graph/docs/tutorials/ share/doc/pear/Structures_Graph/docs/tutorials/Structures_Graph/ share/doc/pear/Structures_Graph/docs/tutorials/Structures_Graph/Structures_Graph.pkg +share/doc/pear/XML_Util/ +share/doc/pear/XML_Util/examples/ +share/doc/pear/XML_Util/examples/example.php +share/doc/pear/XML_Util/examples/example2.php