Received: by mail.netbsd.org (Postfix, from userid 605) id 5E3DE84DF3; Mon, 30 Mar 2020 08:54:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D405584DF3 for ; Mon, 30 Mar 2020 08:54:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Uw14ighQ2LAI for ; Mon, 30 Mar 2020 08:54:13 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 44BE584DED for ; Mon, 30 Mar 2020 08:54:13 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1D830FB27; Mon, 30 Mar 2020 08:53:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1585558423213190" MIME-Version: 1.0 Date: Mon, 30 Mar 2020 08:53:43 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/devel/ncurses To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20200330085343.1D830FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1585558423213190 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Mon Mar 30 08:53:42 UTC 2020 Modified Files: pkgsrc/devel/ncurses: Makefile distinfo pkgsrc/devel/ncurses/patches: patch-misc_terminfo.src Log Message: ncurses: Apply Debian patch to fix tmux with screen-256color. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 pkgsrc/devel/ncurses/Makefile cvs rdiff -u -r1.43 -r1.44 pkgsrc/devel/ncurses/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ncurses/patches/patch-misc_terminfo.src Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1585558423213190 Content-Disposition: inline Content-Length: 2983 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/ncurses/Makefile diff -u pkgsrc/devel/ncurses/Makefile:1.108 pkgsrc/devel/ncurses/Makefile:1.109 --- pkgsrc/devel/ncurses/Makefile:1.108 Sat Mar 28 07:55:54 2020 +++ pkgsrc/devel/ncurses/Makefile Mon Mar 30 08:53:42 2020 @@ -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 Index: pkgsrc/devel/ncurses/distinfo diff -u pkgsrc/devel/ncurses/distinfo:1.43 pkgsrc/devel/ncurses/distinfo:1.44 --- pkgsrc/devel/ncurses/distinfo:1.43 Sat Mar 28 07:55:54 2020 +++ pkgsrc/devel/ncurses/distinfo Mon Mar 30 08:53:42 2020 @@ -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) = 4c1333dcc3 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 Index: pkgsrc/devel/ncurses/patches/patch-misc_terminfo.src diff -u pkgsrc/devel/ncurses/patches/patch-misc_terminfo.src:1.3 pkgsrc/devel/ncurses/patches/patch-misc_terminfo.src:1.4 --- pkgsrc/devel/ncurses/patches/patch-misc_terminfo.src:1.3 Sat Mar 28 07:55:55 2020 +++ pkgsrc/devel/ncurses/patches/patch-misc_terminfo.src Mon Mar 30 08:53:42 2020 @@ -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/ncur 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/ 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, --_----------=_1585558423213190--