Mon Jul 8 18:37:03 2019 UTC ()
tesseract: updated to 4.1.0

4.1.0 Release
Added new renders Alto, LSTMBox, WordStrBox.
Added character boxes in hOCR output.
Added python training scripts (experimental) as alternative shell scripts.
Better support AVX / AVX2 / SSE.
Disable OpenMP support by default.
Fix for bounding box problem.
Implemented support for whitelist/blacklist in LSTM engine.
Improved cmake configuration.
Code modernization and improvements.
A lot of bug fixes...


(adam)
diff -r1.47 -r1.48 pkgsrc/graphics/tesseract/Makefile
diff -r1.11 -r1.12 pkgsrc/graphics/tesseract/PLIST
diff -r1.21 -r1.22 pkgsrc/graphics/tesseract/distinfo
diff -r1.1 -r0 pkgsrc/graphics/tesseract/patches/patch-doc_Makefile.am
diff -r1.3 -r1.4 pkgsrc/graphics/tesseract/patches/patch-tessdata_Makefile.am
cvs diff -r1.47 -r1.48 pkgsrc/graphics/tesseract/Makefile (switch to unified diff)

--- pkgsrc/graphics/tesseract/Makefile 2019/05/04 16:05:33 1.47
+++ pkgsrc/graphics/tesseract/Makefile 2019/07/08 18:37:03 1.48
@@ -1,48 +1,47 @@ @@ -1,48 +1,47 @@
1# $NetBSD: Makefile,v 1.47 2019/05/04 16:05:33 leot Exp $ 1# $NetBSD: Makefile,v 1.48 2019/07/08 18:37:03 adam Exp $
2 2
3DISTNAME= tesseract-4.0.0 3DISTNAME= tesseract-4.1.0
4PKGREVISION= 6 
5CATEGORIES= graphics 4CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_GITHUB:=tesseract-ocr/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=tesseract-ocr/}
7DISTFILES= ${DEFAULT_DISTFILES} 6DISTFILES= ${DEFAULT_DISTFILES}
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/tesseract-ocr/tesseract 9HOMEPAGE= https://github.com/tesseract-ocr/tesseract
11COMMENT= Open Source OCR Engine 10COMMENT= Open Source OCR Engine
12LICENSE= apache-2.0 11LICENSE= apache-2.0
13 12
14LANGVER= 4.0.0 13LANGVER= 4.0.0
15DISTFILES+= tessdata-${LANGVER}${EXTRACT_SUFX} 14DISTFILES+= tessdata-${LANGVER}${EXTRACT_SUFX}
16SITES.tessdata-${LANGVER}.tar.gz= -${MASTER_SITES:Q}tessdata/archive/${LANGVER}.tar.gz 15SITES.tessdata-${LANGVER}.tar.gz= -${MASTER_SITES:Q}tessdata/archive/${LANGVER}.tar.gz
17 16
18BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc 17BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
19 18
20USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
21USE_LIBTOOL= yes 20USE_LIBTOOL= yes
22USE_TOOLS+= autoconf automake bash gmake pax pkg-config 21USE_TOOLS+= autoconf automake bash gmake pax pkg-config
23GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
24CONFIGURE_ENV+= LIBLEPT_HEADERSDIR=${BUILDLINK_PREFIX.leptonica}/include 23CONFIGURE_ENV+= LIBLEPT_HEADERSDIR=${BUILDLINK_PREFIX.leptonica}/include
25 24
26INSTALL_TARGET= install training-install 25INSTALL_TARGET= install training-install
27REPLACE_BASH+= ${WRKSRC}/src/training/*.sh 26REPLACE_BASH+= ${WRKSRC}/src/training/*.sh
28 27
29post-extract: 28post-extract:
30 ${MV} ${WRKDIR}/tessdata-${LANGVER}/* ${WRKSRC}/tessdata 29 ${MV} ${WRKDIR}/tessdata-${LANGVER}/* ${WRKSRC}/tessdata
31 30
32# For some reason this release tarball lacks these 31# For some reason this release tarball lacks these
33pre-configure: 32pre-configure:
34 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${SH} ./autogen.sh 33 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${SH} ./autogen.sh
35 34
36# Building the training tools requires that the base build is done 35# Building the training tools requires that the base build is done
37post-build: 36post-build:
38 cd ${WRKSRC} && ${BUILD_MAKE_CMD} training 37 cd ${WRKSRC} && ${BUILD_MAKE_CMD} training
39 38
40post-install: 39post-install:
41 cd ${WRKSRC}/tessdata && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \ 40 cd ${WRKSRC}/tessdata && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
42 ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} install-langs 41 ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} install-langs
43 42
44.include "../../devel/pango/buildlink3.mk" 43.include "../../devel/pango/buildlink3.mk"
45.include "../../graphics/cairo/buildlink3.mk" 44.include "../../graphics/cairo/buildlink3.mk"
46.include "../../graphics/leptonica/buildlink3.mk" 45.include "../../graphics/leptonica/buildlink3.mk"
47.include "../../textproc/icu/buildlink3.mk" 46.include "../../textproc/icu/buildlink3.mk"
48.include "../../mk/bsd.pkg.mk" 47.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/graphics/tesseract/PLIST (switch to unified diff)

--- pkgsrc/graphics/tesseract/PLIST 2018/11/18 18:07:20 1.11
+++ pkgsrc/graphics/tesseract/PLIST 2019/07/08 18:37:03 1.12
@@ -1,220 +1,223 @@ @@ -1,220 +1,223 @@
1@comment $NetBSD: PLIST,v 1.11 2018/11/18 18:07:20 adam Exp $ 1@comment $NetBSD: PLIST,v 1.12 2019/07/08 18:37:03 adam Exp $
2bin/ambiguous_words 2bin/ambiguous_words
3bin/classifier_tester 3bin/classifier_tester
4bin/cntraining 4bin/cntraining
5bin/combine_lang_model 5bin/combine_lang_model
6bin/combine_tessdata 6bin/combine_tessdata
7bin/dawg2wordlist 7bin/dawg2wordlist
8bin/language-specific.sh 8bin/language-specific.sh
9bin/lstmeval 9bin/lstmeval
10bin/lstmtraining 10bin/lstmtraining
11bin/merge_unicharsets 11bin/merge_unicharsets
12bin/mftraining 12bin/mftraining
13bin/set_unicharset_properties 13bin/set_unicharset_properties
14bin/shapeclustering 14bin/shapeclustering
15bin/tesseract 15bin/tesseract
16bin/tesstrain.sh 16bin/tesstrain.sh
17bin/tesstrain_utils.sh 17bin/tesstrain_utils.sh
18bin/text2image 18bin/text2image
19bin/unicharset_extractor 19bin/unicharset_extractor
20bin/wordlist2dawg 20bin/wordlist2dawg
21include/tesseract/apitypes.h 21include/tesseract/apitypes.h
22include/tesseract/baseapi.h 22include/tesseract/baseapi.h
23include/tesseract/capi.h 23include/tesseract/capi.h
24include/tesseract/genericvector.h 24include/tesseract/genericvector.h
25include/tesseract/helpers.h 25include/tesseract/helpers.h
26include/tesseract/host.h 
27include/tesseract/ltrresultiterator.h 26include/tesseract/ltrresultiterator.h
28include/tesseract/ocrclass.h 27include/tesseract/ocrclass.h
29include/tesseract/osdetect.h 28include/tesseract/osdetect.h
30include/tesseract/pageiterator.h 29include/tesseract/pageiterator.h
31include/tesseract/platform.h 30include/tesseract/platform.h
32include/tesseract/publictypes.h 31include/tesseract/publictypes.h
33include/tesseract/renderer.h 32include/tesseract/renderer.h
34include/tesseract/resultiterator.h 33include/tesseract/resultiterator.h
35include/tesseract/serialis.h 34include/tesseract/serialis.h
36include/tesseract/strngs.h 35include/tesseract/strngs.h
37include/tesseract/tess_version.h 36include/tesseract/tess_version.h
38include/tesseract/tesscallback.h 37include/tesseract/tesscallback.h
39include/tesseract/thresholder.h 38include/tesseract/thresholder.h
40include/tesseract/unichar.h 39include/tesseract/unichar.h
41lib/libtesseract.la 40lib/libtesseract.la
42lib/pkgconfig/tesseract.pc 41lib/pkgconfig/tesseract.pc
43man/man1/ambiguous_words.1 42man/man1/ambiguous_words.1
44man/man1/classifier_tester.1 43man/man1/classifier_tester.1
45man/man1/cntraining.1 44man/man1/cntraining.1
46man/man1/combine_lang_model.1 45man/man1/combine_lang_model.1
47man/man1/combine_tessdata.1 46man/man1/combine_tessdata.1
48man/man1/dawg2wordlist.1 47man/man1/dawg2wordlist.1
49man/man1/lstmeval.1 48man/man1/lstmeval.1
50man/man1/lstmtraining.1 49man/man1/lstmtraining.1
51man/man1/merge_unicharsets.1 50man/man1/merge_unicharsets.1
52man/man1/mftraining.1 51man/man1/mftraining.1
53man/man1/set_unicharset_properties.1 52man/man1/set_unicharset_properties.1
54man/man1/shapeclustering.1 53man/man1/shapeclustering.1
55man/man1/tesseract.1 54man/man1/tesseract.1
56man/man1/text2image.1 55man/man1/text2image.1
57man/man1/unicharset_extractor.1 56man/man1/unicharset_extractor.1
58man/man1/wordlist2dawg.1 57man/man1/wordlist2dawg.1
59man/man5/unicharambigs.5 58man/man5/unicharambigs.5
60man/man5/unicharset.5 59man/man5/unicharset.5
61share/tessdata/afr.traineddata 60share/tessdata/afr.traineddata
62share/tessdata/amh.traineddata 61share/tessdata/amh.traineddata
63share/tessdata/ara.traineddata 62share/tessdata/ara.traineddata
64share/tessdata/asm.traineddata 63share/tessdata/asm.traineddata
65share/tessdata/aze.traineddata 64share/tessdata/aze.traineddata
66share/tessdata/aze_cyrl.traineddata 65share/tessdata/aze_cyrl.traineddata
67share/tessdata/bel.traineddata 66share/tessdata/bel.traineddata
68share/tessdata/ben.traineddata 67share/tessdata/ben.traineddata
69share/tessdata/bod.traineddata 68share/tessdata/bod.traineddata
70share/tessdata/bos.traineddata 69share/tessdata/bos.traineddata
71share/tessdata/bre.traineddata 70share/tessdata/bre.traineddata
72share/tessdata/bul.traineddata 71share/tessdata/bul.traineddata
73share/tessdata/cat.traineddata 72share/tessdata/cat.traineddata
74share/tessdata/ceb.traineddata 73share/tessdata/ceb.traineddata
75share/tessdata/ces.traineddata 74share/tessdata/ces.traineddata
76share/tessdata/chi_sim.traineddata 75share/tessdata/chi_sim.traineddata
77share/tessdata/chi_sim_vert.traineddata 76share/tessdata/chi_sim_vert.traineddata
78share/tessdata/chi_tra.traineddata 77share/tessdata/chi_tra.traineddata
79share/tessdata/chi_tra_vert.traineddata 78share/tessdata/chi_tra_vert.traineddata
80share/tessdata/chr.traineddata 79share/tessdata/chr.traineddata
 80share/tessdata/configs/alto
81share/tessdata/configs/ambigs.train 81share/tessdata/configs/ambigs.train
82share/tessdata/configs/api_config 82share/tessdata/configs/api_config
83share/tessdata/configs/bigram 83share/tessdata/configs/bigram
84share/tessdata/configs/box.train 84share/tessdata/configs/box.train
85share/tessdata/configs/box.train.stderr 85share/tessdata/configs/box.train.stderr
86share/tessdata/configs/digits 86share/tessdata/configs/digits
 87share/tessdata/configs/get.images
87share/tessdata/configs/hocr 88share/tessdata/configs/hocr
88share/tessdata/configs/inter 89share/tessdata/configs/inter
89share/tessdata/configs/kannada 90share/tessdata/configs/kannada
90share/tessdata/configs/linebox 91share/tessdata/configs/linebox
91share/tessdata/configs/logfile 92share/tessdata/configs/logfile
92share/tessdata/configs/lstm.train 93share/tessdata/configs/lstm.train
 94share/tessdata/configs/lstmbox
93share/tessdata/configs/lstmdebug 95share/tessdata/configs/lstmdebug
94share/tessdata/configs/makebox 96share/tessdata/configs/makebox
95share/tessdata/configs/pdf 97share/tessdata/configs/pdf
96share/tessdata/configs/quiet 98share/tessdata/configs/quiet
97share/tessdata/configs/rebox 99share/tessdata/configs/rebox
98share/tessdata/configs/strokewidth 100share/tessdata/configs/strokewidth
99share/tessdata/configs/tsv 101share/tessdata/configs/tsv
100share/tessdata/configs/txt 102share/tessdata/configs/txt
101share/tessdata/configs/unlv 103share/tessdata/configs/unlv
 104share/tessdata/configs/wordstrbox
102share/tessdata/cos.traineddata 105share/tessdata/cos.traineddata
103share/tessdata/cym.traineddata 106share/tessdata/cym.traineddata
104share/tessdata/dan.traineddata 107share/tessdata/dan.traineddata
105share/tessdata/dan_frak.traineddata 108share/tessdata/dan_frak.traineddata
106share/tessdata/deu.traineddata 109share/tessdata/deu.traineddata
107share/tessdata/deu_frak.traineddata 110share/tessdata/deu_frak.traineddata
108share/tessdata/div.traineddata 111share/tessdata/div.traineddata
109share/tessdata/dzo.traineddata 112share/tessdata/dzo.traineddata
110share/tessdata/ell.traineddata 113share/tessdata/ell.traineddata
111share/tessdata/eng.traineddata 114share/tessdata/eng.traineddata
112share/tessdata/eng.user-patterns 115share/tessdata/eng.user-patterns
113share/tessdata/eng.user-words 116share/tessdata/eng.user-words
114share/tessdata/enm.traineddata 117share/tessdata/enm.traineddata
115share/tessdata/epo.traineddata 118share/tessdata/epo.traineddata
116share/tessdata/equ.traineddata 119share/tessdata/equ.traineddata
117share/tessdata/est.traineddata 120share/tessdata/est.traineddata
118share/tessdata/eus.traineddata 121share/tessdata/eus.traineddata
119share/tessdata/fao.traineddata 122share/tessdata/fao.traineddata
120share/tessdata/fas.traineddata 123share/tessdata/fas.traineddata
121share/tessdata/fil.traineddata 124share/tessdata/fil.traineddata
122share/tessdata/fin.traineddata 125share/tessdata/fin.traineddata
123share/tessdata/fra.traineddata 126share/tessdata/fra.traineddata
124share/tessdata/frk.traineddata 127share/tessdata/frk.traineddata
125share/tessdata/frm.traineddata 128share/tessdata/frm.traineddata
126share/tessdata/fry.traineddata 129share/tessdata/fry.traineddata
127share/tessdata/gla.traineddata 130share/tessdata/gla.traineddata
128share/tessdata/gle.traineddata 131share/tessdata/gle.traineddata
129share/tessdata/glg.traineddata 132share/tessdata/glg.traineddata
130share/tessdata/grc.traineddata 133share/tessdata/grc.traineddata
131share/tessdata/guj.traineddata 134share/tessdata/guj.traineddata
132share/tessdata/hat.traineddata 135share/tessdata/hat.traineddata
133share/tessdata/heb.traineddata 136share/tessdata/heb.traineddata
134share/tessdata/hin.traineddata 137share/tessdata/hin.traineddata
135share/tessdata/hrv.traineddata 138share/tessdata/hrv.traineddata
136share/tessdata/hun.traineddata 139share/tessdata/hun.traineddata
137share/tessdata/hye.traineddata 140share/tessdata/hye.traineddata
138share/tessdata/iku.traineddata 141share/tessdata/iku.traineddata
139share/tessdata/ind.traineddata 142share/tessdata/ind.traineddata
140share/tessdata/isl.traineddata 143share/tessdata/isl.traineddata
141share/tessdata/ita.traineddata 144share/tessdata/ita.traineddata
142share/tessdata/ita_old.traineddata 145share/tessdata/ita_old.traineddata
143share/tessdata/jav.traineddata 146share/tessdata/jav.traineddata
144share/tessdata/jpn.traineddata 147share/tessdata/jpn.traineddata
145share/tessdata/jpn_vert.traineddata 148share/tessdata/jpn_vert.traineddata
146share/tessdata/kan.traineddata 149share/tessdata/kan.traineddata
147share/tessdata/kat.traineddata 150share/tessdata/kat.traineddata
148share/tessdata/kat_old.traineddata 151share/tessdata/kat_old.traineddata
149share/tessdata/kaz.traineddata 152share/tessdata/kaz.traineddata
150share/tessdata/khm.traineddata 153share/tessdata/khm.traineddata
151share/tessdata/kir.traineddata 154share/tessdata/kir.traineddata
152share/tessdata/kor.traineddata 155share/tessdata/kor.traineddata
153share/tessdata/kor_vert.traineddata 156share/tessdata/kor_vert.traineddata
154share/tessdata/kur.traineddata 157share/tessdata/kur.traineddata
155share/tessdata/kur_ara.traineddata 158share/tessdata/kur_ara.traineddata
156share/tessdata/lao.traineddata 159share/tessdata/lao.traineddata
157share/tessdata/lat.traineddata 160share/tessdata/lat.traineddata
158share/tessdata/lav.traineddata 161share/tessdata/lav.traineddata
159share/tessdata/lit.traineddata 162share/tessdata/lit.traineddata
160share/tessdata/ltz.traineddata 163share/tessdata/ltz.traineddata
161share/tessdata/mal.traineddata 164share/tessdata/mal.traineddata
162share/tessdata/mar.traineddata 165share/tessdata/mar.traineddata
163share/tessdata/mkd.traineddata 166share/tessdata/mkd.traineddata
164share/tessdata/mlt.traineddata 167share/tessdata/mlt.traineddata
165share/tessdata/mon.traineddata 168share/tessdata/mon.traineddata
166share/tessdata/mri.traineddata 169share/tessdata/mri.traineddata
167share/tessdata/msa.traineddata 170share/tessdata/msa.traineddata
168share/tessdata/mya.traineddata 171share/tessdata/mya.traineddata
169share/tessdata/nep.traineddata 172share/tessdata/nep.traineddata
170share/tessdata/nld.traineddata 173share/tessdata/nld.traineddata
171share/tessdata/nor.traineddata 174share/tessdata/nor.traineddata
172share/tessdata/oci.traineddata 175share/tessdata/oci.traineddata
173share/tessdata/ori.traineddata 176share/tessdata/ori.traineddata
174share/tessdata/osd.traineddata 177share/tessdata/osd.traineddata
175share/tessdata/pan.traineddata 178share/tessdata/pan.traineddata
176share/tessdata/pdf.ttf 179share/tessdata/pdf.ttf
177share/tessdata/pol.traineddata 180share/tessdata/pol.traineddata
178share/tessdata/por.traineddata 181share/tessdata/por.traineddata
179share/tessdata/pus.traineddata 182share/tessdata/pus.traineddata
180share/tessdata/que.traineddata 183share/tessdata/que.traineddata
181share/tessdata/ron.traineddata 184share/tessdata/ron.traineddata
182share/tessdata/rus.traineddata 185share/tessdata/rus.traineddata
183share/tessdata/san.traineddata 186share/tessdata/san.traineddata
184share/tessdata/sin.traineddata 187share/tessdata/sin.traineddata
185share/tessdata/slk.traineddata 188share/tessdata/slk.traineddata
186share/tessdata/slk_frak.traineddata 189share/tessdata/slk_frak.traineddata
187share/tessdata/slv.traineddata 190share/tessdata/slv.traineddata
188share/tessdata/snd.traineddata 191share/tessdata/snd.traineddata
189share/tessdata/spa.traineddata 192share/tessdata/spa.traineddata
190share/tessdata/spa_old.traineddata 193share/tessdata/spa_old.traineddata
191share/tessdata/sqi.traineddata 194share/tessdata/sqi.traineddata
192share/tessdata/srp.traineddata 195share/tessdata/srp.traineddata
193share/tessdata/srp_latn.traineddata 196share/tessdata/srp_latn.traineddata
194share/tessdata/sun.traineddata 197share/tessdata/sun.traineddata
195share/tessdata/swa.traineddata 198share/tessdata/swa.traineddata
196share/tessdata/swe.traineddata 199share/tessdata/swe.traineddata
197share/tessdata/syr.traineddata 200share/tessdata/syr.traineddata
198share/tessdata/tam.traineddata 201share/tessdata/tam.traineddata
199share/tessdata/tat.traineddata 202share/tessdata/tat.traineddata
200share/tessdata/tel.traineddata 203share/tessdata/tel.traineddata
201share/tessdata/tessconfigs/batch 204share/tessdata/tessconfigs/batch
202share/tessdata/tessconfigs/batch.nochop 205share/tessdata/tessconfigs/batch.nochop
203share/tessdata/tessconfigs/matdemo 206share/tessdata/tessconfigs/matdemo
204share/tessdata/tessconfigs/msdemo 207share/tessdata/tessconfigs/msdemo
205share/tessdata/tessconfigs/nobatch 208share/tessdata/tessconfigs/nobatch
206share/tessdata/tessconfigs/segdemo 209share/tessdata/tessconfigs/segdemo
207share/tessdata/tgk.traineddata 210share/tessdata/tgk.traineddata
208share/tessdata/tgl.traineddata 211share/tessdata/tgl.traineddata
209share/tessdata/tha.traineddata 212share/tessdata/tha.traineddata
210share/tessdata/tir.traineddata 213share/tessdata/tir.traineddata
211share/tessdata/ton.traineddata 214share/tessdata/ton.traineddata
212share/tessdata/tur.traineddata 215share/tessdata/tur.traineddata
213share/tessdata/uig.traineddata 216share/tessdata/uig.traineddata
214share/tessdata/ukr.traineddata 217share/tessdata/ukr.traineddata
215share/tessdata/urd.traineddata 218share/tessdata/urd.traineddata
216share/tessdata/uzb.traineddata 219share/tessdata/uzb.traineddata
217share/tessdata/uzb_cyrl.traineddata 220share/tessdata/uzb_cyrl.traineddata
218share/tessdata/vie.traineddata 221share/tessdata/vie.traineddata
219share/tessdata/yid.traineddata 222share/tessdata/yid.traineddata
220share/tessdata/yor.traineddata 223share/tessdata/yor.traineddata
cvs diff -r1.21 -r1.22 pkgsrc/graphics/tesseract/distinfo (switch to unified diff)

--- pkgsrc/graphics/tesseract/distinfo 2019/05/04 16:05:33 1.21
+++ pkgsrc/graphics/tesseract/distinfo 2019/07/08 18:37:03 1.22
@@ -1,12 +1,11 @@ @@ -1,12 +1,11 @@
1$NetBSD: distinfo,v 1.21 2019/05/04 16:05:33 leot Exp $ 1$NetBSD: distinfo,v 1.22 2019/07/08 18:37:03 adam Exp $
2 2
3SHA1 (tessdata-4.0.0.tar.gz) = 94557a6ecdf8ff8bec131598759e7d3b0bca1911 3SHA1 (tessdata-4.0.0.tar.gz) = 94557a6ecdf8ff8bec131598759e7d3b0bca1911
4RMD160 (tessdata-4.0.0.tar.gz) = 2e826e866b56ff8b9cb2c6613f04d8c4a4ff98d7 4RMD160 (tessdata-4.0.0.tar.gz) = 2e826e866b56ff8b9cb2c6613f04d8c4a4ff98d7
5SHA512 (tessdata-4.0.0.tar.gz) = cd71bb99d44eefb53b359ba64b472c509fff773b2737a8d51e10d5d52d9a3a7ff870d470b1c72a7c78be3263b5ecfbb58a6eab13cf7128d8599681676cdcef6b 5SHA512 (tessdata-4.0.0.tar.gz) = cd71bb99d44eefb53b359ba64b472c509fff773b2737a8d51e10d5d52d9a3a7ff870d470b1c72a7c78be3263b5ecfbb58a6eab13cf7128d8599681676cdcef6b
6Size (tessdata-4.0.0.tar.gz) = 669258747 bytes 6Size (tessdata-4.0.0.tar.gz) = 669258747 bytes
7SHA1 (tesseract-4.0.0.tar.gz) = 243a4919d44bc64d1e7e4cac660c716c845a8d03 7SHA1 (tesseract-4.1.0.tar.gz) = 6e88cc4fd9f1681142bf74dc2df0559202cff3c2
8RMD160 (tesseract-4.0.0.tar.gz) = 0e95d343639ab98c6d3fbc528053b627b6e12282 8RMD160 (tesseract-4.1.0.tar.gz) = 034ffd9690478e28945c09001ce51f7fdceb2ff5
9SHA512 (tesseract-4.0.0.tar.gz) = 69e57d4ba1fc43d212fd0fff69a2b5d48a3b37cfee7054fdc083cbb7e04d92317609a32e457229661d70ce8d9b16c9d25e81bfc3861db660dd2c8f292202d447 9SHA512 (tesseract-4.1.0.tar.gz) = d617f5c5b826640b2871dbe3d7973bcc5e66fafd837921a20e009d683806ed50f0f258aa455019d99fc54f5cb65c2fa0380e3a3c92b39ab0684b8799c730b09d
10Size (tesseract-4.0.0.tar.gz) = 1961372 bytes 10Size (tesseract-4.1.0.tar.gz) = 1965053 bytes
11SHA1 (patch-doc_Makefile.am) = fd9cc782e766428de5709b77d7a2476be55ec7d8 11SHA1 (patch-tessdata_Makefile.am) = 8fe773d1c6318392296ba06996b51692edf32919
12SHA1 (patch-tessdata_Makefile.am) = 1fdbed9dafc1527eb52f354c8b78ba82f854b350 
File Deleted: pkgsrc/graphics/tesseract/patches/Attic/patch-doc_Makefile.am
cvs diff -r1.3 -r1.4 pkgsrc/graphics/tesseract/patches/patch-tessdata_Makefile.am (switch to unified diff)

--- pkgsrc/graphics/tesseract/patches/patch-tessdata_Makefile.am 2019/05/04 16:05:33 1.3
+++ pkgsrc/graphics/tesseract/patches/patch-tessdata_Makefile.am 2019/07/08 18:37:03 1.4
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-tessdata_Makefile.am,v 1.3 2019/05/04 16:05:33 leot Exp $ 1$NetBSD: patch-tessdata_Makefile.am,v 1.4 2019/07/08 18:37:03 adam Exp $
2 2
3Revert a trunk commit that broke install-lang for tesseract<4. 3Revert a trunk commit that broke install-lang for tesseract<4.
4 4
5--- tessdata/Makefile.am.orig 2018-10-29 08:53:12.000000000 +0000 5--- tessdata/Makefile.am.orig 2019-07-07 12:34:08.000000000 +0000
6+++ tessdata/Makefile.am 6+++ tessdata/Makefile.am
7@@ -29,6 +29,27 @@ langdata = bul.traineddata mlt.trainedda 7@@ -7,6 +7,27 @@ SUBDIRS = configs tessconfigs
8 chi_tra.traineddata ita.traineddata spa_old.traineddata \ 8
9 deu-frak.traineddata aze.traineddata 9 langdata =
10  10
11+.PHONY: install-langs 11+.PHONY: install-langs
12+install-langs: 12+install-langs:
13+ @if [ ! -d $(DESTDIR)$(datadir) ]; then mkdir -p $(DESTDIR)$(datadir); fi; 13+ @if [ ! -d $(DESTDIR)$(datadir) ]; then mkdir -p $(DESTDIR)$(datadir); fi;
14+ @if test "${LANGS}" != ""; then \ 14+ @if test "${LANGS}" != ""; then \
15+ for lang_code in ${LANGS}; do \ 15+ for lang_code in ${LANGS}; do \
16+ echo "installing data for $$lang_code"; \ 16+ echo "installing data for $$lang_code"; \
17+ $(INSTALL) -m 644 $(srcdir)/$$lang_code.* $(DESTDIR)$(datadir); \ 17+ $(INSTALL) -m 644 $(srcdir)/$$lang_code.* $(DESTDIR)$(datadir); \
18+ done; \ 18+ done; \
19+ else \ 19+ else \
20+ for l in ./*.traineddata; do \ 20+ for l in ./*.traineddata; do \
21+ filename=`basename $$l`; \ 21+ filename=`basename $$l`; \
22+ lang_code=$${filename%.*}; \ 22+ lang_code=$${filename%.*}; \
23+ if test "$$lang_code" = "*"; then \ 23+ if test "$$lang_code" = "*"; then \
24+ echo "No lang present."; \ 24+ echo "No lang present."; \
25+ break; \ 25+ break; \
26+ fi; \ 26+ fi; \
27+ echo "installing data for $$lang_code"; \ 27+ echo "installing data for $$lang_code"; \
28+ $(INSTALL) -m 644 $(srcdir)/$$lang_code.* $(DESTDIR)$(datadir); \ 28+ $(INSTALL) -m 644 $(srcdir)/$$lang_code.* $(DESTDIR)$(datadir); \
29+ done; \ 29+ done; \
30+ fi; 30+ fi;
31+ 31+
32 uninstall-local: 32 uninstall-local:
33 cd $(DESTDIR)$(datadir); \ 33 cd $(DESTDIR)$(datadir); \
34 rm -f $(langdata) 34 rm -f $(langdata)