head 1.13; access; symbols pkgsrc-2013Q2:1.13.0.6 pkgsrc-2013Q2-base:1.13 pkgsrc-2012Q4:1.13.0.4 pkgsrc-2012Q4-base:1.13 pkgsrc-2011Q4:1.13.0.2 pkgsrc-2011Q4-base:1.13 pkgsrc-2011Q2:1.12.0.16 pkgsrc-2011Q2-base:1.12 pkgsrc-2011Q1:1.12.0.14 pkgsrc-2011Q1-base:1.12 pkgsrc-2010Q4:1.12.0.12 pkgsrc-2010Q4-base:1.12 pkgsrc-2010Q3:1.12.0.10 pkgsrc-2010Q3-base:1.12 pkgsrc-2010Q2:1.12.0.8 pkgsrc-2010Q2-base:1.12 pkgsrc-2010Q1:1.12.0.6 pkgsrc-2010Q1-base:1.12 pkgsrc-2009Q4:1.12.0.4 pkgsrc-2009Q4-base:1.12 pkgsrc-2009Q3:1.12.0.2 pkgsrc-2009Q3-base:1.12 pkgsrc-2009Q2:1.11.0.52 pkgsrc-2009Q2-base:1.11 pkgsrc-2009Q1:1.11.0.50 pkgsrc-2009Q1-base:1.11 pkgsrc-2008Q4:1.11.0.48 pkgsrc-2008Q4-base:1.11 pkgsrc-2008Q3:1.11.0.46 pkgsrc-2008Q3-base:1.11 cube-native-xorg:1.11.0.44 cube-native-xorg-base:1.11 pkgsrc-2008Q2:1.11.0.42 pkgsrc-2008Q2-base:1.11 cwrapper:1.11.0.40 pkgsrc-2008Q1:1.11.0.38 pkgsrc-2008Q1-base:1.11 pkgsrc-2007Q4:1.11.0.36 pkgsrc-2007Q4-base:1.11 pkgsrc-2007Q3:1.11.0.34 pkgsrc-2007Q3-base:1.11 pkgsrc-2007Q2:1.11.0.32 pkgsrc-2007Q2-base:1.11 pkgsrc-2007Q1:1.11.0.30 pkgsrc-2007Q1-base:1.11 pkgsrc-2006Q4:1.11.0.28 pkgsrc-2006Q4-base:1.11 pkgsrc-2006Q3:1.11.0.26 pkgsrc-2006Q3-base:1.11 pkgsrc-2006Q2:1.11.0.24 pkgsrc-2006Q2-base:1.11 pkgsrc-2006Q1:1.11.0.22 pkgsrc-2006Q1-base:1.11 pkgsrc-2005Q4:1.11.0.20 pkgsrc-2005Q4-base:1.11 pkgsrc-2005Q3:1.11.0.18 pkgsrc-2005Q3-base:1.11 pkgsrc-2005Q2:1.11.0.16 pkgsrc-2005Q2-base:1.11 pkgsrc-2005Q1:1.11.0.14 pkgsrc-2005Q1-base:1.11 pkgsrc-2004Q4:1.11.0.12 pkgsrc-2004Q4-base:1.11 pkgsrc-2004Q3:1.11.0.10 pkgsrc-2004Q3-base:1.11 pkgsrc-2004Q2:1.11.0.8 pkgsrc-2004Q2-base:1.11 pkgsrc-2004Q1:1.11.0.6 pkgsrc-2004Q1-base:1.11 pkgsrc-2003Q4:1.11.0.4 pkgsrc-2003Q4-base:1.11 netbsd-1-6-1:1.11.0.2 netbsd-1-6-1-base:1.11 netbsd-1-6:1.8.0.6 netbsd-1-6-RELEASE-base:1.8 pkgviews:1.8.0.2 pkgviews-base:1.8 buildlink2:1.7.0.2 buildlink2-base:1.8 netbsd-1-5-PATCH003:1.7 netbsd-1-5-PATCH001:1.6 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.3 netbsd-1-3-PATCH003:1.3 netbsd-1-3-PATCH002:1.1; locks; strict; comment @# @; 1.13 date 2011.08.17.07.17.15; author adam; state dead; branches; next 1.12; 1.12 date 2009.09.02.15.27.48; author joerg; state Exp; branches; next 1.11; 1.11 date 2002.11.01.00.31.18; author wiz; state Exp; branches; next 1.10; 1.10 date 2002.09.11.00.50.05; author schmonz; state Exp; branches; next 1.9; 1.9 date 2002.08.25.18.38.21; author jlam; state Exp; branches; next 1.8; 1.8 date 2002.05.20.22.16.54; author cjep; state Exp; branches; next 1.7; 1.7 date 2001.08.16.21.41.59; author dogcow; state Exp; branches 1.7.2.1; next 1.6; 1.6 date 2001.01.18.18.05.53; author wiz; state Exp; branches; next 1.5; 1.5 date 2000.12.11.03.45.18; author jlam; state Exp; branches; next 1.4; 1.4 date 2000.06.13.01.46.53; author fredb; state Exp; branches; next 1.3; 1.3 date 98.08.10.15.29.40; author tv; state Exp; branches; next 1.2; 1.2 date 98.08.07.10.40.18; author agc; state Exp; branches; next 1.1; 1.1 date 98.05.08.12.31.21; author frueauf; state Exp; branches; next ; 1.7.2.1 date 2002.06.23.18.43.14; author jlam; state Exp; branches; next ; desc @@ 1.13 log @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. @ text @$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 @ 1.12 log @Always use --mode for libtool. @ text @d1 1 a1 1 $NetBSD$ @ 1.11 log @Update to 1.8.3: CHANGES from 1.8.2 to 1.8.3 1. Various configure related changes and additional updates. CHANGES from 1.8.1 to 1.8.2 1. Allow `NEWDB'-opened databases to actually, well, store records. CHANGES from 1.8 to 1.8.1 1. Lots of bug fixes, including a data corruption bug. 2. Updated to current autoconf and libtool. 3. Moved the dbm/ndbm compatibility routines to libgdbm_compat. @ text @d3 1 a3 1 --- Makefile.in.orig Tue Oct 8 18:09:12 2002 d16 2 a17 1 @@@@ -131,11 +127,11 @@@@ install: libgdbm.la gdbm.h gdbm.info d20 1 a20 1 $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la d22 1 d33 1 a33 1 @@@@ -143,9 +139,9 @@@@ install-compat: d35 2 a36 1 $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ d46 31 @ 1.10 log @Build on Darwin: * don't pass a second (and wrong) pair of -o and -u arguments to ${INSTALL} * use canonical pkgsrc config.guess and config.sub @ text @d3 1 a3 1 --- Makefile.in.orig Tue May 18 23:16:06 1999 d16 7 a22 20 @@@@ -27,11 +23,11 @@@@ DEFS = LIBS = @@LIBS@@ -lc # SunOS 4 users might wish to add '-fpcc-struct-return' to CFLAGS. see INSTALL. -CFLAGS = -O +#CFLAGS = LDFLAGS = # Common prefix for installation directories -prefix = /usr/local +prefix = @@prefix@@ exec_prefix = $(prefix) binprefix = $(exec_prefix) manprefix = $(prefix) @@@@ -121,18 +117,18 @@@@ progs: $(PROGS) install: libgdbm.la gdbm.h gdbm.info $(srcdir)/mkinstalldirs $(libdir) $(includedir) $(man3dir) $(infodir) - $(LIBTOOL) install -c libgdbm.la $(libdir)/libgdbm.la - $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h $(includedir)/gdbm.h a23 2 + $(LIBTOOL) $(INSTALL) -c libgdbm.la $(libdir)/libgdbm.la + $(INSTALL_DATA) gdbm.h $(includedir)/gdbm.h d25 1 a25 1 $(man3dir)/gdbm.3 d28 1 a28 1 $(infodir)/gdbm.info d31 4 a34 1 $(srcdir)/mkinstalldirs $(includedir) d37 1 a37 1 $(includedir)/dbm.h d40 1 a40 1 $(includedir)/ndbm.h @ 1.9 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework. @ text @d1 16 a16 4 $NetBSD: patch-ab,v 1.7.2.1 2002/06/23 18:43:14 jlam Exp $ --- Makefile.in.orig Tue May 18 20:16:06 1999 +++ Makefile.in Thu Aug 16 14:27:07 2001 @@@@ -27,11 +27,11 @@@@ d30 1 a30 1 @@@@ -121,7 +121,7 @@@@ d35 2 d38 2 a39 2 $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h $(includedir)/gdbm.h $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ d41 14 @ 1.8 log @Add NetBSD tag. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Fix Makefile.in to use $(INSTALL) rather than "install"; this can fail on zoularis if it finds /usr/sbin/install first. @ text @d1 1 @ 1.7.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 1 $NetBSD: patch-ab,v 1.8 2002/05/20 22:16:54 cjep Exp $ @ 1.6 log @Don't force '-O'. Noted by Adam Ciarcinski. @ text @d1 2 a2 4 $NetBSD: patch-ab,v 1.5 2000/12/11 03:45:18 jlam Exp $ --- Makefile.in.orig Tue May 18 23:16:06 1999 +++ Makefile.in d17 9 @ 1.5 log @Honor CFLAGS passed in from environment during build. @ text @d1 1 a1 1 $NetBSD$ d10 1 a10 1 +CFLAGS += -O @ 1.4 log @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.] @ text @d3 8 a10 3 --- Makefile.in.orig Tue May 18 22:16:06 1999 +++ Makefile.in Tue May 9 00:33:33 2000 @@@@ -31,7 +31,7 @@@@ @ 1.3 log @Libtoolize and clean up. @ text @d3 4 a6 18 --- 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) a13 39 @@@@ -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 @ 1.2 log @Add NetBSD RCS Ids. @ text @d3 31 a33 7 --- Makefile.in.orig Sun May 15 11:28:49 1994 +++ Makefile.in Fri May 8 14:22:13 1998 @@@@ -74,9 +74,7 @@@@ TEXI_F = gdbm.info -SRCS = $(DBM_CF) $(NDBM_CF) $(GDBM_CF) $(TEST_CF) d35 1 a35 2 -OBJS = $(DBM_OF) $(NDBM_OF) $(GDBM_OF) @@ALLOCA@@ +SRCS = $(DBM_CF) $(NDBM_CF) $(GDBM_CF) d37 2 a38 3 HDRS = gdbmdefs.h extern.h gdbmerrno.h systems.h dbm.h ndbm.h gdbmconst.h \ proto.h @@@@ -88,12 +86,21 @@@@ d43 1 a43 8 +# for bsd.lib.mk to build shared lib easily +LIB = gdbm +SHLIB_MAJOR=1 +SHLIB_MINOR=73 +NOPROFILE=1 +NOLINT=1 + +all: libgdbm.a libgdbm_pic.a libgdbm.so.${SHLIB_MAJOR}.${SHLIB_MINOR} d48 3 a50 4 +install: libgdbm.a libgdbm_pic.a libgdbm.so.${SHLIB_MAJOR}.${SHLIB_MINOR} gdbm.h gdbm.info $(INSTALL_DATA) libgdbm.a $(libdir)/libgdbm.a + $(INSTALL_DATA) libgdbm_pic.a $(libdir)/libgdbm_pic.a + $(INSTALL_DATA) libgdbm.so.${SHLIB_MAJOR}.${SHLIB_MINOR} $(libdir) d54 1 a54 1 @@@@ -102,11 +109,6 @@@@ d62 3 a64 1 - a66 17 cp $(srcdir)/gdbm.proto gdbm.h @@@@ -157,9 +159,6 @@@@ gdbm.dvi: $(TEXI2DVI) $(srcdir)/gdbm.texinfo -clean: - rm -f $(PROGS) $(TEX_F) *.o core junk* - mostlyclean: clean distclean: clean @@@@ -227,3 +226,5 @@@@ testndbm.o: autoconf.h ndbm.h tdbm.o: autoconf.h conv2gdbm.o: autoconf.h gdbm.h + +.include @ 1.1 log @Build and install gdbm shared library, based on pr 4924 and fixes it. @ text @d1 2 @