[pkgsrc/trunk]: pkgsrc/pkgtools/rdigest Make build on Interix, which has a sl...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e0b95d70757d
branches:  trunk
changeset: 487846:e0b95d70757d
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Jan 21 02:18:23 2005 +0000

description:
Make build on Interix, which has a slightly older <sys/queue.h>.

diffstat:

 pkgtools/rdigest/distinfo         |   4 ++--
 pkgtools/rdigest/patches/patch-ac |  16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diffs (71 lines):

diff -r 5f0be893ebdd -r e0b95d70757d pkgtools/rdigest/distinfo
--- a/pkgtools/rdigest/distinfo Fri Jan 21 02:09:10 2005 +0000
+++ b/pkgtools/rdigest/distinfo Fri Jan 21 02:18:23 2005 +0000
@@ -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 -r 5f0be893ebdd -r e0b95d70757d pkgtools/rdigest/patches/patch-ac
--- a/pkgtools/rdigest/patches/patch-ac Fri Jan 21 02:09:10 2005 +0000
+++ b/pkgtools/rdigest/patches/patch-ac Fri Jan 21 02:18:23 2005 +0000
@@ -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 @@
  #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 @@
 +      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 @@
 +{
 +      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 @@
        int     rval;
        int     i;
 +      struct stat st;
++
++      LIST_INIT(&excl);
  
  #ifdef HAVE_SETLOCALE
        (void) setlocale(LC_ALL, "");
@@ -191,7 +197,7 @@
                }
        }
        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++) {