- Update to 2.00

Based on:	Gentoo Portage, NetBSD pkgsrc

5 files changed, 98 insertions, 34 deletions

diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index d1e1fb9d4d0f..4e1da8d33e62 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	tesseract
-DISTVERSION=	1.04b
+DISTVERSION=	2.00
 CATEGORIES=	graphics
 MASTER_SITES=	http://tesseract-ocr.googlecode.com/files/ CENKES
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LANGFILES}
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Commercial quality open source OCR engine
@@ -16,15 +17,29 @@ COMMENT=	Commercial quality open source OCR engine
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
 RUN_DEPENDS=	xterm:${PORTSDIR}/x11/xterm
 
+LANGS=	deu eng fra ita nld spa
+LANGFILES=	${LANGS:S|^|${DISTNAME}.|:S|$|${EXTRACT_SUFX}|}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBTIFF_CFLAGS="-I${LOCALBASE}/include"\
 		LIBTIFF_LIBS="-L${LOCALBASE}/lib -ltiff"
-WRKSRC=	${WRKDIR}/${DISTNAME:S/b$//}
+PORTDOCS=	AUTHORS ChangeLog NEWS README ReleaseNotes
+PORTEXAMPLES=	eurotext.tif phototest.tif
+PORT_VERBS=	cntraining mftraining tessdata unicharset_extractor \
+		wordlist2dawg ${PORTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/X11/xterm|${LOCALBASE}/bin/xterm|'\
 		${WRKSRC}/ccutil/debugwin.cpp
 
-# fuzplist: cntraining mftraining tessdata
+post-install:
+	@cd ${WRKDIR}/tessdata/&&${COPYTREE_SHARE} . ${PREFIX}/share/tessdata/
+.ifndef NOPORTDOCS
+	@${INSTALL} -d ${DOCSDIR}/
+	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+.endif
+.ifndef NOPORTEXAMPLES
+	@${INSTALL} -d ${EXAMPLESDIR}/
+	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}/
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/tesseract/distinfo b/graphics/tesseract/distinfo
index d8a0e80c9777..9de6bb618416 100644
--- a/graphics/tesseract/distinfo
+++ b/graphics/tesseract/distinfo
@@ -1,3 +1,21 @@
-MD5 (tesseract-1.04b.tar.gz) = c6f015f2f2c37b3e7e31b64eb295f798
-SHA256 (tesseract-1.04b.tar.gz) = 4dcbddbed71b1b27f7260413dd5d1498b835954128192acb0ab93c0d835c1c0c
-SIZE (tesseract-1.04b.tar.gz) = 2899276
+MD5 (tesseract-2.00.tar.gz) = 6d68d940ed15c61300cb04019c30f46c
+SHA256 (tesseract-2.00.tar.gz) = 5e27365444da6c0d5219fc1800cafdc309b7d711b2716892fce549044ed27ddb
+SIZE (tesseract-2.00.tar.gz) = 1072362
+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
diff --git a/graphics/tesseract/files/patch-configure b/graphics/tesseract/files/patch-configure
deleted file mode 100644
index d10a9328a6e5..000000000000
--- a/graphics/tesseract/files/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./configure.orig	2007-05-17 04:28:33.000000000 +0400
-+++ ./configure	2007-07-18 15:54:41.000000000 +0400
-@@ -6491,7 +6491,8 @@
-   if test "$cross_compiling" = yes; then
-   ac_cv_func_fork_works=cross
- else
--  cat >conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h >conftest.$ac_ext
-+  cat >>conftest.$ac_ext <<_ACEOF
- /* By Ruediger Kuhlmann. */
-       #include <sys/types.h>
-       #if HAVE_UNISTD_H
diff --git a/graphics/tesseract/files/patch-cutil__globals.h b/graphics/tesseract/files/patch-cutil__globals.h
deleted file mode 100644
index b34e42a3aea3..000000000000
--- a/graphics/tesseract/files/patch-cutil__globals.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./cutil/globals.h.orig	2007-05-16 05:13:26.000000000 +0400
-+++ ./cutil/globals.h	2007-07-18 15:54:41.000000000 +0400
-@@ -45,9 +45,11 @@
- extern int debugs[MAXPROC];      /*debug flags */
- extern int plots[MAXPROC];       /*plot flags */
- extern int corners[4];           /*corners of scan window */
-+extern "C" {
- extern int optind;               /*option index */
- extern char *optarg;             /*option argument */
-                                  /*image file name */
-+}
- extern char imagefile[FILENAMESIZE];
-                                  /* main directory */
- extern char directory[FILENAMESIZE];
diff --git a/graphics/tesseract/pkg-plist b/graphics/tesseract/pkg-plist
index 4a3ad1067455..a6daa8715fcd 100644
--- a/graphics/tesseract/pkg-plist
+++ b/graphics/tesseract/pkg-plist
@@ -1,6 +1,8 @@
 bin/cntraining
 bin/mftraining
 bin/tesseract
+bin/unicharset_extractor
+bin/wordlist2dawg
 include/tesseract/adaptions.h
 include/tesseract/adaptive.h
 include/tesseract/adaptmatch.h
@@ -36,7 +38,6 @@ include/tesseract/clst.h
 include/tesseract/cluster.h
 include/tesseract/clusttool.h
 include/tesseract/cmndwin.h
-include/tesseract/cnTraining.dsp
 include/tesseract/const.h
 include/tesseract/context.h
 include/tesseract/control.h
@@ -51,6 +52,7 @@ include/tesseract/debugwin.h
 include/tesseract/djmenus.h
 include/tesseract/dlltest.cpp
 include/tesseract/dlltest.dsp
+include/tesseract/dlltest.vcproj
 include/tesseract/docqual.h
 include/tesseract/drawedg.h
 include/tesseract/drawfx.h
@@ -113,9 +115,11 @@ include/tesseract/labls.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
@@ -128,7 +132,6 @@ include/tesseract/memryerr.h
 include/tesseract/mergenf.h
 include/tesseract/metrics.h
 include/tesseract/mf.h
-include/tesseract/mfTraining.dsp
 include/tesseract/mfcpch.cpp
 include/tesseract/mfcpch.h
 include/tesseract/mfdefs.h
@@ -187,6 +190,7 @@ 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
@@ -261,13 +265,26 @@ lib/libtesseract_classify.a
 lib/libtesseract_cutil.a
 lib/libtesseract_dict.a
 lib/libtesseract_display.a
+lib/libtesseract_full.a
 lib/libtesseract_image.a
 lib/libtesseract_main.a
 lib/libtesseract_textord.a
 lib/libtesseract_training.a
 lib/libtesseract_viewer.a
 lib/libtesseract_wordrec.a
+share/tessdata/configs/box.train
+share/tessdata/configs/inter
+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/eng.DangAmbigs
 share/tessdata/eng.freq-dawg
 share/tessdata/eng.inttemp
@@ -276,5 +293,45 @@ share/tessdata/eng.pffmtable
 share/tessdata/eng.unicharset
 share/tessdata/eng.user-words
 share/tessdata/eng.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/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/tessconfigs/batch
+share/tessdata/tessconfigs/batch.nochop
+share/tessdata/tessconfigs/matdemo
+share/tessdata/tessconfigs/msdemo
+share/tessdata/tessconfigs/nobatch
+share/tessdata/tessconfigs/segdemo
 @dirrm include/tesseract
+@dirrm share/tessdata/configs
+@dirrm share/tessdata/tessconfigs
 @dirrm share/tessdata