From efd59f16f336b4c4c698ff783e1723f3161026ef Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sat, 14 Apr 2007 23:23:43 +0000 Subject: [PATCH 1/1] ncurses 5.6 - patch 20070414 --- NEWS | 10 +++++++-- configure | 56 ++++++++++++++++++++++++---------------------- configure.in | 6 +++-- dist.mk | 4 ++-- man/curs_opaque.3x | 22 +++++++++--------- 5 files changed, 54 insertions(+), 44 deletions(-) diff --git a/NEWS b/NEWS index 0085579a..6b5cfabc 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2006,2007 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 -- @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.1115 2007/04/07 23:08:57 tom Exp $ +-- $Id: NEWS,v 1.1116 2007/04/14 20:25:08 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,12 @@ 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. +20060414 + + fix whitespace in curs_opaque.3x which caused a spurious ';' in + the installed aliases (report by Peter Santoro). + + fix configure script to not try to generate adacurses-config when + Ada95 tree is not built. + 20060407 + add man/curs_legacy.3x, man/curs_opaque.3x + fix acs_map binding for Ada95 when --enable-reentrant is used. diff --git a/configure b/configure index 5e7895e4..964656dd 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.412 . +# From configure.in Revision: 1.413 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20061216. # @@ -14898,6 +14898,8 @@ ADA_OBJECTS="$withval" fi fi +else + cf_with_ada=no fi ### Construct the ncurses library-subsets, if any, from this set of keywords: @@ -14910,7 +14912,7 @@ fi ### chooses to split module lists into libraries. ### ### (see CF_LIB_RULES). -echo "$as_me:14913: checking for library subsets" >&5 +echo "$as_me:14915: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -14935,7 +14937,7 @@ LIB_SUBSETS="${LIB_SUBSETS}base" test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" -echo "$as_me:14938: result: $LIB_SUBSETS" >&5 +echo "$as_me:14940: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -14973,7 +14975,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:14976: checking default library suffix" >&5 +echo "$as_me:14978: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -14984,10 +14986,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:14987: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:14989: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:14990: checking default library-dependency suffix" >&5 +echo "$as_me:14992: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -15016,10 +15018,10 @@ if test $DFT_LWR_MODEL = shared ; then ;; esac fi -echo "$as_me:15019: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:15021: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:15022: checking default object directory" >&5 +echo "$as_me:15024: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -15035,12 +15037,12 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:15038: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:15040: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 # libtool thinks it can make c++ shared libraries (perhaps only g++) if test "$cf_with_cxx" = yes ; then -echo "$as_me:15043: checking c++ library-dependency suffix" >&5 +echo "$as_me:15045: checking c++ library-dependency suffix" >&5 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 if test "$with_libtool" != "no"; then CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX @@ -15066,7 +15068,7 @@ else esac test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" fi -echo "$as_me:15069: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:15071: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -15158,12 +15160,12 @@ fi # needed for Ada95 TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'` -echo "$as_me:15161: checking where we will install curses.h" >&5 +echo "$as_me:15163: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 test "$with_overwrite" = no && \ test "x$includedir" = 'x${prefix}/include' && \ includedir='${prefix}/include/ncurses'${LIB_SUFFIX} -echo "$as_me:15166: result: $includedir" >&5 +echo "$as_me:15168: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -15171,7 +15173,7 @@ echo "${ECHO_T}$includedir" >&6 if test "$with_overwrite" != no ; then if test "$NCURSES_LIBUTF8" = 1 ; then NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' - { echo "$as_me:15174: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:15176: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;} fi fi @@ -15187,7 +15189,7 @@ EOF ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:15190: checking for src modules" >&5 +echo "$as_me:15192: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -15250,7 +15252,7 @@ EOF fi fi done -echo "$as_me:15253: result: $cf_cv_src_modules" >&5 +echo "$as_me:15255: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -15500,7 +15502,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:15503: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:15505: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -15676,7 +15678,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:15679: error: ambiguous option: $1 + { { echo "$as_me:15681: 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;} @@ -15695,7 +15697,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:15698: error: unrecognized option: $1 + -*) { { echo "$as_me:15700: 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;} @@ -15791,7 +15793,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" ;; - *) { { echo "$as_me:15794: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:15796: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -16168,7 +16170,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:16171: creating $ac_file" >&5 + { echo "$as_me:16173: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -16186,7 +16188,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:16189: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:16191: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -16199,7 +16201,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:16202: error: cannot find input file: $f" >&5 + { { echo "$as_me:16204: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -16265,7 +16267,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:16268: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:16270: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -16276,7 +16278,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:16279: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:16281: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -16289,7 +16291,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:16292: error: cannot find input file: $f" >&5 + { { echo "$as_me:16294: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -16347,7 +16349,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 - { echo "$as_me:16350: $ac_file is unchanged" >&5 + { echo "$as_me:16352: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/configure.in b/configure.in index 6cc9591d..d7911209 100644 --- a/configure.in +++ b/configure.in @@ -28,14 +28,14 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.412 2007/04/07 21:15:23 tom Exp $ +dnl $Id: configure.in,v 1.413 2007/04/14 19:52:26 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.13.20020210) -AC_REVISION($Revision: 1.412 $) +AC_REVISION($Revision: 1.413 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1421,6 +1421,8 @@ end conftest;],[cf_cv_pragma_unreferenced=yes],[cf_cv_pragma_unreferenced=no]) fi fi +else + cf_with_ada=no fi ### Construct the ncurses library-subsets, if any, from this set of keywords: diff --git a/dist.mk b/dist.mk index 5c5f3b5f..6b93ffde 100644 --- 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.588 2007/04/07 17:04:04 tom Exp $ +# $Id: dist.mk,v 1.589 2007/04/14 19:45:21 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 = 6 -NCURSES_PATCH = 20070407 +NCURSES_PATCH = 20070414 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x index 1f04fbf2..ac538123 100644 --- a/man/curs_opaque.3x +++ b/man/curs_opaque.3x @@ -26,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_opaque.3x,v 1.1 2007/04/07 23:19:40 tom Exp $ +.\" $Id: curs_opaque.3x,v 1.2 2007/04/14 20:19:39 tom Exp $ .TH curs_opaque 3X "" .na .hy 0 @@ -46,25 +46,25 @@ .SH SYNOPSIS \fB#include \fR .sp -\fBbool is_cleared (WINDOW *win);\fR +\fBbool is_cleared(WINDOW *win);\fR .br -\fBbool is_idcok (WINDOW *win);\fR +\fBbool is_idcok(WINDOW *win);\fR .br -\fBbool is_idlok (WINDOW *win);\fR +\fBbool is_idlok(WINDOW *win);\fR .br -\fBbool is_immedok (WINDOW *win);\fR +\fBbool is_immedok(WINDOW *win);\fR .br -\fBbool is_keypad (WINDOW *win);\fR +\fBbool is_keypad(WINDOW *win);\fR .br -\fBbool is_leaveok (WINDOW *win);\fR +\fBbool is_leaveok(WINDOW *win);\fR .br -\fBbool is_nodelay (WINDOW *win);\fR +\fBbool is_nodelay(WINDOW *win);\fR .br -\fBbool is_notimeout (WINDOW *win);\fR +\fBbool is_notimeout(WINDOW *win);\fR .br -\fBbool is_scrollok (WINDOW *win);\fR +\fBbool is_scrollok(WINDOW *win);\fR .br -\fBbool is_syncok (WINDOW *win);\fR +\fBbool is_syncok(WINDOW *win);\fR .br .SH DESCRIPTION This implementation provides functions which return properties -- 2.44.0