 @@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.18 2012/01/04 15:09:38 dholland Exp $
+# $NetBSD: Makefile,v 1.19 2012/04/16 04:01:10 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=		2
 CATEGORIES=		databases
 MASTER_SITES=		# ftp://tsx-11.mit.edu/pub/linux/sources/libs/
 EXTRACT_SUFX=		.tar.Z
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Substitute DBM, an implementation of the "real" ndbm library
 WRKSRC=			${WRKDIR}
 MAKE_FILE=		makefile
 MAKE_JOBS_SAFE=		no
 USE_LIBTOOL=		yes
 PKG_DESTDIR_SUPPORT=	user-destdir
 post-extract:
-	@cd ${WRKDIR} && ${SH} sdbm.shar >/dev/null
+	cd ${WRKDIR} && ${SH} sdbm.shar >/dev/null
 .include "../../mk/bsd.pkg.mk"

 @@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.11 2012/04/16 03:50:38 dholland Exp $
+$NetBSD: distinfo,v 1.12 2012/04/16 04:01:10 dholland Exp $
 SHA1 (sdbm.tar.Z) = ebeb769b308a00853b0119f32dda781829e1d712
 RMD160 (sdbm.tar.Z) = 33a48f642ad81bb15a7ce4440dca605e97774afa
 Size (sdbm.tar.Z) = 63557 bytes
-SHA1 (patch-aa) = cbac91086cf9b149b62d63f7f3b3435786ac6090
+SHA1 (patch-aa) = 9ebe008e7119939b5d47abdb1c15cc03e4548698
-SHA1 (patch-ab) = 9dd9ce20db82283c8692f91d337348e1e952403a
+SHA1 (patch-ab) = 0d432aa2f4a8b33077aa045386da499b494bcd24
-SHA1 (patch-ac) = 6455fcb75d5d11173dd5063919e3336989e1e821
+SHA1 (patch-ac) = dccfcb2b7a2f68188bb55bb514021cc091274678
 SHA1 (patch-ad) = 7857dbfc168d12985a9fa0b5cefc39ac90bc4fba
 SHA1 (patch-ae) = 69e4e40277ecae8e6023d72dbbd4a738583f46dd
-SHA1 (patch-af) = d990ecba1b79c04130c4d24666ea2b3da4b1d91c
+SHA1 (patch-af) = 2ff85561125381a10e1b2ee0dd18db04192bc738
-SHA1 (patch-ah) = 63019f2175766d73ef213297e54597e6fd5fba13
+SHA1 (patch-ah) = 90dba8033eba363f246fd785e8897724ab7eb718
-SHA1 (patch-ai) = 2fd5408efe990534d474bd2bb59b8776f0f808df
+SHA1 (patch-ai) = fdaaa656ea9aff3b90edd2397d7dd1309f7040eb

 @@ -1,14 +1,19 @@
-$NetBSD: patch-aa,v 1.5 2005/12/05 20:50:01 rillig Exp $
+$NetBSD: patch-aa,v 1.6 2012/04/16 04:01:10 dholland Exp $
 - Use standard headers.
 - Don't declare own errno.
 - Don't declare own malloc/free/lseek.
 - Remove wrong cast calling malloc.
 --- sdbm.c.orig	2004-04-27 19:10:43.000000000 -0500
 +++ sdbm.c
 @@ -25,6 +25,10 @@
  #endif
  #include <errno.h>
  #include <string.h>
 +#include <stdlib.h>
++
 +/* To define SEEK_SET on Linux */
 +#include <stdio.h>
  #ifdef __STDC__
 @@ -26,17 +31,17 @@ $NetBSD: patch-aa,v 1.5 2005/12/05 20:50
 -extern char *malloc proto((unsigned int));
 -extern void free proto((void *));
 -extern long lseek();
+-
 -/*
   * forward
   */
  static int getdbit proto((DBM *, long));
 @@ -95,7 +88,7 @@ register int mode;
   */
  	n = strlen(file) * 2 + strlen(DIRFEXT) + strlen(PAGFEXT) + 2;
 -	if ((dirname = malloc((unsigned) n)) == NULL)
-+	if ((dirname = (char *) malloc(n)) == NULL)
++	if ((dirname = malloc(n)) == NULL)
  		return errno = ENOMEM, (DBM *) NULL;
  /*
   * build the file names

 @@ -1,14 +1,18 @@
-$NetBSD: patch-ab,v 1.3 2011/08/29 01:33:49 dholland Exp $
+$NetBSD: patch-ab,v 1.4 2012/04/16 04:01:10 dholland Exp $
 - Configure for pkgsrc.
 - libtoolize, build as shared library.
 - Provide working install target.
 --- makefile	2008/08/12 12:14:05	1.1
 +++ makefile	2008/08/12 11:24:23
 @@ -2,37 +2,42 @@
  # makefile for public domain ndbm-clone: sdbm
  # DUFF: use duff's device (loop unroll) in parts of the code
+ #
 -CFLAGS = -O -DSDBM -DDUFF -DBSD42
 +CFLAGS+= -DSDBM -DDUFF
  #LDFLAGS = -p
 +BINDIR=${PREFIX}/bin
 +INCDIR=${PREFIX}/include
 @@ -57,20 +61,20 @@ $NetBSD: patch-ab,v 1.3 2011/08/29 01:33
+ #
  # dbu using berkelezoid ndbm routines [if you have them] for testing
 @@ -53,3 +58,16 @@
  readme:
  	nroff -ms readme.ms | col -b >README
++
 +install: $(LIBS)
 +	mkdir ${DESTDIR}$(BINDIR)
 +	mkdir ${DESTDIR}$(LIBDIR)
 +	mkdir ${DESTDIR}$(INCDIR)
 +	mkdir ${DESTDIR}$(MANDIR)/man3
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${LIBS:.a=.la} ${DESTDIR}${PREFIX}/lib
++	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${LIBS:.a=.la} ${DESTDIR}${PREFIX}/lib
 +	${LIBTOOL} --mode=install $(BSD_INSTALL_PROGRAM) dbu ${DESTDIR}$(BINDIR)
 +	${LIBTOOL} --mode=install $(BSD_INSTALL_PROGRAM) dba ${DESTDIR}$(BINDIR)
 +	${LIBTOOL} --mode=install $(BSD_INSTALL_PROGRAM) dbd ${DESTDIR}$(BINDIR)
 +	${LIBTOOL} --mode=install $(BSD_INSTALL_PROGRAM) dbe ${DESTDIR}$(BINDIR)
 +	$(BSD_INSTALL_DATA) sdbm.h ${DESTDIR}$(INCDIR)
 +	$(BSD_INSTALL_DATA) sdbm.3 ${DESTDIR}$(MANDIR)/man3

 @@ -1,14 +1,17 @@
-$NetBSD: patch-ac,v 1.2 2008/08/12 13:11:30 agc Exp $
+$NetBSD: patch-ac,v 1.3 2012/04/16 04:01:10 dholland Exp $
 - Use standard headers.
 - Don't provide own definitions of now-standard symbols.
 --- tune.h.orig	Mon Sep 25 23:22:26 2000
 +++ tune.h
 @@ -6,11 +6,10 @@
  #define BYTESIZ		8
 -#ifdef SVID
  #include <unistd.h>
 -#endif
 +#include <string.h>
 -#ifdef BSD42

 @@ -1,14 +1,20 @@
-$NetBSD: patch-af,v 1.2 2008/08/12 13:11:30 agc Exp $
+$NetBSD: patch-af,v 1.3 2012/04/16 04:01:10 dholland Exp $
 - Use standard headers.
 - Don't provide own getopt on BSD platforms.
 - Use <ctype.h> functions correctly.
 - Avoid signed bitwise operations.
 - Use the modern regexp library interface.
 --- dbe.c.orig	Mon Sep 25 23:28:28 2000
 +++ dbe.c
 @@ -1,4 +1,10 @@
 +#include <sys/types.h>
 +#include <sys/param.h>
++
 +#include <regex.h>
  #include <stdio.h>
 +#include <stdlib.h>
 +#include <string.h>
  #ifndef VMS
  #include <sys/file.h>

 @@ -1,14 +1,16 @@
-$NetBSD: patch-ah,v 1.1 2008/08/12 13:13:34 agc Exp $
+$NetBSD: patch-ah,v 1.2 2012/04/16 04:01:10 dholland Exp $
 Use standard headers
 --- dba.c	2008/08/12 11:32:24	1.1
 +++ dba.c	2008/08/12 11:32:58
 @@ -2,7 +2,10 @@
   * dba	dbm analysis/recovery
   */
 +#include <fcntl.h>
  #include <stdio.h>
 +#include <stdlib.h>
 +#include <string.h>
  #include <sys/file.h>
  #include "sdbm.h"

 @@ -1,11 +1,15 @@
 $NetBSD: patch-ai,v 1.2 2012/04/16 04:01:10 dholland Exp $
 Use standard headers.
 --- dbd.c	2008/08/12 12:19:22	1.1
 +++ dbd.c	2008/08/12 12:19:53
 @@ -3,6 +3,8 @@
   */
  #include <stdio.h>
 +#include <stdlib.h>
 +#include <string.h>
  #include <sys/file.h>
  #include "sdbm.h"