diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index 7bc8617cec8..d29bf6cc796 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2010/07/17 08:13:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2010/10/22 19:31:43 ajacoutot Exp $
 
 COMMENT-main=	OCR Engine developed at HP Labs
 COMMENT-de=	German language data for tesseract
@@ -8,11 +8,10 @@ COMMENT-it=	Italian language data for tesseract
 COMMENT-nl=	Dutch language data for tesseract
 COMMENT-pt=	Portuguese (Brazilian) language data for tesseract
 
-DISTNAME=	tesseract-2.04
+DISTNAME=	tesseract-3.00
 CATEGORIES=	graphics textproc
 
 PKGNAME-main=	${DISTNAME}
-REVISION-main=	0
 PKGNAME-de=	tesseract-de-2.00
 PKGNAME-es=	tesseract-es-2.00
 PKGNAME-fr=	tesseract-fr-2.00
@@ -20,6 +19,19 @@ PKGNAME-it=	tesseract-it-2.00
 PKGNAME-nl=	tesseract-nl-2.00
 PKGNAME-pt=	tesseract-pt-2.01
 
+SHARED_LIBS +=  tesseract_api             0.0 # 3.0
+SHARED_LIBS +=  tesseract_ccstruct        0.0 # 3.0
+SHARED_LIBS +=  tesseract_ccutil          0.0 # 3.0
+SHARED_LIBS +=  tesseract_classify        0.0 # 3.0
+SHARED_LIBS +=  tesseract_cutil           0.0 # 3.0
+SHARED_LIBS +=  tesseract_dict            0.0 # 3.0
+SHARED_LIBS +=  tesseract_image           0.0 # 3.0
+SHARED_LIBS +=  tesseract_main            0.0 # 3.0
+SHARED_LIBS +=  tesseract_textord         0.0 # 3.0
+SHARED_LIBS +=  tesseract_training        0.0 # 3.0
+SHARED_LIBS +=  tesseract_viewer          0.0 # 3.0
+SHARED_LIBS +=  tesseract_wordrec         0.0 # 3.0
+
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		tesseract-2.00.deu.tar.gz \
 		tesseract-2.00.eng.tar.gz \
@@ -62,9 +74,12 @@ PKG_ARCH-pt=	*
 
 MASTER_SITES=	http://tesseract-ocr.googlecode.com/files/
 
+USE_LIBTOOL=	Yes
+
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	${CONFIGURE_SHARED}
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/ccutil/debugwin.cpp
diff --git a/graphics/tesseract/distinfo b/graphics/tesseract/distinfo
index 7ed09719bff..eb877ec1570 100644
--- a/graphics/tesseract/distinfo
+++ b/graphics/tesseract/distinfo
@@ -5,7 +5,7 @@ MD5 (tesseract-2.00.ita.tar.gz) = J1nh2ukamJpDSQ/0wiU6Sw==
 MD5 (tesseract-2.00.nld.tar.gz) = svbt4YLOpLv//TsEBTPOWA==
 MD5 (tesseract-2.00.spa.tar.gz) = vCand7I4RhOJVnfLjmHKdQ==
 MD5 (tesseract-2.01.por.tar.gz) = 7KIf7Tzh+N7Y387b0TUa9w==
-MD5 (tesseract-2.04.tar.gz) = tE66Gp9Ikqxi5ITIB/4FMw==
+MD5 (tesseract-3.00.tar.gz) = zIEqJhCI6gw9Lac1vjXQnw==
 RMD160 (tesseract-2.00.deu.tar.gz) = x+Z1XpQIQRT7Ghvo6TCMjd3S/do=
 RMD160 (tesseract-2.00.eng.tar.gz) = SoCQcpUEwhazmI8YnqeaWl4iMXM=
 RMD160 (tesseract-2.00.fra.tar.gz) = lr9Oa/ymrCuaPsA7VFpP0S2PND4=
@@ -13,7 +13,7 @@ RMD160 (tesseract-2.00.ita.tar.gz) = Bec51oSrE4tbsDJSbgGb+gHhovY=
 RMD160 (tesseract-2.00.nld.tar.gz) = zhb78X1M5UQmmzf1wH1SOfrSK/8=
 RMD160 (tesseract-2.00.spa.tar.gz) = Dh/LVzm5XUEx7+6kQNNT9WOLtX0=
 RMD160 (tesseract-2.01.por.tar.gz) = OwIX7GJPH38syO1PnTU0bZ/I4CE=
-RMD160 (tesseract-2.04.tar.gz) = gmcY3fSRyLklsCw0PUpJkv1GMdg=
+RMD160 (tesseract-3.00.tar.gz) = gshMM8QUuRltQvRnUlHz7zqxGzo=
 SHA1 (tesseract-2.00.deu.tar.gz) = 2NieJoFCGhRPOh7GHuDFMGhvUJY=
 SHA1 (tesseract-2.00.eng.tar.gz) = QCksjSBgkMSrNC9reBTqQcB1q84=
 SHA1 (tesseract-2.00.fra.tar.gz) = JPWMqysUGIFroJ5vKOM67jRgWIk=
@@ -21,7 +21,7 @@ SHA1 (tesseract-2.00.ita.tar.gz) = isbEFwiVBmD9ZnifWSUGhXf7ibE=
 SHA1 (tesseract-2.00.nld.tar.gz) = i8Clh3wZkqsQqeEkZD/ZAG/zA1A=
 SHA1 (tesseract-2.00.spa.tar.gz) = SSBreUB8sjvCOxzZW+4CVE8vz5s=
 SHA1 (tesseract-2.01.por.tar.gz) = ltjuJngQIqLqsZVp3PI1l7iNbIE=
-SHA1 (tesseract-2.04.tar.gz) = hQxCySpEccX0HUOExXBF6BL94mo=
+SHA1 (tesseract-3.00.tar.gz) = HXl8rj0AR9e+bJsX0Zc6mvz2vYE=
 SHA256 (tesseract-2.00.deu.tar.gz) = YIPxY3NonvVWUfTdd3NCarTDKhLr9/OYr5gqwpcf5AQ=
 SHA256 (tesseract-2.00.eng.tar.gz) = L71Qpss1L4R+vz3q3JFLvBJZJTnUw2j398/wpx99SOc=
 SHA256 (tesseract-2.00.fra.tar.gz) = EgEim7izd6s9kiVeCwZCo2MEuZQVCR+wWfQjyBTOzSU=
@@ -29,7 +29,7 @@ SHA256 (tesseract-2.00.ita.tar.gz) = OhuTI9382jJ3gKupTvck81aQ08/fjvgyxXCXIbfimZo
 SHA256 (tesseract-2.00.nld.tar.gz) = Jrn32AxM/hkHTDxdxVo3tInYm297E8Am+cLcJlEg2Fk=
 SHA256 (tesseract-2.00.spa.tar.gz) = tLg+Rr5GAqNhJ5wTHaLH87qMUawmwOEI+VhAbbauMg4=
 SHA256 (tesseract-2.01.por.tar.gz) = DcMLdoFKdpQkbKNHzLQCvNQOXm879wzKMebTygYhC6o=
-SHA256 (tesseract-2.04.tar.gz) = YoZvKDkWVT4Czr3rG0hYVsankPX4v4bDC4fGMEN0vvg=
+SHA256 (tesseract-3.00.tar.gz) = nDLUX5xczyvZcDqdsTcarw/I+J8txTYJZEKzHDxMOYQ=
 SIZE (tesseract-2.00.deu.tar.gz) = 1373777
 SIZE (tesseract-2.00.eng.tar.gz) = 1013090
 SIZE (tesseract-2.00.fra.tar.gz) = 1007776
@@ -37,4 +37,4 @@ SIZE (tesseract-2.00.ita.tar.gz) = 977683
 SIZE (tesseract-2.00.nld.tar.gz) = 1408071
 SIZE (tesseract-2.00.spa.tar.gz) = 1365863
 SIZE (tesseract-2.01.por.tar.gz) = 2107696
-SIZE (tesseract-2.04.tar.gz) = 1118386
+SIZE (tesseract-3.00.tar.gz) = 3436992
diff --git a/graphics/tesseract/patches/patch-Makefile_in b/graphics/tesseract/patches/patch-Makefile_in
deleted file mode 100644
index b8be0dc6a46..00000000000
--- a/graphics/tesseract/patches/patch-Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2009/08/24 07:12:40 ajacoutot Exp $
---- Makefile.in.orig	Tue Jun 30 18:24:21 2009
-+++ Makefile.in	Sun Aug 23 20:30:34 2009
-@@ -177,7 +177,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
- # TODO(luc) Add 'doc' to this list when ready
--SUBDIRS = ccstruct ccutil classify cutil dict pageseg image textord viewer wordrec ccmain training tessdata testing dlltest java
-+SUBDIRS = ccstruct ccutil classify cutil dict pageseg image textord viewer wordrec ccmain training tessdata testing dlltest
- EXTRA_DIST = eurotext.tif phototest.tif ReleaseNotes tesseract.spec config \
-       tesseract.dsp tesseract.dsw tesseract.vcproj tesseract.sln \
-       StdAfx.cpp StdAfx.h tessdll.cpp tessdll.h tessdll.dsp tessdll.vcproj
diff --git a/graphics/tesseract/patches/patch-ccmain_pgedit_cpp b/graphics/tesseract/patches/patch-ccmain_pgedit_cpp
deleted file mode 100644
index ccdf7c5feb0..00000000000
--- a/graphics/tesseract/patches/patch-ccmain_pgedit_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-ccmain_pgedit_cpp,v 1.2 2009/08/24 07:12:40 ajacoutot Exp $
-
-Fix crash -- cf. http://www.win.tue.nl/~aeb/linux/ocr/tesseract.html
-
---- ccmain/pgedit.cpp.orig	Wed Jun  3 00:54:27 2009
-+++ ccmain/pgedit.cpp	Sun Aug 23 20:25:45 2009
-@@ -753,6 +753,9 @@ void pgeditor_read_file(                   // of seria
- 
-                                  // ptr to last dot
-   filename_extension = strrchr(name.string(), '.');
-+  if (filename_extension == NULL)
-+    filename_extension = "";     // prevent segfaults
-+
-   #ifdef __UNIX__
-   /*    TEXTROW*                tessrows;
-       TBLOB*                  tessblobs;
diff --git a/graphics/tesseract/patches/patch-ccutil_debugwin.cpp b/graphics/tesseract/patches/patch-ccutil_debugwin.cpp
new file mode 100644
index 00000000000..78aab2ccff0
--- /dev/null
+++ b/graphics/tesseract/patches/patch-ccutil_debugwin.cpp
@@ -0,0 +1,13 @@
+--- ccutil/debugwin.cpp.orig	Tue Oct  5 20:25:10 2010
++++ ccutil/debugwin.cpp	Tue Oct  5 20:25:55 2010
+@@ -238,8 +238,8 @@ DEBUG_WIN::DEBUG_WIN(                    //constructor
+   length += sprintf (command + length, "trap \"\" 1 2 3 13 15\n");
+   length +=
+     sprintf (command + length,
+-    "/usr/bin/xterm -sb -sl " INT32FORMAT " -geometry "
+-    INT32FORMAT "x" INT32FORMAT "", buflines, xsize / 8, ysize / 16);
++	"${X11BASE}/xterm -sb -sl " INT32FORMAT " -geometry "
++	INT32FORMAT "x" INT32FORMAT "", buflines, xsize / 8, ysize / 16);
+   if (xpos >= 0)
+     command[length++] = '+';
+   length += sprintf (command + length, INT32FORMAT, xpos);
diff --git a/graphics/tesseract/patches/patch-ccutil_debugwin_cpp b/graphics/tesseract/patches/patch-ccutil_debugwin_cpp
deleted file mode 100644
index 4e00078e121..00000000000
--- a/graphics/tesseract/patches/patch-ccutil_debugwin_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-ccutil_debugwin_cpp,v 1.2 2009/08/24 07:12:40 ajacoutot Exp $
---- ccutil/debugwin.cpp.orig	Fri Nov 14 00:13:57 2008
-+++ ccutil/debugwin.cpp	Sun Aug 23 20:34:12 2009
-@@ -231,7 +231,7 @@ DEBUG_WIN::DEBUG_WIN(                    //constructor
-   length += sprintf (command + length, "trap \"\" 1 2 3 13 15\n");
-   length +=
-     sprintf (command + length,
--    "/usr/bin/xterm -sb -sl " INT32FORMAT " -geometry "
-+    "${X11BASE}/xterm -sb -sl " INT32FORMAT " -geometry "
-     INT32FORMAT "x" INT32FORMAT "", buflines, xsize / 8, ysize / 16);
-   if (xpos >= 0)
-     command[length++] = '+';
diff --git a/graphics/tesseract/patches/patch-configure b/graphics/tesseract/patches/patch-configure
index d2b70b3e609..83936d04da4 100644
--- a/graphics/tesseract/patches/patch-configure
+++ b/graphics/tesseract/patches/patch-configure
@@ -1,35 +1,29 @@
-$OpenBSD: patch-configure,v 1.2 2009/08/24 07:12:40 ajacoutot Exp $
---- configure.orig	Sun Aug 23 20:39:20 2009
-+++ configure	Sun Aug 23 20:39:38 2009
-@@ -8940,18 +8940,6 @@ ac_config_files="$ac_config_files testing/Makefile"
+$OpenBSD: patch-configure,v 1.3 2010/10/22 19:31:43 ajacoutot Exp $
+--- configure.orig	Fri Oct 22 21:03:06 2010
++++ configure	Fri Oct 22 21:03:16 2010
+@@ -15080,13 +15080,13 @@ _ACEOF
  
- ac_config_files="$ac_config_files dlltest/Makefile"
+ fi
  
--ac_config_files="$ac_config_files java/Makefile"
--
--ac_config_files="$ac_config_files java/com/Makefile"
--
--ac_config_files="$ac_config_files java/com/google/Makefile"
--
--ac_config_files="$ac_config_files java/com/google/scrollview/Makefile"
--
--ac_config_files="$ac_config_files java/com/google/scrollview/events/Makefile"
--
--ac_config_files="$ac_config_files java/com/google/scrollview/ui/Makefile"
--
- # AC_CONFIG_FILES(doc/Doxyfile)
- # AC_CONFIG_FILES(doc/header.html)
- # AC_CONFIG_FILES(doc/footer.html)
-@@ -9583,12 +9571,6 @@ do
-     "tessdata/tessconfigs/Makefile") CONFIG_FILES="$CONFIG_FILES tessdata/tessconfigs/Makefile" ;;
-     "testing/Makefile") CONFIG_FILES="$CONFIG_FILES testing/Makefile" ;;
-     "dlltest/Makefile") CONFIG_FILES="$CONFIG_FILES dlltest/Makefile" ;;
--    "java/Makefile") CONFIG_FILES="$CONFIG_FILES java/Makefile" ;;
--    "java/com/Makefile") CONFIG_FILES="$CONFIG_FILES java/com/Makefile" ;;
--    "java/com/google/Makefile") CONFIG_FILES="$CONFIG_FILES java/com/google/Makefile" ;;
--    "java/com/google/scrollview/Makefile") CONFIG_FILES="$CONFIG_FILES java/com/google/scrollview/Makefile" ;;
--    "java/com/google/scrollview/events/Makefile") CONFIG_FILES="$CONFIG_FILES java/com/google/scrollview/events/Makefile" ;;
--    "java/com/google/scrollview/ui/Makefile") CONFIG_FILES="$CONFIG_FILES java/com/google/scrollview/ui/Makefile" ;;
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sem_init in -lpthread" >&5
+-$as_echo_n "checking for sem_init in -lpthread... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sem_init in -pthread" >&5
++$as_echo_n "checking for sem_init in -pthread... " >&6; }
+ if test "${ac_cv_lib_pthread_sem_init+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="-pthread  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -15121,7 +15121,7 @@ if test "x$ac_cv_lib_pthread_sem_init" = x""yes; then 
+ #define HAVE_LIBPTHREAD 1
+ _ACEOF
+ 
+-  LIBS="-lpthread $LIBS"
++  LIBS="-pthread $LIBS"
+ 
+ fi
  
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
diff --git a/graphics/tesseract/patches/patch-dict_dawg.cpp b/graphics/tesseract/patches/patch-dict_dawg.cpp
new file mode 100644
index 00000000000..2807fb2adbb
--- /dev/null
+++ b/graphics/tesseract/patches/patch-dict_dawg.cpp
@@ -0,0 +1,13 @@
+--- dict/dawg.cpp.orig	Tue Oct  5 20:36:06 2010
++++ dict/dawg.cpp	Tue Oct  5 20:36:37 2010
+@@ -29,6 +29,10 @@
+ #ifdef _MSC_VER
+ #pragma warning(disable:4244)  // Conversion warnings
+ #pragma warning(disable:4800)  // int/bool warnings
++#else
++#ifdef __OpenBSD__
++#include <sys/types.h>
++#endif
+ #endif
+ #include "dawg.h"
+ 
diff --git a/graphics/tesseract/patches/patch-dict_dawg_cpp b/graphics/tesseract/patches/patch-dict_dawg_cpp
deleted file mode 100644
index 0d37dedf345..00000000000
--- a/graphics/tesseract/patches/patch-dict_dawg_cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-dict_dawg_cpp,v 1.3 2009/08/24 07:12:40 ajacoutot Exp $
---- dict/dawg.cpp.orig	Tue Dec 30 13:27:36 2008
-+++ dict/dawg.cpp	Sun Aug 23 20:36:22 2009
-@@ -28,6 +28,9 @@
- #ifdef __MSW32__
- #include <windows.h>
- #else
-+#ifdef __OpenBSD__
-+#include <sys/types.h>
-+#endif
- #include <arpa/inet.h>
- #endif
- #include "dawg.h"
diff --git a/graphics/tesseract/patches/patch-dict_makedawg_cpp b/graphics/tesseract/patches/patch-dict_makedawg_cpp
deleted file mode 100644
index 8c3d39af5d1..00000000000
--- a/graphics/tesseract/patches/patch-dict_makedawg_cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-dict_makedawg_cpp,v 1.2 2009/08/24 07:12:40 ajacoutot Exp $
---- dict/makedawg.cpp.orig	Tue Dec 30 13:28:03 2008
-+++ dict/makedawg.cpp	Sun Aug 23 20:37:16 2009
-@@ -33,6 +33,9 @@
- #ifdef __MSW32__
- #include <windows.h>
- #else
-+#ifdef __OpenBSD__
-+#include <sys/types.h>
-+#endif
- #include <arpa/inet.h>
- #endif
- 
diff --git a/graphics/tesseract/patches/patch-dict_reduce_cpp b/graphics/tesseract/patches/patch-dict_reduce_cpp
deleted file mode 100644
index ce74a2d95a9..00000000000
--- a/graphics/tesseract/patches/patch-dict_reduce_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-dict_reduce_cpp,v 1.1 2009/03/05 08:09:40 ajacoutot Exp $
-
-Fix crash -- cf. http://www.win.tue.nl/~aeb/linux/ocr/tesseract.html
-
---- dict/reduce.cpp.orig	Mon Mar 10 17:22:00 2008
-+++ dict/reduce.cpp	Sat Feb 28 08:28:07 2009
-@@ -335,6 +335,9 @@ void reduce_node_input (EDGE_ARRAY dawg,
-     }
-   }
- 
-+  if (!edge_occupied(dawg,node))	/* aeb */
-+    return;
-+
-   qsort ((void *) &edge_of (dawg, node + forward_edges),
-          backward_edges,
-          sizeof (EDGE_RECORD),
diff --git a/graphics/tesseract/patches/patch-image_imgs.cpp b/graphics/tesseract/patches/patch-image_imgs.cpp
new file mode 100644
index 00000000000..cb0d10842f8
--- /dev/null
+++ b/graphics/tesseract/patches/patch-image_imgs.cpp
@@ -0,0 +1,12 @@
+--- image/imgs.cpp.orig	Tue Oct  5 20:40:07 2010
++++ image/imgs.cpp	Tue Oct  5 20:43:41 2010
+@@ -252,7 +252,8 @@ inT32 check_legal_image_size(                     //ge
+   }
+   if (bits_per_pixel != 1 && bits_per_pixel != 2
+       && bits_per_pixel != 4 && bits_per_pixel != 5
+-      && bits_per_pixel != 6 && bits_per_pixel != 8 && bits_per_pixel != 24
++      && bits_per_pixel != 6 && bits_per_pixel != 8
++	  && bits_per_pixel != 16 && bits_per_pixel != 24
+       && bits_per_pixel != 32) {
+     BADBPP.error ("check_legal_image_size", TESSLOG, "%d", bits_per_pixel);
+     return -1;
diff --git a/graphics/tesseract/patches/patch-image_imgs_cpp b/graphics/tesseract/patches/patch-image_imgs_cpp
deleted file mode 100644
index 6b2184df36b..00000000000
--- a/graphics/tesseract/patches/patch-image_imgs_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-image_imgs_cpp,v 1.1 2009/03/05 08:09:40 ajacoutot Exp $
-
-Fix crash -- cf. http://www.win.tue.nl/~aeb/linux/ocr/tesseract.html
-
---- image/imgs.cpp.orig	Mon Mar 10 17:22:01 2008
-+++ image/imgs.cpp	Sat Feb 28 08:28:16 2009
-@@ -250,7 +250,8 @@ inT32 check_legal_image_size(                     //ge
-   }
-   if (bits_per_pixel != 1 && bits_per_pixel != 2
-     && bits_per_pixel != 4 && bits_per_pixel != 5
--  && bits_per_pixel != 6 && bits_per_pixel != 8 && bits_per_pixel != 24) {
-+    && bits_per_pixel != 6 && bits_per_pixel != 8
-+    && bits_per_pixel != 16 && bits_per_pixel != 24) {
-     BADBPP.error ("check_legal_image_size", TESSLOG, "%d", bits_per_pixel);
-     return -1;
-   }
diff --git a/graphics/tesseract/patches/patch-viewer_svutil_h b/graphics/tesseract/patches/patch-viewer_svutil_h
index fef3d2ab0df..08e0fa7c26c 100644
--- a/graphics/tesseract/patches/patch-viewer_svutil_h
+++ b/graphics/tesseract/patches/patch-viewer_svutil_h
@@ -1,6 +1,5 @@
-$OpenBSD: patch-viewer_svutil_h,v 1.2 2009/08/24 07:12:40 ajacoutot Exp $
---- viewer/svutil.h.orig	Wed Jun  3 15:01:03 2009
-+++ viewer/svutil.h	Sun Aug 23 20:25:45 2009
+--- viewer/svutil.h.orig	Tue Oct  5 20:48:35 2010
++++ viewer/svutil.h	Tue Oct  5 20:48:58 2010
 @@ -34,6 +34,11 @@
  #else
  #include <pthread.h>
diff --git a/graphics/tesseract/pkg/PFRAG.shared-main b/graphics/tesseract/pkg/PFRAG.shared-main
new file mode 100644
index 00000000000..438ef75806d
--- /dev/null
+++ b/graphics/tesseract/pkg/PFRAG.shared-main
@@ -0,0 +1,13 @@
+@comment $OpenBSD: PFRAG.shared-main,v 1.1 2010/10/22 19:31:43 ajacoutot Exp $
+@lib lib/libtesseract_api.so.${LIBtesseract_api_VERSION}
+@lib lib/libtesseract_ccstruct.so.${LIBtesseract_ccstruct_VERSION}
+@lib lib/libtesseract_ccutil.so.${LIBtesseract_ccutil_VERSION}
+@lib lib/libtesseract_classify.so.${LIBtesseract_classify_VERSION}
+@lib lib/libtesseract_cutil.so.${LIBtesseract_cutil_VERSION}
+@lib lib/libtesseract_dict.so.${LIBtesseract_dict_VERSION}
+@lib lib/libtesseract_image.so.${LIBtesseract_image_VERSION}
+@lib lib/libtesseract_main.so.${LIBtesseract_main_VERSION}
+@lib lib/libtesseract_textord.so.${LIBtesseract_textord_VERSION}
+@lib lib/libtesseract_training.so.${LIBtesseract_training_VERSION}
+@lib lib/libtesseract_viewer.so.${LIBtesseract_viewer_VERSION}
+@lib lib/libtesseract_wordrec.so.${LIBtesseract_wordrec_VERSION}
diff --git a/graphics/tesseract/pkg/PLIST-main b/graphics/tesseract/pkg/PLIST-main
index 8232fa449b0..bddb0364f5d 100644
--- a/graphics/tesseract/pkg/PLIST-main
+++ b/graphics/tesseract/pkg/PLIST-main
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST-main,v 1.3 2010/07/17 08:13:01 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.4 2010/10/22 19:31:43 ajacoutot Exp $
+%%SHARED%%
 @bin bin/cntraining
+@bin bin/combine_tessdata
 @bin bin/mftraining
 @bin bin/tesseract
 @bin bin/unicharset_extractor
@@ -8,12 +10,15 @@ include/tesseract/
 include/tesseract/adaptions.h
 include/tesseract/adaptive.h
 include/tesseract/adaptmatch.h
+include/tesseract/alignedblob.h
+include/tesseract/ambigs.h
 include/tesseract/applybox.h
 include/tesseract/associate.h
 include/tesseract/badwords.h
 include/tesseract/baseapi.h
 include/tesseract/basedir.h
 include/tesseract/baseline.h
+include/tesseract/bbgrid.h
 include/tesseract/bestfirst.h
 include/tesseract/bits16.h
 include/tesseract/bitstrm.h
@@ -27,8 +32,11 @@ include/tesseract/blobcmpl.h
 include/tesseract/blobs.h
 include/tesseract/blread.h
 include/tesseract/boxread.h
+include/tesseract/callback.h
 include/tesseract/callcpp.h
 include/tesseract/callnet.h
+include/tesseract/ccstruct.h
+include/tesseract/ccutil.h
 include/tesseract/charcut.h
 include/tesseract/charsample.h
 include/tesseract/chartoname.h
@@ -36,22 +44,29 @@ include/tesseract/choicearr.h
 include/tesseract/choices.h
 include/tesseract/chop.h
 include/tesseract/chopper.h
+include/tesseract/classify.h
 include/tesseract/closed.h
 include/tesseract/clst.h
 include/tesseract/cluster.h
 include/tesseract/clusttool.h
+include/tesseract/colfind.h
+include/tesseract/colpartition.h
+include/tesseract/colpartitionset.h
+include/tesseract/commontraining.h
 include/tesseract/const.h
 include/tesseract/context.h
 include/tesseract/control.h
+include/tesseract/conversion.h
 include/tesseract/coutln.h
 include/tesseract/crakedge.h
 include/tesseract/cutil.h
+include/tesseract/cutil_class.h
 include/tesseract/cutoffs.h
 include/tesseract/danerror.h
 include/tesseract/dawg.h
-include/tesseract/debug.h
 include/tesseract/debugwin.h
-include/tesseract/djmenus.h
+include/tesseract/detlinefit.h
+include/tesseract/dict.h
 include/tesseract/dlltest.cpp
 include/tesseract/dlltest.dsp
 include/tesseract/dlltest.vcproj
@@ -85,17 +100,20 @@ include/tesseract/fxid.h
 include/tesseract/gap_map.h
 include/tesseract/genblob.h
 include/tesseract/general.h
+include/tesseract/genericvector.h
 include/tesseract/globaloc.h
 include/tesseract/globals.h
 include/tesseract/gradechop.h
 include/tesseract/hashfn.h
+include/tesseract/helpers.h
 include/tesseract/heuristic.h
 include/tesseract/hideedge.h
 include/tesseract/host.h
 include/tesseract/hosthplb.h
 include/tesseract/hpddef.h
 include/tesseract/hpdsizes.h
-include/tesseract/hyphen.h
+include/tesseract/image.h
+include/tesseract/imagefind.h
 include/tesseract/img.h
 include/tesseract/imgbmp.h
 include/tesseract/imgerrs.h
@@ -110,16 +128,13 @@ include/tesseract/intproto.h
 include/tesseract/ipoints.h
 include/tesseract/kdtree.h
 include/tesseract/labls.h
-include/tesseract/leptonica_pageseg.h
-include/tesseract/leptonica_pageseg_interface.h
+include/tesseract/linefind.h
 include/tesseract/linlsq.h
 include/tesseract/listio.h
 include/tesseract/lmedsq.h
-include/tesseract/lookdawg.h
 include/tesseract/lsterr.h
 include/tesseract/mainblk.h
 include/tesseract/makechop.h
-include/tesseract/makedawg.h
 include/tesseract/makerow.h
 include/tesseract/matchdefs.h
 include/tesseract/matchtab.h
@@ -132,15 +147,12 @@ include/tesseract/memryerr.h
 include/tesseract/mergenf.h
 include/tesseract/metrics.h
 include/tesseract/mf.h
-include/tesseract/mfcpch.cpp
 include/tesseract/mfcpch.h
 include/tesseract/mfdefs.h
 include/tesseract/mfoutline.h
 include/tesseract/mfvars.h
 include/tesseract/mfx.h
-include/tesseract/minmax.h
 include/tesseract/mod128.h
-include/tesseract/msmenus.h
 include/tesseract/name2char.h
 include/tesseract/ndminx.h
 include/tesseract/normalis.h
@@ -157,19 +169,17 @@ include/tesseract/oldbasel.h
 include/tesseract/oldheap.h
 include/tesseract/oldlist.h
 include/tesseract/olutil.h
+include/tesseract/osdetect.h
+include/tesseract/otsuthr.h
 include/tesseract/outfeat.h
 include/tesseract/outlines.h
 include/tesseract/output.h
-include/tesseract/pageblk.h
 include/tesseract/pageres.h
-include/tesseract/pageseg.h
 include/tesseract/pagewalk.h
 include/tesseract/paircmp.h
 include/tesseract/pdblock.h
-include/tesseract/pdclass.h
 include/tesseract/permdawg.h
 include/tesseract/permngram.h
-include/tesseract/permnum.h
 include/tesseract/permute.h
 include/tesseract/pgedit.h
 include/tesseract/picofeat.h
@@ -186,25 +196,22 @@ include/tesseract/polyblob.h
 include/tesseract/polyvert.h
 include/tesseract/poutline.h
 include/tesseract/protos.h
+include/tesseract/qrsequence.h
 include/tesseract/quadlsq.h
 include/tesseract/quadratc.h
 include/tesseract/quspline.h
 include/tesseract/ratngs.h
 include/tesseract/rect.h
-include/tesseract/reduce.h
 include/tesseract/rejctmap.h
 include/tesseract/reject.h
 include/tesseract/render.h
-include/tesseract/rwpoly.h
 include/tesseract/scaleimg.h
 include/tesseract/scanedg.h
-include/tesseract/scanutils.cpp
 include/tesseract/scanutils.h
 include/tesseract/scrollview.h
 include/tesseract/seam.h
 include/tesseract/secname.h
 include/tesseract/serialis.h
-include/tesseract/sigmenu.h
 include/tesseract/sortflts.h
 include/tesseract/speckle.h
 include/tesseract/split.h
@@ -214,17 +221,23 @@ include/tesseract/stderr.h
 include/tesseract/stepblob.h
 include/tesseract/stopper.h
 include/tesseract/strngs.h
+include/tesseract/strokewidth.h
 include/tesseract/structures.h
 include/tesseract/svmnode.h
 include/tesseract/svpaint.cpp
 include/tesseract/svshowim.h
 include/tesseract/svutil.h
+include/tesseract/tabfind.h
+include/tesseract/tablefind.h
+include/tesseract/tabvector.h
 include/tesseract/tally.h
 include/tesseract/tessarray.h
 include/tesseract/tessbox.h
 include/tesseract/tessclas.h
+include/tesseract/tessdatamanager.h
 include/tesseract/tessedit.h
 include/tesseract/tessembedded.h
+include/tesseract/tesseractclass.h
 include/tesseract/tesseractmain.h
 include/tesseract/tessinit.h
 include/tesseract/tessio.h
@@ -234,42 +247,54 @@ include/tesseract/tessvars.h
 include/tesseract/tface.h
 include/tesseract/tfacep.h
 include/tesseract/tfacepp.h
+include/tesseract/thresholder.h
 include/tesseract/topitch.h
 include/tesseract/tordmain.h
 include/tesseract/tordvars.h
 include/tesseract/tospace.h
 include/tesseract/tovars.h
 include/tesseract/tprintf.h
-include/tesseract/training.h
 include/tesseract/trie.h
 include/tesseract/tstruct.h
-include/tesseract/txtregn.h
 include/tesseract/underlin.h
 include/tesseract/unichar.h
 include/tesseract/unicharmap.h
 include/tesseract/unicharset.h
+include/tesseract/unicity_table.h
 include/tesseract/varable.h
 include/tesseract/varabled.h
-include/tesseract/variables.h
 include/tesseract/vecfuncs.h
 include/tesseract/werd.h
 include/tesseract/werdit.h
 include/tesseract/wordclass.h
+include/tesseract/wordrec.h
 include/tesseract/wordseg.h
+include/tesseract/workingpartset.h
 include/tesseract/xform2d.h
+lib/libtesseract_api.a
+lib/libtesseract_api.la
 lib/libtesseract_ccstruct.a
+lib/libtesseract_ccstruct.la
 lib/libtesseract_ccutil.a
+lib/libtesseract_ccutil.la
 lib/libtesseract_classify.a
+lib/libtesseract_classify.la
 lib/libtesseract_cutil.a
+lib/libtesseract_cutil.la
 lib/libtesseract_dict.a
-lib/libtesseract_full.a
+lib/libtesseract_dict.la
 lib/libtesseract_image.a
+lib/libtesseract_image.la
 lib/libtesseract_main.a
-lib/libtesseract_pageseg.a
+lib/libtesseract_main.la
 lib/libtesseract_textord.a
+lib/libtesseract_textord.la
 lib/libtesseract_training.a
+lib/libtesseract_training.la
 lib/libtesseract_viewer.a
+lib/libtesseract_viewer.la
 lib/libtesseract_wordrec.a
+lib/libtesseract_wordrec.la
 share/doc/tesseract/
 share/doc/tesseract/README
 share/doc/tesseract/README.OpenBSD
@@ -278,14 +303,16 @@ share/examples/tesseract/eurotext.tif
 share/examples/tesseract/phototest.tif
 share/tessdata/
 share/tessdata/configs/
+share/tessdata/configs/ambigs.train
 share/tessdata/configs/api_config
 share/tessdata/configs/box.train
 share/tessdata/configs/box.train.stderr
+share/tessdata/configs/digits
 share/tessdata/configs/inter
 share/tessdata/configs/kannada
+share/tessdata/configs/logfile
 share/tessdata/configs/makebox
 share/tessdata/configs/unlv
-share/tessdata/confsets
 share/tessdata/eng.DangAmbigs
 share/tessdata/eng.freq-dawg
 share/tessdata/eng.inttemp