CVS commit: pkgsrc/graphics/tesseract

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jul 16 09:16:27 UTC 2021

Modified Files:
        pkgsrc/graphics/tesseract: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/graphics/tesseract/patches: patch-CMakeLists.txt

Log Message:
tesseract: Avoid C++ <version> issue on macOS.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/graphics/tesseract/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/tesseract/buildlink3.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/tesseract/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/tesseract/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/tesseract/Makefile
diff -u pkgsrc/graphics/tesseract/Makefile:1.57 pkgsrc/graphics/tesseract/Makefile:1.58
--- pkgsrc/graphics/tesseract/Makefile:1.57     Wed Apr 21 11:41:59 2021
+++ pkgsrc/graphics/tesseract/Makefile  Fri Jul 16 09:16:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2021/04/21 11:41:59 adam Exp $
+# $NetBSD: Makefile,v 1.58 2021/07/16 09:16:27 jperkin Exp $
 
 DISTNAME=      tesseract-4.1.1
 PKGREVISION=   8
@@ -24,7 +24,7 @@ GNU_CONFIGURE=                yes
 CONFIGURE_ENV+=                LIBLEPT_HEADERSDIR=${BUILDLINK_PREFIX.leptonica}/include
 
 INSTALL_TARGET=                install training-install
-REPLACE_BASH+=         ${WRKSRC}/src/training/*.sh
+REPLACE_BASH+=         src/training/*.sh
 
 post-extract:
        ${MV} ${WRKDIR}/tessdata-${LANGVER}/* ${WRKSRC}/tessdata
@@ -32,6 +32,7 @@ post-extract:
 # For some reason this release tarball lacks these
 pre-configure:
        cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${SH} ./autogen.sh
+       ${MV} ${WRKSRC}/VERSION ${WRKSRC}/VERSION.txt
 
 # Building the training tools requires that the base build is done
 post-build:

Index: pkgsrc/graphics/tesseract/buildlink3.mk
diff -u pkgsrc/graphics/tesseract/buildlink3.mk:1.2 pkgsrc/graphics/tesseract/buildlink3.mk:1.3
--- pkgsrc/graphics/tesseract/buildlink3.mk:1.2 Fri Jun  5 12:49:00 2020
+++ pkgsrc/graphics/tesseract/buildlink3.mk     Fri Jul 16 09:16:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/06/05 12:49:00 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2021/07/16 09:16:27 jperkin Exp $
 
 BUILDLINK_TREE+=       tesseract
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        tesseract
 TESSERACT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.tesseract+=      tesseract>=3.05.01nb6
-BUILDLINK_ABI_DEPENDS.tesseract?=              tesseract>=4.1.1nb5
+BUILDLINK_ABI_DEPENDS.tesseract?=      tesseract>=4.1.1nb5
 BUILDLINK_PKGSRCDIR.tesseract?=                ../../graphics/tesseract
 
 .include "../../graphics/leptonica/buildlink3.mk"

Index: pkgsrc/graphics/tesseract/distinfo
diff -u pkgsrc/graphics/tesseract/distinfo:1.23 pkgsrc/graphics/tesseract/distinfo:1.24
--- pkgsrc/graphics/tesseract/distinfo:1.23     Sun Dec 29 16:44:12 2019
+++ pkgsrc/graphics/tesseract/distinfo  Fri Jul 16 09:16:27 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2019/12/29 16:44:12 adam Exp $
+$NetBSD: distinfo,v 1.24 2021/07/16 09:16:27 jperkin Exp $
 
 SHA1 (tessdata-4.0.0.tar.gz) = 94557a6ecdf8ff8bec131598759e7d3b0bca1911
 RMD160 (tessdata-4.0.0.tar.gz) = 2e826e866b56ff8b9cb2c6613f04d8c4a4ff98d7
@@ -8,4 +8,5 @@ SHA1 (tesseract-4.1.1.tar.gz) = 25318bb3
 RMD160 (tesseract-4.1.1.tar.gz) = 8218e0271e7dee72a0f2ee0a8c8ce937b94d857f
 SHA512 (tesseract-4.1.1.tar.gz) = 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2
 Size (tesseract-4.1.1.tar.gz) = 1974988 bytes
+SHA1 (patch-CMakeLists.txt) = d54f14faadc70cffac45fa6c3b9612845bf6ed27
 SHA1 (patch-tessdata_Makefile.am) = 8fe773d1c6318392296ba06996b51692edf32919

Added files:

Index: pkgsrc/graphics/tesseract/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/tesseract/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Fri Jul 16 09:16:27 2021
+++ pkgsrc/graphics/tesseract/patches/patch-CMakeLists.txt      Fri Jul 16 09:16:27 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2021/07/16 09:16:27 jperkin Exp $
+
+Avoid C++ <version> issue on case-insensitive file systems.
+
+--- CMakeLists.txt.orig        2019-12-26 14:21:51.000000000 +0000
++++ CMakeLists.txt
+@@ -41,7 +41,7 @@ set_property(GLOBAL PROPERTY PREDEFINED_
+ project(tesseract C CXX)
+ 
+ # Get version with components from VERSION file.
+-file(STRINGS "VERSION" VERSION_PLAIN)
++file(STRINGS "VERSION.txt" VERSION_PLAIN)
+ string(REGEX REPLACE "^([^.]*)\\..*" "\\1" VERSION_MAJOR ${VERSION_PLAIN})
+ string(REGEX REPLACE "^[^.]*\\.([^.]*)\\..*" "\\1" VERSION_MINOR ${VERSION_PLAIN})
+ string(REGEX REPLACE "^[^.]*\\.[^.]*\\.([0-9]*).*" "\\1" VERSION_PATCH ${VERSION_PLAIN})