Mon Feb 25 11:54:05 2019 UTC ()
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.


(jperkin)
diff -r1.101 -r1.102 pkgsrc/devel/ncurses/Makefile
diff -r1.39 -r1.40 pkgsrc/devel/ncurses/Makefile.common
diff -r1.35 -r1.36 pkgsrc/devel/ncurses/distinfo
diff -r0 -r1.1 pkgsrc/devel/ncurses/patches/patch-misc_terminfo.src
diff -r1.18 -r1.19 pkgsrc/devel/ncursesw/Makefile
cvs diff -r1.101 -r1.102 pkgsrc/devel/ncurses/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/Makefile 2019/02/12 20:11:22 1.101
+++ pkgsrc/devel/ncurses/Makefile 2019/02/25 11:54:05 1.102
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.101 2019/02/12 20:11:22 triaxx Exp $ 1# $NetBSD: Makefile,v 1.102 2019/02/25 11:54:05 jperkin Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4PKGREVISION= 4 4PKGREVISION= 5
5COMMENT= CRT screen handling and optimization package 5COMMENT= CRT screen handling and optimization package
6 6
7INSTALLATION_DIRS+= share/examples 7INSTALLATION_DIRS+= share/examples
8 8
9PLIST_SRC= ${PKGDIR}/PLIST ${WRKDIR}/PLIST.terminfo 9PLIST_SRC= ${PKGDIR}/PLIST ${WRKDIR}/PLIST.terminfo
10 10
11post-configure: 11post-configure:
12 cd ${WRKSRC}/man; \ 12 cd ${WRKSRC}/man; \
13 for f in *.1m; do \ 13 for f in *.1m; do \
14 mv -f $${f} `${BASENAME} $${f} .1m`.1; \ 14 mv -f $${f} `${BASENAME} $${f} .1m`.1; \
15 done; \ 15 done; \
16 for f in *.3x; do \ 16 for f in *.3x; do \
17 mv -f $${f} `${BASENAME} $${f} .3x`.3; \ 17 mv -f $${f} `${BASENAME} $${f} .3x`.3; \
cvs diff -r1.39 -r1.40 pkgsrc/devel/ncurses/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/Makefile.common 2019/02/14 22:59:49 1.39
+++ pkgsrc/devel/ncurses/Makefile.common 2019/02/25 11:54:05 1.40
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.39 2019/02/14 22:59:49 gutteridge Exp $ 1# $NetBSD: Makefile.common,v 1.40 2019/02/25 11:54:05 jperkin Exp $
2# 2#
3# used by devel/ncurses/Makefile 3# used by devel/ncurses/Makefile
4# used by devel/ncursesw/Makefile 4# used by devel/ncursesw/Makefile
5 5
6DISTNAME= ncurses-${NC_VERS} 6DISTNAME= ncurses-${NC_VERS}
7NC_VERS= 6.1 7NC_VERS= 6.1
8CATEGORIES= devel 8CATEGORIES= devel
9MASTER_SITES= ${MASTER_SITE_GNU:=ncurses/} 9MASTER_SITES= ${MASTER_SITE_GNU:=ncurses/}
10MASTER_SITES+= ftp://dickey.his.com/ncurses/ 10MASTER_SITES+= ftp://dickey.his.com/ncurses/
11MASTER_SITES+= ftp://dickey.his.com/ncurses/${NC_VERS}/ 11MASTER_SITES+= ftp://dickey.his.com/ncurses/${NC_VERS}/
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://invisible-island.net/ncurses/ncurses.html 14HOMEPAGE= http://invisible-island.net/ncurses/ncurses.html
@@ -63,27 +63,26 @@ CONFIGURE_ARGS+= --without-manpage-tbl @@ -63,27 +63,26 @@ CONFIGURE_ARGS+= --without-manpage-tbl
63. endif 63. endif
64.endif 64.endif
65 65
66.include "../../mk/compiler.mk" 66.include "../../mk/compiler.mk"
67 67
68# Fix build under FreeBSD 10.2 68# Fix build under FreeBSD 10.2
69.if !empty(PKGSRC_COMPILER:Mclang) 69.if !empty(PKGSRC_COMPILER:Mclang)
70CONFIGURE_ENV+= ac_cv_c_compiler_gnu=no 70CONFIGURE_ENV+= ac_cv_c_compiler_gnu=no
71CONFIGURE_ENV+= ac_cv_cxx_compiler_gnu=no 71CONFIGURE_ENV+= ac_cv_cxx_compiler_gnu=no
72.endif 72.endif
73 73
74.if ${OPSYS} == "SunOS" 74.if ${OPSYS} == "SunOS"
75CONFIGURE_ARGS+= --disable-const 75CONFIGURE_ARGS+= --disable-const
76TERMINFO_SRC= ${WRKSRC}/misc/terminfo.src 
77TERMINFODIR= share/lib/terminfo 76TERMINFODIR= share/lib/terminfo
78.else 77.else
79TERMINFODIR= share/terminfo 78TERMINFODIR= share/terminfo
80.endif 79.endif
81 80
82.if !empty(CC_VERSION:Mgcc-5.*) 81.if !empty(CC_VERSION:Mgcc-5.*)
83# Inhibit generation of line markers in the output from the preprocessor 82# Inhibit generation of line markers in the output from the preprocessor
84# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60723 83# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60723
85CPPFLAGS+= -P 84CPPFLAGS+= -P
86.endif 85.endif
87 86
88# This prevents tic from writing into ~/.terminfo 87# This prevents tic from writing into ~/.terminfo
89INSTALLATION_DIRS+= ${TERMINFODIR} 88INSTALLATION_DIRS+= ${TERMINFODIR}
cvs diff -r1.35 -r1.36 pkgsrc/devel/ncurses/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ncurses/distinfo 2018/10/18 19:42:49 1.35
+++ pkgsrc/devel/ncurses/distinfo 2019/02/25 11:54:05 1.36
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.35 2018/10/18 19:42:49 leot Exp $ 1$NetBSD: distinfo,v 1.36 2019/02/25 11:54:05 jperkin Exp $
2 2
3SHA1 (ncurses-6.1.tar.gz) = 57acf6bc24cacd651d82541929f726f4def780cc 3SHA1 (ncurses-6.1.tar.gz) = 57acf6bc24cacd651d82541929f726f4def780cc
4RMD160 (ncurses-6.1.tar.gz) = 938235f3922f9c6ef0f1081d643ecb2da1347a17 4RMD160 (ncurses-6.1.tar.gz) = 938235f3922f9c6ef0f1081d643ecb2da1347a17
5SHA512 (ncurses-6.1.tar.gz) = e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee 5SHA512 (ncurses-6.1.tar.gz) = e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee
6Size (ncurses-6.1.tar.gz) = 3365395 bytes 6Size (ncurses-6.1.tar.gz) = 3365395 bytes
7SHA1 (patch-aa) = 4523f87f39d2aa3eea07a0e55595eb9e50b74a6c 7SHA1 (patch-aa) = 4523f87f39d2aa3eea07a0e55595eb9e50b74a6c
8SHA1 (patch-ab) = f4573e7a161c2f59d9828d163abe2a5ba2e4d56f 8SHA1 (patch-ab) = f4573e7a161c2f59d9828d163abe2a5ba2e4d56f
9SHA1 (patch-ac) = 08e5fa8179c7f5c65c617a55c9693745b89b42de 9SHA1 (patch-ac) = 08e5fa8179c7f5c65c617a55c9693745b89b42de
10SHA1 (patch-aclocal.m4) = efb1a966687d2c35fc3e3e1d5345e80aaf2822f6 10SHA1 (patch-aclocal.m4) = efb1a966687d2c35fc3e3e1d5345e80aaf2822f6
11SHA1 (patch-c++_Makefile.in) = 68ff81c719ec4aa13beb962cb66d7cd6749d7af5 11SHA1 (patch-c++_Makefile.in) = 68ff81c719ec4aa13beb962cb66d7cd6749d7af5
12SHA1 (patch-configure.in) = 48a705b3f4de3a65c0c1c3648f5a24c5310ed3fa 12SHA1 (patch-configure.in) = 48a705b3f4de3a65c0c1c3648f5a24c5310ed3fa
13SHA1 (patch-misc_ncurses-config.in) = 43e4dc8abe85804513da1189aeffa5c7746ffcca 13SHA1 (patch-misc_ncurses-config.in) = 43e4dc8abe85804513da1189aeffa5c7746ffcca
 14SHA1 (patch-misc_terminfo.src) = 3423a09b0b6aac1139ab21f514c631ee8c36c2f7
14SHA1 (patch-ncurses_base_MKlib__gen.sh) = f8ce67fbd273529e4161a2820677d05a623fd527 15SHA1 (patch-ncurses_base_MKlib__gen.sh) = f8ce67fbd273529e4161a2820677d05a623fd527
15SHA1 (patch-ncurses_tinfo_parse__entry.c) = 06d2b52e84595f8acd47ad36ded7b7d5bec95b8a 16SHA1 (patch-ncurses_tinfo_parse__entry.c) = 06d2b52e84595f8acd47ad36ded7b7d5bec95b8a
File Added: pkgsrc/devel/ncurses/patches/Attic/patch-misc_terminfo.src
$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,
cvs diff -r1.18 -r1.19 pkgsrc/devel/ncursesw/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ncursesw/Makefile 2018/10/24 16:58:38 1.18
+++ pkgsrc/devel/ncursesw/Makefile 2019/02/25 11:54:05 1.19
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.18 2018/10/24 16:58:38 minskim Exp $ 1# $NetBSD: Makefile,v 1.19 2019/02/25 11:54:05 jperkin Exp $
2 2
3.include "../../devel/ncurses/Makefile.common" 3.include "../../devel/ncurses/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/ncurses/ncursesw/} 5PKGNAME= ${DISTNAME:S/ncurses/ncursesw/}
6COMMENT= Wide character CRT screen handling and optimization package 6COMMENT= Wide character CRT screen handling and optimization package
7PKGREVISION= 2 7PKGREVISION= 3
8 8
9PATCHDIR= ${.CURDIR}/../../devel/ncurses/patches 9PATCHDIR= ${.CURDIR}/../../devel/ncurses/patches
10DISTINFO_FILE= ${.CURDIR}/../../devel/ncurses/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../devel/ncurses/distinfo
11 11
12CONFIGURE_ARGS+= --enable-widec 12CONFIGURE_ARGS+= --enable-widec
13CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ncursesw 13CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ncursesw
14 14
15INSTALLATION_DIRS+= include/ncursesw 15INSTALLATION_DIRS+= include/ncursesw
16INSTALLATION_DIRS+= bin 16INSTALLATION_DIRS+= bin
17INSTALLATION_DIRS+= lib/pkgconfig 17INSTALLATION_DIRS+= lib/pkgconfig
18 18
19BUILD_TARGET= libs 19BUILD_TARGET= libs
20 20