diff --git a/sysutils/colorls/Makefile b/sysutils/colorls/Makefile index 923abbc9261..2e79fcb40a3 100644 --- a/sysutils/colorls/Makefile +++ b/sysutils/colorls/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.10 2005/09/05 11:55:47 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2006/05/27 04:35:21 naddy Exp $ COMMENT= "ls that can use color to display file attributes" -DISTNAME= ls-3.7.1 -PKGNAME= color${DISTNAME}p0 +DISTNAME= ls-3.9 +PKGNAME= color${DISTNAME} CATEGORIES= sysutils MAINTAINER= Christian Weisgerber diff --git a/sysutils/colorls/distinfo b/sysutils/colorls/distinfo index 104db8b661a..d211026a166 100644 --- a/sysutils/colorls/distinfo +++ b/sysutils/colorls/distinfo @@ -1,4 +1,4 @@ -MD5 (ls-3.7.1.tar.gz) = d104eb4404fa6aa774785e17e95a62c1 -RMD160 (ls-3.7.1.tar.gz) = ab7b3fa8d95d7523eb40adfb7166c28b04ca9305 -SHA1 (ls-3.7.1.tar.gz) = 3a8efb24ad5256c020eb90806903ddd7b7a4e1ed -SIZE (ls-3.7.1.tar.gz) = 12319 +MD5 (ls-3.9.tar.gz) = 75ec60db2c741953f3df580180a0c5e0 +RMD160 (ls-3.9.tar.gz) = 37fb21562ac724340f6df7e9465d3b643a73de66 +SHA1 (ls-3.9.tar.gz) = c5e14f8cd275b1499a47cbe5a4df70d1c3fefdfb +SIZE (ls-3.9.tar.gz) = 12685 diff --git a/sysutils/colorls/patches/patch-colorls_1 b/sysutils/colorls/patches/patch-colorls_1 index a420ae7526d..f0467483e48 100644 --- a/sysutils/colorls/patches/patch-colorls_1 +++ b/sysutils/colorls/patches/patch-colorls_1 @@ -1,6 +1,6 @@ -$OpenBSD: patch-colorls_1,v 1.7 2005/09/05 11:55:47 espie Exp $ ---- colorls.1.orig Mon Sep 5 13:49:27 2005 -+++ colorls.1 Mon Sep 5 13:50:47 2005 +$OpenBSD: patch-colorls_1,v 1.8 2006/05/27 04:35:21 naddy Exp $ +--- colorls.1.orig Sat May 27 06:10:29 2006 ++++ colorls.1 Sat May 27 06:30:47 2006 @@ -34,14 +34,14 @@ .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 .\" @@ -189,7 +189,7 @@ $OpenBSD: patch-colorls_1,v 1.7 2005/09/05 11:55:47 espie Exp $ +.Ev CLICOLOR +functionality depends on a terminal type with color capabilities. .It Ev TZ - The timezone to use when displaying dates. + The time zone to use when displaying dates. See @@ -425,24 +562,25 @@ for more information. .Sh EXAMPLES @@ -220,3 +220,11 @@ $OpenBSD: patch-colorls_1,v 1.7 2005/09/05 11:55:47 espie Exp $ .Xr symlink 7 , .Xr sticky 8 .Sh STANDARDS +@@ -458,6 +596,6 @@ utility is expected to be a superset of + specification. + .Sh HISTORY + An +-.Nm ++.Nm ls + utility appeared in + .At v3 . diff --git a/sysutils/colorls/patches/patch-ls_c b/sysutils/colorls/patches/patch-ls_c index 1ab40e964ec..01319d6865f 100644 --- a/sysutils/colorls/patches/patch-ls_c +++ b/sysutils/colorls/patches/patch-ls_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-ls_c,v 1.7 2005/06/21 18:26:21 naddy Exp $ ---- ls.c.orig Tue Jun 21 20:05:48 2005 -+++ ls.c Tue Jun 21 20:16:37 2005 +$OpenBSD: patch-ls_c,v 1.8 2006/05/27 04:35:21 naddy Exp $ +--- ls.c.orig Sat May 27 04:58:46 2006 ++++ ls.c Sat May 27 05:55:02 2006 @@ -62,6 +62,10 @@ static char rcsid[] = "$OpenBSD: ls.c,v #include #include @@ -12,8 +12,8 @@ $OpenBSD: patch-ls_c,v 1.7 2005/06/21 18:26:21 naddy Exp $ #include "ls.h" #include "extern.h" -@@ -105,6 +109,15 @@ int f_stream; /* stream format */ - int f_dirname; /* if precede with directory name */ +@@ -103,6 +107,15 @@ int f_statustime; /* use time of last m + int f_stream; /* stream format */ int f_type; /* add type character for non-regular files */ int f_typedir; /* add type character for directories */ +#ifdef COLORLS @@ -28,7 +28,7 @@ $OpenBSD: patch-ls_c,v 1.7 2005/06/21 18:26:21 naddy Exp $ int rval; -@@ -116,6 +129,11 @@ ls_main(int argc, char *argv[]) +@@ -114,6 +127,11 @@ ls_main(int argc, char *argv[]) int ch, fts_options, notused; int kflag = 0; char *p; @@ -40,7 +40,7 @@ $OpenBSD: patch-ls_c,v 1.7 2005/06/21 18:26:21 naddy Exp $ /* Terminal defaults to -Cq, non-terminal defaults to -1. */ if (isatty(STDOUT_FILENO)) { -@@ -133,7 +151,7 @@ ls_main(int argc, char *argv[]) +@@ -131,7 +149,7 @@ ls_main(int argc, char *argv[]) f_listdot = 1; fts_options = FTS_PHYSICAL; @@ -49,7 +49,7 @@ $OpenBSD: patch-ls_c,v 1.7 2005/06/21 18:26:21 naddy Exp $ switch (ch) { /* * The -1, -C and -l, -m and -x options all override each -@@ -178,6 +196,9 @@ ls_main(int argc, char *argv[]) +@@ -176,6 +194,9 @@ ls_main(int argc, char *argv[]) case 'F': f_type = 1; break; @@ -59,7 +59,7 @@ $OpenBSD: patch-ls_c,v 1.7 2005/06/21 18:26:21 naddy Exp $ case 'L': fts_options &= ~FTS_PHYSICAL; fts_options |= FTS_LOGICAL; -@@ -242,11 +263,46 @@ ls_main(int argc, char *argv[]) +@@ -240,11 +261,46 @@ ls_main(int argc, char *argv[]) argc -= optind; argv += optind;