Made the package work on Solaris, which didn't like redeclarations of

standard functions:

"misc.h", line 42: identifier redeclared: sprintf

3 files changed, 38 insertions, 6 deletions

diff --git a/devel/spiff/distinfo b/devel/spiff/distinfo
index 70231ce93d3..fb723a5ddc1 100644
--- a/devel/spiff/distinfo
+++ b/devel/spiff/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.4 2006/06/08 16:12:48 minskim Exp $
+$NetBSD: distinfo,v 1.5 2007/10/05 21:13:59 rillig Exp $
 
 SHA1 (spiff-1.0.tar.gz) = 09803fa6f946c3639bb2c7ac5b5644860ebed643
 RMD160 (spiff-1.0.tar.gz) = ff651435946dd8889b9a01a598f3933e3e50c614
 Size (spiff-1.0.tar.gz) = 48291 bytes
 SHA1 (patch-aa) = 7385b723590f1e8ce86e830605da3ce1bd97a3ea
-SHA1 (patch-ab) = 36b0ee588e64fc2716e18711099125636e95bf38
+SHA1 (patch-ab) = 7d9bedb10742a36e2841d79ccd5d608b8eefeb5f
 SHA1 (patch-ac) = d88280626b3d1621377d38037a52e79e6e35bb1a
 SHA1 (patch-ad) = 386f3130fdc97eb7e5472404aaf3f3bc8e94654c
 SHA1 (patch-ae) = fb98434c7cead14541cd6b8a6bf36775ade76ed9
+SHA1 (patch-af) = 5d922bcafe13e5f24347e78b9e1cd0859d295631
diff --git a/devel/spiff/patches/patch-ab b/devel/spiff/patches/patch-ab
index efc411a500b..b9eef8dbac7 100644
--- a/devel/spiff/patches/patch-ab
+++ b/devel/spiff/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2004/07/04 16:21:59 jschauma Exp $
+$NetBSD: patch-ab,v 1.3 2007/10/05 21:13:59 rillig Exp $
 
 --- misc.h	2001/10/15 10:01:22	1.1
 +++ misc.h	2001/10/15 10:02:19
@@ -11,18 +11,20 @@ $NetBSD: patch-ab,v 1.2 2004/07/04 16:21:59 jschauma Exp $
  /*
  **	make sure that if we have a XENIX system, that
  **	we also treat it as an AT and T derivative
-@@ -36,12 +38,14 @@
+@@ -36,12 +38,16 @@
  /*
  **	lines needed to shut up lint
  */
-+#if !(defined(BSD) && BSD >= 199306) && !defined(__linux__)
++#if defined(__STDC__)
++#include <string.h>
++#else
  extern char *sprintf();
  extern char *strcat();
  extern char *strncat();
  extern char *strcpy();
  extern char *strncpy();
  extern char *malloc();
-+#endif /* BSD */
++#endif
  
  extern void Z_complain();
  extern void Z_fatal();
diff --git a/devel/spiff/patches/patch-af b/devel/spiff/patches/patch-af
new file mode 100644
index 00000000000..7dc36c37ed3
--- /dev/null
+++ b/devel/spiff/patches/patch-af
@@ -0,0 +1,29 @@
+$NetBSD: patch-af,v 1.1 2007/10/05 21:14:00 rillig Exp $
+
+Programming in C before 1989 must have been really painful.
+
+--- parse.c.orig	1990-02-05 21:17:19.000000000 +0100
++++ parse.c	2007-10-05 23:08:43.000000000 +0200
+@@ -68,9 +68,6 @@ static
+ _P_in_alpha(chr)
+ char chr;
+ {
+-#ifndef ATT
+-	extern int index();
+-#endif
+ 	/*
+ 	**	special case when string terminator
+ 	**	is handed to us
+@@ -78,11 +75,7 @@ char chr;
+ 	if ('\0' == chr)
+ 		return(0);
+ 
+-#ifdef ATT
+-	return((int) strchr(_P_alpha,chr));
+-#else
+-	return((int) index(_P_alpha,chr));
+-#endif
++	return strchr(_P_alpha,chr) != NULL;
+ }
+ 
+ void