summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/boost-libs/Makefile2
-rw-r--r--devel/dee/Makefile2
-rw-r--r--devel/icu-le-hb/Makefile2
-rw-r--r--devel/icu-le-hb/files/patch-icu6853
-rw-r--r--devel/icu/Makefile2
-rw-r--r--devel/icu/distinfo6
-rw-r--r--devel/icu/pkg-plist1
-rw-r--r--devel/kiwix-lib/Makefile1
-rw-r--r--devel/libical/Makefile1
-rw-r--r--devel/libical/files/patch-icu6829
-rw-r--r--devel/libphonenumber/Makefile1
-rw-r--r--devel/libzim/Makefile1
-rw-r--r--devel/objecthash/Makefile2
-rw-r--r--devel/php72-intl/Makefile1
-rw-r--r--devel/php72-intl/files/patch-icu68201
-rw-r--r--devel/php73-intl/Makefile1
-rw-r--r--devel/php73-intl/files/patch-icu68213
-rw-r--r--devel/php74-intl/Makefile1
-rw-r--r--devel/php74-intl/files/patch-icu68213
-rw-r--r--devel/php80-intl/Makefile1
-rw-r--r--devel/php80-intl/files/patch-icu68222
-rw-r--r--devel/py-pyicu/Makefile1
-rw-r--r--devel/py-pyicu/files/patch-icu6897
-rw-r--r--devel/qt5-core/Makefile2
-rw-r--r--devel/ticcutils/Makefile2
25 files changed, 1048 insertions, 10 deletions
diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile
index 1f80672baafd..1f9e5d5fec14 100644
--- a/devel/boost-libs/Makefile
+++ b/devel/boost-libs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= boost-libs
-PORTREVISION= 2
+PORTREVISION= 3
COMMENT= Free portable C++ libraries (without Boost.Python)
diff --git a/devel/dee/Makefile b/devel/dee/Makefile
index 3fb7377b1e97..a224b438ac29 100644
--- a/devel/dee/Makefile
+++ b/devel/dee/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dee
PORTVERSION= 1.2.7
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= devel
MASTER_SITES= https://launchpadlibrarian.net/151383425/ \
https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
diff --git a/devel/icu-le-hb/Makefile b/devel/icu-le-hb/Makefile
index 3e9ed229fa88..e3f7589770e3 100644
--- a/devel/icu-le-hb/Makefile
+++ b/devel/icu-le-hb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= icu-le-hb
DISTVERSION= 1.0.3-3
DISTVERSIONSUFFIX= -gb8a3163
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= devel print
MAINTAINER= office@FreeBSD.org
diff --git a/devel/icu-le-hb/files/patch-icu68 b/devel/icu-le-hb/files/patch-icu68
new file mode 100644
index 000000000000..2d9b0b657eda
--- /dev/null
+++ b/devel/icu-le-hb/files/patch-icu68
@@ -0,0 +1,53 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+LEFontInstance.cpp:82:39: error: use of undeclared identifier 'TRUE'
+ return mapCharToGlyph(ch, mapper, TRUE);
+ ^
+LEGlyphStorage.cpp:662:12: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+LEInsertionList.cpp:89:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+LEInsertionList.cpp:93:12: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+
+--- src/LEFontInstance.cpp.orig 2016-11-13 06:15:24 UTC
++++ src/LEFontInstance.cpp
+@@ -79,7 +79,7 @@ void LEFontInstance::mapCharsToGlyphs(const LEUnicode
+
+ LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper) const
+ {
+- return mapCharToGlyph(ch, mapper, TRUE);
++ return mapCharToGlyph(ch, mapper, true);
+ }
+
+ LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper, le_bool filterZeroWidth) const
+--- src/LEGlyphStorage.cpp.orig 2016-11-13 06:15:24 UTC
++++ src/LEGlyphStorage.cpp
+@@ -659,7 +659,7 @@ le_bool LEGlyphStorage::applyInsertion(le_int32 atPosi
+ // just got replaced by the insertion
+ fSrcIndex -= 1;
+
+- return FALSE;
++ return false;
+ }
+
+ U_NAMESPACE_END
+--- src/LEInsertionList.cpp.orig 2016-11-13 06:15:24 UTC
++++ src/LEInsertionList.cpp
+@@ -86,11 +86,11 @@ le_bool LEInsertionList::applyInsertions(LEInsertionCa
+ {
+ for (InsertionRecord *rec = head; rec != NULL; rec = rec->next) {
+ if (callback->applyInsertion(rec->position, rec->count, rec->glyphs)) {
+- return TRUE;
++ return true;
+ }
+ }
+
+- return FALSE;
++ return false;
+ }
+
+ U_NAMESPACE_END
diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index 8a1990bfc0e9..c8db8d0cde8c 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= icu
-DISTVERSION= 67_1
+DISTVERSION= 68_1
PORTREVISION?= 0 # keep for icu-lx
PORTEPOCH?= 1
CATEGORIES?= devel
diff --git a/devel/icu/distinfo b/devel/icu/distinfo
index 38f369994cbd..08a912019bbc 100644
--- a/devel/icu/distinfo
+++ b/devel/icu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587585860
-SHA256 (icu4c-67_1-src.tgz) = 94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
-SIZE (icu4c-67_1-src.tgz) = 24518055
+TIMESTAMP = 1603920072
+SHA256 (icu4c-68_1-src.tgz) = a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d
+SIZE (icu4c-68_1-src.tgz) = 24722348
diff --git a/devel/icu/pkg-plist b/devel/icu/pkg-plist
index 146cc132701f..1a47f81ff6b0 100644
--- a/devel/icu/pkg-plist
+++ b/devel/icu/pkg-plist
@@ -190,6 +190,7 @@ include/unicode/unorm.h
include/unicode/unorm2.h
include/unicode/unum.h
include/unicode/unumberformatter.h
+include/unicode/unumberrangeformatter.h
include/unicode/unumsys.h
include/unicode/uobject.h
include/unicode/upluralrules.h
diff --git a/devel/kiwix-lib/Makefile b/devel/kiwix-lib/Makefile
index 7c77e208a12b..30f3346aef0f 100644
--- a/devel/kiwix-lib/Makefile
+++ b/devel/kiwix-lib/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kiwix-lib
DISTVERSION= 9.3.1
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= me@int19h.org
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index 49855ea9b45a..d02bdde8930e 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libical
DISTVERSION= 3.0.8
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://github.com/libical/libical/releases/download/v${PORTVERSION}/
diff --git a/devel/libical/files/patch-icu68 b/devel/libical/files/patch-icu68
new file mode 100644
index 000000000000..8fc1516a74bb
--- /dev/null
+++ b/devel/libical/files/patch-icu68
@@ -0,0 +1,29 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+src/libical/icalrecur.c:1021:59: error: use of undeclared identifier 'FALSE'
+ en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
+ ^
+src/libical/icalrecur.c:1414:63: error: use of undeclared identifier 'FALSE'
+ en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
+ ^
+
+--- src/libical/icalrecur.c.orig 2020-03-07 14:42:42 UTC
++++ src/libical/icalrecur.c
+@@ -1018,7 +1018,7 @@ icalarray *icalrecurrencetype_rscale_supported_calenda
+
+ calendars = icalarray_new(sizeof(const char **), 20);
+
+- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
++ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
+ while ((cal = uenum_next(en, NULL, &status))) {
+ cal = icalmemory_tmp_copy(cal);
+ icalarray_append(calendars, &cal);
+@@ -1411,7 +1411,7 @@ static int initialize_rscale(icalrecur_iterator *impl)
+ }
+
+ /* Check if specified calendar is supported */
+- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
++ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
+ while ((cal = uenum_next(en, NULL, &status))) {
+ if (!strcmp(cal, rule.rscale)) {
+ is_hebrew = !strcmp(rule.rscale, "hebrew");
diff --git a/devel/libphonenumber/Makefile b/devel/libphonenumber/Makefile
index e57419e81b99..2d55d7da3f1d 100644
--- a/devel/libphonenumber/Makefile
+++ b/devel/libphonenumber/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libphonenumber
DISTVERSIONPREFIX= v
DISTVERSION= 8.12.12
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/libzim/Makefile b/devel/libzim/Makefile
index f12e8d71210b..1d42cd560def 100644
--- a/devel/libzim/Makefile
+++ b/devel/libzim/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libzim
PORTVERSION= 6.2.2
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= swills@FreeBSD.org
diff --git a/devel/objecthash/Makefile b/devel/objecthash/Makefile
index c6a50bdd8171..a468cbe44553 100644
--- a/devel/objecthash/Makefile
+++ b/devel/objecthash/Makefile
@@ -3,7 +3,7 @@
PORTNAME= objecthash
PORTVERSION= 20160802
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/php72-intl/Makefile b/devel/php72-intl/Makefile
index 4862fded8d55..a4c5a5cb662e 100644
--- a/devel/php72-intl/Makefile
+++ b/devel/php72-intl/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PORTREVISION= 1
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php72
diff --git a/devel/php72-intl/files/patch-icu68 b/devel/php72-intl/files/patch-icu68
new file mode 100644
index 000000000000..0969fbaa533c
--- /dev/null
+++ b/devel/php72-intl/files/patch-icu68
@@ -0,0 +1,201 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+ext/intl/breakiterator/codepointiterator_internal.cpp:60:53: error: use of undeclared identifier 'FALSE'
+ this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:60:60: error: use of undeclared identifier 'TRUE'
+ this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:80:10: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:87:10: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:90:9: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:111:42: error: use of undeclared identifier 'FALSE'
+ return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:111:49: error: use of undeclared identifier 'TRUE'
+ return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:130:47: error: use of undeclared identifier 'FALSE'
+ this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:130:54: error: use of undeclared identifier 'TRUE'
+ this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:282:48: error: use of undeclared identifier 'FALSE'
+ this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:282:55: error: use of undeclared identifier 'TRUE'
+ this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
+ ^
+ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE'
+ collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ ^
+ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE'
+ collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ ^
+ext/intl/dateformat/dateformat_attr.c:91:36: error: use of undeclared identifier 'FALSE'
+ zend_bool is_pattern_localized =FALSE;
+ ^
+ext/intl/dateformat/dateformat_attr.c:134:36: error: use of undeclared identifier 'FALSE'
+ zend_bool is_pattern_localized =FALSE;
+ ^
+ext/intl/dateformat/dateformat_attr.c:230:25: error: use of undeclared identifier 'FALSE'
+ zend_bool isLenient = FALSE;
+ ^
+ext/intl/normalizer/normalizer_normalize.c:181:16: error: use of undeclared identifier 'FALSE'
+ UBool uret = FALSE;
+ ^
+ext/intl/timezone/timezone_class.cpp:324:21: error: use of undeclared identifier 'FALSE'
+ tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
+ ^
+ext/intl/timezone/timezone_methods.cpp:94:57: error: use of undeclared identifier 'FALSE'
+ tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
+ ^
+
+--- breakiterator/codepointiterator_internal.cpp.orig 2020-09-30 05:15:54 UTC
++++ breakiterator/codepointiterator_internal.cpp
+@@ -57,7 +57,7 @@ CodePointBreakIterator& CodePointBreakIterator::operat
+ return *this;
+ }
+
+- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
++ this->fText = utext_clone(this->fText, that.fText, false, true, &uec);
+
+ //don't bother copying the character iterator, getText() is deprecated
+ clearCurrentCharIter();
+@@ -77,17 +77,17 @@ CodePointBreakIterator::~CodePointBreakIterator()
+ UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
+ {
+ if (typeid(*this) != typeid(that)) {
+- return FALSE;
++ return false;
+ }
+
+ const CodePointBreakIterator& that2 =
+ static_cast<const CodePointBreakIterator&>(that);
+
+ if (!utext_equals(this->fText, that2.fText)) {
+- return FALSE;
++ return false;
+ }
+
+- return TRUE;
++ return true;
+ }
+
+ CodePointBreakIterator* CodePointBreakIterator::clone(void) const
+@@ -108,7 +108,7 @@ CharacterIterator& CodePointBreakIterator::getText(voi
+
+ UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const
+ {
+- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
++ return utext_clone(fillIn, this->fText, false, true, &status);
+ }
+
+ void CodePointBreakIterator::setText(const UnicodeString &text)
+@@ -127,7 +127,7 @@ void CodePointBreakIterator::setText(UText *text, UErr
+ return;
+ }
+
+- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
++ this->fText = utext_clone(this->fText, text, false, true, &status);
+
+ clearCurrentCharIter();
+ }
+@@ -279,7 +279,7 @@ CodePointBreakIterator &CodePointBreakIterator::refres
+ }
+
+ int64_t pos = utext_getNativeIndex(this->fText);
+- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
++ this->fText = utext_clone(this->fText, input, false, true, &status);
+ if (U_FAILURE(status)) {
+ return *this;
+ }
+--- collator/collator_sort.c.orig 2020-09-30 05:15:54 UTC
++++ collator/collator_sort.c
+@@ -346,7 +346,7 @@ static void collator_sort_internal( int renumber, INTE
+ */
+ PHP_FUNCTION( collator_sort )
+ {
+- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
++ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ }
+ /* }}} */
+
+@@ -540,7 +540,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys )
+ */
+ PHP_FUNCTION( collator_asort )
+ {
+- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
++ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ }
+ /* }}} */
+
+--- dateformat/dateformat_attr.c.orig 2020-09-30 05:15:54 UTC
++++ dateformat/dateformat_attr.c
+@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern )
+ UChar value_buf[64];
+ uint32_t length = USIZE( value_buf );
+ UChar* value = value_buf;
+- zend_bool is_pattern_localized =FALSE;
++ zend_bool is_pattern_localized = false;
+
+ DATE_FORMAT_METHOD_INIT_VARS;
+
+@@ -131,7 +131,7 @@ PHP_FUNCTION( datefmt_set_pattern )
+ size_t value_len = 0;
+ int32_t slength = 0;
+ UChar* svalue = NULL;
+- zend_bool is_pattern_localized =FALSE;
++ zend_bool is_pattern_localized = false;
+
+
+ DATE_FORMAT_METHOD_INIT_VARS;
+@@ -227,7 +227,7 @@ PHP_FUNCTION( datefmt_is_lenient )
+ */
+ PHP_FUNCTION( datefmt_set_lenient )
+ {
+- zend_bool isLenient = FALSE;
++ zend_bool isLenient = false;
+
+ DATE_FORMAT_METHOD_INIT_VARS;
+
+--- normalizer/normalizer_normalize.c.orig 2020-09-30 05:15:54 UTC
++++ normalizer/normalizer_normalize.c
+@@ -178,7 +178,7 @@ PHP_FUNCTION( normalizer_is_normalized )
+ int uinput_len = 0;
+ UErrorCode status = U_ZERO_ERROR;
+
+- UBool uret = FALSE;
++ UBool uret = false;
+
+ intl_error_reset( NULL );
+
+--- timezone/timezone_class.cpp.orig 2020-09-30 05:15:54 UTC
++++ timezone/timezone_class.cpp
+@@ -321,7 +321,7 @@ static HashTable *TimeZone_get_debug_info(zval *object
+
+ int32_t rawOffset, dstOffset;
+ UDate now = Calendar::getNow();
+- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
++ tz->getOffset(now, false, rawOffset, dstOffset, uec);
+ if (U_FAILURE(uec)) {
+ return debug_info;
+ }
+--- timezone/timezone_methods.cpp.orig 2020-09-30 05:15:54 UTC
++++ timezone/timezone_methods.cpp
+@@ -91,7 +91,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)
+ RETURN_NULL();
+ }
+
+- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
++ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL,
+ "intltz_from_date_time_zone");
+ if (tz == NULL) {
+ RETURN_NULL();
diff --git a/devel/php73-intl/Makefile b/devel/php73-intl/Makefile
index a32aaf000627..7da7b804c524 100644
--- a/devel/php73-intl/Makefile
+++ b/devel/php73-intl/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PORTREVISION= 1
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php73
diff --git a/devel/php73-intl/files/patch-icu68 b/devel/php73-intl/files/patch-icu68
new file mode 100644
index 000000000000..4462157b964f
--- /dev/null
+++ b/devel/php73-intl/files/patch-icu68
@@ -0,0 +1,213 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+ext/intl/breakiterator/codepointiterator_internal.cpp:60:53: error: use of undeclared identifier 'FALSE'
+ this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:60:60: error: use of undeclared identifier 'TRUE'
+ this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:80:10: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:87:10: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:90:9: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:111:42: error: use of undeclared identifier 'FALSE'
+ return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:111:49: error: use of undeclared identifier 'TRUE'
+ return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:130:47: error: use of undeclared identifier 'FALSE'
+ this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:130:54: error: use of undeclared identifier 'TRUE'
+ this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:282:48: error: use of undeclared identifier 'FALSE'
+ this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:282:55: error: use of undeclared identifier 'TRUE'
+ this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
+ ^
+ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE'
+ collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ ^
+ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE'
+ collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ ^
+ext/intl/dateformat/dateformat_attr.c:91:36: error: use of undeclared identifier 'FALSE'
+ zend_bool is_pattern_localized =FALSE;
+ ^
+ext/intl/dateformat/dateformat_attr.c:134:36: error: use of undeclared identifier 'FALSE'
+ zend_bool is_pattern_localized =FALSE;
+ ^
+ext/intl/dateformat/dateformat_attr.c:230:25: error: use of undeclared identifier 'FALSE'
+ zend_bool isLenient = FALSE;
+ ^
+ext/intl/normalizer/normalizer_normalize.c:95:10: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+ext/intl/normalizer/normalizer_normalize.c:181:16: error: use of undeclared identifier 'FALSE'
+ UBool uret = FALSE;
+ ^
+ext/intl/timezone/timezone_class.cpp:324:21: error: use of undeclared identifier 'FALSE'
+ tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
+ ^
+ext/intl/timezone/timezone_methods.cpp:94:57: error: use of undeclared identifier 'FALSE'
+ tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
+ ^
+
+--- breakiterator/codepointiterator_internal.cpp.orig 2020-09-29 08:33:05 UTC
++++ breakiterator/codepointiterator_internal.cpp
+@@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIterator::operat
+ return *this;
+ }
+
+- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
++ this->fText = utext_clone(this->fText, that.fText, false, true, &uec);
+
+ //don't bother copying the character iterator, getText() is deprecated
+ clearCurrentCharIter();
+@@ -78,17 +78,17 @@ CodePointBreakIterator::~CodePointBreakIterator()
+ UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
+ {
+ if (typeid(*this) != typeid(that)) {
+- return FALSE;
++ return false;
+ }
+
+ const CodePointBreakIterator& that2 =
+ static_cast<const CodePointBreakIterator&>(that);
+
+ if (!utext_equals(this->fText, that2.fText)) {
+- return FALSE;
++ return false;
+ }
+
+- return TRUE;
++ return true;
+ }
+
+ CodePointBreakIterator* CodePointBreakIterator::clone(void) const
+@@ -109,7 +109,7 @@ CharacterIterator& CodePointBreakIterator::getText(voi
+
+ UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const
+ {
+- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
++ return utext_clone(fillIn, this->fText, false, true, &status);
+ }
+
+ void CodePointBreakIterator::setText(const UnicodeString &text)
+@@ -128,7 +128,7 @@ void CodePointBreakIterator::setText(UText *text, UErr
+ return;
+ }
+
+- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
++ this->fText = utext_clone(this->fText, text, false, true, &status);
+
+ clearCurrentCharIter();
+ }
+@@ -280,7 +280,7 @@ CodePointBreakIterator &CodePointBreakIterator::refres
+ }
+
+ int64_t pos = utext_getNativeIndex(this->fText);
+- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
++ this->fText = utext_clone(this->fText, input, false, true, &status);
+ if (U_FAILURE(status)) {
+ return *this;
+ }
+--- collator/collator_sort.c.orig 2020-09-29 08:33:05 UTC
++++ collator/collator_sort.c
+@@ -346,7 +346,7 @@ static void collator_sort_internal( int renumber, INTE
+ */
+ PHP_FUNCTION( collator_sort )
+ {
+- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
++ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ }
+ /* }}} */
+
+@@ -540,7 +540,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys )
+ */
+ PHP_FUNCTION( collator_asort )
+ {
+- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
++ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ }
+ /* }}} */
+
+--- dateformat/dateformat_attr.c.orig 2020-09-29 08:33:05 UTC
++++ dateformat/dateformat_attr.c
+@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern )
+ UChar value_buf[64];
+ uint32_t length = USIZE( value_buf );
+ UChar* value = value_buf;
+- zend_bool is_pattern_localized =FALSE;
++ zend_bool is_pattern_localized = false;
+
+ DATE_FORMAT_METHOD_INIT_VARS;
+
+@@ -131,7 +131,7 @@ PHP_FUNCTION( datefmt_set_pattern )
+ size_t value_len = 0;
+ int32_t slength = 0;
+ UChar* svalue = NULL;
+- zend_bool is_pattern_localized =FALSE;
++ zend_bool is_pattern_localized = false;
+
+
+ DATE_FORMAT_METHOD_INIT_VARS;
+@@ -227,7 +227,7 @@ PHP_FUNCTION( datefmt_is_lenient )
+ */
+ PHP_FUNCTION( datefmt_set_lenient )
+ {
+- zend_bool isLenient = FALSE;
++ zend_bool isLenient = false;
+
+ DATE_FORMAT_METHOD_INIT_VARS;
+
+--- normalizer/normalizer_normalize.c.orig 2020-09-29 08:33:05 UTC
++++ normalizer/normalizer_normalize.c
+@@ -92,7 +92,7 @@ static UBool intl_is_normalized(zend_long form, const
+ const UNormalizer2 *norm = intl_get_normalizer(form, err);
+
+ if(U_FAILURE(*err)) {
+- return FALSE;
++ return false;
+ }
+
+ return unorm2_isNormalized(norm, uinput, uinput_len, err);
+@@ -263,7 +263,7 @@ PHP_FUNCTION( normalizer_is_normalized )
+ int uinput_len = 0;
+ UErrorCode status = U_ZERO_ERROR;
+
+- UBool uret = FALSE;
++ UBool uret = false;
+
+ intl_error_reset( NULL );
+
+--- timezone/timezone_class.cpp.orig 2020-09-29 08:33:05 UTC
++++ timezone/timezone_class.cpp
+@@ -322,7 +322,7 @@ static HashTable *TimeZone_get_debug_info(zval *object
+
+ int32_t rawOffset, dstOffset;
+ UDate now = Calendar::getNow();
+- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
++ tz->getOffset(now, false, rawOffset, dstOffset, uec);
+ if (U_FAILURE(uec)) {
+ return debug_info;
+ }
+--- timezone/timezone_methods.cpp.orig 2020-09-29 08:33:05 UTC
++++ timezone/timezone_methods.cpp
+@@ -95,7 +95,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)
+ RETURN_NULL();
+ }
+
+- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
++ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL,
+ "intltz_from_date_time_zone");
+ if (tz == NULL) {
+ RETURN_NULL();
diff --git a/devel/php74-intl/Makefile b/devel/php74-intl/Makefile
index 6467347fc18f..c5d70050e29b 100644
--- a/devel/php74-intl/Makefile
+++ b/devel/php74-intl/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PORTREVISION= 1
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php74
diff --git a/devel/php74-intl/files/patch-icu68 b/devel/php74-intl/files/patch-icu68
new file mode 100644
index 000000000000..3199a78daadb
--- /dev/null
+++ b/devel/php74-intl/files/patch-icu68
@@ -0,0 +1,213 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+ext/intl/breakiterator/codepointiterator_internal.cpp:60:53: error: use of undeclared identifier 'FALSE'
+ this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:60:60: error: use of undeclared identifier 'TRUE'
+ this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:80:10: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:87:10: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:90:9: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:111:42: error: use of undeclared identifier 'FALSE'
+ return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:111:49: error: use of undeclared identifier 'TRUE'
+ return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:130:47: error: use of undeclared identifier 'FALSE'
+ this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:130:54: error: use of undeclared identifier 'TRUE'
+ this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:282:48: error: use of undeclared identifier 'FALSE'
+ this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:282:55: error: use of undeclared identifier 'TRUE'
+ this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
+ ^
+ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE'
+ collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ ^
+ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE'
+ collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ ^
+ext/intl/dateformat/dateformat_attr.c:91:36: error: use of undeclared identifier 'FALSE'
+ zend_bool is_pattern_localized =FALSE;
+ ^
+ext/intl/dateformat/dateformat_attr.c:134:36: error: use of undeclared identifier 'FALSE'
+ zend_bool is_pattern_localized =FALSE;
+ ^
+ext/intl/dateformat/dateformat_attr.c:230:25: error: use of undeclared identifier 'FALSE'
+ zend_bool isLenient = FALSE;
+ ^
+ext/intl/normalizer/normalizer_normalize.c:95:10: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+ext/intl/normalizer/normalizer_normalize.c:181:16: error: use of undeclared identifier 'FALSE'
+ UBool uret = FALSE;
+ ^
+ext/intl/timezone/timezone_class.cpp:324:21: error: use of undeclared identifier 'FALSE'
+ tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
+ ^
+ext/intl/timezone/timezone_methods.cpp:94:57: error: use of undeclared identifier 'FALSE'
+ tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
+ ^
+
+--- breakiterator/codepointiterator_internal.cpp.orig 2020-09-29 10:17:14 UTC
++++ breakiterator/codepointiterator_internal.cpp
+@@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIterator::operat
+ return *this;
+ }
+
+- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
++ this->fText = utext_clone(this->fText, that.fText, false, true, &uec);
+
+ //don't bother copying the character iterator, getText() is deprecated
+ clearCurrentCharIter();
+@@ -78,17 +78,17 @@ CodePointBreakIterator::~CodePointBreakIterator()
+ UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
+ {
+ if (typeid(*this) != typeid(that)) {
+- return FALSE;
++ return false;
+ }
+
+ const CodePointBreakIterator& that2 =
+ static_cast<const CodePointBreakIterator&>(that);
+
+ if (!utext_equals(this->fText, that2.fText)) {
+- return FALSE;
++ return false;
+ }
+
+- return TRUE;
++ return true;
+ }
+
+ CodePointBreakIterator* CodePointBreakIterator::clone(void) const
+@@ -109,7 +109,7 @@ CharacterIterator& CodePointBreakIterator::getText(voi
+
+ UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const
+ {
+- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
++ return utext_clone(fillIn, this->fText, false, true, &status);
+ }
+
+ void CodePointBreakIterator::setText(const UnicodeString &text)
+@@ -128,7 +128,7 @@ void CodePointBreakIterator::setText(UText *text, UErr
+ return;
+ }
+
+- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
++ this->fText = utext_clone(this->fText, text, false, true, &status);
+
+ clearCurrentCharIter();
+ }
+@@ -280,7 +280,7 @@ CodePointBreakIterator &CodePointBreakIterator::refres
+ }
+
+ int64_t pos = utext_getNativeIndex(this->fText);
+- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
++ this->fText = utext_clone(this->fText, input, false, true, &status);
+ if (U_FAILURE(status)) {
+ return *this;
+ }
+--- collator/collator_sort.c.orig 2020-09-29 10:17:14 UTC
++++ collator/collator_sort.c
+@@ -346,7 +346,7 @@ static void collator_sort_internal( int renumber, INTE
+ */
+ PHP_FUNCTION( collator_sort )
+ {
+- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
++ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ }
+ /* }}} */
+
+@@ -540,7 +540,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys )
+ */
+ PHP_FUNCTION( collator_asort )
+ {
+- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
++ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ }
+ /* }}} */
+
+--- dateformat/dateformat_attr.c.orig 2020-09-29 10:17:13 UTC
++++ dateformat/dateformat_attr.c
+@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern )
+ UChar value_buf[64];
+ uint32_t length = USIZE( value_buf );
+ UChar* value = value_buf;
+- zend_bool is_pattern_localized =FALSE;
++ zend_bool is_pattern_localized = false;
+
+ DATE_FORMAT_METHOD_INIT_VARS;
+
+@@ -131,7 +131,7 @@ PHP_FUNCTION( datefmt_set_pattern )
+ size_t value_len = 0;
+ int32_t slength = 0;
+ UChar* svalue = NULL;
+- zend_bool is_pattern_localized =FALSE;
++ zend_bool is_pattern_localized = false;
+
+
+ DATE_FORMAT_METHOD_INIT_VARS;
+@@ -227,7 +227,7 @@ PHP_FUNCTION( datefmt_is_lenient )
+ */
+ PHP_FUNCTION( datefmt_set_lenient )
+ {
+- zend_bool isLenient = FALSE;
++ zend_bool isLenient = false;
+
+ DATE_FORMAT_METHOD_INIT_VARS;
+
+--- normalizer/normalizer_normalize.c.orig 2020-09-29 10:17:14 UTC
++++ normalizer/normalizer_normalize.c
+@@ -90,7 +90,7 @@ static UBool intl_is_normalized(zend_long form, const
+ const UNormalizer2 *norm = intl_get_normalizer(form, err);
+
+ if(U_FAILURE(*err)) {
+- return FALSE;
++ return false;
+ }
+
+ return unorm2_isNormalized(norm, uinput, uinput_len, err);
+@@ -261,7 +261,7 @@ PHP_FUNCTION( normalizer_is_normalized )
+ int uinput_len = 0;
+ UErrorCode status = U_ZERO_ERROR;
+
+- UBool uret = FALSE;
++ UBool uret = false;
+
+ intl_error_reset( NULL );
+
+--- timezone/timezone_class.cpp.orig 2020-09-29 10:17:14 UTC
++++ timezone/timezone_class.cpp
+@@ -325,7 +325,7 @@ static HashTable *TimeZone_get_debug_info(zval *object
+
+ int32_t rawOffset, dstOffset;
+ UDate now = Calendar::getNow();
+- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
++ tz->getOffset(now, false, rawOffset, dstOffset, uec);
+ if (U_FAILURE(uec)) {
+ return debug_info;
+ }
+--- timezone/timezone_methods.cpp.orig 2020-09-29 10:17:14 UTC
++++ timezone/timezone_methods.cpp
+@@ -95,7 +95,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)
+ RETURN_NULL();
+ }
+
+- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
++ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL,
+ "intltz_from_date_time_zone");
+ if (tz == NULL) {
+ RETURN_NULL();
diff --git a/devel/php80-intl/Makefile b/devel/php80-intl/Makefile
index 0f945ccf026b..9d6ccc027975 100644
--- a/devel/php80-intl/Makefile
+++ b/devel/php80-intl/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PORTREVISION= 1
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php80
diff --git a/devel/php80-intl/files/patch-icu68 b/devel/php80-intl/files/patch-icu68
new file mode 100644
index 000000000000..4db73ffec0d5
--- /dev/null
+++ b/devel/php80-intl/files/patch-icu68
@@ -0,0 +1,222 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+ext/intl/breakiterator/codepointiterator_internal.cpp:60:53: error: use of undeclared identifier 'FALSE'
+ this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:60:60: error: use of undeclared identifier 'TRUE'
+ this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:80:10: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:87:10: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:90:9: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:111:42: error: use of undeclared identifier 'FALSE'
+ return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:111:49: error: use of undeclared identifier 'TRUE'
+ return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:130:47: error: use of undeclared identifier 'FALSE'
+ this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:130:54: error: use of undeclared identifier 'TRUE'
+ this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:282:48: error: use of undeclared identifier 'FALSE'
+ this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
+ ^
+ext/intl/breakiterator/codepointiterator_internal.cpp:282:55: error: use of undeclared identifier 'TRUE'
+ this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
+ ^
+ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE'
+ collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ ^
+ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE'
+ collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ ^
+ext/intl/dateformat/dateformat_attr.c:91:36: error: use of undeclared identifier 'FALSE'
+ zend_bool is_pattern_localized =FALSE;
+ ^
+ext/intl/dateformat/dateformat_attr.c:134:36: error: use of undeclared identifier 'FALSE'
+ zend_bool is_pattern_localized =FALSE;
+ ^
+ext/intl/dateformat/dateformat_attr.c:230:25: error: use of undeclared identifier 'FALSE'
+ zend_bool isLenient = FALSE;
+ ^
+ext/intl/normalizer/normalizer_normalize.c:95:10: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+ext/intl/normalizer/normalizer_normalize.c:181:16: error: use of undeclared identifier 'FALSE'
+ UBool uret = FALSE;
+ ^
+ext/intl/timezone/timezone_class.cpp:324:21: error: use of undeclared identifier 'FALSE'
+ tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
+ ^
+ext/intl/timezone/timezone_methods.cpp:94:57: error: use of undeclared identifier 'FALSE'
+ tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
+ ^
+
+--- breakiterator/codepointiterator_internal.cpp.orig 2020-10-13 21:58:13 UTC
++++ breakiterator/codepointiterator_internal.cpp
+@@ -56,7 +56,7 @@ CodePointBreakIterator& CodePointBreakIterator::operat
+ return *this;
+ }
+
+- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
++ this->fText = utext_clone(this->fText, that.fText, false, true, &uec);
+
+ //don't bother copying the character iterator, getText() is deprecated
+ clearCurrentCharIter();
+@@ -76,17 +76,17 @@ CodePointBreakIterator::~CodePointBreakIterator()
+ UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
+ {
+ if (typeid(*this) != typeid(that)) {
+- return FALSE;
++ return false;
+ }
+
+ const CodePointBreakIterator& that2 =
+ static_cast<const CodePointBreakIterator&>(that);
+
+ if (!utext_equals(this->fText, that2.fText)) {
+- return FALSE;
++ return false;
+ }
+
+- return TRUE;
++ return true;
+ }
+
+ CodePointBreakIterator* CodePointBreakIterator::clone(void) const
+@@ -107,7 +107,7 @@ CharacterIterator& CodePointBreakIterator::getText(voi
+
+ UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const
+ {
+- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
++ return utext_clone(fillIn, this->fText, false, true, &status);
+ }
+
+ void CodePointBreakIterator::setText(const UnicodeString &text)
+@@ -126,7 +126,7 @@ void CodePointBreakIterator::setText(UText *text, UErr
+ return;
+ }
+
+- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
++ this->fText = utext_clone(this->fText, text, false, true, &status);
+
+ clearCurrentCharIter();
+ }
+@@ -278,7 +278,7 @@ CodePointBreakIterator &CodePointBreakIterator::refres
+ }
+
+ int64_t pos = utext_getNativeIndex(this->fText);
+- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
++ this->fText = utext_clone(this->fText, input, false, true, &status);
+ if (U_FAILURE(status)) {
+ return *this;
+ }
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE'
+ collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ ^
+ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE'
+ collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ ^
+
+--- collator/collator_sort.c.orig 2020-10-13 21:58:13 UTC
++++ collator/collator_sort.c
+@@ -312,7 +312,7 @@ static void collator_sort_internal( int renumber, INTE
+ /* {{{ Sort array using specified collator. */
+ PHP_FUNCTION( collator_sort )
+ {
+- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
++ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ }
+ /* }}} */
+
+@@ -495,7 +495,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys )
+ /* {{{ Sort array using specified collator, maintaining index association. */
+ PHP_FUNCTION( collator_asort )
+ {
+- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
++ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU );
+ }
+ /* }}} */
+
+--- dateformat/dateformat_attr.c.orig 2020-10-13 21:58:13 UTC
++++ dateformat/dateformat_attr.c
+@@ -69,7 +69,7 @@ PHP_FUNCTION( datefmt_get_pattern )
+ UChar value_buf[64];
+ uint32_t length = USIZE( value_buf );
+ UChar* value = value_buf;
+- zend_bool is_pattern_localized =FALSE;
++ zend_bool is_pattern_localized = false;
+
+ DATE_FORMAT_METHOD_INIT_VARS;
+
+@@ -106,7 +106,7 @@ PHP_FUNCTION( datefmt_set_pattern )
+ size_t value_len = 0;
+ int32_t slength = 0;
+ UChar* svalue = NULL;
+- zend_bool is_pattern_localized =FALSE;
++ zend_bool is_pattern_localized = false;
+
+
+ DATE_FORMAT_METHOD_INIT_VARS;
+@@ -184,7 +184,7 @@ PHP_FUNCTION( datefmt_is_lenient )
+ /* {{{ Set formatter lenient. */
+ PHP_FUNCTION( datefmt_set_lenient )
+ {
+- zend_bool isLenient = FALSE;
++ zend_bool isLenient = false;
+
+ DATE_FORMAT_METHOD_INIT_VARS;
+
+--- normalizer/normalizer_normalize.c.orig 2020-10-13 21:58:13 UTC
++++ normalizer/normalizer_normalize.c
+@@ -69,7 +69,7 @@ static UBool intl_is_normalized(zend_long form, const
+ const UNormalizer2 *norm = intl_get_normalizer(form, err);
+
+ if(U_FAILURE(*err)) {
+- return FALSE;
++ return false;
+ }
+
+ return unorm2_isNormalized(norm, uinput, uinput_len, err);
+@@ -226,7 +226,7 @@ PHP_FUNCTION( normalizer_is_normalized )
+ int uinput_len = 0;
+ UErrorCode status = U_ZERO_ERROR;
+
+- UBool uret = FALSE;
++ UBool uret = false;
+
+ intl_error_reset( NULL );
+
+--- timezone/timezone_class.cpp.orig 2020-10-13 21:58:13 UTC
++++ timezone/timezone_class.cpp
+@@ -327,7 +327,7 @@ static HashTable *TimeZone_get_debug_info(zend_object
+
+ int32_t rawOffset, dstOffset;
+ UDate now = Calendar::getNow();
+- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
++ tz->getOffset(now, false, rawOffset, dstOffset, uec);
+ if (U_FAILURE(uec)) {
+ return debug_info;
+ }
+--- timezone/timezone_methods.cpp.orig 2020-10-13 21:58:13 UTC
++++ timezone/timezone_methods.cpp
+@@ -89,7 +89,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)
+ RETURN_NULL();
+ }
+
+- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
++ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL,
+ "intltz_from_date_time_zone");
+ if (tz == NULL) {
+ RETURN_NULL();
diff --git a/devel/py-pyicu/Makefile b/devel/py-pyicu/Makefile
index 3b246f4caee3..5f9614fe346b 100644
--- a/devel/py-pyicu/Makefile
+++ b/devel/py-pyicu/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pyicu
PORTVERSION= 2.4.3
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-pyicu/files/patch-icu68 b/devel/py-pyicu/files/patch-icu68
new file mode 100644
index 000000000000..d49d4a776b94
--- /dev/null
+++ b/devel/py-pyicu/files/patch-icu68
@@ -0,0 +1,97 @@
+Regressed by https://github.com/unicode-org/icu/commit/0101e2632c34
+Fixed by https://github.com/ovalhub/pyicu/commit/b42d6a754729
+
+measureunit.cpp:466:5: error: unknown type name 'NoUnit'
+ NoUnit *object;
+ ^
+measureunit.cpp:480:45: error: unexpected namespace name 'NoUnit': expected expression
+DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, NoUnit,
+ ^
+measureunit.cpp:480:1: error: use of undeclared identifier 'object'
+DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, NoUnit,
+^
+./macros.h:199:33: note: expanded from macro 'DECLARE_TYPE'
+PyObject *wrap_##name(icuClass *object, int flags) \
+ ^
+measureunit.cpp:480:1: error: expected '(' for function-style cast or type construction
+DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, NoUnit,
+^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+./macros.h:199:45: note: expanded from macro 'DECLARE_TYPE'
+PyObject *wrap_##name(icuClass *object, int flags) \
+ ~~~ ^
+measureunit.cpp:480:1: error: expected ';' after top level declarator
+./macros.h:199:75: note: expanded from macro 'DECLARE_TYPE'
+PyObject *wrap_##name(icuClass *object, int flags) \
+ ^
+measureunit.cpp:956:23: error: unexpected namespace name 'NoUnit': expected expression
+ return wrap_NoUnit((NoUnit *) NoUnit::base().clone(), T_OWNED);
+ ^
+measureunit.cpp:956:31: error: expected expression
+ return wrap_NoUnit((NoUnit *) NoUnit::base().clone(), T_OWNED);
+ ^
+measureunit.cpp:961:25: error: unexpected namespace name 'NoUnit': expected expression
+ return wrap_NoUnit((NoUnit *) NoUnit::percent().clone(), T_OWNED);
+ ^
+measureunit.cpp:961:33: error: expected expression
+ return wrap_NoUnit((NoUnit *) NoUnit::percent().clone(), T_OWNED);
+ ^
+measureunit.cpp:966:25: error: unexpected namespace name 'NoUnit': expected expression
+ return wrap_NoUnit((NoUnit *) NoUnit::permille().clone(), T_OWNED);
+ ^
+measureunit.cpp:966:33: error: expected expression
+ return wrap_NoUnit((NoUnit *) NoUnit::permille().clone(), T_OWNED);
+ ^
+measureunit.cpp:1193:19: error: unexpected namespace name 'NoUnit': expected expression
+ REGISTER_TYPE(NoUnit, m);
+ ^
+
+--- measureunit.cpp.orig 2019-10-03 17:11:03 UTC
++++ measureunit.cpp
+@@ -463,7 +463,7 @@ DECLARE_TYPE(Measure, t_measure, UObject, Measure, abs
+
+ class t_nounit : public _wrapper {
+ public:
+- NoUnit *object;
++ MeasureUnit *object;
+ };
+
+ static PyObject *t_nounit_base(PyTypeObject *type);
+@@ -477,7 +477,7 @@ static PyMethodDef t_nounit_methods[] = {
+ { NULL, NULL, 0, NULL }
+ };
+
+-DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, NoUnit,
++DECLARE_TYPE(NoUnit, t_nounit, MeasureUnit, MeasureUnit,
+ abstract_init, NULL);
+
+ #endif
+@@ -953,17 +953,17 @@ DEFINE_RICHCMP(Measure, t_measure);
+
+ static PyObject *t_nounit_base(PyTypeObject *type)
+ {
+- return wrap_NoUnit((NoUnit *) NoUnit::base().clone(), T_OWNED);
++ return wrap_NoUnit((MeasureUnit *) NoUnit::base().clone(), T_OWNED);
+ }
+
+ static PyObject *t_nounit_percent(PyTypeObject *type)
+ {
+- return wrap_NoUnit((NoUnit *) NoUnit::percent().clone(), T_OWNED);
++ return wrap_NoUnit((MeasureUnit *) NoUnit::percent().clone(), T_OWNED);
+ }
+
+ static PyObject *t_nounit_permille(PyTypeObject *type)
+ {
+- return wrap_NoUnit((NoUnit *) NoUnit::permille().clone(), T_OWNED);
++ return wrap_NoUnit((MeasureUnit *) NoUnit::permille().clone(), T_OWNED);
+ }
+
+ #endif
+@@ -1190,7 +1190,7 @@ void _init_measureunit(PyObject *m)
+ INSTALL_TYPE(MeasureUnit, m);
+ INSTALL_TYPE(Measure, m);
+ #if U_ICU_VERSION_HEX >= VERSION_HEX(60, 0, 0)
+- REGISTER_TYPE(NoUnit, m);
++ INSTALL_STRUCT(NoUnit, m);
+ #endif
+ REGISTER_TYPE(CurrencyUnit, m);
+ REGISTER_TYPE(CurrencyAmount, m);
diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile
index e6f64561a4ab..75145e901207 100644
--- a/devel/qt5-core/Makefile
+++ b/devel/qt5-core/Makefile
@@ -2,7 +2,7 @@
PORTNAME= core
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
PKGNAMEPREFIX= qt5-
diff --git a/devel/ticcutils/Makefile b/devel/ticcutils/Makefile
index 9e06b883ebab..c751ad9963a6 100644
--- a/devel/ticcutils/Makefile
+++ b/devel/ticcutils/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ticcutils
DISTVERSIONPREFIX= v
DISTVERSION= 0.20
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel textproc
MAINTAINER= yuri@FreeBSD.org
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-30 09:21:04 +0000