Mon Apr 16 03:50:38 2012 UTC ()
When using strerror instead of sys_errlist, skip sys_nerr too. Should
fix the Solaris build.


(dholland)
diff -r1.10 -r1.11 pkgsrc/databases/sdbm/distinfo
diff -r1.3 -r1.4 pkgsrc/databases/sdbm/patches/patch-ad
cvs diff -r1.10 -r1.11 pkgsrc/databases/sdbm/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/sdbm/distinfo 2012/03/05 03:38:12 1.10
+++ pkgsrc/databases/sdbm/distinfo 2012/04/16 03:50:38 1.11
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.10 2012/03/05 03:38:12 dholland Exp $ 1$NetBSD: distinfo,v 1.11 2012/04/16 03:50:38 dholland Exp $
2 2
3SHA1 (sdbm.tar.Z) = ebeb769b308a00853b0119f32dda781829e1d712 3SHA1 (sdbm.tar.Z) = ebeb769b308a00853b0119f32dda781829e1d712
4RMD160 (sdbm.tar.Z) = 33a48f642ad81bb15a7ce4440dca605e97774afa 4RMD160 (sdbm.tar.Z) = 33a48f642ad81bb15a7ce4440dca605e97774afa
5Size (sdbm.tar.Z) = 63557 bytes 5Size (sdbm.tar.Z) = 63557 bytes
6SHA1 (patch-aa) = cbac91086cf9b149b62d63f7f3b3435786ac6090 6SHA1 (patch-aa) = cbac91086cf9b149b62d63f7f3b3435786ac6090
7SHA1 (patch-ab) = 9dd9ce20db82283c8692f91d337348e1e952403a 7SHA1 (patch-ab) = 9dd9ce20db82283c8692f91d337348e1e952403a
8SHA1 (patch-ac) = 6455fcb75d5d11173dd5063919e3336989e1e821 8SHA1 (patch-ac) = 6455fcb75d5d11173dd5063919e3336989e1e821
9SHA1 (patch-ad) = 7ad5a481f9746ee70bbc94dd509c15969446c8d5 9SHA1 (patch-ad) = 7857dbfc168d12985a9fa0b5cefc39ac90bc4fba
10SHA1 (patch-ae) = 69e4e40277ecae8e6023d72dbbd4a738583f46dd 10SHA1 (patch-ae) = 69e4e40277ecae8e6023d72dbbd4a738583f46dd
11SHA1 (patch-af) = d990ecba1b79c04130c4d24666ea2b3da4b1d91c 11SHA1 (patch-af) = d990ecba1b79c04130c4d24666ea2b3da4b1d91c
12SHA1 (patch-ah) = 63019f2175766d73ef213297e54597e6fd5fba13 12SHA1 (patch-ah) = 63019f2175766d73ef213297e54597e6fd5fba13
13SHA1 (patch-ai) = 2fd5408efe990534d474bd2bb59b8776f0f808df 13SHA1 (patch-ai) = 2fd5408efe990534d474bd2bb59b8776f0f808df
cvs diff -r1.3 -r1.4 pkgsrc/databases/sdbm/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/databases/sdbm/patches/patch-ad 2012/01/04 15:09:38 1.3
+++ pkgsrc/databases/sdbm/patches/patch-ad 2012/04/16 03:50:38 1.4
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1$NetBSD: patch-ad,v 1.3 2012/01/04 15:09:38 dholland Exp $ 1$NetBSD: patch-ad,v 1.4 2012/04/16 03:50:38 dholland Exp $
2 2
3- use standard headers 3- use standard headers
4- don't declare own errno 4- don't declare own errno
5 5
6--- util.c.orig 2012-01-04 15:05:00.000000000 +0000 6--- util.c.orig 2012-04-16 03:53:49.000000000 +0000
7+++ util.c 7+++ util.c
8@@ -1,4 +1,7 @@ 8@@ -1,4 +1,7 @@
9 #include <stdio.h> 9 #include <stdio.h>
10+#include <stdlib.h> 10+#include <stdlib.h>
11+#include <string.h> 11+#include <string.h>
12+#include <errno.h> 12+#include <errno.h>
13 #ifdef SDBM 13 #ifdef SDBM
14 #include "sdbm.h" 14 #include "sdbm.h"
15 #else 15 #else
16@@ -10,15 +13,13 @@ oops(s1, s2) 16@@ -10,15 +13,13 @@ oops(s1, s2)
17 register char *s1; 17 register char *s1;
18 register char *s2; 18 register char *s2;
19 { 19 {
20- extern int errno, sys_nerr; 20- extern int errno, sys_nerr;
21- extern char *sys_errlist[]; 21- extern char *sys_errlist[];
22 extern char *progname; 22 extern char *progname;
23  23
24 if (progname) 24 if (progname)
25 fprintf(stderr, "%s: ", progname); 25 fprintf(stderr, "%s: ", progname);
26 fprintf(stderr, s1, s2); 26 fprintf(stderr, s1, s2);
27 if (errno > 0 && errno < sys_nerr) 27- if (errno > 0 && errno < sys_nerr)
28- fprintf(stderr, " (%s)", sys_errlist[errno]); 28- fprintf(stderr, " (%s)", sys_errlist[errno]);
 29+ if (errno > 0)
29+ fprintf(stderr, " (%s)", strerror(errno)); 30+ fprintf(stderr, " (%s)", strerror(errno));
30 fprintf(stderr, "\n"); 31 fprintf(stderr, "\n");
31 exit(1); 32 exit(1);
32 } 33 }