diff options
| author | joerg <joerg@pkgsrc.org> | 2008-09-18 10:38:45 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-09-18 10:38:45 +0000 |
| commit | c3e2e192a4b7114bf15624f2d3da38660d7b338c (patch) | |
| tree | 92c0076f78233fec5ea1b5ec22cfbf0d9f73ecee | |
| parent | 63f4b6ab4351be88b4921a919597ce38d3ed85da (diff) | |
| download | pkgsrc-c3e2e192a4b7114bf15624f2d3da38660d7b338c.tar.gz | |
Fix build on Solaris by using nbcompat.
| -rw-r--r-- | pkgtools/rdigest/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/rdigest/distinfo | 4 | ||||
| -rw-r--r-- | pkgtools/rdigest/patches/patch-ac | 28 |
3 files changed, 18 insertions, 18 deletions
diff --git a/pkgtools/rdigest/Makefile b/pkgtools/rdigest/Makefile index f0947daa012..b1b249862fc 100644 --- a/pkgtools/rdigest/Makefile +++ b/pkgtools/rdigest/Makefile @@ -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 @@ COMMENT= Recursive message digest wrapper utility DIGESTDIR= ${.CURDIR}/../../pkgtools/digest FILESDIR= ${DIGESTDIR}/files +USE_FEATURES= nbcompat + .include "${DIGESTDIR}/Makefile" diff --git a/pkgtools/rdigest/distinfo b/pkgtools/rdigest/distinfo index 080a30d7160..0064be4a82c 100644 --- a/pkgtools/rdigest/distinfo +++ b/pkgtools/rdigest/distinfo @@ -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 --git a/pkgtools/rdigest/patches/patch-ac b/pkgtools/rdigest/patches/patch-ac index 3e1df949289..237933c88ce 100644 --- a/pkgtools/rdigest/patches/patch-ac +++ b/pkgtools/rdigest/patches/patch-ac @@ -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 @@ $NetBSD: patch-ac,v 1.3 2005/12/02 16:30:07 rillig Exp $ + 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 @@ $NetBSD: patch-ac,v 1.3 2005/12/02 16:30:07 rillig Exp $ + 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 @@ $NetBSD: patch-ac,v 1.3 2005/12/02 16:30:07 rillig Exp $ + (S_ISDIR(st.st_mode) && !digest_directory(argv[i], alg))) { (void) fprintf(stderr, "%s\n", argv[i]); rval = EXIT_FAILURE; - } |