diff options
| author | dholland <dholland@pkgsrc.org> | 2012-06-23 18:49:27 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2012-06-23 18:49:27 +0000 |
| commit | 3d98bc212d51c5bd943ab3c0bcac5641aaa33359 (patch) | |
| tree | 8fc40d3d30179b19eca3b875500092963d815ce9 /databases | |
| parent | 286c1b658a3a48a434cb9561e0f6cbfb5843cd24 (diff) | |
| download | pkgsrc-3d98bc212d51c5bd943ab3c0bcac5641aaa33359.tar.gz | |
Use <fcntl.h> rather than <sys/file.h>, should fix Solaris build.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/sdbm/distinfo | 4 | ||||
| -rw-r--r-- | databases/sdbm/patches/patch-af | 25 |
2 files changed, 16 insertions, 13 deletions
diff --git a/databases/sdbm/distinfo b/databases/sdbm/distinfo index f22eefffba4..0c754ab63e6 100644 --- a/databases/sdbm/distinfo +++ b/databases/sdbm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2012/06/18 02:15:52 dholland Exp $ +$NetBSD: distinfo,v 1.15 2012/06/23 18:49:27 dholland Exp $ SHA1 (sdbm.tar.Z) = ebeb769b308a00853b0119f32dda781829e1d712 RMD160 (sdbm.tar.Z) = 33a48f642ad81bb15a7ce4440dca605e97774afa @@ -8,6 +8,6 @@ SHA1 (patch-ab) = 0d432aa2f4a8b33077aa045386da499b494bcd24 SHA1 (patch-ac) = dccfcb2b7a2f68188bb55bb514021cc091274678 SHA1 (patch-ad) = 7857dbfc168d12985a9fa0b5cefc39ac90bc4fba SHA1 (patch-ae) = 69e4e40277ecae8e6023d72dbbd4a738583f46dd -SHA1 (patch-af) = 2ff85561125381a10e1b2ee0dd18db04192bc738 +SHA1 (patch-af) = fa89bf6c82ed379f83285390641a51bd9bb69c7e SHA1 (patch-ah) = 90dba8033eba363f246fd785e8897724ab7eb718 SHA1 (patch-ai) = 30be3d05db35d02190e8749840921d23c55c24db diff --git a/databases/sdbm/patches/patch-af b/databases/sdbm/patches/patch-af index c48b4e51b9f..93c8f98c395 100644 --- a/databases/sdbm/patches/patch-af +++ b/databases/sdbm/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.3 2012/04/16 04:01:10 dholland Exp $ +$NetBSD: patch-af,v 1.4 2012/06/23 18:49:28 dholland Exp $ - Use standard headers. - Don't provide own getopt on BSD platforms. @@ -6,9 +6,9 @@ $NetBSD: patch-af,v 1.3 2012/04/16 04:01:10 dholland Exp $ - Avoid signed bitwise operations. - Use the modern regexp library interface. ---- dbe.c.orig Mon Sep 25 23:28:28 2000 +--- dbe.c.orig 2012-06-23 18:47:09.000000000 +0000 +++ dbe.c -@@ -1,4 +1,10 @@ +@@ -1,6 +1,12 @@ +#include <sys/types.h> +#include <sys/param.h> + @@ -17,9 +17,12 @@ $NetBSD: patch-af,v 1.3 2012/04/16 04:01:10 dholland Exp $ +#include <stdlib.h> +#include <string.h> #ifndef VMS - #include <sys/file.h> +-#include <sys/file.h> ++#include <fcntl.h> #include <ndbm.h> -@@ -51,6 +57,7 @@ + #else + #include "file.h" +@@ -51,6 +57,7 @@ char *optarg; /* Global argumen #define index strchr #endif @@ -27,7 +30,7 @@ $NetBSD: patch-af,v 1.3 2012/04/16 04:01:10 dholland Exp $ char getopt(argc, argv, optstring) int argc; -@@ -128,23 +135,26 @@ +@@ -128,23 +135,26 @@ char *optstring; } return c; } @@ -59,7 +62,7 @@ $NetBSD: patch-af,v 1.3 2012/04/16 04:01:10 dholland Exp $ } } putchar('"'); -@@ -171,7 +181,9 @@ +@@ -171,7 +181,9 @@ char *s; *p = '\f'; else if (*s == 't') *p = '\t'; @@ -70,7 +73,7 @@ $NetBSD: patch-af,v 1.3 2012/04/16 04:01:10 dholland Exp $ i = (*s++ - '0') << 6; i |= (*s++ - '0') << 3; i |= *s - '0'; -@@ -211,6 +223,8 @@ +@@ -211,6 +223,8 @@ char **argv; typedef enum { YOW, FETCH, STORE, DELETE, SCAN, REGEXP } commands; @@ -79,7 +82,7 @@ $NetBSD: patch-af,v 1.3 2012/04/16 04:01:10 dholland Exp $ char opt; int flags; int giveusage = 0; -@@ -333,7 +347,8 @@ +@@ -333,7 +347,8 @@ char **argv; fprintf(stderr, "Missing regular expression.\n"); goto db_exit; } @@ -89,7 +92,7 @@ $NetBSD: patch-af,v 1.3 2012/04/16 04:01:10 dholland Exp $ fprintf(stderr, "Invalid regular expression\n"); goto db_exit; } -@@ -343,7 +358,7 @@ +@@ -343,7 +358,7 @@ char **argv; goto db_exit; } while (key.dptr != NULL) { @@ -98,7 +101,7 @@ $NetBSD: patch-af,v 1.3 2012/04/16 04:01:10 dholland Exp $ content = dbm_fetch(db, key); if (dbm_error(db)) { fprintf(stderr, "Error when fetching "); -@@ -362,6 +377,7 @@ +@@ -362,6 +377,7 @@ char **argv; } key = dbm_nextkey(db); } |