From 56854db66ddc938444ff2dc5eab1cff491c8522e Mon Sep 17 00:00:00 2001
From: tv <tv>
Date: Wed, 13 Oct 2004 18:50:13 +0000
Subject: Defuzz patches by regenerating with pkgdiff.

---
 misc/colorls/distinfo         |  6 +++---
 misc/colorls/patches/patch-aa |  9 ++++-----
 misc/colorls/patches/patch-ab | 17 ++++++-----------
 3 files changed, 13 insertions(+), 19 deletions(-)

(limited to 'misc/colorls')

diff --git a/misc/colorls/distinfo b/misc/colorls/distinfo
index aa26eb238fa..e6877aa1122 100644
--- a/misc/colorls/distinfo
+++ b/misc/colorls/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:09 agc Exp $
+$NetBSD: distinfo,v 1.3 2004/10/13 18:50:13 tv Exp $
 
 SHA1 (ls.tar.gz) = f0d069e71faade167feaf14c4e6327bcc14d6616
 Size (ls.tar.gz) = 11768 bytes
-SHA1 (patch-aa) = 74f7f7a7bda98c24b375a6e76628550b661a36d7
-SHA1 (patch-ab) = 80310a1b7274c5a8899dd68efbc2b0ed492bcc90
+SHA1 (patch-aa) = 831f286605126a136b540b4456916db8cc8ff7e4
+SHA1 (patch-ab) = 8f26c3e16bb85371bbb16c5f77a667b3a456af68
 SHA1 (patch-ac) = 89f775c18318c4ca8a7dbebc2daba7c52ae0878f
 SHA1 (patch-ad) = d502e96261a950c5307794f01422147430c76aba
 SHA1 (patch-ae) = 9b15ef9f8ab3e77b34a0f7ee401fbe8dcae4a854
diff --git a/misc/colorls/patches/patch-aa b/misc/colorls/patches/patch-aa
index d974d843b79..abb636a0f48 100644
--- a/misc/colorls/patches/patch-aa
+++ b/misc/colorls/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2000/02/05 20:05:24 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2004/10/13 18:50:13 tv Exp $
 
---- Makefile.orig	Sat Nov 27 23:51:20 1999
-+++ Makefile	Sat Nov 27 23:51:22 1999
-@@ -3,5 +3,8 @@
+--- Makefile.orig	Fri Sep 23 22:55:51 1994
++++ Makefile
+@@ -3,4 +3,7 @@
  
 -PROG=	ls
 +PROG=	colorls
@@ -11,4 +11,3 @@ $NetBSD: patch-aa,v 1.6 2000/02/05 20:05:24 wiz Exp $
 +MANDIR= ${PREFIX}/man
 +MANINSTALL= catinstall maninstall
  
- .include <bsd.prog.mk>
diff --git a/misc/colorls/patches/patch-ab b/misc/colorls/patches/patch-ab
index 95c537b49f5..b2c4640bc22 100644
--- a/misc/colorls/patches/patch-ab
+++ b/misc/colorls/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2000/02/05 20:05:24 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2004/10/13 18:50:13 tv Exp $
 
---- colorls.1.orig	Sat Nov 27 23:53:51 1999
-+++ colorls.1	Sat Nov 27 23:53:52 1999
-@@ -35,15 +35,23 @@
+--- colorls.1.orig	Wed Oct 13 14:49:05 2004
++++ colorls.1
+@@ -37,14 +37,22 @@
  .\"
  .Dd July 29, 1994
 -.Dt LS 1
@@ -30,9 +30,7 @@ $NetBSD: patch-ab,v 1.6 2000/02/05 20:05:24 wiz Exp $
 +.Pp
  For each operand that names a
  .Ar file
- of a type other than
-@@ -87,6 +95,12 @@
- a percent sign (%) after each whiteout,
+@@ -88,4 +96,10 @@ a percent sign (%) after each whiteout,
  and a vertical bar (|) after each that is a
  .Tn FIFO .
 +.It Fl G
@@ -43,9 +41,7 @@ $NetBSD: patch-ab,v 1.6 2000/02/05 20:05:24 wiz Exp $
 +some extra attributes (setuid bit set, etc.) are also displayed.
  .It Fl L
  If argument is a symbolic link, list the file or directory the link references
- rather than the link itself.
-@@ -318,6 +332,74 @@
- See
+@@ -319,4 +333,72 @@ See
  .Xr environ 7
  for more information.
 +.It LSCOLORS
@@ -118,4 +114,3 @@ $NetBSD: patch-ab,v 1.6 2000/02/05 20:05:24 wiz Exp $
 +background for setuid executables, etc.
  .El
  .Sh COMPATIBILITY
- The group field is now automatically included in the long listing for
-- 
cgit v1.2.3