diff options
| author | dholland <dholland> | 2012-01-04 15:09:38 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2012-01-04 15:09:38 +0000 |
| commit | 483e0003df1aecd730c7390ca8b15f3b208d2e09 (patch) | |
| tree | c190d1005dd0dcb777f38a7f4488552c386ea0be /databases/sdbm | |
| parent | 91f78e8bfa38699e7932a8bdbb66b2a6b3e00e90 (diff) | |
| download | pkgsrc-483e0003df1aecd730c7390ca8b15f3b208d2e09.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')
| -rw-r--r-- | databases/sdbm/Makefile | 4 | ||||
| -rw-r--r-- | databases/sdbm/distinfo | 4 | ||||
| -rw-r--r-- | databases/sdbm/patches/patch-ad | 31 |
3 files changed, 22 insertions, 17 deletions
diff --git a/databases/sdbm/Makefile b/databases/sdbm/Makefile index 71540d6ee8a..9eb2b42468f 100644 --- a/databases/sdbm/Makefile +++ b/databases/sdbm/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.17 2011/03/11 10:52:26 zafer Exp $ +# $NetBSD: Makefile,v 1.18 2012/01/04 15:09:38 dholland Exp $ # DISTNAME= sdbm # this is the Dec. 1990 release with some race condition fixes from an # unknown outside source: PKGNAME= sdbm-90.12.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= databases MASTER_SITES= # ftp://tsx-11.mit.edu/pub/linux/sources/libs/ EXTRACT_SUFX= .tar.Z diff --git a/databases/sdbm/distinfo b/databases/sdbm/distinfo index a77d52650d8..6d0267c08d5 100644 --- a/databases/sdbm/distinfo +++ b/databases/sdbm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2011/11/14 01:41:08 dholland Exp $ +$NetBSD: distinfo,v 1.9 2012/01/04 15:09:38 dholland Exp $ SHA1 (sdbm.tar.Z) = ebeb769b308a00853b0119f32dda781829e1d712 RMD160 (sdbm.tar.Z) = 33a48f642ad81bb15a7ce4440dca605e97774afa @@ -6,7 +6,7 @@ Size (sdbm.tar.Z) = 63557 bytes SHA1 (patch-aa) = cbac91086cf9b149b62d63f7f3b3435786ac6090 SHA1 (patch-ab) = 9dd9ce20db82283c8692f91d337348e1e952403a SHA1 (patch-ac) = 6455fcb75d5d11173dd5063919e3336989e1e821 -SHA1 (patch-ad) = 4b27a77c661ed21ca0da350e5a2d98b58714e797 +SHA1 (patch-ad) = 7ad5a481f9746ee70bbc94dd509c15969446c8d5 SHA1 (patch-ae) = 99b8d6eb4565b28e93913652f24c628441ea24b1 SHA1 (patch-af) = d990ecba1b79c04130c4d24666ea2b3da4b1d91c SHA1 (patch-ah) = 63019f2175766d73ef213297e54597e6fd5fba13 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); + } |