diff --git a/print/freetype/patches/patch-Makefile.in b/print/freetype/patches/patch-Makefile_in
similarity index 83%
rename from print/freetype/patches/patch-Makefile.in
rename to print/freetype/patches/patch-Makefile_in
index b73f597b4e0..0246e3e4dfd 100644
--- a/print/freetype/patches/patch-Makefile.in
+++ b/print/freetype/patches/patch-Makefile_in
@@ -1,6 +1,7 @@
---- Makefile.in.orig	Sat Nov 11 21:24:10 2000
-+++ Makefile.in	Sat Nov 11 21:25:18 2000
-@@ -8,9 +8,9 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2001/02/19 20:04:09 danh Exp $
+--- Makefile.in.orig	Wed Aug 19 21:59:56 1998
++++ Makefile.in	Mon Feb 19 14:57:25 2001
+@@ -8,9 +8,9 @@ FTLIBDIR = lib
  FTTESTDIR = test
  FTPODIR = po
  
@@ -12,7 +13,7 @@
  
  # we can't use the target names 'lib', 'test', etc.
  # because make will believe that the directories are
-@@ -22,30 +22,23 @@
+@@ -22,30 +22,23 @@ ttlib:
  ttlibdebug:
  	cd $(FTLIBDIR); $(MAKE) -f $(MAKEFILE) debug
  
@@ -43,7 +44,7 @@
  	cd $(FTPODIR); $(MAKE) distclean
  	$(RMF) config.cache config.log config.status Makefile \
                 MakeSub ft_conf.h libtool
-@@ -55,6 +48,5 @@
+@@ -55,6 +48,5 @@ check:
  
  depend:
  	cd $(FTLIBDIR); $(MAKE) -f $(MAKEFILE) depend
diff --git a/print/freetype/patches/patch-aa b/print/freetype/patches/patch-lib_arch_unix_Makefile_in
similarity index 58%
rename from print/freetype/patches/patch-aa
rename to print/freetype/patches/patch-lib_arch_unix_Makefile_in
index ece2904638a..aa73833e1c4 100644
--- a/print/freetype/patches/patch-aa
+++ b/print/freetype/patches/patch-lib_arch_unix_Makefile_in
@@ -1,6 +1,7 @@
---- lib/arch/unix/Makefile.in.orig	Wed Jan 19 18:08:23 2000
-+++ lib/arch/unix/Makefile.in	Wed Jan 19 18:09:09 2000
-@@ -197,7 +197,7 @@
+$OpenBSD: patch-lib_arch_unix_Makefile_in,v 1.1 2001/02/19 20:04:10 danh Exp $
+--- lib/arch/unix/Makefile.in.orig	Sat Jul 31 02:48:17 1999
++++ lib/arch/unix/Makefile.in	Mon Feb 19 14:57:25 2001
+@@ -197,7 +197,7 @@ freetype.lo: $(SRC_S) $(SRC_M)
  libttf.la: $(LIB_FILES)
  	$(LIBTOOL) --mode=link $(CC) -o libttf.la $(LIB_FILES) \
                                 -rpath $(libdir) \
diff --git a/print/freetype/patches/patch-ac b/print/freetype/patches/patch-ltconfig
similarity index 54%
rename from print/freetype/patches/patch-ac
rename to print/freetype/patches/patch-ltconfig
index 5f9ddf10c61..95456c61ceb 100644
--- a/print/freetype/patches/patch-ac
+++ b/print/freetype/patches/patch-ltconfig
@@ -1,6 +1,7 @@
+$OpenBSD: patch-ltconfig,v 1.1 2001/02/19 20:04:10 danh Exp $
 --- ltconfig.orig	Thu Jul 15 20:56:06 1999
-+++ ltconfig	Sat Nov 11 21:26:28 2000
-@@ -1105,6 +1105,9 @@
++++ ltconfig	Mon Feb 19 15:01:43 2001
+@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
      with_gnu_ld=no
    fi
    ;;
@@ -10,7 +11,7 @@
  
  esac
  
-@@ -1391,10 +1394,18 @@
+@@ -1391,10 +1394,21 @@ else
      ;;
  
    openbsd*)
@@ -19,19 +20,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*)
-@@ -1955,13 +1966,10 @@
+@@ -1955,13 +1969,10 @@ netbsd*)
  
  openbsd*)
    version_type=sunos
diff --git a/print/freetype/patches/patch-ab b/print/freetype/patches/patch-ltmain_sh
similarity index 67%
rename from print/freetype/patches/patch-ab
rename to print/freetype/patches/patch-ltmain_sh
index bde789b56d9..1154262c6ab 100644
--- a/print/freetype/patches/patch-ab
+++ b/print/freetype/patches/patch-ltmain_sh
@@ -1,6 +1,37 @@
+$OpenBSD: patch-ltmain_sh,v 1.1 2001/02/19 20:04:10 danh Exp $
 --- ltmain.sh.orig	Thu Jul 15 20:56:06 1999
-+++ ltmain.sh	Sat Nov 11 21:26:30 2000
-@@ -1789,6 +1789,9 @@
++++ ltmain.sh	Mon Feb 19 15:03:26 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)!
  	  ;;
@@ -10,7 +41,7 @@
  	*)
  	  # Add libc to deplibs on all other systems.
  	  deplibs="$deplibs -lc"
-@@ -3522,40 +3525,6 @@
+@@ -3522,40 +3540,6 @@ libdir='$install_libdir'\
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0