sync with -current ls

2009-02-14 16:39:28 +00:00 · 2009-02-14 16:39:28 +00:00 · cb1e30fc22
commit cb1e30fc22
parent 4921da4669
5 changed files with 41 additions and 32 deletions
--- a/sysutils/colorls/Makefile
+++ b/sysutils/colorls/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.14 2007/08/11 18:41:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.15 2009/02/14 16:39:28 naddy Exp $

 COMMENT=	ls that can use color to display file attributes

-DISTNAME=	ls-4.2
+DISTNAME=	ls-4.5
 PKGNAME=	color${DISTNAME}
 CATEGORIES=	sysutils

@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=	http://sites.inka.de/~mips/unix/distfiles/
+MASTER_SITES=	http://shell.uugrn.org/~naddy/

 WRKDIST=	${WRKDIR}/ls
 NO_REGRESS=	Yes
--- a/sysutils/colorls/distinfo
+++ b/sysutils/colorls/distinfo
@ -1,5 +1,5 @@
-MD5 (ls-4.2.tar.gz) = ZSp4ITsdjfO9Xj3o9lGiWw==
-RMD160 (ls-4.2.tar.gz) = xvT1RJooEc+I5lYfZ4gRwWOQDnQ=
-SHA1 (ls-4.2.tar.gz) = pPW/mMynEwmYQy3FSyci6P7tpc8=
-SHA256 (ls-4.2.tar.gz) = YU6mDT67wvLkysNmxjHNxNNERAgprNWkpQnA8emMQUw=
-SIZE (ls-4.2.tar.gz) = 12635
+MD5 (ls-4.5.tar.gz) = MbUZOQgtpBov/h50a5/LjA==
+RMD160 (ls-4.5.tar.gz) = mQGhYnKeMhAE1wlhiqvTTX+zvhc=
+SHA1 (ls-4.5.tar.gz) = w5mY4cPmZtDhPRT4A8z6VUxdM7U=
+SHA256 (ls-4.5.tar.gz) = SRuilGEa/jBPUyfZ6EJQGl+d9g+1JnRpQfH8i/iOrqY=
+SIZE (ls-4.5.tar.gz) = 12633
--- a/sysutils/colorls/patches/patch-Makefile
+++ b/sysutils/colorls/patches/patch-Makefile
@ -1,8 +1,8 @@
-$OpenBSD: patch-Makefile,v 1.7 2007/08/11 17:52:11 naddy Exp $
--- Makefile.orig	Wed Aug  6 21:09:09 2003
-+++ Makefile	Sat Aug 11 19:28:48 2007
+$OpenBSD: patch-Makefile,v 1.8 2009/02/14 16:39:28 naddy Exp $
+--- Makefile.orig	Sat Feb 14 17:24:38 2009
+++ Makefile	Sat Feb 14 17:28:28 2009
@@ -1,8 +1,13 @@
- #	$OpenBSD: patch-Makefile,v 1.7 2007/08/11 17:52:11 naddy Exp $
+ #	$OpenBSD: patch-Makefile,v 1.8 2009/02/14 16:39:28 naddy Exp $
 
 -PROG=	ls
 +PROG=	colorls
--- a/sysutils/colorls/patches/patch-colorls_1
+++ b/sysutils/colorls/patches/patch-colorls_1
@ -1,6 +1,6 @@
-$OpenBSD: patch-colorls_1,v 1.10 2007/08/11 18:41:28 naddy Exp $
--- colorls.1.orig	Sat Aug 11 20:38:04 2007
-+++ colorls.1	Sat Aug 11 20:37:37 2007
+$OpenBSD: patch-colorls_1,v 1.11 2009/02/14 16:39:28 naddy Exp $
+--- colorls.1.orig	Sat Feb 14 17:29:39 2009
+++ colorls.1	Sat Feb 14 17:33:51 2009
@@ -37,11 +37,11 @@
 .Dt COLORLS 1
 .Os
@ -16,7 +16,7 @@ $OpenBSD: patch-colorls_1,v 1.10 2007/08/11 18:41:28 naddy Exp $
 .Op Ar file ...
 .Sh DESCRIPTION
 For each operand that names a
-@@ -112,6 +112,12 @@ and a vertical bar
+@@ -121,6 +121,12 @@ and a vertical bar
 after each that is a FIFO.
 .It Fl f
 Output is not sorted.
@ -27,18 +27,18 @@ $OpenBSD: patch-colorls_1,v 1.10 2007/08/11 18:41:28 naddy Exp $
 +in the environment.
 +(See below.)
 .It Fl g
- The same as
+ List in long format as in
 .Fl l ,
-@@ -414,7 +420,7 @@ The
- .Nm
- utility exits 0 on success or \*(Gt0 if an error occurred.
+@@ -420,7 +426,7 @@ system immutable
+ .Pp
+ .Ex -std ls
 .Sh ENVIRONMENT
 -.Bl -tag -width BLOCKSIZE
 +.Bl -tag -width CLICOLOR_FORCE
 .It Ev BLOCKSIZE
 If the environment variable
 .Ev BLOCKSIZE
-@@ -424,6 +430,44 @@ option is not specified, the block counts
+@@ -430,6 +436,44 @@ option is not specified, the block counts
 (see
 .Fl s )
 will be displayed in units of that size block.
@ -83,7 +83,7 @@ $OpenBSD: patch-colorls_1,v 1.10 2007/08/11 18:41:28 naddy Exp $
 .It COLUMNS
 If this variable contains a string representing a
 decimal integer, it is used as the
-@@ -436,6 +480,99 @@ many pathname text columns to display
+@@ -442,6 +486,99 @@ many pathname text columns to display
 based on the width provided
 (see
 .Fl C ) .
@ -183,7 +183,7 @@ $OpenBSD: patch-colorls_1,v 1.10 2007/08/11 18:41:28 naddy Exp $
 .It Ev TZ
 The time zone to use when displaying dates.
 See
-@@ -445,24 +582,25 @@ for more information.
+@@ -451,24 +588,25 @@ for more information.
 .Sh EXAMPLES
 List the contents of the current working directory in long format:
 .Pp
@ -212,8 +212,17 @@ $OpenBSD: patch-colorls_1,v 1.10 2007/08/11 18:41:28 naddy Exp $
 .Xr symlink 7 ,
 .Xr sticky 8
 .Sh STANDARDS
-@@ -492,6 +630,6 @@ flag differs between this implementation and
- .St -p1003.1-2004 .
+@@ -479,7 +617,7 @@ utility is compliant with the
+ specification.
+ .Pp
+ The flags
+-.Op Fl hT
+.Op Fl GhT
+ are extensions to that specification.
+ .Pp
+ Historically, the
+@@ -500,6 +638,6 @@ flags differs between this implementation and
+ .St -p1003.1-2008 .
 .Sh HISTORY
 An
 -.Nm
--- a/sysutils/colorls/patches/patch-ls_c
+++ b/sysutils/colorls/patches/patch-ls_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-ls_c,v 1.9 2007/08/11 17:52:11 naddy Exp $
--- ls.c.orig	Mon May  7 20:39:28 2007
-+++ ls.c	Sat Aug 11 19:28:48 2007
-@@ -62,6 +62,10 @@ static char rcsid[] = "$OpenBSD: ls.c,v 1.29 2007/05/0
+$OpenBSD: patch-ls_c,v 1.10 2009/02/14 16:39:28 naddy Exp $
+--- ls.c.orig	Sat Feb 14 17:24:38 2009
+++ ls.c	Sat Feb 14 17:28:28 2009
+@@ -62,6 +62,10 @@ static char rcsid[] = "$OpenBSD: ls.c,v 1.33 2008/12/3
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
@ -48,8 +48,8 @@ $OpenBSD: patch-ls_c,v 1.9 2007/08/11 17:52:11 naddy Exp $
 +	while ((ch = getopt(argc, argv, "1ACFGLRSTacdfghiklmnopqrstux")) != -1) {
 		switch (ch) {
 		/*
- 		 * The -1, -C and -l, -m and -x options all override each
-@@ -185,6 +203,9 @@ ls_main(int argc, char *argv[])
+ 		 * The -1, -C and -l, -m, -n and -x options all override each
+@@ -186,6 +204,9 @@ ls_main(int argc, char *argv[])
 		case 'F':
 			f_type = 1;
 			break;
@ -59,7 +59,7 @@ $OpenBSD: patch-ls_c,v 1.9 2007/08/11 17:52:11 naddy Exp $
 		case 'L':
 			fts_options &= ~FTS_PHYSICAL;
 			fts_options |= FTS_LOGICAL;
-@@ -254,11 +275,46 @@ ls_main(int argc, char *argv[])
+@@ -255,11 +276,46 @@ ls_main(int argc, char *argv[])
 	if (f_grouponly == -1)
 		f_grouponly = 0;