From nobody Sat Dec 11 04:09:31 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7BEAB18D4FEB; Sat, 11 Dec 2021 04:09:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J9vRc0Z8Sz4h2q; Sat, 11 Dec 2021 04:09:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E946726EE5; Sat, 11 Dec 2021 04:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BB49VP5012950; Sat, 11 Dec 2021 04:09:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BB49V3r012949; Sat, 11 Dec 2021 04:09:31 GMT (envelope-from git) Date: Sat, 11 Dec 2021 04:09:31 GMT Message-Id: <202112110409.1BB49V3r012949@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: f056ba0e7f97 - main - graphics/tesseract: switch back to autotools List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f056ba0e7f979f3f9f8daf0d3f1120ccca9b6fdf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639195772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=we6eDeCuMJFhK0bZBxGwubC8S32Zpl36S2+3gA/Z0Aw=; b=GzeT6xtfnNxXsd90lc51e5bPNNV9HVCLLZifPy5veQ3euFuqwSlZdPxeH0Dw6EZp24apoi YwWiIYeJuei4vreoas3mUksQ0szRwWycH50ZN/GwB4PUUSZPLLUIlJx4t9f9tN5gtCBPMc oujP8st/nHx7/P6xkcfXY3C67qvxSUps2peNWJe63bO9stkv77gdy52TANtYIwXaW5xkmX QGvJvufulrF4Zv8oi+mrLzHSIEtcaO9dQblHzI96Cr4EL3EfkVePwLZB8nxj+JOQaJehDx mqgZn6Ggg8a2MXQm4YFV8UnlymEyJQ0Doe+Py+X1OfjrbDR6Y3Yg1cB/o5PmeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639195772; a=rsa-sha256; cv=none; b=x33TPzqFlCX6ok3IiFEU4t3eAlhCgOErFfAxAp6qVDsPY4ThA6Bi41dzPA6B/PQ9R8tSBl C8rDxhijfcUymI2S9zykZxnpTeE0J0SiPs4XzH4tT1wrWzK44bnx0gRoN4zLYuAxfp7phO E9aPhMIFLp8+dkA8+/OoN6/iVdTX742xIxDx9zEHRIOe7eRqbFLt0Roz6DDaFiwTwKns1Y d4Y39AGVWUWooLHFwogkzZ7WCOx0xs5DYRY101OuFrS4uydDDdaaQr0O5P+2qGqtCD0yGr k4xTjJoXZXw+JjCkn/B8geImP5DhiV+ZAKjwO0mMnc8mhaSUsmtccSMI3I3Fnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=f056ba0e7f979f3f9f8daf0d3f1120ccca9b6fdf commit f056ba0e7f979f3f9f8daf0d3f1120ccca9b6fdf Author: Piotr Kubaj AuthorDate: 2021-12-11 04:06:11 +0000 Commit: Piotr Kubaj CommitDate: 2021-12-11 04:06:11 +0000 graphics/tesseract: switch back to autotools It looks like cmake doesn't install training data. --- graphics/tesseract/Makefile | 28 ++++++---------------------- graphics/tesseract/pkg-plist | 27 ++++++++++++++++++++------- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile index 6e8d3eec200a..76bfeecdd1ef 100644 --- a/graphics/tesseract/Makefile +++ b/graphics/tesseract/Makefile @@ -2,6 +2,7 @@ PORTNAME= tesseract PORTVERSION= 5.0.0 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= pkubaj@FreeBSD.org @@ -20,7 +21,7 @@ LIB_DEPENDS= liblept.so:graphics/leptonica \ RUN_DEPENDS= tesseract-data>=0:graphics/tesseract-data -USES= compiler:c++11-lang cmake cpe gnome libarchive libtool \ +USES= autoreconf compiler:c++11-lang cpe gnome libarchive libtool \ localbase pathfix pkgconfig USE_LDCONFIG= yes @@ -31,44 +32,27 @@ CPE_VENDOR= tesseract_project USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME}-ocr -CMAKE_ON= BUILD_SHARED_LIBS DATADIR= ${PREFIX}/share/tessdata LDFLAGS+= -pthread PORTDATA= * PORTDOCS= AUTHORS ChangeLog README.md +INSTALL_TARGET= install-strip -OPTIONS_DEFINE= DOCS OPENMP TOOLS +OPTIONS_DEFINE= DOCS TOOLS OPTIONS_DEFAULT= TOOLS -OPTIONS_DEFAULT_amd64= OPENMP -OPTIONS_DEFAULT_i386= OPENMP -OPTIONS_DEFAULT_powerpc64= OPENMP -OPTIONS_DEFAULT_powerpc64le= OPENMP OPTIONS_SUB= yes -OPENMP_CMAKE_BOOL= OPENMP_BUILD - -TOOLS_CMAKE_BOOL= BUILD_TRAINING_TOOLS +TOOLS_CONFIGURE_ENABLE= training TOOLS_DESC= Include training tools TOOLS_LIB_DEPENDS=libicui18n.so:devel/icu \ libfontconfig.so:x11-fonts/fontconfig TOOLS_USE= GNOME=cairo,glib20,pango -.include - -.if ${ARCH} != powerpc64 && ${ARCH} != riscv64 -CMAKE_ARGS+= -DENABLE_LTO:BOOL=ON -.endif - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-TOOLS-on: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/src/training/libcommon_training.so \ - ${STAGEDIR}${PREFIX}/lib/ - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/src/training/libpango_training.so \ - ${STAGEDIR}${PREFIX}/lib/ - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/src/training/libunicharset_training.so \ - ${STAGEDIR}${PREFIX}/lib/ + @cd ${WRKSRC} && ${MAKE} DESTDIR=${STAGEDIR} training-install .include diff --git a/graphics/tesseract/pkg-plist b/graphics/tesseract/pkg-plist index eba4af254909..1b50d2c62f8a 100644 --- a/graphics/tesseract/pkg-plist +++ b/graphics/tesseract/pkg-plist @@ -26,13 +26,26 @@ include/tesseract/renderer.h include/tesseract/resultiterator.h include/tesseract/unichar.h include/tesseract/version.h -%%TOOLS%%lib/libcommon_training.so -%%TOOLS%%lib/libpango_training.so +lib/libtesseract.a lib/libtesseract.so +lib/libtesseract.so.5 lib/libtesseract.so.5.0.0 -%%TOOLS%%lib/libunicharset_training.so -lib/cmake/tesseract/TesseractConfig.cmake -lib/cmake/tesseract/TesseractConfigVersion.cmake -lib/cmake/tesseract/TesseractTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/tesseract/TesseractTargets.cmake 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