From 20eaaa5d77aa1abe7aa7bfbdfd331553ec36ce3f Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Tue, 14 Jun 2011 13:25:57 +0000
Subject: Fix build on NetBSD-current. From Daniel Loffgren in PR 45019.

---
 misc/colorls/distinfo               |  5 +++--
 misc/colorls/patches/patch-ae       | 25 +++++++++++++++++--------
 misc/colorls/patches/patch-extern.h | 11 +++++++++++
 3 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 misc/colorls/patches/patch-extern.h

(limited to 'misc/colorls')

diff --git a/misc/colorls/distinfo b/misc/colorls/distinfo
index c25724df0ab..82f1b869295 100644
--- a/misc/colorls/distinfo
+++ b/misc/colorls/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2011/01/02 14:46:38 obache Exp $
+$NetBSD: distinfo,v 1.6 2011/06/14 13:25:57 wiz Exp $
 
 SHA1 (ls.tar.gz) = f0d069e71faade167feaf14c4e6327bcc14d6616
 RMD160 (ls.tar.gz) = 7b607b7ab953ad0dc603c269fa03648cd54ac04f
@@ -7,4 +7,5 @@ SHA1 (patch-aa) = 831f286605126a136b540b4456916db8cc8ff7e4
 SHA1 (patch-ab) = 8f26c3e16bb85371bbb16c5f77a667b3a456af68
 SHA1 (patch-ac) = 201dfa7f1fd9cdf022f7c4f50af9b14fe1e0cccb
 SHA1 (patch-ad) = d502e96261a950c5307794f01422147430c76aba
-SHA1 (patch-ae) = 9b15ef9f8ab3e77b34a0f7ee401fbe8dcae4a854
+SHA1 (patch-ae) = f901c10b02f9a965e10603a2d0365f0439b00e65
+SHA1 (patch-extern.h) = ecb2f17ab8f17a42f744c26a86d243d90b309fd5
diff --git a/misc/colorls/patches/patch-ae b/misc/colorls/patches/patch-ae
index 10ef02b3a82..7e1196fc13b 100644
--- a/misc/colorls/patches/patch-ae
+++ b/misc/colorls/patches/patch-ae
@@ -1,8 +1,16 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:10:13 agc Exp $
+$NetBSD: patch-ae,v 1.3 2011/06/14 13:25:57 wiz Exp $
 
---- print.c.orig	Sun Dec 22 00:40:58 1996
-+++ print.c	Thu May 21 15:42:08 1998
-@@ -64,6 +64,26 @@
+--- print.c.orig	1996-12-21 23:40:58.000000000 +0000
++++ print.c
+@@ -43,6 +43,7 @@ static char const sccsid[] = "@(#)print.
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ 
++#include <ctype.h>
+ #include <err.h>
+ #include <errno.h>
+ #include <fts.h>
+@@ -64,6 +65,26 @@ static int	printtype __P((u_int));
  
  #define	IS_NOPRINT(p)	((p)->fts_number == NO_PRINT)
  
@@ -29,7 +37,7 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:10:13 agc Exp $
  void
  printscol(dp)
  	DISPLAY *dp;
-@@ -124,10 +144,14 @@
+@@ -124,10 +145,14 @@ printlong(dp)
  			printtime(sp->st_ctime);
  		else
  			printtime(sp->st_mtime);
@@ -45,7 +53,7 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:10:13 agc Exp $
  			printlink(p);
  		(void)putchar('\n');
  	}
-@@ -190,10 +214,22 @@
+@@ -190,10 +215,22 @@ printcol(dp)
  			    dp->s_block);
  			if ((base += numrows) >= num)
  				break;
@@ -72,7 +80,7 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:10:13 agc Exp $
  			endcol += colwidth;
  		}
  		(void)putchar('\n');
-@@ -219,9 +255,13 @@
+@@ -219,9 +256,13 @@ printaname(p, inodefield, sizefield)
  	if (f_size)
  		chcnt += printf("%*qd ",
  		    (int)sizefield, howmany(sp->st_blocks, blocksize));
@@ -86,7 +94,7 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:10:13 agc Exp $
  	return (chcnt);
  }
  
-@@ -281,6 +321,95 @@
+@@ -281,6 +322,96 @@ printtype(mode)
  	return (0);
  }
  
@@ -105,6 +113,7 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 11:10:13 agc Exp $
 +	printf("m");
 +}
 +
++int
 +colortype(mode)
 +       mode_t mode;
 +{
diff --git a/misc/colorls/patches/patch-extern.h b/misc/colorls/patches/patch-extern.h
new file mode 100644
index 00000000000..aca9bc6cd2c
--- /dev/null
+++ b/misc/colorls/patches/patch-extern.h
@@ -0,0 +1,11 @@
+$NetBSD: patch-extern.h,v 1.1 2011/06/14 13:25:57 wiz Exp $
+
+--- extern.h.orig	1994-09-24 02:55:52.000000000 +0000
++++ extern.h
+@@ -49,3 +49,6 @@ void	 printcol __P((DISPLAY *));
+ void	 printlong __P((DISPLAY *));
+ void	 printscol __P((DISPLAY *));
+ void	 usage __P((void));
++
++void	 parsecolors(char *);
++int	 colortype(mode_t);
-- 
cgit v1.2.3