From 1d3f3870f4d3ee48d56cc69a430e68dc5d384b37 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 17 Nov 2011 15:41:06 +0100
Subject: [PATCH] gdbm: update to 1.10, abi_depends bump.

---
 srcpkgs/gdbm/depends                       |  2 +-
 srcpkgs/gdbm/gdbm-devel.rshlibs            |  2 ++
 srcpkgs/gdbm/gdbm-devel.template           | 14 +++++------
 srcpkgs/gdbm/patches/fix_installation.diff | 29 ----------------------
 srcpkgs/gdbm/template                      | 14 +++--------
 xbps-src/common/mapping_shlib_binpkg.txt   |  2 +-
 6 files changed, 14 insertions(+), 49 deletions(-)
 create mode 100644 srcpkgs/gdbm/gdbm-devel.rshlibs
 delete mode 100644 srcpkgs/gdbm/patches/fix_installation.diff

diff --git a/srcpkgs/gdbm/depends b/srcpkgs/gdbm/depends
index e6315a0425..4edb2fea97 100644
--- a/srcpkgs/gdbm/depends
+++ b/srcpkgs/gdbm/depends
@@ -1,2 +1,2 @@
-abi_depends=">=1.8.0"
+abi_depends=">=1.10"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/gdbm/gdbm-devel.rshlibs b/srcpkgs/gdbm/gdbm-devel.rshlibs
new file mode 100644
index 0000000000..1a52581655
--- /dev/null
+++ b/srcpkgs/gdbm/gdbm-devel.rshlibs
@@ -0,0 +1,2 @@
+libc.so.6
+libgdbm.so.4
diff --git a/srcpkgs/gdbm/gdbm-devel.template b/srcpkgs/gdbm/gdbm-devel.template
index 65aef97896..c780f2a455 100644
--- a/srcpkgs/gdbm/gdbm-devel.template
+++ b/srcpkgs/gdbm/gdbm-devel.template
@@ -1,19 +1,17 @@
 # Template file for 'gdbm-devel'.
 #
-short_desc="${short_desc} (development files)"
+short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=2
-
 Add_dependency run glibc-devel
-Add_dependency run gdbm
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+	vmove usr/bin usr
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/share/info usr/share
+	vmove usr/share/man usr/share
 }
diff --git a/srcpkgs/gdbm/patches/fix_installation.diff b/srcpkgs/gdbm/patches/fix_installation.diff
deleted file mode 100644
index e9ad07c8d0..0000000000
--- a/srcpkgs/gdbm/patches/fix_installation.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.in.orig	2008-10-25 02:29:16.000000000 +0200
-+++ Makefile.in	2008-10-25 02:30:57.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
diff --git a/srcpkgs/gdbm/template b/srcpkgs/gdbm/template
index 141ceb98bc..cc77f2445e 100644
--- a/srcpkgs/gdbm/template
+++ b/srcpkgs/gdbm/template
@@ -1,21 +1,15 @@
 # Template file for 'gdbm'
 pkgname=gdbm
-version=1.8.3
-revision=3
+version=1.10
+homepage="http://www.gnu.org.ua/software/gdbm/"
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
-make_install_args="INSTALL_ROOT=$XBPS_DESTDIR/$pkgname-$version"
 short_desc="GNU database routines"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9
+license="GPL-3"
+checksum=23f8134c5b94bbfb06d756a6b78f074fba6e6028cf2fe01341d40b26db773441
 long_desc="
  GNU dbm is a set of database routines that use extensible hashing.
  It works similar to the standard Unix dbm routines."
 
 subpackages="gdbm-devel"
-
-post_build()
-{
-	mkdir -p ${DESTDIR}/usr/share/info
-	touch -f ${DESTDIR}/usr/share/info/dir
-}
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 4eef87ecdb..c5e3acb2d9 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -169,7 +169,7 @@ libbfd-2.21.so			binutils		binutils-devel
 libopcodes-2.21.so		binutils		binutils-devel
 libdb-4.8.so			libdb			db-devel
 libdb_cxx-4.8.so		libdb			db-devel
-libgdbm.so.3			gdbm			gdbm-devel
+libgdbm.so.4			gdbm			gdbm-devel
 libgettextsrc-0.18.1.so		gettext-libs		gettext-devel
 libgettextlib-0.18.1.so		gettext-libs		gettext-devel
 libgettextpo.so.0		gettext-libs		gettext-devel