Update to tesseract-3.05.00.

graphics/tesseract/tesseract/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2017/04/10 11:46:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2017/04/28 21:01:17 ajacoutot Exp $
 
 COMMENT=	OCR Engine developed at HP Labs
 
 GH_PROJECT=	tesseract
-GH_TAGNAME=	3.04.01
+GH_TAGNAME=	3.05.00
 
 SHARED_LIBS +=  tesseract            3.2      # 3.2
 
@@ -19,6 +19,8 @@ MODULES +=		gcc4
 MODGCC4_ARCHS=		*
 MODGCC4_LANGS=		c++
 
+ALL_TARGET=		training
+
 LIB_DEPENDS=		devel/pango \
 			graphics/leptonica \
 			textproc/icu4c
@@ -28,10 +30,22 @@ RUN_DEPENDS=		graphics/tesseract/tessdata,-main
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
-
+ 
 ALL_TARGET=		all training
 INSTALL_TARGET=		install training-install
 
+###
+AUTOCONF_VERSION=	2.69
+AUTOMAKE_VERSION=	1.15
+BUILD_DEPENDS +=	${MODGNU_AUTOCONF_DEPENDS} \
+			${MODGNU_AUTOMAKE_DEPENDS}
+pre-configure:
+	cd ${WRKSRC} && ${SETENV} \
+		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+		AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+		autoreconf -fi
+###
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tesseract
 	${INSTALL_DATA} ${WRKSRC}/testing/{eurotext.tif,phototest.tif} \

graphics/tesseract/tesseract/distinfo

@@ -1,2 +1,2 @@
-SHA256 (tesseract-3.04.01.tar.gz) = V/Y+GxSuBMOTKiaD5L5JVKKEnhft1jj/6RvFohVq3Go=
-SIZE (tesseract-3.04.01.tar.gz) = 2269105
+SHA256 (tesseract-3.05.00.tar.gz) = P+g+BtD3Ozn26S7Z/HzLo+9zSHe3aqXdqqd4+sCV2ZY=
+SIZE (tesseract-3.05.00.tar.gz) = 3581853

graphics/tesseract/tesseract/patches/patch-ccstruct_matrix_h

@@ -1,15 +0,0 @@
-$OpenBSD: patch-ccstruct_matrix_h,v 1.1 2016/09/11 12:09:54 naddy Exp $
-
-https://github.com/tesseract-ocr/tesseract/commit/4919b276ebde72782997787f424fd44122e2974e
-
---- ccstruct/matrix.h.orig	Tue Feb 16 22:27:01 2016
-+++ ccstruct/matrix.h	Sun Sep 11 14:00:23 2016
-@@ -30,7 +30,7 @@
- 
- class BLOB_CHOICE_LIST;
- 
--#define NOT_CLASSIFIED reinterpret_cast<BLOB_CHOICE_LIST*>(NULL)
-+#define NOT_CLASSIFIED reinterpret_cast<BLOB_CHOICE_LIST*>(0)
- 
- // A generic class to hold a 2-D matrix with entries of type T, but can also
- // act as a base class for other implementations, such as a triangular or

graphics/tesseract/tesseract/patches/patch-configure

@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2016/04/12 07:38:02 ajacoutot Exp $
---- configure.orig	Tue Feb 16 22:27:01 2016
-+++ configure	Tue Apr 12 08:47:26 2016
-@@ -4119,6 +4119,10 @@ fi
-     powerpc-*-darwin*)
-         OPENCL_LIBS=""
-         ;;
-+    *openbsd*)
-+        ADD_RT_TRUE='#'
-+        ADD_RT_FALSE=
-+        ;;
-     *)
-         # default
-          if true; then

graphics/tesseract/tesseract/patches/patch-configure_ac

@@ -0,0 +1,16 @@
+$OpenBSD: patch-configure_ac,v 1.1 2017/04/28 21:01:17 ajacoutot Exp $
+
+No librt on OpenBSD.
+
+--- configure.ac.orig	Fri Apr 28 20:55:39 2017
++++ configure.ac	Fri Apr 28 20:56:19 2017
+@@ -109,6 +109,9 @@ case "${host_os}" in
+     powerpc-*-darwin*)
+         OPENCL_LIBS=""
+         ;;
++    *openbsd*)
++        AM_CONDITIONAL([ADD_RT], false)
++        ;;
+     *)
+         # default
+         AM_CONDITIONAL([ADD_RT], true)

graphics/tesseract/tesseract/patches/patch-viewer_svutil_h

@@ -1,6 +1,6 @@
---- viewer/svutil.h.orig	Sat Oct 22 04:21:21 2011
-+++ viewer/svutil.h	Wed Dec 21 19:12:28 2011
-@@ -39,6 +39,11 @@
+--- viewer/svutil.h.orig	Thu Feb 16 18:59:48 2017
++++ viewer/svutil.h	Fri Apr 28 20:26:55 2017
+@@ -42,6 +42,11 @@
  #else
  #include <pthread.h>
  #include <semaphore.h>

graphics/tesseract/tesseract/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2016/04/12 07:38:02 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.3 2017/04/28 21:01:17 ajacoutot Exp $
 @pkgpath graphics/tesseract,-main
 @pkgpath graphics/tesseract
 @bin bin/ambiguous_words
@@ -78,6 +78,7 @@ share/tessdata/configs/pdf
 share/tessdata/configs/quiet
 share/tessdata/configs/rebox
 share/tessdata/configs/strokewidth
+share/tessdata/configs/tsv
 share/tessdata/configs/txt
 share/tessdata/configs/unlv
 share/tessdata/pdf.ttf