From 48d750c144b5c6543252a8dd8901dc7d8975e39d Mon Sep 17 00:00:00 2001 From: Jeroen Ruigrok/asmodai Date: Thu, 22 Sep 2005 11:14:44 +0000 Subject: [PATCH] Enable wide character support in ncurses, since we have it, better make use of it. This also enables the wide character functions for ncurses so that we actually synchronise the library and header files which the manual pages we install. Furthermore reflect the SYSTEM_NAME properly (1.1->1.3.6) and update to reflect the currently installed compiler suites. --- lib/libncurses/Makefile.inc | 3 ++- lib/libncurses/include/curses.head | 10 +++++----- lib/libncurses/include/ncurses_cfg.h | 21 ++++++++++++++++----- lib/libncurses/libform/Makefile | 3 ++- lib/libncurses/libmenu/Makefile | 3 ++- lib/libncurses/libncurses/Makefile | 3 ++- lib/libncurses/libpanel/Makefile | 3 ++- 7 files changed, 31 insertions(+), 15 deletions(-) diff --git a/lib/libncurses/Makefile.inc b/lib/libncurses/Makefile.inc index 47cc26dc2e..73011850bc 100644 --- a/lib/libncurses/Makefile.inc +++ b/lib/libncurses/Makefile.inc @@ -1,9 +1,10 @@ -# $DragonFly: src/lib/libncurses/Makefile.inc,v 1.5 2005/08/07 08:40:42 asmodai Exp $ +# $DragonFly: src/lib/libncurses/Makefile.inc,v 1.6 2005/09/22 11:14:44 asmodai Exp $ NCURSESDIR= ${.CURDIR}/../../../contrib/ncurses-5.4 CFLAGS+= -I${NCURSESDIR}/include/ CFLAGS+= -I${.CURDIR}/../include/ CFLAGS+= -I${.CURDIR} -I${.OBJDIR} +CFLAGS+= -D_XOPEN_SOURCE_EXTENDED SHLIB_MAJOR= 6 diff --git a/lib/libncurses/include/curses.head b/lib/libncurses/include/curses.head index 5d9442b78c..fc6b89969f 100644 --- a/lib/libncurses/include/curses.head +++ b/lib/libncurses/include/curses.head @@ -33,7 +33,7 @@ ****************************************************************************/ /* $Id: curses.h.in,v 1.148 2004/01/14 23:50:12 tom Exp $ */ -/* $DragonFly: src/lib/libncurses/include/curses.head,v 1.2 2005/07/29 14:20:11 joerg Exp $ */ +/* $DragonFly: src/lib/libncurses/include/curses.head,v 1.3 2005/09/22 11:14:44 asmodai Exp $ */ #ifndef __NCURSES_H #define __NCURSES_H @@ -113,7 +113,7 @@ * of the header incompatible. */ #undef NCURSES_CH_T -#define NCURSES_CH_T chtype +#define NCURSES_CH_T cchar_t typedef unsigned long chtype; @@ -312,16 +312,16 @@ typedef chtype attr_t; /* ...must be at least as wide as chtype */ #include #endif -#if 0 +#if 1 #include /* ...to get mbstate_t, etc. */ #endif #if 0 -typedef unsigned short wchar_t; +typedef unsigned short wchar_t1; #endif #if 0 -typedef unsigned int wint_t; +typedef unsigned int wint_t1; #endif #define CCHARW_MAX 5 diff --git a/lib/libncurses/include/ncurses_cfg.h b/lib/libncurses/include/ncurses_cfg.h index d4972245de..d0ff3a7e15 100644 --- a/lib/libncurses/include/ncurses_cfg.h +++ b/lib/libncurses/include/ncurses_cfg.h @@ -43,12 +43,15 @@ * http://invisible-island.net/autoconf/ * ftp://invisible-island.net/autoconf/ */ -/* $DragonFly: src/lib/libncurses/include/ncurses_cfg.h,v 1.1 2005/03/12 19:13:54 eirikn Exp $ */ +/* $DragonFly: src/lib/libncurses/include/ncurses_cfg.h,v 1.2 2005/09/22 11:14:44 asmodai Exp $ */ #ifndef NC_CONFIG_H #define NC_CONFIG_H -#define SYSTEM_NAME "dragonfly1.1" +#define SYSTEM_NAME "dragonfly1.3.6" #define CC_HAS_PROTOS 1 +#ifdef __cplusplus +#include +#endif #define HAVE_LONG_FILE_NAMES 1 #define MIXEDCASE_FILENAMES 1 #define USE_SYSMOUSE 1 @@ -75,6 +78,16 @@ #define USE_ROOT_ENVIRON 1 #define USE_ASSUMED_COLOR 1 #define USE_HASHMAP 1 +#define USE_WIDEC_SUPPORT 1 +#define HAVE_PUTWC 1 +#define HAVE_BTOWC 1 +#define HAVE_WCTOB 1 +#define HAVE_MBTOWC 1 +#define HAVE_WCTOMB 1 +#define HAVE_MBLEN 1 +#define HAVE_MBRLEN 1 +#define HAVE_MBRTOWC 1 +#define NEED_WCHAR_H 1 #define GCC_SCANF 1 #define GCC_PRINTF 1 #define GCC_UNUSED __attribute__((unused)) @@ -135,10 +148,8 @@ #define HAVE_WORKING_POLL 1 #define HAVE_TYPEINFO 1 #define ETIP_NEEDS_MATH_H 1 -#define CPP_HAS_PARAM_INIT 1 -#define HAVE_STRSTREAM_H 1 #define CPP_HAS_VSCAN_FUNC 1 -#define USE_STRSTREAM_VSCAN 1 +#define USE_STDIO_VSCAN 1 #define HAVE_SLK_COLOR 1 #define HAVE_PANEL_H 1 #define HAVE_LIBPANEL 1 diff --git a/lib/libncurses/libform/Makefile b/lib/libncurses/libform/Makefile index 2ba653e1ac..6827559f30 100644 --- a/lib/libncurses/libform/Makefile +++ b/lib/libncurses/libform/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/lib/libncurses/libform/Makefile,v 1.3 2005/03/14 15:15:13 joerg Exp $ +# $DragonFly: src/lib/libncurses/libform/Makefile,v 1.4 2005/09/22 11:14:44 asmodai Exp $ LIB= form @@ -17,6 +17,7 @@ ncurses_def.h: curses.h: cat ${.CURDIR}/../include/curses.head >$@ ${NCURSESDIR}/include/MKkey_defs.sh $(TERMINFO_CAPS) >>$@ + cat ${NCURSESDIR}/include/curses.wide >>$@ cat ${NCURSESDIR}/include/curses.tail >>$@ CLEANFILES= curses.h ncurses_def.h diff --git a/lib/libncurses/libmenu/Makefile b/lib/libncurses/libmenu/Makefile index 44a7812e53..d6d39f1260 100644 --- a/lib/libncurses/libmenu/Makefile +++ b/lib/libncurses/libmenu/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/lib/libncurses/libmenu/Makefile,v 1.3 2005/03/14 15:15:13 joerg Exp $ +# $DragonFly: src/lib/libncurses/libmenu/Makefile,v 1.4 2005/09/22 11:14:44 asmodai Exp $ LIB= menu @@ -17,6 +17,7 @@ ncurses_def.h: curses.h: cat ${.CURDIR}/../include/curses.head >$@ ${NCURSESDIR}/include/MKkey_defs.sh $(TERMINFO_CAPS) >>$@ + cat ${NCURSESDIR}/include/curses.wide >>$@ cat ${NCURSESDIR}/include/curses.tail >>$@ CLEANFILES= curses.h ncurses_def.h diff --git a/lib/libncurses/libncurses/Makefile b/lib/libncurses/libncurses/Makefile index 15677a67d7..e355f9dc1a 100644 --- a/lib/libncurses/libncurses/Makefile +++ b/lib/libncurses/libncurses/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/lib/libncurses/libncurses/Makefile,v 1.6 2005/07/30 13:59:45 joerg Exp $ +# $DragonFly: src/lib/libncurses/libncurses/Makefile,v 1.7 2005/09/22 11:14:44 asmodai Exp $ LIB= ncurses @@ -20,6 +20,7 @@ ncurses_def.h: curses.h: cat ${.CURDIR}/../include/curses.head >$@ ${NCURSESDIR}/include/MKkey_defs.sh $(TERMINFO_CAPS) >>$@ + cat ${NCURSESDIR}/include/curses.wide >>$@ cat ${NCURSESDIR}/include/curses.tail >>$@ term.h: awk -f ${.CURDIR}/../include/MKterm.h.awk ${TERMINFO_CAPS} > $@ diff --git a/lib/libncurses/libpanel/Makefile b/lib/libncurses/libpanel/Makefile index 8bce8c9f2e..bb1b349af6 100644 --- a/lib/libncurses/libpanel/Makefile +++ b/lib/libncurses/libpanel/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/lib/libncurses/libpanel/Makefile,v 1.3 2005/03/14 15:15:14 joerg Exp $ +# $DragonFly: src/lib/libncurses/libpanel/Makefile,v 1.4 2005/09/22 11:14:44 asmodai Exp $ LIB= panel @@ -17,6 +17,7 @@ ncurses_def.h: curses.h: cat ${.CURDIR}/../include/curses.head >$@ ${NCURSESDIR}/include/MKkey_defs.sh $(TERMINFO_CAPS) >>$@ + cat ${NCURSESDIR}/include/curses.wide >>$@ cat ${NCURSESDIR}/include/curses.tail >>$@ CLEANFILES= curses.h ncurses_def.h -- 2.41.0