cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync with 3.9

Browse Source
This commit is contained in:
naddy 2006-05-27 04:35:21 +00:00
parent dbd3e01ddf
commit 94a8237701
4 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysutils/colorls/Makefile
View File

@ -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" COMMENT= "ls that can use color to display file attributes"
DISTNAME= ls-3.7.1 DISTNAME= ls-3.9
PKGNAME= color${DISTNAME}p0 PKGNAME= color${DISTNAME}
CATEGORIES= sysutils CATEGORIES= sysutils
MAINTAINER= Christian Weisgerber <naddy@openbsd.org> MAINTAINER= Christian Weisgerber <naddy@openbsd.org>

8
sysutils/colorls/distinfo
View File

@ -1,4 +1,4 @@
MD5 (ls-3.7.1.tar.gz) = d104eb4404fa6aa774785e17e95a62c1 MD5 (ls-3.9.tar.gz) = 75ec60db2c741953f3df580180a0c5e0
RMD160 (ls-3.7.1.tar.gz) = ab7b3fa8d95d7523eb40adfb7166c28b04ca9305 RMD160 (ls-3.9.tar.gz) = 37fb21562ac724340f6df7e9465d3b643a73de66
SHA1 (ls-3.7.1.tar.gz) = 3a8efb24ad5256c020eb90806903ddd7b7a4e1ed SHA1 (ls-3.9.tar.gz) = c5e14f8cd275b1499a47cbe5a4df70d1c3fefdfb
SIZE (ls-3.7.1.tar.gz) = 12319 SIZE (ls-3.9.tar.gz) = 12685

16
sysutils/colorls/patches/patch-colorls_1
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-colorls_1,v 1.7 2005/09/05 11:55:47 espie Exp $ $OpenBSD: patch-colorls_1,v 1.8 2006/05/27 04:35:21 naddy Exp $
--- colorls.1.orig Mon Sep 5 13:49:27 2005 --- colorls.1.orig Sat May 27 06:10:29 2006
+++ colorls.1 Mon Sep 5 13:50:47 2005 +++ colorls.1 Sat May 27 06:30:47 2006
@@ -34,14 +34,14 @@ @@ -34,14 +34,14 @@
.\" @(#)ls.1 8.7 (Berkeley) 7/29/94 .\" @(#)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 +.Ev CLICOLOR
+functionality depends on a terminal type with color capabilities. +functionality depends on a terminal type with color capabilities.
.It Ev TZ .It Ev TZ
The timezone to use when displaying dates. The time zone to use when displaying dates.
See See
@@ -425,24 +562,25 @@ for more information. @@ -425,24 +562,25 @@ for more information.
.Sh EXAMPLES .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 symlink 7 ,
.Xr sticky 8 .Xr sticky 8
.Sh STANDARDS .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 .

18
sysutils/colorls/patches/patch-ls_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ls_c,v 1.7 2005/06/21 18:26:21 naddy Exp $ $OpenBSD: patch-ls_c,v 1.8 2006/05/27 04:35:21 naddy Exp $
--- ls.c.orig Tue Jun 21 20:05:48 2005 --- ls.c.orig Sat May 27 04:58:46 2006
+++ ls.c Tue Jun 21 20:16:37 2005 +++ ls.c Sat May 27 05:55:02 2006
@@ -62,6 +62,10 @@ static char rcsid[] = "$OpenBSD: ls.c,v @@ -62,6 +62,10 @@ static char rcsid[] = "$OpenBSD: ls.c,v
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
@ -12,8 +12,8 @@ $OpenBSD: patch-ls_c,v 1.7 2005/06/21 18:26:21 naddy Exp $
#include "ls.h" #include "ls.h"
#include "extern.h" #include "extern.h"
@@ -105,6 +109,15 @@ int f_stream; /* stream format */ @@ -103,6 +107,15 @@ int f_statustime; /* use time of last m
int f_dirname; /* if precede with directory name */ int f_stream; /* stream format */
int f_type; /* add type character for non-regular files */ int f_type; /* add type character for non-regular files */
int f_typedir; /* add type character for directories */ int f_typedir; /* add type character for directories */
+#ifdef COLORLS +#ifdef COLORLS
@ -28,7 +28,7 @@ $OpenBSD: patch-ls_c,v 1.7 2005/06/21 18:26:21 naddy Exp $
int rval; 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 ch, fts_options, notused;
int kflag = 0; int kflag = 0;
char *p; 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. */ /* Terminal defaults to -Cq, non-terminal defaults to -1. */
if (isatty(STDOUT_FILENO)) { 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; f_listdot = 1;
fts_options = FTS_PHYSICAL; 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) { switch (ch) {
/* /*
* The -1, -C and -l, -m and -x options all override each * 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': case 'F':
f_type = 1; f_type = 1;
break; break;
@ -59,7 +59,7 @@ $OpenBSD: patch-ls_c,v 1.7 2005/06/21 18:26:21 naddy Exp $
case 'L': case 'L':
fts_options &= ~FTS_PHYSICAL; fts_options &= ~FTS_PHYSICAL;
fts_options |= FTS_LOGICAL; 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; argc -= optind;
argv += optind; argv += optind;