4 files changed, 68 insertions, 342 deletions

diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index 353110ea6499..bd7c56631ea4 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -6,80 +6,69 @@
 #
 
 PORTNAME=	tesseract
-PORTVERSION=	3.01
-PORTREVISION=	3
+PORTVERSION=	3.02.02
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-.if !defined(NOPORTDATA) || make(makesum)
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		tesseract-ocr-3.01.eng.tar.gz tesseract-ocr-3.01.osd.tar.gz
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-.endif
+DISTFILES=	tesseract-ocr-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Commercial quality open source OCR engine
 
 LICENSE=	AL2
 
-LIB_DEPENDS=	lept.2:${PORTSDIR}/graphics/leptonica
+LIB_DEPENDS=	lept:${PORTSDIR}/graphics/leptonica
 
 DIST_SUBDIR=	${PORTNAME}
 PROJECTHOST=	tesseract-ocr
+WRKSRC= 	${WRKDIR}/tesseract-ocr
 
-USE_AUTOTOOLS=	automake autoconf:env
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	LIBLEPT_HEADERSDIR="${LOCALBASE}/include/leptonica"
+CONFIGURE_ENV=	LIBLEPT_HEADERSDIR="${LOCALBASE}/include/leptonica" \
+		LIBS="${PTHREAD_LIBS}"
 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>
+.include <bsd.port.options.mk>
 
-.if defined(USE_GCC) || !empty(CC:M*gcc4*)
-CXXFLAGS+=	-fpermissive
+.ifndef NOPORTDATA
+DATADIR=        ${PREFIX}/share/tessdata
+MAN1=		ambiguous_words.1 cntraining.1 combine_tessdata.1 dawg2wordlist.1 \
+		mftraining.1 shapeclustering.1 tesseract.1 unicharset_extractor.1 \
+		wordlist2dawg.1
+MAN5=		unicharambigs.5 unicharset.5
+PORTDATA=	*
 .endif
 
-.ifndef NOPORTDATA
-DATADIR=	${PREFIX}/share/tessdata
-PORTDATA=	eng.traineddata osd.traineddata
+.if ${PORT_OPTIONS:MDOCS}
+PORTDOCS=	AUTHORS ChangeLog README ReleaseNotes html
 .endif
 
-.ifndef NOPORTDOCS
-PORTDOCS=	AUTHORS ChangeLog README ReleaseNotes
+.if ${PORT_OPTIONS:MDOCS} || make(makesum)
+DISTFILES+=	tesseract-ocr-${PORTVERSION}-doc-html${EXTRACT_SUFX}
 .endif
 
-.ifndef NOPORTEXAMPLES
+.if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	eurotext.tif phototest.tif
 .endif
 
-AUTOTOOLSFILES=	aclocal.m4
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' \
-			  -e 's|2.65|%%AUTOCONF_VERSION%%|g' \
-			  ${WRKSRC}/aclocal.m4
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'\
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '1s|.*|/*|' ${WRKSRC}/ccutil/strngs.h
+	@${REINPLACE_CMD} -e 's|-O3 -DNDEBUG||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+	's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+	${WRKSRC}/Makefile.in
+.ifdef NOPORTDATA
+	@${FIND} ${WRKSRC} -type f -name 'Makefile.in' -print0 | ${XARGS} -0 \
+	${REINPLACE_CMD} -e '\|^install-am:|,+1s|install-data-am||'
+.endif
 
 post-install:
-.ifndef NOPORTDATA
-	@${MKDIR} ${DATADIR}
-.for f in ${PORTDATA:R}
-	@${TAR} --strip-components 2 -C ${DATADIR} \
-	-xf ${_DISTDIR}/tesseract-ocr-3.01.${f}.tar.gz *.traineddata
-.endfor
-	@cd ${DATADIR}; ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PORTDATA}; \
-	${CHMOD} ${BINMODE} ${PORTDATA}
-.endif
-.ifndef NOPORTDOCS
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS:Nhtml} ${DOCSDIR}
+	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${DOCSDIR}
 .endif
-.ifndef NOPORTEXAMPLES
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
 .endif
@@ -87,4 +76,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG} ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/tesseract/distinfo b/graphics/tesseract/distinfo
index 061d7928c0bc..784f3ae74d8e 100644
--- a/graphics/tesseract/distinfo
+++ b/graphics/tesseract/distinfo
@@ -1,6 +1,4 @@
-SHA256 (tesseract/tesseract-3.01.tar.gz) = c24b0bd278291bc93ab242f93841c1d8743689c943bd804afbc5b898dc0a1c9b
-SIZE (tesseract/tesseract-3.01.tar.gz) = 3287629
-SHA256 (tesseract/tesseract-ocr-3.01.eng.tar.gz) = 89dceb9910dcfc21296645b289834269f9dd5ebeb819fe6b8d2f7fcbafd8c8b1
-SIZE (tesseract/tesseract-ocr-3.01.eng.tar.gz) = 4306720
-SHA256 (tesseract/tesseract-ocr-3.01.osd.tar.gz) = 7861210fd0970ad30503e8c70d7841de6716bd293d8512fd8787a1a07219b7aa
-SIZE (tesseract/tesseract-ocr-3.01.osd.tar.gz) = 4320544
+SHA256 (tesseract/tesseract-ocr-3.02.02.tar.gz) = c15cd55325b1ecbc9d6e7a732f44ff790d3bd1131bcbf99e70fb7edd644dcc44
+SIZE (tesseract/tesseract-ocr-3.02.02.tar.gz) = 3750747
+SHA256 (tesseract/tesseract-ocr-3.02.02-doc-html.tar.gz) = 553c77079ad8bb4ad70ebb669c47c6a461b51bcd0a13a2ac89ceabe0a09de798
+SIZE (tesseract/tesseract-ocr-3.02.02-doc-html.tar.gz) = 11305421
diff --git a/graphics/tesseract/pkg-message b/graphics/tesseract/pkg-message
index 5627bf794f6e..a0a4d68e2846 100644
--- a/graphics/tesseract/pkg-message
+++ b/graphics/tesseract/pkg-message
@@ -1,2 +1,2 @@
-Additional trained language data are available in the
+Trained language data are available in the
 graphics/tesseract-data port.
diff --git a/graphics/tesseract/pkg-plist b/graphics/tesseract/pkg-plist
index 33faae471816..f97c66017c8c 100644
--- a/graphics/tesseract/pkg-plist
+++ b/graphics/tesseract/pkg-plist
@@ -1,301 +1,40 @@
+bin/ambiguous_words
+bin/classifier_tester
 bin/cntraining
 bin/combine_tessdata
+bin/dawg2wordlist
 bin/mftraining
+bin/shapeclustering
 bin/tesseract
 bin/unicharset_extractor
 bin/wordlist2dawg
-include/tesseract/adaptive.h
-include/tesseract/alignedblob.h
-include/tesseract/altlist.h
-include/tesseract/ambigs.h
-include/tesseract/apitypes.h
-include/tesseract/associate.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/bitvec.h
-include/tesseract/blckerr.h
-include/tesseract/blkocc.h
-include/tesseract/blobbox.h
-include/tesseract/blobclass.h
-include/tesseract/blobs.h
-include/tesseract/blread.h
-include/tesseract/bmp_8.h
-include/tesseract/boxread.h
-include/tesseract/boxword.h
-include/tesseract/cached_file.h
-include/tesseract/callcpp.h
-include/tesseract/ccstruct.h
-include/tesseract/ccutil.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/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
-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/control.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/detlinefit.h
-include/tesseract/devanagari_processing.h
-include/tesseract/dict.h
-include/tesseract/docqual.h
-include/tesseract/dppoint.h
-include/tesseract/drawedg.h
-include/tesseract/drawfx.h
-include/tesseract/drawtord.h
-include/tesseract/edgblob.h
-include/tesseract/edgloop.h
-include/tesseract/efio.h
-include/tesseract/elst.h
-include/tesseract/elst2.h
-include/tesseract/emalloc.h
-include/tesseract/errcode.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/flexfx.h
-include/tesseract/float2int.h
-include/tesseract/fpchop.h
-include/tesseract/fpoint.h
-include/tesseract/freelist.h
-include/tesseract/fxdefs.h
-include/tesseract/gap_map.h
-include/tesseract/genblob.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/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/imgerrs.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/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/lsterr.h
-include/tesseract/makechop.h
-include/tesseract/makerow.h
-include/tesseract/matchdefs.h
-include/tesseract/matchtab.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/mf.h
-include/tesseract/mfcpch.h
-include/tesseract/mfdefs.h
-include/tesseract/mfoutline.h
-include/tesseract/mfx.h
-include/tesseract/mod128.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
-include/tesseract/notdll.h
-include/tesseract/nwmain.h
-include/tesseract/ocrblock.h
-include/tesseract/ocrclass.h
-include/tesseract/ocrfeatures.h
-include/tesseract/ocrrow.h
-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/pageiterator.h
-include/tesseract/pageres.h
-include/tesseract/params.h
-include/tesseract/paramsd.h
-include/tesseract/pdblock.h
-include/tesseract/permute.h
-include/tesseract/pgedit.h
-include/tesseract/picofeat.h
-include/tesseract/pieces.h
-include/tesseract/pithsync.h
-include/tesseract/pitsync1.h
-include/tesseract/platform.h
-include/tesseract/plotedges.h
-include/tesseract/plotseg.h
-include/tesseract/points.h
-include/tesseract/polyaprx.h
-include/tesseract/polyblk.h
-include/tesseract/protos.h
-include/tesseract/publictypes.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/rejctmap.h
-include/tesseract/reject.h
-include/tesseract/render.h
-include/tesseract/resultiterator.h
-include/tesseract/scaleimg.h
-include/tesseract/scanedg.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
-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/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/tesscallback.h
-include/tesseract/tessdatamanager.h
-include/tesseract/tessedit.h
-include/tesseract/tesseract_cube_combiner.h
-include/tesseract/tesseractclass.h
-include/tesseract/tesseractmain.h
-include/tesseract/tessopt.h
-include/tesseract/tessvars.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/tovars.h
-include/tesseract/tprintf.h
-include/tesseract/trie.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/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
+%%PORTDATA%%include/tesseract/apitypes.h
+%%PORTDATA%%include/tesseract/baseapi.h
+%%PORTDATA%%include/tesseract/basedir.h
+%%PORTDATA%%include/tesseract/capi.h
+%%PORTDATA%%include/tesseract/errcode.h
+%%PORTDATA%%include/tesseract/fileerr.h
+%%PORTDATA%%include/tesseract/genericvector.h
+%%PORTDATA%%include/tesseract/helpers.h
+%%PORTDATA%%include/tesseract/host.h
+%%PORTDATA%%include/tesseract/ltrresultiterator.h
+%%PORTDATA%%include/tesseract/memry.h
+%%PORTDATA%%include/tesseract/ndminx.h
+%%PORTDATA%%include/tesseract/pageiterator.h
+%%PORTDATA%%include/tesseract/params.h
+%%PORTDATA%%include/tesseract/platform.h
+%%PORTDATA%%include/tesseract/publictypes.h
+%%PORTDATA%%include/tesseract/resultiterator.h
+%%PORTDATA%%include/tesseract/serialis.h
+%%PORTDATA%%include/tesseract/strngs.h
+%%PORTDATA%%include/tesseract/tesscallback.h
+%%PORTDATA%%include/tesseract/thresholder.h
+%%PORTDATA%%include/tesseract/unichar.h
+%%PORTDATA%%include/tesseract/unicharmap.h
+%%PORTDATA%%include/tesseract/unicharset.h
 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
-share/tessdata/tessconfigs/matdemo
-share/tessdata/tessconfigs/msdemo
-share/tessdata/tessconfigs/nobatch
-share/tessdata/tessconfigs/segdemo
-@dirrm include/tesseract
-@dirrmtry share/tessdata/configs
-@dirrmtry share/tessdata/tessconfigs
-@dirrmtry share/tessdata
+%%PORTDATA%%libdata/pkgconfig/tesseract.pc
+%%PORTDATA%%@dirrm include/tesseract