diff options
| author | dholland <dholland@pkgsrc.org> | 2012-01-04 15:09:38 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2012-01-04 15:09:38 +0000 |
| commit | ad01731b24bdfed41071bdbb0812adcddfcbe96d (patch) | |
| tree | c190d1005dd0dcb777f38a7f4488552c386ea0be /databases/sdbm/patches | |
| parent | 471159df38876fca53ffc7f059e1928e1b4263b3 (diff) | |
| download | pkgsrc-ad01731b24bdfed41071bdbb0812adcddfcbe96d.tar.gz | |
Our patch doesn't need to check for BSD before using standard headers and
functions. Update that, don't declare own sys_errlist. Fixes Linux build.
PKGREVISION -> 2 as a precaution.
Diffstat (limited to 'databases/sdbm/patches')
| -rw-r--r-- | databases/sdbm/patches/patch-ad | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/databases/sdbm/patches/patch-ad b/databases/sdbm/patches/patch-ad index ef03eba9d9d..7ce6be6104c 100644 --- a/databases/sdbm/patches/patch-ad +++ b/databases/sdbm/patches/patch-ad @@ -1,27 +1,32 @@ -$NetBSD: patch-ad,v 1.2 2008/08/12 13:11:30 agc Exp $ +$NetBSD: patch-ad,v 1.3 2012/01/04 15:09:38 dholland Exp $ ---- util.c.orig Mon Sep 25 23:25:31 2000 +- use standard headers +- don't declare own errno + +--- util.c.orig 2012-01-04 15:05:00.000000000 +0000 +++ util.c -@@ -1,4 +1,11 @@ -+#include <sys/types.h> -+#include <sys/param.h> -+ +@@ -1,4 +1,7 @@ #include <stdio.h> +#include <stdlib.h> -+#if defined(BSD) && BSD >= 199506 ++#include <string.h> +#include <errno.h> -+#endif #ifdef SDBM #include "sdbm.h" #else -@@ -10,8 +17,10 @@ +@@ -10,15 +13,13 @@ oops(s1, s2) register char *s1; register char *s2; { -+#if !(defined(BSD) && BSD >= 199506) - extern int errno, sys_nerr; - extern char *sys_errlist[]; -+#endif +- extern int errno, sys_nerr; +- extern char *sys_errlist[]; extern char *progname; if (progname) + fprintf(stderr, "%s: ", progname); + fprintf(stderr, s1, s2); + if (errno > 0 && errno < sys_nerr) +- fprintf(stderr, " (%s)", sys_errlist[errno]); ++ fprintf(stderr, " (%s)", strerror(errno)); + fprintf(stderr, "\n"); + exit(1); + } |