From 8866e63d4b5aeb6919003fcead461f1241329a99 Mon Sep 17 00:00:00 2001
From: fredb <fredb>
Date: Tue, 13 Jun 2000 01:46:52 +0000
Subject: Update to gdbm-1.8.0. From the NEWS file: CHANGES from 1.7.3 to 1.8  
 1.  Added GDBM_CENTFREE functionality and option.   2.  Added
 GDBM_COALESCEBLKS functionality and option.   3.  Added GDBM_NOLOCK flag.  
 4.  Made ``fast'' mode the default, making GDBM_FAST obsolete, and adding    
   the GDBM_SYNC flag and GDBM_SYNCMODE option.   5.  Switched to building
 with libtool. [This last make LT_CONFIG_OVERRIDE necessary.]

---
 databases/gdbm/Makefile         | 14 ++++-----
 databases/gdbm/files/md5        |  4 +--
 databases/gdbm/files/patch-sum  |  4 +--
 databases/gdbm/patches/patch-ab | 63 ++++-------------------------------------
 databases/gdbm/pkg/PLIST        |  4 +--
 5 files changed, 16 insertions(+), 73 deletions(-)

(limited to 'databases')

diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index a936066b5e0..38d0ec97dba 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,20 +1,16 @@
-# $NetBSD: Makefile,v 1.17 2000/06/08 22:28:28 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2000/06/13 01:46:52 fredb Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/01/28 08:11:23 asami Exp 
 #
 
-DISTNAME=	gdbm-1.7.3
+DISTNAME=	gdbm-1.8.0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GNU:=gdbm/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/gdbm/gdbm.html
 
-GNU_CONFIGURE=	# defined
-USE_LIBTOOL=	# defined
-
-INFO_FILES=	gdbm.info
-
-post-build:
-	cd ${WRKSRC} ; ${RM} gdbm.info ; ${MAKE} gdbm.info
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/gdbm/files/md5 b/databases/gdbm/files/md5
index 804e3f70708..27c4a4810e5 100644
--- a/databases/gdbm/files/md5
+++ b/databases/gdbm/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:17:04 agc Exp $
+$NetBSD: md5,v 1.3 2000/06/13 01:46:53 fredb Exp $
 
-MD5 (gdbm-1.7.3.tar.gz) = d7fe897b181e2d2295a8d47afa0ac150
+MD5 (gdbm-1.8.0.tar.gz) = cd543862287f55ad66e62cc9d82cc906
diff --git a/databases/gdbm/files/patch-sum b/databases/gdbm/files/patch-sum
index 84b1e5c1381..5c2c6e96095 100644
--- a/databases/gdbm/files/patch-sum
+++ b/databases/gdbm/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:29 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/06/13 01:46:53 fredb Exp $
 
 MD5 (patch-aa) = 8ac9c73422e28dbe6bd2bb0bd23c5d7a
-MD5 (patch-ab) = 8b60eae78924a2e7654fb8eed9a89502
+MD5 (patch-ab) = 9983d10faded1119c11bf1c86a4743c2
diff --git a/databases/gdbm/patches/patch-ab b/databases/gdbm/patches/patch-ab
index dbd3412d0dc..c6b97632007 100644
--- a/databases/gdbm/patches/patch-ab
+++ b/databases/gdbm/patches/patch-ab
@@ -1,23 +1,9 @@
-$NetBSD: patch-ab,v 1.3 1998/08/10 15:29:40 tv Exp $
+$NetBSD: patch-ab,v 1.4 2000/06/13 01:46:53 fredb Exp $
 
---- Makefile.in.orig	Mon Aug 10 11:13:23 1998
-+++ Makefile.in	Mon Aug 10 11:22:25 1998
-@@ -3,7 +3,7 @@
- srcdir = @srcdir@
- VPATH = @srcdir@
- 
--CC = @CC@
-+CC = $(LIBTOOL) @CC@
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -19,11 +19,10 @@
- LIBS = @LIBS@ -lc
- 
- # SunOS users might wish to add '-fpcc-struct-return' to CFLAGS. see INSTALL.
--CFLAGS = -O
--LDFLAGS =
-+CPPFLAGS = $(DEFS) -I. -I$(srcdir)
+--- Makefile.in.orig	Tue May 18 22:16:06 1999
++++ Makefile.in	Tue May  9 00:33:33 2000
+@@ -31,7 +31,7 @@
+ LDFLAGS =
  
  # Common prefix for installation directories
 -prefix = /usr/local
@@ -25,42 +11,3 @@ $NetBSD: patch-ab,v 1.3 1998/08/10 15:29:40 tv Exp $
  exec_prefix = $(prefix)
  binprefix = $(exec_prefix)
  manprefix = $(prefix)
-@@ -39,9 +38,6 @@
- 
- #### End of system configuration section. ####
- 
--.c.o:
--	$(CC) -c $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) $(CFLAGS) $<
--
- SHELL = /bin/sh
- 
- PROGS = libgdbm.a testgdbm testdbm testndbm tndbm tdbm conv2gdbm
-@@ -88,12 +84,12 @@
- 
- DISTFILES = $(SRCS) $(HDRS) $(MSCFILES)
- 
--all: libgdbm.a
-+all: libgdbm.la
- 
- progs: $(PROGS)
- 
--install: libgdbm.a gdbm.h gdbm.info
--	$(INSTALL_DATA) libgdbm.a $(libdir)/libgdbm.a
-+install: libgdbm.la gdbm.h gdbm.info
-+	@$(LIBTOOL) $(INSTALL_DATA) libgdbm.la $(libdir)/
- 	$(INSTALL_DATA) gdbm.h $(includedir)/gdbm.h
- 	$(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3
- 	$(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info
-@@ -102,10 +98,8 @@
- 	$(INSTALL_DATA) $(srcdir)/dbm.h $(includedir)/dbm.h
- 	$(INSTALL_DATA) $(srcdir/ndbm.h $(includedir)/ndbm.h
- 
--libgdbm.a: $(OBJS) gdbm.h
--	rm -f libgdbm.a
--	ar q libgdbm.a $(OBJS)
--	$(RANLIB) libgdbm.a
-+libgdbm.la: $(OBJS) gdbm.h
-+	$(CC) -o $@ $(OBJS:.o=.lo) -rpath $(PREFIX)/lib -version-info 1:73
- 
- gdbm.h:	gdbm.proto gdbmerrno.h gdbm.proto2
- 	rm -f gdbm.h
diff --git a/databases/gdbm/pkg/PLIST b/databases/gdbm/pkg/PLIST
index 2ca5cbb01ee..faab3154b51 100644
--- a/databases/gdbm/pkg/PLIST
+++ b/databases/gdbm/pkg/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2000/06/08 22:28:30 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2000/06/13 01:46:54 fredb Exp $
 include/gdbm.h
 @unexec install-info --delete %D/info/gdbm.info %D/info/dir
 info/gdbm.info
 @exec   install-info          %D/info/gdbm.info %D/info/dir
 lib/libgdbm.a
 lib/libgdbm.la
-lib/libgdbm.so.1.73
+lib/libgdbm.so.2.0
 man/man3/gdbm.3
-- 
cgit v1.2.3