CVS commit: pkgsrc/devel

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Feb 25 11:54:05 UTC 2019

Modified Files:
        pkgsrc/devel/ncurses: Makefile Makefile.common distinfo
        pkgsrc/devel/ncursesw: Makefile
Added Files:
        pkgsrc/devel/ncurses/patches: patch-misc_terminfo.src

Log Message:
ncurses: Disable xterm+rep for maximum portability.

Many terminal emulators still do not support this capability, resulting in
broken output.  Patch from OmniOS, bump PKGREVISIONs.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/devel/ncurses/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/ncurses/Makefile.common
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/ncurses/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ncurses/patches/patch-misc_terminfo.src
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/ncursesw/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ncurses/Makefile
diff -u pkgsrc/devel/ncurses/Makefile:1.101 pkgsrc/devel/ncurses/Makefile:1.102
--- pkgsrc/devel/ncurses/Makefile:1.101 Tue Feb 12 20:11:22 2019
+++ pkgsrc/devel/ncurses/Makefile       Mon Feb 25 11:54:05 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.101 2019/02/12 20:11:22 triaxx Exp $
+# $NetBSD: Makefile,v 1.102 2019/02/25 11:54:05 jperkin Exp $
 
 .include "Makefile.common"
-PKGREVISION=   4
+PKGREVISION=   5
 COMMENT=       CRT screen handling and optimization package
 
 INSTALLATION_DIRS+=    share/examples

Index: pkgsrc/devel/ncurses/Makefile.common
diff -u pkgsrc/devel/ncurses/Makefile.common:1.39 pkgsrc/devel/ncurses/Makefile.common:1.40
--- pkgsrc/devel/ncurses/Makefile.common:1.39   Thu Feb 14 22:59:49 2019
+++ pkgsrc/devel/ncurses/Makefile.common        Mon Feb 25 11:54:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2019/02/14 22:59:49 gutteridge Exp $
+# $NetBSD: Makefile.common,v 1.40 2019/02/25 11:54:05 jperkin Exp $
 #
 # used by devel/ncurses/Makefile
 # used by devel/ncursesw/Makefile
@@ -73,7 +73,6 @@ CONFIGURE_ENV+=               ac_cv_cxx_compiler_gnu=
 
 .if ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=       --disable-const
-TERMINFO_SRC=  ${WRKSRC}/misc/terminfo.src
 TERMINFODIR=   share/lib/terminfo
 .else
 TERMINFODIR=   share/terminfo

Index: pkgsrc/devel/ncurses/distinfo
diff -u pkgsrc/devel/ncurses/distinfo:1.35 pkgsrc/devel/ncurses/distinfo:1.36
--- pkgsrc/devel/ncurses/distinfo:1.35  Thu Oct 18 19:42:49 2018
+++ pkgsrc/devel/ncurses/distinfo       Mon Feb 25 11:54:05 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2018/10/18 19:42:49 leot Exp $
+$NetBSD: distinfo,v 1.36 2019/02/25 11:54:05 jperkin Exp $
 
 SHA1 (ncurses-6.1.tar.gz) = 57acf6bc24cacd651d82541929f726f4def780cc
 RMD160 (ncurses-6.1.tar.gz) = 938235f3922f9c6ef0f1081d643ecb2da1347a17
@@ -11,5 +11,6 @@ SHA1 (patch-aclocal.m4) = efb1a966687d2c
 SHA1 (patch-c++_Makefile.in) = 68ff81c719ec4aa13beb962cb66d7cd6749d7af5
 SHA1 (patch-configure.in) = 48a705b3f4de3a65c0c1c3648f5a24c5310ed3fa
 SHA1 (patch-misc_ncurses-config.in) = 43e4dc8abe85804513da1189aeffa5c7746ffcca
+SHA1 (patch-misc_terminfo.src) = 3423a09b0b6aac1139ab21f514c631ee8c36c2f7
 SHA1 (patch-ncurses_base_MKlib__gen.sh) = f8ce67fbd273529e4161a2820677d05a623fd527
 SHA1 (patch-ncurses_tinfo_parse__entry.c) = 06d2b52e84595f8acd47ad36ded7b7d5bec95b8a

Index: pkgsrc/devel/ncursesw/Makefile
diff -u pkgsrc/devel/ncursesw/Makefile:1.18 pkgsrc/devel/ncursesw/Makefile:1.19
--- pkgsrc/devel/ncursesw/Makefile:1.18 Wed Oct 24 16:58:38 2018
+++ pkgsrc/devel/ncursesw/Makefile      Mon Feb 25 11:54:05 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2018/10/24 16:58:38 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2019/02/25 11:54:05 jperkin Exp $
 
 .include "../../devel/ncurses/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/ncurses/ncursesw/}
 COMMENT=       Wide character CRT screen handling and optimization package
-PKGREVISION=   2
+PKGREVISION=   3
 
 PATCHDIR=      ${.CURDIR}/../../devel/ncurses/patches
 DISTINFO_FILE= ${.CURDIR}/../../devel/ncurses/distinfo

Added files:

Index: pkgsrc/devel/ncurses/patches/patch-misc_terminfo.src
diff -u /dev/null pkgsrc/devel/ncurses/patches/patch-misc_terminfo.src:1.1
--- /dev/null   Mon Feb 25 11:54:06 2019
+++ pkgsrc/devel/ncurses/patches/patch-misc_terminfo.src        Mon Feb 25 11:54:05 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-misc_terminfo.src,v 1.1 2019/02/25 11:54:05 jperkin Exp $
+
+Many terminal emulators still do not support the "rep" capability, so
+avoid it for maximum portability.  Patch from OmniOS, see also
+http://invisible-island.net/ncurses/ncurses.faq.html#xterm_generic
+
+--- misc/terminfo.src.orig     2018-01-27 15:14:08.000000000 +0000
++++ misc/terminfo.src
+@@ -4328,7 +4328,7 @@ xterm-xfree86|xterm terminal emulator (X
+ xterm-new|modern xterm terminal emulator,
+       npc,
+       indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM,
+-      rin=\E[%p1%dT, use=ansi+rep, use=ecma+strikeout,
++      rin=\E[%p1%dT, use=ecma+strikeout,
+       use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
+       use=xterm-basic,
+