<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/f4e636693fbfa24dbc8a9490ade888f52325827e">https://github.com/macports/macports-ports/commit/f4e636693fbfa24dbc8a9490ade888f52325827e</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 f4e636693fb arb: Don't break if PATH contains spaces
</span>f4e636693fb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f4e636693fbfa24dbc8a9490ade888f52325827e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed May 12 19:53:19 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> arb: Don't break if PATH contains spaces
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Backport an upstream changeset that eliminates an error if the user's
</span><span style='display:block; white-space:pre;color:#404040;'> PATH contains spaces.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62868
</span>---
science/arb/Portfile | 3 +-
science/arb/files/changeset_18439.diff | 154 +++++++++++++++++++++++++++++++++
science/arb/files/patch-ARB-arb.diff | 10 +--
3 files changed, 161 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/arb/Portfile b/science/arb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f14c7a90a52..b6c092a9754 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/arb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/arb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> name arb
epoch 2
version 6.0.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> checksums rmd160 3bc93a511a6eabb108e9811a3c66ea25182da19f \
sha256 8b1fc3fd11bbb05aca4731ac8803c004a4f2b6b87c11b543660d07ea349a6c21 \
size 13286019
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +68,7 @@ patchfiles patch-ARB-config.makefile.diff \
</span> patch-ARB-globalsosx.cpp.diff \
patch-ARB-intro.fig.diff \
patch-ARB-subfams.cpp.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ changeset_18439.diff \
</span> patch-ARB-arb.diff
platform darwin {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/arb/files/changeset_18439.diff b/science/arb/files/changeset_18439.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1b1734ba0cd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/arb/files/changeset_18439.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,154 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+improve error exit from script (kill self).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+protect functions vs. wrong use (check param 3 of addpath; deny param 3 for append and prepend).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+quote several expressions (to allow installation paths containing spaces)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+http://bugs.arb-home.de/changeset/18439
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- SH/arb (revision 18438)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ SH/arb (revision 18439)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,8 +3,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # set -x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# error message function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-err () {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "`basename $0`: $@" 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# error message function (nested exit):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++trap "exit 1" TERM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++export ARB_SCRIPT_PID=$$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++abort_script_with() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "`basename $0`: $@" 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kill -s TERM $ARB_SCRIPT_PID
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,5 +18,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ me="${BASH_SOURCE[0]}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # while me is symlink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- while [ -h "$me" ]; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while [ -h "$me" ]; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # change to directory where symlink "$me" resides
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "$(dirname "$me")"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,5 +39,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval value=\"\$\{$1:-\}\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$value" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *:$2:*|*:$2|$2:*|$2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *:${2}:*|*:${2}|${2}:*|${2})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result="$value"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,13 +47,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$3" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- p*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ prepend)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result="$2:${value}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ append)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result="${value}:$2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result="${value}:$2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ abort_script_with "addpath expects param 'append' or 'prepend'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- eval $1=$result
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ eval "$1=\"$result\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unset result value
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,4 +64,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # convenience routine which appends a string to a path.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append () {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ -n "${3:-}" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ abort_script_with too many arguments to append: "\$3=$3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addpath "$1" "$2" append
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,4 +72,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # convenience routine which prepends a string to a path.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prepend () {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ -n "${3:-}" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ abort_script_with too many arguments to prepend: "\$3=$3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addpath "$1" "$2" prepend
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,20 +101,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use ARBHOME defined by location of script (comment out for old behavior)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ARBHOME=$ARBHOME_OF_SCRIPT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ARBHOME="$ARBHOME_OF_SCRIPT"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Using ARBHOME='$ARBHOME'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-prepend PATH $ARBHOME/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-prepend LD_LIBRARY_PATH $ARBHOME/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++prepend PATH "$ARBHOME/bin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++prepend LD_LIBRARY_PATH "$ARBHOME/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append LD_LIBRARY_PATH /usr/dt/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append LD_LIBRARY_PATH /usr/openwin/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-append LD_LIBRARY_PATH $ARBHOME/lib/addlibs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-prepend SHLIB_PATH $ARBHOME/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-append SHLIB_PATH $ARBHOME/lib/addlibs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-append PYTHONPATH $ARBHOME/lib/python2.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-append PERl5LIB $ARBHOME/lib/perl5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++append LD_LIBRARY_PATH "$ARBHOME/lib/addlibs"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++prepend SHLIB_PATH "$ARBHOME/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++append SHLIB_PATH "$ARBHOME/lib/addlibs"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++append PYTHONPATH "$ARBHOME/lib/python2.6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++append PERl5LIB "$ARBHOME/lib/perl5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # environment variables that this shell script sets/changes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-export LD_LIBRARY_PATH MANPATH PATH ARBHOME SHLIB_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++export LD_LIBRARY_PATH MANPATH PATH ARBHOME SHLIB_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export PYTHONPATH PERL5LIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,5 +123,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export PWD HOME USER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ -x $ARBHOME/bin/ghostview ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ -x "$ARBHOME/bin/ghostview" ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GS_LIB="$ARBHOME/DEPOT/ghostscript"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export GS_LIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,17 +131,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ -z ${ARB_PROP:-} ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ARB_PROP=${HOME}/.arb_prop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ARB_PROP="${HOME}/.arb_prop"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Using properties from $ARB_PROP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ ! -d ${ARB_PROP} ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ ! -d "${ARB_PROP}" ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Directory ${ARB_PROP} not found - creating ..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkdir ${ARB_PROP}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkdir "${ARB_PROP}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export ARB_PROP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ARB_LOCAL_PTS=${HOME}/.arb_pts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ ! -d ${ARB_LOCAL_PTS} ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ARB_LOCAL_PTS="${HOME}/.arb_pts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ ! -d "${ARB_LOCAL_PTS}" ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Directory ${ARB_LOCAL_PTS} not found - creating ..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkdir ${ARB_LOCAL_PTS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkdir "${ARB_LOCAL_PTS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,16 +149,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARBMACROHOME="${ARB_PROP}/macros";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ ! -d ${ARBMACROHOME} ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ ! -d "${ARBMACROHOME}" ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Directory $ARBMACROHOME not found - creating ..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkdir ${ARBMACROHOME}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkdir "${ARBMACROHOME}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export ARBMACROHOME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ -z ${ARBMACRO:-} ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ -z "${ARBMACRO:-}" ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARBMACRO="$ARBHOME/lib/macros"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ ! -d ${ARBMACRO} ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ ! -d "${ARBMACRO}" ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Directory $ARBMACRO not found - creating ..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkdir ${ARBMACRO}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mkdir "${ARBMACRO}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export ARBMACRO
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/arb/files/patch-ARB-arb.diff b/science/arb/files/patch-ARB-arb.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b0b64b87290..19868bf35bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/arb/files/patch-ARB-arb.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/arb/files/patch-ARB-arb.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- SH/arb.orig 2016-08-22 05:27:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ SH/arb 2020-10-10 06:01:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,7 +89,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- SH/arb.orig 2021-05-12 19:46:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ SH/arb 2021-05-12 19:46:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,7 +100,7 @@
</span> fi
# use ARBHOME defined by location of script (comment out for old behavior)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--ARBHOME=$ARBHOME_OF_SCRIPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ARBHOME=$ARBHOME_OF_SCRIPT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ARBHOME="$ARBHOME_OF_SCRIPT"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ARBHOME="$ARBHOME_OF_SCRIPT"
</span>
echo "Using ARBHOME='$ARBHOME'"
</pre><pre style='margin:0'>
</pre>