diff options
author | jlam <jlam@pkgsrc.org> | 2001-08-06 14:20:46 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-08-06 14:20:46 +0000 |
commit | 1118eb7b6648c91ffc9859b0b16dfd1a1abab501 (patch) | |
tree | c37f39728f76ba480789cb249bfb49f9fd57e4f6 /devel/readline/patches | |
parent | 9c5672f4b0045abd13901e1e9127124dd8bc525d (diff) | |
download | pkgsrc-1118eb7b6648c91ffc9859b0b16dfd1a1abab501.tar.gz |
Update readline to 4.2. Major changes from version 4.1:
* bug fixes
* improve linking with C++ code
+ a new file, rltypedefs.h, contains the new typedefs for function pointers
+ several minor additions to the API to customize look of readline
+ more complete documentation for public functions and variables
Diffstat (limited to 'devel/readline/patches')
-rw-r--r-- | devel/readline/patches/patch-aa | 159 | ||||
-rw-r--r-- | devel/readline/patches/patch-ad | 51 | ||||
-rw-r--r-- | devel/readline/patches/patch-ae | 97 | ||||
-rw-r--r-- | devel/readline/patches/patch-ah | 13 | ||||
-rw-r--r-- | devel/readline/patches/patch-ai | 13 | ||||
-rw-r--r-- | devel/readline/patches/patch-ak | 13 |
6 files changed, 55 insertions, 291 deletions
diff --git a/devel/readline/patches/patch-aa b/devel/readline/patches/patch-aa deleted file mode 100644 index 1c51443dc9e..00000000000 --- a/devel/readline/patches/patch-aa +++ /dev/null @@ -1,159 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2000/07/19 09:31:45 jlam Exp $ - ---- display.c.orig Thu Sep 16 11:19:40 1999 -+++ display.c Sun Jul 16 22:30:13 2000 -@@ -688,7 +688,7 @@ - putc ('\r', rl_outstream); - #else - if (term_cr) -- tputs (term_cr, 1, _rl_output_character_function); -+ tputs (term_cr, 1, (void *)_rl_output_character_function); - #endif - _rl_output_some_chars (local_prompt, nleft); - _rl_last_c_pos = nleft; -@@ -945,7 +945,7 @@ - #if defined (__MSDOS__) - putc ('\r', rl_outstream); - #else -- tputs (term_cr, 1, _rl_output_character_function); -+ tputs (term_cr, 1, (void *)_rl_output_character_function); - #endif - _rl_output_some_chars (local_prompt, lendiff); - _rl_last_c_pos = lendiff; -@@ -1168,7 +1168,7 @@ - #if defined (__MSDOS__) - putc ('\r', rl_outstream); - #else -- tputs (term_cr, 1, _rl_output_character_function); -+ tputs (term_cr, 1, (void *)_rl_output_character_function); - #endif /* !__MSDOS__ */ - _rl_last_c_pos = 0; - } -@@ -1187,7 +1187,7 @@ - #if defined (HACK_TERMCAP_MOTION) - if (term_forward_char) - for (i = _rl_last_c_pos; i < new; i++) -- tputs (term_forward_char, 1, _rl_output_character_function); -+ tputs (term_forward_char, 1, (void *)_rl_output_character_function); - else - for (i = _rl_last_c_pos; i < new; i++) - putc (data[i], rl_outstream); -@@ -1218,7 +1218,7 @@ - #if defined (__MSDOS__) - putc ('\r', rl_outstream); - #else -- tputs (term_cr, 1, _rl_output_character_function); -+ tputs (term_cr, 1, (void *)_rl_output_character_function); - #endif - _rl_last_c_pos = 0; - } -@@ -1226,7 +1226,7 @@ - { /* delta < 0 */ - if (term_up && *term_up) - for (i = 0; i < -delta; i++) -- tputs (term_up, 1, _rl_output_character_function); -+ tputs (term_up, 1, (void *)_rl_output_character_function); - } - - _rl_last_v_pos = to; /* Now TO is here */ -@@ -1437,7 +1437,7 @@ - int count; - { - if (term_clreol) -- tputs (term_clreol, 1, _rl_output_character_function); -+ tputs (term_clreol, 1, (void *)_rl_output_character_function); - else if (count) - space_to_eol (count); - } -@@ -1460,7 +1460,7 @@ - _rl_clear_screen () - { - if (term_clrpag) -- tputs (term_clrpag, 1, _rl_output_character_function); -+ tputs (term_clrpag, 1, (void *)_rl_output_character_function); - else - crlf (); - } -@@ -1476,7 +1476,7 @@ - { - char *buffer; - buffer = tgoto (term_IC, 0, count); -- tputs (buffer, 1, _rl_output_character_function); -+ tputs (buffer, 1, (void *)_rl_output_character_function); - _rl_output_some_chars (string, count); - } - else -@@ -1485,14 +1485,14 @@ - - /* If we have to turn on insert-mode, then do so. */ - if (term_im && *term_im) -- tputs (term_im, 1, _rl_output_character_function); -+ tputs (term_im, 1, (void *)_rl_output_character_function); - - /* If there is a special command for inserting characters, then - use that first to open up the space. */ - if (term_ic && *term_ic) - { - for (i = count; i--; ) -- tputs (term_ic, 1, _rl_output_character_function); -+ tputs (term_ic, 1, (void *)_rl_output_character_function); - } - - /* Print the text. */ -@@ -1501,7 +1501,7 @@ - /* If there is a string to turn off insert mode, we had best use - it now. */ - if (term_ei && *term_ei) -- tputs (term_ei, 1, _rl_output_character_function); -+ tputs (term_ei, 1, (void *)_rl_output_character_function); - } - } - -@@ -1517,13 +1517,13 @@ - { - char *buffer; - buffer = tgoto (term_DC, count, count); -- tputs (buffer, count, _rl_output_character_function); -+ tputs (buffer, count, (void *)_rl_output_character_function); - } - else - { - if (term_dc && *term_dc) - while (count--) -- tputs (term_dc, 1, _rl_output_character_function); -+ tputs (term_dc, 1, (void *)_rl_output_character_function); - } - } - -@@ -1570,7 +1570,7 @@ - #if defined (__MSDOS__) - putc ('\r', rl_outstream); - #else -- tputs (term_cr, 1, _rl_output_character_function); -+ tputs (term_cr, 1, (void *)_rl_output_character_function); - #endif - _rl_last_c_pos = 0; - } -@@ -1620,7 +1620,7 @@ - #if defined (__MSDOS__) - putc ('\r', rl_outstream); - #else -- tputs (term_cr, 1, _rl_output_character_function); -+ tputs (term_cr, 1, (void *)_rl_output_character_function); - #endif - _rl_last_c_pos = 0; - #if defined (__MSDOS__) -@@ -1628,11 +1628,11 @@ - putc ('\r', rl_outstream); - #else - if (term_clreol) -- tputs (term_clreol, 1, _rl_output_character_function); -+ tputs (term_clreol, 1, (void *)_rl_output_character_function); - else - { - space_to_eol (screenwidth); -- tputs (term_cr, 1, _rl_output_character_function); -+ tputs (term_cr, 1, (void *)_rl_output_character_function); - } - #endif - if (_rl_last_v_pos > 0) diff --git a/devel/readline/patches/patch-ad b/devel/readline/patches/patch-ad deleted file mode 100644 index 6d21344bf0e..00000000000 --- a/devel/readline/patches/patch-ad +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2000/07/19 09:31:45 jlam Exp $ - ---- terminal.c.orig Mon Jan 24 10:44:28 2000 -+++ terminal.c Sun Jul 16 22:34:03 2000 -@@ -500,7 +500,7 @@ - - if (term_backspace) - for (i = 0; i < count; i++) -- tputs (term_backspace, 1, _rl_output_character_function); -+ tputs (term_backspace, 1, (void *)_rl_output_character_function); - else - for (i = 0; i < count; i++) - putc ('\b', _rl_out_stream); -@@ -513,7 +513,7 @@ - { - #if defined (NEW_TTY_DRIVER) - if (term_cr) -- tputs (term_cr, 1, _rl_output_character_function); -+ tputs (term_cr, 1, (void *)_rl_output_character_function); - #endif /* NEW_TTY_DRIVER */ - putc ('\n', _rl_out_stream); - return 0; -@@ -533,7 +533,7 @@ - case VISIBLE_BELL: - if (visible_bell) - { -- tputs (visible_bell, 1, _rl_output_character_function); -+ tputs (visible_bell, 1, (void *)_rl_output_character_function); - break; - } - /* FALLTHROUGH */ -@@ -558,7 +558,7 @@ - { - #if !defined (__DJGPP__) - if (term_has_meta && term_mm) -- tputs (term_mm, 1, _rl_output_character_function); -+ tputs (term_mm, 1, (void *)_rl_output_character_function); - #endif - } - -@@ -568,8 +568,8 @@ - { - #if !defined (__DJGPP__) - if (on && term_ks) -- tputs (term_ks, 1, _rl_output_character_function); -+ tputs (term_ks, 1, (void *)_rl_output_character_function); - else if (!on && term_ke) -- tputs (term_ke, 1, _rl_output_character_function); -+ tputs (term_ke, 1, (void *)_rl_output_character_function); - #endif - } diff --git a/devel/readline/patches/patch-ae b/devel/readline/patches/patch-ae index b83db1ba739..bab7b72d44a 100644 --- a/devel/readline/patches/patch-ae +++ b/devel/readline/patches/patch-ae @@ -1,67 +1,80 @@ -$NetBSD: patch-ae,v 1.6 2001/06/19 08:48:57 jlam Exp $ +$NetBSD: patch-ae,v 1.7 2001/08/06 14:20:48 jlam Exp $ ---- Makefile.in.orig Wed Dec 29 17:02:40 1999 +--- Makefile.in.orig Mon Nov 27 11:57:09 2000 +++ Makefile.in -@@ -63,17 +63,17 @@ - TERMCAP_LIB = @TERMCAP_LIB@ +@@ -18,6 +18,9 @@ + RL_LIBRARY_VERSION = @LIBVERSION@ + RL_LIBRARY_NAME = readline - # For libraries which include headers from other libraries. --INCLUDES = -I. -I$(srcdir) -I$(includedir) -+INCLUDES = -I. -I$(srcdir) - - CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(CPPFLAGS) $(INCLUDES) $(LOCAL_CFLAGS) $(CFLAGS) ++SHLIB_MAJOR = @SHLIB_MAJOR@ ++SHLIB_MINOR = @SHLIB_MINOR@ ++ + srcdir = @srcdir@ + VPATH = .:@srcdir@ + top_srcdir = @top_srcdir@ +@@ -77,11 +80,12 @@ .c.o: ${RM} $@ - $(CC) -c $(CCFLAGS) $< -+ ${LIBTOOL} --mode=compile $(CC) -c $(CCFLAGS) $< ++ $(LIBTOOL) $(CC) -c $(CCFLAGS) $< # The name of the main library target. --LIBRARY_NAME = libreadline.a --STATIC_LIBS = libreadline.a libhistory.a -+LIBRARY_NAME = libreadline.la -+STATIC_LIBS = libreadline.la libhistory.la + LIBRARY_NAME = libreadline.a + STATIC_LIBS = libreadline.a libhistory.a ++LIBTOOL_LIBS = libreadline.la libhistory.la # The C code source files for this library. CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \ -@@ -121,18 +121,17 @@ +@@ -127,6 +131,8 @@ + + all: static + ++all-la: $(LIBTOOL_LIBS) ++ + everything: static shared examples static: $(STATIC_LIBS) +@@ -136,13 +142,25 @@ + $(AR) $(ARFLAGS) $@ $(OBJECTS) + -test -n "$(RANLIB)" && $(RANLIB) $@ --libreadline.a: $(OBJECTS) +libreadline.la: $(OBJECTS) ++ ${LIBTOOL} $(RM) $@ ++ ${LIBTOOL} ${CC} -o $@ ${OBJECTS:.o=.lo} \ ++ -rpath $(libdir) \ ++ -version-info ${SHLIB_MAJOR}:${SHLIB_MINOR} ++ + libhistory.a: $(HISTOBJ) xmalloc.o $(RM) $@ -- $(AR) $(ARFLAGS) $@ $(OBJECTS) -- -test -n "$(RANLIB)" && $(RANLIB) $@ -+ ${LIBTOOL} --mode=link cc -o $@ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info ${READLINE_MAJOR}:${READLINE_MINOR} - --libhistory.a: $(HISTOBJ) xmalloc.o -+libhistory.la: $(HISTOBJ) xmalloc.o - $(RM) $@ -- $(AR) $(ARFLAGS) $@ $(HISTOBJ) xmalloc.o -- -test -n "$(RANLIB)" && $(RANLIB) $@ -+ ${LIBTOOL} --mode=link cc -o $@ ${HISTOBJ:.o=.lo} xmalloc.lo -rpath ${PREFIX}/lib -version-info ${READLINE_MAJOR}:${READLINE_MINOR} + $(AR) $(ARFLAGS) $@ $(HISTOBJ) xmalloc.o + -test -n "$(RANLIB)" && $(RANLIB) $@ -readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a - $(CC) $(CCFLAGS) -o $@ ./examples/rl.c ./libreadline.a ${TERMCAP_LIB} ++libhistory.la: $(HISTOBJ) xmalloc.o ++ ${LIBTOOL} $(RM) $@ ++ ${LIBTOOL} ${CC} -o $@ ${HISTOBJ:.o=.lo} xmalloc.lo \ ++ -rpath $(libdir) \ ++ -version-info ${SHLIB_MAJOR}:${SHLIB_MINOR} + -+readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.la -+ ${LIBTOOL} --mode=link $(CC) $(CCFLAGS) ${LDFLAGS} -o $@ ./examples/rl.c libreadline.la -ltermcap ++readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./$(LIBRARY_NAME) ++ ${LIBTOOL} $(CC) $(CCFLAGS) $(LDFLAGS) -o $@ ./examples/rl.c ./$(LIBRARY_NAME) ${TERMCAP_LIB} - Makefile makefile: config.status $(srcdir)/Makefile.in - CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status -@@ -181,12 +180,8 @@ - maybe-uninstall-headers: uninstall-headers - - install: installdirs $(STATIC_LIBS) install-headers -- -$(MV) $(libdir)/libreadline.a $(libdir)/libreadline.old -- $(INSTALL_DATA) libreadline.a $(libdir)/libreadline.a -- -test -n "$(RANLIB)" && $(RANLIB) -t $(libdir)/libreadline.a -- -$(MV) $(libdir)/libhistory.a $(libdir)/libhistory.old -- $(INSTALL_DATA) libhistory.a $(libdir)/libhistory.a -- -test -n "$(RANLIB)" && $(RANLIB) -t $(libdir)/libhistory.a -+ ${LIBTOOL} --mode=install ${INSTALL_DATA} libreadline.la ${libdir} -+ ${LIBTOOL} --mode=install ${INSTALL_DATA} libhistory.la ${libdir} + lint: force + $(MAKE) $(MFLAGS) CCFLAGS='$(GCC_LINT_CFLAGS)' static +@@ -203,6 +221,14 @@ -( if test -d doc ; then \ cd doc && \ ${MAKE} ${MFLAGS} infodir=$(infodir) $@; \ ++ fi ) ++ ++install-la: installdirs $(LIBTOOL_LIBS) install-headers ++ ${LIBTOOL} ${INSTALL_DATA} libreadline.la $(libdir) ++ ${LIBTOOL} ${INSTALL_DATA} libhistory.la $(libdir) ++ -( if test -d doc ; then \ ++ cd doc && \ ++ ${MAKE} ${MFLAGS} infodir=$(infodir) install; \ + fi ) + + installdirs: $(srcdir)/support/mkdirs diff --git a/devel/readline/patches/patch-ah b/devel/readline/patches/patch-ah deleted file mode 100644 index 8609701dd46..00000000000 --- a/devel/readline/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.2 1999/07/13 00:56:13 jlam Exp $ - ---- chardefs.h.orig Thu Sep 25 10:59:00 1997 -+++ chardefs.h Tue Jul 6 05:18:58 1999 -@@ -51,7 +51,7 @@ - #define meta_character_bit 0x080 /* x0000000, must be on. */ - #define largest_char 255 /* Largest character value. */ - --#define CTRL_CHAR(c) ((c) < control_character_threshold && (c) >= 0) -+#define CTRL_CHAR(c) (((unsigned)(c)) < control_character_threshold) - #define META_CHAR(c) ((c) > meta_character_threshold && (c) <= largest_char) - - #define CTRL(c) ((c) & control_character_mask) diff --git a/devel/readline/patches/patch-ai b/devel/readline/patches/patch-ai deleted file mode 100644 index 7f0952c5869..00000000000 --- a/devel/readline/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.1 1999/07/13 00:56:14 jlam Exp $ - ---- doc/hist.texinfo.orig Thu Dec 31 12:04:50 1998 -+++ doc/hist.texinfo Tue Jul 6 13:29:26 1999 -@@ -11,7 +11,7 @@ - @ifinfo - @dircategory Libraries - @direntry --* History: (history). The GNU history library API -+* History: (history). The GNU history library API - @end direntry - - This document describes the GNU History library, a programming tool that diff --git a/devel/readline/patches/patch-ak b/devel/readline/patches/patch-ak deleted file mode 100644 index aa74a2605ee..00000000000 --- a/devel/readline/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.1 1999/07/13 00:56:14 jlam Exp $ - ---- doc/Makefile.in.orig Thu Feb 18 12:24:36 1999 -+++ doc/Makefile.in Tue Jul 6 13:36:33 1999 -@@ -53,7 +53,7 @@ - $(RM) $@ - -${NROFF} -man $< > $@ - --all: info dvi html ps text -+all: info # dvi html ps text - nodvi: info html text - - readline.dvi: $(RLSRC) |