<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bedfa167a7a985e43dd4e5cf79b06c5b00f07c8e">https://github.com/macports/macports-ports/commit/bedfa167a7a985e43dd4e5cf79b06c5b00f07c8e</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 bedfa167a7a xterm: manually define HAVE_NCURSES_TERM_H and HAVE_NCURSES_CURSES_H
</span>bedfa167a7a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bedfa167a7a985e43dd4e5cf79b06c5b00f07c8e
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Jul 2 10:35:00 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> xterm: manually define HAVE_NCURSES_TERM_H and HAVE_NCURSES_CURSES_H
</span>---
x11/xterm/Portfile | 17 ++---------------
x11/xterm/files/patch-xterm.h.diff | 14 ++++++++++++++
2 files changed, 16 insertions(+), 15 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 f1e32b0c689..8bcf6c0c359 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;'>@@ -34,7 +34,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:#e0ffe0;'>+patchfiles PR-7191532.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-xterm.h.diff
</span>
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,20 +46,6 @@ configure.args --mandir=${prefix}/share/man --enable-luit \
</span> --x-include=${prefix}/include --x-lib=${prefix}/lib \
--with-app-defaults=${prefix}/share/X11/app-defaults
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} > 19} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # add missing ncurses library to Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-lfontconfig|-lfontconfig -lncurses|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If -ltermcap stays in the LDFLAGS, xterm is linked against both
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /usr/lib's and ${prefix}/lib's libncurses.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-ltermcap|-lncurses|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url https://invisible-island.net/xterm/xterm.log.html
livecheck.regex "Patch #(\\d+)"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xterm/files/patch-xterm.h.diff b/x11/xterm/files/patch-xterm.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..83e636645b3
</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/patch-xterm.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/xterm.h.orig 2020-04-14 17:17:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/xterm.h 2020-07-02 10:26:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -184,6 +184,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAVE_NCURSES_TERM_H 1
</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;'>++#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAVE_NCURSES_TERM_H 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAVE_NCURSES_CURSES_H 1
</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;'>+ #ifdef __osf__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TTY_GROUP_NAME "terminal"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>