Index: archivers/unarchiver/Makefile =================================================================== --- archivers/unarchiver/Makefile +++ 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 Index: audio/musicpd/Makefile =================================================================== --- audio/musicpd/Makefile +++ 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} Index: audio/ncmpcpp/Makefile =================================================================== --- audio/ncmpcpp/Makefile +++ 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/ Index: databases/couchdb2/Makefile =================================================================== --- databases/couchdb2/Makefile +++ 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} Index: databases/couchdb3/Makefile =================================================================== --- databases/couchdb3/Makefile +++ databases/couchdb3/Makefile @@ -2,6 +2,7 @@ PORTNAME= couchdb3 DISTVERSION= 3.1.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= APACHE/couchdb/source/${DISTVERSION} DISTNAME= apache-couchdb-${DISTVERSION} Index: databases/evolution-data-server/Makefile =================================================================== --- databases/evolution-data-server/Makefile +++ 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 Index: databases/firebird25-server/Makefile =================================================================== --- databases/firebird25-server/Makefile +++ 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 Index: databases/kbibtex/Makefile =================================================================== --- databases/kbibtex/Makefile +++ 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} Index: databases/kdb/Makefile =================================================================== --- databases/kdb/Makefile +++ 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} Index: databases/mysql80-client/Makefile =================================================================== --- databases/mysql80-client/Makefile +++ databases/mysql80-client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) Index: databases/mysql80-server/Makefile =================================================================== --- databases/mysql80-server/Makefile +++ 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 Index: databases/mysql80-server/files/patch-icu68 =================================================================== --- /dev/null +++ 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, Index: databases/postgresql10-server/Makefile =================================================================== --- databases/postgresql10-server/Makefile +++ 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 Index: databases/postgresql10-server/files/patch-icu68 =================================================================== --- /dev/null +++ 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 ++ + #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 ++ + #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 + #include + #include + #include +--- 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 + #include + + #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 ++ + #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 ++ + #include + #include + #include Index: databases/postgresql11-server/Makefile =================================================================== --- databases/postgresql11-server/Makefile +++ 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 Index: databases/postgresql11-server/files/patch-icu68 =================================================================== --- /dev/null +++ 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", Index: databases/postgresql12-server/Makefile =================================================================== --- databases/postgresql12-server/Makefile +++ 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 Index: databases/postgresql12-server/files/patch-icu68 =================================================================== --- /dev/null +++ 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", Index: databases/postgresql13-server/Makefile =================================================================== --- databases/postgresql13-server/Makefile +++ databases/postgresql13-server/Makefile @@ -5,7 +5,7 @@ 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} Index: databases/postgresql13-server/files/patch-icu68 =================================================================== --- /dev/null +++ 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", Index: databases/postgresql96-server/Makefile =================================================================== --- databases/postgresql96-server/Makefile +++ 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 Index: databases/postgresql96-server/files/patch-icu68 =================================================================== --- /dev/null +++ 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 + #include + #include + #include +--- 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 + #include + + #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 ++ + #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 ++ + #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 + #include + #include + +--- 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 + #include + #include + #include Index: databases/sqlite3/Makefile =================================================================== --- databases/sqlite3/Makefile +++ 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/ Index: databases/tarantool/Makefile =================================================================== --- databases/tarantool/Makefile +++ databases/tarantool/Makefile @@ -3,6 +3,7 @@ PORTNAME= tarantool PORTVERSION= 2.4.2 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org Index: deskutils/calibre/Makefile =================================================================== --- deskutils/calibre/Makefile +++ 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}/ Index: deskutils/calibre/files/patch-icu68 =================================================================== --- /dev/null +++ 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; Index: deskutils/osmo/Makefile =================================================================== --- deskutils/osmo/Makefile +++ 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} Index: deskutils/peaclock/Makefile =================================================================== --- deskutils/peaclock/Makefile +++ deskutils/peaclock/Makefile @@ -2,6 +2,7 @@ PORTNAME= peaclock DISTVERSION= 0.4.3 +PORTREVISION= 1 CATEGORIES= deskutils MAINTAINER= yuri@FreeBSD.org Index: devel/boost-libs/Makefile =================================================================== --- devel/boost-libs/Makefile +++ devel/boost-libs/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= boost-libs -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Free portable C++ libraries (without Boost.Python) Index: devel/dee/Makefile =================================================================== --- devel/dee/Makefile +++ 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/ Index: devel/icu-le-hb/Makefile =================================================================== --- devel/icu-le-hb/Makefile +++ 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 Index: devel/icu-le-hb/files/patch-icu68 =================================================================== --- /dev/null +++ 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 Index: devel/icu/Makefile =================================================================== --- devel/icu/Makefile +++ 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 Index: devel/icu/distinfo =================================================================== --- devel/icu/distinfo +++ 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 Index: devel/icu/pkg-plist =================================================================== --- devel/icu/pkg-plist +++ devel/icu/pkg-plist @@ -190,6 +190,7 @@ 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 Index: devel/kiwix-lib/Makefile =================================================================== --- devel/kiwix-lib/Makefile +++ devel/kiwix-lib/Makefile @@ -2,6 +2,7 @@ PORTNAME= kiwix-lib DISTVERSION= 9.3.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= me@int19h.org Index: devel/libical/Makefile =================================================================== --- devel/libical/Makefile +++ 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}/ Index: devel/libical/files/patch-icu68 =================================================================== --- /dev/null +++ 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"); Index: devel/libphonenumber/Makefile =================================================================== --- devel/libphonenumber/Makefile +++ devel/libphonenumber/Makefile @@ -3,6 +3,7 @@ PORTNAME= libphonenumber DISTVERSIONPREFIX= v DISTVERSION= 8.12.11 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org Index: devel/libzim/Makefile =================================================================== --- devel/libzim/Makefile +++ devel/libzim/Makefile @@ -2,6 +2,7 @@ PORTNAME= libzim PORTVERSION= 6.2.2 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= swills@FreeBSD.org Index: devel/objecthash/Makefile =================================================================== --- devel/objecthash/Makefile +++ devel/objecthash/Makefile @@ -3,7 +3,7 @@ PORTNAME= objecthash PORTVERSION= 20160802 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= devel MAINTAINER= ports@FreeBSD.org Index: devel/php72-intl/Makefile =================================================================== --- devel/php72-intl/Makefile +++ devel/php72-intl/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php72 Index: devel/php72-intl/files/patch-icu68 =================================================================== --- /dev/null +++ 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(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(); Index: devel/php73-intl/Makefile =================================================================== --- devel/php73-intl/Makefile +++ devel/php73-intl/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php73 Index: devel/php73-intl/files/patch-icu68 =================================================================== --- /dev/null +++ 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(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(); Index: devel/php74-intl/Makefile =================================================================== --- devel/php74-intl/Makefile +++ devel/php74-intl/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php74 Index: devel/php74-intl/files/patch-icu68 =================================================================== --- /dev/null +++ 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(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(); Index: devel/php80-intl/Makefile =================================================================== --- devel/php80-intl/Makefile +++ devel/php80-intl/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PORTREVISION= 1 CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php80 Index: devel/php80-intl/files/patch-icu68 =================================================================== --- /dev/null +++ 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(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(); Index: devel/py-pyicu/Makefile =================================================================== --- devel/py-pyicu/Makefile +++ 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} Index: devel/py-pyicu/files/patch-icu68 =================================================================== --- /dev/null +++ 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); Index: devel/qt5-core/Makefile =================================================================== --- devel/qt5-core/Makefile +++ devel/qt5-core/Makefile @@ -2,7 +2,7 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel PKGNAMEPREFIX= qt5- Index: devel/ticcutils/Makefile =================================================================== --- devel/ticcutils/Makefile +++ 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 Index: dns/libpsl/Makefile =================================================================== --- dns/libpsl/Makefile +++ 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}/ Index: editors/libreoffice/Makefile =================================================================== --- editors/libreoffice/Makefile +++ editors/libreoffice/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 .include "${.CURDIR}/Makefile.common" Index: editors/libreoffice/files/patch-icu68 =================================================================== --- /dev/null +++ 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 ); Index: editors/libreoffice6/Makefile =================================================================== --- editors/libreoffice6/Makefile +++ editors/libreoffice6/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 .include "${.CURDIR}/Makefile.common" Index: editors/libreoffice6/files/patch-icu68 =================================================================== --- /dev/null +++ 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 ); Index: editors/poedit/Makefile =================================================================== --- editors/poedit/Makefile +++ 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/ Index: finance/gnucash/Makefile =================================================================== --- finance/gnucash/Makefile +++ 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} Index: games/0ad/Makefile =================================================================== --- games/0ad/Makefile +++ 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 Index: games/0ad/files/patch-icu68 =================================================================== --- /dev/null +++ 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(); Index: games/an/Makefile =================================================================== --- games/an/Makefile +++ 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 Index: games/easyrpg-player/Makefile =================================================================== --- games/easyrpg-player/Makefile +++ games/easyrpg-player/Makefile @@ -3,6 +3,7 @@ PORTNAME= easyrpg-player PORTVERSION= 0.6.2.3 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org Index: games/liblcf/Makefile =================================================================== --- games/liblcf/Makefile +++ games/liblcf/Makefile @@ -3,6 +3,7 @@ PORTNAME= liblcf PORTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org Index: games/openrct2/Makefile =================================================================== --- games/openrct2/Makefile +++ games/openrct2/Makefile @@ -4,6 +4,7 @@ PORTNAME= openrct2 DISTVERSIONPREFIX= v DISTVERSION= 0.3.1 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= pkubaj@FreeBSD.org Index: games/openttd/Makefile =================================================================== --- games/openttd/Makefile +++ 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 Index: games/openttd/files/patch-icu68 =================================================================== --- /dev/null +++ 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; + } + + /** Index: games/widelands/Makefile =================================================================== --- games/widelands/Makefile +++ 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/ Index: graphics/dcmtk/Makefile =================================================================== --- graphics/dcmtk/Makefile +++ 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 Index: graphics/imv/Makefile =================================================================== --- graphics/imv/Makefile +++ 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 Index: graphics/libcdr01/Makefile =================================================================== --- graphics/libcdr01/Makefile +++ graphics/libcdr01/Makefile @@ -2,6 +2,7 @@ PORTNAME= libcdr PORTVERSION= 0.1.6 +PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= LODEV PKGNAMESUFFIX= 01 Index: graphics/libcdr01/files/patch-icu68 =================================================================== --- /dev/null +++ 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(); Index: graphics/libfreehand/Makefile =================================================================== --- graphics/libfreehand/Makefile +++ graphics/libfreehand/Makefile @@ -2,7 +2,7 @@ PORTNAME= libfreehand PORTVERSION= 0.1.2 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= graphics MASTER_SITES= LODEV Index: graphics/libzmf/Makefile =================================================================== --- graphics/libzmf/Makefile +++ graphics/libzmf/Makefile @@ -2,7 +2,7 @@ PORTNAME= libzmf PORTVERSION= 0.0.2 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= graphics MASTER_SITES= LODEV Index: graphics/maim/Makefile =================================================================== --- graphics/maim/Makefile +++ 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 Index: graphics/openfx-arena/Makefile =================================================================== --- graphics/openfx-arena/Makefile +++ 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 Index: graphics/osg/Makefile =================================================================== --- graphics/osg/Makefile +++ 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 Index: graphics/tesseract/Makefile =================================================================== --- graphics/tesseract/Makefile +++ graphics/tesseract/Makefile @@ -3,7 +3,7 @@ PORTNAME= tesseract PORTVERSION= 4.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= pkubaj@FreeBSD.org Index: irc/znc-push/Makefile =================================================================== --- irc/znc-push/Makefile +++ irc/znc-push/Makefile @@ -4,6 +4,7 @@ DISTVERSIONPREFIX= v DISTVERSION= 1.0.0-173 DISTVERSIONSUFFIX= -g78d0385 +PORTREVISION= 1 CATEGORIES= irc MAINTAINER= dor.bsd@xm0.uk Index: irc/znc/Makefile =================================================================== --- irc/znc/Makefile +++ 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/ Index: java/openjfx14/Makefile =================================================================== --- java/openjfx14/Makefile +++ 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 \ Index: java/openjfx14/files/patch-icu68 =================================================================== --- /dev/null +++ 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::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(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::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(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(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(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(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) Index: java/openjfx8-devel/Makefile =================================================================== --- java/openjfx8-devel/Makefile +++ 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/ \ Index: lang/gnustep-base/Makefile =================================================================== --- lang/gnustep-base/Makefile +++ 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 Index: lang/gnustep-base/files/patch-icu68 =================================================================== --- /dev/null +++ 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); Index: lang/hermes/Makefile =================================================================== --- lang/hermes/Makefile +++ lang/hermes/Makefile @@ -3,6 +3,7 @@ PORTNAME= hermes DISTVERSIONPREFIX= v DISTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= lang PKGNAMESUFFIX= -javascript-engine Index: lang/parrot/Makefile =================================================================== --- lang/parrot/Makefile +++ 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 Index: lang/spidermonkey52/Makefile =================================================================== --- lang/spidermonkey52/Makefile +++ 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} Index: lang/spidermonkey60/Makefile =================================================================== --- lang/spidermonkey60/Makefile +++ 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} Index: lang/spidermonkey78/Makefile =================================================================== --- lang/spidermonkey78/Makefile +++ 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} Index: mail/cyrus-imapd30/Makefile =================================================================== --- mail/cyrus-imapd30/Makefile +++ 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}/ Index: mail/cyrus-imapd32/Makefile =================================================================== --- mail/cyrus-imapd32/Makefile +++ 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 Index: mail/dovecot-fts-xapian/Makefile =================================================================== --- mail/dovecot-fts-xapian/Makefile +++ mail/dovecot-fts-xapian/Makefile @@ -2,6 +2,7 @@ PORTNAME= fts-xapian PORTVERSION= 1.4.1 +PORTREVISION= 1 CATEGORIES= mail PKGNAMEPREFIX= dovecot- Index: mail/dovecot/Makefile =================================================================== --- mail/dovecot/Makefile +++ 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/ Index: mail/evolution-ews/Makefile =================================================================== --- mail/evolution-ews/Makefile +++ 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 Index: mail/evolution/Makefile =================================================================== --- mail/evolution/Makefile +++ mail/evolution/Makefile @@ -3,6 +3,7 @@ PORTNAME= evolution PORTVERSION= 3.38.0 +PORTREVISION= 1 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome Index: mail/exim/Makefile =================================================================== --- mail/exim/Makefile +++ 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 \ Index: mail/libvmime/Makefile =================================================================== --- mail/libvmime/Makefile +++ 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 Index: mail/postfix-current/Makefile =================================================================== --- mail/postfix-current/Makefile +++ 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/ \ Index: mail/postfix/Makefile =================================================================== --- mail/postfix/Makefile +++ 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/ \ Index: mail/rspamd-devel/Makefile =================================================================== --- mail/rspamd-devel/Makefile +++ mail/rspamd-devel/Makefile @@ -2,6 +2,7 @@ PORTNAME= rspamd PORTVERSION= 2.6.a1.20200929 +PORTREVISION= 1 CATEGORIES= mail PKGNAMESUFFIX= -devel Index: mail/rspamd/Makefile =================================================================== --- mail/rspamd/Makefile +++ mail/rspamd/Makefile @@ -2,6 +2,7 @@ PORTNAME= rspamd PORTVERSION= 2.6 +PORTREVISION= 1 CATEGORIES= mail MAINTAINER= vsevolod@FreeBSD.org Index: mail/sendmail-devel/Makefile =================================================================== --- mail/sendmail-devel/Makefile +++ 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} Index: mail/sendmail/Makefile =================================================================== --- mail/sendmail/Makefile +++ 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} Index: mail/thunderbird/Makefile =================================================================== --- mail/thunderbird/Makefile +++ 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 Index: math/R/Makefile =================================================================== --- math/R/Makefile +++ 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|\..*||} Index: math/libqalculate/Makefile =================================================================== --- math/libqalculate/Makefile +++ 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}/ Index: math/py-rpy2/Makefile =================================================================== --- math/py-rpy2/Makefile +++ math/py-rpy2/Makefile @@ -3,6 +3,7 @@ PORTNAME= rpy2 PORTVERSION= 3.3.6 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Index: math/sage/Makefile =================================================================== --- math/sage/Makefile +++ 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/ \ Index: misc/sword/Makefile =================================================================== --- misc/sword/Makefile +++ 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}/ Index: misc/xiphos/Makefile =================================================================== --- misc/xiphos/Makefile +++ 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. Index: multimedia/aegisub/Makefile =================================================================== --- multimedia/aegisub/Makefile +++ 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/ \ Index: multimedia/subtitlecomposer/Makefile =================================================================== --- multimedia/subtitlecomposer/Makefile +++ 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 Index: net-im/dino/Makefile =================================================================== --- net-im/dino/Makefile +++ 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 Index: net/freerdp/Makefile =================================================================== --- net/freerdp/Makefile +++ 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}/ Index: net/openldap24-server/Makefile =================================================================== --- net/openldap24-server/Makefile +++ net/openldap24-server/Makefile @@ -66,7 +66,7 @@ .endif PORTREVISION_CLIENT= 0 -PORTREVISION_SERVER= 0 +PORTREVISION_SERVER= 1 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_SHLIB_MINOR= 10.14 OPENLDAP_MAJOR= ${DISTVERSION:R} Index: net/samba412/Makefile =================================================================== --- net/samba412/Makefile +++ 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} Index: net/samba413/Makefile =================================================================== --- net/samba413/Makefile +++ 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} Index: net/yaz/Makefile =================================================================== --- net/yaz/Makefile +++ 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/ Index: net/zebra-server/Makefile =================================================================== --- net/zebra-server/Makefile +++ 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} Index: news/tin/Makefile =================================================================== --- news/tin/Makefile +++ 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}/ \ Index: print/harfbuzz-icu/Makefile =================================================================== --- print/harfbuzz-icu/Makefile +++ print/harfbuzz-icu/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -icu COMMENT= Harfbuzz ICU support Index: print/libmspub01/Makefile =================================================================== --- print/libmspub01/Makefile +++ 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 Index: print/scribus-devel/Makefile =================================================================== --- print/scribus-devel/Makefile +++ 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}/ Index: print/tex-xetex/Makefile =================================================================== --- print/tex-xetex/Makefile +++ 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- Index: print/texlive-base/Makefile =================================================================== --- print/texlive-base/Makefile +++ 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 Index: science/py-tensorflow/Makefile =================================================================== --- science/py-tensorflow/Makefile +++ 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} Index: security/certificate-transparency/Makefile =================================================================== --- security/certificate-transparency/Makefile +++ security/certificate-transparency/Makefile @@ -3,7 +3,7 @@ PORTNAME= certificate-transparency PORTVERSION= 20161015 -PORTREVISION= 45 +PORTREVISION= 46 CATEGORIES= security MAINTAINER= ports@FreeBSD.org Index: sysutils/gdisk/Makefile =================================================================== --- sysutils/gdisk/Makefile +++ 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} Index: sysutils/ltfs/Makefile =================================================================== --- sysutils/ltfs/Makefile +++ sysutils/ltfs/Makefile @@ -5,7 +5,7 @@ DISTVERSIONPREFIX= v DISTVERSION= 2.4.2.0 DISTVERSIONSUFFIX= -10418 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= kbowling@FreeBSD.org Index: sysutils/ltfs/files/patch-icu68 =================================================================== --- /dev/null +++ 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) Index: sysutils/osquery/Makefile =================================================================== --- sysutils/osquery/Makefile +++ sysutils/osquery/Makefile @@ -3,7 +3,7 @@ PORTNAME= osquery PORTVERSION= 3.3.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= sysutils MAINTAINER= zi@FreeBSD.org Index: sysutils/tracker-miners/Makefile =================================================================== --- sysutils/tracker-miners/Makefile +++ 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 Index: sysutils/tracker/Makefile =================================================================== --- sysutils/tracker/Makefile +++ sysutils/tracker/Makefile @@ -3,6 +3,7 @@ PORTNAME= tracker PORTVERSION= 2.3.4 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME Index: textproc/R-cran-stringi/Makefile =================================================================== --- textproc/R-cran-stringi/Makefile +++ textproc/R-cran-stringi/Makefile @@ -3,6 +3,7 @@ PORTNAME= stringi DISTVERSION= 1.5.3 +PORTREVISION= 1 CATEGORIES= textproc DISTNAME= ${PORTNAME}_${DISTVERSION} Index: textproc/dwdiff/Makefile =================================================================== --- textproc/dwdiff/Makefile +++ 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/ Index: textproc/dwdiff/files/patch-icu68 =================================================================== --- /dev/null +++ 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 +-#endif + + /*==== Configuration definitions ====*/ + #ifndef NO_STRDUP Index: textproc/gitlab-elasticsearch-indexer/Makefile =================================================================== --- textproc/gitlab-elasticsearch-indexer/Makefile +++ 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 Index: textproc/hs-pandoc-citeproc/Makefile =================================================================== --- textproc/hs-pandoc-citeproc/Makefile +++ 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_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 \ Index: textproc/hs-pandoc-citeproc/files/extra-patch-icu68 =================================================================== --- /dev/null +++ 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) Index: textproc/libe-book/Makefile =================================================================== --- textproc/libe-book/Makefile +++ 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}/ Index: textproc/libe-book/files/patch-icu68 =================================================================== --- /dev/null +++ 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) + { Index: textproc/libfolia/Makefile =================================================================== --- textproc/libfolia/Makefile +++ textproc/libfolia/Makefile @@ -3,7 +3,7 @@ PORTNAME= libfolia DISTVERSIONPREFIX= v DISTVERSION= 1.15 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= textproc MAINTAINER= yuri@FreeBSD.org Index: textproc/libqxp/Makefile =================================================================== --- textproc/libqxp/Makefile +++ 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}/ Index: textproc/libvisio01/Makefile =================================================================== --- textproc/libvisio01/Makefile +++ 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 Index: textproc/nuspell/Makefile =================================================================== --- textproc/nuspell/Makefile +++ textproc/nuspell/Makefile @@ -3,6 +3,7 @@ PORTNAME= nuspell DISTVERSIONPREFIX= v DISTVERSION= 4.0.0 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= jbeich@FreeBSD.org Index: textproc/raptor2/Makefile =================================================================== --- textproc/raptor2/Makefile +++ 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} Index: textproc/rubygem-charlock_holmes/Makefile =================================================================== --- textproc/rubygem-charlock_holmes/Makefile +++ 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 Index: textproc/ucto/Makefile =================================================================== --- textproc/ucto/Makefile +++ 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 Index: textproc/xalan-c/Makefile =================================================================== --- textproc/xalan-c/Makefile +++ 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} Index: textproc/zorba/Makefile =================================================================== --- textproc/zorba/Makefile +++ 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} Index: textproc/zorba/files/patch-icu68 =================================================================== --- /dev/null +++ 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 */ Index: www/chromium/Makefile =================================================================== --- www/chromium/Makefile +++ 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 Index: www/cliqz/Makefile =================================================================== --- www/cliqz/Makefile +++ 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 Index: www/epiphany/Makefile =================================================================== --- www/epiphany/Makefile +++ www/epiphany/Makefile @@ -3,7 +3,7 @@ PORTNAME= epiphany PORTVERSION= 3.38.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome Index: www/firefox-esr/Makefile =================================================================== --- www/firefox-esr/Makefile +++ 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 \ Index: www/firefox/Makefile =================================================================== --- www/firefox/Makefile +++ 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 \ Index: www/iridium/Makefile =================================================================== --- www/iridium/Makefile +++ 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 Index: www/node/Makefile =================================================================== --- www/node/Makefile +++ 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}/ Index: www/node10/Makefile =================================================================== --- www/node10/Makefile +++ 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 Index: www/node10/files/patch-icu68 =================================================================== --- /dev/null +++ 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 sap1; + std::unique_ptr 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(); Index: www/node12/Makefile =================================================================== --- www/node12/Makefile +++ 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 Index: www/node14/Makefile =================================================================== --- www/node14/Makefile +++ 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 Index: www/qt5-webkit/Makefile =================================================================== --- www/qt5-webkit/Makefile +++ 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- Index: www/qt5-webkit/files/patch-icu68 =================================================================== --- /dev/null +++ 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::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(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::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(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(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(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(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) Index: www/webkit2-gtk3/Makefile =================================================================== --- www/webkit2-gtk3/Makefile +++ 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 Index: www/webkit2-gtk3/files/patch-icu68 =================================================================== --- /dev/null +++ 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::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(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::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(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(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(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(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) Index: x11-toolkits/gnustep-gui/Makefile =================================================================== --- x11-toolkits/gnustep-gui/Makefile +++ 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 Index: x11-toolkits/gnustep-gui/files/patch-icu68 =================================================================== --- /dev/null +++ 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) Index: x11-toolkits/tepl/Makefile =================================================================== --- x11-toolkits/tepl/Makefile +++ 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 Index: x11-toolkits/vte3/Makefile =================================================================== --- x11-toolkits/vte3/Makefile +++ 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 Index: x11/gnome-shell/Makefile =================================================================== --- x11/gnome-shell/Makefile +++ x11/gnome-shell/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnome-shell PORTVERSION= 3.36.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome Index: x11/slop/Makefile =================================================================== --- x11/slop/Makefile +++ x11/slop/Makefile @@ -3,7 +3,7 @@ PORTNAME= slop PORTVERSION= 7.5 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= ports@FreeBSD.org