diff --git a/security/libmcrypt/patches/patch-ltconfig b/security/libmcrypt/patches/patch-ltconfig
index be5dc2f6e40..5efa372206f 100644
--- a/security/libmcrypt/patches/patch-ltconfig
+++ b/security/libmcrypt/patches/patch-ltconfig
@@ -1,6 +1,6 @@
---- ltconfig.orig	Sat Oct 21 04:39:25 2000
-+++ ltconfig	Thu Dec 14 11:44:23 2000
-@@ -1105,6 +1105,9 @@
+--- ltconfig.orig	Thu Feb  1 07:27:33 2001
++++ ltconfig	Tue Feb 20 13:12:58 2001
+@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
      with_gnu_ld=no
    fi
    ;;
@@ -10,7 +10,7 @@
  
  esac
  
-@@ -1402,10 +1405,18 @@
+@@ -1402,10 +1405,21 @@ else
      ;;
  
    openbsd*)
@@ -19,19 +19,22 @@
      hardcode_direct=yes
      hardcode_shlibpath_var=no
 +    case "$host_os" in
-+      openbsd2.[01234567])
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-+	hardcode_libdir_flag_spec='-R$libdir'
++      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
++       hardcode_libdir_flag_spec='-R$libdir'
 +      ;;
 +      *)
-+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
-+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
++       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++       if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
++         export_dynamic_flag_spec='${wl}-E'
++       fi
 +      ;;
 +    esac
      ;;
  
    os2*)
-@@ -2022,13 +2033,10 @@
+@@ -2022,13 +2036,10 @@ netbsd*)
  
  openbsd*)
    version_type=sunos
diff --git a/security/libmcrypt/patches/patch-ltmain.sh b/security/libmcrypt/patches/patch-ltmain.sh
index 7091c6396e2..c85807e9b15 100644
--- a/security/libmcrypt/patches/patch-ltmain.sh
+++ b/security/libmcrypt/patches/patch-ltmain.sh
@@ -1,6 +1,36 @@
---- ltmain.sh.orig	Sat Oct 21 04:39:25 2000
-+++ ltmain.sh	Thu Dec 14 11:44:26 2000
-@@ -1799,6 +1799,9 @@
+--- ltmain.sh.orig	Thu Feb  1 07:27:33 2001
++++ ltmain.sh	Tue Feb 20 13:14:09 2001
+@@ -1079,7 +1079,18 @@ compiler."
+ 	    # These systems don't actually have c library (as such)
+ 	    continue
+ 	    ;;
++          *-*-openbsd*)
++            # Do not include libc due to us having libc/libc_r.
++            continue
++            ;;
+ 	  esac
++        elif test "$arg" = "-lc_r"; then
++          case "$host" in
++          *-*-openbsd*)
++            # Do not include libc_r directly, use -pthread flag.
++            continue
++            ;;
++          esac
+ 	elif test "$arg" = "-lm"; then
+ 	  case "$host" in
+ 	  *-*-cygwin* | *-*-beos*)
+@@ -1091,6 +1102,10 @@ compiler."
+ 	deplibs="$deplibs $arg"
+ 	;;
+ 
++      -?thread)
++        deplibs="$deplibs $arg"
++        ;;
++
+       -module)
+ 	module=yes
+ 	continue
+@@ -1799,6 +1814,9 @@ compiler."
  	  # rhapsody is a little odd...
  	  deplibs="$deplibs -framework System"
  	  ;;
@@ -10,7 +40,7 @@
  	*)
  	  # Add libc to deplibs on all other systems.
  	  deplibs="$deplibs -lc"
-@@ -3567,40 +3570,6 @@
+@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0
  
diff --git a/www/libghttp/patches/patch-ltconfig b/www/libghttp/patches/patch-ltconfig
index a38cfb2177e..2ff40403e54 100644
--- a/www/libghttp/patches/patch-ltconfig
+++ b/www/libghttp/patches/patch-ltconfig
@@ -1,6 +1,47 @@
 --- ltconfig.orig	Mon Aug 14 15:10:37 2000
-+++ ltconfig	Thu Aug 17 13:02:48 2000
-@@ -1962,6 +1962,7 @@
++++ ltconfig	Tue Feb 20 13:08:54 2001
+@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
+     with_gnu_ld=no
+   fi
+   ;;
++openbsd*)
++  with_gnu_ld=no
++  ;;
+ 
+ esac
+ 
+@@ -1391,10 +1394,21 @@ else
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+-    hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
++    case "$host_os" in
++      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
++       hardcode_libdir_flag_spec='-R$libdir'
++      ;;
++      *)
++       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
++       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++       if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
++         export_dynamic_flag_spec='${wl}-E'
++       fi
++      ;;
++    esac
+     ;;
+ 
+   os2*)
+@@ -1955,13 +1969,10 @@ netbsd*)
+ 
+ openbsd*)
+   version_type=sunos
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-    need_version=no
+-  fi
    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
diff --git a/www/libghttp/patches/patch-ltmain.sh b/www/libghttp/patches/patch-ltmain.sh
index eb663501809..6ceb4707334 100644
--- a/www/libghttp/patches/patch-ltmain.sh
+++ b/www/libghttp/patches/patch-ltmain.sh
@@ -1,6 +1,46 @@
---- ltmain.sh.orig	Thu Aug 17 13:02:11 2000
-+++ ltmain.sh	Thu Aug 17 13:02:25 2000
-@@ -3522,40 +3522,6 @@
+--- ltmain.sh.orig	Mon Aug 14 15:10:37 2000
++++ ltmain.sh	Tue Feb 20 13:10:11 2001
+@@ -1073,7 +1073,18 @@ compiler."
+ 	    # These systems don't actually have c library (as such)
+ 	    continue
+ 	    ;;
++          *-*-openbsd*)
++            # Do not include libc due to us having libc/libc_r.
++            continue
++            ;;
+ 	  esac
++        elif test "$arg" = "-lc_r"; then
++          case "$host" in
++          *-*-openbsd*)
++            # Do not include libc_r directly, use -pthread flag.
++            continue
++            ;;
++          esac
+ 	elif test "$arg" = "-lm"; then
+ 	  case "$host" in
+ 	  *-*-cygwin* | *-*-beos*)
+@@ -1085,6 +1096,10 @@ compiler."
+ 	deplibs="$deplibs $arg"
+ 	;;
+ 
++      -?thread)
++        deplibs="$deplibs $arg"
++        ;;
++
+       -module)
+ 	module=yes
+ 	continue
+@@ -1789,6 +1804,9 @@ compiler."
+ 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
+ 	  # these systems don't actually have a c library (as such)!
+ 	  ;;
++        *-*-openbsd*)
++          # Do not include libc due to us having libc/libc_r.
++          ;;
+ 	*)
+ 	  # Add libc to deplibs on all other systems.
+ 	  deplibs="$deplibs -lc"
+@@ -3522,40 +3540,6 @@ libdir='$install_libdir'\
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0