devel/icu: update to 68.1

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

21 files changed, 615 insertions, 11 deletions

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