Fix build on SunOS.

- no more __P, just use ansi prototypes
- use sigprocmask instead of sigsetmask
- use dirent.h instead of sys/dir.h

7 files changed, 196 insertions, 117 deletions

diff --git a/misc/fep/distinfo b/misc/fep/distinfo
index 7598384e950..e68f0eafda4 100644
--- a/misc/fep/distinfo
+++ b/misc/fep/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.15 2011/09/29 20:22:26 wiz Exp $
+$NetBSD: distinfo,v 1.16 2012/03/01 22:00:44 hans Exp $
 
 SHA1 (fep.tar.gz) = 73fa55337b12dba3b91c9895e2c9adbbdfa9d960
 RMD160 (fep.tar.gz) = 2a8b9eeecd5c76bec5cdb524ae6c650f298ccbde
 Size (fep.tar.gz) = 40137 bytes
 SHA1 (patch-aa) = 33cb713a2fc7d084a3769b7b9b61c7810ebacdd0
 SHA1 (patch-ab) = 2b6f6cff25a21b374dce4b0162dc06a6d0b6c24f
-SHA1 (patch-ac) = a306ac6a1fa580238e3ac89ea785fefe138ebb65
+SHA1 (patch-ac) = 78fe4be33d8f65d8ebfeeffe1835f471baf8509d
 SHA1 (patch-ad) = 78d5fd59d51542d304d3adcdde3a7ac48790d857
-SHA1 (patch-ae) = 4f632e44ca5ba552c70b99f153e68a8370f79a98
-SHA1 (patch-af) = 77d32f96314a8657e3b575d93def4156e29af2af
-SHA1 (patch-ag) = 2e1d76994ddd50c040383c93f4776ddd7bb2f934
+SHA1 (patch-ae) = 47294d88fb6e371c607a28b2ae859b4fecd34f89
+SHA1 (patch-af) = 6c63349b6a327dec4f1a35ca5f3ebc3a2c774982
+SHA1 (patch-ag) = e16b4109fe841e57d3213d09db98cebf0550fc81
 SHA1 (patch-ah) = 5fd76d412877dc5db166dad274a765b68182c875
 SHA1 (patch-ai) = eda04c0d295a425e6929ade003314cc5ea340368
-SHA1 (patch-aj) = 543837ec84af69b283285ae5abafc2eeddd89e30
+SHA1 (patch-aj) = 45ef777a7e97998641e33c5af6f18986c14bf0bf
 SHA1 (patch-ak) = 97f14ed899fc2afc4f27a3730084355ec42649af
-SHA1 (patch-al) = 43cadd61a36ea6783df419caeb1c2b9fab5090e1
+SHA1 (patch-al) = 8c2ac44e4ed181b3803e8b54f36c9fd752da2021
 SHA1 (patch-am) = 26915755c5c06fc68cba722349b2a4d585787fb7
diff --git a/misc/fep/patches/patch-ac b/misc/fep/patches/patch-ac
index 94153ffe231..7967a5db062 100644
--- a/misc/fep/patches/patch-ac
+++ b/misc/fep/patches/patch-ac
@@ -1,11 +1,13 @@
-$NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
+$NetBSD: patch-ac,v 1.7 2012/03/01 22:00:44 hans Exp $
 
 --- fep_com.c.orig	1991-05-29 01:31:09.000000000 -0400
 +++ fep_com.c	2005-12-10 16:59:27.000000000 -0500
-@@ -6 +6 @@
+@@ -3,14 +3,28 @@
+ #ifndef lint
+ static char rcsid[]=
+ "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ac,v 1.7 2012/03/01 22:00:44 hans Exp $ (SRA)";
 -#endif lint
 +#endif /* lint */
-@@ -7,6 +7,18 @@
  
  #include <stdio.h>
 +#include <sys/ioctl.h>
@@ -24,7 +26,13 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
 +#include <stdlib.h>
  #include <sys/param.h>
  #include <sys/file.h>
-@@ -31,7 +43,7 @@
+ #include <sys/stat.h>
++#include <sys/types.h>
++#include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include "fep_defs.h"
+ #include "fep_glob.h"
+@@ -31,7 +45,7 @@ executeBuiltInFunction (comline, more)
      char *comline, **more;
  {
      register FunctionTableEnt *ftp;
@@ -33,7 +41,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
      char *search_string();
      int argc;
  
-@@ -93,7 +105,7 @@
+@@ -93,7 +107,7 @@ is_same_command (a, b)
  
      while (*a && *b && *a == *b)
  	++a, ++b;
@@ -42,7 +50,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
  	return 1;
      else
  	return 0;
-@@ -295,7 +307,7 @@
+@@ -295,7 +309,7 @@ unalias (comline)
  set (comline)
      char *comline;
  {
@@ -51,7 +59,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
      char *cp, *index();
      char *argv[MAXARGS];
      int argc;
-@@ -352,8 +364,13 @@
+@@ -352,8 +366,13 @@ unset(comline)
  
  extern	int Transparency;
  extern	int Through;
@@ -67,7 +75,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
  extern	int master, slave;
  extern	char slave_tty[];
  
-@@ -368,7 +385,11 @@
+@@ -368,7 +387,11 @@ toggle_through()
  {
      int r;
      int slave_fd;
@@ -79,7 +87,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
  
      if (Through == OFF) {
  
-@@ -378,15 +399,26 @@
+@@ -378,15 +401,26 @@ toggle_through()
  	    return;
  	}
  
@@ -106,7 +114,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
  	if (r < 0) {
  	    perror (slave_tty);
  	    (void) close (slave_fd);
-@@ -394,7 +426,11 @@
+@@ -394,7 +428,11 @@ toggle_through()
  	(void) close (slave_fd);
      }
      else
@@ -118,7 +126,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
  
      if (r < 0) {
  	printf ("Can't change pty mode.\n");
-@@ -410,7 +446,11 @@
+@@ -410,7 +448,11 @@ toggle_through()
  fix_transparency()
  {
      int r;
@@ -130,7 +138,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
  
      if (Through)
  	return;
-@@ -418,11 +458,17 @@
+@@ -418,11 +460,17 @@ fix_transparency()
      if (slave < 0)
  	return;
  
@@ -148,7 +156,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
      if (r < 0) {
  	perror (slave_tty);
  	return;
-@@ -432,9 +478,19 @@
+@@ -432,9 +480,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 +177,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
  	    if (r < 0) {
  		perror ("stdout");
  		return;
-@@ -445,7 +501,11 @@
+@@ -445,7 +503,11 @@ fix_transparency()
      }
      else {
  	if (Transparency == ON) {
@@ -182,7 +190,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
  	    if (r < 0) {
  		perror ("stdout");
  		return;
-@@ -623,10 +683,10 @@
+@@ -623,10 +685,10 @@ MORE *create_more(maxline)
  {
      MORE *mp;
  
@@ -195,7 +203,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
      else {
  	mp->cur_line = 0;
  	mp->max_line = maxline;
-@@ -738,9 +798,9 @@
+@@ -738,9 +800,9 @@ char *line;
  fep_pwd (line)
      char *line;
  {
@@ -207,7 +215,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
      printf ("%s\n", cwd);
  }
  
-@@ -755,7 +815,7 @@
+@@ -755,7 +817,7 @@ fep_echo (comline)
      argc = mkargv (comline, argv, MAXARGS);
      
      argp = &argv[1];
@@ -216,7 +224,7 @@ $NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw Exp $
  	putnewline = 0;
  	++argp;
      }
-@@ -791,7 +851,7 @@
+@@ -791,7 +853,7 @@ fep_command (comline)
      int argc;
      int i;
      char **argp;
diff --git a/misc/fep/patches/patch-ae b/misc/fep/patches/patch-ae
index f0a9eb4aa86..3a379ee082a 100644
--- a/misc/fep/patches/patch-ae
+++ b/misc/fep/patches/patch-ae
@@ -1,8 +1,11 @@
-$NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
+$NetBSD: patch-ae,v 1.9 2012/03/01 22:00:44 hans Exp $
 
 --- fep_edit.c.orig	1995-01-20 08:16:37.000000000 +0000
 +++ fep_edit.c	2011-09-29 20:19:55.000000000 +0000
-@@ -6,10 +6,22 @@
+@@ -3,15 +3,29 @@
+ #ifndef lint
+ static char rcsid[]=
+ "$Id: patch-ae,v 1.9 2012/03/01 22:00:44 hans Exp $ (SRA)";
 -#endif lint
 +#endif /* lint */
  
@@ -10,6 +13,8 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  #include <sys/types.h>
  #include <sys/stat.h>
 +#include <sys/ioctl.h>
++#include <unistd.h>
++#include <sys/fcntl.h>
 +#include <inttypes.h>
 +#ifdef TERMIOS
 +#include <termios.h>
@@ -24,9 +29,12 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  #include <sys/time.h>
 +#include <stdlib.h>
  #include <ctype.h>
- #include <sys/dir.h>
+-#include <sys/dir.h>
++#include <dirent.h>
  #include <sys/file.h>
-@@ -25,7 +37,7 @@
+ #include <setjmp.h>
+ #include "fep_defs.h"
+@@ -25,7 +39,7 @@ int		MarkPosition = -1;	/* Marked positi
  EDITMODE	editmode = NOTYET;	/* edtimode EMACS, VI */
  EDITSTATUS	editstatus = NOTEDITING;/* EDITING, NOTEDITING */
  
@@ -35,7 +43,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  int	NeedNewLine;			/* add new line flag */
  int	NeedSave;			/* need to save to history */
  int	Transparency = OFF;		/* transparent flag */
-@@ -86,7 +98,7 @@
+@@ -86,7 +100,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 +52,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  	/* ^X-^D	*/	{"\\^X\\^D",	send_eof},
  	/* ^X-(		*/	{"\\^X(",	fep_start_script},
  	/* ^X-)		*/	{"\\^X)",	fep_end_script},
-@@ -99,9 +111,9 @@
+@@ -99,9 +113,9 @@ BINDENT emacsBindings[] = {
  init_bind_table ()
  {
  
@@ -57,7 +65,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  	printf ("Can't allocate space for function table\n");
  	exit (1);
      }
-@@ -167,9 +179,9 @@
+@@ -167,9 +181,9 @@ init_edit_params ()
      /*
       * Initialize command line buffer
       */
@@ -70,7 +78,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  	perror ("Edit line buffer");
  	exit (1);
      }
-@@ -192,6 +204,30 @@
+@@ -192,6 +206,30 @@ initEmacsBindings (cft, aft)
  
  #define import(table,key,fn) if((int)key>0)table[(int)key]=fn
  
@@ -101,7 +109,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
      /* Now, using cbreak mode
      import (cft, tchars_buf.t_startc, ignore);
      import (cft, tchars_buf.t_stopc, ignore);
-@@ -212,6 +248,7 @@
+@@ -212,6 +250,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);
@@ -109,7 +117,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  
  #undef import
  
-@@ -227,7 +264,7 @@
+@@ -227,7 +266,7 @@ initEmacsBindings (cft, aft)
   * Main function of front end program
   */
  CHAR *
@@ -118,7 +126,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  {
      int c;
      CHAR *execute_command, *check_alias();
-@@ -257,7 +294,7 @@
+@@ -257,7 +296,7 @@ RETRY:
  	 */
  	swallow_output();
  
@@ -127,7 +135,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  	    ++redirect_line;
  	    execute_command = CommandLine;
  	    goto RETURN;	    
-@@ -301,7 +338,11 @@
+@@ -301,7 +340,11 @@ RETRY:
  	 * call send_eof
  	 */
  	if (
@@ -139,7 +147,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  	    && curFuncTab[c] != send_eof
  	    && ! look_var ("ignore-eof")
  	    && CommandLine [0] == '\0'
-@@ -422,11 +463,11 @@
+@@ -422,11 +465,11 @@ self_insert(c)
      register int i, nbyte = 1, currentNull;
  #ifdef KANJI
      CHAR byte2;
@@ -153,7 +161,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
          errorBell();
  	return (0);
      }
-@@ -441,7 +482,7 @@
+@@ -441,7 +484,7 @@ self_insert(c)
  	nbyte = 2;
      }
      else
@@ -162,7 +170,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  	putChar (c);
      reverse_strcpy (
  	&CommandLine[CurrentPosition] + nbyte,
-@@ -453,7 +494,7 @@
+@@ -453,7 +496,7 @@ self_insert(c)
      if (nbyte > 1) {
  	CommandLine[CurrentPosition - 1] = byte2;
      }
@@ -171,7 +179,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
      printS (&CommandLine [CurrentPosition]);
  
      if (CommandLine[CurrentPosition] != '\0') {
-@@ -557,7 +598,7 @@
+@@ -557,7 +600,7 @@ moveto (position)
  #ifdef KANJI
  	    && !(CurrentPosition + 1 == position
  		    && iskanji (CommandLine[CurrentPosition]))
@@ -180,7 +188,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  	)
  	    (void) forward_n_character (1);
  }
-@@ -581,10 +622,10 @@
+@@ -581,10 +624,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--;
@@ -193,7 +201,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  
  /*
   * Move cursor to end of line
-@@ -642,7 +683,7 @@
+@@ -642,7 +685,7 @@ backward_n_character(n)
  	    i--;
  	}
  	else
@@ -202,7 +210,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  	putchar (BS);
  	i--;
      }
-@@ -697,7 +738,7 @@
+@@ -697,7 +740,7 @@ backward_n_word (n)
  	    nchars++;
  	}
      }
@@ -211,7 +219,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
      while (n--) {
  	i--, nchars++;
  	while (i > 0 && !iswordchar (CommandLine [i])) {
-@@ -707,7 +748,7 @@
+@@ -707,7 +750,7 @@ backward_n_word (n)
  	    i--, nchars++;
  	}
      }
@@ -220,7 +228,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
      return (backward_n_character (nchars));
  }
  
-@@ -758,7 +799,7 @@
+@@ -758,7 +801,7 @@ backward_n_Word (n)
  	    nchars++;
  	}
      }
@@ -229,7 +237,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
      while (n--) {
  	i--, nchars++;
  	while (i > 0 && !isWordchar (CommandLine [i]))
-@@ -766,7 +807,7 @@
+@@ -766,7 +809,7 @@ backward_n_Word (n)
  	while (i > 0 && isWordchar (CommandLine [i - 1]))
  	    i--, nchars++;
      }
@@ -238,7 +246,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
      return (backward_n_character (nchars));
  }
  
-@@ -804,7 +845,7 @@
+@@ -804,7 +847,7 @@ forward_n_character(n)
  	(void) putchar (CommandLine[i++]);
      }
      else
@@ -247,7 +255,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
      if (isctlchar(CommandLine[i])) {
  	(void) putchar (unctl (CommandLine [i]));
  	i++;
-@@ -819,7 +860,7 @@
+@@ -819,7 +862,7 @@ forward_n_character(n)
  	    (void) putchar (CommandLine[i++]);
  	}
  	else
@@ -256,7 +264,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  	putChar (CommandLine [i++]);
      }
  
-@@ -1000,9 +1041,9 @@
+@@ -1000,9 +1043,9 @@ delete_previous_n_character(n)
  	    i -= 2, nbyte += 2;
  	else
  	    i -= 1, nbyte += 1;
@@ -268,7 +276,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  
      deleteArea = howlong (&CommandLine[CurrentPosition - nbyte], nbyte);
      restArea = howlong (&CommandLine[CurrentPosition], 0);
-@@ -1075,7 +1116,7 @@
+@@ -1075,7 +1118,7 @@ delete_previous_n_word(n)
  	    nchars++;
  	}
      }
@@ -277,7 +285,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
      while (n--) {
  	i--, nchars++;
  	while (i > 0 && !iswordchar (CommandLine [i]))
-@@ -1083,7 +1124,7 @@
+@@ -1083,7 +1126,7 @@ delete_previous_n_word(n)
  	while (i > 0 && iswordchar (CommandLine [i - 1]))
  	    i--, nchars++;
      }
@@ -286,7 +294,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  
      return (delete_previous_n_character (nchars));
  }
-@@ -1136,7 +1177,7 @@
+@@ -1136,7 +1179,7 @@ delete_previous_n_Word(n)
  	    nchars++;
  	}
      }
@@ -295,7 +303,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
      while (n--) {
  	i--, nchars++;
  	while (i > 0 && !isWordchar (CommandLine [i]))
-@@ -1144,7 +1185,7 @@
+@@ -1144,7 +1187,7 @@ delete_previous_n_Word(n)
  	while (i > 0 && isWordchar (CommandLine [i - 1]))
  	    i--, nchars++;
      }
@@ -304,7 +312,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  
      return (delete_previous_n_character (nchars));
  }
-@@ -1183,9 +1224,9 @@
+@@ -1183,9 +1226,9 @@ delete_next_n_character (n)
  	    else
  		cp++, nbyte++;
      }
@@ -316,7 +324,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  
      deleteArea = howlong (&CommandLine[CurrentPosition], nbyte);
      restArea = howlong (&CommandLine[CurrentPosition + nbyte], 0);
-@@ -1481,7 +1522,11 @@
+@@ -1481,7 +1524,11 @@ insert_and_flush(c)
   */
  send_eof()
  {
@@ -328,7 +336,16 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  
      (void) self_insert (c);
      if (isctlchar (c))
-@@ -1737,11 +1782,11 @@
+@@ -1698,7 +1745,7 @@ expand_file_name ()
+     char *fileList[256];
+     CHAR line[256];
+     DIR *dirp, *x_opendir();
+-    struct direct *dp;
++    struct dirent *dp;
+     int found = 0;
+     int i;
+     int tilde_expanded = 0;
+@@ -1737,11 +1784,11 @@ expand_file_name ()
  	    char *fcp;
  
  # ifdef ALLOCA
@@ -345,7 +362,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  		fputs ("\r\n", stdout);
  		perror ("alloca:");
  		reprint ();
-@@ -1754,7 +1799,7 @@
+@@ -1754,7 +1801,7 @@ expand_file_name ()
      fileList [i] = (char *) 0;
  
      if (*start_expand == '~' && look_var ("expand-tilde")) {
@@ -354,7 +371,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  
  	strcpy (buf, start_expand);
  	p = x_dirname (buf);
-@@ -1801,7 +1846,7 @@
+@@ -1801,7 +1848,7 @@ expand_file_name ()
  # ifndef ALLOCA
      for (i = 0; fileList [i]; i++)
  	free (fileList [i]);
@@ -363,7 +380,16 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  
      closedir(dirp);
      return (0);
-@@ -1928,11 +1973,11 @@
+@@ -1903,7 +1950,7 @@ ls (dirp, prefixstring)
+     DIR *dirp;
+     char *prefixstring;
+ {
+-    struct direct *dp;
++    struct dirent *dp;
+     char *fileList[MAXFILES + 1];
+     int i, j;
+     int maxlen = 0;
+@@ -1928,11 +1975,11 @@ ls (dirp, prefixstring)
  	    continue;
  	if (prefix (prefixstring, dp->d_name)) {
  # ifdef ALLOCA
@@ -380,7 +406,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  		fputs ("\r\n", stdout);
  		perror ("alloca:");
  		reprint ();
-@@ -1975,7 +2020,7 @@
+@@ -1975,7 +2022,7 @@ BACK:
  # ifndef ALLOCA
      for (i = 0; fileList [i]; i++)
  	free (fileList [i]);
@@ -389,7 +415,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
      return;
  }
  
-@@ -2022,7 +2067,7 @@
+@@ -2022,7 +2069,7 @@ list_remote_file (host, pattern)
  	fputs ("\n", stdout);
      }
  }
@@ -398,7 +424,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  
  bind_key (ft, func, s, dfunc)
      FUNC ft[];		/* Function table */
-@@ -2032,7 +2077,7 @@
+@@ -2032,7 +2079,7 @@ bind_key (ft, func, s, dfunc)
  {
      char tmps[16];
  
@@ -407,7 +433,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  	tmps[0] = toctrl (s[2]);
  	strcpy (&tmps[1], &s[3]);
  	s = tmps;
-@@ -2042,7 +2087,7 @@
+@@ -2042,7 +2089,7 @@ bind_key (ft, func, s, dfunc)
       * If the string contain only one character, put the function to
       * appropriate position in the table.
       */
@@ -416,7 +442,7 @@ $NetBSD: patch-ae,v 1.8 2011/09/29 20:22:26 wiz Exp $
  	if (isIndirect (ft[(int) *s]))
  	    free (maskIndirect (ft[(int) *s]));
  
-@@ -2059,11 +2104,11 @@
+@@ -2059,11 +2106,11 @@ bind_key (ft, func, s, dfunc)
  	if (! (isIndirect (ft[(int) *s]))) {
  	    register int i;
  
diff --git a/misc/fep/patches/patch-af b/misc/fep/patches/patch-af
index 206a3acb6fb..67e5d868b21 100644
--- a/misc/fep/patches/patch-af
+++ b/misc/fep/patches/patch-af
@@ -1,17 +1,20 @@
-$NetBSD: patch-af,v 1.6 2006/01/17 21:23:01 kristerw Exp $
+$NetBSD: patch-af,v 1.7 2012/03/01 22:00:44 hans Exp $
 
 --- fep_funcs.c.orig	1991-05-29 01:31:18.000000000 -0400
 +++ fep_funcs.c	2005-12-10 16:59:27.000000000 -0500
-@@ -6 +6 @@
+@@ -3,9 +3,10 @@
+ #ifndef lint
+ static char rcsid[]=
+ "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-af,v 1.7 2012/03/01 22:00:44 hans Exp $ (SRA)";
 -#endif lint
 +#endif /* lint */
-@@ -7,4 +7,5 @@
  
  #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"},
@@ -20,7 +23,7 @@ $NetBSD: patch-af,v 1.6 2006/01/17 21:23:01 kristerw 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 4783074b145..5e3d451870b 100644
--- a/misc/fep/patches/patch-ag
+++ b/misc/fep/patches/patch-ag
@@ -1,16 +1,22 @@
-$NetBSD: patch-ag,v 1.6 2006/01/17 21:23:01 kristerw Exp $
+$NetBSD: patch-ag,v 1.7 2012/03/01 22:00:44 hans Exp $
 
 --- fep_funcs.h.orig	1991-05-29 01:31:20.000000000 -0400
 +++ fep_funcs.h	2005-12-10 16:59:27.000000000 -0500
-@@ -6 +6 @@
+@@ -3,7 +3,7 @@
+ #ifndef lint
+ # define FEP_FUNCS \
+     "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-ag,v 1.7 2012/03/01 22:00:44 hans Exp $ (SRA)"
 -#endif lint
 +#endif /* lint */
-@@ -22,7 +22,7 @@
+ 
+ /*
+  * command line edit functions
+@@ -22,7 +22,7 @@ int	delete_previous_character();
  int	delete_previous_word();
  int	delete_previous_Word();
  int	delete_to_kill_buffer();
 -int	terminate();
-+void	terminate __P((int));
++void	terminate(int);
  int	end_of_line();
  int	expand_file_name();
  int	forward_character();
diff --git a/misc/fep/patches/patch-aj b/misc/fep/patches/patch-aj
index 3df5ea34cdd..1bbc9f50b6e 100644
--- a/misc/fep/patches/patch-aj
+++ b/misc/fep/patches/patch-aj
@@ -1,8 +1,11 @@
-$NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
+$NetBSD: patch-aj,v 1.11 2012/03/01 22:00:44 hans Exp $
 
 --- fep_main.c.orig	1993-06-10 02:53:06.000000000 +0000
 +++ fep_main.c	2011-09-29 20:16:05.000000000 +0000
-@@ -6,15 +6,24 @@
+@@ -3,18 +3,30 @@
+ #ifndef lint
+ static char rcsid[]=
+ "$Id: patch-aj,v 1.11 2012/03/01 22:00:44 hans Exp $ (SRA)";
 -#endif lint
 +#endif /* lint */
  
@@ -16,6 +19,9 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
 +#include <stdlib.h>
 +#include <fcntl.h>
 +#include <termios.h>
++#ifdef __sun
++#include <sys/ttold.h>
++#endif
 +#ifndef _POSIX_VDISABLE
 +#define _POSIX_VDISABLE '\0'
 +#endif
@@ -30,7 +36,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  
  #include "fep_defs.h"
  #include "fep_glob.h"
-@@ -30,7 +39,7 @@
+@@ -30,7 +42,7 @@ static char rcsid[]=
  #ifdef STAT
    static char fep_statrc[] = FEP_STAT;
  #endif
@@ -39,7 +45,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  
  char	*myself;			/* the command name */
  char	*prompt = "";			/* prompt string */
-@@ -38,9 +47,9 @@
+@@ -38,9 +50,9 @@ char	*delimiters = DEFAULT_DELIMITERS;
  					/* delimiter characters */
  int	master;				/* file discriptor for pty master */
  int	slave;				/* file discriptor for pty slave */
@@ -52,12 +58,12 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz 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 +60,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 */
 -int	catchsig();			/* function take care SIGCHILD */
-+void	catchsig __P((int));		/* function take care SIGCHILD */
++void	catchsig (int);		/* function take care SIGCHILD */
  
 -struct	sgttyb initial_ttymode;		/* initial tty mode */
 -struct	sgttyb master_ttymode;		/* master tty mode */
@@ -76,7 +82,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  char	*term_clear;			/* terminal clear code */
  
 -void	(*sighup)(), (*sigchld)(), (*sigtstp)();
-+void	(*sighup) __P((int)), (*sigchld) __P((int)), (*sigtstp) __P((int));
++void	(*sighup)(int), (*sigchld)(int), (*sigtstp)(int);
  					/* function buffer for signal */
  
 +#ifdef TIOCSETN
@@ -93,7 +99,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  
  char	master_tty[16];			/* master tty name */
  char	slave_tty[16];			/* slave tty name */
-@@ -112,6 +128,10 @@
+@@ -112,6 +131,10 @@ main(argc, argv)
  
      myself = argv[0];
  
@@ -104,7 +110,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
      /*
       * Initialize binding table
       */
-@@ -172,7 +192,7 @@
+@@ -172,7 +195,7 @@ main(argc, argv)
  		    histlen = atoi (argv[1]);
  		}
  		else {
@@ -113,16 +119,16 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  		}
  		break;
  
-@@ -276,7 +296,7 @@
+@@ -276,7 +299,7 @@ DEFAULT:
  fix_signal ()
  {
  #ifdef SIGWINCH
 -    int sigwinch();
-+    void sigwinch __P((int));
++    void sigwinch(int);
  #endif
  
      sighup = signal (SIGHUP, terminate);
-@@ -298,7 +318,7 @@
+@@ -298,7 +321,7 @@ recover_signal ()
  input_handler()
  {
      char   *inputline;
@@ -131,7 +137,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  
      /*
       * Get slave tty descriptor for auto-tty-fix
-@@ -306,7 +326,7 @@
+@@ -306,7 +329,7 @@ input_handler()
      if ((slave = open (slave_tty, O_RDONLY)) < 0)
  	perror ("open");
  
@@ -140,7 +146,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  	/*
  	 * XXX: nbyte should be greater than 0 only for ^@ input in emacs.
  	 * This solution is very ugly.. but it will takes a half day
-@@ -322,7 +342,7 @@
+@@ -322,7 +345,7 @@ input_handler()
  
  	/*
  	 * NOTE:
@@ -149,7 +155,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  	 * Because inputline here is converted by alias.
  	 */
  
-@@ -336,7 +356,7 @@
+@@ -336,7 +359,7 @@ input_handler()
  	if (Through == OFF && Transparency == OFF && script_fp)
  	    fwrite (inputline, sizeof(CHAR), strlen (inputline), script_fp);
      }
@@ -158,7 +164,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  }
  
  #define INPUT_BUFFER_SIZE 1024
-@@ -384,21 +404,19 @@
+@@ -384,21 +407,19 @@ getcharacter()
  {
      char c;
      int n;
@@ -184,7 +190,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  
  RETRY:
      readfd = selectmask;
-@@ -409,13 +427,13 @@
+@@ -409,13 +430,13 @@ RETRY:
      while ((nfound = select (selectnfds, &readfd, 0, 0, *timeout)) < 0)
  	if (errno != EINTR) {
  		perror ("select");
@@ -200,7 +206,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  	int nbyte;
  
  	/*
-@@ -451,7 +469,7 @@
+@@ -451,7 +472,7 @@ RETRY:
      /*
       * Found input from terminal
       */
@@ -209,7 +215,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  
  #ifndef USE_TIMEOUT
  	/*
-@@ -467,8 +485,8 @@
+@@ -467,8 +488,8 @@ RETRY:
  	RETURNCHAR:
  	if ((c = getc (stdin)) == EOF) {
  	    if (debug)
@@ -220,7 +226,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  	}
  	else
  	    return (c & CHARMASK);
-@@ -504,7 +522,7 @@
+@@ -504,7 +525,7 @@ int set_buffer (bp, size)
      BUFFER *bp;
      int size;
  {
@@ -229,7 +235,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  
      if (bp->b_buf)
  	newbuf = (char *) realloc (bp->b_buf, size);
-@@ -596,7 +614,7 @@
+@@ -596,7 +617,7 @@ buf_put (bp, s)
  
  swallow_output()
  {
@@ -238,7 +244,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
      int r;
      int nbyte;
      int ncount = 10;
-@@ -604,7 +622,7 @@
+@@ -604,7 +625,7 @@ swallow_output()
      while (
  	ncount-- &&
  	select (selectnfds, &readfd, 0, 0, TIMEOUT_NOBLOCK) > 0 &&
@@ -247,7 +253,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
      ) {
  	nbyte = buf_read (master, output_buffer);
  	if (nbyte > 0) {
-@@ -636,21 +654,23 @@
+@@ -636,21 +657,23 @@ swallow_output()
  #include <sys/m_wait.h>
  #endif
  
@@ -275,7 +281,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  }
  
  exec_to_command(argv)
-@@ -675,13 +695,37 @@
+@@ -675,13 +698,37 @@ exec_to_command(argv)
      dup2 (slave, 2);
      (void) close (slave);
  
@@ -314,7 +320,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  fix_tty()
  {
      struct tchars tcbuf;
-@@ -719,6 +763,7 @@
+@@ -719,6 +766,7 @@ fix_tty()
      ioctl (0, TIOCSETC, (char *) & tcbuf);
      ioctl (0, TIOCSLTC, (char *) & lcbuf);
  }
@@ -322,7 +328,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  
  kill_process()
  {
-@@ -727,9 +772,10 @@
+@@ -727,9 +775,10 @@ kill_process()
  	(void) killpg (child_pid, SIGTERM);
  }
  
@@ -335,7 +341,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  
      /*
       * Save history if 'history-file' is set
-@@ -759,10 +805,14 @@
+@@ -759,10 +808,14 @@ terminate()
  	    if (killpg (child_pid, SIGKILL) < 0)
  		perror ("kill");
  
@@ -351,7 +357,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  }
  
  get_pty_master()
-@@ -775,6 +825,41 @@
+@@ -775,6 +828,41 @@ get_pty_master()
  	master = 1;
  	return;
      }
@@ -393,7 +399,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
      for (c = 'p'; c <= 's'; c++) {
  	for (i = 0; i < 16; i++) {
  	    sprintf (master_tty, "/dev/pty%c%x", c, i);
-@@ -796,11 +881,16 @@
+@@ -796,11 +884,16 @@ get_pty_master()
      }
  
   FOUND:
@@ -410,7 +416,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  
  #ifdef TIOCGWINSZ
      {
-@@ -820,11 +910,15 @@
+@@ -820,11 +913,15 @@ get_pty_master()
  # if defined(TIOCKGETC) && defined(TIOCKSETC)
      ioctl (0, TIOCKGETC, (char *) &jtchars_buf);
  # endif
@@ -430,7 +436,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
      selectnfds = max (fileno(stdin), master) + 1;
  
      return;
-@@ -838,11 +932,20 @@
+@@ -838,11 +935,20 @@ get_pty_slave()
  	perror (slave_tty);
  	exit (1);
      }
@@ -451,7 +457,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  
  #ifdef KANJI
  # if defined(TIOCKGET) && defined(TIOCKSET)
-@@ -851,7 +954,7 @@
+@@ -851,7 +957,7 @@ get_pty_slave()
  # if defined(TIOCKGETC) && defined(TIOCKSETC)
      ioctl (slave, TIOCKSETC, (char *) &jtchars_buf);
  # endif
@@ -460,7 +466,7 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  
  #ifdef TIOCSWINSZ
      {
-@@ -866,18 +969,20 @@
+@@ -866,37 +972,40 @@ get_pty_slave()
  
  recover_tty()
  {
@@ -478,13 +484,22 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
  {
      long	pid;
 -    void	(*func) ();
-+    void	(*func) __P((int));
-     int		omask;
+-    int		omask;
 -    extern int	errno;
++    void	(*func) (int);
++    sigset_t    set, oset;
  
      pid = getpid ();
   /* reset signal handler so kill below stops us */
-@@ -890,7 +995,7 @@
+     func = signal (SIGCHLD, SIG_IGN);
+     signal (SIGTSTP, SIG_DFL);
+     recover_tty();
+-#define	mask(s)	(1 << ((s)-1))
+-    omask = sigsetmask (sigblock (0) & ~mask (SIGTSTP));
++    sigemptyset(&set);
++    sigaddset(&set, SIGTSTP);
++    sigprocmask (SIG_BLOCK, &set, &oset);
+     kill (0, SIGTSTP);
  
      if (kill (child_pid, SIGCONT) < 0 && errno == ESRCH) {
  	printf ("Where my child has gone?!\n");
@@ -493,12 +508,19 @@ $NetBSD: patch-aj,v 1.10 2011/09/29 20:22:26 wiz Exp $
      }
      killpg (child_pid, SIGCONT);
      kill (0, SIGCONT);
-@@ -933,7 +1038,7 @@
+     signal (SIGCHLD, func);
+     signal (SIGTSTP, SIG_IGN);
+-    sigblock (mask (SIGTSTP));
++    sigprocmask (SIG_BLOCK, &set, &oset);
+     fix_tty ();
+     if (look_var ("auto-repaint"))
+ 	fep_repaint(0);
+@@ -933,7 +1042,7 @@ usageAndExit()
  /*
   * Propagate window size changes to the slave tty.
   */
 -sigwinch()
-+sigwinch(int num)
++void sigwinch(int num)
  {
  #ifdef TIOCGWINSZ			/* 4.3BSD */
      struct winsize win;
diff --git a/misc/fep/patches/patch-al b/misc/fep/patches/patch-al
index 49d1b705c0b..b101df802e9 100644
--- a/misc/fep/patches/patch-al
+++ b/misc/fep/patches/patch-al
@@ -1,11 +1,25 @@
-$NetBSD: patch-al,v 1.5 2006/01/17 21:23:01 kristerw Exp $
+$NetBSD: patch-al,v 1.6 2012/03/01 22:00:44 hans Exp $
 
 --- fep_util.c.orig	1988-12-28 07:24:01.000000000 -0500
 +++ fep_util.c	2005-12-10 16:59:27.000000000 -0500
-@@ -6 +6 @@
+@@ -3,14 +3,14 @@
+ #ifndef lint
+ static char rcsid[]=
+ "$Header: /cvsroot/pkgsrc/misc/fep/patches/patch-al,v 1.6 2012/03/01 22:00:44 hans Exp $ (SRA)";
 -#endif lint
 +#endif /* lint */
-@@ -178,9 +178,9 @@
+ 
+ #ifndef MKARGDEBUG
+ 
+ #include <stdio.h>
+ #include <pwd.h>
+ #include <sys/types.h>
+-#include <sys/dir.h>
++#include <dirent.h>
+ #include <ctype.h>
+ #include "fep_defs.h"
+ 
+@@ -178,9 +178,9 @@ max (d1, d2)
  {
      return (d1 > d2 ? d1 : d2);
  }
@@ -17,7 +31,7 @@ $NetBSD: patch-al,v 1.5 2006/01/17 21:23:01 kristerw Exp $
  
  #include <stdio.h>
  #include <ctype.h>
-@@ -198,7 +198,7 @@
+@@ -198,7 +198,7 @@ main()
  	showArgs (s);
      }
  }
@@ -26,7 +40,7 @@ $NetBSD: patch-al,v 1.5 2006/01/17 21:23:01 kristerw Exp $
  
  showArgs (comline)
      char *comline;
-@@ -402,4 +402,4 @@
+@@ -402,4 +402,4 @@ iskanji_in_string (s, i)
      else
  	return (iskanji (*cp));
  }