From 467e532a80f4fa851f7bc6356f6a56a68720003c Mon Sep 17 00:00:00 2001
From: kristerw <kristerw>
Date: Tue, 17 Jan 2006 21:23:01 +0000
Subject: Regenerate hand edited patches so that they can be applied using the
 OS X patch program.

---
 misc/fep/distinfo         | 26 +++++++++++++-------------
 misc/fep/patches/patch-ab |  5 +++--
 misc/fep/patches/patch-ac |  6 +++---
 misc/fep/patches/patch-ad |  7 +++----
 misc/fep/patches/patch-ae |  6 +++---
 misc/fep/patches/patch-af |  6 +++---
 misc/fep/patches/patch-ag |  7 ++-----
 misc/fep/patches/patch-ah |  7 ++-----
 misc/fep/patches/patch-ai |  6 +++---
 misc/fep/patches/patch-aj |  8 +++-----
 misc/fep/patches/patch-ak |  6 +++---
 misc/fep/patches/patch-al |  7 ++-----
 misc/fep/patches/patch-am |  6 +++---
 13 files changed, 46 insertions(+), 57 deletions(-)

diff --git a/misc/fep/distinfo b/misc/fep/distinfo
index 0d16aac7fe5..95f772cf3f3 100644
--- a/misc/fep/distinfo
+++ b/misc/fep/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.12 2006/01/03 19:28:00 joerg Exp $
+$NetBSD: distinfo,v 1.13 2006/01/17 21:23:01 kristerw Exp $
 
 SHA1 (fep.tar.gz) = 73fa55337b12dba3b91c9895e2c9adbbdfa9d960
 RMD160 (fep.tar.gz) = 2a8b9eeecd5c76bec5cdb524ae6c650f298ccbde
 Size (fep.tar.gz) = 40137 bytes
 SHA1 (patch-aa) = f62c430e029bdf8e434d9e492831192209bd6aab
-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) = c10add53082437f9daec6250f4700dadbb4ddfc7
-SHA1 (patch-ak) = a9c91d72619008889f94b1c488697eaaf8e5d0b3
-SHA1 (patch-al) = 6761a1e617b6d679a2e2b5e2ed1f5e895b375c3e
-SHA1 (patch-am) = 4edeca9622de1e15dd36dae2d70e73f16a920798
+SHA1 (patch-ab) = 2b6f6cff25a21b374dce4b0162dc06a6d0b6c24f
+SHA1 (patch-ac) = a306ac6a1fa580238e3ac89ea785fefe138ebb65
+SHA1 (patch-ad) = 78d5fd59d51542d304d3adcdde3a7ac48790d857
+SHA1 (patch-ae) = 16a34dbf37dfeeab3c0c76ec651ac19037fa600a
+SHA1 (patch-af) = 77d32f96314a8657e3b575d93def4156e29af2af
+SHA1 (patch-ag) = 2e1d76994ddd50c040383c93f4776ddd7bb2f934
+SHA1 (patch-ah) = 5fd76d412877dc5db166dad274a765b68182c875
+SHA1 (patch-ai) = eda04c0d295a425e6929ade003314cc5ea340368
+SHA1 (patch-aj) = 12c456f62a84fd61b049a1c4091f92fbaa059205
+SHA1 (patch-ak) = 97f14ed899fc2afc4f27a3730084355ec42649af
+SHA1 (patch-al) = 43cadd61a36ea6783df419caeb1c2b9fab5090e1
+SHA1 (patch-am) = 26915755c5c06fc68cba722349b2a4d585787fb7
diff --git a/misc/fep/patches/patch-ab b/misc/fep/patches/patch-ab
index beb83092fa4..e7f913cbd7b 100644
--- a/misc/fep/patches/patch-ab
+++ b/misc/fep/patches/patch-ab
@@ -1,10 +1,11 @@
-$NetBSD: patch-ab,v 1.5 2006/01/03 18:16:10 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2006/01/17 21:23:01 kristerw Exp $
 
 --- fep_alias.c.orig	1988-11-13 01:50:58.000000000 -0500
 +++ fep_alias.c	2005-12-10 16:59:27.000000000 -0500
-@@ -6,7 +6,8 @@
+@@ -6 +6 @@
 -#endif lint
 +#endif /* lint */
+@@ -7,6 +7,7 @@
  
  #include <stdio.h>
  #include <ctype.h>
diff --git a/misc/fep/patches/patch-ac b/misc/fep/patches/patch-ac
index a1465aeeca5..94153ffe231 100644
--- a/misc/fep/patches/patch-ac
+++ b/misc/fep/patches/patch-ac
@@ -1,10 +1,11 @@
-$NetBSD: patch-ac,v 1.5 2006/01/03 18:16:10 joerg Exp $
+$NetBSD: patch-ac,v 1.6 2006/01/17 21:23:01 kristerw 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,8 +6,20 @@
+@@ -6 +6 @@
 -#endif lint
 +#endif /* lint */
+@@ -7,6 +7,18 @@
  
  #include <stdio.h>
 +#include <sys/ioctl.h>
@@ -23,7 +24,6 @@ $NetBSD: patch-ac,v 1.5 2006/01/03 18:16:10 joerg Exp $
 +#include <stdlib.h>
  #include <sys/param.h>
  #include <sys/file.h>
- #include <sys/stat.h>
 @@ -31,7 +43,7 @@
      char *comline, **more;
  {
diff --git a/misc/fep/patches/patch-ad b/misc/fep/patches/patch-ad
index 9c4e06284ec..af258e29517 100644
--- a/misc/fep/patches/patch-ad
+++ b/misc/fep/patches/patch-ad
@@ -1,16 +1,15 @@
-$NetBSD: patch-ad,v 1.6 2006/01/03 18:16:10 joerg Exp $
+$NetBSD: patch-ad,v 1.7 2006/01/17 21:23:01 kristerw Exp $
 
 --- fep_defs.h.orig	1993-05-10 01:23:33.000000000 -0400
 +++ fep_defs.h	2005-12-10 16:59:27.000000000 -0500
-@@ -6,6 +6,6 @@
+@@ -6 +6 @@
 -#endif lint
 +#endif /* lint */
+@@ -7,3 +7,3 @@
  
 -#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,21 +31,21 @@
  # define isctlchar(c)	(c && !iskanji(c) && (!(c&0140) || c=='\177'))
  # define iswordchar(c)	(c && (iskanji(c) || isalnum(c) || iscntrl(c)))
diff --git a/misc/fep/patches/patch-ae b/misc/fep/patches/patch-ae
index 5048d7f5967..cb27e21b621 100644
--- a/misc/fep/patches/patch-ae
+++ b/misc/fep/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.6 2006/01/03 18:16:10 joerg Exp $
+$NetBSD: patch-ae,v 1.7 2006/01/17 21:23:01 kristerw Exp $
 
 --- fep_edit.c.orig	1995-01-20 03:16:37.000000000 -0500
 +++ fep_edit.c	2005-12-10 16:59:27.000000000 -0500
-@@ -6,10 +6,22 @@
+@@ -6 +6 @@
 -#endif lint
 +#endif /* lint */
- 
+@@ -8,8 +8,20 @@
  #include <stdio.h>
  #include <sys/types.h>
  #include <sys/stat.h>
diff --git a/misc/fep/patches/patch-af b/misc/fep/patches/patch-af
index b7819196192..206a3acb6fb 100644
--- a/misc/fep/patches/patch-af
+++ b/misc/fep/patches/patch-af
@@ -1,16 +1,16 @@
-$NetBSD: patch-af,v 1.5 2006/01/03 18:16:10 joerg Exp $
+$NetBSD: patch-af,v 1.6 2006/01/17 21:23:01 kristerw 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 +6,7 @@
+@@ -6 +6 @@
 -#endif lint
 +#endif /* lint */
+@@ -7,4 +7,5 @@
  
  #include <stdio.h>
 +#include "fep_defs.h"
  #include "fep_funcs.h"
  
- /*
 @@ -94,7 +95,7 @@
  	 "Expand file name"},
  	{list_file_name,		"list-file-name",
diff --git a/misc/fep/patches/patch-ag b/misc/fep/patches/patch-ag
index b5bef811e0a..4783074b145 100644
--- a/misc/fep/patches/patch-ag
+++ b/misc/fep/patches/patch-ag
@@ -1,13 +1,10 @@
-$NetBSD: patch-ag,v 1.5 2006/01/03 18:16:10 joerg Exp $
+$NetBSD: patch-ag,v 1.6 2006/01/17 21:23:01 kristerw 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,4 +6,4 @@
+@@ -6 +6 @@
 -#endif lint
 +#endif /* lint */
- 
- /*
-  * command line edit functions
 @@ -22,7 +22,7 @@
  int	delete_previous_word();
  int	delete_previous_Word();
diff --git a/misc/fep/patches/patch-ah b/misc/fep/patches/patch-ah
index e2d905a7b86..16756c03c8b 100644
--- a/misc/fep/patches/patch-ah
+++ b/misc/fep/patches/patch-ah
@@ -1,13 +1,10 @@
-$NetBSD: patch-ah,v 1.5 2006/01/03 18:16:10 joerg Exp $
+$NetBSD: patch-ah,v 1.6 2006/01/17 21:23:01 kristerw Exp $
 
 --- fep_glob.h.orig	1988-08-28 01:36:43.000000000 -0400
 +++ fep_glob.h	2005-12-10 16:59:27.000000000 -0500
-@@ -6,4 +6,4 @@
+@@ -6 +6 @@
 -#endif lint
 +#endif /* lint */
- 
- extern FUNC	*curFuncTab;	/* function table */
- extern FUNC	*altFuncTab;	/* altanative function table */
 @@ -29,6 +29,11 @@
   * tty control caracters.
   * defined in fep_main.c
diff --git a/misc/fep/patches/patch-ai b/misc/fep/patches/patch-ai
index 779cba11824..c6ba941782e 100644
--- a/misc/fep/patches/patch-ai
+++ b/misc/fep/patches/patch-ai
@@ -1,17 +1,17 @@
-$NetBSD: patch-ai,v 1.5 2006/01/03 18:16:10 joerg Exp $
+$NetBSD: patch-ai,v 1.6 2006/01/17 21:23:01 kristerw Exp $
 
 --- fep_hist.c.orig	1988-11-25 06:45:42.000000000 -0500
 +++ fep_hist.c	2005-12-10 16:59:27.000000000 -0500
-@@ -6,6 +6,8 @@
+@@ -6 +6 @@
 -#endif lint
 +#endif /* lint */
+@@ -7,4 +7,6 @@
  
  #include <stdio.h>
 +#include <stdlib.h>
 +#include <unistd.h>
  #include <ctype.h>
  #include "fep_defs.h"
- #include "fep_glob.h"
 @@ -255,7 +257,7 @@
  
  	default:
diff --git a/misc/fep/patches/patch-aj b/misc/fep/patches/patch-aj
index c47de2592c4..81d996578e2 100644
--- a/misc/fep/patches/patch-aj
+++ b/misc/fep/patches/patch-aj
@@ -1,13 +1,11 @@
-$NetBSD: patch-aj,v 1.8 2006/01/03 19:28:00 joerg Exp $
+$NetBSD: patch-aj,v 1.9 2006/01/17 21:23:01 kristerw Exp $
 
 --- 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 @@
+@@ -6 +6 @@
 -#endif lint
 +#endif /* lint */
- 
- #include <stdio.h>
- #include <signal.h>
+@@ -10,11 +10,20 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/ioctl.h>
diff --git a/misc/fep/patches/patch-ak b/misc/fep/patches/patch-ak
index 5b9ba2f6cac..a4015b13bce 100644
--- a/misc/fep/patches/patch-ak
+++ b/misc/fep/patches/patch-ak
@@ -1,16 +1,16 @@
-$NetBSD: patch-ak,v 1.5 2006/01/03 18:16:10 joerg Exp $
+$NetBSD: patch-ak,v 1.6 2006/01/17 21:23:01 kristerw Exp $
 
 --- fep_set.c.orig	1991-05-29 01:31:24.000000000 -0400
 +++ fep_set.c	2005-12-10 16:59:27.000000000 -0500
-@@ -6,6 +6,7 @@
+@@ -6 +6 @@
 -#endif lint
 +#endif /* lint */
+@@ -7,4 +7,5 @@
  
  #include <stdio.h>
 +#include <stdlib.h>
  #include "fep_defs.h"
  #include "fep_glob.h"
- 
 @@ -67,10 +68,10 @@
  #ifdef HASH
  #define HASHNUM	10
diff --git a/misc/fep/patches/patch-al b/misc/fep/patches/patch-al
index 95a52114a18..49d1b705c0b 100644
--- a/misc/fep/patches/patch-al
+++ b/misc/fep/patches/patch-al
@@ -1,13 +1,10 @@
-$NetBSD: patch-al,v 1.4 2006/01/03 18:16:10 joerg Exp $
+$NetBSD: patch-al,v 1.5 2006/01/17 21:23:01 kristerw 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,4 +6,4 @@
+@@ -6 +6 @@
 -#endif lint
 +#endif /* lint */
- 
- #ifndef MKARGDEBUG
- 
 @@ -178,9 +178,9 @@
  {
      return (d1 > d2 ? d1 : d2);
diff --git a/misc/fep/patches/patch-am b/misc/fep/patches/patch-am
index 53c5651b09d..ba5b6b870d3 100644
--- a/misc/fep/patches/patch-am
+++ b/misc/fep/patches/patch-am
@@ -1,10 +1,11 @@
-$NetBSD: patch-am,v 1.4 2006/01/03 18:16:10 joerg Exp $
+$NetBSD: patch-am,v 1.5 2006/01/17 21:23:01 kristerw Exp $
 
 --- fep_vi.c.orig	1991-05-29 01:31:27.000000000 -0400
 +++ fep_vi.c	2005-12-10 16:59:27.000000000 -0500
-@@ -6,7 +6,17 @@
+@@ -6 +6 @@
 -#endif lint
 +#endif /* lint */
+@@ -7,5 +7,15 @@
  
  #include <stdio.h>
 +#include <sys/ioctl.h>
@@ -20,7 +21,6 @@ $NetBSD: patch-am,v 1.4 2006/01/03 18:16:10 joerg Exp $
 +#endif
  #include <ctype.h>
  #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},
-- 
cgit v1.2.3