devel/icu: update to 68.1

Changes:	http://site.icu-project.org/download/68
ABI:		https://abi-laboratory.pro/tracker/timeline/icu4c/
Reported by:	GitHub (watch releases)

18 files changed, 149 insertions, 9 deletions

diff --git a/textproc/R-cran-stringi/Makefile b/textproc/R-cran-stringi/Makefile
index 66d7ac455ca9..d8ea17abb930 100644
--- a/textproc/R-cran-stringi/Makefile
+++ b/textproc/R-cran-stringi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	stringi
 DISTVERSION=	1.5.3
+PORTREVISION=	1
 CATEGORIES=	textproc
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
diff --git a/textproc/dwdiff/Makefile b/textproc/dwdiff/Makefile
index b12682086333..f343c38d35fb 100644
--- a/textproc/dwdiff/Makefile
+++ b/textproc/dwdiff/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dwdiff
 PORTVERSION=	2.1.3
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	https://os.ghalkes.nl/dist/ \
 		http://fossies.org/unix/privat/
diff --git a/textproc/dwdiff/files/patch-icu68 b/textproc/dwdiff/files/patch-icu68
new file mode 100644
index 000000000000..de647944c304
--- /dev/null
+++ b/textproc/dwdiff/files/patch-icu68
@@ -0,0 +1,26 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from src/unicode.c:21:
+src/definitions.h:48:15: error: expected identifier
+typedef enum {false, true} bool;
+              ^
+/usr/include/stdbool.h:36:15: note: expanded from macro 'false'
+#define false   0
+                ^
+
+--- src/definitions.h.orig	2020-07-18 06:57:36 UTC
++++ src/definitions.h
+@@ -43,13 +43,7 @@
+ 
+ /*==== Misc definitions ====*/
+ /* Define a bool type if not already defined (C++ and C99 do)*/
+-#if !(defined(__cplusplus) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19990601L))
+-/*@-incondefs@*/
+-typedef enum {false, true} bool;
+-/*@+incondefs@*/
+-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19990601L
+ #include <stdbool.h>
+-#endif
+ 
+ /*==== Configuration definitions ====*/
+ #ifndef NO_STRDUP
diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile
index 756b66c6fb2c..9960c6f0e07d 100644
--- a/textproc/gitlab-elasticsearch-indexer/Makefile
+++ b/textproc/gitlab-elasticsearch-indexer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gitlab-elasticsearch-indexer
 PORTVERSION=	2.7.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	mfechner@FreeBSD.org
diff --git a/textproc/hs-pandoc-citeproc/Makefile b/textproc/hs-pandoc-citeproc/Makefile
index 1b9d4d5b6468..d0ffb8533f20 100644
--- a/textproc/hs-pandoc-citeproc/Makefile
+++ b/textproc/hs-pandoc-citeproc/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	pandoc-citeproc
 PORTVERSION=	0.17.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -26,6 +27,7 @@ UNICODE_COLLATION_DESC=		Use bindings to the Internationl Components for Unicode
 UNICODE_COLLATION_CABAL_FLAGS=	unicode_collation
 UNICODE_COLLATION_USE_CABAL=	text-icu-0.7.0.1
 UNICODE_COLLATION_LIB_DEPENDS=	libicui18n.so:devel/icu
+UNICODE_COLLATION_EXTRA_PATCHES=${PATCHDIR}/extra-patch-icu68
 
 USE_CABAL=	Glob-0.10.0_1 \
 		HTTP-4000.3.14_1 \
diff --git a/textproc/hs-pandoc-citeproc/files/extra-patch-icu68 b/textproc/hs-pandoc-citeproc/files/extra-patch-icu68
new file mode 100644
index 000000000000..8126bf04fba3
--- /dev/null
+++ b/textproc/hs-pandoc-citeproc/files/extra-patch-icu68
@@ -0,0 +1,21 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+cbits/text_icu.c:308:43: error:
+     error: use of undeclared identifier 'TRUE'
+        return u_strCompareIter(iter1, iter2, TRUE);
+                                              ^
+    |
+308 |     return u_strCompareIter(iter1, iter2, TRUE);
+    |                                           ^
+
+--- text-icu-0.7.0.1/cbits/text_icu.c.orig	2015-01-09 04:58:03 UTC
++++ text-icu-0.7.0.1/cbits/text_icu.c
+@@ -305,7 +305,7 @@ int32_t __hs_u_strFoldCase(UChar *dest, int32_t destCa
+ 
+ int32_t __hs_u_strCompareIter(UCharIterator *iter1, UCharIterator *iter2)
+ {
+-    return u_strCompareIter(iter1, iter2, TRUE);
++    return u_strCompareIter(iter1, iter2, true);
+ }
+ 
+ UBlockCode __hs_ublock_getCode(UChar32 c)
diff --git a/textproc/libe-book/Makefile b/textproc/libe-book/Makefile
index ad5081ef1d11..ec1fce695539 100644
--- a/textproc/libe-book/Makefile
+++ b/textproc/libe-book/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libe-book
 PORTVERSION=	0.1.3
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	textproc
 MASTER_SITES=	SF/libebook/${PORTNAME}-${PORTVERSION}/
 
diff --git a/textproc/libe-book/files/patch-icu68 b/textproc/libe-book/files/patch-icu68
new file mode 100644
index 000000000000..17f6d8e84cd1
--- /dev/null
+++ b/textproc/libe-book/files/patch-icu68
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+      ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+      TRUE, TRUE, &status)
+            ^
+
+--- src/lib/EBOOKCharsetConverter.cpp.orig	2018-01-01 11:16:28 UTC
++++ src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
diff --git a/textproc/libfolia/Makefile b/textproc/libfolia/Makefile
index 05646e9f7035..7decf4f66963 100644
--- a/textproc/libfolia/Makefile
+++ b/textproc/libfolia/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	libfolia
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.15
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	textproc
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/libqxp/Makefile b/textproc/libqxp/Makefile
index e3192f6e258c..5a74758f5d5f 100644
--- a/textproc/libqxp/Makefile
+++ b/textproc/libqxp/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libqxp
 PORTVERSION=	0.0.0
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	textproc
 MASTER_SITES=	https://dev-www.libreoffice.org/src/${PORTNAME}/
 
diff --git a/textproc/libvisio01/Makefile b/textproc/libvisio01/Makefile
index 50bfe1b08ebd..4301bd27c319 100644
--- a/textproc/libvisio01/Makefile
+++ b/textproc/libvisio01/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libvisio
 PORTVERSION=	0.1.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc devel
 MASTER_SITES=	LODEV/${PORTNAME}
 PKGNAMESUFFIX=	01
diff --git a/textproc/nuspell/Makefile b/textproc/nuspell/Makefile
index f0a775c16fdf..2ebdd1b3256c 100644
--- a/textproc/nuspell/Makefile
+++ b/textproc/nuspell/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	nuspell
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index bbbd43ad7d38..1134df36db0b 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	raptor2
 PORTVERSION=	2.0.15
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.librdf.org/source/ \
 		SF/librdf/${PORTNAME}/${PORTVERSION}
diff --git a/textproc/rubygem-charlock_holmes/Makefile b/textproc/rubygem-charlock_holmes/Makefile
index 66d58ef635ba..7bb75bf28451 100644
--- a/textproc/rubygem-charlock_holmes/Makefile
+++ b/textproc/rubygem-charlock_holmes/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	charlock_holmes
 DISTVERSION=	0.7.7
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
diff --git a/textproc/ucto/Makefile b/textproc/ucto/Makefile
index c1d82aa13fb5..aea09edd467f 100644
--- a/textproc/ucto/Makefile
+++ b/textproc/ucto/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	ucto
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.14.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	textproc
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile
index cbd44f052e88..6487103b8068 100644
--- a/textproc/xalan-c/Makefile
+++ b/textproc/xalan-c/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xalan-c
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	APACHE/xalan/xalan-c/sources
 DISTNAME=	xalan_c-${PORTVERSION}
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index ea5f66e432b5..97dfb8ee4109 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zorba
 PORTVERSION=	2.7.0
-PORTREVISION=	30
+PORTREVISION=	31
 CATEGORIES=	textproc java
 MASTER_SITES=	https://launchpadlibrarian.net/119058962/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
diff --git a/textproc/zorba/files/patch-icu68 b/textproc/zorba/files/patch-icu68
new file mode 100644
index 000000000000..de4bce3f5277
--- /dev/null
+++ b/textproc/zorba/files/patch-icu68
@@ -0,0 +1,67 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+src/util/regex.cpp:454:33: error: use of undeclared identifier 'TRUE'
+  return U_SUCCESS( status ) == TRUE;
+                                ^
+src/util/unicode_util.cpp:2229:33: error: use of undeclared identifier 'TRUE'
+  return U_SUCCESS( status ) == TRUE;
+                                ^
+src/util/unicode_util.cpp:2250:33: error: use of undeclared identifier 'TRUE'
+  return U_SUCCESS( status ) == TRUE;
+                                ^
+src/util/unicode_util.cpp:2292:33: error: use of undeclared identifier 'TRUE'
+  return U_SUCCESS( status ) == TRUE;
+                                ^
+src/util/unicode_util.cpp:2301:33: error: use of undeclared identifier 'TRUE'
+  return U_SUCCESS( status ) == TRUE;
+                                ^
+
+--- src/util/regex.cpp.orig	2012-10-03 22:35:16 UTC
++++ src/util/regex.cpp
+@@ -451,7 +451,7 @@ bool regex::replace_all( string const &in, string cons
+   matcher_->reset( in );
+   UErrorCode status = U_ZERO_ERROR;
+   *out = matcher_->replaceAll( replacement, status );
+-  return U_SUCCESS( status ) == TRUE;
++  return U_SUCCESS( status ) == true;
+ }
+ 
+ bool regex::replace_all( char const *in, char const *replacement,
+--- src/util/unicode_util.cpp.orig	2012-10-03 22:35:16 UTC
++++ src/util/unicode_util.cpp
+@@ -2226,7 +2226,7 @@ bool normalize( string const &in, normalization::type 
+     default                 : icu_mode = UNORM_NONE; break;
+   }
+   Normalizer::normalize( in, icu_mode, 0, *out, status );
+-  return U_SUCCESS( status ) == TRUE;
++  return U_SUCCESS( status ) == true;
+ }
+ 
+ bool strip_diacritics( string const &in, string *out ) {
+@@ -2247,7 +2247,7 @@ bool to_char( char const *in, char_type *out ) {
+   u_strFromUTF8WithSub(
+     out, 1, nullptr, in, utf8::char_length( *in ), SubChar, nullptr, &status
+   );
+-  return U_SUCCESS( status ) == TRUE;
++  return U_SUCCESS( status ) == true;
+ }
+ 
+ #endif /* ZORBA_NO_ICU */
+@@ -2289,7 +2289,7 @@ bool to_string( char const *in, size_type in_len, stri
+   UErrorCode status = U_ZERO_ERROR;
+   u_strFromUTF8( buf, in_len + 1, &buf_len, in, in_len, &status );
+   out->releaseBuffer( buf_len );
+-  return U_SUCCESS( status ) == TRUE;
++  return U_SUCCESS( status ) == true;
+ }
+ 
+ bool to_string( wchar_t const *in, size_type in_len, string *out ) {
+@@ -2298,7 +2298,7 @@ bool to_string( wchar_t const *in, size_type in_len, s
+   size_type buf_len;
+   u_strFromWCS( buf, in_len + 1, &buf_len, in, in_len, &status );
+   out->releaseBuffer( buf_len );
+-  return U_SUCCESS( status ) == TRUE;
++  return U_SUCCESS( status ) == true;
+ }
+ 
+ #endif /* ZORBA_NO_ICU */