screen: use right environ for Apple

barracuda156 · Sep 7, 2024 · bcce82a · bcce82a
1 parent b71e7b0
commit bcce82a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/sysutils/screen/Portfile b/sysutils/screen/Portfile
@@ -46,7 +46,8 @@ checksums ${distname}${extract.suffix} \
 
 patchfiles patch-apple-screen.diff \
  patch-apple-window.diff \
- patch-tic.diff
+ patch-tic.diff \
+ patch-use-right-environ.diff
 depends_lib-append port:ncurses
 
 extract.only ${distname}${extract.suffix}

diff --git a/sysutils/screen/files/patch-use-right-environ.diff b/sysutils/screen/files/patch-use-right-environ.diff
@@ -0,0 +1,15 @@
+--- screen.c.orig 2024-08-29 03:55:03.000000000 +0800
++++ screen.c 2024-09-07 14:59:55.000000000 +0800
+@@ -59,7 +59,12 @@
+ #include "utmp.h"
+ #include "winmsg.h"
+
++#ifdef __APPLE__
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#else
+ extern char **environ;
++#endif
+
+ int force_vt = 1;
+ int VBellWait;