On 2010/04/20 00:27, Nicholas Marriott wrote: > They got rid of the tdb man pages? :-/
There are manpages for tdbbackup/tdbdump/tdbtool (need xsltproc and an stylesheet that's retrieved via http) but the library docs definitely are worse in this release :( all we have is a couple of text files in docs/. It would make sense to install those though, the diff below does that. > Not tested but the fdm and tdb bits look fine to me. Lightly tested here, but most of my mail bypasses fdm. > I didn't realise they still did a separate release of tdb. Nor did I until today - I've looked for updates before but didn't find any, googleing didn't help me find this one, I just noticed that a few OS had a newer version of tdb as a separate library and after seeing talloc, I thought to try http://tdb.samba.org, and there it was... Index: Makefile =================================================================== RCS file: /cvs/ports/databases/tdb/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile 22 Mar 2010 09:38:36 -0000 1.3 +++ Makefile 20 Apr 2010 00:32:42 -0000 @@ -2,10 +2,9 @@ COMMENT= trivial database library -DISTNAME= tdb-1.0.6 -PKGNAME= ${DISTNAME}p1 +DISTNAME= tdb-1.2.1 CATEGORIES= databases -SHARED_LIBS+= tdb 1.0 +SHARED_LIBS+= tdb 2.0 MAINTAINER= Nicholas Marriott <n...@users.sourceforge.net> @@ -15,10 +14,22 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tdb/} -CONFIGURE_STYLE=autoconf -CONFIGURE_ARGS= --includedir=${TRUEPREFIX}/include/tdb -AUTOCONF_VERSION=2.13 +WANTLIB= c + +HOMEPAGE= http://tdb.samba.org/ +MASTER_SITES= http://samba.org/ftp/tdb/ + +CONFIGURE_STYLE=gnu +CONFIGURE_ARGS= --disable-python +USE_GMAKE= Yes USE_LIBTOOL= Yes +MAKE_FLAGS= TDB_SOLIB=libtdb.so.${LIBtdb_VERSION} \ + TDB_SONAME=libtdb.so.${LIBtdb_VERSION} + +INSTALL_TARGET= installdirs installbin installheaders installlibs + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tdb + ${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/tdb/ .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/databases/tdb/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 28 Jul 2007 21:37:26 -0000 1.1.1.1 +++ distinfo 20 Apr 2010 00:32:42 -0000 @@ -1,5 +1,5 @@ -MD5 (tdb-1.0.6.tar.gz) = a2Q/3rSDBAENzV9nXkWLWA== -RMD160 (tdb-1.0.6.tar.gz) = UWPK8cx2yfOmnoj3Q47NmOxeUs8= -SHA1 (tdb-1.0.6.tar.gz) = 0YdlIvG4/6jPhEofZgXgwy04eno= -SHA256 (tdb-1.0.6.tar.gz) = I1vU+CMhZ1d5sO0Jl1PQg1sPPlO8RYRvNy/VE1AlK7I= -SIZE (tdb-1.0.6.tar.gz) = 139948 +MD5 (tdb-1.2.1.tar.gz) = c+qBKCqC5clZ2cCCry0CFQ== +RMD160 (tdb-1.2.1.tar.gz) = 8kiCJXu0Yu3BDI7w2jnYLOhHVGw= +SHA1 (tdb-1.2.1.tar.gz) = mjsrh++3t7FGsRzNfUgCOaGaMNI= +SHA256 (tdb-1.2.1.tar.gz) = 70I7k0xd3+3ao9OxVnBysNb3JDu65f02OhsJCwVzzfo= +SIZE (tdb-1.2.1.tar.gz) = 268142 Index: patches/patch-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- patches/patch-Makefile_in 28 Jul 2007 21:37:26 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,34 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/07/28 21:37:26 jasper Exp $ ---- Makefile.in.orig Tue Dec 11 04:08:49 2001 -+++ Makefile.in Thu Jun 28 12:15:24 2007 -@@ -80,8 +80,8 @@ LDADD = libtdb.la - @build_tdbtorture_t...@tdbtorture = tdbtorture - @build_tdbtorture_fa...@tdbtorture = - --noinst_PROGRAMS = tdbspeed tdbiterate $(TDBTEST) $(TDBTORTURE) --bin_PROGRAMS = tdbtool tdbdump -+noinst_PROGRAMS = tdbtool tdbdump tdbspeed tdbiterate $(TDBTEST) $(TDBTORTURE) -+bin_PROGRAMS = - - lib_LTLIBRARIES = libtdb.la - -@@ -115,7 +115,7 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ - libtdb_la_LIBADD = - libtdb_la_OBJECTS = tdb.lo spinlock.lo --PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -+PROGRAMS = - - tdbtool_OBJECTS = tdbtool.o - tdbtool_LDADD = $(LDADD) -@@ -159,8 +159,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEX - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libtdb_la_SOURCES) $(tdbtool_SOURCES) $(tdbdump_SOURCES) $(tdbspeed_SOURCES) $(tdbiterate_SOURCES) $(tdbtest_SOURCES) $(tdbtorture_SOURCES) --OBJECTS = $(libtdb_la_OBJECTS) $(tdbtool_OBJECTS) $(tdbdump_OBJECTS) $(tdbspeed_OBJECTS) $(tdbiterate_OBJECTS) $(tdbtest_OBJECTS) $(tdbtorture_OBJECTS) -+SOURCES = $(libtdb_la_SOURCES) -+OBJECTS = $(libtdb_la_OBJECTS) - - all: all-redirect - .SUFFIXES: Index: patches/patch-configure_in =================================================================== RCS file: patches/patch-configure_in diff -N patches/patch-configure_in --- patches/patch-configure_in 28 Jul 2007 21:37:26 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,33 +0,0 @@ -$OpenBSD: patch-configure_in,v 1.1.1.1 2007/07/28 21:37:26 jasper Exp $ ---- configure.in.orig Thu Jun 28 11:58:50 2007 -+++ configure.in Thu Jun 28 11:59:20 2007 -@@ -15,18 +15,18 @@ AC_PROG_INSTALL - AC_PROG_RANLIB - - dnl Checks for libraries. --AC_CHECK_LIB(gdbm, gdbm_open, -- [have_gdbm=true],[have_gdbm=false]) --if test "x$have_gdbm" = "xfalse";then -- AC_MSG_WARN(WARNING: tdbtest is disabled. It needs gdbm.) --fi --AC_CHECK_LIB(dl, dlopen,[have_dllib=true],[have_dllib=false]) --if test "x$have_dllib" = "xfalse";then -- AC_MSG_WARN(WARNING: tdbtorture is disabled. It needs libdl.) --fi -+dnl AC_CHECK_LIB(gdbm, gdbm_open, -+dnl [have_gdbm=true],[have_gdbm=false]) -+dnl if test "x$have_gdbm" = "xfalse";then -+dnl AC_MSG_WARN(WARNING: tdbtest is disabled. It needs gdbm.) -+dnl fi -+dnl AC_CHECK_LIB(dl, dlopen,[have_dllib=true],[have_dllib=false]) -+dnl if test "x$have_dllib" = "xfalse";then -+dnl AC_MSG_WARN(WARNING: tdbtorture is disabled. It needs libdl.) -+dnl fi - --AM_CONDITIONAL(BUILD_TDBTEST,$have_gdbm) --AM_CONDITIONAL(BUILD_TDBTORTURE,$have_dllib) -+dnl AM_CONDITIONAL(BUILD_TDBTEST,$have_gdbm) -+dnl AM_CONDITIONAL(BUILD_TDBTORTURE,$have_dllib) - - AC_ARG_WITH(spinlocks, [ --with-spinlocks use spin locks instead of fcntl locks ]) - if test "x$with_spinlocks" = "xyes"; then Index: patches/patch-rules_mk =================================================================== RCS file: patches/patch-rules_mk diff -N patches/patch-rules_mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-rules_mk 20 Apr 2010 00:32:42 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ +--- rules.mk.orig Mon Apr 19 12:16:11 2010 ++++ rules.mk Mon Apr 19 12:16:23 2010 +@@ -8,9 +8,9 @@ showflags:: + .SUFFIXES: .c .o + + .c.o: +- @echo Compiling $*.c ++ @#echo Compiling $*.c + @mkdir -p `dirname $...@` +- @$(CC) $(PICFLAG) $(CFLAGS) $(ABI_CHECK) -c $< -o $@ ++ $(CC) $(PICFLAG) $(CFLAGS) $(ABI_CHECK) -c $< -o $@ + + distclean:: + rm -f *~ */*~ Index: patches/patch-tdb_mk =================================================================== RCS file: patches/patch-tdb_mk diff -N patches/patch-tdb_mk --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tdb_mk 20 Apr 2010 00:32:42 -0000 @@ -0,0 +1,18 @@ +$OpenBSD$ +--- tdb.mk.orig Mon Apr 19 13:06:58 2010 ++++ tdb.mk Mon Apr 19 13:07:30 2010 +@@ -91,10 +91,10 @@ installheaders:: installdirs + installlibs:: all installdirs + cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig + cp $(TDB_STLIB) $(TDB_SOLIB) $(DESTDIR)$(libdir) +- rm -f $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT) +- ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT) +- rm -f $(DESTDIR)$(libdir)/$(TDB_SONAME) +- ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/$(TDB_SONAME) ++ @#rm -f $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT) ++ @#ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT) ++ @#rm -f $(DESTDIR)$(libdir)/$(TDB_SONAME) ++ @#ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/$(TDB_SONAME) + + $(TDB_STLIB): $(TDB_OBJ) + ar -rv $(TDB_STLIB) $(TDB_OBJ) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/databases/tdb/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 22 Mar 2010 09:38:36 -0000 1.2 +++ pkg/PLIST 20 Apr 2010 00:32:42 -0000 @@ -1,17 +1,14 @@ @comment $OpenBSD: PLIST,v 1.2 2010/03/22 09:38:36 sthen Exp $ +...@conflict samba-<3.5.0 %%SHARED%% -include/tdb/ -include/tdb/tdb.h +...@bin bin/tdbbackup +...@bin bin/tdbdump +...@bin bin/tdbtool +include/tdb.h lib/libtdb.a -lib/libtdb.la -...@man man/man3/tdb.3 -...@man man/man3/tdb_chainlock.3 -...@man man/man3/tdb_close.3 -...@man man/man3/tdb_delete.3 -...@man man/man3/tdb_error.3 -...@man man/man3/tdb_exists.3 -...@man man/man3/tdb_fetch.3 -...@man man/man3/tdb_firstkey.3 -...@man man/man3/tdb_open.3 -...@man man/man3/tdb_store.3 -...@man man/man3/tdb_traverse.3 +lib/pkgconfig/ +lib/pkgconfig/tdb.pc +share/doc/tdb/ +share/doc/tdb/README +share/doc/tdb/tdb.magic +share/doc/tdb/tracing.txt
