diff options
author | obache <obache@pkgsrc.org> | 2011-01-02 14:46:38 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2011-01-02 14:46:38 +0000 |
commit | 0555cb21b740f1964463666217f8e8e639f64458 (patch) | |
tree | 3b1f80a599bf18ca5ffd0ccf17d99451e5765262 /misc/colorls | |
parent | 81473927a5b095cd4d5978c4d8d520318854a6ca (diff) | |
download | pkgsrc-0555cb21b740f1964463666217f8e8e639f64458.tar.gz |
Fixes build on DragonFly-2.8.2.
Diffstat (limited to 'misc/colorls')
-rw-r--r-- | misc/colorls/distinfo | 4 | ||||
-rw-r--r-- | misc/colorls/patches/patch-ac | 40 |
2 files changed, 33 insertions, 11 deletions
diff --git a/misc/colorls/distinfo b/misc/colorls/distinfo index 00c469aa3fa..c25724df0ab 100644 --- a/misc/colorls/distinfo +++ b/misc/colorls/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 11:02:51 agc Exp $ +$NetBSD: distinfo,v 1.5 2011/01/02 14:46:38 obache Exp $ SHA1 (ls.tar.gz) = f0d069e71faade167feaf14c4e6327bcc14d6616 RMD160 (ls.tar.gz) = 7b607b7ab953ad0dc603c269fa03648cd54ac04f Size (ls.tar.gz) = 11768 bytes SHA1 (patch-aa) = 831f286605126a136b540b4456916db8cc8ff7e4 SHA1 (patch-ab) = 8f26c3e16bb85371bbb16c5f77a667b3a456af68 -SHA1 (patch-ac) = 89f775c18318c4ca8a7dbebc2daba7c52ae0878f +SHA1 (patch-ac) = 201dfa7f1fd9cdf022f7c4f50af9b14fe1e0cccb SHA1 (patch-ad) = d502e96261a950c5307794f01422147430c76aba SHA1 (patch-ae) = 9b15ef9f8ab3e77b34a0f7ee401fbe8dcae4a854 diff --git a/misc/colorls/patches/patch-ac b/misc/colorls/patches/patch-ac index 1d0da07f464..e74cb184759 100644 --- a/misc/colorls/patches/patch-ac +++ b/misc/colorls/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 1998/12/28 22:13:05 marc Exp $ +$NetBSD: patch-ac,v 1.4 2011/01/02 14:46:39 obache Exp $ ---- ls.c.orig Sat Dec 21 18:40:58 1996 -+++ ls.c Mon Dec 28 17:10:04 1998 -@@ -59,6 +59,8 @@ +--- ls.c.orig 1996-12-21 23:40:58.000000000 +0000 ++++ ls.c +@@ -59,12 +59,18 @@ static char const sccsid[] = "@(#)ls.c 8 #include <string.h> #include <unistd.h> #include <locale.h> @@ -11,7 +11,17 @@ $NetBSD: patch-ac,v 1.3 1998/12/28 22:13:05 marc Exp $ #include "ls.h" #include "extern.h" -@@ -94,6 +96,7 @@ + + static void display __P((FTSENT *, FTSENT *)); ++#ifdef __DragonFly__ ++static int mastercmp __P((const FTSENT * const *, const FTSENT * const *)); ++#else + static int mastercmp __P((const FTSENT **, const FTSENT **)); ++#endif + static void traverse __P((int, char **, int)); + + static void (*printfcn) __P((DISPLAY *)); +@@ -94,6 +100,7 @@ int f_statustime; /* use time of last m 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 */ @@ -19,7 +29,7 @@ $NetBSD: patch-ac,v 1.3 1998/12/28 22:13:05 marc Exp $ #ifndef BSD4_4_LITE int f_whiteout; /* show whiteout entries */ #endif -@@ -135,9 +138,9 @@ +@@ -135,9 +142,9 @@ main(argc, argv) fts_options = FTS_PHYSICAL; #ifdef BSD4_4_LITE @@ -31,7 +41,7 @@ $NetBSD: patch-ac,v 1.3 1998/12/28 22:13:05 marc Exp $ #endif switch (ch) { /* -@@ -168,6 +171,10 @@ +@@ -168,6 +175,10 @@ main(argc, argv) case 'F': f_type = 1; break; @@ -42,7 +52,7 @@ $NetBSD: patch-ac,v 1.3 1998/12/28 22:13:05 marc Exp $ case 'L': fts_options &= ~FTS_PHYSICAL; fts_options |= FTS_LOGICAL; -@@ -228,18 +235,21 @@ +@@ -228,18 +239,21 @@ main(argc, argv) argc -= optind; argv += optind; @@ -66,7 +76,7 @@ $NetBSD: patch-ac,v 1.3 1998/12/28 22:13:05 marc Exp $ fts_options |= FTS_COMFOLLOW; #ifndef BSD4_4_LITE -@@ -384,7 +394,8 @@ +@@ -384,7 +398,8 @@ display(p, list) u_long btotal, maxblock, maxinode, maxlen, maxnlink; int bcfile, flen, glen, ulen, maxflags, maxgroup, maxuser; int entries, needstats; @@ -76,3 +86,15 @@ $NetBSD: patch-ac,v 1.3 1998/12/28 22:13:05 marc Exp $ /* * If list is NULL there are two possibilities: that the parent +@@ -521,7 +536,11 @@ display(p, list) + */ + static int + mastercmp(a, b) ++#ifdef __DragonFly__ ++ const FTSENT * const *a, * const *b; ++#else + const FTSENT **a, **b; ++#endif + { + int a_info, b_info; + |