- Remove gdbm dependency

- Fix build on -current

PR:		55658
Submitted by:	Matthias Andree <matthias.andree@gmx.de>

3 files changed, 90 insertions, 6 deletions

diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index df14cafd91f4..0bc625185753 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	tdb
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,12 +16,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Trivial Database
 
-LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm
-
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-INSTALLS_SHLIB=	yes
+USE_AUTOMAKE_VER=	14
+USE_AUTOCONF_VER=	213
+USE_LIBTOOL_VER=	13
+INSTALLS_SHLIB=		yes
 
 MAN3=	tdb.3 tdb_chainlock.3 tdb_close.3 tdb_delete.3 tdb_error.3 \
 	tdb_exists.3 tdb_fetch.3 tdb_firstkey.3 tdb_open.3 tdb_store.3 \
diff --git a/databases/tdb/files/patch-tdbspeed-gdbm b/databases/tdb/files/patch-tdbspeed-gdbm
new file mode 100644
index 000000000000..f12e5bfc2832
--- /dev/null
+++ b/databases/tdb/files/patch-tdbspeed-gdbm
@@ -0,0 +1,42 @@
+--- configure.in.orig	2002-09-03 07:48:38.000000000 +1000
++++ configure.in	2002-09-03 07:45:23.000000000 +1000
+@@ -18,13 +18,14 @@
+ 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.)
++  AC_MSG_WARN(WARNING: tdbspeed and tdbtest are disabled. They need 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
+ 
++AM_CONDITIONAL(BUILD_TDBSPEED,$have_gdbm)
+ AM_CONDITIONAL(BUILD_TDBTEST,$have_gdbm)
+ AM_CONDITIONAL(BUILD_TDBTORTURE,$have_dllib)
+ 
+--- Makefile.am.orig	2002-09-03 07:48:50.000000000 +1000
++++ Makefile.am	2002-09-03 07:42:58.000000000 +1000
+@@ -1,6 +1,12 @@
+ CFLAGS = @CFLAGS@ @WARNS@
+ LDADD=libtdb.la
+ 
++if BUILD_TDBSPEED
++TDBSPEED = tdbspeed
++else
++TDBSPEED =
++endif
++
+ if BUILD_TDBTEST
+ TDBTEST = tdbtest
+ else
+@@ -13,7 +19,7 @@
+ TDBTORTURE =
+ endif
+ 
+-noinst_PROGRAMS=tdbspeed tdbiterate $(TDBTEST) $(TDBTORTURE)
++noinst_PROGRAMS=tdbiterate $(TDBSPEED) $(TDBTEST) $(TDBTORTURE)
+ bin_PROGRAMS=tdbtool tdbdump
+ 
+ lib_LTLIBRARIES=libtdb.la
diff --git a/databases/tdb/files/patch-tdbtool.c b/databases/tdb/files/patch-tdbtool.c
new file mode 100644
index 000000000000..8b68bac89979
--- /dev/null
+++ b/databases/tdb/files/patch-tdbtool.c
@@ -0,0 +1,43 @@
+--- tdbtool.c~	Tue Dec 11 04:45:47 2001
++++ tdbtool.c	Sun Aug 17 18:49:00 2003
+@@ -169,23 +169,23 @@
+ 
+ static void help(void)
+ {
+-	printf("
+-tdbtool: 
+-  create    dbname     : create a database
+-  open      dbname     : open an existing database
+-  erase                : erase the database
+-  dump      dumpname   : dump the database as strings
+-  insert    key  data  : insert a record
+-  store     key  data  : store a record (replace)
+-  show      key        : show a record by key
+-  delete    key        : delete a record by key
+-  list                 : print the database hash table and freelist
+-  free                 : print the database freelist
+-  1 | first            : print the first record
+-  n | next             : print the next record
+-  q | quit             : terminate
+-  \\n                   : repeat 'next' command
+-");
++	puts("");
++	puts("tdbtool: ");
++	puts("  create    dbname     : create a database");
++	puts("  open      dbname     : open an existing database");
++	puts("  erase                : erase the database");
++	puts("  dump      dumpname   : dump the database as strings");
++	puts("  insert    key  data  : insert a record");
++	puts("  store     key  data  : store a record (replace)");
++	puts("  show      key        : show a record by key");
++	puts("  delete    key        : delete a record by key");
++	puts("  list                 : print the database hash table and freelist");
++	puts("  free                 : print the database freelist");
++	puts("  1 | first            : print the first record");
++	puts("  n | next             : print the next record");
++	puts("  q | quit             : terminate");
++	puts("  \\n                   : repeat 'next' command");
++	puts("");
+ }
+ 
+ static void terror(char *why)