3 files changed, 46 insertions, 6 deletions
diff --git a/databases/qdbm-plus/files/patch-Makefile.in b/databases/qdbm-plus/files/patch-Makefile.in
index 17d294b238ff..a1d8a4af8a11 100644
--- a/databases/qdbm-plus/files/patch-Makefile.in
+++ b/databases/qdbm-plus/files/patch-Makefile.in
@@ -1,11 +1,31 @@
 --- Makefile.in.orig	2007-03-07 02:44:50 UTC
 +++ Makefile.in
-@@ -44,7 +44,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(sr
+@@ -39,22 +39,19 @@ DESTDIR =
+ 
+ # Building binaries
+ CXX = @CXX@
+-CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(srcdir)/.. -I$(MYHEADDIR) \
+-  -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
++CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(srcdir)/.. -I$(MYHEADDIR) @MYDEFS@ \
    -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
    -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
    -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
 -CXXFLAGS = -Wall -ansi -pedantic -fsigned-char -fPIC -O2 -fno-strict-aliasing @MYOPTS@
-+CXXFLAGS = @CXXFLAGS@ -Wall -ansi -pedantic -fsigned-char -fPIC -fno-strict-aliasing
++CXXFLAGS = @CXXFLAGS@
  LD = @LD@
  LIBS = -lqdbm @LIBS@
- LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
+-LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
+-  -L$(HOME)/lib -L/usr/local/lib $(LIBS)
+-LDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
+-  -L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS)
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
++LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) $(LIBS)
++LDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) -lxqdbm $(LIBS)
++LDENV =
+ AR = @AR@
+ ARFLAGS = rcsv
+-RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
++RUNENV =
+ 
+ 
+ 
diff --git a/databases/qdbm-plus/files/patch-configure b/databases/qdbm-plus/files/patch-configure
new file mode 100644
index 000000000000..38535a418c1d
--- /dev/null
+++ b/databases/qdbm-plus/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	2010-08-04 17:15:28 UTC
++++ configure
+@@ -3203,7 +3203,7 @@ if test "${ac_cv_lib_iconv_main+set}" = 
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-liconv  $LIBS"
++LIBS="$ICONV_LIB $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -3232,7 +3232,7 @@ if test "x$ac_cv_lib_iconv_main" = x""ye
+ #define HAVE_LIBICONV 1
+ _ACEOF
+ 
+-  LIBS="-liconv $LIBS"
++  LIBS="$ICONV_LIB $LIBS"
+ 
+ fi
+ 
diff --git a/databases/qdbm-plus/files/patch-xadbm.h b/databases/qdbm-plus/files/patch-xadbm.h
index 764758af9f45..918099731bb3 100644
--- a/databases/qdbm-plus/files/patch-xadbm.h
+++ b/databases/qdbm-plus/files/patch-xadbm.h
@@ -1,6 +1,6 @@
---- xadbm.h.orig	2006-01-01 08:23:58.000000000 +0300
-+++ xadbm.h	2015-01-28 23:44:53.000000000 +0300
-@@ -72,21 +72,21 @@
+--- xadbm.h.orig	2006-01-01 05:23:58 UTC
++++ xadbm.h
+@@ -72,21 +72,21 @@ private:
   * @param latter the latter datum.
   * @return reference to a temporary instance.
   */