diff --git a/databases/gdbm/patches/patch-ac b/databases/gdbm/patches/patch-Makefile_in
similarity index 75%
rename from databases/gdbm/patches/patch-ac
rename to databases/gdbm/patches/patch-Makefile_in
index fcb4f277867..4560aa450f9 100644
--- a/databases/gdbm/patches/patch-ac
+++ b/databases/gdbm/patches/patch-Makefile_in
@@ -1,6 +1,7 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2001/08/26 23:45:18 brad Exp $
 --- Makefile.in.orig	Tue May 18 23:16:06 1999
-+++ Makefile.in	Thu Dec  9 15:57:41 1999
-@@ -18,20 +18,20 @@
++++ Makefile.in	Sun Aug 26 19:15:54 2001
+@@ -18,20 +18,20 @@ INSTALL_DATA = @INSTALL_DATA@
  BINOWN = bin
  BINGRP = bin
  
@@ -25,7 +26,7 @@
  exec_prefix = $(prefix)
  binprefix = $(exec_prefix)
  manprefix = $(prefix)
-@@ -115,7 +115,7 @@
+@@ -115,7 +115,7 @@ MSCFILES = COPYING ChangeLog Makefile.in
  
  DISTFILES = $(SRCS) $(HDRS) $(MSCFILES)
  
@@ -34,7 +35,7 @@
  
  progs: $(PROGS)
  
-@@ -187,7 +187,8 @@
+@@ -187,7 +187,8 @@ TAGS: $(SRCS)
  
  info: gdbm.info
  
diff --git a/databases/gdbm/patches/patch-ab b/databases/gdbm/patches/patch-gdbm_texinfo
similarity index 69%
rename from databases/gdbm/patches/patch-ab
rename to databases/gdbm/patches/patch-gdbm_texinfo
index 0a4072ae55d..d42b2609c2e 100644
--- a/databases/gdbm/patches/patch-ab
+++ b/databases/gdbm/patches/patch-gdbm_texinfo
@@ -1,5 +1,6 @@
---- gdbm.texinfo.orig	Tue Jun 22 09:45:56 1999
-+++ gdbm.texinfo	Tue Jun 22 09:48:55 1999
+$OpenBSD: patch-gdbm_texinfo,v 1.1 2001/08/26 23:45:18 brad Exp $
+--- gdbm.texinfo.orig	Wed May 19 00:35:25 1999
++++ gdbm.texinfo	Sun Aug 26 19:15:54 2001
 @@ -2,6 +2,10 @@
  @comment %**start of header (This is for running Texinfo on a region.)
  @setfilename gdbm.info
diff --git a/databases/gdbm/patches/patch-ltconfig b/databases/gdbm/patches/patch-ltconfig
index f482b096c53..e00f3946ac4 100644
--- a/databases/gdbm/patches/patch-ltconfig
+++ b/databases/gdbm/patches/patch-ltconfig
@@ -1,6 +1,22 @@
 --- ltconfig.orig	Tue May 18 20:17:36 1999
-+++ ltconfig	Sun Feb 18 11:45:07 2001
-@@ -702,7 +702,7 @@
++++ ltconfig	Sun Aug 26 19:20:59 2001
+@@ -348,7 +348,14 @@ fi
+ 
+ if test -n "$RANLIB"; then
+   old_archive_cmds="$old_archive_cmds;\$RANLIB \$oldlib"
+-  old_postinstall_cmds="\$RANLIB \$oldlib;$old_postinstall_cmds"
++  case "$host_os" in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib;$old_postinstall_cmds"
++  ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib;$old_postinstall_cmds"
++  ;;
++  esac
+ fi
+ 
+ # Check to see if we are using GCC.
+@@ -702,7 +709,7 @@ hardcode_shlibpath_var=unsupported
  runpath_var=
  
  case "$host_os" in
@@ -9,7 +25,7 @@
    # On these operating systems, we should treat GNU ld like the system ld.
    gnu_ld_acts_native=yes
    ;;
-@@ -815,10 +815,21 @@
+@@ -815,10 +822,21 @@ else
      ;;
  
    openbsd*)
@@ -25,7 +41,7 @@
 +      *)
 +	archive_cmds='$CC -shared $pic_flag -o $lib$libobjs'
 +	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
++	if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 +	  export_dynamic_flag_spec='${wl}-E'
 +	fi
 +      ;;
diff --git a/databases/gdbm/patches/patch-aa b/databases/gdbm/patches/patch-ltmain_sh
similarity index 81%
rename from databases/gdbm/patches/patch-aa
rename to databases/gdbm/patches/patch-ltmain_sh
index 204b7846a1a..7439ba5041c 100644
--- a/databases/gdbm/patches/patch-aa
+++ b/databases/gdbm/patches/patch-ltmain_sh
@@ -1,23 +1,24 @@
---- ltmain.sh.orig	Wed Mar 25 10:25:39 1998
-+++ ltmain.sh	Sat Oct 21 14:18:54 2000
-@@ -1002,7 +1002,15 @@
+$OpenBSD: patch-ltmain_sh,v 1.1 2001/08/26 23:45:18 brad Exp $
+--- ltmain.sh.orig	Tue May 18 20:17:36 1999
++++ ltmain.sh	Sun Aug 26 19:26:08 2001
+@@ -1002,7 +1002,15 @@ if test -z "$show_help"; then
  
        # Add libc to deplibs on all systems.
        dependency_libs="$deplibs"
 -      deplibs="$deplibs -lc"
 +      case "$host_os" in
 +      openbsd*)
-+		# do not include libc due to us having libc/libc_r.
++	# do not include libc due to us having libc/libc_r.
 +      ;;
 +      *)
-+		# Add libc to deplibs on all other systems.
-+		deplibs="$deplibs -lc"
++	# Add libc to deplibs on all other systems.
++	deplibs="$deplibs -lc"
 +      ;;
 +      esac
  
        if test "$build_libtool_libs" = yes; then
          # Get the real and link names of the library.
-@@ -2023,37 +2031,6 @@
+@@ -2023,37 +2031,6 @@ libdir='$install_libdir'\
        done
      fi