Changes 1.9.1:

* Bugfix: Improperly used preprocessor directive caused compilation failure
  when using gcc 4.4.4 or newer.

Changes 1.9:
* Use of mmap
* Changes in compatibility mode
* Locking is disabled.
* Do not link pag to dir.
* gdbm_setopt
* The testgdbm program is installed
* A testsuite is provided.
* Improved documentation.

4 files changed, 11 insertions, 89 deletions

diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index f36323839c3..480929e3833 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2010/01/24 17:11:18 heinz Exp $
-#
+# $NetBSD: Makefile,v 1.42 2011/08/17 07:17:15 adam Exp $
 
-DISTNAME=	gdbm-1.8.3
-PKGREVISION=	1
+DISTNAME=	gdbm-1.9.1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GNU:=gdbm/}
 
@@ -14,9 +12,9 @@ LICENSE=	gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-INFO_FILES=		# PLIST
-MAKE_FLAGS+=		INSTALL_ROOT=${DESTDIR:Q}
+GNU_CONFIGURE=		yes
+INFO_FILES=		yes
+MAKE_JOBS_SAFE=		no
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/gdbm/PLIST b/databases/gdbm/PLIST
index 5f9c681bb33..3820c04a055 100644
--- a/databases/gdbm/PLIST
+++ b/databases/gdbm/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2006/03/30 03:44:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2011/08/17 07:17:15 adam Exp $
+bin/testgdbm
 include/gdbm.h
 info/gdbm.info
 lib/libgdbm.la
diff --git a/databases/gdbm/distinfo b/databases/gdbm/distinfo
index e6cafea011c..265000dcea9 100644
--- a/databases/gdbm/distinfo
+++ b/databases/gdbm/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2009/09/02 15:27:48 joerg Exp $
+$NetBSD: distinfo,v 1.7 2011/08/17 07:17:15 adam Exp $
 
-SHA1 (gdbm-1.8.3.tar.gz) = a0296b1986a99cb9ec0dc3b17ea99aec76e9b760
-RMD160 (gdbm-1.8.3.tar.gz) = 0f5741ab32f95db721c5d9f4548447301171e938
-Size (gdbm-1.8.3.tar.gz) = 228695 bytes
-SHA1 (patch-ab) = a97baa1513fbc4979c7393ed7d8b9502ec882f4f
+SHA1 (gdbm-1.9.1.tar.gz) = 0742a9ed8fc93fb5d5d3984d2acf99821134e2e9
+RMD160 (gdbm-1.9.1.tar.gz) = 512ad1b5c3a3fb7b17094d627b9d6da8215532f2
+Size (gdbm-1.9.1.tar.gz) = 554843 bytes
diff --git a/databases/gdbm/patches/patch-ab b/databases/gdbm/patches/patch-ab
deleted file mode 100644
index 2115f81a399..00000000000
--- a/databases/gdbm/patches/patch-ab
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2009/09/02 15:27:48 joerg Exp $
-
---- Makefile.in.orig	2002-10-08 18:09:12.000000000 +0200
-+++ Makefile.in
-@@ -14,10 +14,6 @@ INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- 
--# File ownership and group
--BINOWN = bin
--BINGRP = bin
--
- MAKEINFO = makeinfo
- TEXI2DVI = texi2dvi
- 
-@@ -130,22 +126,22 @@ install: libgdbm.la gdbm.h gdbm.info
- 	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
- 		$(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
- 		$(INSTALL_ROOT)$(infodir)
--	$(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
-+	$(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
-+	$(INSTALL_DATA) gdbm.h \
- 		$(INSTALL_ROOT)$(includedir)/gdbm.h
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
-+	$(INSTALL_DATA) $(srcdir)/gdbm.3 \
- 		$(INSTALL_ROOT)$(man3dir)/gdbm.3
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
-+	$(INSTALL_DATA) $(srcdir)/gdbm.info \
- 		$(INSTALL_ROOT)$(infodir)/gdbm.info
- 
- install-compat:
- 	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
- 		$(INSTALL_ROOT)$(includedir)
--	$(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
-+	$(LIBTOOL) --mode=install $(INSTALL) -c libgdbm_compat.la \
- 		$(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
-+	$(INSTALL_DATA) $(srcdir)/dbm.h \
- 		$(INSTALL_ROOT)$(includedir)/dbm.h
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
-+	$(INSTALL_DATA) $(srcdir)/ndbm.h \
- 		$(INSTALL_ROOT)$(includedir)/ndbm.h
- 
- #libgdbm.a: $(OBJS) gdbm.h
-@@ -172,10 +168,10 @@ gdbm.h:	gdbm.proto gdbmerrno.h gdbm.prot
- 	chmod -w gdbm.h
- 
- testgdbm: testgdbm.o libgdbm.la @LIBOBJS@
--	$(LIBTOOL) $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@
- 
- testdbm: testdbm.o libgdbm.la libgdbm_compat.la
--	$(LIBTOOL) $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la libgdbm_compat.la
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la libgdbm_compat.la
- 
- tdbm: testdbm.o
- 	$(CC) $(LDFLAGS) -o tdbm testdbm.o $(LIBS)
-@@ -184,7 +180,7 @@ testndbm.o: testndbm.c
- 	$(CC) -c -I. -I$(srcdir) $(CFLAGS) $(DEFS) -DGNU $(srcdir)/testndbm.c
- 
- testndbm: testndbm.o libgdbm.la libgdbm_compat.la
--	$(LIBTOOL) $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la libgdbm_compat.la
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la libgdbm_compat.la
- 
- tndbm.o: testndbm.c
- 	cp $(srcdir)/testndbm.c ./tndbm.c
-@@ -195,7 +191,7 @@ tndbm: tndbm.o
- 	$(CC) $(LDFLAGS) -o tndbm tndbm.o $(LIBS)
- 
- conv2gdbm: conv2gdbm.o libgdbm.la @LIBOBJS@
--	$(LIBTOOL) $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@
- 
- lintgdbm: 
- 	lint $(DEFS) $(LFLAGS) $(DBM_CF) $(NDBM_CF) $(GDBM_CF) testgdbm.c