Split patch into pieces. Requested by Roland Illig.

6 files changed, 90 insertions, 78 deletions

diff --git a/shells/es/distinfo b/shells/es/distinfo
index 49ae1f4e299..df0b1db8751 100644
--- a/shells/es/distinfo
+++ b/shells/es/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 14:53:32 agc Exp $
+$NetBSD: distinfo,v 1.3 2004/02/26 07:47:48 uebayasi Exp $
 
 SHA1 (es-0.9-alpha1.tar.gz) = 5027c9dade742c437b8e471a356d15883ebc4732
 Size (es-0.9-alpha1.tar.gz) = 125913 bytes
-SHA1 (patch-aa) = 293dfdef73bcfd5126aa5c5ffa98d5b3c8142b37
+SHA1 (patch-aa) = 54f061989aa9317cdc32470302978129d8186b13
+SHA1 (patch-ab) = bd58fbbf71d5c9dc76bdc380cb7b93ad3f5f1c72
+SHA1 (patch-ac) = ac40f8fd66517a2db338e72f0584d58e8d8867ba
+SHA1 (patch-ad) = 197a7e52e06966781093ee2bbfc5769f0b09f161
+SHA1 (patch-ae) = f3b28abd1520c2d98e2424f45fc780ae09cc00ea
diff --git a/shells/es/patches/patch-aa b/shells/es/patches/patch-aa
index ed394b75b8d..4da4433a843 100644
--- a/shells/es/patches/patch-aa
+++ b/shells/es/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:13:54 agc Exp $
+$NetBSD: patch-aa,v 1.4 2004/02/26 07:47:48 uebayasi Exp $
 
 *** Makefile.orig	Tue May 30 06:14:14 1995
 --- Makefile	Fri Aug 11 16:02:11 1995
@@ -39,78 +39,3 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:13:54 agc Exp $
   
   es	: ${OFILES} initial.o
   	${CC} -o es ${LDFLAGS} ${OFILES} initial.o ${LIBS}
---- prim-sys.c.orig	Tue May 30 06:13:51 1995
-+++ prim-sys.c	Thu Apr 10 10:15:40 1997
-@@ -194,7 +194,7 @@
- 
- static void printlimit(const Limit *limit, Boolean hard) {
- 	struct rlimit rlim;
--	long lim;
-+	u_quad_t lim;
- 	getrlimit(limit->flag, &rlim);
- 	if (hard)
- 		lim = rlim.rlim_max;
-@@ -209,11 +209,11 @@
- 				lim /= suf->amount;
- 				break;
- 			}
--		print("%-8s\t%d%s\n", limit->name, lim, (suf == NULL || lim == 0) ? "" : suf->name);
-+		print("%-8s\t%ud%s\n", limit->name, (unsigned int)lim, (suf == NULL || lim == 0) ? "" : suf->name);
- 	}
- }
- 
--static long parselimit(const Limit *limit, char *s) {
-+static u_quad_t parselimit(const Limit *limit, char *s) {
- 	long lim;
- 	char *t;
- 	const Suffix *suf = limit->suffix;
---- main.c~	Tue May 30 06:13:50 1995
-+++ main.c	Thu Apr 10 09:20:49 1997
-@@ -9,7 +9,7 @@
- Boolean gcinfo		= FALSE;	/* -I */
- #endif
- 
--#if !HPUX && !defined(linux)
-+#if !HPUX && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- extern int getopt (int argc, char **argv, const char *optstring);
- #endif
- extern int optind;
---- stdenv.h~	Tue May 30 06:13:53 1995
-+++ stdenv.h	Thu Apr 10 09:32:22 1997
-@@ -283,6 +283,7 @@
- 
- /* stdlib */
- 
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- extern noreturn exit(int);
- extern noreturn abort(void);
- extern long strtol(const char *num, char **end, int base);
-@@ -290,6 +291,7 @@
- 	void *base, size_t nmemb, size_t size,
- 	int (*compar)(const void *, const void *)
- );
-+#endif
- 
- /* setjmp */
- 
---- util.c	1997/10/24 14:23:46	1.1
-+++ util.c	1997/10/24 14:25:01
-@@ -2,6 +2,10 @@
- 
- #include "es.h"
- 
-+#include <sys/param.h>
-+
-+#if !(defined(BSD) && BSD >= 199306)
-+/* agc - just use the system strerror here */
- /* strerror -- turn an error code into a string */
- extern char *strerror(int n) {
- 	extern int sys_nerr;
-@@ -10,6 +14,7 @@
- 		return "unknown error";
- 	return sys_errlist[n];
- }
-+#endif
- 
- /* uerror -- print a unix error, our version of perror */
- extern void uerror(char *s) {
diff --git a/shells/es/patches/patch-ab b/shells/es/patches/patch-ab
new file mode 100644
index 00000000000..0a15ec3f9f2
--- /dev/null
+++ b/shells/es/patches/patch-ab
@@ -0,0 +1,27 @@
+$NetBSD: patch-ab,v 1.1 2004/02/26 07:47:48 uebayasi Exp $
+
+--- prim-sys.c.orig	Tue May 30 06:13:51 1995
++++ prim-sys.c	Thu Apr 10 10:15:40 1997
+@@ -194,7 +194,7 @@
+ 
+ static void printlimit(const Limit *limit, Boolean hard) {
+ 	struct rlimit rlim;
+-	long lim;
++	u_quad_t lim;
+ 	getrlimit(limit->flag, &rlim);
+ 	if (hard)
+ 		lim = rlim.rlim_max;
+@@ -209,11 +209,11 @@
+ 				lim /= suf->amount;
+ 				break;
+ 			}
+-		print("%-8s\t%d%s\n", limit->name, lim, (suf == NULL || lim == 0) ? "" : suf->name);
++		print("%-8s\t%ud%s\n", limit->name, (unsigned int)lim, (suf == NULL || lim == 0) ? "" : suf->name);
+ 	}
+ }
+ 
+-static long parselimit(const Limit *limit, char *s) {
++static u_quad_t parselimit(const Limit *limit, char *s) {
+ 	long lim;
+ 	char *t;
+ 	const Suffix *suf = limit->suffix;
diff --git a/shells/es/patches/patch-ac b/shells/es/patches/patch-ac
new file mode 100644
index 00000000000..2203c83f15c
--- /dev/null
+++ b/shells/es/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/02/26 07:47:48 uebayasi Exp $
+
+--- main.c~	Tue May 30 06:13:50 1995
++++ main.c	Thu Apr 10 09:20:49 1997
+@@ -9,7 +9,7 @@
+ Boolean gcinfo		= FALSE;	/* -I */
+ #endif
+ 
+-#if !HPUX && !defined(linux)
++#if !HPUX && !defined(linux) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ extern int getopt (int argc, char **argv, const char *optstring);
+ #endif
+ extern int optind;
diff --git a/shells/es/patches/patch-ad b/shells/es/patches/patch-ad
new file mode 100644
index 00000000000..6caba1d3ff0
--- /dev/null
+++ b/shells/es/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1 2004/02/26 07:47:48 uebayasi Exp $
+
+--- stdenv.h~	Tue May 30 06:13:53 1995
++++ stdenv.h	Thu Apr 10 09:32:22 1997
+@@ -283,6 +283,7 @@
+ 
+ /* stdlib */
+ 
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+ extern noreturn exit(int);
+ extern noreturn abort(void);
+ extern long strtol(const char *num, char **end, int base);
+@@ -290,6 +291,7 @@
+ 	void *base, size_t nmemb, size_t size,
+ 	int (*compar)(const void *, const void *)
+ );
++#endif
+ 
+ /* setjmp */
+ 
diff --git a/shells/es/patches/patch-ae b/shells/es/patches/patch-ae
new file mode 100644
index 00000000000..e46ac4cd935
--- /dev/null
+++ b/shells/es/patches/patch-ae
@@ -0,0 +1,23 @@
+$NetBSD: patch-ae,v 1.1 2004/02/26 07:47:48 uebayasi Exp $
+
+--- util.c	1997/10/24 14:23:46	1.1
++++ util.c	1997/10/24 14:25:01
+@@ -2,6 +2,10 @@
+ 
+ #include "es.h"
+ 
++#include <sys/param.h>
++
++#if !(defined(BSD) && BSD >= 199306)
++/* agc - just use the system strerror here */
+ /* strerror -- turn an error code into a string */
+ extern char *strerror(int n) {
+ 	extern int sys_nerr;
+@@ -10,6 +14,7 @@
+ 		return "unknown error";
+ 	return sys_errlist[n];
+ }
++#endif
+ 
+ /* uerror -- print a unix error, our version of perror */
+ extern void uerror(char *s) {