Make this package build with gcc-4.

7 files changed, 60 insertions, 3 deletions

diff --git a/devel/spiff/distinfo b/devel/spiff/distinfo
index 11f790e8742..70231ce93d3 100644
--- a/devel/spiff/distinfo
+++ b/devel/spiff/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:34 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/06/08 16:12:48 minskim Exp $
 
 SHA1 (spiff-1.0.tar.gz) = 09803fa6f946c3639bb2c7ac5b5644860ebed643
 RMD160 (spiff-1.0.tar.gz) = ff651435946dd8889b9a01a598f3933e3e50c614
@@ -6,3 +6,5 @@ Size (spiff-1.0.tar.gz) = 48291 bytes
 SHA1 (patch-aa) = 7385b723590f1e8ce86e830605da3ce1bd97a3ea
 SHA1 (patch-ab) = 36b0ee588e64fc2716e18711099125636e95bf38
 SHA1 (patch-ac) = d88280626b3d1621377d38037a52e79e6e35bb1a
+SHA1 (patch-ad) = 386f3130fdc97eb7e5472404aaf3f3bc8e94654c
+SHA1 (patch-ae) = fb98434c7cead14541cd6b8a6bf36775ade76ed9
diff --git a/devel/spiff/patches/patch-ad b/devel/spiff/patches/patch-ad
new file mode 100644
index 00000000000..fabc26374d1
--- /dev/null
+++ b/devel/spiff/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/06/08 16:12:48 minskim Exp $
+
+--- spiff.c.orig	1990-02-05 20:17:20.000000000 +0000
++++ spiff.c
+@@ -27,7 +27,7 @@ static char rcsid[]= "$Header: spiff.c,v
+ #include "visual.h"
+ #include "output.h"
+ 
+-extern void _Y_doargs();
++static void _Y_doargs();
+ 
+ static int _Y_eflag = 0;	/* use exact match algorithm */
+ static int _Y_vflag = 0;	/* use visual mode */
diff --git a/devel/spiff/patches/patch-ae b/devel/spiff/patches/patch-ae
new file mode 100644
index 00000000000..b15c175f558
--- /dev/null
+++ b/devel/spiff/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2006/06/08 16:12:48 minskim Exp $
+
+--- compare.c.orig	1990-02-05 20:17:15.000000000 +0000
++++ compare.c
+@@ -21,6 +21,10 @@ static char rcsid[]= "$Header: compare.c
+ 
+ #include <ctype.h>
+ 
++static int _X_strcmp(char *s1, char *s2, int flags);
++static int _X_floatdiff(F_float p1, F_float p2, T_tol the_tol);
++static int _X_cmptokens(K_token p1, K_token p2, int flags);
++
+ X_com(a,b,flags)
+ int a,b,flags;
+ {
diff --git a/editors/ex/distinfo b/editors/ex/distinfo
index 98efc31c38c..29c01251fda 100644
--- a/editors/ex/distinfo
+++ b/editors/ex/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/12/09 14:10:39 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/06/08 16:15:47 minskim Exp $
 
 SHA1 (ex-040103.tar.gz) = 51fa1d613b37a4f3aed1ef2968be691465cdff09
 RMD160 (ex-040103.tar.gz) = 5fc3f222dde5a8d00e1b233281ccf210affdbdf1
@@ -6,3 +6,4 @@ Size (ex-040103.tar.gz) = 284130 bytes
 SHA1 (patch-aa) = 134513a18d1a5192818eccd456d91857fda82860
 SHA1 (patch-ab) = 5bac9911e71b7fe787023568a7a46d1e87fb4d0e
 SHA1 (patch-ac) = 2dcda20524bb2f2e6a4569c4571905352ca75a34
+SHA1 (patch-ad) = 31bafb04f553ca286baf90505da450964fea9954
diff --git a/editors/ex/patches/patch-ad b/editors/ex/patches/patch-ad
new file mode 100644
index 00000000000..fbecc97e450
--- /dev/null
+++ b/editors/ex/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2006/06/08 16:15:47 minskim Exp $
+
+--- ex.h.orig	2003-03-18 20:29:07.000000000 +0000
++++ ex.h
+@@ -549,7 +549,6 @@ extern	int	tfile;		/* Temporary file uni
+ var	bool	tflag;		/* -t option given on command line */
+ var	bool	vcatch;		/* Want to catch an error (open/visual) */
+ var	bool	verbose;	/* -V option; print command input to stderr */
+-var	char	*versionstring;	/* For the "version" command */
+ var	JMP_BUF	vreslab;	/* For error throws to a visual catch */
+ var	bool	writing;	/* 1 if in middle of a file write */
+ var	int	xchng;		/* Suppresses multiple "No writes" in !cmd */
diff --git a/editors/mined/distinfo b/editors/mined/distinfo
index e267a7a995d..7251aee12dd 100644
--- a/editors/mined/distinfo
+++ b/editors/mined/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:15:11 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/06/08 16:17:30 minskim Exp $
 
 SHA1 (mined-2000.7.tar.gz) = 644bb15455f636b58a05b67a988421a6dc99cf90
 RMD160 (mined-2000.7.tar.gz) = 9e01b738b12c600af649f1066661095b1b88f484
@@ -6,3 +6,4 @@ Size (mined-2000.7.tar.gz) = 1208334 bytes
 SHA1 (patch-aa) = c0467b6017cf54827ba3c1de23c9ba9e3f31acf7
 SHA1 (patch-ab) = d3a99e8d14797233b6abf8c1096d65bd3451d28c
 SHA1 (patch-ac) = 9624eae0aecde080174f8d3c982b209aa703273c
+SHA1 (patch-ad) = 6e20730fc2404d02e31437edd1513d3f78a644fd
diff --git a/editors/mined/patches/patch-ad b/editors/mined/patches/patch-ad
new file mode 100644
index 00000000000..2a56fc12a7c
--- /dev/null
+++ b/editors/mined/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/06/08 16:17:30 minskim Exp $
+
+--- src/mined1.c.orig	2003-05-25 20:28:23.000000000 +0000
++++ src/mined1.c
+@@ -2367,7 +2367,7 @@ VIEWmode ()
+   }
+ }
+ 
+-extern FLAG viewing_help;
++static FLAG viewing_help;
+ static void end_view_help ();
+ 
+ void