diff options
Diffstat (limited to 'contrib/ncurses')
| -rw-r--r-- | contrib/ncurses/FREEBSD-Xlist | 9 | ||||
| -rw-r--r-- | contrib/ncurses/FREEBSD-upgrade | 57 | ||||
| -rw-r--r-- | contrib/ncurses/FREEBSD-vendor | 8 | ||||
| -rw-r--r-- | contrib/ncurses/ncurses/tinfo/comp_scan.c | 4 | ||||
| -rw-r--r-- | contrib/ncurses/ncurses/tinfo/lib_baudrate.c | 2 | ||||
| -rw-r--r-- | contrib/ncurses/ncurses/tinfo/lib_raw.c | 2 | ||||
| -rw-r--r-- | contrib/ncurses/ncurses/tinfo/lib_termcap.c | 16 |
7 files changed, 98 insertions, 0 deletions
diff --git a/contrib/ncurses/FREEBSD-Xlist b/contrib/ncurses/FREEBSD-Xlist new file mode 100644 index 0000000..a0ee58e --- /dev/null +++ b/contrib/ncurses/FREEBSD-Xlist @@ -0,0 +1,9 @@ +$FreeBSD$ + +Ada95 +c++ +doc/html/Ada95.html +doc/html/ada +doc/html/index.html +doc/html/man +test diff --git a/contrib/ncurses/FREEBSD-upgrade b/contrib/ncurses/FREEBSD-upgrade new file mode 100644 index 0000000..0e7cdf2 --- /dev/null +++ b/contrib/ncurses/FREEBSD-upgrade @@ -0,0 +1,57 @@ +$FreeBSD$ + +ncurses + + The release tarball can be found at GNU FTP sites. + The beta version can be found at ftp://invisible-island.net/ncurses/ + or ftp://dickey.his.com/ncurses/ + +For the import files and directories were pruned by: + + tar -X FREEBSD-Xlist -zxf ncurses-5.6.tar.gz + +check if there are any new bits that we don't want. + +then imported by: + + cvs import -m 'Import ncurses 5.6-20061217 onto the vendor branch' \ + src/contrib/ncurses NCURSES v5_6_20061217 + +The date in the tag can be obtained from contrib/ncurses/dist.mk. +If the version is a snapshot, + + cvs import -m 'Import ncurses 5.6-20080209 snapshot onto the vendor branch' \ + src/contrib/ncurses NCURSES v5_6_20080209 + +Remove files that are removed in this release in vendor branch (NCURSES) +instead of HEAD. + +To make local changes to ncurses, simply patch and commit to the main +branch (aka HEAD). Never make local changes on the vendor (NCURSES) branch. + +All local changes should be submitted to Thomas Dickey for inclusion in +the next vendor release. The author is very willing to help us. + +After importing, you have to update files in lib/ncurses. To configure +ncurses, go to /usr/ports/devel/ncurses and + + make WITHOUT_TERMINFO=1 configure + +Update ncurses_cfg.h and necessary Makefile glues from ${WRKSRC}/build.nowidec. +Directory for wide character support is ${WRKSRC}/build.widec +You may have to update ncurses-specific glue in termcap.c. + +Current local changes: + +ncurses/tinfo/comp_scan.c + rev 1.2: native termcap tweaking + +ncurses/tinfo/lib_termcap.c + rev 1.2: native termcap tweaking + rev 1.4: remove GCC_UNUSED for rev 1.2 + +ncurses/tinfo/read_termcap.c + This is not used. We have our own src/lib/ncurses/termcap.c + +rafan@FreeBSD.org +9-Jan-2007 diff --git a/contrib/ncurses/FREEBSD-vendor b/contrib/ncurses/FREEBSD-vendor new file mode 100644 index 0000000..ab85905 --- /dev/null +++ b/contrib/ncurses/FREEBSD-vendor @@ -0,0 +1,8 @@ +# $FreeBSD$ +Project: Ncurses (new curses) library +ProjectURL: http://www.gnu.org/software/ncurses/ +Version: 5.6-20080209 snapshot +VendorTag: NCURSES +VersionTag: v5_6_20080209 +License: MIT-like +Maintainer: peter, rafan diff --git a/contrib/ncurses/ncurses/tinfo/comp_scan.c b/contrib/ncurses/ncurses/tinfo/comp_scan.c index e937f7e..cf95464 100644 --- a/contrib/ncurses/ncurses/tinfo/comp_scan.c +++ b/contrib/ncurses/ncurses/tinfo/comp_scan.c @@ -32,6 +32,8 @@ * and: Thomas E. Dickey 1996 on * ****************************************************************************/ +/* $FreeBSD$ */ + /* * comp_scan.c --- Lexical scanner for terminfo compiler. * @@ -513,8 +515,10 @@ _nc_get_token(bool silent) if (!silent) { if (*after_list == '\0') _nc_warning("empty longname field"); +#ifndef FREEBSD_NATIVE else if (strchr(after_list, ' ') == 0) _nc_warning("older tic versions may treat the description field as an alias"); +#endif } } else { after_list = buffer + strlen(buffer); diff --git a/contrib/ncurses/ncurses/tinfo/lib_baudrate.c b/contrib/ncurses/ncurses/tinfo/lib_baudrate.c index 4070160..2d1c3ea 100644 --- a/contrib/ncurses/ncurses/tinfo/lib_baudrate.c +++ b/contrib/ncurses/ncurses/tinfo/lib_baudrate.c @@ -32,6 +32,8 @@ * and: Thomas E. Dickey 1996-on * ****************************************************************************/ +/* $FreeBSD$ */ + /* * lib_baudrate.c * diff --git a/contrib/ncurses/ncurses/tinfo/lib_raw.c b/contrib/ncurses/ncurses/tinfo/lib_raw.c index 58e7188..a360972 100644 --- a/contrib/ncurses/ncurses/tinfo/lib_raw.c +++ b/contrib/ncurses/ncurses/tinfo/lib_raw.c @@ -32,6 +32,8 @@ * and: Thomas E. Dickey 1998 on * ****************************************************************************/ +/* $FreeBSD$ */ + /* * raw.c * diff --git a/contrib/ncurses/ncurses/tinfo/lib_termcap.c b/contrib/ncurses/ncurses/tinfo/lib_termcap.c index ff97eea..2291df8 100644 --- a/contrib/ncurses/ncurses/tinfo/lib_termcap.c +++ b/contrib/ncurses/ncurses/tinfo/lib_termcap.c @@ -36,6 +36,8 @@ * (but it has changed a lot) * ****************************************************************************/ +/* $FreeBSD$ */ + #define __INTERNAL_CAPS_VISIBLE #include <curses.priv.h> @@ -50,6 +52,10 @@ MODULE_ID("$Id: lib_termcap.c,v 1.61 2007/06/02 19:36:03 tom Exp $") NCURSES_EXPORT_VAR(char *) UP = 0; NCURSES_EXPORT_VAR(char *) BC = 0; +#ifdef FREEBSD_NATIVE +extern char _nc_termcap[]; /* buffer to copy out */ +#endif + #define MyCache _nc_globals.tgetent_cache #define CacheInx _nc_globals.tgetent_index #define CacheSeq _nc_globals.tgetent_sequence @@ -173,6 +179,16 @@ tgetent(char *bufp, const char *name) #endif*/ } + +#ifdef FREEBSD_NATIVE + /* + * This is a REALLY UGLY hack. Basically, if we originate with + * a termcap source, try and copy it out. + */ + if (bufp && _nc_termcap[0]) + strncpy(bufp, _nc_termcap, 1024); +#endif + returnCode(errcode); } |
