ncurses 5.9 - patch 20111112

+ add pccon entries for OpenBSD console (Alexei Malinin).
+ build-fix for OpenBSD 4.9 with gcc 4.2.1, setting _XOPEN_SOURCE to
  600 to work around inconsistent ifdef'ing of wcstof between C and
  C++ header files.
+ modify capconvert script to accept more than exact match on "xterm",
  e.g., the "xterm-*" variants, to exclude from the conversion (patch
  by Robert Millan).
+ add -lc_r as alternative for -lpthread, allows build of threaded code
  in older FreeBSD machines.
+ build-fix for MirBSD, which fails when either _XOPEN_SOURCE or
  _POSIX_SOURCE are defined.
+ fix a typo misc/Makefile.in, used in uninstalling pc-files.
This commit is contained in:
Thomas E. Dickey 2011-11-13 02:51:43 +00:00
parent 7ca9d1eb1a
commit b7f1cb3f50
11 changed files with 3741 additions and 2909 deletions

44
Ada95/aclocal.m4 vendored
View File

@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey
dnl
dnl $Id: aclocal.m4,v 1.39 2011/10/30 23:24:00 tom Exp $
dnl $Id: aclocal.m4,v 1.40 2011/11/13 02:11:11 tom Exp $
dnl Macros used in NCURSES Ada95 auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -3607,7 +3607,7 @@ fi
AC_SUBST(PKG_CONFIG_LIBDIR)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_WITH_PTHREAD version: 3 updated: 2010/05/29 16:31:02
dnl CF_WITH_PTHREAD version: 4 updated: 2011/11/12 21:08:44
dnl ---------------
dnl Check for POSIX thread library.
AC_DEFUN([CF_WITH_PTHREAD],
@ -3623,28 +3623,32 @@ if test "$with_pthread" != no ; then
AC_CHECK_HEADER(pthread.h,[
AC_DEFINE(HAVE_PTHREADS_H)
AC_MSG_CHECKING(if we can link with the pthread library)
cf_save_LIBS="$LIBS"
CF_ADD_LIB(pthread)
AC_TRY_LINK([
for cf_lib_pthread in pthread c_r
do
AC_MSG_CHECKING(if we can link with the $cf_lib_pthread library)
cf_save_LIBS="$LIBS"
CF_ADD_LIB($cf_lib_pthread)
AC_TRY_LINK([
#include <pthread.h>
],[
int rc = pthread_create(0,0,0,0);
int rc = pthread_create(0,0,0,0);
],[with_pthread=yes],[with_pthread=no])
LIBS="$cf_save_LIBS"
AC_MSG_RESULT($with_pthread)
LIBS="$cf_save_LIBS"
AC_MSG_RESULT($with_pthread)
test "$with_pthread" = yes && break
done
if test "$with_pthread" = yes ; then
CF_ADD_LIB(pthread)
AC_DEFINE(HAVE_LIBPTHREADS)
else
AC_MSG_ERROR(Cannot link with pthread library)
fi
if test "$with_pthread" = yes ; then
CF_ADD_LIB($cf_lib_pthread)
AC_DEFINE(HAVE_LIBPTHREADS)
else
AC_MSG_ERROR(Cannot link with pthread library)
fi
])
fi
])
dnl ---------------------------------------------------------------------------
dnl CF_XOPEN_SOURCE version: 39 updated: 2011/10/30 17:09:50
dnl CF_XOPEN_SOURCE version: 40 updated: 2011/11/12 21:08:44
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@ -3693,11 +3697,17 @@ linux*|gnu*|mint*|k*bsd*-gnu) #(vi
CF_GNU_SOURCE
;;
mirbsd*) #(vi
# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
cf_XOPEN_SOURCE=
CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
;;
netbsd*) #(vi
cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
;;
openbsd[[4-9]]*) #(vi
# setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
cf_XOPEN_SOURCE=600
;;
openbsd*) #(vi
# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
;;

1027
Ada95/configure vendored

File diff suppressed because it is too large Load Diff

26
NEWS
View File

@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.1812 2011/10/30 14:36:41 tom Exp $
-- $Id: NEWS,v 1.1818 2011/11/13 02:07:55 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -45,6 +45,20 @@ 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.
20111112
+ add pccon entries for OpenBSD console (Alexei Malinin).
+ build-fix for OpenBSD 4.9 with gcc 4.2.1, setting _XOPEN_SOURCE to
600 to work around inconsistent ifdef'ing of wcstof between C and
C++ header files.
+ modify capconvert script to accept more than exact match on "xterm",
e.g., the "xterm-*" variants, to exclude from the conversion (patch
by Robert Millan).
+ add -lc_r as alternative for -lpthread, allows build of threaded code
in older FreeBSD machines.
+ build-fix for MirBSD, which fails when either _XOPEN_SOURCE or
_POSIX_SOURCE are defined.
+ fix a typo misc/Makefile.in, used in uninstalling pc-files.
20111030
+ modify make_db_path() to allow creating "terminfo.db" in the same
directory as an existing "terminfo" directory. This fixes a case
@ -470,7 +484,7 @@ it is not possible to add this information.
20110212
+ regenerated html manpages.
+ use _tracef() in show_where() function of tic, to work correctly with
special case of trace configuration.
special case of trace configuration.
20110205
+ add xterm-utf8 entry as a demo of the U8 feature -TD
@ -534,7 +548,7 @@ it is not possible to add this information.
version which works with termcap.
+ remove obsolete emacs "Local Variables" section from documentation
(request by Sven Joachim).
+ update doc/html/index.html to include NCURSES-Programming-HOWTO.html
+ update doc/html/index.html to include NCURSES-Programming-HOWTO.html
(report by Sven Joachim).
20101128
@ -609,8 +623,8 @@ it is not possible to add this information.
Sven Joachim).
+ add parameterized cursor-controls to linux-basic (report by Dae) -TD
> patch by Juergen Pfeifer:
+ document how to build 32-bit libraries in README.MinGW
+ fixes to filename computation in mk-dlls.sh.in
+ document how to build 32-bit libraries in README.MinGW
+ fixes to filename computation in mk-dlls.sh.in
+ use POSIX locale in mk-dlls.sh.in rather than en_US (report by Sven
Joachim).
+ add a check in mk-dlls.sh.in to obtain the size of a pointer to
@ -793,7 +807,7 @@ it is not possible to add this information.
20100417
+ modify _nc_capcmp() to work with cancelled strings.
+ correct translation of "^" in _nc_infotocap(), used to transform
terminfo to termcap strings
terminfo to termcap strings
+ add configure --disable-rpath-hack, to allow disabling the feature
which adds rpath options for libraries in unusual places.
+ improve CF_RPATH_HACK_2 by checking if the rpath option for a given

44
aclocal.m4 vendored
View File

@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: aclocal.m4,v 1.581 2011/10/30 21:13:25 tom Exp $
dnl $Id: aclocal.m4,v 1.586 2011/11/13 02:10:04 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -6691,7 +6691,7 @@ fi
AC_SUBST(PKG_CONFIG_LIBDIR)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_WITH_PTHREAD version: 3 updated: 2010/05/29 16:31:02
dnl CF_WITH_PTHREAD version: 4 updated: 2011/11/12 21:08:44
dnl ---------------
dnl Check for POSIX thread library.
AC_DEFUN([CF_WITH_PTHREAD],
@ -6707,23 +6707,27 @@ if test "$with_pthread" != no ; then
AC_CHECK_HEADER(pthread.h,[
AC_DEFINE(HAVE_PTHREADS_H)
AC_MSG_CHECKING(if we can link with the pthread library)
cf_save_LIBS="$LIBS"
CF_ADD_LIB(pthread)
AC_TRY_LINK([
for cf_lib_pthread in pthread c_r
do
AC_MSG_CHECKING(if we can link with the $cf_lib_pthread library)
cf_save_LIBS="$LIBS"
CF_ADD_LIB($cf_lib_pthread)
AC_TRY_LINK([
#include <pthread.h>
],[
int rc = pthread_create(0,0,0,0);
int rc = pthread_create(0,0,0,0);
],[with_pthread=yes],[with_pthread=no])
LIBS="$cf_save_LIBS"
AC_MSG_RESULT($with_pthread)
LIBS="$cf_save_LIBS"
AC_MSG_RESULT($with_pthread)
test "$with_pthread" = yes && break
done
if test "$with_pthread" = yes ; then
CF_ADD_LIB(pthread)
AC_DEFINE(HAVE_LIBPTHREADS)
else
AC_MSG_ERROR(Cannot link with pthread library)
fi
if test "$with_pthread" = yes ; then
CF_ADD_LIB($cf_lib_pthread)
AC_DEFINE(HAVE_LIBPTHREADS)
else
AC_MSG_ERROR(Cannot link with pthread library)
fi
])
fi
])
@ -6791,7 +6795,7 @@ CF_NO_LEAKS_OPTION(valgrind,
[USE_VALGRIND])
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_XOPEN_SOURCE version: 39 updated: 2011/10/30 17:09:50
dnl CF_XOPEN_SOURCE version: 40 updated: 2011/11/12 21:08:44
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@ -6840,11 +6844,17 @@ linux*|gnu*|mint*|k*bsd*-gnu) #(vi
CF_GNU_SOURCE
;;
mirbsd*) #(vi
# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
cf_XOPEN_SOURCE=
CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
;;
netbsd*) #(vi
cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
;;
openbsd[[4-9]]*) #(vi
# setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
cf_XOPEN_SOURCE=600
;;
openbsd*) #(vi
# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
;;

2717
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.842 2011/10/30 10:52:27 tom Exp $
# $Id: dist.mk,v 1.843 2011/11/11 18:50:46 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 = 9
NCURSES_PATCH = 20111030
NCURSES_PATCH = 20111112
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.56 2011/02/21 01:09:31 tom Exp $
# $Id: Makefile.in,v 1.57 2011/11/11 18:05:45 tom Exp $
##############################################################################
# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. #
# #
@ -139,7 +139,7 @@ uninstall.data :
uninstall.libs :
-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
@MAKE_PC_FILES@ $(SHELL) 'for name in *.pc; do rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done'
@MAKE_PC_FILES@ $(SHELL) -c 'for name in *.pc; do rm -f $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; done'
tags :

View File

@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
# $Revision: 1.401 $
# $Date: 2011/09/11 00:34:21 $
# $Revision: 1.404 $
# $Date: 2011/11/13 01:54:10 $
#
# 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
@ -1664,6 +1664,56 @@ qansi-m|QNX ansi with mouse,
qansi-w|QNX ansi for windows,
xvpa, use=qansi-m,
#### OpenBSD consoles
#
# From: Alexei Malinin <Alexei.Malinin@mail.ru>; October, 2011.
#
# The following terminal descriptions for the AMD/Intel PC console
# were prepared based on information contained in the OpenBSD-4.9
# termtypes.master and wscons(4) & vga(4) manuals (2010, November).
#
# Added bce based on testing with tack -TD
# Added several capabilities to pccon+base, reading wsemul_vt100_subr.c -TD
# Changed kbs to DEL and removed keys that duplicate stty settings -TD
#
pccon+keys|OpenBSD PC keyboard keys,
kbs=\177, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
kdch1=\E[3~, kend=\E[8~, kent=^M, kf1=\E[11~, kf10=\E[21~,
kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, kf3=\E[13~,
kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
kf9=\E[20~, khome=\E[7~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
krfr=^R,
pccon+sgr+acs0|sgr and simple ASCII pseudographics for OpenBSD PC console,
acsc=+>\,<-\^.v0#`+a\:f\\h#i#j+k+l+m+n+o~p-q-r-s_t+u+v+w+x|y#z#{*|!}#~o,
sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m,
pccon+sgr+acs|sgr and default ASCII pseudographics for OpenBSD PC console,
acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
enacs=\E)0$<5>, rmacs=\E(B$<5>,
sgr=\E[0%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<5>,
sgr0=\E[m\E(B$<5>, smacs=\E(0$<5>,
pccon+colors|ANSI colors for OpenBSD PC console,
bce,
colors#8, pairs#64,
op=\E[m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
pccon+base|base capabilities for OpenBSD PC console,
am, km, mc5i, msgr, npc, nxon, xenl, xon,
cols#80, it#8, lines#24,
bel=^G, clear=\E[H\E[J, cr=^M, cub1=^H, cud1=^J, cuf1=\E[C,
cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
dch1=\E[P, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
il1=\E[L, ind=\ED, nel=\EE, rev=\E[7m, ri=\EM, rmam=\E[?7l,
rmso=\E[m, rs2=\Ec$<50>, smam=\E[?7h, smso=\E[7m,
tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n,
pccon0-m|OpenBSD PC console without colors & with simple ASCII pseudographics,
use=pccon+base, use=pccon+sgr+acs0, use=pccon+keys,
pccon0|OpenBSD PC console with simple ASCII pseudographics,
use=pccon0-m, use=pccon+colors,
pccon-m|OpenBSD PC console without colors,
use=pccon+base, use=pccon+sgr+acs, use=pccon+keys,
pccon|OpenBSD PC console,
use=pccon-m, use=pccon+colors,
#### NetBSD consoles
#
# pcvt termcap database entries (corresponding to release 3.31)
@ -22582,4 +22632,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
# 2011-09-10
# * add xterm+kbs fragment from xterm #272 -TD
#
# 2011-11-12
# * add pccon entries for OpenBSD console (Alexei Malinin)
#
######## SHANTIH! SHANTIH! SHANTIH!

View File

@ -1,6 +1,6 @@
#!/bin/sh
##############################################################################
# Copyright (c) 1998,2006 Free Software Foundation, Inc. #
# Copyright (c) 1998-2006,2011 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"), #
@ -26,7 +26,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: capconvert,v 1.4 2006/04/22 21:46:17 tom Exp $
# $Id: capconvert,v 1.5 2011/11/12 23:28:07 Robert.Millan Exp $
#
# capconvert -- automated conversion from termcap to terminfo
#
@ -77,16 +77,18 @@ then
# Assumes the terminfo master covers all canned terminal types
exit;
fi
if test "$TERM" = "xterm"
then
case $TERM in
xterm | xterm-*)
echo "You are running xterm, which usually sets TERMCAP itself."
echo "We can ignore this, because terminfo knows about xterm."
echo "So you will just use the system-wide terminfo tree."
exit;
else
exit
;;
*)
echo "We will have to make a local one for you anyway, to capture the effect"
echo "of your TERMCAP variable."
fi
;;
esac
else
echo "No system-wide terminfo tree. We will make you a local one."
fi
@ -109,7 +111,7 @@ IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:"
for x in $PATH .
do
if test $OPT $x/tic
then
then
TIC=$x/tic
break
fi
@ -141,7 +143,7 @@ if test -d $HOME/.terminfo
then
echo "It appears you already have a private terminfo directory"
echo "at $HOME/.terminfo; this seems odd, because TERMINFO"
echo "is not defined. I am not going to second-guess this -- if you"
echo "is not defined. I am not going to second-guess this -- if you"
echo "really want me to try auto-configuring for you, remove or"
echo "rename $HOME/terminfo and run me again."
exit;
@ -214,7 +216,7 @@ trap 0 1 2 5 15
#
echo "You now have a private tree under $HOME/.terminfo;"
echo "the ncurses library will automatically read from it,"
echo "and ncurses tic will automatically compile entries to it."
echo "and ncurses tic will automatically compile entries to it."
# We're done unless user has a .termcap file or equivalent named by TERMCAP
if test -z "$TERMCAP"
@ -235,7 +237,7 @@ then
echo "Done."
echo "Note that editing $HOME/.termcap will no longer change the data curses sees."
elif test -f "$TERMCAP"
then
then
echo "Your TERMCAP names the file $TERMCAP. I will compile that."
eval $TIC $TERMCAP
echo "Done."

12
test/aclocal.m4 vendored
View File

@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written *
dnl authorization. *
dnl***************************************************************************
dnl
dnl $Id: aclocal.m4,v 1.70 2011/10/30 23:26:32 tom Exp $
dnl $Id: aclocal.m4,v 1.71 2011/11/13 02:11:59 tom Exp $
dnl
dnl Author: Thomas E. Dickey
dnl
@ -3146,7 +3146,7 @@ AC_TRY_LINK([
test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_XOPEN_SOURCE version: 39 updated: 2011/10/30 17:09:50
dnl CF_XOPEN_SOURCE version: 40 updated: 2011/11/12 21:08:44
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@ -3195,11 +3195,17 @@ linux*|gnu*|mint*|k*bsd*-gnu) #(vi
CF_GNU_SOURCE
;;
mirbsd*) #(vi
# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <arpa/inet.h>
# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
cf_XOPEN_SOURCE=
CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
;;
netbsd*) #(vi
cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
;;
openbsd[[4-9]]*) #(vi
# setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw
cf_XOPEN_SOURCE=600
;;
openbsd*) #(vi
# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
;;

2691
test/configure vendored

File diff suppressed because it is too large Load Diff