summaryrefslogtreecommitdiff
path: root/devel/ncurses
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2020-03-30 08:53:42 +0000
committerjperkin <jperkin@pkgsrc.org>2020-03-30 08:53:42 +0000
commit347b43b0a2bc1834c586ae36cc9f8b9a8fb7e368 (patch)
treefedbb9ad5281b555eeee6831e697fc5955e96f4e /devel/ncurses
parentf714db04f1c78772eb1551428515be53e11e1ac8 (diff)
downloadpkgsrc-347b43b0a2bc1834c586ae36cc9f8b9a8fb7e368.tar.gz
ncurses: Apply Debian patch to fix tmux with screen-256color.
Bump PKGREVISION.
Diffstat (limited to 'devel/ncurses')
-rw-r--r--devel/ncurses/Makefile4
-rw-r--r--devel/ncurses/distinfo4
-rw-r--r--devel/ncurses/patches/patch-misc_terminfo.src13
3 files changed, 16 insertions, 5 deletions
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 11ecc631733..ee575903f50 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.108 2020/03/28 07:55:54 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2020/03/30 08:53:42 jperkin Exp $
.include "Makefile.common"
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= CRT screen handling and optimization package
diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo
index 395dd6cb389..854e3b145be 100644
--- a/devel/ncurses/distinfo
+++ b/devel/ncurses/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2020/03/28 07:55:54 wiz Exp $
+$NetBSD: distinfo,v 1.44 2020/03/30 08:53:42 jperkin Exp $
SHA1 (ncurses-6.2.tar.gz) = 56e410fb77f2b5501a0b2f6a995376f3cefe1097
RMD160 (ncurses-6.2.tar.gz) = bedfe81f33b3e55e44d14126c9c2821d7f222701
@@ -6,5 +6,5 @@ SHA512 (ncurses-6.2.tar.gz) = 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062b
Size (ncurses-6.2.tar.gz) = 3425862 bytes
SHA1 (patch-c++_Makefile.in) = 32611b5fe66df676f35c39212402b77d99ca8e19
SHA1 (patch-configure) = c0074d959a9981b3811519328f42a0c18a51c5a4
-SHA1 (patch-misc_terminfo.src) = 4efca9c426b3c2c4202775a50c51396189da7f8f
+SHA1 (patch-misc_terminfo.src) = d9eede4b159358f396693141ed9d9c2a76647917
SHA1 (patch-mk-1st.awk) = adf9d68ee565da80078cfcfa8969a4ef806d65de
diff --git a/devel/ncurses/patches/patch-misc_terminfo.src b/devel/ncurses/patches/patch-misc_terminfo.src
index 39c334696f2..9c188d7374b 100644
--- a/devel/ncurses/patches/patch-misc_terminfo.src
+++ b/devel/ncurses/patches/patch-misc_terminfo.src
@@ -1,4 +1,4 @@
-$NetBSD: patch-misc_terminfo.src,v 1.3 2020/03/28 07:55:55 wiz Exp $
+$NetBSD: patch-misc_terminfo.src,v 1.4 2020/03/30 08:53:42 jperkin Exp $
Many terminal emulators still do not support the "rep" capability, so
avoid it for maximum portability. Patch from OmniOS, see also
@@ -6,6 +6,9 @@ http://invisible-island.net/ncurses/ncurses.faq.html#xterm_generic
or
https://github.com/joyent/pkgsrc/issues/248
+Apply Debian patch for https://bugs.debian.org/933572, removing "rin"
+from screen-256color until tmux supports it correctly.
+
--- misc/terminfo.src.orig 2020-01-19 01:09:38.000000000 +0000
+++ misc/terminfo.src
@@ -4513,7 +4513,7 @@ xterm-xfree86|xterm terminal emulator (X
@@ -17,3 +20,11 @@ https://github.com/joyent/pkgsrc/issues/248
use=ecma+strikeout, use=xterm+keypad, use=vt420+lrmm,
use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
use=xterm-basic,
+@@ -7346,6 +7346,7 @@ screen-16color-bce-s|GNU Screen with 16
+
+ screen-256color|GNU Screen with 256 colors,
+ use=xterm+256setaf, use=screen4,
++ rin@,
+
+ screen-256color-s|GNU Screen with 256 colors and status line,
+ use=xterm+256setaf, use=screen-s,