ncurses 5.9 - patch 20130316

+ additional fix for tic.c, to allocate missing buffer space.
+ eliminate configure-script warnings for gen-pkgconfig.in
+ correct typo in sgr string for sun-color,
  add bold for consistency with sgr,
  change smso for consistency with sgr -TD
+ correct typo in sgr string for terminator -TD
+ add blink to the attributes masked by ncv in linux-16color (report
  by Benjamin Sittler)
+ improve warning message from post-load checking for missing "%?"
  operator by tic/infocmp by showing the entry name and capability.
+ minor formatting improvement to tic/infocmp -f option to ensure
  line split after "%;".
+ amend scripting for --with-cxx-shared option to handle the debug
  library "libncurses++_g.a" (report by Sven Joachim).

diff --git a/NEWS b/NEWS
index ec63bb336590576a84c19c28b6fb58d413874081..a5bbbead56de6a6373ace66ad4c7eb8775a0ebcb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.2030 2013/03/09 22:42:05 tom Exp $
+-- $Id: NEWS,v 1.2035 2013/03/17 01:01:39 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -45,6 +45,22 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20130316
+       + additional fix for tic.c, to allocate missing buffer space.
+       + eliminate configure-script warnings for gen-pkgconfig.in
+       + correct typo in sgr string for sun-color,
+         add bold for consistency with sgr,
+         change smso for consistency with sgr -TD
+       + correct typo in sgr string for terminator -TD
+       + add blink to the attributes masked by ncv in linux-16color (report
+         by Benjamin Sittler)
+       + improve warning message from post-load checking for missing "%?"
+         operator by tic/infocmp by showing the entry name and capability.
+       + minor formatting improvement to tic/infocmp -f option to ensure
+         line split after "%;".
+       + amend scripting for --with-cxx-shared option to handle the debug
+         library "libncurses++_g.a" (report by Sven Joachim).
+

 20130309
        + amend change to toe.c for reading from /dev/zero, to ensure that
          there is a buffer for the temporary filename (cf: 20120324).
 20130309
        + amend change to toe.c for reading from /dev/zero, to ensure that
          there is a buffer for the temporary filename (cf: 20120324).

diff --git a/aclocal.m4 b/aclocal.m4
index 65f01c05abb927849b95bc1816b22739539dfb39..bc5c706013a7a150c2caa5d5a42b5f4407bf055e 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl

-dnl $Id: aclocal.m4,v 1.654 2013/03/10 00:23:09 tom Exp $
+dnl $Id: aclocal.m4,v 1.658 2013/03/12 13:40:56 tom Exp $

 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on


@@ -3232,7 +3232,28 @@ do
 
                if test $cf_dir = c++; then
                        if test "x$with_shared_cxx" != xyes; then
 
                if test $cf_dir = c++; then
                        if test "x$with_shared_cxx" != xyes; then

-                               Libs_To_Make='../lib/$(LIBNAME)'
+                               cf_list=
+                               for cf_item in $Libs_To_Make
+                               do
+                                       case $cf_item in
+                                       *.a)
+                                               ;;
+                                       *)
+                                               cf_item=`echo "$cf_item" | sed -e 's/\.so.*/.a/'`
+                                               ;;
+                                       esac
+                                       for cf_test in $cf_list
+                                       do
+                                               if test "$cf_test" = "$cf_item"
+                                               then
+                                                       cf_LIST_MODELS=`echo "$cf_LIST_MODELS" | sed -e 's/normal//'`
+                                                       cf_item=
+                                                       break
+                                               fi
+                                       done
+                                       test -n "$cf_item" && cf_list="$cf_list $cf_item"
+                               done
+                               Libs_To_Make="$cf_list"

                        fi
                fi
 
                        fi
                fi
 


@@ -3256,7 +3277,15 @@ do
 
                        CXX_MODEL=$cf_ITEM
                        if test "$CXX_MODEL" = SHARED; then
 
                        CXX_MODEL=$cf_ITEM
                        if test "$CXX_MODEL" = SHARED; then

-                               test "x$with_shared_cxx" = xno && CXX_MODEL=NORMAL
+                               case $cf_cv_shlib_version in #(vi
+                               cygdll|mingw) #(vi
+                                       test "x$with_shared_cxx" = xno && CF_VERBOSE(overriding CXX_MODEL to SHARED)
+                                       with_shared_cxx=yes
+                                       ;;
+                               *)
+                                       test "x$with_shared_cxx" = xno && CXX_MODEL=NORMAL
+                                       ;;
+                               esac

                        fi
 
                        CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
                        fi
 
                        CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 08dc9c92dca4e9390b5c569a3c1652008cd27d94..2bf92a3f61589d2e4b79194d9f53c2ee9456cf6b 100644 (file)
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.97 2013/03/09 21:22:49 tom Exp $
+# $Id: Makefile.in,v 1.101 2013/03/13 09:45:11 tom Exp $

 ##############################################################################
 # Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.                #
 #                                                                            #
 ##############################################################################
 # Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.                #
 #                                                                            #


@@ -153,33 +153,12 @@ depend :
 tags:
        $(CTAGS) *.[h] *.cc
 
 tags:
        $(CTAGS) *.[h] *.cc
 

-# Build a conventional library for installing, since a shared library would
-# pull in all of the ncurses libraries (panel, menu, form, ncurses) as direct
-# dependencies.
-LIB_OBJS = \
-       $(MODEL)/cursesf$o \
-       $(MODEL)/cursesm$o \
-       $(MODEL)/cursesw$o \
-       $(MODEL)/cursespad$o \
-       $(MODEL)/cursesp$o \
-       $(MODEL)/cursslk$o \
-       $(MODEL)/cursesapp$o \
-       $(MODEL)/cursesmain$o
-
-../lib/$(LIBNAME_NORMAL) : $(LIB_OBJS)
-       $(CXX_AR) $(CXX_ARFLAGS) $@ $?
-       $(RANLIB) $@
-
-../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
-       cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
-               -o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
-               -rpath $(INSTALL_PREFIX)$(libdir) \
-               $(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(LDFLAGS_LIBTOOL) $(SHLIB_LIST)
-

 OBJS_DEMO = $(MODEL)/demo$o
 
 $(MODEL)/demo$o : $(srcdir)/demo.cc \
        $(cursesf_h) $(cursesm_h) $(cursesapp_h)
 OBJS_DEMO = $(MODEL)/demo$o
 
 $(MODEL)/demo$o : $(srcdir)/demo.cc \
        $(cursesf_h) $(cursesm_h) $(cursesapp_h)

+       @echo 'compiling demo (obj_s)'
+       @$(LIBTOOL_COMPILE) $(CXX) $(CFLAGS_DEFAULT) -c $(srcdir)/demo.cc -o $@

 
 demo$x:        $(OBJS_DEMO) \
        $(LIBRARIES)  \
 
 demo$x:        $(OBJS_DEMO) \
        $(LIBRARIES)  \


@@ -193,21 +172,13 @@ etip.h:   $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh
 $(DESTDIR)$(libdir) :
        mkdir -p $@
 
 $(DESTDIR)$(libdir) :
        mkdir -p $@
 

-install \
-install.libs:: $(LIBRARIES) $(DESTDIR)$(libdir)
-       $(LIBTOOL_INSTALL) $(INSTALL_LIB) $(LIBRARIES) $(DESTDIR)$(libdir)/$(LIBNAME)
-
-uninstall \
-uninstall.libs::
-       -$(LIBTOOL_UNINSTALL) rm -f $(DESTDIR)$(libdir)/$(LIBNAME)
-

 mostlyclean ::
        -rm -f core tags TAGS *~ *.bak *.i *.ii *.ln *.atac trace
 
 clean :: mostlyclean
        -sh -c "if test -n '$x' ; then $(MAKE) clean x=''; fi"
        -rm -rf $(MODEL)/SunWS_cache
 mostlyclean ::
        -rm -f core tags TAGS *~ *.bak *.i *.ii *.ln *.atac trace
 
 clean :: mostlyclean
        -sh -c "if test -n '$x' ; then $(MAKE) clean x=''; fi"
        -rm -rf $(MODEL)/SunWS_cache

-       -$(LIBTOOL_CLEAN) rm -f demo$x $(AUTO_SRC) $(LIBRARIES) $(LIB_OBJS) $(OBJS_DEMO)
+       -$(LIBTOOL_CLEAN) rm -f demo$x $(AUTO_SRC) $(LIBRARIES) $(OBJS_DEMO)

        -rm -rf .libs
 
 distclean :: clean
        -rm -rf .libs
 
 distclean :: clean

diff --git a/c++/modules b/c++/modules
index bc4fae5992511d1f1844f8653d2ebab5eb7f747d..0dfb00437a72860b737fdb909ee1cc3dd43a2adc 100644 (file)
--- a/c++/modules
+++ b/c++/modules
@@ -1,5 +1,5 @@
 # Program modules
 # Program modules

-# $Id: modules,v 1.7 2006/12/24 00:53:08 tom Exp $
+# $Id: modules,v 1.9 2013/03/13 09:57:40 tom Exp $

 ##############################################################################
 # Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
 #                                                                            #
 ##############################################################################
 # Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
 #                                                                            #


@@ -34,12 +34,11 @@
 @ base
 cursesf                c++             $(srcdir)       $(cursesf_h) $(cursesapp_h)
 cursesm                c++             $(srcdir)       $(cursesm_h) $(cursesapp_h)
 @ base
 cursesf                c++             $(srcdir)       $(cursesf_h) $(cursesapp_h)
 cursesm                c++             $(srcdir)       $(cursesm_h) $(cursesapp_h)

-cursesp                c++             $(srcdir)       $(cursesp_h)

 cursesw                c++             $(srcdir)       $(cursesw_h)
 cursespad      c++             $(srcdir)       $(cursesw_h)
 cursesw                c++             $(srcdir)       $(cursesw_h)
 cursespad      c++             $(srcdir)       $(cursesw_h)

+cursesp                c++             $(srcdir)       $(cursesp_h)

 cursslk                c++             $(srcdir)       $(cursslk_h) $(cursesapp_h)
 cursesapp      c++             $(srcdir)       $(cursesapp_h)
 cursesmain     c++             $(srcdir)       $(cursesapp_h)
 cursslk                c++             $(srcdir)       $(cursslk_h) $(cursesapp_h)
 cursesapp      c++             $(srcdir)       $(cursesapp_h)
 cursesmain     c++             $(srcdir)       $(cursesapp_h)

-demo           c++             $(srcdir)       $(cursesf_h) $(cursesm_h) $(cursesapp_h)

 
 # vile:makemode
 
 # vile:makemode

diff --git a/configure b/configure
index 50e012e2a9ddb1e6d5a2d299df2e74aeb6e6fb47..3ad7f4a959a0cbbee4d8ed2c1b961d976e71f43d 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Revision: 1.563 .
+# From configure.in Revision: 1.564 .

 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20121002.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20121002.
 #


@@ -20516,6 +20516,12 @@ fi
 
 ADAHTML_DIR=../../doc/html/ada
 
 
 ADAHTML_DIR=../../doc/html/ada
 

+# these could be configurable, but are not currently
+PANEL_NAME=panel
+MENU_NAME=menu
+FORM_NAME=form
+CXX_NAME=ncurses++
+

 SUB_SCRIPTS=
 
 ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/ncurses_dll.h include/termcap.h include/unctrl.h $SUB_SCRIPTS $SUB_MAKEFILES Makefile"
 SUB_SCRIPTS=
 
 ac_config_files="$ac_config_files include/MKterm.h.awk include/curses.head:include/curses.h.in include/ncurses_dll.h include/termcap.h include/unctrl.h $SUB_SCRIPTS $SUB_MAKEFILES Makefile"


@@ -20599,7 +20605,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"

-{ echo "$as_me:20602: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:20608: creating $CONFIG_STATUS" >&5

 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL


@@ -20775,7 +20781,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header

-    { { echo "$as_me:20778: error: ambiguous option: $1
+    { { echo "$as_me:20784: error: ambiguous option: $1

 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}


@@ -20794,7 +20800,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
     ac_need_defaults=false;;
 
   # This is an error.

-  -*) { { echo "$as_me:20797: error: unrecognized option: $1
+  -*) { { echo "$as_me:20803: error: unrecognized option: $1

 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}


@@ -20904,7 +20910,7 @@ do
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;

-  *) { { echo "$as_me:20907: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:20913: error: invalid argument: $ac_config_target" >&5

 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac


@@ -21211,6 +21217,10 @@ s,@cross_compiling@,$cross_compiling,;t t
 s,@TIC_PATH@,$TIC_PATH,;t t
 s,@MAKE_TESTS@,$MAKE_TESTS,;t t
 s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t
 s,@TIC_PATH@,$TIC_PATH,;t t
 s,@MAKE_TESTS@,$MAKE_TESTS,;t t
 s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t

+s,@PANEL_NAME@,$PANEL_NAME,;t t
+s,@MENU_NAME@,$MENU_NAME,;t t
+s,@FORM_NAME@,$FORM_NAME,;t t
+s,@CXX_NAME@,$CXX_NAME,;t t

 CEOF
 
 EOF
 CEOF
 
 EOF


@@ -21325,7 +21335,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
   esac
 
   if test x"$ac_file" != x-; then

-    { echo "$as_me:21328: creating $ac_file" >&5
+    { echo "$as_me:21338: creating $ac_file" >&5

 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi


@@ -21343,7 +21353,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)

-         test -f "$f" || { { echo "$as_me:21346: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:21356: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;


@@ -21356,7 +21366,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
            echo $srcdir/$f
          else
            # /dev/null tree

-           { { echo "$as_me:21359: error: cannot find input file: $f" >&5
+           { { echo "$as_me:21369: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;


@@ -21372,7 +21382,7 @@ cat >>$CONFIG_STATUS <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' $ac_item`
         if test -z "$ac_used"; then
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' $ac_item`
         if test -z "$ac_used"; then

-          { echo "$as_me:21375: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:21385: WARNING: datarootdir was used implicitly but not set:

 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}


@@ -21381,7 +21391,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then

-        { echo "$as_me:21384: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:21394: WARNING: datarootdir was used explicitly but not set:

 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}


@@ -21418,7 +21428,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`egrep '[  ]*'$ac_name'[   ]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
             ac_init=`egrep '[  ]*'$ac_name'[   ]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`

-              { echo "$as_me:21421: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:21431: WARNING: Variable $ac_name is used but was not set:

 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}


@@ -21429,7 +21439,7 @@ $ac_seen" >&2;}
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`

-      { echo "$as_me:21432: WARNING: Some variables may not be substituted:
+      { echo "$as_me:21442: WARNING: Some variables may not be substituted:

 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}


@@ -21478,7 +21488,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
   * )   ac_file_in=$ac_file.in ;;
   esac
 

-  test x"$ac_file" != x- && { echo "$as_me:21481: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:21491: creating $ac_file" >&5

 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the


@@ -21489,7 +21499,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)

-         test -f "$f" || { { echo "$as_me:21492: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:21502: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;


@@ -21502,7 +21512,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
            echo $srcdir/$f
          else
            # /dev/null tree

-           { { echo "$as_me:21505: error: cannot find input file: $f" >&5
+           { { echo "$as_me:21515: error: cannot find input file: $f" >&5

 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;


@@ -21560,7 +21570,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then

-      { echo "$as_me:21563: $ac_file is unchanged" >&5
+      { echo "$as_me:21573: $ac_file is unchanged" >&5

 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \


@@ -21821,7 +21831,28 @@ do
 
                if test $cf_dir = c++; then
                        if test "x$with_shared_cxx" != xyes; then
 
                if test $cf_dir = c++; then
                        if test "x$with_shared_cxx" != xyes; then

-                               Libs_To_Make='../lib/$(LIBNAME)'
+                               cf_list=
+                               for cf_item in $Libs_To_Make
+                               do
+                                       case $cf_item in
+                                       *.a)
+                                               ;;
+                                       *)
+                                               cf_item=`echo "$cf_item" | sed -e 's/\.so.*/.a/'`
+                                               ;;
+                                       esac
+                                       for cf_test in $cf_list
+                                       do
+                                               if test "$cf_test" = "$cf_item"
+                                               then
+                                                       cf_LIST_MODELS=`echo "$cf_LIST_MODELS" | sed -e 's/normal//'`
+                                                       cf_item=
+                                                       break
+                                               fi
+                                       done
+                                       test -n "$cf_item" && cf_list="$cf_list $cf_item"
+                               done
+                               Libs_To_Make="$cf_list"

                        fi
                fi
 
                        fi
                fi
 


@@ -21846,7 +21877,18 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
 
                        CXX_MODEL=$cf_ITEM
                        if test "$CXX_MODEL" = SHARED; then
 
                        CXX_MODEL=$cf_ITEM
                        if test "$CXX_MODEL" = SHARED; then

-                               test "x$with_shared_cxx" = xno && CXX_MODEL=NORMAL
+                               case $cf_cv_shlib_version in #(vi
+                               cygdll|mingw) #(vi
+                                       test "x$with_shared_cxx" = xno && test -n "$verbose" && echo "  overriding CXX_MODEL to SHARED" 1>&6
+
+echo "${as_me:-configure}:21884: testing overriding CXX_MODEL to SHARED ..." 1>&5
+
+                                       with_shared_cxx=yes
+                                       ;;
+                               *)
+                                       test "x$with_shared_cxx" = xno && CXX_MODEL=NORMAL
+                                       ;;
+                               esac

                        fi
 
        case $cf_item in #(vi
                        fi
 
        case $cf_item in #(vi

diff --git a/configure.in b/configure.in
index 37c73eafc036c28f51f1980bb965fc3ba903e2d7..92e4206848ff27a5e17b2a221d1f1957cdbfa7b6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,14 +28,14 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl

-dnl $Id: configure.in,v 1.563 2013/03/09 21:15:51 tom Exp $
+dnl $Id: configure.in,v 1.564 2013/03/16 23:32:24 tom Exp $

 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl See http://invisible-island.net/autoconf/ for additional information.
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20030208)
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl See http://invisible-island.net/autoconf/ for additional information.
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20030208)

-AC_REVISION($Revision: 1.563 $)
+AC_REVISION($Revision: 1.564 $)

 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 


@@ -1904,6 +1904,17 @@ AC_SUBST(MAKE_TESTS)
 ADAHTML_DIR=../../doc/html/ada
 AC_SUBST(ADAHTML_DIR)
 
 ADAHTML_DIR=../../doc/html/ada
 AC_SUBST(ADAHTML_DIR)
 

+# these could be configurable, but are not currently
+PANEL_NAME=panel
+MENU_NAME=menu
+FORM_NAME=form
+CXX_NAME=ncurses++
+
+AC_SUBST(PANEL_NAME)
+AC_SUBST(MENU_NAME)
+AC_SUBST(FORM_NAME)
+AC_SUBST(CXX_NAME)
+

 SUB_SCRIPTS=
 
 AC_OUTPUT( \
 SUB_SCRIPTS=
 
 AC_OUTPUT( \

diff --git a/dist.mk b/dist.mk
index 0e036288630bf0d821a3984b3a1961e849d10b4b..85794c46dc25f37a94adb96828f9d4b0e8285de5 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.917 2013/03/09 15:56:30 tom Exp $
+# $Id: dist.mk,v 1.919 2013/03/16 16:00:27 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 9
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 9

-NCURSES_PATCH = 20130309
+NCURSES_PATCH = 20130316

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
index 56b170f1e44277820c720612488cd0319e759ae8..9db12572aaee3ba385a24ae9e840be1f099232c5 100644 (file)
--- a/misc/gen-pkgconfig.in
+++ b/misc/gen-pkgconfig.in
@@ -1,7 +1,7 @@
 #!@SHELL@
 #!@SHELL@

-# $Id: gen-pkgconfig.in,v 1.14 2012/01/01 01:48:23 tom Exp $
+# $Id: gen-pkgconfig.in,v 1.15 2013/03/16 23:33:34 tom Exp $

 ##############################################################################
 ##############################################################################

-# Copyright (c) 2009-2010,2011 Free Software Foundation, Inc.                #
+# Copyright (c) 2009-2012,2013 Free Software Foundation, Inc.                #

 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #


@@ -39,10 +39,10 @@
 # library, except that the tinfo library does not depend on ncurses.
 LIB_NAME=@LIB_NAME@
 TINFO_NAME=@TINFO_NAME@
 # library, except that the tinfo library does not depend on ncurses.
 LIB_NAME=@LIB_NAME@
 TINFO_NAME=@TINFO_NAME@

-PANEL_NAME=panel # @PANEL_NAME@
-MENU_NAME=menu # @MENU_NAME@
-FORM_NAME=form # @FORM_NAME@
-CXX_NAME=ncurses++ # @CXX_NAME@
+PANEL_NAME=@PANEL_NAME@
+MENU_NAME=@MENU_NAME@
+FORM_NAME=@FORM_NAME@
+CXX_NAME=@CXX_NAME@

 DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
 TINFO_ARG_SUFFIX=@TINFO_ARG_SUFFIX@
 CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@
 DFT_DEP_SUFFIX=@DFT_DEP_SUFFIX@
 TINFO_ARG_SUFFIX=@TINFO_ARG_SUFFIX@
 CXX_LIB_SUFFIX=@CXX_LIB_SUFFIX@

diff --git a/misc/terminfo.src b/misc/terminfo.src
index e8b02f3d750cd4130fe166057df7cac76cb96b87..8acd6844261d29765fb5d0245c0545598ee09227 100644 (file)
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #      bug-ncurses@gnu.org
 #
 # Report bugs and new terminal descriptions to
 #      bug-ncurses@gnu.org
 #

-#      $Revision: 1.470 $
-#      $Date: 2012/11/04 15:59:03 $
+#      $Revision: 1.472 $
+#      $Date: 2013/03/16 22:39:31 $

 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually


@@ -1025,7 +1025,7 @@ kon|kon2|jfbterm|Kanji ON Linux console,
 # you use a 512-character console font. This uses bold for bright
 # foreground colors and blink for bright background colors.
 linux-16color|linux console with 16 colors,
 # you use a 512-character console font. This uses bold for bright
 # foreground colors and blink for bright background colors.
 linux-16color|linux console with 16 colors,

-       colors#16, ncv#54, pairs#256,
+       colors#16, ncv#62, pairs#256,

        setab=\E[4%p1%{8}%m%d%?%p1%{8}%>%t;5%e%p1%{8}%=%t;2%e;25%;m,
        setaf=\E[3%p1%{8}%m%d%?%p1%{8}%>%t;1%e%p1%{8}%=%t;2%e;21%;m,
        use=linux,
        setab=\E[4%p1%{8}%m%d%?%p1%{8}%>%t;5%e%p1%{8}%=%t;2%e;25%;m,
        setaf=\E[3%p1%{8}%m%d%?%p1%{8}%>%t;1%e%p1%{8}%=%t;2%e;21%;m,
        use=linux,


@@ -4890,7 +4890,7 @@ terminator|Terminator no line wrap,
        rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>,
        s0ds=\E(B, s1ds=\E(0, sc=\E7, setab=\E[48;5;%p1%dm,
        setaf=\E[38;5;%p1%dm,
        rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>,
        s0ds=\E(B, s1ds=\E(0, sc=\E7, setab=\E[48;5;%p1%dm,
        setaf=\E[38;5;%p1%dm,

-       sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%;m%?%p9%t\E(0%e\E(B%;,
+       sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;,

        sgr0=\E[m\E(B, smacs=\E(0, smcup=\E7\E[?47h, smir=\E[4h,
        smso=\E[7m, smul=\E[4m, tbc=\E[3g, tsl=\E]2;%p1,
        vpa=\E[%i%p1%dd,
        sgr0=\E[m\E(B, smacs=\E(0, smcup=\E7\E[?47h, smir=\E[4h,
        smso=\E[7m, smul=\E[4m, tbc=\E[3g, tsl=\E]2;%p1,
        vpa=\E[%i%p1%dd,


@@ -5431,13 +5431,13 @@ sun-type4|Sun Workstation console with type 4 keyboard,
 # It supports bold, but not underline -TD (2009-09-19)
 sun-color|Sun Microsystems Workstation console with color support (IA systems),
        colors#8, ncv#3, pairs#64,
 # It supports bold, but not underline -TD (2009-09-19)
 sun-color|Sun Microsystems Workstation console with color support (IA systems),
        colors#8, ncv#3, pairs#64,

-       cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
+       bold=\E[1m, cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,

        cuu=\E[%p1%dA, home=\E[H, op=\E[0m, rs2=\E[s,
        setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
        setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
        setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
        cuu=\E[%p1%dA, home=\E[H, op=\E[0m, rs2=\E[s,
        setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
        setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
        setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,

-       sgr=\E[0%?%p1;1%;%?%p3%;7%;m, sgr0=\E[m, smso=\E[1m,
-       use=sun,
+       sgr=\E[0%?%p6%t;1%;%?%p1%p3%|%t;7%;m, sgr0=\E[m,
+       smso=\E[7m, use=sun,

 
 #### Iris consoles
 #
 
 #### Iris consoles
 #


@@ -22960,4 +22960,12 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #      * un-cancel the initc in vte-256color, since this was implemented
 #        starting with version 0.20 in 2009 -TD
 #
 #      * un-cancel the initc in vte-256color, since this was implemented
 #        starting with version 0.20 in 2009 -TD
 #

+# 2013-03-16
+#      * correct typo in sgr string for sun-color,
+#        add bold for consistency with sgr,
+#        change smso for consistency with sgr -TD
+#      * correct typo in sgr string for terminator -TD
+#      * add blink to the attributes masked by ncv in linux-16color (report
+#        by Benjamin Sittler)
+#

 ######## SHANTIH!  SHANTIH!  SHANTIH!
 ######## SHANTIH!  SHANTIH!  SHANTIH!

diff --git a/mk-1st.awk b/mk-1st.awk
index da23aeaff6cd08fe9e9189b7a6aa9349112a7bbd..2762fc39a53b6d9b4e3f3d3fa9f45c89554eec15 100644 (file)
--- a/mk-1st.awk
+++ b/mk-1st.awk
@@ -1,4 +1,4 @@
-# $Id: mk-1st.awk,v 1.90 2013/03/10 00:09:14 tom Exp $
+# $Id: mk-1st.awk,v 1.95 2013/03/12 11:09:40 tom Exp $

 ##############################################################################
 # Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.                #
 #                                                                            #
 ##############################################################################
 # Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.                #
 #                                                                            #


@@ -130,23 +130,38 @@ function symlink(src,dst) {
                }
        }
 function rmlink(directory, dst) {
                }
        }
 function rmlink(directory, dst) {

-               printf "\t-rm -f %s/%s\n", directory, dst
+               if ( dst != "" ) {
+                       printf "\t-rm -f %s/%s\n", directory, dst
+               }

        }
 function removelinks(directory) {
        }
 function removelinks(directory) {

-               rmlink(directory, end_name);
+               nlinks = 0;
+               links[nlinks++] = end_name;

                if ( DoLinks == "reverse" ) {
                        if ( ShlibVer == "rel" ) {
                if ( DoLinks == "reverse" ) {
                        if ( ShlibVer == "rel" ) {

-                               rmlink(directory, abi_name);
-                               rmlink(directory, rel_name);
+                               links[nlinks++] = abi_name;
+                               links[nlinks++] = rel_name;

                        } else if ( ShlibVer == "abi" ) {
                        } else if ( ShlibVer == "abi" ) {

-                               rmlink(directory, abi_name);
+                               links[nlinks++] = abi_name;

                        }
                } else {
                        if ( ShlibVer == "rel" ) {
                        }
                } else {
                        if ( ShlibVer == "rel" ) {

-                               rmlink(directory, abi_name);
-                               rmlink(directory, lib_name);
+                               links[nlinks++] = abi_name;
+                               links[nlinks++] = lib_name;

                        } else if ( ShlibVer == "abi" ) {
                        } else if ( ShlibVer == "abi" ) {

-                               rmlink(directory, lib_name);
+                               links[nlinks++] = lib_name;
+                       }
+               }
+               for (j = 0; j < nlinks; ++j) {
+                       found = 0;
+                       for (k = 0; k < j; ++k ) {
+                               if ( links[j] == links[k] ) {
+                                       found = 1;
+                                       break;
+                               }
+                       }
+                       if ( !found ) {
+                               rmlink(directory, links[j]);

                        }
                }
        }
                        }
                }
        }


@@ -234,8 +249,9 @@ function install_dll(directory,filename) {
                printf "\t%s %s %s\n", program, src_name, dst_name
        }
 BEGIN  {
                printf "\t%s %s %s\n", program, src_name, dst_name
        }
 BEGIN  {

-               found = 0
-               using = 0
+               TOOL_PREFIX = "";
+               found = 0;
+               using = 0;

        }
        /^@/ {
                using = 0
        }
        /^@/ {
                using = 0


@@ -244,6 +260,15 @@ BEGIN      {
                } else if (index(subset,$2) > 0) {
                        if (using == 0) {
                                if (found == 0) {
                } else if (index(subset,$2) > 0) {
                        if (using == 0) {
                                if (found == 0) {

+                                       if ( name ~ /^.*\+\+.*/ ) {
+                                               if ( CXX_MODEL == "NORMAL" && MODEL == "SHARED" ) {
+                                                       print  ""
+                                                       printf "# overriding model from %s to match CXX_MODEL\n", MODEL;
+                                                       MODEL = "NORMAL";
+                                                       suffix = ".a";
+                                                       DoLinks = "no";
+                                               }
+                                       }

                                        print  ""
                                        printf "# generated by mk-1st.awk (subset=%s)\n", subset
                                        printf "#  name:          %s\n", name 
                                        print  ""
                                        printf "# generated by mk-1st.awk (subset=%s)\n", subset
                                        printf "#  name:          %s\n", name 


@@ -300,11 +325,19 @@ BEGIN     {
                                printf "%s_OBJS =", OBJS
                                if ( $2 == "lib" ) {
                                        found = 1;
                                printf "%s_OBJS =", OBJS
                                if ( $2 == "lib" ) {
                                        found = 1;

-                               } else if ( $2 == "c++" && CXX_MODEL == "SHARED" ) {
+                               } else if ( $2 == "c++" ) {
+                                       TOOL_PREFIX = "CXX_";

                                        found = 1;
                                } else {
                                        found = 2;
                                }
                                        found = 1;
                                } else {
                                        found = 2;
                                }

+                               if ( $2 == "c++" ) {
+                                       CC_NAME="CXX"
+                                       CC_FLAG="CXXFLAGS"
+                               } else {
+                                       CC_NAME="CC"
+                                       CC_FLAG="CFLAGS"
+                               }

                        }
                        printf " \\\n\t../%s/%s$o", model, $1;
                }
                        }
                        printf " \\\n\t../%s/%s$o", model, $1;
                }


@@ -400,11 +433,6 @@ END        {
                        }
                        else if ( MODEL == "LIBTOOL" )
                        {
                        }
                        else if ( MODEL == "LIBTOOL" )
                        {

-                               if ( $2 == "c++" ) {
-                                       compile="CXX"
-                               } else {
-                                       compile="CC"
-                               }

                                end_name = lib_name;
                                printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
                                if ( is_ticlib() ) {
                                end_name = lib_name;
                                printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
                                if ( is_ticlib() ) {


@@ -414,7 +442,10 @@ END        {
                                } else {
                                        which_list = "SHLIB_LIST";
                                }
                                } else {
                                        which_list = "SHLIB_LIST";
                                }

-                               printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(%s) $(LDFLAGS)\n", compile, lib_name, OBJS, libtool_version, which_list
+                               printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) $(%s) \\\n", CC_NAME, CC_FLAG;
+                               printf "\t\t-o %s $(%s_OBJS:$o=.lo) \\\n", lib_name, OBJS;
+                               printf "\t\t-rpath $(DESTDIR)$(libdir) \\\n";
+                               printf "\t\t%s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(%s) $(LDFLAGS)\n", libtool_version, which_list;

                                print  ""
                                print  "install \\"
                                print  "install.libs \\"
                                print  ""
                                print  "install \\"
                                print  "install.libs \\"


@@ -432,7 +463,7 @@ END {
                        {
                                end_name = lib_name;
                                printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
                        {
                                end_name = lib_name;
                                printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS

-                               printf "\t$(AR) $(ARFLAGS) $@ $?\n"
+                               printf "\t$(%sAR) $(%sARFLAGS) $@ $?\n", TOOL_PREFIX, TOOL_PREFIX;

                                printf "\t$(RANLIB) $@\n"
                                if ( host == "vxworks" )
                                {
                                printf "\t$(RANLIB) $@\n"
                                if ( host == "vxworks" )
                                {

diff --git a/ncurses/base/lib_addch.c b/ncurses/base/lib_addch.c
index 622cf11cacf115e8185d0cb8645df1ed8493b616..b72eaad928c8e9c95d7df0f4535e3566569bbbda 100644 (file)
--- a/ncurses/base/lib_addch.c
+++ b/ncurses/base/lib_addch.c
@@ -36,7 +36,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
 #include <curses.priv.h>
 #include <ctype.h>
 

-MODULE_ID("$Id: lib_addch.c,v 1.126 2013/03/02 21:06:47 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.127 2013/03/17 00:30:29 tom Exp $")

 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 


@@ -431,7 +431,7 @@ waddch_nosync(WINDOW *win, const NCURSES_CH_T ch)
 #if USE_WIDEC_SUPPORT
               || ((sp == 0 || !sp->_legacy_coding) &&
                   (WINDOW_EXT(win, addch_used)
 #if USE_WIDEC_SUPPORT
               || ((sp == 0 || !sp->_legacy_coding) &&
                   (WINDOW_EXT(win, addch_used)

-                   || !_nc_is_charable(t)))
+                   || !_nc_is_charable(CharOf(ch))))

 #endif
        )) {
        return waddch_literal(win, ch);
 #endif
        )) {
        return waddch_literal(win, ch);

diff --git a/package/debian/changelog b/package/debian/changelog
index 4e2302980b88fa9e586c5106289089cee319f96e..e3044394e57846c15989f89730ee9f64adeeb2c9 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (5.9-20130309) unstable; urgency=low
+ncurses6 (5.9-20130316) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 09 Mar 2013 11:12:13 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 10 Mar 2013 19:17:14 -0400

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/ncurses.spec b/package/ncurses.spec
index e3ea5b3c4162363a63dcad9d65ac3130f2fb2ae8..caf90ca6b698960a734374527d4f51344fd4f3f9 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Release: 5.9
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Release: 5.9

-Version: 20130309
+Version: 20130316

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{release}-%{version}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{release}-%{version}.tgz

diff --git a/progs/dump_entry.c b/progs/dump_entry.c
index 99f3b2a83900520cbac17458e933863cda707210..95f5323d5af89f68eb7e11587ef6e94d60c005af 100644 (file)
--- a/progs/dump_entry.c
+++ b/progs/dump_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -39,7 +39,7 @@
 #include "termsort.c"          /* this C file is generated */
 #include <parametrized.h>      /* so is this */
 
 #include "termsort.c"          /* this C file is generated */
 #include <parametrized.h>      /* so is this */
 

-MODULE_ID("$Id: dump_entry.c,v 1.104 2012/12/30 00:51:13 tom Exp $")
+MODULE_ID("$Id: dump_entry.c,v 1.107 2013/03/17 00:27:15 tom Exp $")

 
 #define INDENT                 8
 #define DISCARD(string) string = ABSENT_STRING
 
 #define INDENT                 8
 #define DISCARD(string) string = ABSENT_STRING


@@ -491,7 +491,7 @@ has_params(const char *src)
 }
 
 static char *
 }
 
 static char *

-fmt_complex(char *src, int level)
+fmt_complex(TERMTYPE *tterm, const char *capability, char *src, int level)

 {
     bool percent = FALSE;
     bool params = has_params(src);
 {
     bool percent = FALSE;
     bool params = has_params(src);


@@ -527,13 +527,15 @@ fmt_complex(char *src, int level)
                    strncpy_DYN(&tmpbuf, "%", 1);
                    strncpy_DYN(&tmpbuf, src, 1);
                    if (*src++ == '?') {
                    strncpy_DYN(&tmpbuf, "%", 1);
                    strncpy_DYN(&tmpbuf, src, 1);
                    if (*src++ == '?') {

-                       src = fmt_complex(src, level + 1);
+                       src = fmt_complex(tterm, capability, src, level + 1);

                        if (*src != '\0' && *src != '%') {
                            strncpy_DYN(&tmpbuf, "\n", 1);
                            indent_DYN(&tmpbuf, level + 1);
                        }
                    } else if (level == 1) {
                        if (*src != '\0' && *src != '%') {
                            strncpy_DYN(&tmpbuf, "\n", 1);
                            indent_DYN(&tmpbuf, level + 1);
                        }
                    } else if (level == 1) {

-                       _nc_warning("%%%c without %%?", *src);
+                       _nc_warning("%s: %%%c without %%? in %s",
+                                   _nc_first_name(tterm->term_names),
+                                   *src, capability);

                    }
                }
                continue;
                    }
                }
                continue;


@@ -547,9 +549,17 @@ fmt_complex(char *src, int level)
                    indent_DYN(&tmpbuf, level);
                    strncpy_DYN(&tmpbuf, "%", 1);
                    strncpy_DYN(&tmpbuf, src++, 1);
                    indent_DYN(&tmpbuf, level);
                    strncpy_DYN(&tmpbuf, "%", 1);
                    strncpy_DYN(&tmpbuf, src++, 1);

+                   if (src[0] == '%'
+                       && src[1] != '\0'
+                       && (strchr("?e;", src[1])) == 0) {
+                       tmpbuf.text[tmpbuf.used++] = '\n';
+                       indent_DYN(&tmpbuf, level);
+                   }

                    return src;
                }
                    return src;
                }

-               _nc_warning("%%; without %%?");
+               _nc_warning("%s: %%; without %%? in %s",
+                           _nc_first_name(tterm->term_names),
+                           capability);

            }
            break;
        case 'p':
            }
            break;
        case 'p':


@@ -820,7 +830,7 @@ fmt_entry(TERMTYPE *tterm,
                if (pretty
                    && (outform == F_TERMINFO
                        || outform == F_VARIABLE)) {
                if (pretty
                    && (outform == F_TERMINFO
                        || outform == F_VARIABLE)) {

-                   fmt_complex(src, 1);
+                   fmt_complex(tterm, name, src, 1);

                } else {
                    strcpy_DYN(&tmpbuf, src);
                }
                } else {
                    strcpy_DYN(&tmpbuf, src);
                }

diff --git a/progs/tic.c b/progs/tic.c
index d9d12cf88afb61b969d9d728a44aad9ed904af49..3c9a6049105d95febda50491955a1a60ac469a12 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -46,7 +46,7 @@
 #include <hashed_db.h>
 #include <transform.h>
 
 #include <hashed_db.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tic.c,v 1.184 2013/03/09 23:14:07 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.185 2013/03/17 00:57:05 tom Exp $")

 
 #define STDIN_NAME "<stdin>"
 
 
 #define STDIN_NAME "<stdin>"
 


@@ -432,7 +432,7 @@ copy_input(FILE *source, const char *filename, char *alt_file)
         */
        result = fopen(alt_file, "r+");
        fclose(target);
         */
        result = fopen(alt_file, "r+");
        fclose(target);

-       to_remove = alt_file;
+       to_remove = strdup(alt_file);

     }
     return result;
 }
     }
     return result;
 }