Fix patches: $Header$ is a CVS keyword. Remove realloc and malloc

prototypes, they conflict with DragonFly's stdlib.h. Add parameter
to sigwinch, it should match the local prototype. Fix errno.

14 files changed, 98 insertions, 109 deletions

diff --git a/misc/fep/Makefile b/misc/fep/Makefile
index 951598d5cc2..48372335c9e 100644
--- a/misc/fep/Makefile
+++ b/misc/fep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/12/26 23:39:33 schmonz Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/03 18:16:10 joerg Exp $
 
 DISTNAME=	fep
 PKGNAME=	fep-1.0
@@ -9,9 +9,6 @@ MASTER_SITES=	ftp://ftp.sra.co.jp/pub/cmd/fep/
 MAINTAINER=	nobu@psrc.isac.co.jp
 COMMENT=	General purpose front end for command line editing
 
-PKG_FAIL_REASON+=	"Broken on NetBSD/i386 3.0 in pkgsrc-2005Q4"
-PKG_FAIL_REASON+=	"Will be removed in pkgsrc-2006Q1 unless fixed"
-
 LICENSE=	fep-license
 RESTRICTED=	Do not redistribute for a fee.
 NO_SRC_ON_CDROM=${RESTRICTED}
diff --git a/misc/fep/distinfo b/misc/fep/distinfo
index fbc82952617..4b09d766b41 100644
--- a/misc/fep/distinfo
+++ b/misc/fep/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.10 2005/12/16 14:08:42 christos Exp $
+$NetBSD: distinfo,v 1.11 2006/01/03 18:16:10 joerg Exp $
 
 SHA1 (fep.tar.gz) = 73fa55337b12dba3b91c9895e2c9adbbdfa9d960
 RMD160 (fep.tar.gz) = 2a8b9eeecd5c76bec5cdb524ae6c650f298ccbde
 Size (fep.tar.gz) = 40137 bytes
 SHA1 (patch-aa) = f62c430e029bdf8e434d9e492831192209bd6aab
-SHA1 (patch-ab) = 28ae2efeede871a11078a786a928afda792242d7
-SHA1 (patch-ac) = cfa898a7a3697a4b907a8f1ab9e273eb92bd8f76
-SHA1 (patch-ad) = 49826b61f62aed0552d4508012f55c9e4b9669fc
-SHA1 (patch-ae) = d0c19117ad680a1f2345605c3e77667453839b15
-SHA1 (patch-af) = bd6250efdebd77b770e0f4b901ce8f824e384ed1
-SHA1 (patch-ag) = 4212289541cf652a3a7059fb4d2441810f33d648
-SHA1 (patch-ah) = 5e3cad48182f3fe7a896c7b1c1522ed4c6314341
-SHA1 (patch-ai) = fdaef6525ef547cfb5b66776af2e9efaeaa617c2
-SHA1 (patch-aj) = bbb5ef189839c5dc128b4731f829ec295633c420
-SHA1 (patch-ak) = d8186fb2d46bc1de30b32745ebd7297cfc3570aa
-SHA1 (patch-al) = 9cbd6080b72de05d61a4bc4a957aab5ebc5c69d0
-SHA1 (patch-am) = f4098526944734e7d137dbe0b60c4ea9462e0234
+SHA1 (patch-ab) = fd95c29fd3b989c1cd01ea68049641b90b18baf3
+SHA1 (patch-ac) = 5a347a6636a27d12c19633c569cf46c91133806e
+SHA1 (patch-ad) = f3047c0e7ee5e05017c6618eee1ef99606cb040b
+SHA1 (patch-ae) = 050c46aef84036e52b8a92472161f15dd797dd16
+SHA1 (patch-af) = f748b01e64dcd39ad114e94df054cb7f0d9e35c4
+SHA1 (patch-ag) = 79dea41e0154b80d17dc28b2d7eab1ed571e7139
+SHA1 (patch-ah) = 7735bc3f22aaef4e88c1bd4b08cb95a4565ce726
+SHA1 (patch-ai) = f936705fe0e6b4d15733ccb679316e5120ecc932
+SHA1 (patch-aj) = 25e3d6d77dee6539a68d6324a6744df06d3cedd6
+SHA1 (patch-ak) = a9c91d72619008889f94b1c488697eaaf8e5d0b3
+SHA1 (patch-al) = 6761a1e617b6d679a2e2b5e2ed1f5e895b375c3e
+SHA1 (patch-am) = 4edeca9622de1e15dd36dae2d70e73f16a920798
diff --git a/misc/fep/patches/patch-ab b/misc/fep/patches/patch-ab
index 23bbd219d85..beb83092fa4 100644
--- a/misc/fep/patches/patch-ab
+++ b/misc/fep/patches/patch-ab
@@ -1,11 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2005/12/10 22:10:47 christos Exp $
+$NetBSD: patch-ab,v 1.5 2006/01/03 18:16:10 joerg Exp $
 
 --- fep_alias.c.orig	1988-11-13 01:50:58.000000000 -0500
 +++ fep_alias.c	2005-12-10 16:59:27.000000000 -0500
-@@ -3,10 +3,11 @@
- #ifndef lint
- static char rcsid[]=
- "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ab,v 1.4 2005/12/10 22:10:47 christos Exp $ (SRA)";
+@@ -6,7 +6,8 @@
 -#endif lint
 +#endif /* lint */
  
diff --git a/misc/fep/patches/patch-ac b/misc/fep/patches/patch-ac
index 0eefafbfd58..a1465aeeca5 100644
--- a/misc/fep/patches/patch-ac
+++ b/misc/fep/patches/patch-ac
@@ -1,11 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2005/12/10 22:10:47 christos Exp $
+$NetBSD: patch-ac,v 1.5 2006/01/03 18:16:10 joerg Exp $
 
 --- fep_com.c.orig	1991-05-29 01:31:09.000000000 -0400
 +++ fep_com.c	2005-12-10 16:59:27.000000000 -0500
-@@ -3,11 +3,23 @@
- #ifndef lint
- static char rcsid[]=
- "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ac,v 1.4 2005/12/10 22:10:47 christos Exp $ (SRA)";
+@@ -6,8 +6,20 @@
 -#endif lint
 +#endif /* lint */
  
diff --git a/misc/fep/patches/patch-ad b/misc/fep/patches/patch-ad
index a1ed5451380..9c4e06284ec 100644
--- a/misc/fep/patches/patch-ad
+++ b/misc/fep/patches/patch-ad
@@ -1,11 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2005/12/10 22:10:47 christos Exp $
+$NetBSD: patch-ad,v 1.6 2006/01/03 18:16:10 joerg Exp $
 
 --- fep_defs.h.orig	1993-05-10 01:23:33.000000000 -0400
 +++ fep_defs.h	2005-12-10 16:59:27.000000000 -0500
-@@ -3,9 +3,9 @@
- #ifndef lint
- # define FEP_DEFS \
-     "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ad,v 1.5 2005/12/10 22:10:47 christos Exp $ (SRA)"
+@@ -6,6 +6,6 @@
 -#endif lint
 +#endif /* lint */
  
diff --git a/misc/fep/patches/patch-ae b/misc/fep/patches/patch-ae
index 08a1b0384d1..5048d7f5967 100644
--- a/misc/fep/patches/patch-ae
+++ b/misc/fep/patches/patch-ae
@@ -1,11 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2005/12/10 22:10:47 christos Exp $
+$NetBSD: patch-ae,v 1.6 2006/01/03 18:16:10 joerg Exp $
 
 --- fep_edit.c.orig	1995-01-20 03:16:37.000000000 -0500
 +++ fep_edit.c	2005-12-10 16:59:27.000000000 -0500
-@@ -3,13 +3,25 @@
- #ifndef lint
- static char rcsid[]=
- "$Id: patch-ae,v 1.5 2005/12/10 22:10:47 christos Exp $ (SRA)";
+@@ -6,10 +6,22 @@
 -#endif lint
 +#endif /* lint */
  
diff --git a/misc/fep/patches/patch-af b/misc/fep/patches/patch-af
index 339b2d6b44c..b7819196192 100644
--- a/misc/fep/patches/patch-af
+++ b/misc/fep/patches/patch-af
@@ -1,11 +1,8 @@
-$NetBSD: patch-af,v 1.4 2005/12/10 22:10:47 christos Exp $
+$NetBSD: patch-af,v 1.5 2006/01/03 18:16:10 joerg Exp $
 
 --- fep_funcs.c.orig	1991-05-29 01:31:18.000000000 -0400
 +++ fep_funcs.c	2005-12-10 16:59:27.000000000 -0500
-@@ -3,9 +3,10 @@
- #ifndef lint
- static char rcsid[]=
- "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-af,v 1.4 2005/12/10 22:10:47 christos Exp $ (SRA)";
+@@ -6,6 +6,7 @@
 -#endif lint
 +#endif /* lint */
  
diff --git a/misc/fep/patches/patch-ag b/misc/fep/patches/patch-ag
index b8ae3e7744b..b5bef811e0a 100644
--- a/misc/fep/patches/patch-ag
+++ b/misc/fep/patches/patch-ag
@@ -1,11 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2005/12/10 22:10:47 christos Exp $
+$NetBSD: patch-ag,v 1.5 2006/01/03 18:16:10 joerg Exp $
 
 --- fep_funcs.h.orig	1991-05-29 01:31:20.000000000 -0400
 +++ fep_funcs.h	2005-12-10 16:59:27.000000000 -0500
-@@ -3,7 +3,7 @@
- #ifndef lint
- # define FEP_FUNCS \
-     "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ag,v 1.4 2005/12/10 22:10:47 christos Exp $ (SRA)"
+@@ -6,4 +6,4 @@
 -#endif lint
 +#endif /* lint */
  
diff --git a/misc/fep/patches/patch-ah b/misc/fep/patches/patch-ah
index 05b8bb29a51..e2d905a7b86 100644
--- a/misc/fep/patches/patch-ah
+++ b/misc/fep/patches/patch-ah
@@ -1,11 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2005/12/10 22:10:47 christos Exp $
+$NetBSD: patch-ah,v 1.5 2006/01/03 18:16:10 joerg Exp $
 
 --- fep_glob.h.orig	1988-08-28 01:36:43.000000000 -0400
 +++ fep_glob.h	2005-12-10 16:59:27.000000000 -0500
-@@ -3,7 +3,7 @@
- #ifndef lint
- # define FEP_GLOB \
-     "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ah,v 1.4 2005/12/10 22:10:47 christos Exp $ (SRA)"
+@@ -6,4 +6,4 @@
 -#endif lint
 +#endif /* lint */
  
diff --git a/misc/fep/patches/patch-ai b/misc/fep/patches/patch-ai
index 727e201e165..779cba11824 100644
--- a/misc/fep/patches/patch-ai
+++ b/misc/fep/patches/patch-ai
@@ -1,11 +1,8 @@
-$NetBSD: patch-ai,v 1.4 2005/12/10 22:10:47 christos Exp $
+$NetBSD: patch-ai,v 1.5 2006/01/03 18:16:10 joerg Exp $
 
 --- fep_hist.c.orig	1988-11-25 06:45:42.000000000 -0500
 +++ fep_hist.c	2005-12-10 16:59:27.000000000 -0500
-@@ -3,9 +3,11 @@
- #ifndef lint
- static char rcsid[]=
- "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ai,v 1.4 2005/12/10 22:10:47 christos Exp $ (SRA)";
+@@ -6,6 +6,8 @@
 -#endif lint
 +#endif /* lint */
  
diff --git a/misc/fep/patches/patch-aj b/misc/fep/patches/patch-aj
index f87c1a49f27..7156063f2b3 100644
--- a/misc/fep/patches/patch-aj
+++ b/misc/fep/patches/patch-aj
@@ -1,11 +1,6 @@
-$NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
-
---- fep_main.c.orig	1993-06-09 22:53:06.000000000 -0400
-+++ fep_main.c	2005-12-10 16:59:27.000000000 -0500
-@@ -3,15 +3,24 @@
- #ifndef lint
- static char rcsid[]=
- "$Id: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $ (SRA)";
+--- fep_main.c.orig	1993-06-10 02:53:06.000000000 +0000
++++ fep_main.c	2006-01-03 18:13:49.000000000 +0000
+@@ -6,15 +6,24 @@
 -#endif lint
 +#endif /* lint */
  
@@ -28,8 +23,12 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
 +#endif
  #include <sys/time.h>
  #include <sys/resource.h>
- #include <sys/errno.h>
-@@ -30,7 +39,7 @@
+-#include <sys/errno.h>
++#include <errno.h>
+ 
+ #include "fep_defs.h"
+ #include "fep_glob.h"
+@@ -30,7 +39,7 @@ static char rcsid[]=
  #ifdef STAT
    static char fep_statrc[] = FEP_STAT;
  #endif
@@ -38,7 +37,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 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 +50,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 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 +91,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 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 +102,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
      /*
       * Initialize binding table
       */
-@@ -172,7 +192,7 @@
+@@ -172,7 +192,7 @@ main(argc, argv)
  		    histlen = atoi (argv[1]);
  		}
  		else {
@@ -112,7 +111,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
  		}
  		break;
  
-@@ -276,7 +296,7 @@
+@@ -276,7 +296,7 @@ DEFAULT:
  fix_signal ()
  {
  #ifdef SIGWINCH
@@ -121,7 +120,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 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);
      }
@@ -130,7 +129,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
  }
  
  #define INPUT_BUFFER_SIZE 1024
-@@ -384,7 +404,8 @@
+@@ -384,21 +404,19 @@ getcharacter()
  {
      char c;
      int n;
@@ -140,7 +139,11 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
  #ifdef USE_TIMEOUT
      struct timeval **timeout = auto_tty_fix ? timeout_list : notimeout;
  #else
-@@ -396,9 +417,8 @@
+     struct timeval **timeout = notimeout;
+ #endif
+-    extern int errno;
+-
+ 
      /*
       * Sorry, this cording depends to an implementation of getc().
       */
@@ -152,7 +155,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
  
  RETRY:
      readfd = selectmask;
-@@ -409,13 +429,13 @@
+@@ -409,13 +427,13 @@ RETRY:
      while ((nfound = select (selectnfds, &readfd, 0, 0, *timeout)) < 0)
  	if (errno != EINTR) {
  		perror ("select");
@@ -168,7 +171,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
  	int nbyte;
  
  	/*
-@@ -451,7 +471,7 @@
+@@ -451,7 +469,7 @@ RETRY:
      /*
       * Found input from terminal
       */
@@ -177,7 +180,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
  
  #ifndef USE_TIMEOUT
  	/*
-@@ -467,8 +487,8 @@
+@@ -467,8 +485,8 @@ RETRY:
  	RETURNCHAR:
  	if ((c = getc (stdin)) == EOF) {
  	    if (debug)
@@ -188,7 +191,16 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
  	}
  	else
  	    return (c & CHARMASK);
-@@ -596,7 +616,7 @@
+@@ -504,7 +522,7 @@ int set_buffer (bp, size)
+     BUFFER *bp;
+     int size;
+ {
+-    char *newbuf, *malloc(), *realloc();
++    char *newbuf;
+ 
+     if (bp->b_buf)
+ 	newbuf = (char *) realloc (bp->b_buf, size);
+@@ -596,7 +614,7 @@ buf_put (bp, s)
  
  swallow_output()
  {
@@ -197,7 +209,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
      int r;
      int nbyte;
      int ncount = 10;
-@@ -604,7 +624,7 @@
+@@ -604,7 +622,7 @@ swallow_output()
      while (
  	ncount-- &&
  	select (selectnfds, &readfd, 0, 0, TIMEOUT_NOBLOCK) > 0 &&
@@ -206,7 +218,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
      ) {
  	nbyte = buf_read (master, output_buffer);
  	if (nbyte > 0) {
-@@ -636,21 +656,23 @@
+@@ -636,21 +654,23 @@ swallow_output()
  #include <sys/m_wait.h>
  #endif
  
@@ -234,7 +246,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
  }
  
  exec_to_command(argv)
-@@ -675,13 +697,37 @@
+@@ -675,13 +695,37 @@ exec_to_command(argv)
      dup2 (slave, 2);
      (void) close (slave);
  
@@ -273,7 +285,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
  fix_tty()
  {
      struct tchars tcbuf;
-@@ -719,6 +765,7 @@
+@@ -719,6 +763,7 @@ fix_tty()
      ioctl (0, TIOCSETC, (char *) & tcbuf);
      ioctl (0, TIOCSLTC, (char *) & lcbuf);
  }
@@ -281,7 +293,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
  
  kill_process()
  {
-@@ -727,7 +774,9 @@
+@@ -727,9 +772,10 @@ kill_process()
  	(void) killpg (child_pid, SIGTERM);
  }
  
@@ -290,9 +302,11 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
 +terminate(n)
 +    int n;
  {
-     extern int errno;
+-    extern int errno;
  
-@@ -759,10 +808,14 @@
+     /*
+      * Save history if 'history-file' is set
+@@ -759,10 +805,14 @@ terminate()
  	    if (killpg (child_pid, SIGKILL) < 0)
  		perror ("kill");
  
@@ -308,7 +322,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
  }
  
  get_pty_master()
-@@ -775,6 +828,41 @@
+@@ -775,6 +825,41 @@ get_pty_master()
  	master = 1;
  	return;
      }
@@ -350,7 +364,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
      for (c = 'p'; c <= 's'; c++) {
  	for (i = 0; i < 16; i++) {
  	    sprintf (master_tty, "/dev/pty%c%x", c, i);
-@@ -796,11 +884,16 @@
+@@ -796,11 +881,16 @@ get_pty_master()
      }
  
   FOUND:
@@ -367,7 +381,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
  
  #ifdef TIOCGWINSZ
      {
-@@ -820,11 +913,15 @@
+@@ -820,11 +910,15 @@ get_pty_master()
  # if defined(TIOCKGETC) && defined(TIOCKSETC)
      ioctl (0, TIOCKGETC, (char *) &jtchars_buf);
  # endif
@@ -387,7 +401,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
      selectnfds = max (fileno(stdin), master) + 1;
  
      return;
-@@ -838,11 +935,20 @@
+@@ -838,11 +932,20 @@ get_pty_slave()
  	perror (slave_tty);
  	exit (1);
      }
@@ -408,7 +422,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
  
  #ifdef KANJI
  # if defined(TIOCKGET) && defined(TIOCKSET)
-@@ -851,7 +957,7 @@
+@@ -851,7 +954,7 @@ get_pty_slave()
  # if defined(TIOCKGETC) && defined(TIOCKSETC)
      ioctl (slave, TIOCKSETC, (char *) &jtchars_buf);
  # endif
@@ -417,7 +431,7 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
  
  #ifdef TIOCSWINSZ
      {
-@@ -866,16 +972,19 @@
+@@ -866,18 +969,20 @@ get_pty_slave()
  
  recover_tty()
  {
@@ -437,9 +451,11 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
 -    void	(*func) ();
 +    void	(*func) __P((int));
      int		omask;
-     extern int	errno;
+-    extern int	errno;
  
-@@ -890,7 +999,7 @@
+     pid = getpid ();
+  /* reset signal handler so kill below stops us */
+@@ -890,7 +995,7 @@ suspend()
  
      if (kill (child_pid, SIGCONT) < 0 && errno == ESRCH) {
  	printf ("Where my child has gone?!\n");
@@ -448,3 +464,12 @@ $NetBSD: patch-aj,v 1.6 2005/12/10 22:10:47 christos Exp $
      }
      killpg (child_pid, SIGCONT);
      kill (0, SIGCONT);
+@@ -933,7 +1038,7 @@ usageAndExit()
+ /*
+  * Propagate window size changes to the slave tty.
+  */
+-sigwinch()
++sigwinch(int num)
+ {
+ #ifdef TIOCGWINSZ			/* 4.3BSD */
+     struct winsize win;
diff --git a/misc/fep/patches/patch-ak b/misc/fep/patches/patch-ak
index 62d38f381f8..5b9ba2f6cac 100644
--- a/misc/fep/patches/patch-ak
+++ b/misc/fep/patches/patch-ak
@@ -1,11 +1,8 @@
-$NetBSD: patch-ak,v 1.4 2005/12/10 22:10:47 christos Exp $
+$NetBSD: patch-ak,v 1.5 2006/01/03 18:16:10 joerg Exp $
 
 --- fep_set.c.orig	1991-05-29 01:31:24.000000000 -0400
 +++ fep_set.c	2005-12-10 16:59:27.000000000 -0500
-@@ -3,9 +3,10 @@
- #ifndef lint
- static char rcsid[]=
- "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ak,v 1.4 2005/12/10 22:10:47 christos Exp $ (SRA)";
+@@ -6,6 +6,7 @@
 -#endif lint
 +#endif /* lint */
  
diff --git a/misc/fep/patches/patch-al b/misc/fep/patches/patch-al
index 9f9eb9bef51..95a52114a18 100644
--- a/misc/fep/patches/patch-al
+++ b/misc/fep/patches/patch-al
@@ -1,11 +1,8 @@
-$NetBSD: patch-al,v 1.3 2005/12/10 22:10:47 christos Exp $
+$NetBSD: patch-al,v 1.4 2006/01/03 18:16:10 joerg Exp $
 
 --- fep_util.c.orig	1988-12-28 07:24:01.000000000 -0500
 +++ fep_util.c	2005-12-10 16:59:27.000000000 -0500
-@@ -3,7 +3,7 @@
- #ifndef lint
- static char rcsid[]=
- "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-al,v 1.3 2005/12/10 22:10:47 christos Exp $ (SRA)";
+@@ -6,4 +6,4 @@
 -#endif lint
 +#endif /* lint */
  
diff --git a/misc/fep/patches/patch-am b/misc/fep/patches/patch-am
index f15f3b48e2f..53c5651b09d 100644
--- a/misc/fep/patches/patch-am
+++ b/misc/fep/patches/patch-am
@@ -1,11 +1,8 @@
-$NetBSD: patch-am,v 1.3 2005/12/10 22:10:47 christos Exp $
+$NetBSD: patch-am,v 1.4 2006/01/03 18:16:10 joerg Exp $
 
 --- fep_vi.c.orig	1991-05-29 01:31:27.000000000 -0400
 +++ fep_vi.c	2005-12-10 16:59:27.000000000 -0500
-@@ -3,10 +3,20 @@
- #ifndef lint
- static char rcsid[]=
- "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-am,v 1.3 2005/12/10 22:10:47 christos Exp $ (SRA)";
+@@ -6,7 +6,17 @@
 -#endif lint
 +#endif /* lint */