From 6287b5d192ab796af6be9d62bdbd8e88072a5769 Mon Sep 17 00:00:00 2001 From: christos Date: Fri, 7 Nov 2003 16:36:12 +0000 Subject: two more patch files. --- misc/fep/patches/patch-al | 40 +++++++++++++++++++++++ misc/fep/patches/patch-am | 83 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 misc/fep/patches/patch-al create mode 100644 misc/fep/patches/patch-am (limited to 'misc/fep') diff --git a/misc/fep/patches/patch-al b/misc/fep/patches/patch-al new file mode 100644 index 00000000000..25e97ec1f7d --- /dev/null +++ b/misc/fep/patches/patch-al @@ -0,0 +1,40 @@ +$NetBSD: patch-al,v 1.1 2003/11/07 16:36:12 christos Exp $ + +--- fep_util.c.orig 1988-12-28 07:24:01.000000000 -0500 ++++ fep_util.c 2003-11-07 11:26:03.000000000 -0500 +@@ -3,7 +3,7 @@ + #ifndef lint + static char rcsid[]= + "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-al,v 1.1 2003/11/07 16:36:12 christos Exp $ (SRA)"; +-#endif lint ++#endif /* lint */ + + #ifndef MKARGDEBUG + +@@ -178,9 +178,9 @@ + { + return (d1 > d2 ? d1 : d2); + } +-#endif max ++#endif /* max */ + +-#else MKARGDEBUG ++#else /* MKARGDEBUG */ + + #include + #include +@@ -198,7 +198,7 @@ + showArgs (s); + } + } +-#endif MKARGDEBUG ++#endif /* MKARGDEBUG */ + + showArgs (comline) + char *comline; +@@ -402,4 +402,4 @@ + else + return (iskanji (*cp)); + } +-#endif KANJI ++#endif /* KANJI */ diff --git a/misc/fep/patches/patch-am b/misc/fep/patches/patch-am new file mode 100644 index 00000000000..b37b2397ec4 --- /dev/null +++ b/misc/fep/patches/patch-am @@ -0,0 +1,83 @@ +$NetBSD: patch-am,v 1.1 2003/11/07 16:36:12 christos Exp $ + +--- fep_vi.c.orig 1991-05-29 01:31:27.000000000 -0400 ++++ fep_vi.c 2003-11-07 11:19:21.000000000 -0500 +@@ -3,10 +3,20 @@ + #ifndef lint + static char rcsid[]= + "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-am,v 1.1 2003/11/07 16:36:12 christos Exp $ (SRA)"; +-#endif lint ++#endif /* lint */ + + #include ++#include ++#ifdef TERMIOS ++#include ++#ifdef __linux__ ++#ifndef _POSIX_VDISABLE ++#define _POSIX_VDISABLE '\0' ++#endif ++#endif ++#else + #include ++#endif + #include + #include "fep_defs.h" + #include "fep_glob.h" +@@ -107,7 +117,7 @@ + /* ^X-^V */ {"\\^X\\^V", view_buffer}, + /* ^X-^X */ {"\\^X\\^X", expand_file_name}, + /* ^X-? */ {"\\^X?", show_bindings}, +- /* ^X-^C */ {"\\^X\\^C", terminate}, ++ /* ^X-^C */ {"\\^X\\^C", (FUNC)terminate}, + /* ^X-^D */ {"\\^X\\^D", send_eof}, + /* ^X-( */ {"\\^X(", fep_start_script}, + /* ^X-) */ {"\\^X)", fep_end_script}, +@@ -138,7 +148,7 @@ + /* ^X-^L */ {"\\^X\\^L", fep_repaint}, + /* ^X-^X */ {"\\^X\\^X", expand_file_name}, + /* ^X-? */ {"\\^X?", show_bindings}, +- /* ^X-^C */ {"\\^X\\^C", terminate}, ++ /* ^X-^C */ {"\\^X\\^C", (FUNC)terminate}, + /* ^X-^D */ {"\\^X\\^D", send_eof}, + /* ^X-^V */ {"\\^X\\^V", view_buffer}, + /* ^X-( */ {"\\^X(", fep_start_script}, +@@ -161,7 +171,29 @@ + cft[i] = self_insert; + + #define import(table,key,fn) if((int)key>0)table[(int)key]=fn +- ++#ifdef TERMIOS ++ /* Now, using cbreak mode ++ import (cft, initial_ttymode.c_cc[VSTART], ignore); ++ import (cft, initial_ttymode.c_cc[VSTOP], ignore); ++ */ ++ import (cft, initial_ttymode.c_cc[VINTR], insert_and_flush); ++ import (aft, initial_ttymode.c_cc[VINTR], insert_and_flush); ++ import (cft, initial_ttymode.c_cc[VQUIT], insert_and_flush); ++ import (cft, initial_ttymode.c_cc[VEOF], send_eof); ++#ifdef VSWTC ++ import (cft, initial_ttymode.c_cc[VSWTC], insert_and_flush); ++#endif ++ import (cft, initial_ttymode.c_cc[VSUSP], insert_and_flush); ++#ifdef VDSUSP ++ import (cft, initial_ttymode.c_cc[VDSUSP], self_insert); ++#endif ++ import (cft, initial_ttymode.c_cc[VREPRINT], reprint); ++ import (cft, initial_ttymode.c_cc[VDISCARD], self_insert); ++ import (cft, initial_ttymode.c_cc[VWERASE], delete_previous_word); ++ import (cft, initial_ttymode.c_cc[VLNEXT], literal_next); ++ import (cft, initial_ttymode.c_cc[VERASE], delete_previous_character); ++ import (cft, initial_ttymode.c_cc[VKILL], delete_line); ++#else + /* Now, using cbreak mode + import (cft, tchars_buf.t_startx, ignore); + import (cft, tchars_buf.t_stopc, ignore); +@@ -179,6 +211,7 @@ + import (cft, ltchars_buf.t_lnextc, literal_next); + import (cft, initial_ttymode.sg_erase, delete_previous_character); + import (cft, initial_ttymode.sg_kill, delete_line); ++#endif + + #undef import + -- cgit v1.2.3