From 4a4aad4e6f1b37709cc423fb551d23624ada169c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 24 Aug 2011 17:00:17 +0000
Subject: [PATCH] GNU dbm 1.9.1.

svn path=/nixpkgs/trunk/; revision=28791
---
 pkgs/development/libraries/gdbm/default.nix   | 40 ++++++++++++++-----
 pkgs/development/libraries/gdbm/install.patch | 29 --------------
 2 files changed, 29 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/development/libraries/gdbm/install.patch

diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix
index 448fd04edd81..807e6a6a2a82 100644
--- a/pkgs/development/libraries/gdbm/default.nix
+++ b/pkgs/development/libraries/gdbm/default.nix
@@ -1,22 +1,40 @@
-{ stdenv, fetchurl, automake }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gdbm-1.8.3";
+  name = "gdbm-1.9.1";
+
   src = fetchurl {
     url = "mirror://gnu/gdbm/${name}.tar.gz";
-    sha256 = "1j8x51xc71di1fx23sl22n5ghlqxl9a57sxri82l12z2l8w06d6c";
+    sha256 = "1vcs39nhvwyicjfx4qc17k54n22azla5yjr9yachcavp6wk8a9b0";
   };
 
-  patches = [ ./install.patch ];
-
-  # The fuloong2f is not supported by gdbm 1.8.3 still
-  preConfigure = ''
-    cp ${automake}/share/automake*/config.{sub,guess} .
-  '';
+  doCheck = true;
 
   meta = {
-    description = "GNU DBM key/value database library";
+    description = "GNU dbm key/value database library";
+
+    longDescription =
+      '' GNU dbm (or GDBM, for short) is a library of database functions that
+         use extensible hashing and work similar to the standard UNIX dbm.
+         These routines are provided to a programmer needing to create and
+         manipulate a hashed database.
+
+         The basic use of GDBM is to store key/data pairs in a data file.
+         Each key must be unique and each key is paired with only one data
+         item.
+
+         The library provides primitives for storing key/data pairs,
+         searching and retrieving the data by its key and deleting a key
+         along with its data.  It also support sequential iteration over all
+         key/data pairs in a database.
+
+         For compatibility with programs using old UNIX dbm function, the
+         package also provides traditional dbm and ndbm interfaces.
+      '';
+
     homepage = http://www.gnu.org/software/gdbm/;
-    license = "GPLv2+";
+    license = "GPLv3+";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
diff --git a/pkgs/development/libraries/gdbm/install.patch b/pkgs/development/libraries/gdbm/install.patch
deleted file mode 100644
index 81afe020b7be..000000000000
--- a/pkgs/development/libraries/gdbm/install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gdbm-1.8.3/Makefile.in	2002-10-08 18:09:12.000000000 +0200
-+++ gdbm-1.8.3/Makefile.in	2008-04-07 01:15:58.000000000 +0200
-@@ -131,11 +131,11 @@ install: libgdbm.la gdbm.h gdbm.info
- 		$(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 \
-+	$(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:
-@@ -143,9 +143,9 @@ install-compat:
- 		$(INSTALL_ROOT)$(includedir)
- 	$(LIBTOOL) $(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