diff options
| author | asami <asami@FreeBSD.org> | 1997-10-16 14:26:17 +0800 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1997-10-16 14:26:17 +0800 |
| commit | e45d9d5fb9212db245ce24fdd668f2f18097a0a8 (patch) | |
| tree | 4061fff63bae21ab7cb54be20dd0d7e9b4265455 /misc | |
| parent | 730d71bcd59540bda9cf5ece8c81169c6bfd0d7a (diff) | |
| download | freebsd-ports-gnome-e45d9d5fb9212db245ce24fdd668f2f18097a0a8.tar.gz freebsd-ports-gnome-e45d9d5fb9212db245ce24fdd668f2f18097a0a8.tar.zst freebsd-ports-gnome-e45d9d5fb9212db245ce24fdd668f2f18097a0a8.zip | |
Update to version 2.2.5. Basically just packed up today's 2.2-stable
to make a new distfile and adjusted diffs.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/colorls/Makefile | 8 | ||||
| -rw-r--r-- | misc/colorls/distinfo | 2 | ||||
| -rw-r--r-- | misc/colorls/files/patch-aa | 42 |
3 files changed, 24 insertions, 28 deletions
diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile index f0f61402fe6e..103c017c535f 100644 --- a/misc/colorls/Makefile +++ b/misc/colorls/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: colorls -# Version required: FreeBSD-current (around January '97) +# Version required: FreeBSD-2.2-stable (around October '97) # Date created: 8 March 1995 # Whom: Satoshi Asami # -# $Id: Makefile,v 1.12 1997/01/02 06:29:44 asami Exp $ +# $Id: Makefile,v 1.13 1997/04/30 03:18:06 asami Exp $ # DISTNAME= colorls -PKGNAME= colorls-2.2 +PKGNAME= colorls-2.2.5 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_LOCAL} -DISTFILES= ls.tar.gz +DISTFILES= ls-2.2.5.tar.gz MAINTAINER= asami@FreeBSD.ORG diff --git a/misc/colorls/distinfo b/misc/colorls/distinfo index 1a8753ed0cf1..403092e6eacf 100644 --- a/misc/colorls/distinfo +++ b/misc/colorls/distinfo @@ -1 +1 @@ -MD5 (ls.tar.gz) = 9912034525558b016c7700d939807e76 +MD5 (ls-2.2.5.tar.gz) = 38963684cb0d01faf2eec6defa3b410d diff --git a/misc/colorls/files/patch-aa b/misc/colorls/files/patch-aa index 75053363cfdb..cf1e0db90c1c 100644 --- a/misc/colorls/files/patch-aa +++ b/misc/colorls/files/patch-aa @@ -1,26 +1,23 @@ --- ./ls.c.org Wed Mar 8 02:14:11 1995 +++ ./ls.c Wed Mar 8 02:17:10 1995 -@@ -93,6 +93,7 @@ +@@ -94,6 +94,7 @@ int f_dirname; /* if precede with directory name */ int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ +int f_color; /* add type in color for non-regular files */ - #ifndef BSD4_4_LITE - int f_whiteout; /* show whiteout entries */ - #endif -@@ -135,9 +136,9 @@ + + int rval; + +@@ -131,7 +132,7 @@ + f_listdot = 1; fts_options = FTS_PHYSICAL; - #ifdef BSD4_4_LITE - while ((ch = getopt(argc, argv, "1ACFLRTacdfgikloqrstu")) != EOF) { + while ((ch = getopt(argc, argv, "1ACFGLRTacdfgikloqrstu")) != EOF) { - #else -- while ((ch = getopt(argc, argv, "1ACFLRTWacdfgikloqrstu")) != EOF) { -+ while ((ch = getopt(argc, argv, "1ACFGLRTWacdfgikloqrstu")) != EOF) { - #endif switch (ch) { /* -@@ -152,6 +153,9 @@ + * The -1, -C and -l options all override each other so shell +@@ -161,6 +162,9 @@ case 'F': f_type = 1; break; @@ -30,7 +27,7 @@ case 'L': fts_options &= ~FTS_PHYSICAL; fts_options |= FTS_LOGICAL; -@@ -207,18 +211,21 @@ +@@ -216,18 +220,21 @@ argc -= optind; argv += optind; @@ -53,7 +50,7 @@ + if (!f_longform && !f_listdir && !f_type && !f_color) fts_options |= FTS_COMFOLLOW; - #ifndef BSD4_4_LITE + /* If -l or -s, figure out block size. */ --- ./ls.h.org Wed Mar 8 02:14:11 1995 +++ ./ls.h Wed Mar 8 02:17:11 1995 @@ -49,6 +49,7 @@ @@ -262,22 +259,21 @@ --- ./colorls.1.org Wed Mar 8 02:14:10 1995 +++ ./colorls.1 Wed Mar 8 02:17:10 1995 @@ -36,16 +36,24 @@ - .\" ls.1,v 1.3 1994/09/24 02:55:53 davidg Exp + .\" $Id: ls.1,v 1.5.2.4 1997/09/19 06:18:11 charnier Exp $ .\" - .Dd July 29, 1994 + .Dd April 18, 1994 -.Dt LS 1 +.Dt COLORLS 1 .Os .Sh NAME --.Nm ls + .Nm ls -.Nd list directory contents -+.Nm colorls +.Nd list directory contents in color .Sh SYNOPSIS -.Nm ls --.Op Fl ACFLRTWacdfiloqrstu1 +-.Op Fl ACFLRTacdfgikloqrstu1 +.Nm colorls -+.Op Fl ACFGLRTWacdfiloqrstu1 ++.Op Fl ACFGLRTacdfgikloqrstu1 .Op Ar file ... .Sh DESCRIPTION +(Note: This man page describes the color version of the program. To @@ -291,10 +287,10 @@ For each operand that names a .Ar file of a type other than -@@ -87,6 +95,12 @@ - a percent sign (%) after each whiteout, +@@ -86,6 +94,12 @@ + an equals sign (=) after each socket, and a vertical bar (|) after each that is a - .Tn FIFO . + .Tn FIFO . +.It Fl G +Use ANSI color sequences to distinguish file types. (See +.Ev LSCOLORS @@ -304,7 +300,7 @@ .It Fl L If argument is a symbolic link, list the file or directory the link references rather than the link itself. -@@ -314,6 +328,74 @@ +@@ -322,6 +336,74 @@ See .Xr environ 7 for more information. |