Index: head/graphics/tesseract/Makefile =================================================================== --- head/graphics/tesseract/Makefile (revision 506494) +++ head/graphics/tesseract/Makefile (revision 506495) @@ -1,69 +1,67 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= tesseract -PORTVERSION= 4.0.0 -PORTREVISION= 3 +PORTVERSION= 4.1.0 CATEGORIES= graphics -MAINTAINER= pkubaj@anongoth.pl +MAINTAINER= pkubaj@FreeBSD.org COMMENT= Commercial quality open source OCR engine LICENSE= APACHE20 BUILD_DEPENDS= asciidoc:textproc/asciidoc \ xsltproc:textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl LIB_DEPENDS= liblept.so:graphics/leptonica RUN_DEPENDS= tesseract-data>=0:graphics/tesseract-data USES= autoreconf compiler:c++11-lang gmake gnome localbase \ libtool pathfix pkgconfig shebangfix USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME}-ocr CONFIGURE_ENV= LIBLEPT_HEADERSDIR="${LOCALBASE}/include/leptonica" DATADIR= ${PREFIX}/share/tessdata PORTDATA= * PORTDOCS= AUTHORS ChangeLog README.md INSTALL_TARGET= install-strip SHEBANG_FILES= src/training/language-specific.sh \ src/training/tesstrain.sh OPTIONS_DEFINE= DOCS TOOLS OPTIONS_DEFINE_amd64=OPENMP OPTIONS_DEFINE_i386=OPENMP OPTIONS_DEFAULT=TOOLS OPTIONS_DEFAULT_amd64=OPENMP OPTIONS_DEFAULT_i386=OPENMP OPTIONS_SUB= yes OPENMP_CONFIGURE_ENABLE=openmp OPENMP_LIB_DEPENDS=libomp.so:devel/openmp TOOLS_DESC= Include training tools TOOLS_LIB_DEPENDS=libicui18n.so:devel/icu \ libfontconfig.so:x11-fonts/fontconfig -TOOLS_USES= compiler:c++11-lib TOOLS_USE= GNOME=cairo,glib20,pango post-patch: @${REINPLACE_CMD} -e 's|-O3 -DNDEBUG||' ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/doc/Makefile.am post-build-TOOLS-on: @cd ${WRKSRC} && ${MAKE} training post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-TOOLS-on: @cd ${WRKSRC} && ${MAKE} DESTDIR=${STAGEDIR} training-install .include Index: head/graphics/tesseract/distinfo =================================================================== --- head/graphics/tesseract/distinfo (revision 506494) +++ head/graphics/tesseract/distinfo (revision 506495) @@ -1,3 +1,3 @@ -TIMESTAMP = 1544717557 -SHA256 (tesseract-ocr-tesseract-4.0.0_GH0.tar.gz) = a1f5422ca49a32e5f35c54dee5112b11b99928fc9f4ee6695cdc6768d69f61dd -SIZE (tesseract-ocr-tesseract-4.0.0_GH0.tar.gz) = 1961372 +TIMESTAMP = 1562588745 +SHA256 (tesseract-ocr-tesseract-4.1.0_GH0.tar.gz) = 5c5ed5f1a76888dc57a83704f24ae02f8319849f5c4cf19d254296978a1a1961 +SIZE (tesseract-ocr-tesseract-4.1.0_GH0.tar.gz) = 1965053 Index: head/graphics/tesseract/files/patch-doc_Makefile.am =================================================================== --- head/graphics/tesseract/files/patch-doc_Makefile.am (revision 506494) +++ head/graphics/tesseract/files/patch-doc_Makefile.am (nonexistent) @@ -1,15 +0,0 @@ ---- doc/Makefile.am.orig 2019-03-28 05:11:18 UTC -+++ doc/Makefile.am -@@ -36,7 +36,11 @@ EXTRA_DIST = $(man_MANS) Doxyfile - html: $(patsubst %,%.html,$(man_MANS)) - - %: %.asc -- $(asciidoc) -o $@ $< -+ $(asciidoc) $< -+ $(asciidoc) -b docbook $< -+ %%LOCALBASE%%/bin/xsltproc --nonet --param man.charmap.use.subset "0" \ -+ %%LOCALBASE%%/share/xsl/docbook/manpages/docbook.xsl \ -+ $@.xml - - %.html: %.asc - asciidoc -b html5 -o $@ $< Property changes on: head/graphics/tesseract/files/patch-doc_Makefile.am ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/tesseract/files/patch-configure.ac =================================================================== --- head/graphics/tesseract/files/patch-configure.ac (revision 506494) +++ head/graphics/tesseract/files/patch-configure.ac (revision 506495) @@ -1,18 +1,17 @@ sem_init(3) is part of libc on FreeBSD, so we ended up not linking against libpthread. Look for a symbol that causes us to load it. libtesseract.so is not linked against libomp if openmp is enabled, which makes dependent ports fail. This adds a workaround by linking directly against libomp. ---- configure.ac.orig 2019-03-26 21:58:42 UTC +--- configure.ac.orig 2019-07-07 12:34:08 UTC +++ configure.ac -@@ -375,6 +375,10 @@ CXXFLAGS="$OLD_CXXFLAGS" +@@ -372,6 +372,9 @@ esac # ---------------------------------------- - AC_SEARCH_LIBS([sem_init], [pthread rt]) -+AC_SEARCH_LIBS([pthread_create], [pthread]) + AC_SEARCH_LIBS([pthread_create], [pthread]) +if test "$enable_openmp" != no; then + AC_SEARCH_LIBS([omp_get_thread_num ], [omp]) +fi - + # ---------------------------------------- Index: head/graphics/tesseract/files/patch-src_ccutil_ocrclass.h =================================================================== --- head/graphics/tesseract/files/patch-src_ccutil_ocrclass.h (nonexistent) +++ head/graphics/tesseract/files/patch-src_ccutil_ocrclass.h (revision 506495) @@ -0,0 +1,10 @@ +--- src/ccutil/ocrclass.h.orig 2019-07-08 13:00:14 UTC ++++ src/ccutil/ocrclass.h +@@ -31,6 +31,7 @@ + #ifdef _WIN32 + #include // for timeval + #endif ++#include + + /********************************************************************** + * EANYCODE_CHAR Property changes on: head/graphics/tesseract/files/patch-src_ccutil_ocrclass.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/tesseract/pkg-plist =================================================================== --- head/graphics/tesseract/pkg-plist (revision 506494) +++ head/graphics/tesseract/pkg-plist (revision 506495) @@ -1,62 +1,61 @@ %%TOOLS%%bin/ambiguous_words %%TOOLS%%bin/classifier_tester %%TOOLS%%bin/cntraining %%TOOLS%%bin/combine_lang_model %%TOOLS%%bin/combine_tessdata %%TOOLS%%bin/dawg2wordlist %%TOOLS%%bin/language-specific.sh %%TOOLS%%bin/lstmtraining %%TOOLS%%bin/lstmeval %%TOOLS%%bin/merge_unicharsets %%TOOLS%%bin/mftraining %%TOOLS%%bin/set_unicharset_properties %%TOOLS%%bin/shapeclustering bin/tesseract %%TOOLS%%bin/tesstrain.sh %%TOOLS%%bin/tesstrain_utils.sh %%TOOLS%%bin/text2image %%TOOLS%%bin/unicharset_extractor %%TOOLS%%bin/wordlist2dawg include/tesseract/apitypes.h include/tesseract/baseapi.h include/tesseract/capi.h include/tesseract/genericvector.h include/tesseract/helpers.h -include/tesseract/host.h include/tesseract/ltrresultiterator.h include/tesseract/ocrclass.h include/tesseract/osdetect.h include/tesseract/pageiterator.h include/tesseract/platform.h include/tesseract/publictypes.h include/tesseract/renderer.h include/tesseract/resultiterator.h include/tesseract/serialis.h include/tesseract/strngs.h include/tesseract/tesscallback.h include/tesseract/tess_version.h include/tesseract/thresholder.h include/tesseract/unichar.h lib/libtesseract.a lib/libtesseract.so lib/libtesseract.so.4 -lib/libtesseract.so.4.0.0 +lib/libtesseract.so.4.0.1 libdata/pkgconfig/tesseract.pc man/man1/ambiguous_words.1.gz man/man1/classifier_tester.1.gz man/man1/cntraining.1.gz man/man1/combine_lang_model.1.gz man/man1/combine_tessdata.1.gz man/man1/dawg2wordlist.1.gz man/man1/lstmeval.1.gz man/man1/lstmtraining.1.gz man/man1/merge_unicharsets.1.gz man/man1/mftraining.1.gz man/man1/set_unicharset_properties.1.gz man/man1/shapeclustering.1.gz man/man1/tesseract.1.gz man/man1/text2image.1.gz man/man1/unicharset_extractor.1.gz man/man1/wordlist2dawg.1.gz man/man5/unicharambigs.5.gz man/man5/unicharset.5.gz