diff --git a/x11/fleditor/patches/patch-FL_Fl_Editor_H b/x11/fleditor/patches/patch-FL_Fl_Editor_H
new file mode 100644
index 00000000000..64f9ec67c6a
--- /dev/null
+++ b/x11/fleditor/patches/patch-FL_Fl_Editor_H
@@ -0,0 +1,12 @@
+$OpenBSD: patch-FL_Fl_Editor_H,v 1.1 2010/05/22 21:23:33 espie Exp $
+--- FL/Fl_Editor.H.orig	Sat May 22 23:21:21 2010
++++ FL/Fl_Editor.H	Sat May 22 23:21:27 2010
+@@ -186,7 +186,7 @@ class Fl_Editor : public Fl_Group (public)
+ 	FL_API long FindRow(short screenY);
+ 	FL_API void HandleScroll();
+ 	FL_API void Cut();
+-	static FL_API void Fl_Editor::draw_clip(void *v, int X, int Y, int W, int H);
++	static FL_API void draw_clip(void *v, int X, int Y, int W, int H);
+ 	FL_API void resize(int x, int y, int w, int h);
+ #if (FL_MAJOR_VERSION > 1)
+ 	void layout(){ Fl_Group::layout(); resize(x(), y(),w(), h()); redraw(); }
diff --git a/x11/fleditor/patches/patch-FL_wstring_h b/x11/fleditor/patches/patch-FL_wstring_h
new file mode 100644
index 00000000000..ee0ac3a3f66
--- /dev/null
+++ b/x11/fleditor/patches/patch-FL_wstring_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-FL_wstring_h,v 1.1 2010/05/22 21:23:33 espie Exp $
+--- FL/wstring.h.orig	Sat May 22 23:20:40 2010
++++ FL/wstring.h	Sat May 22 23:20:49 2010
+@@ -88,7 +88,7 @@ class wString
+ 		long     operator>(const char *str) const { return (strcmp(buffer,str) > 0); };
+ 		long     operator==(const char *str) const  { return (strcmp(buffer,str) == 0); };
+         wString& operator=(const char *str)	{ SSet(str);  return (*this); };
+-        RCLDLL wString& wString::operator=(const wString& str) { SSet(str.buffer); return (*this); }
++        RCLDLL wString& operator=(const wString& str) { SSet(str.buffer); return (*this); }
+         wString& operator=(const unsigned char *str)    { SSet((const char *)str); return *this; };
+ 		operator const char *() const       { return Get(); };
+ 		wString& ToUpper()	{ strupr(buffer);  return *this; };
diff --git a/x11/fleditor/patches/patch-Makefile_in b/x11/fleditor/patches/patch-Makefile_in
index 2fc44db3e55..c0284c2f13e 100644
--- a/x11/fleditor/patches/patch-Makefile_in
+++ b/x11/fleditor/patches/patch-Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.8 2006/10/19 09:16:32 wilfried Exp $
+$OpenBSD: patch-Makefile_in,v 1.9 2010/05/22 21:23:33 espie Exp $
 --- Makefile.in.orig	Fri Jun 14 23:12:25 2002
-+++ Makefile.in	Thu Oct 19 11:14:03 2006
++++ Makefile.in	Sat May 22 16:29:40 2010
 @@ -29,25 +29,25 @@ FLTKLIBDIR	=	@ac_fltk_libraries@
  # Program options...
  #
@@ -36,7 +36,7 @@ $OpenBSD: patch-Makefile_in,v 1.8 2006/10/19 09:16:32 wilfried Exp $
  
  
  #
-@@ -62,7 +62,7 @@ INCLUDEDEPS = FL/Fl_Editor.H FL/Fl_Fancy
+@@ -62,7 +62,7 @@ INCLUDEDEPS = FL/Fl_Editor.H FL/Fl_FancyEditor.H FL/Fl
  # Make all targets...
  #
  
@@ -84,7 +84,7 @@ $OpenBSD: patch-Makefile_in,v 1.8 2006/10/19 09:16:32 wilfried Exp $
  
  #
  # Make the editor widget library.
-@@ -124,12 +129,10 @@ EDITOR_OBJS = src/Fl_Editor.o src/Fl_Fan
+@@ -124,12 +129,10 @@ EDITOR_OBJS = src/Fl_Editor.o src/Fl_FancyEditor.o src
          src/editengine.o src/lists.o src/wstring.o
  
  libfleditor.a:	$(EDITOR_OBJS)
diff --git a/x11/fleditor/patches/patch-configure b/x11/fleditor/patches/patch-configure
index c7f10569ae0..a873eb5e5bb 100644
--- a/x11/fleditor/patches/patch-configure
+++ b/x11/fleditor/patches/patch-configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure,v 1.6 2005/12/25 20:23:18 naddy Exp $
+$OpenBSD: patch-configure,v 1.7 2010/05/22 21:23:33 espie Exp $
 --- configure.orig	Mon Apr 22 18:23:58 2002
-+++ configure	Fri Aug  9 15:52:32 2002
++++ configure	Sat May 22 16:29:40 2010
 @@ -20,7 +20,7 @@ ac_help="$ac_help
  ac_help="$ac_help
    --with-fltk=DIR         fltk root (for lib and include) [default=/usr/local]"
@@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.6 2005/12/25 20:23:18 naddy Exp $
  
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-@@ -1347,33 +1348,12 @@ if test "${enable_shared+set}" = set; th
+@@ -1347,33 +1348,12 @@ if test "${enable_shared+set}" = set; then
    enableval="$enable_shared"
    
  if eval "test x$enable_shared = xyes"; then
diff --git a/x11/fleditor/patches/patch-fltk_Fl_Editor_h b/x11/fleditor/patches/patch-fltk_Fl_Editor_h
new file mode 100644
index 00000000000..985c7a1722c
--- /dev/null
+++ b/x11/fleditor/patches/patch-fltk_Fl_Editor_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-fltk_Fl_Editor_h,v 1.1 2010/05/22 21:23:33 espie Exp $
+--- fltk/Fl_Editor.h.orig	Sat May 22 23:20:03 2010
++++ fltk/Fl_Editor.h	Sat May 22 23:20:16 2010
+@@ -186,7 +186,7 @@ class Fl_Editor : public Fl_Group (public)
+ 	FL_API long FindRow(short screenY);
+ 	FL_API void HandleScroll();
+ 	FL_API void Cut();
+-	static FL_API void Fl_Editor::draw_clip(void *v, int X, int Y, int W, int H);
++	static FL_API void draw_clip(void *v, int X, int Y, int W, int H);
+ 	FL_API void resize(int x, int y, int w, int h);
+ #if (FL_MAJOR_VERSION > 1)
+ 	void layout(){ Fl_Group::layout(); resize(x(), y(),w(), h()); redraw(); }
diff --git a/x11/fleditor/patches/patch-fltk_wstring_h b/x11/fleditor/patches/patch-fltk_wstring_h
new file mode 100644
index 00000000000..682084762e3
--- /dev/null
+++ b/x11/fleditor/patches/patch-fltk_wstring_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-fltk_wstring_h,v 1.1 2010/05/22 21:23:33 espie Exp $
+--- fltk/wstring.h.orig	Sat May 22 23:21:41 2010
++++ fltk/wstring.h	Sat May 22 23:21:47 2010
+@@ -88,7 +88,7 @@ class wString
+ 		long     operator>(const char *str) const { return (strcmp(buffer,str) > 0); };
+ 		long     operator==(const char *str) const  { return (strcmp(buffer,str) == 0); };
+         wString& operator=(const char *str)	{ SSet(str);  return (*this); };
+-        RCLDLL wString& wString::operator=(const wString& str) { SSet(str.buffer); return (*this); }
++        RCLDLL wString& operator=(const wString& str) { SSet(str.buffer); return (*this); }
+         wString& operator=(const unsigned char *str)    { SSet((const char *)str); return *this; };
+ 		operator const char *() const       { return Get(); };
+ 		wString& ToUpper()	{ strupr(buffer);  return *this; };