4 files changed, 88 insertions, 130 deletions

diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index 29f6f17f289b..81a17657f5cb 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tesseract
-PORTVERSION=	3.00
-PORTREVISION=	1
+PORTVERSION=	3.01
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 .if !defined(NOPORTDATA) || make(makesum)
@@ -18,20 +17,28 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Commercial quality open source OCR engine
 
-LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
+LICENSE=	ASL
+
+LIB_DEPENDS=	lept.2:${PORTSDIR}/graphics/leptonica
 
 DIST_SUBDIR=	${PORTNAME}
 PROJECTHOST=	tesseract-ocr
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBTIFF_CFLAGS="-I${LOCALBASE}/include"\
-		LIBTIFF_LIBS="-L${LOCALBASE}/lib -ltiff"
-LICENSE=	ASL
+USE_AUTOTOOLS=	automake
 USE_LDCONFIG=	yes
 
+CONFIGURE_ENV=	LIBLEPT_HEADERSDIR="${LOCALBASE}/include/leptonica"
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+MAN1=	cntraining.1 combine_tessdata.1 mftraining.1 tesseract.1 \
+	unicharset_extractor.1 wordlist2dawg.1
+MAN5=	unicharambigs.5 unicharset.5
+
 .include <bsd.port.pre.mk>
 
-TESSERACT_XTERM ?=	${LOCALBASE}/bin/xterm
+.if defined(USE_GCC) || !empty(CC:M*gcc4*)
+CXXFLAGS+=	-fpermissive
+.endif
 
 .ifndef NOPORTDATA
 DATADIR=	${PREFIX}/share/tessdata
@@ -39,25 +46,17 @@ PORTDATA=	eng.traineddata
 .endif
 
 .ifndef NOPORTDOCS
-PORTDOCS=	AUTHORS ChangeLog NEWS README ReleaseNotes
+PORTDOCS=	AUTHORS ChangeLog README ReleaseNotes
 .endif
 
 .ifndef NOPORTEXAMPLES
 PORTEXAMPLES=	eurotext.tif phototest.tif
 .endif
 
-pre-fetch:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "The fallback xterm-compatible terminal to be used"
-	@${ECHO_MSG} "for debugging purposes may be overridden by"
-	@${ECHO_MSG} "defining TESSERACT_XTERM"
-	@${ECHO_MSG} ""
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/xterm|${TESSERACT_XTERM}|'\
-		${WRKSRC}/ccutil/debugwin.cpp
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'\
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '1s|.*|/*|' ${WRKSRC}/ccutil/strngs.h
 
 post-install:
 .ifndef NOPORTDATA
diff --git a/graphics/tesseract/distinfo b/graphics/tesseract/distinfo
index 1352d62a59c5..c1f7d40fbec9 100644
--- a/graphics/tesseract/distinfo
+++ b/graphics/tesseract/distinfo
@@ -1,4 +1,4 @@
-SHA256 (tesseract/tesseract-3.00.tar.gz) = 9c32d45f9c5ccf2bd9703a9db1371aaf0fc8f89f2dc536096442b31c3c4c3984
-SIZE (tesseract/tesseract-3.00.tar.gz) = 3436992
+SHA256 (tesseract/tesseract-3.01.tar.gz) = c24b0bd278291bc93ab242f93841c1d8743689c943bd804afbc5b898dc0a1c9b
+SIZE (tesseract/tesseract-3.01.tar.gz) = 3287629
 SHA256 (tesseract/eng.traineddata.gz) = 3ad150c58d59aa7f20e12bed0e15a33c988f5803d6cba8ef366aeec0c18d4e9d
 SIZE (tesseract/eng.traineddata.gz) = 742852
diff --git a/graphics/tesseract/pkg-message b/graphics/tesseract/pkg-message
index c68a61187e2a..5627bf794f6e 100644
--- a/graphics/tesseract/pkg-message
+++ b/graphics/tesseract/pkg-message
@@ -1,6 +1,2 @@
-Some of tesseract's graphical features rely on
-a viewer running in an external process, and
-cannot be used with default installations at
-the present time.  Additional, non-English
-trained language data are available in the
+Additional trained language data are available in the
 graphics/tesseract-data port.
diff --git a/graphics/tesseract/pkg-plist b/graphics/tesseract/pkg-plist
index 971576cdd0b2..33faae471816 100644
--- a/graphics/tesseract/pkg-plist
+++ b/graphics/tesseract/pkg-plist
@@ -1,46 +1,47 @@
-bin/combine_tessdata
 bin/cntraining
+bin/combine_tessdata
 bin/mftraining
 bin/tesseract
 bin/unicharset_extractor
 bin/wordlist2dawg
-include/tesseract/adaptions.h
 include/tesseract/adaptive.h
-include/tesseract/adaptmatch.h
 include/tesseract/alignedblob.h
+include/tesseract/altlist.h
 include/tesseract/ambigs.h
-include/tesseract/applybox.h
+include/tesseract/apitypes.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/beam_search.h
 include/tesseract/bestfirst.h
 include/tesseract/bits16.h
-include/tesseract/bitstrm.h
 include/tesseract/bitvec.h
 include/tesseract/blckerr.h
 include/tesseract/blkocc.h
 include/tesseract/blobbox.h
 include/tesseract/blobclass.h
-include/tesseract/blobcmp.h
-include/tesseract/blobcmpl.h
 include/tesseract/blobs.h
 include/tesseract/blread.h
+include/tesseract/bmp_8.h
 include/tesseract/boxread.h
-include/tesseract/callback.h
+include/tesseract/boxword.h
+include/tesseract/cached_file.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/char_altlist.h
+include/tesseract/char_bigrams.h
+include/tesseract/char_samp.h
+include/tesseract/char_samp_enum.h
+include/tesseract/char_samp_set.h
+include/tesseract/char_set.h
 include/tesseract/chartoname.h
-include/tesseract/choicearr.h
-include/tesseract/choices.h
 include/tesseract/chop.h
 include/tesseract/chopper.h
+include/tesseract/classifier_base.h
+include/tesseract/classifier_factory.h
 include/tesseract/classify.h
 include/tesseract/closed.h
 include/tesseract/clst.h
@@ -48,26 +49,33 @@ include/tesseract/cluster.h
 include/tesseract/clusttool.h
 include/tesseract/colfind.h
 include/tesseract/colpartition.h
+include/tesseract/colpartitiongrid.h
 include/tesseract/colpartitionset.h
 include/tesseract/commontraining.h
+include/tesseract/con_comp.h
 include/tesseract/const.h
-include/tesseract/context.h
 include/tesseract/control.h
-include/tesseract/conversion.h
+include/tesseract/conv_net_classifier.h
 include/tesseract/coutln.h
 include/tesseract/crakedge.h
+include/tesseract/cube_const.h
+include/tesseract/cube_line_object.h
+include/tesseract/cube_line_segmenter.h
+include/tesseract/cube_object.h
+include/tesseract/cube_reco_context.h
+include/tesseract/cube_search_object.h
+include/tesseract/cube_tuning_params.h
+include/tesseract/cube_utils.h
 include/tesseract/cutil.h
 include/tesseract/cutil_class.h
 include/tesseract/cutoffs.h
 include/tesseract/danerror.h
 include/tesseract/dawg.h
-include/tesseract/debugwin.h
 include/tesseract/detlinefit.h
+include/tesseract/devanagari_processing.h
 include/tesseract/dict.h
-include/tesseract/dlltest.cpp
-include/tesseract/dlltest.dsp
-include/tesseract/dlltest.vcproj
 include/tesseract/docqual.h
+include/tesseract/dppoint.h
 include/tesseract/drawedg.h
 include/tesseract/drawfx.h
 include/tesseract/drawtord.h
@@ -78,80 +86,75 @@ include/tesseract/elst.h
 include/tesseract/elst2.h
 include/tesseract/emalloc.h
 include/tesseract/errcode.h
-include/tesseract/expandblob.h
 include/tesseract/extern.h
 include/tesseract/extract.h
 include/tesseract/featdefs.h
+include/tesseract/feature_base.h
+include/tesseract/feature_bmp.h
+include/tesseract/feature_chebyshev.h
+include/tesseract/feature_hybrid.h
 include/tesseract/fileerr.h
 include/tesseract/findseam.h
 include/tesseract/fixspace.h
-include/tesseract/fixxht.h
 include/tesseract/flexfx.h
 include/tesseract/float2int.h
 include/tesseract/fpchop.h
 include/tesseract/fpoint.h
 include/tesseract/freelist.h
-include/tesseract/funcdefs.h
 include/tesseract/fxdefs.h
-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/hybrid_neural_net_classifier.h
 include/tesseract/image.h
 include/tesseract/imagefind.h
 include/tesseract/img.h
-include/tesseract/imgbmp.h
 include/tesseract/imgerrs.h
-include/tesseract/imgio.h
 include/tesseract/imgs.h
 include/tesseract/imgscale.h
 include/tesseract/imgtiff.h
 include/tesseract/imgunpk.h
+include/tesseract/input_file_buffer.h
 include/tesseract/intfx.h
 include/tesseract/intmatcher.h
 include/tesseract/intproto.h
 include/tesseract/ipoints.h
 include/tesseract/kdtree.h
-include/tesseract/labls.h
+include/tesseract/lang_mod_edge.h
+include/tesseract/lang_model.h
+include/tesseract/language_model.h
 include/tesseract/linefind.h
 include/tesseract/linlsq.h
 include/tesseract/listio.h
-include/tesseract/lmedsq.h
 include/tesseract/lsterr.h
-include/tesseract/mainblk.h
 include/tesseract/makechop.h
 include/tesseract/makerow.h
 include/tesseract/matchdefs.h
 include/tesseract/matchtab.h
-include/tesseract/matmatch.h
 include/tesseract/matrix.h
 include/tesseract/measure.h
 include/tesseract/memblk.h
 include/tesseract/memry.h
 include/tesseract/memryerr.h
 include/tesseract/mergenf.h
-include/tesseract/metrics.h
 include/tesseract/mf.h
 include/tesseract/mfcpch.h
 include/tesseract/mfdefs.h
 include/tesseract/mfoutline.h
-include/tesseract/mfvars.h
 include/tesseract/mfx.h
 include/tesseract/mod128.h
-include/tesseract/name2char.h
 include/tesseract/ndminx.h
+include/tesseract/neural_net.h
+include/tesseract/neuron.h
 include/tesseract/normalis.h
 include/tesseract/normfeat.h
 include/tesseract/normmatch.h
@@ -161,7 +164,6 @@ include/tesseract/ocrblock.h
 include/tesseract/ocrclass.h
 include/tesseract/ocrfeatures.h
 include/tesseract/ocrrow.h
-include/tesseract/ocrshell.h
 include/tesseract/oldbasel.h
 include/tesseract/oldheap.h
 include/tesseract/oldlist.h
@@ -171,12 +173,11 @@ include/tesseract/otsuthr.h
 include/tesseract/outfeat.h
 include/tesseract/outlines.h
 include/tesseract/output.h
+include/tesseract/pageiterator.h
 include/tesseract/pageres.h
-include/tesseract/pagewalk.h
-include/tesseract/paircmp.h
+include/tesseract/params.h
+include/tesseract/paramsd.h
 include/tesseract/pdblock.h
-include/tesseract/permdawg.h
-include/tesseract/permngram.h
 include/tesseract/permute.h
 include/tesseract/pgedit.h
 include/tesseract/picofeat.h
@@ -189,10 +190,8 @@ include/tesseract/plotseg.h
 include/tesseract/points.h
 include/tesseract/polyaprx.h
 include/tesseract/polyblk.h
-include/tesseract/polyblob.h
-include/tesseract/polyvert.h
-include/tesseract/poutline.h
 include/tesseract/protos.h
+include/tesseract/publictypes.h
 include/tesseract/qrsequence.h
 include/tesseract/quadlsq.h
 include/tesseract/quadratc.h
@@ -202,14 +201,18 @@ include/tesseract/rect.h
 include/tesseract/rejctmap.h
 include/tesseract/reject.h
 include/tesseract/render.h
+include/tesseract/resultiterator.h
 include/tesseract/scaleimg.h
 include/tesseract/scanedg.h
-include/tesseract/scanutils.h
 include/tesseract/scrollview.h
 include/tesseract/seam.h
+include/tesseract/search_column.h
+include/tesseract/search_node.h
+include/tesseract/search_object.h
 include/tesseract/secname.h
 include/tesseract/serialis.h
 include/tesseract/sortflts.h
+include/tesseract/sorthelper.h
 include/tesseract/speckle.h
 include/tesseract/split.h
 include/tesseract/states.h
@@ -217,114 +220,74 @@ include/tesseract/statistc.h
 include/tesseract/stderr.h
 include/tesseract/stepblob.h
 include/tesseract/stopper.h
+include/tesseract/string_32.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/tablerecog.h
 include/tesseract/tabvector.h
 include/tesseract/tally.h
+include/tesseract/tess_lang_mod_edge.h
+include/tesseract/tess_lang_model.h
 include/tesseract/tessarray.h
 include/tesseract/tessbox.h
-include/tesseract/tessclas.h
+include/tesseract/tesscallback.h
 include/tesseract/tessdatamanager.h
 include/tesseract/tessedit.h
-include/tesseract/tessembedded.h
+include/tesseract/tesseract_cube_combiner.h
 include/tesseract/tesseractclass.h
 include/tesseract/tesseractmain.h
-include/tesseract/tessinit.h
-include/tesseract/tessio.h
 include/tesseract/tessopt.h
-include/tesseract/tessout.h
 include/tesseract/tessvars.h
-include/tesseract/tface.h
+include/tesseract/textord.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/trie.h
-include/tesseract/tstruct.h
+include/tesseract/tuning_params.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/vecfuncs.h
 include/tesseract/werd.h
 include/tesseract/werdit.h
+include/tesseract/word_altlist.h
+include/tesseract/word_list_lang_model.h
+include/tesseract/word_size_model.h
+include/tesseract/word_unigrams.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_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_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
+lib/libtesseract.a
+lib/libtesseract.la
+lib/libtesseract.so
+lib/libtesseract.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/hocr
 share/tessdata/configs/inter
 share/tessdata/configs/kannada
+share/tessdata/configs/linebox
 share/tessdata/configs/logfile
 share/tessdata/configs/makebox
+share/tessdata/configs/rebox
+share/tessdata/configs/strokewidth
 share/tessdata/configs/unlv
 share/tessdata/tessconfigs/batch
 share/tessdata/tessconfigs/batch.nochop