5 files changed, 16 insertions, 43 deletions

diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index 2dfa5f4d6567..e9bc5d9b3176 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -6,30 +6,32 @@
 #
 
 PORTNAME=	gdbm
-PORTVERSION=	1.8.3
-PORTREVISION=	3
+PORTVERSION=	1.9.1
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	The GNU database manager
 
+OPTIONS=	COMPAT	"dbm/ndbm compatibility" off
+
+GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
+INFO=		gdbm
+MAN3=		gdbm.3
+
+.include <bsd.port.options.mk>
+
 .if defined(WITH_COMPAT)
-INSTALL_TARGET=	install install-compat
+CONFIGURE_ARGS+=--enable-libgdbm-compat
 PLIST_SUB=	GDBM_COMPAT=""
 .else
 PLIST_SUB=	GDBM_COMPAT="@comment "
 .endif
 
-MAN3=		gdbm.3
-INFO=		gdbm
-
 pre-everything::
 .if !defined(WITH_COMPAT)
 	@${ECHO_MSG}
diff --git a/databases/gdbm/distinfo b/databases/gdbm/distinfo
index 0268e6de7fac..af2e67eef35a 100644
--- a/databases/gdbm/distinfo
+++ b/databases/gdbm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gdbm-1.8.3.tar.gz) = cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9
-SIZE (gdbm-1.8.3.tar.gz) = 228695
+SHA256 (gdbm-1.9.1.tar.gz) = 6025852637772b0699f2294b5f14fd4a084bca3c8161d29d64d1f30d6d1a9aed
+SIZE (gdbm-1.9.1.tar.gz) = 554843
diff --git a/databases/gdbm/files/patch-configure b/databases/gdbm/files/patch-configure
deleted file mode 100644
index 75be7d85c377..000000000000
--- a/databases/gdbm/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sat Sep 28 08:23:50 2002
-+++ configure	Wed Oct 16 06:15:31 2002
-@@ -6974,6 +6974,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/databases/gdbm/files/patch-libtool22 b/databases/gdbm/files/patch-libtool22
deleted file mode 100644
index 5f6d58758f08..000000000000
--- a/databases/gdbm/files/patch-libtool22
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	2009-06-29 13:15:23.000000000 -0500
-+++ Makefile.in	2009-06-29 13:16:42.000000000 -0500
-@@ -130,7 +130,7 @@
- 	$(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \
- 		$(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
- 		$(INSTALL_ROOT)$(infodir)
--	$(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
-+	$(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
- 	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
- 		$(INSTALL_ROOT)$(includedir)/gdbm.h
- 	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
-@@ -141,7 +141,7 @@
- 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_ROOT)$(includedir)/dbm.h
diff --git a/databases/gdbm/pkg-plist b/databases/gdbm/pkg-plist
index d0cd72a312e7..c44b0eaf8111 100644
--- a/databases/gdbm/pkg-plist
+++ b/databases/gdbm/pkg-plist
@@ -1,12 +1,13 @@
 @comment $FreeBSD$
+bin/testgdbm
 include/gdbm.h
 %%GDBM_COMPAT%%include/dbm.h
 %%GDBM_COMPAT%%include/ndbm.h
 lib/libgdbm.a
 lib/libgdbm.la
 lib/libgdbm.so
-lib/libgdbm.so.3
+lib/libgdbm.so.4
 %%GDBM_COMPAT%%lib/libgdbm_compat.a
 %%GDBM_COMPAT%%lib/libgdbm_compat.la
 %%GDBM_COMPAT%%lib/libgdbm_compat.so
-%%GDBM_COMPAT%%lib/libgdbm_compat.so.3
+%%GDBM_COMPAT%%lib/libgdbm_compat.so.4