diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/readline/Makefile | 15 | ||||
| -rw-r--r-- | devel/readline/files/md5 | 4 | ||||
| -rw-r--r-- | devel/readline/files/patch-sum | 8 | ||||
| -rw-r--r-- | devel/readline/patches/patch-aa | 92 | ||||
| -rw-r--r-- | devel/readline/patches/patch-ad | 27 | ||||
| -rw-r--r-- | devel/readline/patches/patch-ae | 25 | ||||
| -rw-r--r-- | devel/readline/pkg/PLIST | 7 |
7 files changed, 98 insertions, 80 deletions
diff --git a/devel/readline/Makefile b/devel/readline/Makefile index 670d507247d..5ffa9cc4c54 100644 --- a/devel/readline/Makefile +++ b/devel/readline/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2000/06/09 07:06:34 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2000/07/19 09:31:44 jlam Exp $ # -DISTNAME= readline-4.0 +DISTNAME= readline-4.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=readline/} @@ -11,8 +11,17 @@ HOMEPAGE= http://www.gnu.org/software/readline/ GNU_CONFIGURE= # defined USE_LIBTOOL= # defined USE_GTEXINFO= # defined -MAKE_ENV+= READLINE_MAJOR=4 READLINE_MINOR=0 + +READLINE_MAJOR= 4 +READLINE_MINOR= 1 + +MAKE_ENV+= READLINE_MAJOR=${READLINE_MAJOR} +MAKE_ENV+= READLINE_MINOR=${READLINE_MINOR} + +PLIST_SUBST+= READLINE_MAJOR=${READLINE_MAJOR} +PLIST_SUBST+= READLINE_MINOR=${READLINE_MINOR} ALL_TARGET= all documentation +INFO_FILES= readline.info history.info .include "../../mk/bsd.pkg.mk" diff --git a/devel/readline/files/md5 b/devel/readline/files/md5 index f550371bc12..987dbcb77a3 100644 --- a/devel/readline/files/md5 +++ b/devel/readline/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.4 1999/07/13 00:56:13 jlam Exp $ +$NetBSD: md5,v 1.5 2000/07/19 09:31:45 jlam Exp $ -MD5 (readline-4.0.tar.gz) = 73e863c4439f86d7f71c630956ebd346 +MD5 (readline-4.1.tar.gz) = d0c31936fb627237275fdfd991fe3873 diff --git a/devel/readline/files/patch-sum b/devel/readline/files/patch-sum index 7a36a243829..2593ee8d751 100644 --- a/devel/readline/files/patch-sum +++ b/devel/readline/files/patch-sum @@ -1,8 +1,8 @@ -$NetBSD: patch-sum,v 1.3 1999/07/26 15:12:23 agc Exp $ +$NetBSD: patch-sum,v 1.4 2000/07/19 09:31:45 jlam Exp $ -MD5 (patch-aa) = 753804c7a34e14e737bf9c91d2c6d55f -MD5 (patch-ad) = d449ce3cd4db0f57683c26f526d8e2b0 -MD5 (patch-ae) = 38f3f5a9aeb6edff38f134c1af41739f +MD5 (patch-aa) = 8ce4e421492ff6b77a5cd744a6d73938 +MD5 (patch-ad) = 8bf1c9aef49cac33d08932478fc443d6 +MD5 (patch-ae) = dd3a5cae5535fea49d5bc5e928f3d37c MD5 (patch-ah) = 1692b74a84f79aeb354ca2a0dc46bc71 MD5 (patch-ai) = 0bee21167117e7e6510455fce24043da MD5 (patch-ak) = 54446c23a1340c6997b6327f10965100 diff --git a/devel/readline/patches/patch-aa b/devel/readline/patches/patch-aa index 356fbfc0b43..1c51443dc9e 100644 --- a/devel/readline/patches/patch-aa +++ b/devel/readline/patches/patch-aa @@ -1,26 +1,26 @@ -$NetBSD: patch-aa,v 1.5 1999/07/13 00:56:13 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2000/07/19 09:31:45 jlam Exp $ ---- display.c.orig Thu Dec 17 15:36:30 1998 -+++ display.c Tue Jul 6 05:21:00 1999 -@@ -652,7 +652,7 @@ - _rl_last_c_pos <= last_invisible && local_prompt) - { +--- 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; - } -@@ -899,7 +899,7 @@ - term_cr && lendiff > visible_length && _rl_last_c_pos > 0 && - od > lendiff && _rl_last_c_pos < last_invisible) - { +@@ -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; - } -@@ -1069,7 +1069,7 @@ +@@ -1168,7 +1168,7 @@ #if defined (__MSDOS__) putc ('\r', rl_outstream); #else @@ -29,8 +29,8 @@ $NetBSD: patch-aa,v 1.5 1999/07/13 00:56:13 jlam Exp $ #endif /* !__MSDOS__ */ _rl_last_c_pos = 0; } -@@ -1090,7 +1090,7 @@ - +@@ -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); @@ -38,42 +38,43 @@ $NetBSD: patch-aa,v 1.5 1999/07/13 00:56:13 jlam Exp $ else for (i = _rl_last_c_pos; i < new; i++) putc (data[i], rl_outstream); -@@ -1127,14 +1127,14 @@ - { - for (i = 0; i < delta; i++) - putc ('\n', 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; } - else +@@ -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); } - #endif /* !__GO32__ */ + _rl_last_v_pos = to; /* Now TO is here */ -@@ -1346,7 +1346,7 @@ +@@ -1437,7 +1437,7 @@ + int count; { - #if !defined (__GO32__) if (term_clreol) - tputs (term_clreol, 1, _rl_output_character_function); + tputs (term_clreol, 1, (void *)_rl_output_character_function); else if (count) - #endif /* !__GO32__ */ space_to_eol (count); -@@ -1371,7 +1371,7 @@ + } +@@ -1460,7 +1460,7 @@ + _rl_clear_screen () { - #if !defined (__GO32__) if (term_clrpag) - tputs (term_clrpag, 1, _rl_output_character_function); + tputs (term_clrpag, 1, (void *)_rl_output_character_function); else - #endif /* !__GO32__ */ crlf (); -@@ -1402,7 +1402,7 @@ + } +@@ -1476,7 +1476,7 @@ { char *buffer; buffer = tgoto (term_IC, 0, count); @@ -82,7 +83,7 @@ $NetBSD: patch-aa,v 1.5 1999/07/13 00:56:13 jlam Exp $ _rl_output_some_chars (string, count); } else -@@ -1411,14 +1411,14 @@ +@@ -1485,14 +1485,14 @@ /* If we have to turn on insert-mode, then do so. */ if (term_im && *term_im) @@ -99,16 +100,16 @@ $NetBSD: patch-aa,v 1.5 1999/07/13 00:56:13 jlam Exp $ } /* Print the text. */ -@@ -1427,7 +1427,7 @@ +@@ -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); } - #endif /* !__GO32__ */ } -@@ -1456,13 +1456,13 @@ + +@@ -1517,13 +1517,13 @@ { char *buffer; buffer = tgoto (term_DC, count, count); @@ -122,24 +123,29 @@ $NetBSD: patch-aa,v 1.5 1999/07/13 00:56:13 jlam Exp $ - tputs (term_dc, 1, _rl_output_character_function); + tputs (term_dc, 1, (void *)_rl_output_character_function); } - #endif /* !__GO32__ */ } -@@ -1503,7 +1503,7 @@ - { - if (term_cr) - { + +@@ -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; } - } -@@ -1518,14 +1518,14 @@ - the right thing happens if we have wrapped to a new screen line. */ - if (term_cr) - { +@@ -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); @@ -149,5 +155,5 @@ $NetBSD: patch-aa,v 1.5 1999/07/13 00:56:13 jlam Exp $ - tputs (term_cr, 1, _rl_output_character_function); + tputs (term_cr, 1, (void *)_rl_output_character_function); } + #endif if (_rl_last_v_pos > 0) - _rl_move_vert (0); diff --git a/devel/readline/patches/patch-ad b/devel/readline/patches/patch-ad index 2f879ec4f24..6d21344bf0e 100644 --- a/devel/readline/patches/patch-ad +++ b/devel/readline/patches/patch-ad @@ -1,17 +1,17 @@ -$NetBSD: patch-ad,v 1.3 1999/07/13 00:56:13 jlam Exp $ +$NetBSD: patch-ad,v 1.4 2000/07/19 09:31:45 jlam Exp $ ---- terminal.c.orig Thu May 14 10:54:16 1998 -+++ terminal.c Tue Jul 6 05:23:35 1999 -@@ -478,7 +478,7 @@ - #if !defined (__GO32__) +--- 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 - #endif /* !__GO32__ */ for (i = 0; i < count; i++) -@@ -492,7 +492,7 @@ + putc ('\b', _rl_out_stream); +@@ -513,7 +513,7 @@ { #if defined (NEW_TTY_DRIVER) if (term_cr) @@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.3 1999/07/13 00:56:13 jlam Exp $ #endif /* NEW_TTY_DRIVER */ putc ('\n', _rl_out_stream); return 0; -@@ -513,7 +513,7 @@ +@@ -533,7 +533,7 @@ case VISIBLE_BELL: if (visible_bell) { @@ -29,22 +29,23 @@ $NetBSD: patch-ad,v 1.3 1999/07/13 00:56:13 jlam Exp $ break; } /* FALLTHROUGH */ -@@ -541,7 +541,7 @@ - _rl_enable_meta_key () +@@ -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 } - void -@@ -549,7 +549,7 @@ - int on; +@@ -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 cee03900d64..7eb3e10b463 100644 --- a/devel/readline/patches/patch-ae +++ b/devel/readline/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.4 1999/07/13 00:56:13 jlam Exp $ +$NetBSD: patch-ae,v 1.5 2000/07/19 09:31:45 jlam Exp $ ---- Makefile.in.orig Thu Feb 18 12:24:11 1999 -+++ Makefile.in Tue Jul 6 13:18:52 1999 -@@ -67,11 +67,11 @@ +--- Makefile.in.orig Wed Dec 29 17:02:40 1999 ++++ Makefile.in Sun Jul 16 23:22:30 2000 +@@ -69,11 +69,11 @@ .c.o: ${RM} $@ @@ -17,7 +17,7 @@ $NetBSD: patch-ae,v 1.4 1999/07/13 00:56:13 jlam Exp $ # The C code source files for this library. CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \ -@@ -117,18 +117,16 @@ +@@ -121,18 +121,17 @@ static: $(STATIC_LIBS) @@ -35,17 +35,18 @@ $NetBSD: patch-ae,v 1.4 1999/07/13 00:56:13 jlam Exp $ - -test -n "$(RANLIB)" && $(RANLIB) $@ + ${LIBTOOL} --mode=link cc -o $@ ${HISTOBJ:.o=.lo} xmalloc.lo -rpath ${PREFIX}/lib -version-info ${READLINE_MAJOR}:${READLINE_MINOR} --readline: $(OBJECTS) readline.h rldefs.h chardefs.h -- $(CC) $(CCFLAGS) -o $@ ./examples/rl.c ./libreadline.a -ltermcap -+readline: libreadline.la readline.h rldefs.h chardefs.h +-readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a +- $(CC) $(CCFLAGS) -o $@ ./examples/rl.c ./libreadline.a ${TERMCAP_LIB} ++ ++readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.la + ${LIBTOOL} --mode=link $(CC) $(CCFLAGS) ${LDFLAGS} -o $@ ./examples/rl.c libreadline.la -ltermcap Makefile makefile: config.status $(srcdir)/Makefile.in CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status -@@ -169,12 +167,8 @@ - for f in ${INSTALLED_HEADERS}; do \ - $(INSTALL_DATA) $(srcdir)/$$f $(includedir)/readline ; \ - done +@@ -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 diff --git a/devel/readline/pkg/PLIST b/devel/readline/pkg/PLIST index 0c8b62b3c44..f7a8efe558b 100644 --- a/devel/readline/pkg/PLIST +++ b/devel/readline/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2000/06/09 07:06:35 jlam Exp $ +@comment $NetBSD: PLIST,v 1.8 2000/07/19 09:31:45 jlam Exp $ include/readline/chardefs.h include/readline/history.h include/readline/keymaps.h @@ -10,13 +10,14 @@ include/readline/tilde.h @unexec install-info --delete %D/info/readline.info %D/info/dir info/history.info info/readline.info +info/rluserman.info @exec install-info %D/info/history.info %D/info/dir @exec install-info %D/info/readline.info %D/info/dir lib/libhistory.a lib/libhistory.la -lib/libhistory.so.4.0 +lib/libhistory.so.${READLINE_MAJOR}.${READLINE_MINOR} lib/libreadline.a lib/libreadline.la -lib/libreadline.so.4.0 +lib/libreadline.so.${READLINE_MAJOR}.${READLINE_MINOR} man/man3/readline.3 @dirrm include/readline |