diff options
| author | tv <tv> | 2005-01-21 02:18:23 +0000 |
|---|---|---|
| committer | tv <tv> | 2005-01-21 02:18:23 +0000 |
| commit | aa69826e3450903f438549716e52d528825fbd8b (patch) | |
| tree | 959a193ee808dda82e51cecbc27ed93c798e9ab9 /pkgtools | |
| parent | 61a09ed2a03114c1f1a68d8274e0f7c2f70bad5a (diff) | |
| download | pkgsrc-aa69826e3450903f438549716e52d528825fbd8b.tar.gz | |
Make build on Interix, which has a slightly older <sys/queue.h>.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/rdigest/distinfo | 4 | ||||
| -rw-r--r-- | pkgtools/rdigest/patches/patch-ac | 16 |
2 files changed, 13 insertions, 7 deletions
diff --git a/pkgtools/rdigest/distinfo b/pkgtools/rdigest/distinfo index dfb2312e8aa..dd02985e6e2 100644 --- a/pkgtools/rdigest/distinfo +++ b/pkgtools/rdigest/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/07/24 05:21:05 atatat Exp $ +$NetBSD: distinfo,v 1.2 2005/01/21 02:18:23 tv Exp $ SHA1 (patch-aa) = a1ed803a43925ef4c82e2c468bd2ee922b1998b6 SHA1 (patch-ab) = b34e588443c030e0111edaff19ccf0882bf74a13 -SHA1 (patch-ac) = b67e1db9ec7bce6a1b1e3a398251584f9194a1c7 +SHA1 (patch-ac) = 787eb9b87e79b5110ae13594a4171bfe08ba2660 diff --git a/pkgtools/rdigest/patches/patch-ac b/pkgtools/rdigest/patches/patch-ac index a3bf6e32e2f..bf6ee0d604a 100644 --- a/pkgtools/rdigest/patches/patch-ac +++ b/pkgtools/rdigest/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.1.1.1 2003/07/24 05:21:07 atatat Exp $ +$NetBSD: patch-ac,v 1.2 2005/01/21 02:18:23 tv Exp $ ---- digest.c.orig 2003-07-23 20:27:09.000000000 -0400 +--- digest.c.orig 2005-01-20 21:10:03.000000000 -0500 +++ digest.c @@ -43,9 +43,14 @@ __RCSID("$NetBSD: digest.c,v 1.8 2003/07 #endif @@ -17,7 +17,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/07/24 05:21:07 atatat Exp $ #ifdef HAVE_LOCALE_H #include <locale.h> #endif -@@ -147,21 +152,172 @@ digest_file(char *fn, alg_t *alg) +@@ -147,21 +152,178 @@ digest_file(char *fn, alg_t *alg) return (rc); } @@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/07/24 05:21:07 atatat Exp $ + const char *p; +}; + -+LIST_HEAD(, excl) excl = LIST_HEAD_INITIALIZER(excl); ++LIST_HEAD(, excl) excl; + +static void +exclude(const char *p) @@ -43,7 +43,11 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/07/24 05:21:07 atatat Exp $ +{ + struct excl *e; + ++#ifdef LIST_FOREACH + LIST_FOREACH(e, &excl, n) ++#else ++ for (e = excl.lh_first; e; e = e->n.le_next) ++#endif + if (strcmp(e->p, p) == 0) + return (1); + @@ -175,6 +179,8 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/07/24 05:21:07 atatat Exp $ int rval; int i; + struct stat st; ++ ++ LIST_INIT(&excl); #ifdef HAVE_SETLOCALE (void) setlocale(LC_ALL, ""); @@ -191,7 +197,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/07/24 05:21:07 atatat Exp $ } } argc -= optind; -@@ -186,7 +342,9 @@ main(int argc, char **argv) +@@ -186,7 +348,9 @@ main(int argc, char **argv) } } else { for (i = 0 ; i < argc ; i++) { |