ncurses 5.7 - patch 20100313

+ modify install-rule for manpages so that *-config manpages will
  install when building with --srcdir (report by Sven Joachim).
+ modify CF_DISABLE_LEAKS configure macro so that the --enable-leaks
  option is not the same as --disable-leaks (GenToo #305889).
+ modify #define's for build-compiler to suppress cchar_t symbol from
  compile of make_hash and make_keys, improving cross-compilation of
  ncursesw (report by Bernhard Rosenkraenzer).
+ modify CF_MAN_PAGES configure macro to replace all occurrences of
  TPUT in tput.1's manpage (Debian #573597, report/analysis by Anders
  Kaseorg).

diff --git a/NEWS b/NEWS
index d240ab00830e638c5f677c7386410de09295efdb..22821c568502b7d839fc63b481d355a3ef29bf8a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1509 2010/03/06 21:03:02 tom Exp $
+-- $Id: NEWS,v 1.1513 2010/03/13 20:30:34 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,18 @@ 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.
 
+20100313
+       + modify install-rule for manpages so that *-config manpages will
+         install when building with --srcdir (report by Sven Joachim).
+       + modify CF_DISABLE_LEAKS configure macro so that the --enable-leaks
+         option is not the same as --disable-leaks (GenToo #305889).
+       + modify #define's for build-compiler to suppress cchar_t symbol from
+         compile of make_hash and make_keys, improving cross-compilation of
+         ncursesw (report by Bernhard Rosenkraenzer).
+       + modify CF_MAN_PAGES configure macro to replace all occurrences of
+         TPUT in tput.1's manpage (Debian #573597, report/analysis by Anders
+         Kaseorg).
+
 20100306
        + generate manpages for the *-config scripts, adapted from help2man
          (suggested by Sven Joachim).

diff --git a/aclocal.m4 b/aclocal.m4
index 9db0a644bce932420c531a35b50f2da4f666c08f..a8e9dcfb343f85140892650a5f62afe965e45f5b 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.492 2010/03/06 18:47:56 tom Exp $
+dnl $Id: aclocal.m4,v 1.494 2010/03/13 20:15:30 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -985,7 +985,7 @@ done
 AC_SUBST(DIRS_TO_MAKE)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_LEAKS version: 4 updated: 2006/12/16 15:10:42
+dnl CF_DISABLE_LEAKS version: 5 updated: 2010/03/13 15:14:55
 dnl ----------------
 dnl Combine no-leak checks with the libraries or tools that are used for the
 dnl checks.
@@ -998,7 +998,7 @@ AC_REQUIRE([CF_WITH_VALGRIND])
 AC_MSG_CHECKING(if you want to perform memory-leak testing)
 AC_ARG_ENABLE(leaks,
        [  --disable-leaks         test: free permanent memory, analyze leaks],
-       [with_no_leaks=yes],
+       [if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi],
        : ${with_no_leaks:=no})
 AC_MSG_RESULT($with_no_leaks)
 
@@ -3304,7 +3304,7 @@ AC_ARG_WITH(manpage-tbl,
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 35 updated: 2007/03/31 11:47:29
+dnl CF_MAN_PAGES version: 36 updated: 2010/03/13 13:41:01
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that
@@ -3435,7 +3435,7 @@ CF_EOF
                cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
                cf_name=`echo $cf_name|sed "$program_transform_name"`
 cat >>$cf_edit_man <<-CF_EOF
-               s,@$cf_NAME@,$cf_name,
+               s,@$cf_NAME@,$cf_name,g
 CF_EOF
        done
        ])

diff --git a/configure b/configure
index fb2bc3f039863672b1e4296355de4c6829963fa9..2cd7d68fc8990fc808131f47b27c3bb0df1cac6b 100755 (executable)
--- a/configure
+++ b/configure
@@ -9301,7 +9301,7 @@ CF_EOF
                cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
                cf_name=`echo $cf_name|sed "$program_transform_name"`
 cat >>$cf_edit_man <<-CF_EOF
-               s,@$cf_NAME@,$cf_name,
+               s,@$cf_NAME@,$cf_name,g
 CF_EOF
        done
 
@@ -11656,7 +11656,7 @@ echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&
 # Check whether --enable-leaks or --disable-leaks was given.
 if test "${enable_leaks+set}" = set; then
   enableval="$enable_leaks"
-  with_no_leaks=yes
+  if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi
 else
   : ${with_no_leaks:=no}
 fi;

diff --git a/dist.mk b/dist.mk
index 258faf033adc1b38b7bf5347f253439e6c0c0a96..e220a6199c1e5eb9ce7b719cd85894adaada993a 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.749 2010/03/06 17:59:20 tom Exp $
+# $Id: dist.mk,v 1.750 2010/03/13 18:24:27 tom Exp $
 # 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 = 7
-NCURSES_PATCH = 20100306
+NCURSES_PATCH = 20100313
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/man/Makefile.in b/man/Makefile.in
index bd998f3754344504d0c14f18573e18effede355c..fde9a935ba3feb87191ae4b5d08f4701412de485 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.42 2010/03/06 20:59:25 tom Exp $
+# $Id: Makefile.in,v 1.43 2010/03/13 20:28:21 tom Exp $
 ##############################################################################
 # Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -54,7 +54,7 @@ tags :
 $(DESTDIR)$(mandir) :
        sh $(srcdir)/../mkdirs.sh $@
 
-EDITARGS = $(DESTDIR)$(mandir) $(srcdir) terminfo.5 $(srcdir)/*.[0-9]*
+EDITARGS = $(DESTDIR)$(mandir) $(srcdir) terminfo.5 *-config.1 $(srcdir)/*.[0-9]*
 
 install install.man : terminfo.5 $(DESTDIR)$(mandir)
        sh ../edit_man.sh normal installing $(EDITARGS)

diff --git a/man/ncurses.3x b/man/ncurses.3x
index 651531b0a63856c89f92c6529d372382cc90551f..448d2f1f315c84929a2dd47eaee19b491f4b4a32 100644 (file)
--- a/man/ncurses.3x
+++ b/man/ncurses.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: ncurses.3x,v 1.94 2010/01/09 16:34:57 tom Exp $
+.\" $Id: ncurses.3x,v 1.95 2010/03/13 20:25:19 tom Exp $
 .hy 0
 .TH ncurses 3X ""
 .ds n 5
@@ -46,7 +46,7 @@ is the approved replacement for
 This describes \fBncurses\fR
 version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
 .PP
-The \fBncurses\fR library emulates the \fBcurses\fR(3X) library of
+The \fBncurses\fR library emulates the curses library of
 System V Release 4 UNIX,
 and XPG4 (X/Open Portability Guide) curses (also known as XSI curses).
 XSI stands for X/Open System Interfaces Extension.

diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in
index 9304d201c018afb867e8f7edaa046101708f858c..f2c961bf9644bb74a9328abbc92e07495aea0543 100644 (file)
--- a/ncurses/Makefile.in
+++ b/ncurses/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.124 2010/01/30 19:00:34 tom Exp $
+# $Id: Makefile.in,v 1.125 2010/03/13 19:29:55 tom Exp $
 ##############################################################################
 # Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
 #                                                                            #
@@ -93,7 +93,7 @@ CPPFLAGS      = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) @CPPFLAGS@
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
 
-BUILD_CPPFLAGS = -I../include @BUILD_CPPFLAGS@
+BUILD_CPPFLAGS = -I../include -DUSE_BUILD_CC @BUILD_CPPFLAGS@
 BUILD_CC       = @BUILD_CC@
 BUILD_CCFLAGS  = -DHAVE_CONFIG_H -I../ncurses -I$(srcdir) -I$(INCDIR) $(BUILD_CPPFLAGS) @BUILD_CFLAGS@
 BUILD_LDFLAGS  = @BUILD_LDFLAGS@

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 0018291d860c0d0fc79aad10b8168bff1c9c9618..e88bff7a96ecc5e6c165e3c6d1a7a97c005ea849 100644 (file)
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
 
 
 /*
- * $Id: curses.priv.h,v 1.452 2010/03/06 19:15:50 tom Exp $
+ * $Id: curses.priv.h,v 1.453 2010/03/13 19:33:00 tom Exp $
  *
  *     curses.priv.h
  *
@@ -546,7 +546,7 @@ typedef unsigned colorpair_t;       /* type big enough to store PAIR_OF() */
 
 #define COLOR_DEFAULT          C_MASK
 
-#if defined(USE_TERMLIB) && !defined(NEED_NCURSES_CH_T)
+#if defined(USE_BUILD_CC) || (defined(USE_TERMLIB) && !defined(NEED_NCURSES_CH_T))
 
 #undef NCURSES_CH_T            /* this is not a termlib feature */
 #define NCURSES_CH_T void      /* ...but we need a pointer in SCREEN */
@@ -593,7 +593,7 @@ typedef struct {
 
 struct _SLK;
 
-#ifndef USE_TERMLIB
+#if !(defined(USE_TERMLIB) || defined(USE_BUILD_CC))
 
 typedef struct
 {
@@ -1725,7 +1725,7 @@ NCURSES_EXPORT(int) _nc_build_wch(WINDOW *win, ARG_CH_T ch);
 #endif
 
 /* lib_addstr.c */
-#if USE_WIDEC_SUPPORT && !defined(USE_TERMLIB)
+#if USE_WIDEC_SUPPORT && !(defined(USE_TERMLIB) || defined(USE_BUILD_CC))
 extern NCURSES_EXPORT(int) _nc_wchstrlen(const cchar_t *);
 #endif
 
@@ -1856,7 +1856,7 @@ extern NCURSES_EXPORT(void) _nc_names_leaks(void);
 extern NCURSES_EXPORT(void) _nc_tgetent_leaks(void);
 #endif
 
-#ifndef USE_TERMLIB
+#if !(defined(USE_TERMLIB) || defined(USE_BUILD_CC))
 extern NCURSES_EXPORT(NCURSES_CH_T) _nc_render (WINDOW *, NCURSES_CH_T);
 extern NCURSES_EXPORT(int) _nc_waddch_nosync (WINDOW *, const NCURSES_CH_T);
 extern NCURSES_EXPORT(void) _nc_scroll_window (WINDOW *, int const, NCURSES_SIZE_T const, NCURSES_SIZE_T const, NCURSES_CH_T);
@@ -1866,7 +1866,7 @@ extern NCURSES_EXPORT(void) _nc_scroll_window (WINDOW *, int const, NCURSES_SIZE
 extern NCURSES_EXPORT(int) _nc_insert_wch(WINDOW *, const cchar_t *);
 #endif
 
-#if USE_WIDEC_SUPPORT && !defined(USE_TERMLIB)
+#if USE_WIDEC_SUPPORT && !(defined(USE_TERMLIB) || defined(USE_BUILD_CC))
 extern NCURSES_EXPORT(size_t) _nc_wcrtomb (char *, wchar_t, mbstate_t *);
 #endif