<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/6a58738e13189efa31d5b4fef76a3dcc77628f1a">https://github.com/macports/macports-ports/commit/6a58738e13189efa31d5b4fef76a3dcc77628f1a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6a58738e13189efa31d5b4fef76a3dcc77628f1a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Mar 13 13:20:22 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> xterm: Specify template for mktemp
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64807
</span>---
x11/xterm/Portfile | 5 +-
x11/xterm/files/PR-7191532.patch | 5 +-
x11/xterm/files/TMPDIR.patch | 139 +++++++++++++++++++++++++++++++++++++++
3 files changed, 143 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xterm/Portfile b/x11/xterm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7557eee487e..617f0a56aa5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xterm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xterm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +32,8 @@ depends_lib port:ncurses \
</span> port:xorg-libXaw \
port:Xft2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles PR-7191532.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles PR-7191532.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TMPDIR.patch
</span>
configure.args --mandir=${prefix}/share/man --enable-luit \
--enable-logging --enable-wide-chars \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xterm/files/PR-7191532.patch b/x11/xterm/files/PR-7191532.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 384985be2ff..ab2355573eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xterm/files/PR-7191532.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xterm/files/PR-7191532.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naurp xterm-248.orig/main.h xterm-248/main.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xterm-248.orig/main.h 2009-03-28 10:39:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xterm-248/main.h 2009-09-16 14:40:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- main.h.orig 2009-03-28 10:39:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ main.h 2009-09-16 14:40:45.000000000 -0700
</span> @@ -200,7 +200,7 @@
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xterm/files/TMPDIR.patch b/x11/xterm/files/TMPDIR.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a33f90a026e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xterm/files/TMPDIR.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,139 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plink.sh.orig 2022-02-13 08:30:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plink.sh 2022-03-13 13:04:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,13 +44,15 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++: "${TMPDIR=/tmp}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while [ $# != 0 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ $ASNEED = no ] && [ -n "$LINKIT" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASNEED=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT=-Wl,-as-needed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- warned=`mktemp`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ warned=`mktemp "$TMPDIR/xterm.XXXXXXXX"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ trap "rm -f $warned; exit 1" 1 2 3 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ trap "rm -f $warned" 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( eval $LINKIT $OPT $NO_LTO "$@" >"$warned" 2>&1 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vttests/16colors.sh.orig 2022-02-13 08:33:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vttests/16colors.sh 2022-03-13 13:04:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMD='/bin/echo'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT='-n'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUF=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++: "${TMPDIR=/tmp}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { test ! -f $TMP || test -s $TMP; } &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for verb in "printf" "print" ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vttests/8colors.sh.orig 2022-02-13 08:42:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vttests/8colors.sh 2022-03-13 13:04:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMD='/bin/echo'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT='-n'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUF=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++: "${TMPDIR=/tmp}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { test ! -f $TMP || test -s $TMP; } &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for verb in "printf" "print" ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vttests/acolors.sh.orig 2022-02-13 08:34:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vttests/acolors.sh 2022-03-13 13:04:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMD='/bin/echo'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT='-n'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUF=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++: "${TMPDIR=/tmp}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { test ! -f $TMP || test -s $TMP; } &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for verb in "printf" "print" ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vttests/doublechars.sh.orig 2022-02-13 08:34:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vttests/doublechars.sh 2022-03-13 13:04:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMD='/bin/echo'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT='-n'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUF=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++: "${TMPDIR=/tmp}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { test ! -f $TMP || test -s $TMP; } &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for verb in "printf" "print" ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vttests/dynamic.sh.orig 2022-02-13 08:35:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vttests/dynamic.sh 2022-03-13 13:04:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMD='/bin/echo'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT='-n'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUF=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++: "${TMPDIR=/tmp}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { test ! -f $TMP || test -s $TMP; } &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for verb in "printf" "print" ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vttests/dynamic2.sh.orig 2022-02-13 08:35:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vttests/dynamic2.sh 2022-03-13 13:04:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMD='/bin/echo'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT='-n'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUF=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++: "${TMPDIR=/tmp}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { test ! -f $TMP || test -s $TMP; } &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for verb in "printf" "print" ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vttests/fonts.sh.orig 2022-02-13 08:35:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vttests/fonts.sh 2022-03-13 13:04:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMD='/bin/echo'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT='-n'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUF=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++: "${TMPDIR=/tmp}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { test ! -f $TMP || test -s $TMP; } &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for verb in "printf" "print" ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vttests/other-sgr.sh.orig 2022-02-13 08:36:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vttests/other-sgr.sh 2022-03-13 13:04:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMD='/bin/echo'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT='-n'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUF=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++: "${TMPDIR=/tmp}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { test ! -f $TMP || test -s $TMP; } &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for verb in "printf" "print" ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vttests/resize.sh.orig 2022-02-13 08:36:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vttests/resize.sh 2022-03-13 13:04:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMD='/bin/echo'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT='-n'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUF=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++: "${TMPDIR=/tmp}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { test ! -f $TMP || test -s $TMP; } &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for verb in "printf" "print" ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vttests/title.sh.orig 2022-02-13 08:36:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vttests/title.sh 2022-03-13 13:04:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMD='/bin/echo'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT='-n'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUF=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TMP=`(mktemp) 2>/dev/null` || TMP=/tmp/xterm$$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++: "${TMPDIR=/tmp}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TMP=`(mktemp "$TMPDIR/xterm.XXXXXXXX") 2>/dev/null` || TMP="$TMPDIR/xterm$$"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval '$CMD $OPT >$TMP || echo fail >$TMP' 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { test ! -f $TMP || test -s $TMP; } &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for verb in "printf" "print" ; do
</span></pre><pre style='margin:0'>
</pre>