<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d888b4c3bdd82ce287bf06a7970913b3b925c2be">https://github.com/macports/macports-ports/commit/d888b4c3bdd82ce287bf06a7970913b3b925c2be</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d888b4c pear-1.0.tcl: Fix default quoting for MacPorts 2.5.4+
</span>d888b4c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d888b4c3bdd82ce287bf06a7970913b3b925c2be
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Oct 5 11:50:26 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> pear-1.0.tcl: Fix default quoting for MacPorts 2.5.4+
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/macports/macports-base/commit/8434c0eee6ba2867c09524697d6f95f3a095ddf0
</span>---
_resources/port1.0/group/pear-1.0.tcl | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/pear-1.0.tcl b/_resources/port1.0/group/pear-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index edddd77..4e46eb0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/pear-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/pear-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,6 +14,7 @@
</span>
# Args placed before the php or pear commands.
options pear.env
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.3] <= 0} {
</span> default pear.env {
"TZ=UTC \
HOME=${pear.installer} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,13 +28,35 @@ default pear.env {
</span> PHP_PEAR_TEST_DIR=${pear.installer}/pear/tests \
PHP_PEAR_SYSCONF_DIR=${pear.installer}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default pear.env {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TZ=UTC \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HOME=${pear.installer} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_PEAR_INSTALL_DIR=${pear.installer}/pear \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_PEAR_BIN_DIR=${pear.installer}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_PEAR_PHP_BIN=${pear.cmd-php} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_PEAR_CFG_DIR=${pear.installer}/pear/cfg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_PEAR_DOC_DIR=${pear.installer}/pear/docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_PEAR_DATA_DIR=${pear.installer}/pear/data \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_PEAR_WWW_DIR=${pear.installer}/pear/www \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_PEAR_TEST_DIR=${pear.installer}/pear/tests \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_PEAR_SYSCONF_DIR=${pear.installer}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# Args placed after php or pear commands.
options pear.configure.pre_args
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.3] <= 0} {
</span> default pear.configure.pre_args {
"-c ${pear.installer}/pear.conf \
-C ${pear.installer}/pear.conf"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default pear.configure.pre_args {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -c ${pear.installer}/pear.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -C ${pear.installer}/pear.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# Where we instruct pear to install our package.
options pear.destroot
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +100,11 @@ options pear.package
</span>
# Package file.
options pear.packagefile
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp [macports_version] 2.5.3] <= 0} {
</span> default pear.packagefile {"${distpath}/[lindex $distfiles 0]"}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default pear.packagefile {${distpath}/[lindex $distfiles 0]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
proc pear.setup {package_name package_version {package_channel "pear.php.net"}} {
global name extract.suffix version
</pre><pre style='margin:0'>
</pre>