Update to 3.00

11 files changed, 207 insertions, 262 deletions

diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index 157042e3faec..358269f69bfa 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -6,40 +6,77 @@
 #
 
 PORTNAME=	tesseract
-DISTVERSION=	2.04
-PORTREVISION=	1
+PORTVERSION=	3.00
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} CENKES
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LANGFILES}
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${TESSERACT_LANGS:O:u:S|$|.traineddata.gz|}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Commercial quality open source OCR engine
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 
+DIST_SUBDIR=	${PORTNAME}
 PROJECTHOST=	tesseract-ocr
-LANGS2_00?=	deu eng fra ita nld spa
-LANGS2_01?=	deu-f por vie
-LANGS2_04?=	eus
-
-.for _N in 2_00 2_01 2_04
-LANGFILES+=	${LANGS${_N}:S|^|${PORTNAME}-${_N:S|_|.|}.|:S|$|${EXTRACT_SUFX}|}
-.endfor
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBTIFF_CFLAGS="-I${LOCALBASE}/include"\
 		LIBTIFF_LIBS="-L${LOCALBASE}/lib -ltiff"
+LICENSE=	ASL
+USE_LDCONFIG=	yes
+
+OPTIONS=	EXTRA_LANGUAGES "Install additional language data" Off
+
+.include <bsd.port.pre.mk>
+
+TESSERACT_XTERM ?=	${LOCALBASE}/bin/xterm
+
+.if defined(WITH_EXTRA_LANGUAGES) || make(makesum)
+TESSERACT_LANGS ?=	bul chi_tra chi_sim cat ces dan dan-frak deu deu-frak ell eng \
+		fin fra hun ind ita jpn kor lav lit nld nor pol por ron rus slk \
+		slv spa srp swe swe-frak tgl tur ukr vie
+.else
+TESSERACT_LANGS ?=	eng
+.endif
+
+.ifndef NOPORTDATA
+DATADIR=	${PREFIX}/share/tessdata
+PORTDATA=	${TESSERACT_LANGS:O:u:S|$|.traineddata|}
+.endif
+
+.ifndef NOPORTDOCS
 PORTDOCS=	AUTHORS ChangeLog NEWS README ReleaseNotes
+.endif
+
+.ifndef NOPORTEXAMPLES
 PORTEXAMPLES=	eurotext.tif phototest.tif
+.endif
+
+pre-fetch:
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "The choice of language data to be installed, and the fallback"
+	@${ECHO_MSG} "xterm-compatible terminal to be used for debugging purposes,"
+	@${ECHO_MSG} "may be overridden by defining TESSERACT_LANGS and "
+	@${ECHO_MSG} "TESSERACT_XTERM, respectively."
+	@${ECHO_MSG} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/X11/xterm|${LOCALBASE}/bin/xterm|'\
+	@${REINPLACE_CMD} -e 's|/usr/bin/xterm|${TESSERACT_XTERM}|'\
 		${WRKSRC}/ccutil/debugwin.cpp
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'\
 		${WRKSRC}/configure
 
 post-install:
-	@cd ${WRKDIR}/tessdata/&&${COPYTREE_SHARE} . ${PREFIX}/share/tessdata/
+.ifndef NOPORTDATA
+	@${INSTALL} -d ${DATADIR}/
+.for datafile in ${PORTDATA}
+	@${GUNZIP_CMD} -c ${_DISTDIR}/${datafile}.gz > ${DATADIR}/${datafile}
+	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DATADIR}/${datafile}
+	@${CHMOD} ${SHAREMODE} ${DATADIR}/${datafile}
+.endfor
+.endif
 .ifndef NOPORTDOCS
 	@${INSTALL} -d ${DOCSDIR}/
 	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
@@ -48,5 +85,8 @@ post-install:
 	@${INSTALL} -d ${EXAMPLESDIR}/
 	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}/
 .endif
+	@${ECHO_MSG} ""
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG} ""
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/tesseract/distinfo b/graphics/tesseract/distinfo
index f80b50f1b87a..eecbe6f4c359 100644
--- a/graphics/tesseract/distinfo
+++ b/graphics/tesseract/distinfo
@@ -1,33 +1,74 @@
-MD5 (tesseract-2.04.tar.gz) = b44eba1a9f4892ac62e484c807fe0533
-SHA256 (tesseract-2.04.tar.gz) = 62866f283916553e02cebdeb1b485856c6a790f5f8bf86c30b87c6304374bef8
-SIZE (tesseract-2.04.tar.gz) = 1118386
-MD5 (tesseract-2.00.deu.tar.gz) = 609d91b1ae3759a756b819b5d8403653
-SHA256 (tesseract-2.00.deu.tar.gz) = 6083f16373689ef55651f4dd7773426ab4c32a12ebf7f398af982ac2971fe404
-SIZE (tesseract-2.00.deu.tar.gz) = 1373777
-MD5 (tesseract-2.00.eng.tar.gz) = b8291d6b3a63ce7879d688e845e341a9
-SHA256 (tesseract-2.00.eng.tar.gz) = 2fbd50a6cb352f847ebf3deadc914bbc12592539d4c368f7f7cff0a71f7d48e7
-SIZE (tesseract-2.00.eng.tar.gz) = 1013090
-MD5 (tesseract-2.00.fra.tar.gz) = 64896b462e62572a3708bb461820126c
-SHA256 (tesseract-2.00.fra.tar.gz) = 1201229bb8b377ab3d92255e0b0642a36304b99415091fb059f423c814cecd25
-SIZE (tesseract-2.00.fra.tar.gz) = 1007776
-MD5 (tesseract-2.00.ita.tar.gz) = 2759e1dae91a989a43490ff4c2253a4b
-SHA256 (tesseract-2.00.ita.tar.gz) = 3a1b9323ddfcda327780aba94ef724f35690d3cfdf8ef832c5709721b7e2999a
-SIZE (tesseract-2.00.ita.tar.gz) = 977683
-MD5 (tesseract-2.00.nld.tar.gz) = b2f6ede182cea4bbfffd3b040533ce58
-SHA256 (tesseract-2.00.nld.tar.gz) = 26b9f7d80c4cfe19074c3c5dc55a37b489d89b6f7b13c026f9c2dc265120d859
-SIZE (tesseract-2.00.nld.tar.gz) = 1408071
-MD5 (tesseract-2.00.spa.tar.gz) = bc26a777b2384613895677cb8e61ca75
-SHA256 (tesseract-2.00.spa.tar.gz) = b4b83e46be4602a361279c131da2c7f3ba8c51ac26c0e108f958406db6ae320e
-SIZE (tesseract-2.00.spa.tar.gz) = 1365863
-MD5 (tesseract-2.01.deu-f.tar.gz) = 62695819882e372cb86367c1b72cf229
-SHA256 (tesseract-2.01.deu-f.tar.gz) = 410143cf5029b10d274909439de2c407706e4d601cd5e1bb1309dbd46288757e
-SIZE (tesseract-2.01.deu-f.tar.gz) = 1312785
-MD5 (tesseract-2.01.por.tar.gz) = eca21fed3ce1f8ded8dfcedbd1351af7
-SHA256 (tesseract-2.01.por.tar.gz) = 0dc30b76814a7694246ca347ccb402bcd40e5e6f3bf70cca31e6d3ca06210baa
-SIZE (tesseract-2.01.por.tar.gz) = 2107696
-MD5 (tesseract-2.01.vie.tar.gz) = 34a05c2ae1ec8524e6b7647bdeecd408
-SHA256 (tesseract-2.01.vie.tar.gz) = 8026240029341d45a6142cfccf6f0f98e5b1f35cae5725f8379ac4a8de34283f
-SIZE (tesseract-2.01.vie.tar.gz) = 964277
-MD5 (tesseract-2.04.eus.tar.gz) = 1f82f6c152dd10b5a7116b0a040a7125
-SHA256 (tesseract-2.04.eus.tar.gz) = 19aa30dda8049fb03e125e3b17d05ae402544e9ec81adcb18964d4a7b125a2fe
-SIZE (tesseract-2.04.eus.tar.gz) = 1207994
+SHA256 (tesseract/tesseract-3.00.tar.gz) = 9c32d45f9c5ccf2bd9703a9db1371aaf0fc8f89f2dc536096442b31c3c4c3984
+SIZE (tesseract/tesseract-3.00.tar.gz) = 3436992
+SHA256 (tesseract/bul.traineddata.gz) = fc3c650568d014f2337052658e9ddd8efaff6ac74c9a90952d740eafdf400e2d
+SIZE (tesseract/bul.traineddata.gz) = 848731
+SHA256 (tesseract/cat.traineddata.gz) = dcc52db7522c67d2629117b7fde4c114ca51677f7f1efbedc12bf1e7319acde2
+SIZE (tesseract/cat.traineddata.gz) = 995008
+SHA256 (tesseract/ces.traineddata.gz) = 9848a4c137be45659e29f4aa07ccb6357fd4401307478cce0ed5f8e6686480d2
+SIZE (tesseract/ces.traineddata.gz) = 1059966
+SHA256 (tesseract/chi_sim.traineddata.gz) = 40c1cdf62106a0705807e8be5bee235a9e9efe716e22568e3885561a835d7d5b
+SIZE (tesseract/chi_sim.traineddata.gz) = 19732398
+SHA256 (tesseract/chi_tra.traineddata.gz) = 68ac2d83998b7f6e3fa26a58be8be5507e78185a16b3e106fe48a7b2667165fc
+SIZE (tesseract/chi_tra.traineddata.gz) = 27512772
+SHA256 (tesseract/dan.traineddata.gz) = 2104d8b1cfde6fa960e31db826a101a356c77c3efeae6e78cab5a97e62f3410c
+SIZE (tesseract/dan.traineddata.gz) = 958449
+SHA256 (tesseract/dan-frak.traineddata.gz) = ddc9f75b6104618d0682c9c98f5fed1ec52b1b0d5a54d38a20b20f0ab5d9a32b
+SIZE (tesseract/dan-frak.traineddata.gz) = 683525
+SHA256 (tesseract/deu.traineddata.gz) = 9e1845a69d5b6cf93d4fa05d5b8934e7cfaf8b088e6be9e8dac30c7859591ccc
+SIZE (tesseract/deu.traineddata.gz) = 965684
+SHA256 (tesseract/deu-frak.traineddata.gz) = 59f005f735a33039d416f699bff0bae7d42e5ab000dca6e1aae99d99f3776dc5
+SIZE (tesseract/deu-frak.traineddata.gz) = 827836
+SHA256 (tesseract/ell.traineddata.gz) = f8cb765c40733a677fa470370b935c34cfc53ba8de372b33e83ab59c7407195d
+SIZE (tesseract/ell.traineddata.gz) = 944284
+SHA256 (tesseract/eng.traineddata.gz) = 3ad150c58d59aa7f20e12bed0e15a33c988f5803d6cba8ef366aeec0c18d4e9d
+SIZE (tesseract/eng.traineddata.gz) = 742852
+SHA256 (tesseract/fin.traineddata.gz) = 30c05d403295fb659048b5d82db0d87c9cbee5077314e2b52f6fdca9c9ec8520
+SIZE (tesseract/fin.traineddata.gz) = 959833
+SHA256 (tesseract/fra.traineddata.gz) = 1d795f1da1ee20671ffbbf4b2997b424f459861b217c9ffa7abbeb72abd760d6
+SIZE (tesseract/fra.traineddata.gz) = 933372
+SHA256 (tesseract/hun.traineddata.gz) = 7b4d80703067fc5a8bf3da80f7da699f26a665a3e5ca93004fe353a1d6e74f60
+SIZE (tesseract/hun.traineddata.gz) = 1008061
+SHA256 (tesseract/ind.traineddata.gz) = 9b2ee5ab2d33511f5fb8edbaee3d3a448cf8ab9efbf8e5c852d59481317e8218
+SIZE (tesseract/ind.traineddata.gz) = 836752
+SHA256 (tesseract/ita.traineddata.gz) = a6cbaa39fddee521090e48d6a83b6f62e77b5fe7d90ab8ce9ee4d8ada10730f5
+SIZE (tesseract/ita.traineddata.gz) = 939956
+SHA256 (tesseract/jpn.traineddata.gz) = ebbde8c607a05cdd97d492734896a24b2aa17d5b4fb00e9597a96b39c1f22aa3
+SIZE (tesseract/jpn.traineddata.gz) = 14604738
+SHA256 (tesseract/kor.traineddata.gz) = 8d4709341dbda7da9f42bb1d39c4d22d5ca767c2a30fbe36cb2ad152f092b01f
+SIZE (tesseract/kor.traineddata.gz) = 6032090
+SHA256 (tesseract/lav.traineddata.gz) = 305173b54d836dae2f22e4f488734440a83e683636c033cafe066083738ceebc
+SIZE (tesseract/lav.traineddata.gz) = 1018176
+SHA256 (tesseract/lit.traineddata.gz) = 1a04f9e952a76d430c2b9d16140f2d42f27c72a9bbd55b3e8f2b6e701ef0f399
+SIZE (tesseract/lit.traineddata.gz) = 1012936
+SHA256 (tesseract/nld.traineddata.gz) = 2826628b0ff22fc3bb5d6e9d6901a39141b805b78084e0c9ab61f12c28747831
+SIZE (tesseract/nld.traineddata.gz) = 954151
+SHA256 (tesseract/nor.traineddata.gz) = c97cbfd93f676b331296b729d5526d1accc1325474a6b6d91260d03a1c862606
+SIZE (tesseract/nor.traineddata.gz) = 951018
+SHA256 (tesseract/pol.traineddata.gz) = 708e2c59cc4e6451e90fc1ef57b83b809bc354b9e0ef3935e9f181d2a718d5ce
+SIZE (tesseract/pol.traineddata.gz) = 1060352
+SHA256 (tesseract/por.traineddata.gz) = 25df33e4f6c55749d04a5307f1143e31a71a76b7417b91a531c686bf49308b85
+SIZE (tesseract/por.traineddata.gz) = 911645
+SHA256 (tesseract/ron.traineddata.gz) = 367ccb440283e57e4e3f87cd0b97a59a07ceb920e09da8778feafe5e086a9892
+SIZE (tesseract/ron.traineddata.gz) = 929925
+SHA256 (tesseract/rus.traineddata.gz) = 8ced9431d2b1d544fbdd362c36786e3804451da06093bc45acecad84829e5f7a
+SIZE (tesseract/rus.traineddata.gz) = 848490
+SHA256 (tesseract/slk.traineddata.gz) = 037839ad756b9177f7d8f7bd3f01a3a1012094360c5c62a49abbde0a33389511
+SIZE (tesseract/slk.traineddata.gz) = 1091624
+SHA256 (tesseract/slv.traineddata.gz) = bb7318f24972abc380688c67be86d07193e0294b252b60c648720978ad4a8b04
+SIZE (tesseract/slv.traineddata.gz) = 930221
+SHA256 (tesseract/spa.traineddata.gz) = 5de0748b068f35c941e86bba622e23a376a6b084cb094007e7059714f1e030e0
+SIZE (tesseract/spa.traineddata.gz) = 910992
+SHA256 (tesseract/srp.traineddata.gz) = 542b83f62389ff8cc34746dd765345566ab368b63dcf275c223ecb52c2cb9291
+SIZE (tesseract/srp.traineddata.gz) = 977674
+SHA256 (tesseract/swe.traineddata.gz) = 25331ca1f41378a86336604476049810a0c5350417205e300cb2d11048cec2c1
+SIZE (tesseract/swe.traineddata.gz) = 959911
+SHA256 (tesseract/swe-frak.traineddata.gz) = 2cf1a0e1eb8a0e3f8477ebcde44d99a9229f2c20b2d96ecb1ca6c25db5c6fdec
+SIZE (tesseract/swe-frak.traineddata.gz) = 1503568
+SHA256 (tesseract/tgl.traineddata.gz) = d4d88e1fb31771d0b42e65291c03da3a167541df7c9682b81d833a4bd6c9e8cf
+SIZE (tesseract/tgl.traineddata.gz) = 978138
+SHA256 (tesseract/tur.traineddata.gz) = cb4e187f6c25c145252c88a576f3e3c9204c1d77e1c012172a85980c5c01088b
+SIZE (tesseract/tur.traineddata.gz) = 933401
+SHA256 (tesseract/ukr.traineddata.gz) = a54f0ce0843c863f102bfe135939200fc18702ce61ae6ebc571ab49460849365
+SIZE (tesseract/ukr.traineddata.gz) = 927741
+SHA256 (tesseract/vie.traineddata.gz) = 5f61c32daf9a7071ff0dc95415aed75276538813398e3debb3849bba70bda713
+SIZE (tesseract/vie.traineddata.gz) = 1575539
diff --git a/graphics/tesseract/files/patch-ccmain_applybox.cpp b/graphics/tesseract/files/patch-ccmain_applybox.cpp
deleted file mode 100644
index 994d5a489fbc..000000000000
--- a/graphics/tesseract/files/patch-ccmain_applybox.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ccmain/applybox.cpp.orig	2009-04-14 09:59:39.000000000 +0000
-+++ ccmain/applybox.cpp	2009-04-14 10:06:23.000000000 +0000
-@@ -195,6 +195,7 @@
-     bad_blobs);
-   tprintf ("				Final labelled words:     %6d\n",
-     final_labelled_blob_count);
-+  fclose(box_file);
- }
- 
- 
diff --git a/graphics/tesseract/files/patch-ccstruct_polyblk.cpp b/graphics/tesseract/files/patch-ccstruct_polyblk.cpp
deleted file mode 100644
index 07f9356e901e..000000000000
--- a/graphics/tesseract/files/patch-ccstruct_polyblk.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ccstruct/polyblk.cpp.orig	2009-09-11 08:36:32.000000000 -0400
-+++ ccstruct/polyblk.cpp	2009-09-11 08:38:14.000000000 -0400
-@@ -271,6 +271,7 @@
-       }
-     }
-   }
-+  delete lines;
- }
- #endif
- 
diff --git a/graphics/tesseract/files/patch-classify_adaptmatch.cpp b/graphics/tesseract/files/patch-classify_adaptmatch.cpp
deleted file mode 100644
index 8d22665019fd..000000000000
--- a/graphics/tesseract/files/patch-classify_adaptmatch.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- classify/adaptmatch.cpp.orig	2009-09-11 06:08:28.000000000 -0400
-+++ classify/adaptmatch.cpp	2009-09-11 06:10:13.000000000 -0400
-@@ -444,6 +444,7 @@
-     char empty_lengths[] = {0};
-     if (!bln_numericmode)
-       tprintf ("Nil classification!\n");  // Should never normally happen.
-+    delete Results;
-     return (append_choice (NIL, "", empty_lengths, 50.0f, -20.0f, -1));
-   }
- 
diff --git a/graphics/tesseract/files/patch-image_imgs.cpp b/graphics/tesseract/files/patch-image_imgs.cpp
deleted file mode 100644
index 8f897c66de3b..000000000000
--- a/graphics/tesseract/files/patch-image_imgs.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- image/imgs.cpp.orig	2009-04-14 10:20:27.000000000 +0000
-+++ image/imgs.cpp	2009-04-14 10:25:19.000000000 +0000
-@@ -643,7 +643,7 @@
-                                  //put in destination
-     dest->put_line (xdest, ydest, destext, &copyline, 0);
-   }
--  delete linesums;
-+  delete[] linesums;
- }
- 
- 
-@@ -784,7 +784,7 @@
-                                  //put in destination
-     dest->put_line (xdest, ydest, destext, &copyline, 0);
-   }
--  delete linesums;
-+  delete[] linesums;
- }
- 
- 
diff --git a/graphics/tesseract/files/patch-viewer_scrollview.cpp b/graphics/tesseract/files/patch-viewer_scrollview.cpp
deleted file mode 100644
index d3a6dc148159..000000000000
--- a/graphics/tesseract/files/patch-viewer_scrollview.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- viewer/scrollview.cpp.orig	2009-09-11 08:24:19.000000000 -0400
-+++ viewer/scrollview.cpp	2009-09-11 08:32:47.000000000 -0400
-@@ -416,6 +416,7 @@
-   SVEvent* ret = waiting_for_events[ea].second;
-   waiting_for_events.erase(ea);
-   mutex_waiting->Unlock();
-+  delete sem;
-   return ret;
- }
- 
-@@ -436,6 +437,7 @@
-   SVEvent* ret = waiting_for_events[ea].second;
-   waiting_for_events.erase(ea);
-   mutex_waiting->Unlock();
-+  delete sem;
-   return ret;
- }
- 
-@@ -822,4 +824,4 @@
- }
- 
- 
--#endif  // GRAPHICS_DISABLED
-\ No newline at end of file
-+#endif  // GRAPHICS_DISABLED
diff --git a/graphics/tesseract/files/patch-viewer_svutil.cpp b/graphics/tesseract/files/patch-viewer_svutil.cpp
deleted file mode 100644
index 0c5d5e4e95e7..000000000000
--- a/graphics/tesseract/files/patch-viewer_svutil.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- viewer/svutil.cpp.orig	2009-06-03 20:29:38.000000000 +0400
-+++ viewer/svutil.cpp	2009-09-10 15:45:19.000000000 +0400
-@@ -40,9 +40,13 @@
- #ifdef __linux__
- #include <sys/prctl.h>
- #endif
-+#include <netinet/in.h>
- #endif
- 
- #include <iostream>
-+#include <cstring> 
-+#include <cstdio> 
-+#include <cstdlib>
- 
- const int kBufferSize = 65536;
- const int kMaxMsgSize = 4096;
diff --git a/graphics/tesseract/files/patch-wordrec_render.cpp b/graphics/tesseract/files/patch-wordrec_render.cpp
deleted file mode 100644
index cc5a90e3d2ff..000000000000
--- a/graphics/tesseract/files/patch-wordrec_render.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- wordrec/render.cpp.orig	2009-09-11 05:04:06.000000000 -0400
-+++ wordrec/render.cpp	2009-09-11 05:07:37.000000000 -0400
-@@ -108,13 +108,13 @@
-  * that was supplied as input.
-  **********************************************************************/
- void render_edgepts(void *window, EDGEPT *edgept, C_COL color) {
-+  if (!edgept)
-+    return;
-+
-   float x = edgept->pos.x;
-   float y = edgept->pos.y;
-   EDGEPT *this_edge = edgept;
- 
--  if (!edgept)
--    return;
--
-   c_line_color_index(window, color);
-   c_move(window, x, y);
-   do {
diff --git a/graphics/tesseract/pkg-message b/graphics/tesseract/pkg-message
new file mode 100644
index 000000000000..126f907c5a07
--- /dev/null
+++ b/graphics/tesseract/pkg-message
@@ -0,0 +1,4 @@
+Some of tesseract's graphical features rely on a
+Java-based viewer running in an external process,
+and cannot be used with default installations at
+the present time.
diff --git a/graphics/tesseract/pkg-plist b/graphics/tesseract/pkg-plist
index 7907cdec3acf..907c53aac9a3 100644
--- a/graphics/tesseract/pkg-plist
+++ b/graphics/tesseract/pkg-plist
@@ -1,3 +1,4 @@
+bin/combine_tessdata
 bin/cntraining
 bin/mftraining
 bin/tesseract
@@ -6,12 +7,15 @@ bin/wordlist2dawg
 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
@@ -25,8 +29,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
@@ -34,22 +41,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
@@ -83,17 +97,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
@@ -108,16 +125,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
@@ -130,15 +144,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
@@ -155,19 +166,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
@@ -184,25 +193,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
@@ -212,17 +218,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
@@ -232,130 +244,88 @@ 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_api.so
+lib/libtesseract_api.so.3
 lib/libtesseract_ccstruct.a
+lib/libtesseract_ccstruct.la
+lib/libtesseract_ccstruct.so
+lib/libtesseract_ccstruct.so.3
 lib/libtesseract_ccutil.a
+lib/libtesseract_ccutil.la
+lib/libtesseract_ccutil.so
+lib/libtesseract_ccutil.so.3
 lib/libtesseract_classify.a
+lib/libtesseract_classify.la
+lib/libtesseract_classify.so
+lib/libtesseract_classify.so.3
 lib/libtesseract_cutil.a
+lib/libtesseract_cutil.la
+lib/libtesseract_cutil.so
+lib/libtesseract_cutil.so.3
 lib/libtesseract_dict.a
-lib/libtesseract_full.a
+lib/libtesseract_dict.la
+lib/libtesseract_dict.so
+lib/libtesseract_dict.so.3
 lib/libtesseract_image.a
+lib/libtesseract_image.la
+lib/libtesseract_image.so
+lib/libtesseract_image.so.3
 lib/libtesseract_main.a
-lib/libtesseract_pageseg.a
+lib/libtesseract_main.la
+lib/libtesseract_main.so
+lib/libtesseract_main.so.3
 lib/libtesseract_textord.a
+lib/libtesseract_textord.la
+lib/libtesseract_textord.so
+lib/libtesseract_textord.so.3
 lib/libtesseract_training.a
+lib/libtesseract_training.la
+lib/libtesseract_training.so
+lib/libtesseract_training.so.3
 lib/libtesseract_viewer.a
+lib/libtesseract_viewer.la
+lib/libtesseract_viewer.so
+lib/libtesseract_viewer.so.3
 lib/libtesseract_wordrec.a
+lib/libtesseract_wordrec.la
+lib/libtesseract_wordrec.so
+lib/libtesseract_wordrec.so.3
+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/deu.DangAmbigs
-share/tessdata/deu.freq-dawg
-share/tessdata/deu.inttemp
-share/tessdata/deu.normproto
-share/tessdata/deu.pffmtable
-share/tessdata/deu.unicharset
-share/tessdata/deu.user-words
-share/tessdata/deu.word-dawg
-share/tessdata/deu-f.DangAmbigs
-share/tessdata/deu-f.freq-dawg
-share/tessdata/deu-f.inttemp
-share/tessdata/deu-f.normproto
-share/tessdata/deu-f.pffmtable
-share/tessdata/deu-f.unicharset
-share/tessdata/deu-f.user-words
-share/tessdata/deu-f.word-dawg
-share/tessdata/eng.DangAmbigs
-share/tessdata/eng.freq-dawg
-share/tessdata/eng.inttemp
-share/tessdata/eng.normproto
-share/tessdata/eng.pffmtable
-share/tessdata/eng.unicharset
-share/tessdata/eng.user-words
-share/tessdata/eng.word-dawg
-share/tessdata/eus.DangAmbigs
-share/tessdata/eus.freq-dawg
-share/tessdata/eus.inttemp
-share/tessdata/eus.normproto
-share/tessdata/eus.pffmtable
-share/tessdata/eus.unicharset
-share/tessdata/eus.user-words
-share/tessdata/eus.word-dawg
-share/tessdata/fra.DangAmbigs
-share/tessdata/fra.freq-dawg
-share/tessdata/fra.inttemp
-share/tessdata/fra.normproto
-share/tessdata/fra.pffmtable
-share/tessdata/fra.unicharset
-share/tessdata/fra.user-words
-share/tessdata/fra.word-dawg
-share/tessdata/ita.DangAmbigs
-share/tessdata/ita.freq-dawg
-share/tessdata/ita.inttemp
-share/tessdata/ita.normproto
-share/tessdata/ita.pffmtable
-share/tessdata/ita.unicharset
-share/tessdata/ita.user-words
-share/tessdata/ita.word-dawg
-share/tessdata/nld.DangAmbigs
-share/tessdata/nld.freq-dawg
-share/tessdata/nld.inttemp
-share/tessdata/nld.normproto
-share/tessdata/nld.pffmtable
-share/tessdata/nld.unicharset
-share/tessdata/nld.user-words
-share/tessdata/nld.word-dawg
-share/tessdata/por.DangAmbigs
-share/tessdata/por.freq-dawg
-share/tessdata/por.inttemp
-share/tessdata/por.normproto
-share/tessdata/por.pffmtable
-share/tessdata/por.unicharset
-share/tessdata/por.user-words
-share/tessdata/por.word-dawg
-share/tessdata/spa.DangAmbigs
-share/tessdata/spa.freq-dawg
-share/tessdata/spa.inttemp
-share/tessdata/spa.normproto
-share/tessdata/spa.pffmtable
-share/tessdata/spa.unicharset
-share/tessdata/spa.user-words
-share/tessdata/spa.word-dawg
-share/tessdata/vie.DangAmbigs
-share/tessdata/vie.freq-dawg
-share/tessdata/vie.inttemp
-share/tessdata/vie.normproto
-share/tessdata/vie.pffmtable
-share/tessdata/vie.unicharset
-share/tessdata/vie.user-words
-share/tessdata/vie.word-dawg
 share/tessdata/tessconfigs/batch
 share/tessdata/tessconfigs/batch.nochop
 share/tessdata/tessconfigs/matdemo
@@ -365,4 +335,4 @@ share/tessdata/tessconfigs/segdemo
 @dirrm include/tesseract
 @dirrm share/tessdata/configs
 @dirrm share/tessdata/tessconfigs
-@dirrm share/tessdata
+@dirrmtry share/tessdata