diff --git a/sysutils/colorls/Makefile b/sysutils/colorls/Makefile index 73b79e50909..d1bd2b68a89 100644 --- a/sysutils/colorls/Makefile +++ b/sysutils/colorls/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.22 2011/09/22 08:28:56 stsp Exp $ +# $OpenBSD: Makefile,v 1.23 2011/11/12 12:31:21 naddy Exp $ COMMENT= ls that can use color to display file attributes -DISTNAME= ls-4.8 +DISTNAME= ls-5.0 PKGNAME= color${DISTNAME} -REVISION= 1 CATEGORIES= sysutils MAINTAINER= Christian Weisgerber diff --git a/sysutils/colorls/distinfo b/sysutils/colorls/distinfo index 241f737a6fe..09bd21eeff0 100644 --- a/sysutils/colorls/distinfo +++ b/sysutils/colorls/distinfo @@ -1,5 +1,5 @@ -MD5 (ls-4.8.tar.gz) = GBSgS0HDfJIO/Dwm5bUsSA== -RMD160 (ls-4.8.tar.gz) = 7KmHKkE154XAPyggqqGtkx/+M5o= -SHA1 (ls-4.8.tar.gz) = GytYnqmekbs40dqTLk1TcZVNm6Y= -SHA256 (ls-4.8.tar.gz) = zS5FHrG4UOJaZgS5S5ngQnifV3LltX308+DD3r8H2Kw= -SIZE (ls-4.8.tar.gz) = 12505 +MD5 (ls-5.0.tar.gz) = 89LT2v4rhwEIERUHKMQUFg== +RMD160 (ls-5.0.tar.gz) = gRwVuWR3z48E4JRX1kxj7RK15tE= +SHA1 (ls-5.0.tar.gz) = 6TbweR4JUl7akwLYK/0V/bcpdA0= +SHA256 (ls-5.0.tar.gz) = gSeFBwONdvlHEe4XHah4rYY32m0obfMIQ0cDz7fJbZc= +SIZE (ls-5.0.tar.gz) = 12603 diff --git a/sysutils/colorls/patches/patch-colorls_1 b/sysutils/colorls/patches/patch-colorls_1 index 2144f8fc1c0..dd3fc69417b 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.12 2009/10/29 20:10:39 naddy Exp $ ---- colorls.1.orig Thu Oct 29 20:53:23 2009 -+++ colorls.1 Thu Oct 29 21:04:05 2009 +$OpenBSD: patch-colorls_1,v 1.13 2011/11/12 12:31:21 naddy Exp $ +--- colorls.1.orig Sat Nov 12 13:14:57 2011 ++++ colorls.1 Sat Nov 12 13:16:21 2011 @@ -37,11 +37,11 @@ .Dt COLORLS 1 .Os @@ -10,9 +10,9 @@ $OpenBSD: patch-colorls_1,v 1.12 2009/10/29 20:10:39 naddy Exp $ .Nd list directory contents .Sh SYNOPSIS -.Nm ls --.Op Fl 1AaCcdFfghikLlmnopqRrSsTtux +-.Op Fl 1AaCcdFfgHhikLlmnopqRrSsTtux +.Nm -+.Op Fl 1AaCcdFfGghikLlmnopqRrSsTtux ++.Op Fl 1AaCcdFfGgHhikLlmnopqRrSsTtux .Op Ar .Sh DESCRIPTION For each operand that names a @@ -29,16 +29,16 @@ $OpenBSD: patch-colorls_1,v 1.12 2009/10/29 20:10:39 naddy Exp $ .It Fl g List in long format as in .Fl l , -@@ -418,7 +424,7 @@ user immutable - .Pp - .Ex -std ls +@@ -423,7 +429,7 @@ user append-only + user immutable + .El .Sh ENVIRONMENT -.Bl -tag -width BLOCKSIZE +.Bl -tag -width CLICOLOR_FORCE .It Ev BLOCKSIZE If the environment variable .Ev BLOCKSIZE -@@ -428,11 +434,138 @@ option is not specified, the block counts +@@ -433,11 +439,138 @@ option is not specified, the block counts (see .Fl s ) will be displayed in units of that size block. @@ -177,7 +177,7 @@ $OpenBSD: patch-colorls_1,v 1.12 2009/10/29 20:10:39 naddy Exp $ .It Ev TZ The time zone to use when displaying dates. See -@@ -442,24 +575,25 @@ for more information. +@@ -449,24 +582,25 @@ for more information. .Sh EXAMPLES List the contents of the current working directory in long format: .Pp @@ -206,7 +206,7 @@ $OpenBSD: patch-colorls_1,v 1.12 2009/10/29 20:10:39 naddy Exp $ .Xr symlink 7 , .Xr sticky 8 .Sh STANDARDS -@@ -470,7 +604,7 @@ utility is compliant with the +@@ -477,7 +611,7 @@ utility is compliant with the specification. .Pp The flags @@ -215,7 +215,7 @@ $OpenBSD: patch-colorls_1,v 1.12 2009/10/29 20:10:39 naddy Exp $ are extensions to that specification. .Pp Historically, the -@@ -491,6 +625,6 @@ flags differs between this implementation and +@@ -498,6 +632,6 @@ flags differs between this implementation and .St -p1003.1-2008 . .Sh HISTORY An diff --git a/sysutils/colorls/patches/patch-ls_c b/sysutils/colorls/patches/patch-ls_c index 399846f197a..284e02f494c 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.12 2011/09/22 08:28:56 stsp Exp $ ---- ls.c.orig Tue Oct 19 16:28:14 2010 -+++ ls.c Thu Sep 22 09:41:24 2011 +$OpenBSD: patch-ls_c,v 1.13 2011/11/12 12:31:21 naddy Exp $ +--- ls.c.orig Fri Mar 4 22:03:19 2011 ++++ ls.c Sat Nov 12 13:17:42 2011 @@ -42,12 +42,17 @@ #include #include @@ -54,8 +54,8 @@ $OpenBSD: patch-ls_c,v 1.12 2011/09/22 08:28:56 stsp Exp $ f_listdot = 1; fts_options = FTS_PHYSICAL; -- while ((ch = getopt(argc, argv, "1ACFLRSTacdfghiklmnopqrstux")) != -1) { -+ while ((ch = getopt(argc, argv, "1ACFGLRSTacdfghiklmnopqrstux")) != -1) { +- while ((ch = getopt(argc, argv, "1ACFHLRSTacdfghiklmnopqrstux")) != -1) { ++ while ((ch = getopt(argc, argv, "1ACFGHLRSTacdfghiklmnopqrstux")) != -1) { switch (ch) { /* * The -1, -C and -l, -m, -n and -x options all override each @@ -66,10 +66,10 @@ $OpenBSD: patch-ls_c,v 1.12 2011/09/22 08:28:56 stsp Exp $ + case 'G': + setenv("CLICOLOR", "", 1); + break; - case 'L': - fts_options &= ~FTS_PHYSICAL; - fts_options |= FTS_LOGICAL; -@@ -245,11 +269,46 @@ ls_main(int argc, char *argv[]) + case 'H': + fts_options |= FTS_COMFOLLOW; + break; +@@ -248,11 +272,46 @@ ls_main(int argc, char *argv[]) if (f_grouponly == -1) f_grouponly = 0; diff --git a/sysutils/colorls/patches/patch-util_c b/sysutils/colorls/patches/patch-util_c index 2d040d6ab43..1734eb6299c 100644 --- a/sysutils/colorls/patches/patch-util_c +++ b/sysutils/colorls/patches/patch-util_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-util_c,v 1.7 2011/09/22 08:28:56 stsp Exp $ ---- util.c.orig Wed Oct 28 00:59:21 2009 -+++ util.c Thu Sep 22 09:53:40 2011 +$OpenBSD: patch-util_c,v 1.8 2011/11/12 12:31:21 naddy Exp $ +--- util.c.orig Sat Nov 12 13:20:00 2011 ++++ util.c Sat Nov 12 13:19:25 2011 @@ -41,10 +41,12 @@ #include #include @@ -65,9 +65,9 @@ $OpenBSD: patch-util_c,v 1.7 2011/09/22 08:28:56 stsp Exp $ { (void)fprintf(stderr, +#ifdef COLORLS -+ "usage: %s [-1AaCcdFfGghikLlmnopqRrSsTtux] [file ...]\n", ++ "usage: %s [-1AaCcdFfGgHhikLlmnopqRrSsTtux] [file ...]\n", +#else - "usage: %s [-1AaCcdFfghikLlmnopqRrSsTtux] [file ...]\n", + "usage: %s [-1AaCcdFfgHhikLlmnopqRrSsTtux] [file ...]\n", +#endif __progname); exit(1);