contrib/ncurses: Reapply local mods and revise READMEs
authorJohn Marino <draco@marino.st>
Fri, 11 Mar 2016 19:04:12 +0000 (20:04 +0100)
committerJohn Marino <draco@marino.st>
Fri, 11 Mar 2016 20:00:43 +0000 (21:00 +0100)
contrib/ncurses/README.DELETED
contrib/ncurses/README.DRAGONFLY
contrib/ncurses/misc/terminfo.src
contrib/ncurses/ncurses/base/MKlib_gen.sh
contrib/ncurses/ncurses/tinfo/comp_scan.c

index a2e326f..56c377d 100644 (file)
@@ -1,3 +1,10 @@
+ANNOUNCE
+AUTHORS
+INSTALL
+MANIFEST
+NEWS
+README
+TO-DO
 Ada95/
 Makefile.in
 Makefile.os2
@@ -13,14 +20,7 @@ configure.in
 convert_configure.pl
 dist.mk
 doc/
-form/Makefile.in
-form/READ.ME
-form/headers
-form/llib-lform
-form/llib-lformt
-form/llib-lformtw
-form/llib-lformw
-form/modules
+form/
 include/Caps.aix4
 include/Caps.hpux11
 include/Caps.keys
@@ -38,14 +38,7 @@ include/termcap.h.in
 include/unctrl.h.in
 install-sh
 man/
-menu/Makefile.in
-menu/READ.ME
-menu/headers
-menu/llib-lmenu
-menu/llib-lmenut
-menu/llib-lmenutw
-menu/llib-lmenuw
-menu/modules
+menu/
 misc/Makefile.in
 misc/chkdef.cmd
 misc/cleantic.cmd
@@ -62,7 +55,6 @@ misc/tdlint
 mk-0th.awk
 mk-1st.awk
 mk-2nd.awk
-mk-dlls.sh.in
 mk-hdr.awk
 ncurses/Makefile.in
 ncurses/README
@@ -73,11 +65,18 @@ ncurses/llib-lncurses
 ncurses/llib-lncursest
 ncurses/llib-lncursestw
 ncurses/llib-lncursesw
+ncurses/llib-ltic
+ncurses/llib-ltict
+ncurses/llib-ltictw
+ncurses/llib-lticw
+ncurses/llib-ltinfo
+ncurses/llib-ltinfot
+ncurses/llib-ltinfotw
+ncurses/llib-ltinfow
 ncurses/modules
 ncurses/tinfo/README
 ncurses/tinfo/tinfo_driver.c
 ncurses/trace/README
-ncurses/tty/tty_display.h
 ncurses/win32con
 panel/Makefile.in
 panel/headers
@@ -88,3 +87,4 @@ panel/llib-lpanelw
 panel/modules
 progs/Makefile.in
 test/
+package/
index 76a9ee7..e284382 100644 (file)
@@ -4,10 +4,10 @@ GNU NCURSES 5.9
 Original source can be downloaded from:
 http://ftp.gnu.org/pub/gnu/ncurses
 
-file = ncurses-5.9.tar.gz
-date = 5 April 2011
-size = 2826473
-sha1 = 3e042e5f2c7223bffdaac9646a533b8c758b65b5
+file = ncurses-6.0-20160305.tgz
+date = 6 March 2016
+size = 3153972
+sha1 = dbbaff96c4e447148243a9b5a8babb014f5b4bdc
 
 A list of files and directories removed is in README.DELETED
 
index 13cc1f9..62b71ca 100644 (file)
@@ -4202,7 +4202,7 @@ xterm-basic|modern xterm terminal emulator - common,
        il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m,
        is2=\E[!p\E[?3;4l\E[4l\E>, kmous=\E[M, meml=\El,
        memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
-       ritm=\E[23m, rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l,
+       ritm=\E[23m, rmacs=\E(B, rmam=\E[?7l,
        rmir=\E[4l, rmkx=\E[?1l\E>, rmm=\E[?1034l, rmso=\E[27m,
        rmul=\E[24m, rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7,
        setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
@@ -4210,7 +4210,7 @@ xterm-basic|modern xterm terminal emulator - common,
        setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
        sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
        sgr0=\E(B\E[m, sitm=\E[3m, smacs=\E(0, smam=\E[?7h,
-       smcup=\E[?1049h, smir=\E[4h, smkx=\E[?1h\E=,
+       smir=\E[4h, smkx=\E[?1h\E=,
        smm=\E[?1034h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
        vpa=\E[%i%p1%dd, E3=\E[3J, use=ansi+pp, use=xterm+kbs,
        use=vt100+enq,
index 71a478f..1be8af5 100755 (executable)
@@ -492,11 +492,22 @@ sed -n -f $ED1 \
        -e 's/gen_$//' \
        -e 's/  / /g' >>$TMP
 
+cat >$ED1 <<EOF
+s/  / /g
+s/^ //
+s/ $//
+s/P_NCURSES_BOOL/NCURSES_BOOL/g
+EOF
+
+# A patch discussed here:
+#      https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+# introduces spurious #line markers.  Work around that by ignoring the system's
+# attempt to define "bool" and using our own symbol here.
+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
+cat $ED2 >$TMP
+
 $preprocessor $TMP 2>/dev/null \
-| sed \
-       -e 's/  / /g' \
-       -e 's/^ //' \
-       -e 's/_Bool/NCURSES_BOOL/g' \
+| sed -f $ED1 \
 | $AWK -f $AW2 \
 | sed -f $ED3 \
 | sed \
index fe6e8e7..637524e 100644 (file)
@@ -585,8 +585,10 @@ _nc_get_token(bool silent)
                if (!silent) {
                    if (*after_list == '\0')
                        _nc_warning("empty longname field");
+#ifndef DRAGONFLY_NATIVE
                    else if (strchr(after_list, ' ') == 0)
                        _nc_warning("older tic versions may treat the description field as an alias");
+#endif
                }
            } else {
                after_list = tok_buf + strlen(tok_buf);