Make patches apply again; use sed script in pre-build

to remove stuff after #endif to avoid RCS problems with patches (hi christos!).

15 files changed, 174 insertions, 253 deletions

diff --git a/misc/fep/Makefile b/misc/fep/Makefile
index 6f24c621a85..3fa3c3060ee 100644
--- a/misc/fep/Makefile
+++ b/misc/fep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/11/11 10:42:32 wiz Exp $
 # FreeBSD Id: Makefile,v 1.2 1996/11/11 05:49:31 obrien Exp
 #
 
@@ -19,4 +19,10 @@ NO_BIN_ON_CDROM=${RESTRICTED}
 
 MANCOMPRESSED=	yes
 
+pre-build:
+	cd ${WRKSRC} && \
+		for i in *.[ch]; do ${SED} "s,#endif lint,#endif /* lint */,g" $${i} > $${i}.new && \
+			${MV} -f $${i}.new $${i}; \
+		done
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/fep/distinfo b/misc/fep/distinfo
index b05c8508113..01f85bc8cb1 100644
--- a/misc/fep/distinfo
+++ b/misc/fep/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.4 2003/11/07 16:35:51 christos Exp $
+$NetBSD: distinfo,v 1.5 2003/11/11 10:42:32 wiz Exp $
 
 SHA1 (fep.tar.gz) = 73fa55337b12dba3b91c9895e2c9adbbdfa9d960
 Size (fep.tar.gz) = 40137 bytes
-SHA1 (patch-aa) = 1f8abf4fd9437fac506274d5bd02e641465ed19d
-SHA1 (patch-ab) = 33ed4137d8dc1006c57b3d2f77c736c5dcfd88f1
-SHA1 (patch-ac) = 35886a142911bc6da8b6661de86ab803d5f506f9
-SHA1 (patch-ad) = bd19298f8277a0385d3612a2a99f9f586eeb156c
-SHA1 (patch-ae) = aa6ca28dac7ebbca2f00513d8f60ef4064e13024
-SHA1 (patch-af) = d4422c9f033e16c8ad137723e4c82f051aad3b7b
-SHA1 (patch-ag) = 1bdc893ab86462fe1347ab8366f105bbed50fe87
-SHA1 (patch-ah) = d63de2c13396fa4657282433cf22f086d6141cdb
-SHA1 (patch-ai) = 409c63c5cb5283735ea83f047f65357caf9e6331
-SHA1 (patch-aj) = 3266b9c80e104290b62460acc73a1c1ab2accee4
-SHA1 (patch-ak) = d1b517c222d26c74c325773220039e1319a57554
-SHA1 (patch-al) = f82284b2ddea4d3ec8cc7d00e8654b1f28354796
-SHA1 (patch-am) = 9d8e7fb850cf08bfe80726a9cfad657adebd130d
+SHA1 (patch-aa) = fd1fa7e7978d007bcccd55726d47ce66edd585f2
+SHA1 (patch-ab) = 3d05ad0b25a56ce588e7d31afa7685b18ca94bd6
+SHA1 (patch-ac) = 6f989e576260e95c035cb12c13d43b095414913b
+SHA1 (patch-ad) = 696b57cb1b282e01549995b1bbf51b10aa881f0b
+SHA1 (patch-ae) = dd89c7124376a77a3809a28025c2975fcdf445ab
+SHA1 (patch-af) = a2d8a7c9050ee89f66c211d1ed818091163a8858
+SHA1 (patch-ag) = 1a8cd62babb699ff85ec4e8ec56ef844f7f401c7
+SHA1 (patch-ah) = c08a2af68c59f254cd33969a98d2376047ae4f0f
+SHA1 (patch-ai) = f5b420c63c13612182ff5c093277e9a6bd608e48
+SHA1 (patch-aj) = 47983e99dd157e16b155e96d39bbea8039f291ad
+SHA1 (patch-ak) = c7e65cb589f9267a11b688a8773704c7e13ab8a3
+SHA1 (patch-al) = b6f57757e7374e3268e45ac0a294c45d0bff7258
+SHA1 (patch-am) = 4b19832075292802c1ddf2fdc9083b7379eb4066
diff --git a/misc/fep/patches/patch-aa b/misc/fep/patches/patch-aa
index 03a5e01e7bf..84de7b31911 100644
--- a/misc/fep/patches/patch-aa
+++ b/misc/fep/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-aa,v 1.6 2003/11/11 10:42:32 wiz Exp $
 
---- Makefile.orig	1993-06-09 22:51:22.000000000 -0400
-+++ Makefile	2003-11-07 11:13:19.000000000 -0500
-@@ -15,17 +15,21 @@
+--- Makefile.orig	Thu Jun 10 04:51:22 1993
++++ Makefile
+@@ -15,17 +15,21 @@ OBJ	= fep_main.o fep_edit.o fep_hist.o f
  DISTRIBUTION\
  	= Makefile fep.1 $(HEADER) $(SRC) feprc.sample README
  
@@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.5 2003/11/07 16:35:51 christos Exp $
  
  all: $(TARGET)
  
-@@ -37,7 +41,7 @@
+@@ -37,7 +41,7 @@ argv: fep_com.c
  
  install: $(TARGET)
  	install -s $(TARGET) $(INSTDIR)
diff --git a/misc/fep/patches/patch-ab b/misc/fep/patches/patch-ab
index f1c80b79e92..0fb29eef114 100644
--- a/misc/fep/patches/patch-ab
+++ b/misc/fep/patches/patch-ab
@@ -1,17 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-ab,v 1.3 2003/11/11 10:42:32 wiz Exp $
 
---- fep_alias.c.orig	1988-11-13 01:50:58.000000000 -0500
-+++ fep_alias.c	2003-11-07 11:23:03.000000000 -0500
-@@ -3,7 +3,7 @@
- #ifndef lint
- static char rcsid[]=
- "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ab,v 1.2 2003/11/07 16:35:51 christos Exp $ (SRA)";
--#endif lint
-+#endif /* lint */
- 
- #include <stdio.h>
- #include <ctype.h>
-@@ -18,7 +18,7 @@
+--- fep_alias.c.orig	Sun Nov 13 07:50:58 1988
++++ fep_alias.c
+@@ -18,7 +18,7 @@ typedef struct _alias {
  
  ALIAS	alias_top = {"top", "top", (ALIAS *)0};
  ALIAS	*alias_list = &alias_top;
@@ -20,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/07 16:35:51 christos Exp $
  
  /*
   * Functions
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ check_alias (comline)
  
      while (isspace (*comline))
  	++comline;
diff --git a/misc/fep/patches/patch-ac b/misc/fep/patches/patch-ac
index b4d810b968c..fe64c4fc125 100644
--- a/misc/fep/patches/patch-ac
+++ b/misc/fep/patches/patch-ac
@@ -1,13 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-ac,v 1.3 2003/11/11 10:42:32 wiz Exp $
 
---- fep_com.c.orig	1991-05-29 01:31:09.000000000 -0400
-+++ fep_com.c	2003-11-07 11:22:46.000000000 -0500
-@@ -3,10 +3,20 @@
- #ifndef lint
- static char rcsid[]=
- "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $ (SRA)";
--#endif lint
-+#endif /* lint */
+--- fep_com.c.orig	Wed May 29 07:31:09 1991
++++ fep_com.c
+@@ -6,7 +6,17 @@ static char rcsid[]=
+ #endif lint
  
  #include <stdio.h>
 +#include <sys/ioctl.h>
@@ -24,7 +20,7 @@ $NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
  #include <ctype.h>
  #include <sys/param.h>
  #include <sys/file.h>
-@@ -31,7 +41,7 @@
+@@ -31,7 +41,7 @@ executeBuiltInFunction (comline, more)
      char *comline, **more;
  {
      register FunctionTableEnt *ftp;
@@ -33,7 +29,7 @@ $NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
      char *search_string();
      int argc;
  
-@@ -93,7 +103,7 @@
+@@ -93,7 +103,7 @@ is_same_command (a, b)
  
      while (*a && *b && *a == *b)
  	++a, ++b;
@@ -42,7 +38,7 @@ $NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
  	return 1;
      else
  	return 0;
-@@ -295,7 +305,7 @@
+@@ -295,7 +305,7 @@ unalias (comline)
  set (comline)
      char *comline;
  {
@@ -51,7 +47,7 @@ $NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
      char *cp, *index();
      char *argv[MAXARGS];
      int argc;
-@@ -352,8 +362,13 @@
+@@ -352,8 +362,13 @@ unset(comline)
  
  extern	int Transparency;
  extern	int Through;
@@ -67,7 +63,7 @@ $NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
  extern	int master, slave;
  extern	char slave_tty[];
  
-@@ -368,7 +383,11 @@
+@@ -368,7 +383,11 @@ toggle_through()
  {
      int r;
      int slave_fd;
@@ -79,7 +75,7 @@ $NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
  
      if (Through == OFF) {
  
-@@ -378,15 +397,26 @@
+@@ -378,15 +397,26 @@ toggle_through()
  	    return;
  	}
  
@@ -106,7 +102,7 @@ $NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
  	if (r < 0) {
  	    perror (slave_tty);
  	    (void) close (slave_fd);
-@@ -394,7 +424,11 @@
+@@ -394,7 +424,11 @@ toggle_through()
  	(void) close (slave_fd);
      }
      else
@@ -118,7 +114,7 @@ $NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
  
      if (r < 0) {
  	printf ("Can't change pty mode.\n");
-@@ -410,7 +444,11 @@
+@@ -410,7 +444,11 @@ toggle_through()
  fix_transparency()
  {
      int r;
@@ -130,7 +126,7 @@ $NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
  
      if (Through)
  	return;
-@@ -418,11 +456,17 @@
+@@ -418,11 +456,17 @@ fix_transparency()
      if (slave < 0)
  	return;
  
@@ -148,7 +144,7 @@ $NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
      if (r < 0) {
  	perror (slave_tty);
  	return;
-@@ -432,9 +476,19 @@
+@@ -432,9 +476,19 @@ fix_transparency()
       * If find slave tty mode is cbreak or raw, fix tty mode of stdout to
       * same mode as slave and set Transparency ON.
       */
@@ -169,7 +165,7 @@ $NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
  	    if (r < 0) {
  		perror ("stdout");
  		return;
-@@ -445,7 +499,11 @@
+@@ -445,7 +499,11 @@ fix_transparency()
      }
      else {
  	if (Transparency == ON) {
@@ -182,7 +178,7 @@ $NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
  	    if (r < 0) {
  		perror ("stdout");
  		return;
-@@ -738,9 +796,9 @@
+@@ -738,9 +796,9 @@ char *line;
  fep_pwd (line)
      char *line;
  {
@@ -194,7 +190,7 @@ $NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
      printf ("%s\n", cwd);
  }
  
-@@ -755,7 +813,7 @@
+@@ -755,7 +813,7 @@ fep_echo (comline)
      argc = mkargv (comline, argv, MAXARGS);
      
      argp = &argv[1];
@@ -203,7 +199,7 @@ $NetBSD: patch-ac,v 1.2 2003/11/07 16:35:51 christos Exp $
  	putnewline = 0;
  	++argp;
      }
-@@ -791,7 +849,7 @@
+@@ -791,7 +849,7 @@ fep_command (comline)
      int argc;
      int i;
      char **argp;
diff --git a/misc/fep/patches/patch-ad b/misc/fep/patches/patch-ad
index af6fa5e2ac5..5899a21e0fb 100644
--- a/misc/fep/patches/patch-ad
+++ b/misc/fep/patches/patch-ad
@@ -1,21 +1,15 @@
-$NetBSD: patch-ad,v 1.3 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-ad,v 1.4 2003/11/11 10:42:32 wiz Exp $
 
---- fep_defs.h.orig	1993-05-10 01:23:33.000000000 -0400
-+++ fep_defs.h	2003-11-07 11:14:52.000000000 -0500
-@@ -3,9 +3,9 @@
- #ifndef lint
- # define FEP_DEFS \
-     "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ad,v 1.3 2003/11/07 16:35:51 christos Exp $ (SRA)"
--#endif lint
-+#endif /* lint */
+--- fep_defs.h.orig	Mon May 10 07:23:33 1993
++++ fep_defs.h
+@@ -6,5 +6,5 @@
+ #endif lint
  
 -#define	MAXCOMLEN		512	/* maximum command length */
 +#define	MAXCMDLEN		512	/* maximum command length */
  #define MAXARGS			64	/* maximum number of arguments */
  #define ON			1	/* on switch */
- #define OFF			0	/* off switch */
-@@ -31,11 +31,11 @@
- # define isctlchar(c)	(c && !iskanji(c) && (!(c&0140) || c=='\177'))
+@@ -32,9 +32,9 @@
  # define iswordchar(c)	(c && (iskanji(c) || isalnum(c) || iscntrl(c)))
  # define isWordchar(c)	((c) && !isspace((c)))
 -#else KANJI
@@ -27,9 +21,7 @@ $NetBSD: patch-ad,v 1.3 2003/11/07 16:35:51 christos Exp $
 +#endif /* KANJI */
  #define unctl(c)	(((c)=='\177') ? '?' : ((c) >= 040) ? (c) : (c)|0100)
  #define toctrl(c)	((c)&~0100)
- #define ctrl(c)		((c)&037)
-@@ -53,17 +53,17 @@
- #ifdef KANJI
+@@ -54,8 +54,8 @@
  # define CHAR		unsigned char
  # define CHARMASK	0377
 -#else KANJI
@@ -40,12 +32,10 @@ $NetBSD: patch-ad,v 1.3 2003/11/07 16:35:51 christos Exp $
 +#endif /* KANJI */
  
  /*
-  * Only one machine I know alloca() works is vax.
-  */
+@@ -64,5 +64,5 @@
  #ifdef vax
  # define ALLOCA
 -#endif vax
 +#endif /* vax */
  
  /*
-  * Typedef's
diff --git a/misc/fep/patches/patch-ae b/misc/fep/patches/patch-ae
index e64b76f4c43..21550d85ecc 100644
--- a/misc/fep/patches/patch-ae
+++ b/misc/fep/patches/patch-ae
@@ -1,14 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-ae,v 1.4 2003/11/11 10:42:32 wiz Exp $
 
---- fep_edit.c.orig	1995-01-20 03:16:37.000000000 -0500
-+++ fep_edit.c	2003-11-07 11:25:48.000000000 -0500
-@@ -3,12 +3,22 @@
- #ifndef lint
- static char rcsid[]=
- "$Id: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $ (SRA)";
--#endif lint
-+#endif /* lint */
- 
+--- fep_edit.c.orig	Fri Jan 20 09:16:37 1995
++++ fep_edit.c
+@@ -8,7 +8,17 @@ static char rcsid[]=
  #include <stdio.h>
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -26,7 +20,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  #include <sys/time.h>
  #include <ctype.h>
  #include <sys/dir.h>
-@@ -25,7 +35,7 @@
+@@ -25,7 +35,7 @@ int		MarkPosition = -1;	/* Marked positi
  EDITMODE	editmode = NOTYET;	/* edtimode EMACS, VI */
  EDITSTATUS	editstatus = NOTEDITING;/* EDITING, NOTEDITING */
  
@@ -35,7 +29,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  int	NeedNewLine;			/* add new line flag */
  int	NeedSave;			/* need to save to history */
  int	Transparency = OFF;		/* transparent flag */
-@@ -86,7 +96,7 @@
+@@ -86,7 +96,7 @@ BINDENT emacsBindings[] = {
  	/* ^X-^V	*/	{"\\^X\\^V",	view_buffer},
  	/* ^X-^K	*/	{"\\^X\\^K",	kill_to_top_of_line},
  	/* ^X-^L	*/	{"\\^X\\^L",	fep_repaint},
@@ -44,7 +38,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  	/* ^X-^D	*/	{"\\^X\\^D",	send_eof},
  	/* ^X-(		*/	{"\\^X(",	fep_start_script},
  	/* ^X-)		*/	{"\\^X)",	fep_end_script},
-@@ -192,6 +202,30 @@
+@@ -192,6 +202,30 @@ initEmacsBindings (cft, aft)
  
  #define import(table,key,fn) if((int)key>0)table[(int)key]=fn
  
@@ -75,7 +69,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
      /* Now, using cbreak mode
      import (cft, tchars_buf.t_startc, ignore);
      import (cft, tchars_buf.t_stopc, ignore);
-@@ -212,6 +246,7 @@
+@@ -212,6 +246,7 @@ initEmacsBindings (cft, aft)
      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);
@@ -83,7 +77,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  
  #undef import
  
-@@ -257,7 +292,7 @@
+@@ -257,7 +292,7 @@ RETRY:
  	 */
  	swallow_output();
  
@@ -92,7 +86,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  	    ++redirect_line;
  	    execute_command = CommandLine;
  	    goto RETURN;	    
-@@ -301,7 +336,11 @@
+@@ -301,7 +336,11 @@ RETRY:
  	 * call send_eof
  	 */
  	if (
@@ -104,7 +98,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  	    && curFuncTab[c] != send_eof
  	    && ! look_var ("ignore-eof")
  	    && CommandLine [0] == '\0'
-@@ -422,11 +461,11 @@
+@@ -422,11 +461,11 @@ self_insert(c)
      register int i, nbyte = 1, currentNull;
  #ifdef KANJI
      CHAR byte2;
@@ -118,7 +112,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
          errorBell();
  	return (0);
      }
-@@ -441,7 +480,7 @@
+@@ -441,7 +480,7 @@ self_insert(c)
  	nbyte = 2;
      }
      else
@@ -127,7 +121,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  	putChar (c);
      reverse_strcpy (
  	&CommandLine[CurrentPosition] + nbyte,
-@@ -453,7 +492,7 @@
+@@ -453,7 +492,7 @@ self_insert(c)
      if (nbyte > 1) {
  	CommandLine[CurrentPosition - 1] = byte2;
      }
@@ -136,7 +130,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
      printS (&CommandLine [CurrentPosition]);
  
      if (CommandLine[CurrentPosition] != '\0') {
-@@ -557,7 +596,7 @@
+@@ -557,7 +596,7 @@ moveto (position)
  #ifdef KANJI
  	    && !(CurrentPosition + 1 == position
  		    && iskanji (CommandLine[CurrentPosition]))
@@ -145,7 +139,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  	)
  	    (void) forward_n_character (1);
  }
-@@ -581,10 +620,10 @@
+@@ -581,10 +620,10 @@ beginning_of_line()
  #ifdef KANJI
  #define INC(i) if(iskanji(CommandLine[i])) i+=2; else i++;
  #define DEC(i) if(i>=2 && iskanji_in_string(CommandLine, i-2)) i-=2; else i--;
@@ -158,7 +152,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  
  /*
   * Move cursor to end of line
-@@ -642,7 +681,7 @@
+@@ -642,7 +681,7 @@ backward_n_character(n)
  	    i--;
  	}
  	else
@@ -167,7 +161,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  	putchar (BS);
  	i--;
      }
-@@ -697,7 +736,7 @@
+@@ -697,7 +736,7 @@ backward_n_word (n)
  	    nchars++;
  	}
      }
@@ -176,7 +170,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
      while (n--) {
  	i--, nchars++;
  	while (i > 0 && !iswordchar (CommandLine [i])) {
-@@ -707,7 +746,7 @@
+@@ -707,7 +746,7 @@ backward_n_word (n)
  	    i--, nchars++;
  	}
      }
@@ -185,7 +179,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
      return (backward_n_character (nchars));
  }
  
-@@ -758,7 +797,7 @@
+@@ -758,7 +797,7 @@ backward_n_Word (n)
  	    nchars++;
  	}
      }
@@ -194,7 +188,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
      while (n--) {
  	i--, nchars++;
  	while (i > 0 && !isWordchar (CommandLine [i]))
-@@ -766,7 +805,7 @@
+@@ -766,7 +805,7 @@ backward_n_Word (n)
  	while (i > 0 && isWordchar (CommandLine [i - 1]))
  	    i--, nchars++;
      }
@@ -203,7 +197,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
      return (backward_n_character (nchars));
  }
  
-@@ -804,7 +843,7 @@
+@@ -804,7 +843,7 @@ forward_n_character(n)
  	(void) putchar (CommandLine[i++]);
      }
      else
@@ -212,7 +206,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
      if (isctlchar(CommandLine[i])) {
  	(void) putchar (unctl (CommandLine [i]));
  	i++;
-@@ -819,7 +858,7 @@
+@@ -819,7 +858,7 @@ forward_n_character(n)
  	    (void) putchar (CommandLine[i++]);
  	}
  	else
@@ -221,7 +215,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  	putChar (CommandLine [i++]);
      }
  
-@@ -1000,9 +1039,9 @@
+@@ -1000,9 +1039,9 @@ delete_previous_n_character(n)
  	    i -= 2, nbyte += 2;
  	else
  	    i -= 1, nbyte += 1;
@@ -233,7 +227,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  
      deleteArea = howlong (&CommandLine[CurrentPosition - nbyte], nbyte);
      restArea = howlong (&CommandLine[CurrentPosition], 0);
-@@ -1075,7 +1114,7 @@
+@@ -1075,7 +1114,7 @@ delete_previous_n_word(n)
  	    nchars++;
  	}
      }
@@ -242,7 +236,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
      while (n--) {
  	i--, nchars++;
  	while (i > 0 && !iswordchar (CommandLine [i]))
-@@ -1083,7 +1122,7 @@
+@@ -1083,7 +1122,7 @@ delete_previous_n_word(n)
  	while (i > 0 && iswordchar (CommandLine [i - 1]))
  	    i--, nchars++;
      }
@@ -251,7 +245,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  
      return (delete_previous_n_character (nchars));
  }
-@@ -1136,7 +1175,7 @@
+@@ -1136,7 +1175,7 @@ delete_previous_n_Word(n)
  	    nchars++;
  	}
      }
@@ -260,7 +254,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
      while (n--) {
  	i--, nchars++;
  	while (i > 0 && !isWordchar (CommandLine [i]))
-@@ -1144,7 +1183,7 @@
+@@ -1144,7 +1183,7 @@ delete_previous_n_Word(n)
  	while (i > 0 && isWordchar (CommandLine [i - 1]))
  	    i--, nchars++;
      }
@@ -269,7 +263,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  
      return (delete_previous_n_character (nchars));
  }
-@@ -1183,9 +1222,9 @@
+@@ -1183,9 +1222,9 @@ delete_next_n_character (n)
  	    else
  		cp++, nbyte++;
      }
@@ -281,7 +275,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  
      deleteArea = howlong (&CommandLine[CurrentPosition], nbyte);
      restArea = howlong (&CommandLine[CurrentPosition + nbyte], 0);
-@@ -1481,7 +1520,11 @@
+@@ -1481,7 +1520,11 @@ insert_and_flush(c)
   */
  send_eof()
  {
@@ -293,7 +287,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  
      (void) self_insert (c);
      if (isctlchar (c))
-@@ -1738,9 +1781,9 @@
+@@ -1738,9 +1781,9 @@ expand_file_name ()
  
  # ifdef ALLOCA
    	    fcp = (char *) alloca (strlen (dp->d_name) + 1);
@@ -305,7 +299,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  	    if (fcp == 0) {
  		fputs ("\r\n", stdout);
  		perror ("alloca:");
-@@ -1754,7 +1797,7 @@
+@@ -1754,7 +1797,7 @@ expand_file_name ()
      fileList [i] = (char *) 0;
  
      if (*start_expand == '~' && look_var ("expand-tilde")) {
@@ -314,7 +308,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  
  	strcpy (buf, start_expand);
  	p = x_dirname (buf);
-@@ -1801,7 +1844,7 @@
+@@ -1801,7 +1844,7 @@ expand_file_name ()
  # ifndef ALLOCA
      for (i = 0; fileList [i]; i++)
  	free (fileList [i]);
@@ -323,7 +317,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  
      closedir(dirp);
      return (0);
-@@ -1929,9 +1972,9 @@
+@@ -1929,9 +1972,9 @@ ls (dirp, prefixstring)
  	if (prefix (prefixstring, dp->d_name)) {
  # ifdef ALLOCA
    	    fcp = (char *) alloca (strlen (dp->d_name) + 1);
@@ -335,7 +329,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  	    if (fcp == 0) {
  		fputs ("\r\n", stdout);
  		perror ("alloca:");
-@@ -1975,7 +2018,7 @@
+@@ -1975,7 +2018,7 @@ BACK:
  # ifndef ALLOCA
      for (i = 0; fileList [i]; i++)
  	free (fileList [i]);
@@ -344,7 +338,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
      return;
  }
  
-@@ -2022,7 +2065,7 @@
+@@ -2022,7 +2065,7 @@ list_remote_file (host, pattern)
  	fputs ("\n", stdout);
      }
  }
@@ -353,7 +347,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  
  bind_key (ft, func, s, dfunc)
      FUNC ft[];		/* Function table */
-@@ -2032,7 +2075,7 @@
+@@ -2032,7 +2075,7 @@ bind_key (ft, func, s, dfunc)
  {
      char tmps[16];
  
@@ -362,7 +356,7 @@ $NetBSD: patch-ae,v 1.3 2003/11/07 16:35:51 christos Exp $
  	tmps[0] = toctrl (s[2]);
  	strcpy (&tmps[1], &s[3]);
  	s = tmps;
-@@ -2042,7 +2085,7 @@
+@@ -2042,7 +2085,7 @@ bind_key (ft, func, s, dfunc)
       * If the string contain only one character, put the function to
       * appropriate position in the table.
       */
diff --git a/misc/fep/patches/patch-af b/misc/fep/patches/patch-af
index d98d9c4f57e..18b42b09251 100644
--- a/misc/fep/patches/patch-af
+++ b/misc/fep/patches/patch-af
@@ -1,20 +1,16 @@
-$NetBSD: patch-af,v 1.2 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-af,v 1.3 2003/11/11 10:42:32 wiz Exp $
 
---- fep_funcs.c.orig	1991-05-29 01:31:18.000000000 -0400
-+++ fep_funcs.c	2003-11-07 11:23:22.000000000 -0500
-@@ -3,9 +3,10 @@
- #ifndef lint
- static char rcsid[]=
- "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-af,v 1.2 2003/11/07 16:35:51 christos Exp $ (SRA)";
--#endif lint
-+#endif /* lint */
+--- fep_funcs.c.orig	Wed May 29 07:31:18 1991
++++ fep_funcs.c
+@@ -6,6 +6,7 @@ static char rcsid[]=
+ #endif lint
  
  #include <stdio.h>
 +#include "fep_defs.h"
  #include "fep_funcs.h"
  
  /*
-@@ -94,7 +95,7 @@
+@@ -94,7 +95,7 @@ FunctionTableEnt FunctionNameTable[] = {
  	 "Expand file name"},
  	{list_file_name,		"list-file-name",
  	 "List file name"},
@@ -23,7 +19,7 @@ $NetBSD: patch-af,v 1.2 2003/11/07 16:35:51 christos Exp $
  	 "Terminate fep"},
  	{suspend,			"suspend",
  	 "Suspend fep"},
-@@ -193,7 +194,7 @@
+@@ -193,7 +194,7 @@ FunctionTableEnt BuiltinFuncTable[] = {
  	 "Operation \"else\""},
  	{fep_endif,			"fep-endif",
  	 "Operation \"endif\""},
diff --git a/misc/fep/patches/patch-ag b/misc/fep/patches/patch-ag
index ffb0a3f4705..c427d3ad4e1 100644
--- a/misc/fep/patches/patch-ag
+++ b/misc/fep/patches/patch-ag
@@ -1,17 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-ag,v 1.3 2003/11/11 10:42:32 wiz Exp $
 
---- fep_funcs.h.orig	1991-05-29 01:31:20.000000000 -0400
-+++ fep_funcs.h	2003-11-07 11:16:49.000000000 -0500
-@@ -3,7 +3,7 @@
- #ifndef lint
- # define FEP_FUNCS \
-     "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ag,v 1.2 2003/11/07 16:35:51 christos Exp $ (SRA)"
--#endif lint
-+#endif /* lint */
- 
- /*
-  * command line edit functions
-@@ -22,7 +22,7 @@
+--- fep_funcs.h.orig	Wed May 29 07:31:20 1991
++++ fep_funcs.h
+@@ -22,7 +22,7 @@ int	delete_previous_character();
  int	delete_previous_word();
  int	delete_previous_Word();
  int	delete_to_kill_buffer();
diff --git a/misc/fep/patches/patch-ah b/misc/fep/patches/patch-ah
index 03a27359c46..28278e6fcd6 100644
--- a/misc/fep/patches/patch-ah
+++ b/misc/fep/patches/patch-ah
@@ -1,17 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-ah,v 1.3 2003/11/11 10:42:32 wiz Exp $
 
---- fep_glob.h.orig	1988-08-28 01:36:43.000000000 -0400
-+++ fep_glob.h	2003-11-07 11:17:00.000000000 -0500
-@@ -3,7 +3,7 @@
- #ifndef lint
- # define FEP_GLOB \
-     "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ah,v 1.2 2003/11/07 16:35:51 christos Exp $ (SRA)"
--#endif lint
-+#endif /* lint */
- 
- extern FUNC	*curFuncTab;	/* function table */
- extern FUNC	*altFuncTab;	/* altanative function table */
-@@ -29,6 +29,11 @@
+--- fep_glob.h.orig	Sun Aug 28 07:36:43 1988
++++ fep_glob.h
+@@ -29,6 +29,11 @@ extern char	*term_clear;	/* terminal cle
   * tty control caracters.
   * defined in fep_main.c
   */
diff --git a/misc/fep/patches/patch-ai b/misc/fep/patches/patch-ai
index a1a3dd864a2..8feea4050ba 100644
--- a/misc/fep/patches/patch-ai
+++ b/misc/fep/patches/patch-ai
@@ -1,13 +1,9 @@
-$NetBSD: patch-ai,v 1.2 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-ai,v 1.3 2003/11/11 10:42:32 wiz Exp $
 
---- fep_hist.c.orig	1988-11-25 06:45:42.000000000 -0500
-+++ fep_hist.c	2003-11-07 11:20:24.000000000 -0500
-@@ -3,9 +3,11 @@
- #ifndef lint
- static char rcsid[]=
- "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ai,v 1.2 2003/11/07 16:35:51 christos Exp $ (SRA)";
--#endif lint
-+#endif /* lint */
+--- fep_hist.c.orig	Fri Nov 25 12:45:42 1988
++++ fep_hist.c
+@@ -6,6 +6,8 @@ static char rcsid[]=
+ #endif lint
  
  #include <stdio.h>
 +#include <stdlib.h>
@@ -15,7 +11,7 @@ $NetBSD: patch-ai,v 1.2 2003/11/07 16:35:51 christos Exp $
  #include <ctype.h>
  #include "fep_defs.h"
  #include "fep_glob.h"
-@@ -255,7 +257,7 @@
+@@ -255,7 +257,7 @@ historyExtract(string)
  
  	default:
  	    {
@@ -24,7 +20,7 @@ $NetBSD: patch-ai,v 1.2 2003/11/07 16:35:51 christos Exp $
  
  		strcpy (buf, "^");
  		strncat (buf, string, 64);
-@@ -267,6 +269,7 @@
+@@ -267,6 +269,7 @@ historyExtract(string)
  
  char *
  search_reverse_history (string)
@@ -32,7 +28,7 @@ $NetBSD: patch-ai,v 1.2 2003/11/07 16:35:51 christos Exp $
  {
      register int i;
      char *re_comp();
-@@ -291,6 +294,7 @@
+@@ -291,6 +294,7 @@ search_reverse_history (string)
  
  char *
  search_forward_history (string)
@@ -40,7 +36,7 @@ $NetBSD: patch-ai,v 1.2 2003/11/07 16:35:51 christos Exp $
  {
      register int i;
      char *re_comp();
-@@ -412,7 +416,7 @@
+@@ -412,7 +416,7 @@ char *
  mk_home_relative (cp)
      char *cp;
  {
@@ -49,7 +45,7 @@ $NetBSD: patch-ai,v 1.2 2003/11/07 16:35:51 christos Exp $
  
      /*
       * If variable "history-file" is not absolute path name,
-@@ -540,7 +544,7 @@
+@@ -540,7 +544,7 @@ read_history (file)
      char *file;
  {
      FILE *fp;
@@ -58,7 +54,7 @@ $NetBSD: patch-ai,v 1.2 2003/11/07 16:35:51 christos Exp $
      register int i;
  
      if ((fp = fopen (file, "r")) == NULL) {
-@@ -550,7 +554,7 @@
+@@ -550,7 +554,7 @@ read_history (file)
  	return;
      }
  
diff --git a/misc/fep/patches/patch-aj b/misc/fep/patches/patch-aj
index b42551081c2..ab83854d407 100644
--- a/misc/fep/patches/patch-aj
+++ b/misc/fep/patches/patch-aj
@@ -1,16 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-aj,v 1.3 2003/11/11 10:42:32 wiz Exp $
 
---- fep_main.c.orig	1993-06-09 22:53:06.000000000 -0400
-+++ fep_main.c	2003-11-07 11:28:23.000000000 -0500
-@@ -3,15 +3,24 @@
- #ifndef lint
- static char rcsid[]=
- "$Id: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $ (SRA)";
--#endif lint
-+#endif /* lint */
- 
- #include <stdio.h>
- #include <signal.h>
+--- fep_main.c.orig	Thu Jun 10 04:53:06 1993
++++ fep_main.c
+@@ -10,8 +10,17 @@ static char rcsid[]=
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/ioctl.h>
@@ -29,7 +21,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  #include <sys/time.h>
  #include <sys/resource.h>
  #include <sys/errno.h>
-@@ -30,7 +39,7 @@
+@@ -30,7 +39,7 @@ static char rcsid[]=
  #ifdef STAT
    static char fep_statrc[] = FEP_STAT;
  #endif
@@ -38,7 +30,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  
  char	*myself;			/* the command name */
  char	*prompt = "";			/* prompt string */
-@@ -38,9 +47,9 @@
+@@ -38,9 +47,9 @@ char	*delimiters = DEFAULT_DELIMITERS;
  					/* delimiter characters */
  int	master;				/* file discriptor for pty master */
  int	slave;				/* file discriptor for pty slave */
@@ -51,7 +43,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  int	selectnfds;			/* max (fileno(stdin), master) + 1*/
  int	child_pid;			/* child pid */
  int	ptyflag = ON;			/* flag to use pty or not */
-@@ -48,27 +57,34 @@
+@@ -48,27 +57,34 @@ int	histlen = -1;			/* history length */
  int	debug = OFF;			/* debug switch */
  int	auto_tty_fix = ON;		/* fix tty mode automaticaly */
  FILE	*script_fp = NULL;		/* script file pointer */
@@ -92,7 +84,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  
  char	master_tty[16];			/* master tty name */
  char	slave_tty[16];			/* slave tty name */
-@@ -112,6 +128,10 @@
+@@ -112,6 +128,10 @@ main(argc, argv)
  
      myself = argv[0];
  
@@ -103,7 +95,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
      /*
       * Initialize binding table
       */
-@@ -276,7 +296,7 @@
+@@ -276,7 +296,7 @@ DEFAULT:
  fix_signal ()
  {
  #ifdef SIGWINCH
@@ -112,7 +104,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  #endif
  
      sighup = signal (SIGHUP, terminate);
-@@ -336,7 +356,7 @@
+@@ -336,7 +356,7 @@ input_handler()
  	if (Through == OFF && Transparency == OFF && script_fp)
  	    fwrite (inputline, sizeof(CHAR), strlen (inputline), script_fp);
      }
@@ -121,7 +113,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  }
  
  #define INPUT_BUFFER_SIZE 1024
-@@ -384,7 +404,8 @@
+@@ -384,7 +404,8 @@ getcharacter()
  {
      char c;
      int n;
@@ -131,7 +123,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  #ifdef USE_TIMEOUT
      struct timeval **timeout = auto_tty_fix ? timeout_list : notimeout;
  #else
-@@ -396,9 +417,8 @@
+@@ -396,9 +417,8 @@ getcharacter()
      /*
       * Sorry, this cording depends to an implementation of getc().
       */
@@ -143,7 +135,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  
  RETRY:
      readfd = selectmask;
-@@ -409,13 +429,13 @@
+@@ -409,13 +429,13 @@ RETRY:
      while ((nfound = select (selectnfds, &readfd, 0, 0, *timeout)) < 0)
  	if (errno != EINTR) {
  		perror ("select");
@@ -159,7 +151,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  	int nbyte;
  
  	/*
-@@ -451,7 +471,7 @@
+@@ -451,7 +471,7 @@ RETRY:
      /*
       * Found input from terminal
       */
@@ -168,7 +160,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  
  #ifndef USE_TIMEOUT
  	/*
-@@ -467,8 +487,8 @@
+@@ -467,8 +487,8 @@ RETRY:
  	RETURNCHAR:
  	if ((c = getc (stdin)) == EOF) {
  	    if (debug)
@@ -179,7 +171,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  	}
  	else
  	    return (c & CHARMASK);
-@@ -596,7 +616,7 @@
+@@ -596,7 +616,7 @@ buf_put (bp, s)
  
  swallow_output()
  {
@@ -188,7 +180,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
      int r;
      int nbyte;
      int ncount = 10;
-@@ -604,7 +624,7 @@
+@@ -604,7 +624,7 @@ swallow_output()
      while (
  	ncount-- &&
  	select (selectnfds, &readfd, 0, 0, TIMEOUT_NOBLOCK) > 0 &&
@@ -197,7 +189,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
      ) {
  	nbyte = buf_read (master, output_buffer);
  	if (nbyte > 0) {
-@@ -636,21 +656,23 @@
+@@ -636,21 +656,23 @@ swallow_output()
  #include <sys/m_wait.h>
  #endif
  
@@ -225,7 +217,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  }
  
  exec_to_command(argv)
-@@ -675,13 +697,37 @@
+@@ -675,13 +697,37 @@ exec_to_command(argv)
      dup2 (slave, 2);
      (void) close (slave);
  
@@ -264,7 +256,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  fix_tty()
  {
      struct tchars tcbuf;
-@@ -719,6 +765,7 @@
+@@ -719,6 +765,7 @@ fix_tty()
      ioctl (0, TIOCSETC, (char *) & tcbuf);
      ioctl (0, TIOCSLTC, (char *) & lcbuf);
  }
@@ -272,7 +264,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  
  kill_process()
  {
-@@ -727,7 +774,9 @@
+@@ -727,7 +774,9 @@ kill_process()
  	(void) killpg (child_pid, SIGTERM);
  }
  
@@ -283,7 +275,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  {
      extern int errno;
  
-@@ -759,10 +808,14 @@
+@@ -759,10 +808,14 @@ terminate()
  	    if (killpg (child_pid, SIGKILL) < 0)
  		perror ("kill");
  
@@ -299,7 +291,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  }
  
  get_pty_master()
-@@ -796,11 +849,15 @@
+@@ -796,11 +849,15 @@ get_pty_master()
      }
  
   FOUND:
@@ -315,7 +307,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  
  #ifdef TIOCGWINSZ
      {
-@@ -820,11 +877,15 @@
+@@ -820,11 +877,15 @@ get_pty_master()
  # if defined(TIOCKGETC) && defined(TIOCKSETC)
      ioctl (0, TIOCKGETC, (char *) &jtchars_buf);
  # endif
@@ -335,7 +327,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
      selectnfds = max (fileno(stdin), master) + 1;
  
      return;
-@@ -838,11 +899,15 @@
+@@ -838,11 +899,15 @@ get_pty_slave()
  	perror (slave_tty);
  	exit (1);
      }
@@ -351,7 +343,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  
  #ifdef KANJI
  # if defined(TIOCKGET) && defined(TIOCKSET)
-@@ -851,7 +916,7 @@
+@@ -851,7 +916,7 @@ get_pty_slave()
  # if defined(TIOCKGETC) && defined(TIOCKSETC)
      ioctl (slave, TIOCKSETC, (char *) &jtchars_buf);
  # endif
@@ -360,7 +352,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
  
  #ifdef TIOCSWINSZ
      {
-@@ -866,16 +931,19 @@
+@@ -866,16 +931,19 @@ get_pty_slave()
  
  recover_tty()
  {
@@ -382,7 +374,7 @@ $NetBSD: patch-aj,v 1.2 2003/11/07 16:35:51 christos Exp $
      int		omask;
      extern int	errno;
  
-@@ -890,7 +958,7 @@
+@@ -890,7 +958,7 @@ suspend()
  
      if (kill (child_pid, SIGCONT) < 0 && errno == ESRCH) {
  	printf ("Where my child has gone?!\n");
diff --git a/misc/fep/patches/patch-ak b/misc/fep/patches/patch-ak
index 1d701ada29b..3fcdfed72db 100644
--- a/misc/fep/patches/patch-ak
+++ b/misc/fep/patches/patch-ak
@@ -1,17 +1,8 @@
-$NetBSD: patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $
+$NetBSD: patch-ak,v 1.3 2003/11/11 10:42:32 wiz Exp $
 
---- fep_set.c.orig	2003-11-07 11:18:26.000000000 -0500
-+++ fep_set.c	2003-11-07 11:19:08.000000000 -0500
-@@ -3,7 +3,7 @@
- #ifndef lint
- static char rcsid[]=
- "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $ (SRA)";
--#endif lint
-+#endif /* lint */
- 
- #include <stdio.h>
- #include "fep_defs.h"
-@@ -67,10 +67,10 @@
+--- fep_set.c.orig	Wed May 29 07:31:24 1991
++++ fep_set.c
+@@ -67,10 +67,10 @@ VAR default_unset_vars [] = {
  #ifdef HASH
  #define HASHNUM	10
  VAR *var_htab[HASHNUM];
@@ -24,7 +15,7 @@ $NetBSD: patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $
  
  /*
   * Functions
-@@ -251,12 +251,12 @@
+@@ -251,12 +251,12 @@ show_varlist ()
  	for (; vp != (VAR *)0; vp = vp->v_next)
  	    printf ("%-16s %s\n", vp->v_name, vp->v_value);
      }
@@ -39,7 +30,7 @@ $NetBSD: patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $
  }
  
  #ifdef HASH
-@@ -273,7 +273,7 @@
+@@ -273,7 +273,7 @@ static getindex (s)
  
      return (sum % HASHNUM);
  }
@@ -48,7 +39,7 @@ $NetBSD: patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $
  
  /*
   * Get pointer to VAR.
-@@ -288,7 +288,7 @@
+@@ -288,7 +288,7 @@ getvp (name, alloc, lastvp)
  {
  #ifdef HASH
      register i = getindex (name);
@@ -57,7 +48,7 @@ $NetBSD: patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $
      VAR *vp, *last = (VAR *)0;
  
  #ifdef HASH
-@@ -296,7 +296,7 @@
+@@ -296,7 +296,7 @@ getvp (name, alloc, lastvp)
  	if (strcmp (name, vp->v_value) == 0)
  	    return (vp);
      }
@@ -66,7 +57,7 @@ $NetBSD: patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $
      for (vp = var_list->v_next, last = var_list; vp; last = vp, vp = vp->v_next) {
  	int r;
  
-@@ -309,7 +309,7 @@
+@@ -309,7 +309,7 @@ getvp (name, alloc, lastvp)
  	else if (r < 0)
  	    break;
      }
@@ -75,7 +66,7 @@ $NetBSD: patch-ak,v 1.2 2003/11/07 16:35:51 christos Exp $
  
      if (alloc == 0)
  	return (0);
-@@ -327,9 +327,9 @@
+@@ -327,9 +327,9 @@ getvp (name, alloc, lastvp)
      else {
  	var_htab[i] = vp;
      }
diff --git a/misc/fep/patches/patch-al b/misc/fep/patches/patch-al
index 25e97ec1f7d..7389694d79d 100644
--- a/misc/fep/patches/patch-al
+++ b/misc/fep/patches/patch-al
@@ -1,17 +1,8 @@
-$NetBSD: patch-al,v 1.1 2003/11/07 16:36:12 christos Exp $
+$NetBSD: patch-al,v 1.2 2003/11/11 10:42:32 wiz 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 @@
+--- fep_util.c.orig	Wed Dec 28 13:24:01 1988
++++ fep_util.c
+@@ -178,9 +178,9 @@ max (d1, d2)
  {
      return (d1 > d2 ? d1 : d2);
  }
@@ -23,7 +14,7 @@ $NetBSD: patch-al,v 1.1 2003/11/07 16:36:12 christos Exp $
  
  #include <stdio.h>
  #include <ctype.h>
-@@ -198,7 +198,7 @@
+@@ -198,7 +198,7 @@ main()
  	showArgs (s);
      }
  }
@@ -32,7 +23,7 @@ $NetBSD: patch-al,v 1.1 2003/11/07 16:36:12 christos Exp $
  
  showArgs (comline)
      char *comline;
-@@ -402,4 +402,4 @@
+@@ -402,4 +402,4 @@ iskanji_in_string (s, i)
      else
  	return (iskanji (*cp));
  }
diff --git a/misc/fep/patches/patch-am b/misc/fep/patches/patch-am
index b37b2397ec4..27b3530ff9f 100644
--- a/misc/fep/patches/patch-am
+++ b/misc/fep/patches/patch-am
@@ -1,13 +1,9 @@
-$NetBSD: patch-am,v 1.1 2003/11/07 16:36:12 christos Exp $
+$NetBSD: patch-am,v 1.2 2003/11/11 10:42:32 wiz 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 */
+--- fep_vi.c.orig	Wed May 29 07:31:27 1991
++++ fep_vi.c
+@@ -6,7 +6,17 @@ static char rcsid[]=
+ #endif lint
  
  #include <stdio.h>
 +#include <sys/ioctl.h>
@@ -24,7 +20,7 @@ $NetBSD: patch-am,v 1.1 2003/11/07 16:36:12 christos Exp $
  #include <ctype.h>
  #include "fep_defs.h"
  #include "fep_glob.h"
-@@ -107,7 +117,7 @@
+@@ -107,7 +117,7 @@ BINDENT viComBindings[] = {
  	/* ^X-^V   */	{"\\^X\\^V",	view_buffer},
  	/* ^X-^X   */	{"\\^X\\^X",	expand_file_name},
  	/* ^X-?    */	{"\\^X?",	show_bindings},
@@ -33,7 +29,7 @@ $NetBSD: patch-am,v 1.1 2003/11/07 16:36:12 christos Exp $
  	/* ^X-^D   */	{"\\^X\\^D",	send_eof},
  	/* ^X-(	   */	{"\\^X(",	fep_start_script},
  	/* ^X-)	   */	{"\\^X)",	fep_end_script},
-@@ -138,7 +148,7 @@
+@@ -138,7 +148,7 @@ BINDENT viInsertBindings[] = {
  	/* ^X-^L   */	{"\\^X\\^L",	fep_repaint},
  	/* ^X-^X   */	{"\\^X\\^X",	expand_file_name},
  	/* ^X-?    */	{"\\^X?",	show_bindings},
@@ -42,7 +38,7 @@ $NetBSD: patch-am,v 1.1 2003/11/07 16:36:12 christos Exp $
  	/* ^X-^D   */	{"\\^X\\^D",	send_eof},
  	/* ^X-^V   */	{"\\^X\\^V",	view_buffer},
  	/* ^X-(	   */	{"\\^X(",	fep_start_script},
-@@ -161,7 +171,29 @@
+@@ -161,7 +171,29 @@ FUNC cft[], aft[];
  	cft[i] = self_insert;
  
  #define import(table,key,fn) if((int)key>0)table[(int)key]=fn
@@ -73,7 +69,7 @@ $NetBSD: patch-am,v 1.1 2003/11/07 16:36:12 christos Exp $
      /* Now, using cbreak mode
      import (cft, tchars_buf.t_startx, ignore);
      import (cft, tchars_buf.t_stopc, ignore);
-@@ -179,6 +211,7 @@
+@@ -179,6 +211,7 @@ FUNC cft[], aft[];
      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);