buildworld bombs in ncurses

Hi,

I have 5.0-RELEASE system installed from binary CD. Now I'm trying to
update it to -CURRENT. make buildworld dies in /usr/src/lib/libncurses.
This looks more like awk issue, because ncurses wasn't changed for a
long time. When I look at lines in generated lib_gen.c where it
complains, I see:

#undef COLOR_P AIR
NCURSES_EXPORT(int) COLOR_PAIR (int z)
{
  T((T_CALLED("COLOR_PAIR(%d)"), z)); returnCode(((z) << ((0) + 8)));
}

note the space in COLOR_P AIR after #undef ...

What have I did wrong?


===> lib/libncurses
AWK=awk sh
/usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/MKkeys_list.sh  /usr/src/lib/libncurses/../../contrib/ncurses/include/Caps | sort > keys.list
./make_keys keys.list > init_keytry.h
sh
/usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/MKlib_gen.sh
"cc -E -O -pipe -mcpu=pentiumpro -I. -I/usr/src/lib/libncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/ncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/include -Wall
-DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS "  "awk" generated <
curses.h | fgrep undef > nomacros.h
AWK=awk sh
/usr/src/lib/libncurses/../../contrib/ncurses/include/MKparametrized.sh 
/usr/src/lib/libncurses/../../contrib/ncurses/include/Caps >
parametrized.h
cat namehdr boolcodes numcodes strcodes codeftr > codes.c
sh
/usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tty/MKexpanded.sh
"cc -E" -O -pipe -mcpu=pentiumpro -I. -I/usr/src/lib/libncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/ncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/include -Wall
-DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS  >expanded.c
sh
/usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/MKfallback.sh > fallback.c
shift: can't shift that many
shift: can't shift that many
sh
/usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/MKlib_gen.sh
"cc -E -O -pipe -mcpu=pentiumpro -I. -I/usr/src/lib/libncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/ncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/include -Wall
-DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS "  "awk" generated <
curses.h >lib_gen.c
awk -f
/usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/MKkeyname.awk
keys.list > lib_keyname.c
echo | awk -f
/usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/MKunctrl.awk
> unctrl.c
sh
/usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/MKcaptab.awk
"awk"  /usr/src/lib/libncurses/../../contrib/ncurses/include/Caps >
comp_captab.c
rm -f .depend
mkdep -f .depend -a    -I. -I/usr/src/lib/libncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/ncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/include -DFREEBSD_NATIVE
-DNDEBUG -DHAVE_CONFIG_H -DTERMIOS  codes.c expanded.c fallback.c
lib_gen.c lib_keyname.c names.c unctrl.c
/usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/access.c
/usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/add_tries.c
/usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/alloc_entry.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/alloc_ttype.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/captoinfo.c comp_captab.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/comp_error.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/comp_expand.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/comp_hash.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/comp_parse.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/comp_scan.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/define_key.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/doalloc.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/free_ttype.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/getenv_num.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tty/hardscroll.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tty/hashmap.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/home_terminfo.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/init_keytry.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/keybound.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/keyok.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_acs.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_addch.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_addstr.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_baudrate.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_beep.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_bkgd.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_box.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_chgat.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_clear.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_clearok.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_clrbot.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_clreol.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_color.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_colorset.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_cur_term.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_data.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_delch.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_delwin.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_dft_fgbg.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_echo.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_endwin.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_erase.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_flash.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_freeall.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_getch.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_getstr.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_has_cap.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_hline.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_immedok.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_inchstr.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_initscr.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_insch.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_insdel.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_insstr.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_instr.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_isendwin.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_kernel.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_leaveok.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_longname.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_mouse.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_move.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tty/lib_mvcur.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_mvwin.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_napms.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_newterm.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_newwin.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_nl.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_options.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_overlay.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_pad.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_print.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_printw.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_raw.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_redrawln.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_refresh.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_restart.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_scanw.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_screen.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_scroll.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_scrollok.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_scrreg.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_set_term.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_setup.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_slk.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_slkatr_set.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_slkatrof.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_slkatron.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_slkatrset.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_slkattr.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_slkclear.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_slkcolor.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_slkinit.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_slklab.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_slkrefr.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_slkset.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_slktouch.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_termcap.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_termname.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_tgoto.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_ti.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_touch.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_tparm.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_tputs.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/trace/lib_trace.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tty/lib_tstp.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/lib_ttyflags.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tty/lib_twait.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_ungetch.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tty/lib_vidattr.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_vline.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_wattroff.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_wattron.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_winch.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/lib_window.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/memmove.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/name_match.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/nc_panel.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/parse_entry.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/read_entry.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/resizeterm.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/safe_sprintf.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/setbuf.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/sigaction.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/strings.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/tries.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tty/tty_update.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/trace/varargs.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/version.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/trace/visbuf.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/vsscanf.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/base/wresize.c /usr/src/lib/libncurses/../../contrib/ncurses/ncurses/tinfo/write_entry.c /usr/src/lib/libncurses/termcap.c
lib_gen.c:165:16: warning: extra tokens at end of #undef directive
lib_gen.c:592:10: warning: extra tokens at end of #undef directive
cc -O -pipe -mcpu=pentiumpro -I. -I/usr/src/lib/libncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/ncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/include -Wall
-DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS  -c codes.c -o
codes.o
cc -O -pipe -mcpu=pentiumpro -I. -I/usr/src/lib/libncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/ncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/include -Wall
-DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS  -c expanded.c -o
expanded.o
cc -O -pipe -mcpu=pentiumpro -I. -I/usr/src/lib/libncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/ncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/include -Wall
-DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS  -c fallback.c -o
fallback.o
cc -O -pipe -mcpu=pentiumpro -I. -I/usr/src/lib/libncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/ncurses
-I/usr/src/lib/libncurses/../../contrib/ncurses/include -Wall
-DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS  -c lib_gen.c -o
lib_gen.o
lib_gen.c:165:16: warning: extra tokens at end of #undef directive
lib_gen.c:166: syntax error before "int"
*** Error code 1

Stop in /usr/src/lib/libncurses.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.



-- 
Pav Lucistnik <pav_at_oook.cz>
Mami! Ten kursor na me mrka!