[pkgsrc/trunk]: pkgsrc/pkgtools/rdigest Fix build on Solaris by using nbcompat.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3d00a4b2c3dd
branches:  trunk
changeset: 547499:3d00a4b2c3dd
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Sep 18 10:38:45 2008 +0000

description:
Fix build on Solaris by using nbcompat.

diffstat:

 pkgtools/rdigest/Makefile         |   4 +++-
 pkgtools/rdigest/distinfo         |   4 ++--
 pkgtools/rdigest/patches/patch-ac |  28 +++++++++++++---------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diffs (92 lines):

diff -r 3a2f0bcef57d -r 3d00a4b2c3dd pkgtools/rdigest/Makefile
--- a/pkgtools/rdigest/Makefile Thu Sep 18 10:21:17 2008 +0000
+++ b/pkgtools/rdigest/Makefile Thu Sep 18 10:38:45 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2008/09/18 10:38:45 joerg Exp $
 
 DISTNAME=      rdigest-${VERSION}
 CATEGORIES=    # be quiet pkglint
@@ -10,4 +10,6 @@
 DIGESTDIR=     ${.CURDIR}/../../pkgtools/digest
 FILESDIR=      ${DIGESTDIR}/files
 
+USE_FEATURES=          nbcompat
+
 .include "${DIGESTDIR}/Makefile"
diff -r 3a2f0bcef57d -r 3d00a4b2c3dd pkgtools/rdigest/distinfo
--- a/pkgtools/rdigest/distinfo Thu Sep 18 10:21:17 2008 +0000
+++ b/pkgtools/rdigest/distinfo Thu Sep 18 10:38:45 2008 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2007/07/09 15:21:03 joerg Exp $
+$NetBSD: distinfo,v 1.7 2008/09/18 10:38:45 joerg Exp $
 
 SHA1 (patch-aa) = abb2e5088629b2b9ddd854d5238d6bcdf5cd9cae
 SHA1 (patch-ab) = 576c6afbde00e64e1fb7c35c1c2f90b8037f2c9a
-SHA1 (patch-ac) = e211afcbf2db8f50870f6b9547704cc8651919bd
+SHA1 (patch-ac) = cfbfc98c76b25b8c88ad022e5099374cbabd9d0e
diff -r 3a2f0bcef57d -r 3d00a4b2c3dd pkgtools/rdigest/patches/patch-ac
--- a/pkgtools/rdigest/patches/patch-ac Thu Sep 18 10:21:17 2008 +0000
+++ b/pkgtools/rdigest/patches/patch-ac Thu Sep 18 10:38:45 2008 +0000
@@ -1,24 +1,26 @@
-$NetBSD: patch-ac,v 1.3 2005/12/02 16:30:07 rillig Exp $
+$NetBSD: patch-ac,v 1.4 2008/09/18 10:38:45 joerg Exp $
 
---- digest.c.orig      2005-01-20 21:10:03.000000000 -0500
+--- digest.c.orig      2008-09-18 12:13:50.000000000 +0200
 +++ digest.c
-@@ -43,9 +43,14 @@
+@@ -41,8 +41,17 @@ __RCSID("$NetBSD: digest.c,v 1.15 2007/0
  #endif
  
++#include <nbcompat.h>
++#include <nbcompat/queue.h>
++#include <nbcompat/stat.h>
  
-+#include <sys/queue.h>
-+#include <sys/stat.h>
-+
  #ifdef HAVE_ERRNO_H
  #include <errno.h>
  #endif
 +#include <fcntl.h>
++#ifdef HAVE_FTS_H
 +#include <fts.h>
++#else
++#include <nbcompat/fts.h>
++#endif
  #ifdef HAVE_LOCALE_H
  #include <locale.h>
- #endif
-@@ -147,21 +152,178 @@ digest_file(char *fn, alg_t *alg)
-       return (rc);
+@@ -158,4 +167,155 @@ digest_file(char *fn, alg_t *alg)
  }
  
 +struct excl {
@@ -174,8 +176,7 @@
 +
  int
  main(int argc, char **argv)
- {
-       alg_t  *alg;
+@@ -164,13 +324,19 @@ main(int argc, char **argv)
        int     rval;
        int     i;
 +      struct stat st;
@@ -196,9 +197,7 @@
 +                      break;
                }
        }
-       argc -= optind;
-@@ -186,7 +348,9 @@ main(int argc, char **argv)
-               }
+@@ -197,5 +363,7 @@ main(int argc, char **argv)
        } else {
                for (i = 0 ; i < argc ; i++) {
 -                      if (!digest_file(argv[i], alg)) {
@@ -207,4 +206,3 @@
 +                          (S_ISDIR(st.st_mode) && !digest_directory(argv[i], alg))) {
                                (void) fprintf(stderr, "%s\n", argv[i]);
                                rval = EXIT_FAILURE;
-                       }