<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9eaf826dc749bb2a2cef5294252df295d8e4cf34">https://github.com/macports/macports-ports/commit/9eaf826dc749bb2a2cef5294252df295d8e4cf34</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9eaf826dc749bb2a2cef5294252df295d8e4cf34
</span>Author: Keto <therealketo@gmail.com>
AuthorDate: Sun Sep 8 02:38:00 2024 -0400

<span style='display:block; white-space:pre;color:#404040;'>    screen: Use right `environ` for Apple
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Additionally, prevent breaking OSX 10.5 as well
</span>---
 sysutils/screen/Portfile                           |  7 ++++---
 sysutils/screen/files/patch-use-right-environ.diff | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/screen/Portfile b/sysutils/screen/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 53fb47c1b79..705d5dafb5e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/screen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/screen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,8 @@ checksums           ${distname}${extract.suffix} \
</span> 
 patchfiles          patch-apple-screen.diff \
                     patch-apple-window.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-tic.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-tic.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-use-right-environ.diff
</span> depends_lib         port:ncurses
 
 extract.only        ${distname}${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,9 +74,9 @@ platform darwin {
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 10} {
</span>     # Tiger lacks vproc.h and _CS_DARWIN_USER_TEMP_DIR, just nix the screen.c patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-delete patch-apple-screen.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-delete   patch-apple-screen.diff
</span> }
 
 notes "
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/screen/files/patch-use-right-environ.diff b/sysutils/screen/files/patch-use-right-environ.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c1a677a6c08
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/screen/files/patch-use-right-environ.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- screen.c.orig  2024-08-29 03:55:03.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ screen.c       2024-09-07 14:59:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +59,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "utmp.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "winmsg.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <crt_externs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define environ (*_NSGetEnviron())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char **environ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int           force_vt = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int           VBellWait;
</span></pre><pre style='margin:0'>

</pre>