gdbm: merge r28217, r28221, r28237

SVN-Revision: 30042

diff --git a/libs/gdbm/Makefile b/libs/gdbm/Makefile
index 9d9c58cc0111fd97a8bfb9026b91418f5b07b03a..32716d297f6afff78c5608168a3cc17b4e842bee 100644 (file)
--- a/libs/gdbm/Makefile
+++ b/libs/gdbm/Makefile
@@ -8,15 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gdbm
-PKG_VERSION:=1.8.3
-PKG_RELEASE:=1
+PKG_VERSION:=1.9.1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gdbm
-PKG_MD5SUM:=1d1b1d5c0245b1c00aff92da751e9aa1
+PKG_MD5SUM:=59f6e4c4193cb875964ffbe8aa384b58
 
 PKG_FIXUP:=libtool
-PKG_BUILD_PARALLEL:=1
+PKG_BUILD_PARALLEL:=0
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -37,7 +37,7 @@ define Build/Compile
        $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
                BINOWN=`id -u` \
                BINGRP=`id -g` \
-               INSTALL_ROOT="$(PKG_INSTALL_DIR)" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 

diff --git a/libs/gdbm/patches/100-fix-build-with-libtool2.patch b/libs/gdbm/patches/100-fix-build-with-libtool2.patch
deleted file mode 100644 (file)
index 8501971..0000000
--- a/libs/gdbm/patches/100-fix-build-with-libtool2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -55,7 +55,7 @@ manext = 3
- .c.lo:
-       $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) $(CFLAGS) $<
- 
--SHELL = /bin/sh
-+SHELL = @SHELL@
- 
- PROGS = libgdbm.la testgdbm testdbm testndbm tndbm tdbm conv2gdbm
- 
-@@ -130,7 +130,7 @@ install: libgdbm.la gdbm.h gdbm.info
-       $(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: libgdbm.la gdbm.h gdbm.info
- 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