2 files changed, 50 insertions, 3 deletions
diff --git a/databases/qdbm/files/patch-Makefile.in b/databases/qdbm/files/patch-Makefile.in
index 1eeb64fc78e7..dd7a54bee60b 100644
--- a/databases/qdbm/files/patch-Makefile.in
+++ b/databases/qdbm/files/patch-Makefile.in
@@ -1,11 +1,29 @@
 --- Makefile.in.orig	2010-08-04 17:14:34 UTC
 +++ Makefile.in
-@@ -56,7 +56,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MY
+@@ -51,20 +51,19 @@ DESTDIR =
+ 
+ # Building binaries
+ CC = @CC@
+-CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) \
+-  -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
++CPPFLAGS = @CPPFLAGS@ -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
 -CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@
-+CFLAGS = @CFLAGS@ -Wall -pedantic -fPIC -fsigned-char
++CFLAGS = @CFLAGS@
  LD = @LD@
  LIBS = -lqdbm @LIBS@
- LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
+-LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
+-LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
++LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) @LIBS@
++LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) $(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/files/patch-configure b/databases/qdbm/files/patch-configure
new file mode 100644
index 000000000000..020738ad5204
--- /dev/null
+++ b/databases/qdbm/files/patch-configure
@@ -0,0 +1,29 @@
+--- configure.orig	2010-08-04 17:15:20 UTC
++++ configure
+@@ -1934,7 +1934,7 @@ fi
+ if test "$enable_iconv" = "yes"
+ then
+   MYDEFS="$MYDEFS -DMYICONV"
+-  MGWLIBS="-liconv $MGWLIBS"
++  MGWLIBS="$ICONV_LIB $MGWLIBS"
+   enables="$enables (iconv)"
+   isiconv="yes"
+ fi
+@@ -3047,7 +3047,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.  */
+ 
+@@ -3076,7 +3076,7 @@ if test "x$ac_cv_lib_iconv_main" = x""ye
+ #define HAVE_LIBICONV 1
+ _ACEOF
+ 
+-  LIBS="-liconv $LIBS"
++  LIBS="$ICONV_LIB $LIBS"
+ 
+ fi
+