aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2020-11-03 00:56:26 +0000
committerJan Beich <jbeich@FreeBSD.org>2020-11-03 00:56:26 +0000
commit6d5d6429d5880f9fdf4b4b54c0fb53e44b3927f9 (patch)
treedb7a5d68a7b148f62f63c9562391af1272e3f376
parent91d87ad6cea9c90bdf179910d1ab72b833a67768 (diff)
downloadports-6d5d6429d5880f9fdf4b4b54c0fb53e44b3927f9.tar.gz
ports-6d5d6429d5880f9fdf4b4b54c0fb53e44b3927f9.zip
devel/icu: update to 68.1
Notes
Notes: svn path=/head/; revision=553940
-rw-r--r--archivers/unarchiver/Makefile2
-rw-r--r--audio/musicpd/Makefile1
-rw-r--r--audio/ncmpcpp/Makefile2
-rw-r--r--databases/couchdb2/Makefile2
-rw-r--r--databases/couchdb3/Makefile1
-rw-r--r--databases/evolution-data-server/Makefile1
-rw-r--r--databases/firebird25-server/Makefile2
-rw-r--r--databases/kbibtex/Makefile2
-rw-r--r--databases/kdb/Makefile2
-rw-r--r--databases/mysql80-client/Makefile2
-rw-r--r--databases/mysql80-server/Makefile2
-rw-r--r--databases/mysql80-server/files/patch-icu6817
-rw-r--r--databases/postgresql10-server/Makefile2
-rw-r--r--databases/postgresql10-server/files/patch-icu68254
-rw-r--r--databases/postgresql11-server/Makefile2
-rw-r--r--databases/postgresql11-server/files/patch-icu6817
-rw-r--r--databases/postgresql12-server/Makefile2
-rw-r--r--databases/postgresql12-server/files/patch-icu6817
-rw-r--r--databases/postgresql13-server/Makefile2
-rw-r--r--databases/postgresql13-server/files/patch-icu6817
-rw-r--r--databases/postgresql96-server/Makefile2
-rw-r--r--databases/postgresql96-server/files/patch-icu68278
-rw-r--r--databases/sqlite3/Makefile1
-rw-r--r--databases/tarantool/Makefile1
-rw-r--r--deskutils/calibre/Makefile2
-rw-r--r--deskutils/calibre/files/patch-icu6897
-rw-r--r--deskutils/osmo/Makefile2
-rw-r--r--deskutils/peaclock/Makefile1
-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
-rw-r--r--dns/libpsl/Makefile1
-rw-r--r--editors/libreoffice/Makefile2
-rw-r--r--editors/libreoffice/files/patch-icu6817
-rw-r--r--editors/libreoffice6/Makefile2
-rw-r--r--editors/libreoffice6/files/patch-icu6831
-rw-r--r--editors/poedit/Makefile2
-rw-r--r--finance/gnucash/Makefile1
-rw-r--r--games/0ad/Makefile2
-rw-r--r--games/0ad/files/patch-icu6817
-rw-r--r--games/an/Makefile2
-rw-r--r--games/easyrpg-player/Makefile1
-rw-r--r--games/liblcf/Makefile1
-rw-r--r--games/openrct2/Makefile1
-rw-r--r--games/openttd/Makefile1
-rw-r--r--games/openttd/files/patch-icu6817
-rw-r--r--games/widelands/Makefile1
-rw-r--r--graphics/dcmtk/Makefile2
-rw-r--r--graphics/imv/Makefile2
-rw-r--r--graphics/libcdr01/Makefile1
-rw-r--r--graphics/libcdr01/files/patch-icu6817
-rw-r--r--graphics/libfreehand/Makefile2
-rw-r--r--graphics/libzmf/Makefile2
-rw-r--r--graphics/maim/Makefile2
-rw-r--r--graphics/openfx-arena/Makefile2
-rw-r--r--graphics/osg/Makefile2
-rw-r--r--graphics/tesseract/Makefile2
-rw-r--r--irc/znc-push/Makefile1
-rw-r--r--irc/znc/Makefile1
-rw-r--r--java/openjfx14/Makefile1
-rw-r--r--java/openjfx14/files/patch-icu68167
-rw-r--r--java/openjfx8-devel/Makefile2
-rw-r--r--lang/gnustep-base/Makefile2
-rw-r--r--lang/gnustep-base/files/patch-icu68185
-rw-r--r--lang/hermes/Makefile1
-rw-r--r--lang/parrot/Makefile2
-rw-r--r--lang/spidermonkey52/Makefile2
-rw-r--r--lang/spidermonkey60/Makefile2
-rw-r--r--lang/spidermonkey78/Makefile2
-rw-r--r--mail/cyrus-imapd30/Makefile1
-rw-r--r--mail/cyrus-imapd32/Makefile1
-rw-r--r--mail/dovecot-fts-xapian/Makefile1
-rw-r--r--mail/dovecot/Makefile1
-rw-r--r--mail/evolution-ews/Makefile1
-rw-r--r--mail/evolution/Makefile2
-rw-r--r--mail/exim/Makefile2
-rw-r--r--mail/libvmime/Makefile2
-rw-r--r--mail/postfix-current/Makefile2
-rw-r--r--mail/postfix/Makefile2
-rw-r--r--mail/rspamd-devel/Makefile1
-rw-r--r--mail/rspamd/Makefile1
-rw-r--r--mail/sendmail-devel/Makefile1
-rw-r--r--mail/sendmail/Makefile2
-rw-r--r--mail/thunderbird/Makefile1
-rw-r--r--math/R/Makefile1
-rw-r--r--math/libqalculate/Makefile1
-rw-r--r--math/py-rpy2/Makefile1
-rw-r--r--math/sage/Makefile1
-rw-r--r--misc/sword/Makefile2
-rw-r--r--misc/xiphos/Makefile1
-rw-r--r--multimedia/aegisub/Makefile2
-rw-r--r--multimedia/subtitlecomposer/Makefile2
-rw-r--r--net-im/dino/Makefile1
-rw-r--r--net/freerdp/Makefile2
-rw-r--r--net/openldap24-server/Makefile2
-rw-r--r--net/samba412/Makefile2
-rw-r--r--net/samba413/Makefile2
-rw-r--r--net/yaz/Makefile1
-rw-r--r--net/zebra-server/Makefile2
-rw-r--r--news/tin/Makefile2
-rw-r--r--print/harfbuzz-icu/Makefile2
-rw-r--r--print/libmspub01/Makefile2
-rw-r--r--print/scribus-devel/Makefile2
-rw-r--r--print/tex-xetex/Makefile2
-rw-r--r--print/texlive-base/Makefile2
-rw-r--r--science/py-tensorflow/Makefile2
-rw-r--r--security/certificate-transparency/Makefile2
-rw-r--r--sysutils/gdisk/Makefile2
-rw-r--r--sysutils/ltfs/Makefile2
-rw-r--r--sysutils/ltfs/files/patch-icu6817
-rw-r--r--sysutils/osquery/Makefile2
-rw-r--r--sysutils/tracker-miners/Makefile2
-rw-r--r--sysutils/tracker/Makefile1
-rw-r--r--textproc/R-cran-stringi/Makefile1
-rw-r--r--textproc/dwdiff/Makefile1
-rw-r--r--textproc/dwdiff/files/patch-icu6826
-rw-r--r--textproc/gitlab-elasticsearch-indexer/Makefile2
-rw-r--r--textproc/hs-pandoc-citeproc/Makefile2
-rw-r--r--textproc/hs-pandoc-citeproc/files/extra-patch-icu6821
-rw-r--r--textproc/libe-book/Makefile2
-rw-r--r--textproc/libe-book/files/patch-icu6820
-rw-r--r--textproc/libfolia/Makefile2
-rw-r--r--textproc/libqxp/Makefile2
-rw-r--r--textproc/libvisio01/Makefile2
-rw-r--r--textproc/nuspell/Makefile1
-rw-r--r--textproc/raptor2/Makefile2
-rw-r--r--textproc/rubygem-charlock_holmes/Makefile2
-rw-r--r--textproc/ucto/Makefile2
-rw-r--r--textproc/xalan-c/Makefile1
-rw-r--r--textproc/zorba/Makefile2
-rw-r--r--textproc/zorba/files/patch-icu6867
-rw-r--r--www/chromium/Makefile2
-rw-r--r--www/cliqz/Makefile2
-rw-r--r--www/epiphany/Makefile2
-rw-r--r--www/firefox-esr/Makefile1
-rw-r--r--www/firefox/Makefile1
-rw-r--r--www/iridium/Makefile1
-rw-r--r--www/node/Makefile1
-rw-r--r--www/node10/Makefile1
-rw-r--r--www/node10/files/patch-icu68109
-rw-r--r--www/node12/Makefile1
-rw-r--r--www/node14/Makefile1
-rw-r--r--www/qt5-webkit/Makefile2
-rw-r--r--www/qt5-webkit/files/patch-icu68170
-rw-r--r--www/webkit2-gtk3/Makefile1
-rw-r--r--www/webkit2-gtk3/files/patch-icu68173
-rw-r--r--x11-toolkits/gnustep-gui/Makefile2
-rw-r--r--x11-toolkits/gnustep-gui/files/patch-icu6829
-rw-r--r--x11-toolkits/tepl/Makefile1
-rw-r--r--x11-toolkits/vte3/Makefile1
-rw-r--r--x11/gnome-shell/Makefile2
-rw-r--r--x11/slop/Makefile2
174 files changed, 2955 insertions, 86 deletions
diff --git a/archivers/unarchiver/Makefile b/archivers/unarchiver/Makefile
index 790e41fe6cc7..e3b1a2d2096d 100644
--- a/archivers/unarchiver/Makefile
+++ b/archivers/unarchiver/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unar
PORTVERSION= 1.10.1
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= archivers gnustep
MASTER_SITES= http://wakaba.c3.cx/releases/TheUnarchiver/
DISTNAME= ${PORTNAME}${PORTVERSION}_src
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index cafc34bfa9fd..7aef433d0ffa 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -2,6 +2,7 @@
PORTNAME= musicpd
PORTVERSION= 0.22.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
DISTNAME= mpd-${PORTVERSION}
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index 7ca5742065d3..1f844647fa1c 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ncmpcpp
DISTVERSION= 0.8.2
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= audio
MASTER_SITES= https://ncmpcpp.rybczak.net/stable/
diff --git a/databases/couchdb2/Makefile b/databases/couchdb2/Makefile
index e62e2c28c711..72a1349d978a 100644
--- a/databases/couchdb2/Makefile
+++ b/databases/couchdb2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= couchdb2
DISTVERSION= 2.3.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= databases
MASTER_SITES= APACHE/couchdb/source/${DISTVERSION}
DISTNAME= apache-couchdb-${DISTVERSION}
diff --git a/databases/couchdb3/Makefile b/databases/couchdb3/Makefile
index 254dfe1805c7..cdd7b41e45a6 100644
--- a/databases/couchdb3/Makefile
+++ b/databases/couchdb3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= couchdb3
PORTREVISION= 1
DISTVERSION= 3.1.1
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= APACHE/couchdb/source/${DISTVERSION}
DISTNAME= apache-couchdb-${DISTVERSION}
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index caa49277d029..a8679c9ec562 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,6 +3,7 @@
PORTNAME= evolution-data-server
PORTVERSION= 3.38.1
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile
index 90d17baccee6..522259bc97a5 100644
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@@ -2,7 +2,7 @@
PORTNAME= firebird
PORTVERSION= 2.5.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES?= databases
MASTER_SITES= https://github.com/FirebirdSQL/${PORTNAME}/releases/download/R2_5_8/
PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index cf6cbc05ef5b..8c899d19b821 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kbibtex
DISTVERSION= 0.9.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= databases kde
MASTER_SITES= KDE/stable/KBibTeX/${DISTVERSION}
diff --git a/databases/kdb/Makefile b/databases/kdb/Makefile
index b72bab22f6fe..fd6046c30d3c 100644
--- a/databases/kdb/Makefile
+++ b/databases/kdb/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kdb
DISTVERSION= 3.2.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= databases kde
MASTER_SITES= KDE/stable/${PORTNAME}/src
DIST_SUBDIR= KDE/${PORTNAME}
diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile
index d93737fc9ebc..8ba57f8c5f2e 100644
--- a/databases/mysql80-client/Makefile
+++ b/databases/mysql80-client/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mysql
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= 80-client
COMMENT= Multithreaded SQL database (client)
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index 382ae8751f70..ef14dd816d74 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= mysql
PORTVERSION= 8.0.22
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES= MYSQL/MySQL-8.0
PKGNAMESUFFIX?= 80-server
diff --git a/databases/mysql80-server/files/patch-icu68 b/databases/mysql80-server/files/patch-icu68
new file mode 100644
index 000000000000..89f0f9b4a54b
--- /dev/null
+++ b/databases/mysql80-server/files/patch-icu68
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+sql/mysqld.cc:6915:30: error: use of undeclared identifier 'TRUE'
+ my_getopt_skip_unknown = TRUE;
+ ^
+
+--- sql/mysqld.cc.orig 2020-06-16 16:31:03 UTC
++++ sql/mysqld.cc
+@@ -6910,7 +6912,7 @@ int mysqld_main(int argc, char **argv)
+ if (opt_keyring_migration_source || opt_keyring_migration_destination ||
+ migrate_connect_options) {
+ Migrate_keyring mk;
+- my_getopt_skip_unknown = TRUE;
++ my_getopt_skip_unknown = true;
+ if (mk.init(remaining_argc, remaining_argv, opt_keyring_migration_source,
+ opt_keyring_migration_destination, opt_keyring_migration_user,
+ opt_keyring_migration_host, opt_keyring_migration_password,
diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile
index 1e73c56cab5e..8fe46510cf38 100644
--- a/databases/postgresql10-server/Makefile
+++ b/databases/postgresql10-server/Makefile
@@ -4,7 +4,7 @@
DISTVERSION?= 10.14
# PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
# not their own. Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?= 0
+PORTREVISION?= 1
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql10-server/files/patch-icu68 b/databases/postgresql10-server/files/patch-icu68
new file mode 100644
index 000000000000..bceb715029ff
--- /dev/null
+++ b/databases/postgresql10-server/files/patch-icu68
@@ -0,0 +1,254 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+pg_collation.c:47:1: error: conflicting types for 'CollationCreate'
+CollationCreate(const char *collname, Oid collnamespace,
+^
+../../../src/include/catalog/pg_collation_fn.h:17:12: note: previous declaration is here
+extern Oid CollationCreate(const char *collname, Oid collnamespace,
+ ^
+collationcmds.c:52:1: error: conflicting types for 'DefineCollation'
+DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_exists)
+^
+../../../src/include/commands/collationcmds.h:21:22: note: previous declaration is here
+extern ObjectAddress DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_exists);
+ ^
+dbcommands.c:780:1: error: conflicting types for 'dropdb'
+dropdb(const char *dbname, bool missing_ok)
+^
+../../../src/include/commands/dbcommands.h:23:13: note: previous declaration is here
+extern void dropdb(const char *dbname, bool missing_ok);
+ ^
+dbcommands.c:1397:1: error: conflicting types for 'AlterDatabase'
+AlterDatabase(ParseState *pstate, AlterDatabaseStmt *stmt, bool isTopLevel)
+^
+../../../src/include/commands/dbcommands.h:25:12: note: previous declaration is here
+extern Oid AlterDatabase(ParseState *pstate, AlterDatabaseStmt *stmt, bool isTopLevel);
+ ^
+dbcommands.c:2009:1: error: conflicting types for 'get_database_oid'
+get_database_oid(const char *dbname, bool missing_ok)
+^
+../../../src/include/commands/dbcommands.h:29:12: note: previous declaration is here
+extern Oid get_database_oid(const char *dbname, bool missingok);
+ ^
+indxpath.c:3003:1: error: conflicting types for 'relation_has_unique_index_for'
+relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel,
+^
+../../../../src/include/optimizer/paths.h:71:13: note: previous declaration is here
+extern bool relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel,
+ ^
+indxpath.c:3174:1: error: conflicting types for 'indexcol_is_bool_constant_for_query'
+indexcol_is_bool_constant_for_query(IndexOptInfo *index, int indexcol)
+^
+../../../../src/include/optimizer/paths.h:74:13: note: previous declaration is here
+extern bool indexcol_is_bool_constant_for_query(IndexOptInfo *index,
+ ^
+indxpath.c:3223:1: error: conflicting types for 'match_index_to_operand'
+match_index_to_operand(Node *operand,
+^
+../../../../src/include/optimizer/paths.h:76:13: note: previous declaration is here
+extern bool match_index_to_operand(Node *operand, int indexcol,
+ ^
+indxpath.c:3867:1: error: conflicting types for 'adjust_rowcompare_for_index'
+adjust_rowcompare_for_index(RowCompareExpr *clause,
+^
+../../../../src/include/optimizer/paths.h:82:14: note: previous declaration is here
+extern Expr *adjust_rowcompare_for_index(RowCompareExpr *clause,
+ ^
+regis.c:31:1: error: conflicting types for 'RS_isRegis'
+RS_isRegis(const char *str)
+^
+../../../src/include/tsearch/dicts/regis.h:41:7: note: previous declaration is here
+bool RS_isRegis(const char *str);
+ ^
+regis.c:85:1: error: conflicting types for 'RS_compile'
+RS_compile(Regis *r, bool issuffix, const char *str)
+^
+../../../src/include/tsearch/dicts/regis.h:43:7: note: previous declaration is here
+void RS_compile(Regis *r, bool issuffix, const char *str);
+ ^
+regis.c:218:1: error: conflicting types for 'RS_execute'
+RS_execute(Regis *r, char *str)
+^
+../../../src/include/tsearch/dicts/regis.h:47:7: note: previous declaration is here
+bool RS_execute(Regis *r, char *str);
+ ^
+guc.c:433:7: error: redefinition of 'log_duration' with a different type: 'bool' vs 'bool' (aka 'char')
+bool log_duration = false;
+ ^
+../../../../src/include/utils/guc.h:233:13: note: previous declaration is here
+extern bool log_duration;
+ ^
+guc.c:434:7: error: redefinition of 'Debug_print_plan' with a different type: 'bool' vs 'bool' (aka 'char')
+bool Debug_print_plan = false;
+ ^
+../../../../src/include/utils/guc.h:234:13: note: previous declaration is here
+extern bool Debug_print_plan;
+ ^
+guc.c:435:7: error: redefinition of 'Debug_print_parse' with a different type: 'bool' vs 'bool' (aka 'char')
+bool Debug_print_parse = false;
+ ^
+../../../../src/include/utils/guc.h:235:13: note: previous declaration is here
+extern bool Debug_print_parse;
+ ^
+guc.c:436:7: error: redefinition of 'Debug_print_rewritten' with a different type: 'bool' vs 'bool' (aka 'char')
+bool Debug_print_rewritten = false;
+ ^
+../../../../src/include/utils/guc.h:236:13: note: previous declaration is here
+extern bool Debug_print_rewritten;
+ ^
+guc.c:437:7: error: redefinition of 'Debug_pretty_print' with a different type: 'bool' vs 'bool' (aka 'char')
+bool Debug_pretty_print = true;
+ ^
+../../../../src/include/utils/guc.h:237:13: note: previous declaration is here
+extern bool Debug_pretty_print;
+ ^
+guc.c:439:7: error: redefinition of 'log_parser_stats' with a different type: 'bool' vs 'bool' (aka 'char')
+bool log_parser_stats = false;
+ ^
+../../../../src/include/utils/guc.h:239:13: note: previous declaration is here
+extern bool log_parser_stats;
+ ^
+guc.c:440:7: error: redefinition of 'log_planner_stats' with a different type: 'bool' vs 'bool' (aka 'char')
+bool log_planner_stats = false;
+ ^
+../../../../src/include/utils/guc.h:240:13: note: previous declaration is here
+extern bool log_planner_stats;
+ ^
+guc.c:441:7: error: redefinition of 'log_executor_stats' with a different type: 'bool' vs 'bool' (aka 'char')
+bool log_executor_stats = false;
+ ^
+../../../../src/include/utils/guc.h:241:13: note: previous declaration is here
+extern bool log_executor_stats;
+ ^
+guc.c:442:7: error: redefinition of 'log_statement_stats' with a different type: 'bool' vs 'bool' (aka 'char')
+bool log_statement_stats = false; /* this is sort of all three above
+ ^
+../../../../src/include/utils/guc.h:242:13: note: previous declaration is here
+extern bool log_statement_stats;
+ ^
+guc.c:444:7: error: redefinition of 'log_btree_build_stats' with a different type: 'bool' vs 'bool' (aka 'char')
+bool log_btree_build_stats = false;
+ ^
+../../../../src/include/utils/guc.h:243:13: note: previous declaration is here
+extern bool log_btree_build_stats;
+ ^
+guc.c:448:7: error: redefinition of 'check_function_bodies' with a different type: 'bool' vs 'bool' (aka 'char')
+bool check_function_bodies = true;
+ ^
+../../../../src/include/utils/guc.h:245:25: note: previous declaration is here
+extern PGDLLIMPORT bool check_function_bodies;
+ ^
+guc.c:449:7: error: redefinition of 'default_with_oids' with a different type: 'bool' vs 'bool' (aka 'char')
+bool default_with_oids = false;
+ ^
+../../../../src/include/utils/guc.h:246:13: note: previous declaration is here
+extern bool default_with_oids;
+ ^
+guc.c:450:7: error: redefinition of 'session_auth_is_superuser' with a different type: 'bool' vs 'bool' (aka 'char')
+bool session_auth_is_superuser;
+ ^
+../../../../src/include/utils/guc.h:247:13: note: previous declaration is here
+extern bool session_auth_is_superuser;
+ ^
+guc.c:4707:1: error: conflicting types for 'SelectConfigFiles'
+SelectConfigFiles(const char *userDoption, const char *progname)
+^
+../../../../src/include/utils/guc.h:354:13: note: previous declaration is here
+extern bool SelectConfigFiles(const char *userDoption, const char *progname);
+ ^
+guc.c:5097:1: error: conflicting types for 'AtEOXact_GUC'
+AtEOXact_GUC(bool isCommit, int nestLevel)
+^
+../../../../src/include/utils/guc.h:358:13: note: previous declaration is here
+extern void AtEOXact_GUC(bool isCommit, int nestLevel);
+ ^
+guc.c:5515:1: error: conflicting types for 'parse_int'
+parse_int(const char *value, int *result, int flags, const char **hintmsg)
+^
+../../../../src/include/utils/guc.h:361:13: note: previous declaration is here
+extern bool parse_int(const char *value, int *result, int flags,
+ ^
+guc.c:5601:1: error: conflicting types for 'parse_real'
+parse_real(const char *value, double *result)
+^
+../../../../src/include/utils/guc.h:363:13: note: previous declaration is here
+extern bool parse_real(const char *value, double *result);
+ ^
+guc.c:5662:1: error: conflicting types for 'config_enum_lookup_by_name'
+config_enum_lookup_by_name(struct config_enum *record, const char *value,
+^
+../../../../src/include/utils/guc_tables.h:265:13: note: previous declaration is here
+extern bool config_enum_lookup_by_name(struct config_enum *record,
+ ^
+guc.c:5930:1: error: conflicting types for 'set_config_option'
+set_config_option(const char *name, const char *value,
+^
+../../../../src/include/utils/guc.h:364:12: note: previous declaration is here
+extern int set_config_option(const char *name, const char *value,
+ ^
+fatal error: too many errors emitted, stopping now [-ferror-limit=]
+
+--- src/backend/catalog/pg_collation.c.orig 2020-08-10 21:19:16 UTC
++++ src/backend/catalog/pg_collation.c
+@@ -14,6 +14,8 @@
+ */
+ #include "postgres.h"
+
++#include <stdbool.h>
++
+ #include "access/genam.h"
+ #include "access/heapam.h"
+ #include "access/htup_details.h"
+--- src/backend/commands/collationcmds.c.orig 2020-08-10 21:19:16 UTC
++++ src/backend/commands/collationcmds.c
+@@ -14,6 +14,8 @@
+ */
+ #include "postgres.h"
+
++#include <stdbool.h>
++
+ #include "access/heapam.h"
+ #include "access/htup_details.h"
+ #include "access/xact.h"
+--- src/backend/commands/dbcommands.c.orig 2020-08-10 21:19:16 UTC
++++ src/backend/commands/dbcommands.c
+@@ -19,6 +19,7 @@
+ */
+ #include "postgres.h"
+
++#include <stdbool.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+--- src/backend/optimizer/path/indxpath.c.orig 2020-08-10 21:19:16 UTC
++++ src/backend/optimizer/path/indxpath.c
+@@ -15,6 +15,7 @@
+ */
+ #include "postgres.h"
+
++#include <stdbool.h>
+ #include <math.h>
+
+ #include "access/stratnum.h"
+--- src/backend/tsearch/regis.c.orig 2020-08-10 21:19:16 UTC
++++ src/backend/tsearch/regis.c
+@@ -14,6 +14,8 @@
+
+ #include "postgres.h"
+
++#include <stdbool.h>
++
+ #include "tsearch/dicts/regis.h"
+ #include "tsearch/ts_locale.h"
+
+--- src/backend/utils/misc/guc.c.orig 2020-08-10 21:19:16 UTC
++++ src/backend/utils/misc/guc.c
+@@ -16,6 +16,8 @@
+ */
+ #include "postgres.h"
+
++#include <stdbool.h>
++
+ #include <ctype.h>
+ #include <float.h>
+ #include <math.h>
diff --git a/databases/postgresql11-server/Makefile b/databases/postgresql11-server/Makefile
index 0fb7a33d506d..d4819b3b8ae3 100644
--- a/databases/postgresql11-server/Makefile
+++ b/databases/postgresql11-server/Makefile
@@ -4,7 +4,7 @@
DISTVERSION?= 11.9
# PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
# not their own. Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?= 1
+PORTREVISION?= 2
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql11-server/files/patch-icu68 b/databases/postgresql11-server/files/patch-icu68
new file mode 100644
index 000000000000..7fc6d8fa98a6
--- /dev/null
+++ b/databases/postgresql11-server/files/patch-icu68
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+collationcmds.c:467:51: error: use of undeclared identifier 'TRUE'
+ uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status);
+ ^
+
+--- src/backend/commands/collationcmds.c.orig 2020-08-10 21:17:40 UTC
++++ src/backend/commands/collationcmds.c
+@@ -444,7 +444,7 @@ get_icu_language_tag(const char *localename)
+ UErrorCode status;
+
+ status = U_ZERO_ERROR;
+- uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status);
++ uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status);
+ if (U_FAILURE(status))
+ ereport(ERROR,
+ (errmsg("could not convert locale name \"%s\" to language tag: %s",
diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile
index 327b8006bef1..cf6f84f33ab6 100644
--- a/databases/postgresql12-server/Makefile
+++ b/databases/postgresql12-server/Makefile
@@ -4,7 +4,7 @@
DISTVERSION?= 12.4
# PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
# not their own. Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?= 1
+PORTREVISION?= 2
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql12-server/files/patch-icu68 b/databases/postgresql12-server/files/patch-icu68
new file mode 100644
index 000000000000..475bdd8fe52a
--- /dev/null
+++ b/databases/postgresql12-server/files/patch-icu68
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+collationcmds.c:467:51: error: use of undeclared identifier 'TRUE'
+ uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status);
+ ^
+
+--- src/backend/commands/collationcmds.c.orig 2020-08-10 21:15:53 UTC
++++ src/backend/commands/collationcmds.c
+@@ -463,7 +463,7 @@ get_icu_language_tag(const char *localename)
+ UErrorCode status;
+
+ status = U_ZERO_ERROR;
+- uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status);
++ uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status);
+ if (U_FAILURE(status))
+ ereport(ERROR,
+ (errmsg("could not convert locale name \"%s\" to language tag: %s",
diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile
index ed33e40bcce0..e72e3e8bf692 100644
--- a/databases/postgresql13-server/Makefile
+++ b/databases/postgresql13-server/Makefile
@@ -5,7 +5,7 @@ PORTNAME?= postgresql
DISTVERSION?= 13.0
# PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
# not their own. Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?= 4
+PORTREVISION?= 5
CATEGORIES?= databases
MASTER_SITES= PGSQL/source/v${DISTVERSION}
PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
diff --git a/databases/postgresql13-server/files/patch-icu68 b/databases/postgresql13-server/files/patch-icu68
new file mode 100644
index 000000000000..54d4cc7dc01f
--- /dev/null
+++ b/databases/postgresql13-server/files/patch-icu68
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+collationcmds.c:467:51: error: use of undeclared identifier 'TRUE'
+ uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status);
+ ^
+
+--- src/backend/commands/collationcmds.c.orig 2020-09-21 20:47:36 UTC
++++ src/backend/commands/collationcmds.c
+@@ -464,7 +464,7 @@ get_icu_language_tag(const char *localename)
+ UErrorCode status;
+
+ status = U_ZERO_ERROR;
+- uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status);
++ uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status);
+ if (U_FAILURE(status))
+ ereport(ERROR,
+ (errmsg("could not convert locale name \"%s\" to language tag: %s",
diff --git a/databases/postgresql96-server/Makefile b/databases/postgresql96-server/Makefile
index 06da0bbbe273..ca43a3353f68 100644
--- a/databases/postgresql96-server/Makefile
+++ b/databases/postgresql96-server/Makefile
@@ -4,7 +4,7 @@
DISTVERSION?= 9.6.19
# PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
# not their own. Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?= 0
+PORTREVISION?= 1
PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql96-server/files/patch-icu68 b/databases/postgresql96-server/files/patch-icu68
new file mode 100644
index 000000000000..90cd386d9480
--- /dev/null
+++ b/databases/postgresql96-server/files/patch-icu68
@@ -0,0 +1,278 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+dbcommands.c:770:1: error: conflicting types for 'dropdb'
+dropdb(const char *dbname, bool missing_ok)
+^
+../../../src/include/commands/dbcommands.h:23:13: note: previous declaration is here
+extern void dropdb(const char *dbname, bool missing_ok);
+ ^
+dbcommands.c:1367:1: error: conflicting types for 'AlterDatabase'
+AlterDatabase(AlterDatabaseStmt *stmt, bool isTopLevel)
+^
+../../../src/include/commands/dbcommands.h:25:12: note: previous declaration is here
+extern Oid AlterDatabase(AlterDatabaseStmt *stmt, bool isTopLevel);
+ ^
+dbcommands.c:1977:1: error: conflicting types for 'get_database_oid'
+get_database_oid(const char *dbname, bool missing_ok)
+^
+../../../src/include/commands/dbcommands.h:29:12: note: previous declaration is here
+extern Oid get_database_oid(const char *dbname, bool missingok);
+ ^
+indxpath.c:2917:1: error: conflicting types for 'relation_has_unique_index_for'
+relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel,
+^
+../../../../src/include/optimizer/paths.h:66:13: note: previous declaration is here
+extern bool relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel,
+ ^
+indxpath.c:3091:1: error: conflicting types for 'match_index_to_operand'
+match_index_to_operand(Node *operand,
+^
+../../../../src/include/optimizer/paths.h:69:13: note: previous declaration is here
+extern bool match_index_to_operand(Node *operand, int indexcol,
+ ^
+indxpath.c:3735:1: error: conflicting types for 'adjust_rowcompare_for_index'
+adjust_rowcompare_for_index(RowCompareExpr *clause,
+^
+../../../../src/include/optimizer/paths.h:75:14: note: previous declaration is here
+extern Expr *adjust_rowcompare_for_index(RowCompareExpr *clause,
+ ^
+regis.c:31:1: error: conflicting types for 'RS_isRegis'
+RS_isRegis(const char *str)
+^
+../../../src/include/tsearch/dicts/regis.h:41:7: note: previous declaration is here
+bool RS_isRegis(const char *str);
+ ^
+regis.c:85:1: error: conflicting types for 'RS_compile'
+RS_compile(Regis *r, bool issuffix, const char *str)
+^
+../../../src/include/tsearch/dicts/regis.h:43:7: note: previous declaration is here
+void RS_compile(Regis *r, bool issuffix, const char *str);
+ ^
+regis.c:218:1: error: conflicting types for 'RS_execute'
+RS_execute(Regis *r, char *str)
+^
+../../../src/include/tsearch/dicts/regis.h:47:7: note: previous declaration is here
+bool RS_execute(Regis *r, char *str);
+ ^
+varlena.c:1845:1: error: conflicting types for 'varstr_sortsupport'
+varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar)
+^
+../../../../src/include/utils/builtins.h:849:13: note: previous declaration is here
+extern void varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar);
+ ^
+varlena.c:3264:1: error: conflicting types for 'SplitIdentifierString'
+SplitIdentifierString(char *rawstring, char separator,
+^
+../../../../src/include/utils/builtins.h:859:13: note: previous declaration is here
+extern bool SplitIdentifierString(char *rawstring, char separator,
+ ^
+varlena.c:3389:1: error: conflicting types for 'SplitDirectoriesString'
+SplitDirectoriesString(char *rawstring, char separator,
+^
+../../../../src/include/utils/builtins.h:861:13: note: previous declaration is here
+extern bool SplitDirectoriesString(char *rawstring, char separator,
+ ^
+varlena.c:3510:1: error: conflicting types for 'SplitGUCList'
+SplitGUCList(char *rawstring, char separator,
+^
+../../../../src/include/utils/builtins.h:863:13: note: previous declaration is here
+extern bool SplitGUCList(char *rawstring, char separator,
+ ^
+varlena.c:4022:1: error: conflicting types for 'replace_text_regexp'
+replace_text_regexp(text *src_text, void *regexp,
+^
+../../../../src/include/utils/builtins.h:866:14: note: previous declaration is here
+extern text *replace_text_regexp(text *src_text, void *regexp,
+ ^
+In file included from varlena.c:5586:
+./levenshtein.c:73:1: error: conflicting types for 'varstr_levenshtein'
+varstr_levenshtein(const char *source, int slen,
+^
+../../../../src/include/utils/builtins.h:850:12: note: previous declaration is here
+extern int varstr_levenshtein(const char *source, int slen,
+ ^
+In file included from varlena.c:5588:
+./levenshtein.c:68:1: error: conflicting types for 'varstr_levenshtein_less_equal'
+varstr_levenshtein_less_equal(const char *source, int slen,
+^
+../../../../src/include/utils/builtins.h:854:12: note: previous declaration is here
+extern int varstr_levenshtein_less_equal(const char *source, int slen,
+ ^
+guc.c:408:7: error: redefinition of 'log_duration' with a different type: 'bool' vs 'bool' (aka 'char')
+bool log_duration = false;
+ ^
+../../../../src/include/utils/guc.h:233:13: note: previous declaration is here
+extern bool log_duration;
+ ^
+guc.c:409:7: error: redefinition of 'Debug_print_plan' with a different type: 'bool' vs 'bool' (aka 'char')
+bool Debug_print_plan = false;
+ ^
+../../../../src/include/utils/guc.h:234:13: note: previous declaration is here
+extern bool Debug_print_plan;
+ ^
+guc.c:410:7: error: redefinition of 'Debug_print_parse' with a different type: 'bool' vs 'bool' (aka 'char')
+bool Debug_print_parse = false;
+ ^
+../../../../src/include/utils/guc.h:235:13: note: previous declaration is here
+extern bool Debug_print_parse;
+ ^
+guc.c:411:7: error: redefinition of 'Debug_print_rewritten' with a different type: 'bool' vs 'bool' (aka 'char')
+bool Debug_print_rewritten = false;
+ ^
+../../../../src/include/utils/guc.h:236:13: note: previous declaration is here
+extern bool Debug_print_rewritten;
+ ^
+guc.c:412:7: error: redefinition of 'Debug_pretty_print' with a different type: 'bool' vs 'bool' (aka 'char')
+bool Debug_pretty_print = true;
+ ^
+../../../../src/include/utils/guc.h:237:13: note: previous declaration is here
+extern bool Debug_pretty_print;
+ ^
+guc.c:414:7: error: redefinition of 'log_parser_stats' with a different type: 'bool' vs 'bool' (aka 'char')
+bool log_parser_stats = false;
+ ^
+../../../../src/include/utils/guc.h:239:13: note: previous declaration is here
+extern bool log_parser_stats;
+ ^
+guc.c:415:7: error: redefinition of 'log_planner_stats' with a different type: 'bool' vs 'bool' (aka 'char')
+bool log_planner_stats = false;
+ ^
+../../../../src/include/utils/guc.h:240:13: note: previous declaration is here
+extern bool log_planner_stats;
+ ^
+guc.c:416:7: error: redefinition of 'log_executor_stats' with a different type: 'bool' vs 'bool' (aka 'char')
+bool log_executor_stats = false;
+ ^
+../../../../src/include/utils/guc.h:241:13: note: previous declaration is here
+extern bool log_executor_stats;
+ ^
+guc.c:417:7: error: redefinition of 'log_statement_stats' with a different type: 'bool' vs 'bool' (aka 'char')
+bool log_statement_stats = false; /* this is sort of all three
+ ^
+../../../../src/include/utils/guc.h:242:13: note: previous declaration is here
+extern bool log_statement_stats;
+ ^
+guc.c:419:7: error: redefinition of 'log_btree_build_stats' with a different type: 'bool' vs 'bool' (aka 'char')
+bool log_btree_build_stats = false;
+ ^
+../../../../src/include/utils/guc.h:243:13: note: previous declaration is here
+extern bool log_btree_build_stats;
+ ^
+guc.c:423:7: error: redefinition of 'check_function_bodies' with a different type: 'bool' vs 'bool' (aka 'char')
+bool check_function_bodies = true;
+ ^
+../../../../src/include/utils/guc.h:245:25: note: previous declaration is here
+extern PGDLLIMPORT bool check_function_bodies;
+ ^
+guc.c:424:7: error: redefinition of 'default_with_oids' with a different type: 'bool' vs 'bool' (aka 'char')
+bool default_with_oids = false;
+ ^
+../../../../src/include/utils/guc.h:246:13: note: previous declaration is here
+extern bool default_with_oids;
+ ^
+guc.c:425:7: error: redefinition of 'SQL_inheritance' with a different type: 'bool' vs 'bool' (aka 'char')
+bool SQL_inheritance = true;
+ ^
+../../../../src/include/utils/guc.h:247:13: note: previous declaration is here
+extern bool SQL_inheritance;
+ ^
+guc.c:428:7: error: redefinition of 'session_auth_is_superuser' with a different type: 'bool' vs 'bool' (aka 'char')
+bool session_auth_is_superuser;
+ ^
+../../../../src/include/utils/guc.h:248:13: note: previous declaration is here
+extern bool session_auth_is_superuser;
+ ^
+guc.c:4599:1: error: conflicting types for 'SelectConfigFiles'
+SelectConfigFiles(const char *userDoption, const char *progname)
+^
+../../../../src/include/utils/guc.h:355:13: note: previous declaration is here
+extern bool SelectConfigFiles(const char *userDoption, const char *progname);
+ ^
+guc.c:4989:1: error: conflicting types for 'AtEOXact_GUC'
+AtEOXact_GUC(bool isCommit, int nestLevel)
+^
+../../../../src/include/utils/guc.h:359:13: note: previous declaration is here
+extern void AtEOXact_GUC(bool isCommit, int nestLevel);
+ ^
+guc.c:5407:1: error: conflicting types for 'parse_int'
+parse_int(const char *value, int *result, int flags, const char **hintmsg)
+^
+../../../../src/include/utils/guc.h:362:13: note: previous declaration is here
+extern bool parse_int(const char *value, int *result, int flags,
+ ^
+guc.c:5493:1: error: conflicting types for 'parse_real'
+parse_real(const char *value, double *result)
+^
+../../../../src/include/utils/guc.h:364:13: note: previous declaration is here
+extern bool parse_real(const char *value, double *result);
+ ^
+guc.c:5554:1: error: conflicting types for 'config_enum_lookup_by_name'
+config_enum_lookup_by_name(struct config_enum * record, const char *value,
+^
+../../../../src/include/utils/guc_tables.h:264:13: note: previous declaration is here
+extern bool config_enum_lookup_by_name(struct config_enum * record,
+ ^
+fatal error: too many errors emitted, stopping now [-ferror-limit=]
+
+--- src/backend/commands/dbcommands.c.orig 2020-08-10 21:21:12 UTC
++++ src/backend/commands/dbcommands.c
+@@ -19,6 +19,7 @@
+ */
+ #include "postgres.h"
+
++#include <stdbool.h>
+ #include <fcntl.h>
+ #include <locale.h>
+ #include <unistd.h>
+--- src/backend/optimizer/path/indxpath.c.orig 2020-08-10 21:21:12 UTC
++++ src/backend/optimizer/path/indxpath.c
+@@ -15,6 +15,7 @@
+ */
+ #include "postgres.h"
+
++#include <stdbool.h>
+ #include <math.h>
+
+ #include "access/stratnum.h"
+--- src/backend/tsearch/regis.c.orig 2020-08-10 21:21:12 UTC
++++ src/backend/tsearch/regis.c
+@@ -14,6 +14,8 @@
+
+ #include "postgres.h"
+
++#include <stdbool.h>
++
+ #include "tsearch/dicts/regis.h"
+ #include "tsearch/ts_locale.h"
+
+--- src/backend/utils/adt/levenshtein.c.orig 2020-08-10 21:21:12 UTC
++++ src/backend/utils/adt/levenshtein.c
+@@ -23,6 +23,8 @@
+ *
+ *-------------------------------------------------------------------------
+ */
++#include <stdbool.h>
++
+ #define MAX_LEVENSHTEIN_STRLEN 255
+
+ /*
+--- src/backend/utils/adt/varlena.c.orig 2020-08-10 21:21:12 UTC
++++ src/backend/utils/adt/varlena.c
+@@ -14,6 +14,7 @@
+ */
+ #include "postgres.h"
+
++#include <stdbool.h>
+ #include <ctype.h>
+ #include <limits.h>
+
+--- src/backend/utils/misc/guc.c.orig 2020-08-10 21:21:12 UTC
++++ src/backend/utils/misc/guc.c
+@@ -16,6 +16,7 @@
+ */
+ #include "postgres.h"
+
++#include <stdbool.h>
+ #include <ctype.h>
+ #include <float.h>
+ #include <math.h>
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index d31b927fd1bf..4f67bbd56b5d 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sqlite3
DISTVERSION= 3.33.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= https://www.sqlite.org/2020/ http://www2.sqlite.org/2020/ http://www3.sqlite.org/2020/
diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index f5f7c99c4b00..e17582592fdd 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -3,6 +3,7 @@
PORTNAME= tarantool
PORTVERSION= 2.4.2
+PORTREVISION= 1
CATEGORIES= databases
MAINTAINER= sunpoet@FreeBSD.org
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 4d71c5e2df52..c6b8cdab284f 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -3,7 +3,7 @@
PORTNAME= calibre
PORTVERSION= 4.23.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils python
MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/
diff --git a/deskutils/calibre/files/patch-icu68 b/deskutils/calibre/files/patch-icu68
new file mode 100644
index 000000000000..0b7d2be8208c
--- /dev/null
+++ b/deskutils/calibre/files/patch-icu68
@@ -0,0 +1,97 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+src/calibre/utils/icu.c:246:29: error: use of undeclared identifier 'TRUE'
+ if (asz == 0) { found = TRUE; goto end; }
+ ^
+src/calibre/utils/icu.c:253:42: error: use of undeclared identifier 'TRUE'
+ if (pos != USEARCH_DONE) found = TRUE;
+ ^
+
+--- src/calibre/utils/icu.c.orig 2020-08-21 01:39:18 UTC
++++ src/calibre/utils/icu.c
+@@ -243,14 +243,14 @@ icu_Collator_contains(icu_Collator *self, PyObject *ar
+
+ a = python_to_icu(a_, &asz);
+ if (a == NULL) goto end;
+- if (asz == 0) { found = TRUE; goto end; }
++ if (asz == 0) { found = true; goto end; }
+ b = python_to_icu(b_, &bsz);
+ if (b == NULL) goto end;
+
+ search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL, &status);
+ if (U_SUCCESS(status)) {
+ pos = usearch_first(search, &status);
+- if (pos != USEARCH_DONE) found = TRUE;
++ if (pos != USEARCH_DONE) found = true;
+ }
+ end:
+ if (search != NULL) usearch_close(search);
+--- src/calibre/utils/matcher.c.orig 2020-08-21 01:39:18 UTC
++++ src/calibre/utils/matcher.c
+@@ -15,9 +15,6 @@
+ #define inline
+ #endif
+
+-typedef unsigned char bool;
+-#define TRUE 1
+-#define FALSE 0
+ #define MAX(x, y) ((x > y) ? x : y)
+ #define nullfree(x) if(x != NULL) free(x); x = NULL;
+
+@@ -240,10 +237,10 @@ static bool create_searches(UStringSearch **searches,
+ U16_FWD_1(needle, i, needle_len);
+ if (pos == i) break;
+ searches[pos] = usearch_openFromCollator(needle + pos, i - pos, haystack, haystack_len, collator, NULL, &status);
+- if (U_FAILURE(status)) { PyErr_SetString(PyExc_ValueError, u_errorName(status)); searches[pos] = NULL; return FALSE; }
++ if (U_FAILURE(status)) { PyErr_SetString(PyExc_ValueError, u_errorName(status)); searches[pos] = NULL; return false; }
+ }
+
+- return TRUE;
++ return true;
+ }
+
+ static void free_searches(UStringSearch **searches, int32_t count) {
+@@ -259,14 +256,14 @@ static bool match(UChar **items, int32_t *item_lengths
+ int32_t i = 0, maxhl = 0;
+ int32_t r = 0, *positions = NULL;
+ MatchInfo *matches = NULL;
+- bool ok = FALSE;
++ bool ok = false;
+ MemoryItem ***memo = NULL;
+ int32_t needle_len = u_strlen(needle);
+ UStringSearch **searches = NULL;
+
+ if (needle_len <= 0 || item_count <= 0) {
+ for (i = 0; i < (int32_t)item_count; i++) match_results[i].score = 0.0;
+- ok = TRUE;
++ ok = true;
+ goto end;
+ }
+
+@@ -289,7 +286,7 @@ static bool match(UChar **items, int32_t *item_lengths
+
+ if (maxhl <= 0) {
+ for (i = 0; i < (int32_t)item_count; i++) match_results[i].score = 0.0;
+- ok = TRUE;
++ ok = true;
+ goto end;
+ }
+
+@@ -308,7 +305,7 @@ static bool match(UChar **items, int32_t *item_lengths
+ convert_positions(positions, final_positions + i * needle_char_len, matches[i].haystack, needle_char_len, needle_len, match_results[i].score);
+ }
+
+- ok = TRUE;
++ ok = true;
+ end:
+ nullfree(positions);
+ nullfree(stack.items);
+@@ -401,7 +398,7 @@ static PyObject *
+ Matcher_calculate_scores(Matcher *self, PyObject *args) {
+ int32_t *final_positions = NULL, *p;
+ Match *matches = NULL;
+- bool ok = FALSE;
++ bool ok = false;
+ uint32_t i = 0, needle_char_len = 0, j = 0;
+ PyObject *items = NULL, *score = NULL, *positions = NULL, *pneedle = NULL;
+ UChar *needle = NULL;
diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile
index 63fa0a9d8088..f5a2114462cd 100644
--- a/deskutils/osmo/Makefile
+++ b/deskutils/osmo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= osmo
PORTVERSION= 0.4.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}-pim/${PORTNAME}-pim/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/peaclock/Makefile b/deskutils/peaclock/Makefile
index 58ff0dda89c0..e5b07c9272dc 100644
--- a/deskutils/peaclock/Makefile
+++ b/deskutils/peaclock/Makefile
@@ -2,6 +2,7 @@
PORTNAME= peaclock
DISTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= deskutils
MAINTAINER= yuri@FreeBSD.org
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
diff --git a/dns/libpsl/Makefile b/dns/libpsl/Makefile
index 50caa0e50819..88610fee03a6 100644
--- a/dns/libpsl/Makefile
+++ b/dns/libpsl/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libpsl
PORTVERSION= 0.21.1
+PORTREVISION= 1
CATEGORIES= dns
MASTER_SITES= https://github.com/rockdaboot/libpsl/releases/download/${PORTVERSION}/
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 25c42ebe0d76..b28c6358fcc1 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
.include "${.CURDIR}/Makefile.common"
diff --git a/editors/libreoffice/files/patch-icu68 b/editors/libreoffice/files/patch-icu68
new file mode 100644
index 000000000000..e1e068c1eb9a
--- /dev/null
+++ b/editors/libreoffice/files/patch-icu68
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+i18npool/source/calendar/calendar_gregorian.cxx:350:40: error: use of undeclared identifier 'TRUE'
+ body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
+ ^
+
+--- i18npool/source/calendar/calendar_gregorian.cxx.orig 2020-09-30 15:54:35 UTC
++++ i18npool/source/calendar/calendar_gregorian.cxx
+@@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDa
+ "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR);
+ int32_t nZoneOffset, nDSTOffset;
+ UErrorCode status = U_ZERO_ERROR;
+- body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
++ body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status );
+ if ( !U_SUCCESS(status) ) throw ERROR;
+ status = U_ZERO_ERROR;
+ body->setTime( fR - (nZoneOffset + nDSTOffset), status );
diff --git a/editors/libreoffice6/Makefile b/editors/libreoffice6/Makefile
index 5bdef7e22e60..ec47374ec8db 100644
--- a/editors/libreoffice6/Makefile
+++ b/editors/libreoffice6/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
.include "${.CURDIR}/Makefile.common"
diff --git a/editors/libreoffice6/files/patch-icu68 b/editors/libreoffice6/files/patch-icu68
new file mode 100644
index 000000000000..59edaffaefc5
--- /dev/null
+++ b/editors/libreoffice6/files/patch-icu68
@@ -0,0 +1,31 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+i18npool/source/calendar/calendar_gregorian.cxx:350:40: error: use of undeclared identifier 'TRUE'
+ body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
+ ^
+svx/source/dialog/fntctrl.cxx:1017:24: error: use of undeclared identifier 'TRUE'
+ bTransparent = TRUE;
+ ^
+
+--- i18npool/source/calendar/calendar_gregorian.cxx.orig 2020-09-30 15:54:35 UTC
++++ i18npool/source/calendar/calendar_gregorian.cxx
+@@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDa
+ "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR);
+ int32_t nZoneOffset, nDSTOffset;
+ UErrorCode status = U_ZERO_ERROR;
+- body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status );
++ body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status );
+ if ( !U_SUCCESS(status) ) throw ERROR;
+ status = U_ZERO_ERROR;
+ body->setTime( fR - (nZoneOffset + nDSTOffset), status );
+--- svx/source/dialog/fntctrl.cxx.orig 2020-10-07 12:23:42 UTC
++++ svx/source/dialog/fntctrl.cxx
+@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSe
+ rCTLFont.SetFillColor( rColor );
+ }
+ else
+- bTransparent = TRUE;
++ bTransparent = true;
+
+ rFont.SetTransparent( bTransparent );
+ rCJKFont.SetTransparent( bTransparent );
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 817c39255b94..af2936308fe3 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -4,7 +4,7 @@
PORTNAME= poedit
PORTVERSION= 1.8.4
-PORTREVISION= 32
+PORTREVISION= 33
CATEGORIES= editors
MASTER_SITES= https://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 831153b0b981..50a87f9a7f6e 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gnucash
PORTVERSION= 4.2
+PORTREVISION= 1
CATEGORIES= finance gnome
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
diff --git a/games/0ad/Makefile b/games/0ad/Makefile
index 58cb16cf9446..fd1ae3e6da87 100644
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@@ -2,7 +2,7 @@
PORTNAME= 0ad
PORTVERSION= 0.0.23b
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games
MASTER_SITES= http://releases.wildfiregames.com/ \
SF/zero-ad/releases
diff --git a/games/0ad/files/patch-icu68 b/games/0ad/files/patch-icu68
new file mode 100644
index 000000000000..5e9199d89535
--- /dev/null
+++ b/games/0ad/files/patch-icu68
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+../../../source/i18n/L10n.cpp:208:82: error: use of undeclared identifier 'TRUE'
+ currentLocaleIsOriginalGameLocale = (currentLocale == icu::Locale::getUS()) == TRUE;
+ ^
+
+--- source/i18n/L10n.cpp.orig 2018-04-10 18:13:32 UTC
++++ source/i18n/L10n.cpp
+@@ -205,7 +205,7 @@ void L10n::ReevaluateCurrentLocaleAndReload()
+ else
+ {
+ GetDictionaryLocale(locale, currentLocale);
+- currentLocaleIsOriginalGameLocale = (currentLocale == icu::Locale::getUS()) == TRUE;
++ currentLocaleIsOriginalGameLocale = (currentLocale == icu::Locale::getUS()) == true;
+ useLongStrings = false;
+ }
+ LoadDictionaryForCurrentLocale();
diff --git a/games/an/Makefile b/games/an/Makefile
index d83f20dc0415..014d2701a317 100644
--- a/games/an/Makefile
+++ b/games/an/Makefile
@@ -3,7 +3,7 @@
PORTNAME= an
PORTVERSION= 1.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
diff --git a/games/easyrpg-player/Makefile b/games/easyrpg-player/Makefile
index c438b7234090..67c80a1391cb 100644
--- a/games/easyrpg-player/Makefile
+++ b/games/easyrpg-player/Makefile
@@ -3,6 +3,7 @@
PORTNAME= easyrpg-player
PORTVERSION= 0.6.2.3
+PORTREVISION= 1
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/liblcf/Makefile b/games/liblcf/Makefile
index 185cbb82f102..578befa55020 100644
--- a/games/liblcf/Makefile
+++ b/games/liblcf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= liblcf
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/openrct2/Makefile b/games/openrct2/Makefile
index f9fc53b503a5..9562c6a11b9b 100644
--- a/games/openrct2/Makefile
+++ b/games/openrct2/Makefile
@@ -4,6 +4,7 @@
PORTNAME= openrct2
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= games
MAINTAINER= pkubaj@FreeBSD.org
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 03db20a90083..145e976b38e8 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -3,6 +3,7 @@
PORTNAME= openttd
DISTVERSION= 1.10.3
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= https://proxy.binaries.openttd.org/openttd-releases/${DISTVERSION}/
DISTNAME= ${PORTNAME}-${DISTVERSION}-source
diff --git a/games/openttd/files/patch-icu68 b/games/openttd/files/patch-icu68
new file mode 100644
index 000000000000..1c2fa15cf409
--- /dev/null
+++ b/games/openttd/files/patch-icu68
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+src/gfx_layout.cpp:119:9: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+
+--- src/gfx_layout.cpp.orig 2020-08-09 17:56:38 UTC
++++ src/gfx_layout.cpp
+@@ -116,7 +116,7 @@ void Font::getGlyphAdvance(LEGlyphID glyph, LEPoint &a
+
+ le_bool Font::getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const
+ {
+- return FALSE;
++ return false;
+ }
+
+ /**
diff --git a/games/widelands/Makefile b/games/widelands/Makefile
index f1f913af14f8..2e9a6144b2b0 100644
--- a/games/widelands/Makefile
+++ b/games/widelands/Makefile
@@ -3,6 +3,7 @@
PORTNAME= widelands
DISTVERSION= build21
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= https://launchpad.net/widelands/${DISTVERSION}/${DISTVERSION}/+download/ \
https://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/dcmtk/Makefile b/graphics/dcmtk/Makefile
index c279ba35f4b5..68de047b5aac 100644
--- a/graphics/dcmtk/Makefile
+++ b/graphics/dcmtk/Makefile
@@ -4,7 +4,7 @@
PORTNAME= dcmtk
DISTVERSIONPREFIX= ${PORTNAME:tu}-
DISTVERSION= 3.6.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics devel
MAINTAINER= yuri@FreeBSD.org
diff --git a/graphics/imv/Makefile b/graphics/imv/Makefile
index 34bbcefc8c56..4320f680b589 100644
--- a/graphics/imv/Makefile
+++ b/graphics/imv/Makefile
@@ -4,7 +4,7 @@
PORTNAME= imv
DISTVERSIONPREFIX= v
DISTVERSION= 4.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/libcdr01/Makefile b/graphics/libcdr01/Makefile
index 495b2b5aa733..eaae006a4104 100644
--- a/graphics/libcdr01/Makefile
+++ b/graphics/libcdr01/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libcdr
PORTVERSION= 0.1.6
+PORTREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= LODEV
PKGNAMESUFFIX= 01
diff --git a/graphics/libcdr01/files/patch-icu68 b/graphics/libcdr01/files/patch-icu68
new file mode 100644
index 000000000000..466cfea4bae4
--- /dev/null
+++ b/graphics/libcdr01/files/patch-icu68
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+libcdr_utils.cpp:111:35: error: use of undeclared identifier 'TRUE'
+ ucsdet_enableInputFilter(csd, TRUE);
+ ^
+
+--- src/lib/libcdr_utils.cpp.orig 2020-02-02 15:30:44 UTC
++++ src/lib/libcdr_utils.cpp
+@@ -108,7 +108,7 @@ static unsigned short getEncoding(const unsigned char
+ csd = ucsdet_open(&status);
+ if (U_FAILURE(status) || !csd)
+ return 0;
+- ucsdet_enableInputFilter(csd, TRUE);
++ ucsdet_enableInputFilter(csd, true);
+ ucsdet_setText(csd, (const char *)buffer, bufferLength, &status);
+ if (U_FAILURE(status))
+ throw libcdr::EncodingException();
diff --git a/graphics/libfreehand/Makefile b/graphics/libfreehand/Makefile
index 84fc73d10976..cbffb920eb59 100644
--- a/graphics/libfreehand/Makefile
+++ b/graphics/libfreehand/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libfreehand
PORTVERSION= 0.1.2
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= graphics
MASTER_SITES= LODEV
diff --git a/graphics/libzmf/Makefile b/graphics/libzmf/Makefile
index fdc363f01e9a..769fee711227 100644
--- a/graphics/libzmf/Makefile
+++ b/graphics/libzmf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libzmf
PORTVERSION= 0.0.2
-PORTREVISION= 21
+PORTREVISION= 22
CATEGORIES= graphics
MASTER_SITES= LODEV
diff --git a/graphics/maim/Makefile b/graphics/maim/Makefile
index fae4f3346b33..c120e399d8fa 100644
--- a/graphics/maim/Makefile
+++ b/graphics/maim/Makefile
@@ -3,7 +3,7 @@
PORTNAME= maim
DISTVERSIONPREFIX= v
DISTVERSION= 5.6.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MAINTAINER= 0mp@FreeBSD.org
diff --git a/graphics/openfx-arena/Makefile b/graphics/openfx-arena/Makefile
index d8ac6bf4ef48..9f61cbb74207 100644
--- a/graphics/openfx-arena/Makefile
+++ b/graphics/openfx-arena/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openfx-arena
PORTVERSION= 2.3.14
DISTVERSIONPREFIX= Natron-
-PORTREVISION= 28
+PORTREVISION= 29
CATEGORIES= graphics
MAINTAINER= olivier@FreeBSD.org
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 0a525a1473b5..d91f23bd83ac 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -4,7 +4,7 @@
PORTNAME= osg
PORTVERSION= 3.6.5
DISTVERSIONPREFIX= OpenSceneGraph-
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index ce2e0e439931..2f0843e3fb84 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tesseract
PORTVERSION= 4.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MAINTAINER= pkubaj@FreeBSD.org
diff --git a/irc/znc-push/Makefile b/irc/znc-push/Makefile
index 46af693453fa..fc0283a84c01 100644
--- a/irc/znc-push/Makefile
+++ b/irc/znc-push/Makefile
@@ -4,6 +4,7 @@ PORTNAME= znc-push
DISTVERSIONPREFIX= v
DISTVERSION= 1.0.0-173
DISTVERSIONSUFFIX= -g78d0385
+PORTREVISION= 1
CATEGORIES= irc
MAINTAINER= dor.bsd@xm0.uk
diff --git a/irc/znc/Makefile b/irc/znc/Makefile
index f3c9a6b170d2..391bf3f78d77 100644
--- a/irc/znc/Makefile
+++ b/irc/znc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= znc
PORTVERSION= 1.8.2
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= https://znc.in/releases/ \
https://znc.in/releases/archive/
diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile
index 2d237cdd9ebb..3bad1abd0cd9 100644
--- a/java/openjfx14/Makefile
+++ b/java/openjfx14/Makefile
@@ -2,6 +2,7 @@
PORTNAME= openjfx
DISTVERSION= 14.0.2.1+1
+PORTREVISION= 1
CATEGORIES= java x11-toolkits devel
MASTER_SITES= https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.7.1/:core \
https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.7.1/:grouping \
diff --git a/java/openjfx14/files/patch-icu68 b/java/openjfx14/files/patch-icu68
new file mode 100644
index 000000000000..f1ada0ac26bd
--- /dev/null
+++ b/java/openjfx14/files/patch-icu68
@@ -0,0 +1,167 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.cpp:27:
+modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h:82:28: error: use of undeclared identifier 'TRUE'
+ isAccessible = TRUE;
+ ^
+modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h:87:28: error: use of undeclared identifier 'FALSE'
+ isAccessible = FALSE;
+ ^
+modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h:96:28: error: use of undeclared identifier 'TRUE'
+ isAccessible = TRUE;
+ ^
+modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h:101:28: error: use of undeclared identifier 'FALSE'
+ isAccessible = FALSE;
+ ^
+modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp:129:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp:149:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+In file included from DerivedSources/WebCore/unified-sources/UnifiedSource-3c72abbe-47.cpp:3:
+modules/javafx.web/src/main/native/Source/WebCore/platform/text/TextCodecICU.cpp:242:45: error: use of undeclared identifier 'TRUE'
+ ucnv_setFallback(m_converter.get(), TRUE);
+ ^
+
+--- modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h.orig 2020-07-17 10:21:33 UTC
++++ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProvider.h
+@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits<int32_t>::max());
+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+ text->chunkOffset = text->chunkLength;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ } else {
+@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits<int32_t>::max());
+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex <= 0 && !text->chunkNativeStart) {
+ text->chunkOffset = 0;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ }
+--- modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp.orig 2020-07-17 10:21:33 UTC
++++ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (index >= length && uText->chunkNativeLimit == length) {
+ // Off the end of the buffer, but we can't get it.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return FALSE;
++ return false;
+ }
+ } else {
+ if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (!index && !uText->chunkNativeStart) {
+ // Already at the beginning; can't go any farther.
+ uText->chunkOffset = 0;
+- return FALSE;
++ return false;
+ }
+ }
+
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+
+ uText->nativeIndexingLimit = uText->chunkLength;
+
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp.orig 2020-07-17 10:21:33 UTC
++++ modules/javafx.web/src/main/native/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
+@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- modules/javafx.web/src/main/native/Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-07-17 10:21:33 UTC
++++ modules/javafx.web/src/main/native/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -239,7 +239,7 @@ void TextCodecICU::createICUConverter() const
+ UErrorCode error = U_ZERO_ERROR;
+ m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close };
+ if (m_converter)
+- ucnv_setFallback(m_converter.get(), TRUE);
++ ucnv_setFallback(m_converter.get(), true);
+ }
+
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error)
diff --git a/java/openjfx8-devel/Makefile b/java/openjfx8-devel/Makefile
index 4e77e46e009c..5d0df7e425aa 100644
--- a/java/openjfx8-devel/Makefile
+++ b/java/openjfx8-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openjfx8
DISTVERSION= 8u202-b07
-PORTREVISION= 7
+PORTREVISION= 8
PORTEPOCH= 1
CATEGORIES= java x11-toolkits devel
MASTER_SITES= https://github.com/t6/openjfx/releases/download/release/ \
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index bb3b4f705a8c..f24e9f6d3ea1 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnustep-base
DISTVERSIONPREFIX= base-
DISTVERSION= 1_26_0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= lang devel gnustep
MAINTAINER= ports@FreeBSD.org
diff --git a/lang/gnustep-base/files/patch-icu68 b/lang/gnustep-base/files/patch-icu68
new file mode 100644
index 000000000000..52ae3bc79e77
--- /dev/null
+++ b/lang/gnustep-base/files/patch-icu68
@@ -0,0 +1,185 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+GSICUString.m:71:18: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+GSICUString.m:80:18: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+GSICUString.m:104:18: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+GSICUString.m:113:18: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+GSICUString.m:135:10: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+GSICUString.m:170:66: error: use of undeclared identifier 'TRUE'
+ UTextNSStringAccess(ut, r.location + [replacement length] + 1, TRUE);
+ ^
+NSRegularExpression.m:185:29: error: use of undeclared identifier 'FALSE'
+ utext_clone(&str->txt, t, FALSE, TRUE, &s);
+ ^
+NSRegularExpression.m:185:36: error: use of undeclared identifier 'TRUE'
+ utext_clone(&str->txt, t, FALSE, TRUE, &s);
+ ^
+NSRegularExpression.m:842:34: error: use of undeclared identifier 'TRUE'
+ utext_clone(&ret->txt, output, TRUE, TRUE, &s);
+ ^
+NSRegularExpression.m:842:40: error: use of undeclared identifier 'TRUE'
+ utext_clone(&ret->txt, output, TRUE, TRUE, &s);
+ ^
+NSRegularExpression.m:876:34: error: use of undeclared identifier 'TRUE'
+ utext_clone(&ret->txt, output, TRUE, TRUE, &s);
+ ^
+NSRegularExpression.m:876:40: error: use of undeclared identifier 'TRUE'
+ utext_clone(&ret->txt, output, TRUE, TRUE, &s);
+ ^
+NSRegularExpression.m:914:34: error: use of undeclared identifier 'TRUE'
+ utext_clone(&ret->txt, output, TRUE, TRUE, &s);
+ ^
+NSRegularExpression.m:914:40: error: use of undeclared identifier 'TRUE'
+ utext_clone(&ret->txt, output, TRUE, TRUE, &s);
+ ^
+NSRegularExpression.m:291:14: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+NSRegularExpression.m:368:36: error: use of undeclared identifier 'FALSE'
+ uregex_useAnchoringBounds(r, FALSE, &s);
+ ^
+NSRegularExpression.m:372:38: error: use of undeclared identifier 'TRUE'
+ uregex_useTransparentBounds(r, TRUE, &s);
+ ^
+
+--- Source/GSICUString.m.orig 2019-01-06 22:33:45 UTC
++++ Source/GSICUString.m
+@@ -68,7 +68,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB
+ * to match it.
+ */
+ ut->chunkOffset = nativeIndex - nativeStart;
+- return TRUE;
++ return true;
+ }
+
+ if (nativeIndex >= length && nativeLimit >= length)
+@@ -77,7 +77,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB
+ * Limit it to point just after the last character.
+ */
+ ut->chunkOffset = ut->chunkLength;
+- return FALSE;
++ return false;
+ }
+
+ /* Set up to fill the chunk with characters from the string
+@@ -101,7 +101,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB
+ * to match it.
+ */
+ ut->chunkOffset = nativeIndex - nativeStart;
+- return TRUE;
++ return true;
+ }
+
+ if (nativeIndex <= 0 && nativeStart <= 0)
+@@ -110,7 +110,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB
+ * Limit it to position of the first character.
+ */
+ ut->chunkOffset = 0;
+- return FALSE;
++ return false;
+ }
+
+ nativeLimit = nativeIndex;
+@@ -132,7 +132,7 @@ UTextNSStringAccess(UText *ut, int64_t nativeIndex, UB
+ ut->chunkNativeStart = nativeStart;
+ ut->nativeIndexingLimit = r.length;
+ ut->chunkLength = r.length;
+- return TRUE;
++ return true;
+ }
+
+ /**
+@@ -167,7 +167,7 @@ UTextNSMutableStringReplace(UText *ut,
+ // Setting the chunk length to 0 here forces UTextNSStringAccess to fetch
+ // the data from the string object.
+ ut->chunkLength = 0;
+- UTextNSStringAccess(ut, r.location + [replacement length] + 1, TRUE);
++ UTextNSStringAccess(ut, r.location + [replacement length] + 1, true);
+ ut->chunkOffset++;
+
+ [replacement release];
+--- Source/NSRegularExpression.m.orig 2019-01-06 22:33:45 UTC
++++ Source/NSRegularExpression.m
+@@ -182,7 +182,7 @@ NSRegularExpressionOptionsToURegexpFlags(NSRegularExpr
+ return nil;
+ }
+ str = [GSUTextString new];
+- utext_clone(&str->txt, t, FALSE, TRUE, &s);
++ utext_clone(&str->txt, t, false, true, &s);
+ return [str autorelease];
+ }
+ #else
+@@ -288,7 +288,7 @@ callback(const void *context, int32_t steps)
+
+ if (NULL == context)
+ {
+- return FALSE;
++ return false;
+ }
+ CALL_BLOCK(block, nil, NSMatchingProgress, &stop);
+ return stop;
+@@ -365,11 +365,11 @@ setupRegex(URegularExpression *regex,
+ uregex_setRegion(r, range.location, range.location+range.length, &s);
+ if (options & NSMatchingWithoutAnchoringBounds)
+ {
+- uregex_useAnchoringBounds(r, FALSE, &s);
++ uregex_useAnchoringBounds(r, false, &s);
+ }
+ if (options & NSMatchingWithTransparentBounds)
+ {
+- uregex_useTransparentBounds(r, TRUE, &s);
++ uregex_useTransparentBounds(r, true, &s);
+ }
+ uregex_setTimeLimit(r, _workLimit, &s);
+ if (U_FAILURE(s))
+@@ -401,11 +401,11 @@ setupRegex(URegularExpression *regex,
+ uregex_setRegion(r, range.location, range.location+range.length, &s);
+ if (options & NSMatchingWithoutAnchoringBounds)
+ {
+- uregex_useAnchoringBounds(r, FALSE, &s);
++ uregex_useAnchoringBounds(r, false, &s);
+ }
+ if (options & NSMatchingWithTransparentBounds)
+ {
+- uregex_useTransparentBounds(r, TRUE, &s);
++ uregex_useTransparentBounds(r, true, &s);
+ }
+ uregex_setTimeLimit(r, _workLimit, &s);
+ if (U_FAILURE(s))
+@@ -839,7 +839,7 @@ prepareResult(NSRegularExpression *regex,
+ DESTROY(ret);
+ return 0;
+ }
+- utext_clone(&ret->txt, output, TRUE, TRUE, &s);
++ utext_clone(&ret->txt, output, true, true, &s);
+ [string setString: ret];
+ [ret release];
+ uregex_close(r);
+@@ -873,7 +873,7 @@ prepareResult(NSRegularExpression *regex,
+ DESTROY(ret);
+ return nil;
+ }
+- utext_clone(&ret->txt, output, TRUE, TRUE, &s);
++ utext_clone(&ret->txt, output, true, true, &s);
+ uregex_close(r);
+
+ utext_close(&txt);
+@@ -911,7 +911,7 @@ prepareResult(NSRegularExpression *regex,
+ DESTROY(ret);
+ return nil;
+ }
+- utext_clone(&ret->txt, output, TRUE, TRUE, &s);
++ utext_clone(&ret->txt, output, true, true, &s);
+ uregex_close(r);
+
+ utext_close(&txt);
diff --git a/lang/hermes/Makefile b/lang/hermes/Makefile
index a90447d1509e..0b99195f68ec 100644
--- a/lang/hermes/Makefile
+++ b/lang/hermes/Makefile
@@ -3,6 +3,7 @@
PORTNAME= hermes
DISTVERSIONPREFIX= v
DISTVERSION= 0.7.0
+PORTREVISION= 1
CATEGORIES= lang
PKGNAMESUFFIX= -javascript-engine
diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index 06fbb4e2a320..e1f8bbf0f0e7 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -3,7 +3,7 @@
PORTNAME= parrot
PORTVERSION= 8.1.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= lang
MASTER_SITES= ftp://ftp.parrot.org/pub/parrot/releases/supported/${PORTVERSION}/ \
LOCAL/sunpoet
diff --git a/lang/spidermonkey52/Makefile b/lang/spidermonkey52/Makefile
index 78cba7acdcc9..9f5184078126 100644
--- a/lang/spidermonkey52/Makefile
+++ b/lang/spidermonkey52/Makefile
@@ -3,7 +3,7 @@
PORTNAME= spidermonkey
PORTVERSION= 52.9.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= lang
MASTER_SITES= MOZILLA/firefox/releases/${PORTVERSION}esr/source
PKGNAMESUFFIX= ${SP_VER}
diff --git a/lang/spidermonkey60/Makefile b/lang/spidermonkey60/Makefile
index f4a49fcf815f..42fabbd7be7d 100644
--- a/lang/spidermonkey60/Makefile
+++ b/lang/spidermonkey60/Makefile
@@ -2,7 +2,7 @@
PORTNAME= spidermonkey
DISTVERSION= 60.9.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= lang
MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source
PKGNAMESUFFIX= ${SP_VER}
diff --git a/lang/spidermonkey78/Makefile b/lang/spidermonkey78/Makefile
index 2014dce6b817..0fe67cf8bde9 100644
--- a/lang/spidermonkey78/Makefile
+++ b/lang/spidermonkey78/Makefile
@@ -2,7 +2,7 @@
PORTNAME= spidermonkey
DISTVERSION= 78.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source
PKGNAMESUFFIX= ${SP_VER}
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
index 92a7e24f1ffb..54c38b1e2216 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.0.14
+PORTREVISION= 1
#PORTREVISION= 0
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile
index d03db37369a3..eb4575d3620f 100644
--- a/mail/cyrus-imapd32/Makefile
+++ b/mail/cyrus-imapd32/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.2.4
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= 32
diff --git a/mail/dovecot-fts-xapian/Makefile b/mail/dovecot-fts-xapian/Makefile
index 04749693e8db..d4918f98adba 100644
--- a/mail/dovecot-fts-xapian/Makefile
+++ b/mail/dovecot-fts-xapian/Makefile
@@ -2,6 +2,7 @@
PORTNAME= fts-xapian
PORTVERSION= 1.4.1
+PORTREVISION= 1
CATEGORIES= mail
PKGNAMEPREFIX= dovecot-
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index a3519edc439b..236435c4875a 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -9,6 +9,7 @@
PORTNAME= dovecot
PORTVERSION= 2.3.11.3
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= https://dovecot.org/releases/2.3/
diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile
index 4ecdad47c58a..c92d241390ea 100644
--- a/mail/evolution-ews/Makefile
+++ b/mail/evolution-ews/Makefile
@@ -3,6 +3,7 @@
PORTNAME= evolution-ews
PORTVERSION= 3.38.0
+PORTREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 817d7f527a4a..67a7457ccbeb 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,7 +3,7 @@
PORTNAME= evolution
PORTVERSION= 3.38.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index d5add0c80bef..6d184106ace1 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -3,7 +3,7 @@
PORTNAME= exim
PORTVERSION?= ${EXIM_VERSION}
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= mail
MASTER_SITES= EXIM:exim
MASTER_SITE_SUBDIR= /exim4/:exim \
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index dd32f8ea74b8..192c2ba1ecf7 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libvmime
PORTVERSION= 0.9.2
DISTVERSIONPREFIX= v
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail
MAINTAINER= sunpoet@FreeBSD.org
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 7c09b142c795..29d6dff7160f 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postfix
DISTVERSION= 3.6-20201026
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH= 6
CATEGORIES= mail
MASTER_SITES= http://ftp.porcupine.org/mirrors/postfix-release/ \
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index a447a8cd84fd..703c217d29ad 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postfix
DISTVERSION= 3.5.7
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \
diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index 36744e7dcb95..a0dd13a3df8a 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -2,6 +2,7 @@
PORTNAME= rspamd
PORTVERSION= 2.6.a1.20200929
+PORTREVISION= 1
CATEGORIES= mail
PKGNAMESUFFIX= -devel
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 2ab9617ac4ee..f53ff633d343 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -2,6 +2,7 @@
PORTNAME= rspamd
PORTVERSION= 2.6
+PORTREVISION= 1
CATEGORIES= mail
MAINTAINER= vsevolod@FreeBSD.org
diff --git a/mail/sendmail-devel/Makefile b/mail/sendmail-devel/Makefile
index ded083bea964..da5e3382720d 100644
--- a/mail/sendmail-devel/Makefile
+++ b/mail/sendmail-devel/Makefile
@@ -2,6 +2,7 @@
PORTNAME= sendmail
PORTVERSION= 8.16.0.50
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/snapshots/
PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2}
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 91f6d0c09ec1..d4df6dab76f7 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sendmail
PORTVERSION= 8.16.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/
DISTNAME= ${PORTNAME}.${PORTVERSION}
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 60762f29759b..818422ddf536 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,6 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 78.4.0
+PORTREVISION= 1
CATEGORIES= mail news net-im
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
diff --git a/math/R/Makefile b/math/R/Makefile
index 3fe475abef3d..7cfd9b877a64 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -3,6 +3,7 @@
PORTNAME= R
DISTVERSION= 4.0.3
+PORTREVISION= 1
CATEGORIES= math lang
MASTER_SITES= CRAN/src/base/R-${PORTVERSION:C|\..*||}
diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile
index bebf5aec1e0d..0b3bcd16c2d2 100644
--- a/math/libqalculate/Makefile
+++ b/math/libqalculate/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libqalculate
PORTVERSION= 3.11.0
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= https://github.com/Qalculate/${PORTNAME}/releases/download/v${PORTVERSION}/
diff --git a/math/py-rpy2/Makefile b/math/py-rpy2/Makefile
index f63a46484dbf..e7235f72e044 100644
--- a/math/py-rpy2/Makefile
+++ b/math/py-rpy2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= rpy2
PORTVERSION= 3.3.6
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/sage/Makefile b/math/sage/Makefile
index 816a11800481..da486e679a2f 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sage
PORTVERSION= 9.2
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= https://mirrors.xmission.com/sage/src/ \
http://mirrors.xmission.com/sage/src/ \
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 23bfd2750db6..298410d83532 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sword
PORTVERSION= 1.8.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= misc
MASTER_SITES= http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index 6f3f4d30682d..06e6f45a8e98 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xiphos
DISTVERSION= 4.2.1
+PORTREVISION= 1
CATEGORIES= misc gnome
# Don't use USE_GITHUB: the sources downloaded by USE_GITHUB cannot be
# built as they miss the file ${WRKSRC}/cmake/source_version.txt.
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 9a00941ebe5a..b0fec2516864 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -3,7 +3,7 @@
PORTNAME= aegisub
PORTVERSION= 3.2.2
-PORTREVISION= 47
+PORTREVISION= 48
CATEGORIES= multimedia
MASTER_SITES= http://ftp.aegisub.org/pub/archives/releases/source/ \
ftp://ftp.aegisub.org/pub/archives/releases/source/ \
diff --git a/multimedia/subtitlecomposer/Makefile b/multimedia/subtitlecomposer/Makefile
index 1e704bbdf739..a4be192b842a 100644
--- a/multimedia/subtitlecomposer/Makefile
+++ b/multimedia/subtitlecomposer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= subtitlecomposer
PORTVERSION= 0.7.0
DISTVERSIONPREFIX= v
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia kde
MAINTAINER= makc@FreeBSD.org
diff --git a/net-im/dino/Makefile b/net-im/dino/Makefile
index de8bf6a602b0..524bee7005c7 100644
--- a/net-im/dino/Makefile
+++ b/net-im/dino/Makefile
@@ -3,6 +3,7 @@
PORTNAME= dino
DISTVERSIONPREFIX= v
DISTVERSION= 0.1.0.20201007
+PORTREVISION= 1
CATEGORIES= net-im
MAINTAINER= ashish@FreeBSD.org
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 47e183906b22..ce625ff4d4b9 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= freerdp
DISTVERSION= 2.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net comms
MASTER_SITES= https://pub.freerdp.com/releases/ \
https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 6864c9be4ea8..04be151155be 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -66,7 +66,7 @@ BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
.endif
PORTREVISION_CLIENT= 0
-PORTREVISION_SERVER= 0
+PORTREVISION_SERVER= 1
OPENLDAP_SHLIB_MAJOR= 2
OPENLDAP_SHLIB_MINOR= 10.14
OPENLDAP_MAJOR= ${DISTVERSION:R}
diff --git a/net/samba412/Makefile b/net/samba412/Makefile
index e5563c544803..c4fa4d91ca5b 100644
--- a/net/samba412/Makefile
+++ b/net/samba412/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ${SAMBA4_BASENAME}412
PORTVERSION= ${SAMBA4_VERSION}
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
diff --git a/net/samba413/Makefile b/net/samba413/Makefile
index 739f9c79ccc1..e1caa13c061a 100644
--- a/net/samba413/Makefile
+++ b/net/samba413/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ${SAMBA4_BASENAME}413
PORTVERSION= ${SAMBA4_VERSION}
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index ee85816c1ded..d108c89282c4 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -3,6 +3,7 @@
PORTNAME= yaz
DISTVERSION= 5.30.3
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://ftp.indexdata.dk/pub/yaz/
diff --git a/net/zebra-server/Makefile b/net/zebra-server/Makefile
index 0738298e8516..ab5f623afa43 100644
--- a/net/zebra-server/Makefile
+++ b/net/zebra-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zebra-server
PORTVERSION= 2.0.55
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= net
MASTER_SITES= http://ftp.indexdata.dk/pub/zebra/
DISTNAME= idzebra-${PORTVERSION}
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 4c146cb8ceab..8d946a2d4b00 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tin
PORTVERSION= 2.4.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES+= news
MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v${PORTVERSION:R}/ \
ftp://ftp.sunet.se/pub/news/readers/tin/v${PORTVERSION:R}/ \
diff --git a/print/harfbuzz-icu/Makefile b/print/harfbuzz-icu/Makefile
index 297b59fce170..bc6de9101a15 100644
--- a/print/harfbuzz-icu/Makefile
+++ b/print/harfbuzz-icu/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -icu
COMMENT= Harfbuzz ICU support
diff --git a/print/libmspub01/Makefile b/print/libmspub01/Makefile
index 5379001ae563..a37287efd984 100644
--- a/print/libmspub01/Makefile
+++ b/print/libmspub01/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libmspub
PORTVERSION= 0.1.4
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= print graphics devel
MASTER_SITES= LODEV/${PORTNAME}
PKGNAMESUFFIX= 01
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index c08e9efb099c..10696c38eba2 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= scribus
PORTVERSION= 1.5.5
-PORTREVISION= 20
+PORTREVISION= 21
CATEGORIES= print editors
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \
http://www.scribus.net/downloads/${PORTVERSION}/
diff --git a/print/tex-xetex/Makefile b/print/tex-xetex/Makefile
index 15f93db5ba52..dc425d6a7f35 100644
--- a/print/tex-xetex/Makefile
+++ b/print/tex-xetex/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xetex
PORTVERSION= 0.99992
-PORTREVISION= 37
+PORTREVISION= 38
CATEGORIES= print
MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
PKGNAMEPREFIX= tex-
diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile
index b3bbb33d93a8..b8de45a0be34 100644
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= texlive
PORTVERSION= 20150521
-PORTREVISION= 56
+PORTREVISION= 57
CATEGORIES= print
MASTER_SITES= TEX_CTAN/systems/texlive/Source/
PKGNAMESUFFIX= -base
diff --git a/science/py-tensorflow/Makefile b/science/py-tensorflow/Makefile
index e04a64655cfa..9b66e537fc1a 100644
--- a/science/py-tensorflow/Makefile
+++ b/science/py-tensorflow/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tensorflow
DISTVERSIONPREFIX= v
DISTVERSION= 1.14.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= science python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DIST_SUBDIR= ${PORTNAME}
diff --git a/security/certificate-transparency/Makefile b/security/certificate-transparency/Makefile
index e27ac5140a88..1d759619e530 100644
--- a/security/certificate-transparency/Makefile
+++ b/security/certificate-transparency/Makefile
@@ -3,7 +3,7 @@
PORTNAME= certificate-transparency
PORTVERSION= 20161015
-PORTREVISION= 45
+PORTREVISION= 46
CATEGORIES= security
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/gdisk/Makefile b/sysutils/gdisk/Makefile
index b169d8e9da40..1665278f7476 100644
--- a/sysutils/gdisk/Makefile
+++ b/sysutils/gdisk/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gdisk
PORTVERSION= 1.0.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= SF/gptfdisk/gptfdisk/${PORTVERSION}
DISTNAME= gptfdisk-${PORTVERSION}
diff --git a/sysutils/ltfs/Makefile b/sysutils/ltfs/Makefile
index a1b0091fef60..ea337f20c833 100644
--- a/sysutils/ltfs/Makefile
+++ b/sysutils/ltfs/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ltfs
DISTVERSIONPREFIX= v
DISTVERSION= 2.4.2.0
DISTVERSIONSUFFIX= -10418
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MAINTAINER= kbowling@FreeBSD.org
diff --git a/sysutils/ltfs/files/patch-icu68 b/sysutils/ltfs/files/patch-icu68
new file mode 100644
index 000000000000..c934a5262cde
--- /dev/null
+++ b/sysutils/ltfs/files/patch-icu68
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+fs.c:266:32: error: use of undeclared identifier 'FALSE'
+ update_platform_safe_name(d, FALSE, idx);
+ ^
+
+--- src/libltfs/fs.c.orig 2020-03-31 23:56:12 UTC
++++ src/libltfs/fs.c
+@@ -263,7 +263,7 @@ struct dentry * fs_allocate_dentry(struct dentry *pare
+ d->platform_safe_name = NULL;
+ } else if (name && !platform_safe_name) {
+ d->name.name = strdup(name);
+- update_platform_safe_name(d, FALSE, idx);
++ update_platform_safe_name(d, false, idx);
+ if (! d->name.name || ! d->platform_safe_name) {
+ ltfsmsg(LTFS_ERR, 10001E, "fs_allocate_dentry: name");
+ if (d->name.name)
diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile
index 7a3fb960f271..7b82a74dd390 100644
--- a/sysutils/osquery/Makefile
+++ b/sysutils/osquery/Makefile
@@ -3,7 +3,7 @@
PORTNAME= osquery
PORTVERSION= 3.3.2
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= sysutils
MAINTAINER= zi@FreeBSD.org
diff --git a/sysutils/tracker-miners/Makefile b/sysutils/tracker-miners/Makefile
index bdcb303dc7c4..4936710150e9 100644
--- a/sysutils/tracker-miners/Makefile
+++ b/sysutils/tracker-miners/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tracker-miners
PORTVERSION= 2.3.5
-PORTREVISION= 1
+PORTREVISION= 2
PĂ–RTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index a86375ee680e..7b6c493776c5 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -3,6 +3,7 @@
PORTNAME= tracker
PORTVERSION= 2.3.4
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
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 */
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index f38570d89537..0b32ce197dc1 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -3,7 +3,7 @@
PORTNAME= chromium
PORTVERSION= 85.0.4183.121
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= www java
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
LOCAL/rene/chromium/:fonts
diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile
index 08346bce8342..0c6df905d371 100644
--- a/www/cliqz/Makefile
+++ b/www/cliqz/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cliqz
DISTVERSION= 1.38.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www
MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \
http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index b2b4f23ac67e..4a627e1b677d 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,7 +3,7 @@
PORTNAME= epiphany
PORTVERSION= 3.38.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 05f320b931d7..a49ba888db0f 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -3,6 +3,7 @@
PORTNAME= firefox
DISTVERSION= 78.4.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 0f84dc17cb7f..ea8f96490d82 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -3,6 +3,7 @@
PORTNAME= firefox
DISTVERSION= 82.0.2
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index 3dc6af9ba039..1de2a2d34b49 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -3,6 +3,7 @@
PORTNAME= iridium
PORTVERSION= 2020.04.81
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://downloads.iridiumbrowser.de/source/
PKGNAMESUFFIX= -browser
diff --git a/www/node/Makefile b/www/node/Makefile
index a02bac5e02fa..3f95411c9dad 100644
--- a/www/node/Makefile
+++ b/www/node/Makefile
@@ -3,6 +3,7 @@
PORTNAME= node
DISTVERSIONPREFIX= v
DISTVERSION= 15.0.1
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://nodejs.org/dist/v${DISTVERSION}/
diff --git a/www/node10/Makefile b/www/node10/Makefile
index 5c4850f55452..17992d5c28e0 100644
--- a/www/node10/Makefile
+++ b/www/node10/Makefile
@@ -3,6 +3,7 @@
PORTNAME= node
PORTVERSION= 10.23.0
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/
PKGNAMESUFFIX= 10
diff --git a/www/node10/files/patch-icu68 b/www/node10/files/patch-icu68
new file mode 100644
index 000000000000..69dbad34273e
--- /dev/null
+++ b/www/node10/files/patch-icu68
@@ -0,0 +1,109 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+../deps/v8/src/objects/intl-objects.cc:246:22: error: use of undeclared identifier 'FALSE'
+ FALSE, &status);
+ ^
+../deps/v8/src/objects/intl-objects.cc:425:22: error: use of undeclared identifier 'FALSE'
+ FALSE, &status);
+ ^
+../deps/v8/src/objects/intl-objects.cc:660:22: error: use of undeclared identifier 'FALSE'
+ FALSE, &status);
+ ^
+../deps/v8/src/objects/intl-objects.cc:799:22: error: use of undeclared identifier 'FALSE'
+ FALSE, &status);
+ ^
+../deps/v8/src/runtime/runtime-intl.cc:88:66: error: use of undeclared identifier 'TRUE'
+ uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, TRUE, &error);
+ ^
+../deps/v8/src/runtime/runtime-intl.cc:135:66: error: use of undeclared identifier 'FALSE'
+ uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, FALSE, &error);
+ ^
+../deps/v8/src/runtime/runtime-intl.cc:167:22: error: use of undeclared identifier 'FALSE'
+ FALSE, &status);
+ ^
+../deps/v8/src/runtime/runtime-intl.cc:402:9: error: use of undeclared identifier 'FALSE'
+ FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1);
+ ^
+../deps/v8/src/runtime/runtime-intl.cc:404:9: error: use of undeclared identifier 'FALSE'
+ FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2);
+ ^
+
+--- deps/v8/src/objects/intl-objects.cc.orig 2020-09-15 13:25:38 UTC
++++ deps/v8/src/objects/intl-objects.cc
+@@ -243,7 +243,7 @@ void SetResolvedDateSettings(Isolate* isolate, const i
+ char result[ULOC_FULLNAME_CAPACITY];
+ status = U_ZERO_ERROR;
+ uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"),
+ factory->NewStringFromAsciiChecked(result),
+@@ -422,7 +422,7 @@ void SetResolvedNumericSettings(Isolate* isolate, cons
+ char result[ULOC_FULLNAME_CAPACITY];
+ UErrorCode status = U_ZERO_ERROR;
+ uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"),
+ factory->NewStringFromAsciiChecked(result),
+@@ -657,7 +657,7 @@ void SetResolvedCollatorSettings(Isolate* isolate,
+ char result[ULOC_FULLNAME_CAPACITY];
+ status = U_ZERO_ERROR;
+ uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"),
+ factory->NewStringFromAsciiChecked(result),
+@@ -796,7 +796,7 @@ void SetResolvedBreakIteratorSettings(Isolate* isolate
+ char result[ULOC_FULLNAME_CAPACITY];
+ status = U_ZERO_ERROR;
+ uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"),
+ factory->NewStringFromAsciiChecked(result),
+--- deps/v8/src/runtime/runtime-intl.cc.orig 2020-09-15 13:25:38 UTC
++++ deps/v8/src/runtime/runtime-intl.cc
+@@ -85,7 +85,7 @@ RUNTIME_FUNCTION(Runtime_CanonicalizeLanguageTag) {
+ char result[ULOC_FULLNAME_CAPACITY];
+
+ // Force strict BCP47 rules.
+- uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, TRUE, &error);
++ uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, true, &error);
+
+ if (U_FAILURE(error) || error == U_STRING_NOT_TERMINATED_WARNING) {
+ return *factory->NewStringFromAsciiChecked(kInvalidTag);
+@@ -132,7 +132,7 @@ RUNTIME_FUNCTION(Runtime_AvailableLocalesOf) {
+
+ error = U_ZERO_ERROR;
+ // No need to force strict BCP47 rules.
+- uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, FALSE, &error);
++ uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, false, &error);
+ if (U_FAILURE(error) || error == U_STRING_NOT_TERMINATED_WARNING) {
+ // This shouldn't happen, but lets not break the user.
+ continue;
+@@ -164,7 +164,7 @@ RUNTIME_FUNCTION(Runtime_GetDefaultICULocale) {
+ char result[ULOC_FULLNAME_CAPACITY];
+ UErrorCode status = U_ZERO_ERROR;
+ uloc_toLanguageTag(default_locale.getName(), result, ULOC_FULLNAME_CAPACITY,
+- FALSE, &status);
++ false, &status);
+ if (U_SUCCESS(status)) {
+ return *factory->NewStringFromAsciiChecked(result);
+ }
+@@ -399,9 +399,9 @@ RUNTIME_FUNCTION(Runtime_InternalCompare) {
+ std::unique_ptr<uc16[]> sap1;
+ std::unique_ptr<uc16[]> sap2;
+ icu::UnicodeString string_val1(
+- FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1);
++ false, GetUCharBufferFromFlat(flat1, &sap1, length1), length1);
+ icu::UnicodeString string_val2(
+- FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2);
++ false, GetUCharBufferFromFlat(flat2, &sap2, length2), length2);
+ result = collator->compare(string_val1, string_val2, status);
+ }
+ if (U_FAILURE(status)) return isolate->ThrowIllegalOperation();
diff --git a/www/node12/Makefile b/www/node12/Makefile
index adfa30c8a643..2e9aeabd2b8c 100644
--- a/www/node12/Makefile
+++ b/www/node12/Makefile
@@ -3,6 +3,7 @@
PORTNAME= node
PORTVERSION= 12.19.0
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/
PKGNAMESUFFIX= 12
diff --git a/www/node14/Makefile b/www/node14/Makefile
index 7c0a12fe24f8..d2d8f271669c 100644
--- a/www/node14/Makefile
+++ b/www/node14/Makefile
@@ -3,6 +3,7 @@
PORTNAME= node
DISTVERSIONPREFIX= v
DISTVERSION= 14.15.0
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://nodejs.org/dist/v${DISTVERSION}/
PKGNAMESUFFIX= 14
diff --git a/www/qt5-webkit/Makefile b/www/qt5-webkit/Makefile
index f2b073aa02e7..cf1fd9610310 100644
--- a/www/qt5-webkit/Makefile
+++ b/www/qt5-webkit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= webkit
DISTVERSION= 5.212.0-alpha4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= https://github.com/qt${PORTNAME}/qt${PORTNAME}/releases/download/${DISTNAME}/
PKGNAMEPREFIX= qt5-
diff --git a/www/qt5-webkit/files/patch-icu68 b/www/qt5-webkit/files/patch-icu68
new file mode 100644
index 000000000000..25f094d7f35f
--- /dev/null
+++ b/www/qt5-webkit/files/patch-icu68
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+ ucnv_setFallback(m_converterICU, TRUE);
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+ isAccessible = TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+ isAccessible = FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+ isAccessible = TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+ isAccessible = FALSE;
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+
+--- Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-03-04 17:16:37 UTC
++++ Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+ m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+ ASSERT(U_SUCCESS(err));
+ if (m_converterICU)
+- ucnv_setFallback(m_converterICU, TRUE);
++ ucnv_setFallback(m_converterICU, true);
+ }
+
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- Source/WebCore/platform/text/icu/UTextProvider.h.orig 2020-03-04 17:16:37 UTC
++++ Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits<int32_t>::max());
+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+ text->chunkOffset = text->chunkLength;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits<int32_t>::max());
+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex <= 0 && !text->chunkNativeStart) {
+ text->chunkOffset = 0;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ }
+--- Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig 2020-03-04 17:16:37 UTC
++++ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (index >= length && uText->chunkNativeLimit == length) {
+ // Off the end of the buffer, but we can't get it.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return FALSE;
++ return false;
+ }
+ } else {
+ if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (!index && !uText->chunkNativeStart) {
+ // Already at the beginning; can't go any farther.
+ uText->chunkOffset = 0;
+- return FALSE;
++ return false;
+ }
+ }
+
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+
+ uText->nativeIndexingLimit = uText->chunkLength;
+
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig 2020-03-04 17:16:37 UTC
++++ Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile
index 04ad1399f84f..8d829799e97e 100644
--- a/www/webkit2-gtk3/Makefile
+++ b/www/webkit2-gtk3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= webkit
PORTVERSION= 2.30.1
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://webkitgtk.org/releases/
PKGNAMESUFFIX= 2-gtk3
diff --git a/www/webkit2-gtk3/files/patch-icu68 b/www/webkit2-gtk3/files/patch-icu68
new file mode 100644
index 000000000000..470bd88a217a
--- /dev/null
+++ b/www/webkit2-gtk3/files/patch-icu68
@@ -0,0 +1,173 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:30:
+Source/WTF/wtf/text/icu/UTextProvider.h:82:28: error: use of undeclared identifier 'TRUE'
+ isAccessible = TRUE;
+ ^
+Source/WTF/wtf/text/icu/UTextProvider.h:87:28: error: use of undeclared identifier 'FALSE'
+ isAccessible = FALSE;
+ ^
+Source/WTF/wtf/text/icu/UTextProvider.h:96:28: error: use of undeclared identifier 'TRUE'
+ isAccessible = TRUE;
+ ^
+Source/WTF/wtf/text/icu/UTextProvider.h:101:28: error: use of undeclared identifier 'FALSE'
+ isAccessible = FALSE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:340:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:360:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp:129:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp:149:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:340:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:360:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+
+--- Source/WTF/wtf/text/icu/UTextProvider.h.orig 2020-08-12 09:17:54 UTC
++++ Source/WTF/wtf/text/icu/UTextProvider.h
+@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits<int32_t>::max());
+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+ text->chunkOffset = text->chunkLength;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ } else {
+@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits<int32_t>::max());
+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex <= 0 && !text->chunkNativeStart) {
+ text->chunkOffset = 0;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ }
+--- Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp.orig 2020-08-12 09:17:54 UTC
++++ Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
+@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp.orig 2020-08-12 09:17:54 UTC
++++ Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (index >= length && uText->chunkNativeLimit == length) {
+ // Off the end of the buffer, but we can't get it.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return FALSE;
++ return false;
+ }
+ } else {
+ if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (!index && !uText->chunkNativeStart) {
+ // Already at the beginning; can't go any farther.
+ uText->chunkOffset = 0;
+- return FALSE;
++ return false;
+ }
+ }
+
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+
+ uText->nativeIndexingLimit = uText->chunkLength;
+
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -337,7 +337,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -357,7 +357,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 3d8e3f7f0990..6cda20aae77f 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnustep-gui
DISTVERSIONPREFIX= gui-
DISTVERSION= 0_27_0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits gnustep
MAINTAINER= ports@FreeBSD.org
diff --git a/x11-toolkits/gnustep-gui/files/patch-icu68 b/x11-toolkits/gnustep-gui/files/patch-icu68
new file mode 100644
index 000000000000..5852e9c8e8a2
--- /dev/null
+++ b/x11-toolkits/gnustep-gui/files/patch-icu68
@@ -0,0 +1,29 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+GSCharacterPanel.m:81:10: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+GSCharacterPanel.m:106:10: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+
+--- Source/GSCharacterPanel.m.orig 2019-01-06 22:00:38 UTC
++++ Source/GSCharacterPanel.m
+@@ -78,7 +78,7 @@
+ static UBool enumCharNamesFn(void *context, UChar32 code, UCharNameChoice nameChoice, const char *name, int32_t length)
+ {
+ [(NSMutableIndexSet*)context addIndex: (NSUInteger)code];
+- return TRUE;
++ return true;
+ }
+
+ static NSIndexSet *AssignedCodepoints()
+@@ -103,7 +103,7 @@ static UBool searchCharNamesFn(void *context, UChar32
+ {
+ [ctx->set addIndex: (NSUInteger)code];
+ }
+- return TRUE;
++ return true;
+ }
+
+ static NSIndexSet *CodepointsWithNameContainingSubstring(NSString *str)
diff --git a/x11-toolkits/tepl/Makefile b/x11-toolkits/tepl/Makefile
index 315933ca51b6..548ccff771dd 100644
--- a/x11-toolkits/tepl/Makefile
+++ b/x11-toolkits/tepl/Makefile
@@ -2,6 +2,7 @@
PORTNAME= tepl
PORTVERSION= 5.0.0
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile
index f1c60d4078d4..787fc1a130ac 100644
--- a/x11-toolkits/vte3/Makefile
+++ b/x11-toolkits/vte3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= vte
PORTVERSION= 0.62.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX= 3
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 33fc58e99c87..999914a462be 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnome-shell
PORTVERSION= 3.36.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/x11/slop/Makefile b/x11/slop/Makefile
index 405978a82f8d..9b7b1c0606a0 100644
--- a/x11/slop/Makefile
+++ b/x11/slop/Makefile
@@ -3,7 +3,7 @@
PORTNAME= slop
PORTVERSION= 7.5
DISTVERSIONPREFIX= v
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= ports@FreeBSD.org