From owner-svn-ports-all@freebsd.org Tue Nov 3 00:56:34 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1506E45FFA3; Tue, 3 Nov 2020 00:56:34 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CQBDx6zH0z4HJB; Tue, 3 Nov 2020 00:56:33 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D2F2C11FFA; Tue, 3 Nov 2020 00:56:33 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A30uXsF030022; Tue, 3 Nov 2020 00:56:33 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A30uRbZ029986; Tue, 3 Nov 2020 00:56:27 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202011030056.0A30uRbZ029986@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 3 Nov 2020 00:56:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553940 - in head: archivers/unarchiver audio/musicpd audio/ncmpcpp databases/couchdb2 databases/couchdb3 databases/evolution-data-server databases/firebird25-server databases/kbibtex d... X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head: archivers/unarchiver audio/musicpd audio/ncmpcpp databases/couchdb2 databases/couchdb3 databases/evolution-data-server databases/firebird25-server databases/kbibtex databases/kdb databases/my... X-SVN-Commit-Revision: 553940 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2020 00:56:34 -0000 Author: jbeich Date: Tue Nov 3 00:56:26 2020 New Revision: 553940 URL: https://svnweb.freebsd.org/changeset/ports/553940 Log: devel/icu: update to 68.1 Changes: http://site.icu-project.org/download/68 ABI: https://abi-laboratory.pro/tracker/timeline/icu4c/ Reported by: GitHub (watch releases) Added: head/databases/mysql80-server/files/patch-icu68 (contents, props changed) head/databases/postgresql10-server/files/patch-icu68 (contents, props changed) head/databases/postgresql11-server/files/patch-icu68 (contents, props changed) head/databases/postgresql12-server/files/patch-icu68 (contents, props changed) head/databases/postgresql13-server/files/patch-icu68 (contents, props changed) head/databases/postgresql96-server/files/patch-icu68 (contents, props changed) head/deskutils/calibre/files/patch-icu68 (contents, props changed) head/devel/icu-le-hb/files/ head/devel/icu-le-hb/files/patch-icu68 (contents, props changed) head/devel/libical/files/ head/devel/libical/files/patch-icu68 (contents, props changed) head/devel/php72-intl/files/ head/devel/php72-intl/files/patch-icu68 (contents, props changed) head/devel/php73-intl/files/ head/devel/php73-intl/files/patch-icu68 (contents, props changed) head/devel/php74-intl/files/ head/devel/php74-intl/files/patch-icu68 (contents, props changed) head/devel/php80-intl/files/ head/devel/php80-intl/files/patch-icu68 (contents, props changed) head/devel/py-pyicu/files/ head/devel/py-pyicu/files/patch-icu68 (contents, props changed) head/editors/libreoffice/files/patch-icu68 (contents, props changed) head/editors/libreoffice6/files/patch-icu68 (contents, props changed) head/games/0ad/files/patch-icu68 (contents, props changed) head/games/openttd/files/patch-icu68 (contents, props changed) head/graphics/libcdr01/files/ head/graphics/libcdr01/files/patch-icu68 (contents, props changed) head/java/openjfx14/files/patch-icu68 (contents, props changed) head/lang/gnustep-base/files/patch-icu68 (contents, props changed) head/sysutils/ltfs/files/ head/sysutils/ltfs/files/patch-icu68 (contents, props changed) head/textproc/dwdiff/files/patch-icu68 (contents, props changed) head/textproc/hs-pandoc-citeproc/files/ head/textproc/hs-pandoc-citeproc/files/extra-patch-icu68 (contents, props changed) head/textproc/libe-book/files/ head/textproc/libe-book/files/patch-icu68 (contents, props changed) head/textproc/zorba/files/patch-icu68 (contents, props changed) head/www/node10/files/patch-icu68 (contents, props changed) head/www/qt5-webkit/files/patch-icu68 (contents, props changed) head/www/webkit2-gtk3/files/patch-icu68 (contents, props changed) head/x11-toolkits/gnustep-gui/files/ head/x11-toolkits/gnustep-gui/files/patch-icu68 (contents, props changed) Modified: head/archivers/unarchiver/Makefile (contents, props changed) head/audio/musicpd/Makefile (contents, props changed) head/audio/ncmpcpp/Makefile (contents, props changed) head/databases/couchdb2/Makefile (contents, props changed) head/databases/couchdb3/Makefile (contents, props changed) head/databases/evolution-data-server/Makefile (contents, props changed) head/databases/firebird25-server/Makefile (contents, props changed) head/databases/kbibtex/Makefile (contents, props changed) head/databases/kdb/Makefile (contents, props changed) head/databases/mysql80-client/Makefile (contents, props changed) head/databases/mysql80-server/Makefile (contents, props changed) head/databases/postgresql10-server/Makefile (contents, props changed) head/databases/postgresql11-server/Makefile (contents, props changed) head/databases/postgresql12-server/Makefile (contents, props changed) head/databases/postgresql13-server/Makefile (contents, props changed) head/databases/postgresql96-server/Makefile (contents, props changed) head/databases/sqlite3/Makefile (contents, props changed) head/databases/tarantool/Makefile (contents, props changed) head/deskutils/calibre/Makefile (contents, props changed) head/deskutils/osmo/Makefile (contents, props changed) head/deskutils/peaclock/Makefile (contents, props changed) head/devel/boost-libs/Makefile (contents, props changed) head/devel/dee/Makefile (contents, props changed) head/devel/icu-le-hb/Makefile (contents, props changed) head/devel/icu/Makefile (contents, props changed) head/devel/icu/distinfo (contents, props changed) head/devel/icu/pkg-plist (contents, props changed) head/devel/kiwix-lib/Makefile (contents, props changed) head/devel/libical/Makefile (contents, props changed) head/devel/libphonenumber/Makefile (contents, props changed) head/devel/libzim/Makefile (contents, props changed) head/devel/objecthash/Makefile (contents, props changed) head/devel/php72-intl/Makefile (contents, props changed) head/devel/php73-intl/Makefile (contents, props changed) head/devel/php74-intl/Makefile (contents, props changed) head/devel/php80-intl/Makefile (contents, props changed) head/devel/py-pyicu/Makefile (contents, props changed) head/devel/qt5-core/Makefile (contents, props changed) head/devel/ticcutils/Makefile (contents, props changed) head/dns/libpsl/Makefile (contents, props changed) head/editors/libreoffice/Makefile (contents, props changed) head/editors/libreoffice6/Makefile (contents, props changed) head/editors/poedit/Makefile (contents, props changed) head/finance/gnucash/Makefile (contents, props changed) head/games/0ad/Makefile (contents, props changed) head/games/an/Makefile (contents, props changed) head/games/easyrpg-player/Makefile (contents, props changed) head/games/liblcf/Makefile (contents, props changed) head/games/openrct2/Makefile (contents, props changed) head/games/openttd/Makefile (contents, props changed) head/games/widelands/Makefile (contents, props changed) head/graphics/dcmtk/Makefile (contents, props changed) head/graphics/imv/Makefile (contents, props changed) head/graphics/libcdr01/Makefile (contents, props changed) head/graphics/libfreehand/Makefile (contents, props changed) head/graphics/libzmf/Makefile (contents, props changed) head/graphics/maim/Makefile (contents, props changed) head/graphics/openfx-arena/Makefile (contents, props changed) head/graphics/osg/Makefile (contents, props changed) head/graphics/tesseract/Makefile (contents, props changed) head/irc/znc-push/Makefile (contents, props changed) head/irc/znc/Makefile (contents, props changed) head/java/openjfx14/Makefile (contents, props changed) head/java/openjfx8-devel/Makefile (contents, props changed) head/lang/gnustep-base/Makefile (contents, props changed) head/lang/hermes/Makefile (contents, props changed) head/lang/parrot/Makefile (contents, props changed) head/lang/spidermonkey52/Makefile (contents, props changed) head/lang/spidermonkey60/Makefile (contents, props changed) head/lang/spidermonkey78/Makefile (contents, props changed) head/mail/cyrus-imapd30/Makefile (contents, props changed) head/mail/cyrus-imapd32/Makefile (contents, props changed) head/mail/dovecot-fts-xapian/Makefile (contents, props changed) head/mail/dovecot/Makefile (contents, props changed) head/mail/evolution-ews/Makefile (contents, props changed) head/mail/evolution/Makefile (contents, props changed) head/mail/exim/Makefile (contents, props changed) head/mail/libvmime/Makefile (contents, props changed) head/mail/postfix-current/Makefile (contents, props changed) head/mail/postfix/Makefile (contents, props changed) head/mail/rspamd-devel/Makefile (contents, props changed) head/mail/rspamd/Makefile (contents, props changed) head/mail/sendmail-devel/Makefile (contents, props changed) head/mail/sendmail/Makefile (contents, props changed) head/mail/thunderbird/Makefile (contents, props changed) head/math/R/Makefile (contents, props changed) head/math/libqalculate/Makefile (contents, props changed) head/math/py-rpy2/Makefile (contents, props changed) head/math/sage/Makefile (contents, props changed) head/misc/sword/Makefile (contents, props changed) head/misc/xiphos/Makefile (contents, props changed) head/multimedia/aegisub/Makefile (contents, props changed) head/multimedia/subtitlecomposer/Makefile (contents, props changed) head/net-im/dino/Makefile (contents, props changed) head/net/freerdp/Makefile (contents, props changed) head/net/openldap24-server/Makefile (contents, props changed) head/net/samba412/Makefile (contents, props changed) head/net/samba413/Makefile (contents, props changed) head/net/yaz/Makefile (contents, props changed) head/net/zebra-server/Makefile (contents, props changed) head/news/tin/Makefile (contents, props changed) head/print/harfbuzz-icu/Makefile (contents, props changed) head/print/libmspub01/Makefile (contents, props changed) head/print/scribus-devel/Makefile (contents, props changed) head/print/tex-xetex/Makefile (contents, props changed) head/print/texlive-base/Makefile (contents, props changed) head/science/py-tensorflow/Makefile (contents, props changed) head/security/certificate-transparency/Makefile (contents, props changed) head/sysutils/gdisk/Makefile (contents, props changed) head/sysutils/ltfs/Makefile (contents, props changed) head/sysutils/osquery/Makefile (contents, props changed) head/sysutils/tracker-miners/Makefile (contents, props changed) head/sysutils/tracker/Makefile (contents, props changed) head/textproc/R-cran-stringi/Makefile (contents, props changed) head/textproc/dwdiff/Makefile (contents, props changed) head/textproc/gitlab-elasticsearch-indexer/Makefile (contents, props changed) head/textproc/hs-pandoc-citeproc/Makefile (contents, props changed) head/textproc/libe-book/Makefile (contents, props changed) head/textproc/libfolia/Makefile (contents, props changed) head/textproc/libqxp/Makefile (contents, props changed) head/textproc/libvisio01/Makefile (contents, props changed) head/textproc/nuspell/Makefile (contents, props changed) head/textproc/raptor2/Makefile (contents, props changed) head/textproc/rubygem-charlock_holmes/Makefile (contents, props changed) head/textproc/ucto/Makefile (contents, props changed) head/textproc/xalan-c/Makefile (contents, props changed) head/textproc/zorba/Makefile (contents, props changed) head/www/chromium/Makefile (contents, props changed) head/www/cliqz/Makefile (contents, props changed) head/www/epiphany/Makefile (contents, props changed) head/www/firefox-esr/Makefile (contents, props changed) head/www/firefox/Makefile (contents, props changed) head/www/iridium/Makefile (contents, props changed) head/www/node/Makefile (contents, props changed) head/www/node10/Makefile (contents, props changed) head/www/node12/Makefile (contents, props changed) head/www/node14/Makefile (contents, props changed) head/www/qt5-webkit/Makefile (contents, props changed) head/www/webkit2-gtk3/Makefile (contents, props changed) head/x11-toolkits/gnustep-gui/Makefile (contents, props changed) head/x11-toolkits/tepl/Makefile (contents, props changed) head/x11-toolkits/vte3/Makefile (contents, props changed) head/x11/gnome-shell/Makefile (contents, props changed) head/x11/slop/Makefile (contents, props changed) Modified: head/archivers/unarchiver/Makefile ============================================================================== --- head/archivers/unarchiver/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/archivers/unarchiver/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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 Modified: head/audio/musicpd/Makefile ============================================================================== --- head/audio/musicpd/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/audio/musicpd/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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} Modified: head/audio/ncmpcpp/Makefile ============================================================================== --- head/audio/ncmpcpp/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/audio/ncmpcpp/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -2,7 +2,7 @@ PORTNAME= ncmpcpp DISTVERSION= 0.8.2 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= audio MASTER_SITES= https://ncmpcpp.rybczak.net/stable/ Modified: head/databases/couchdb2/Makefile ============================================================================== --- head/databases/couchdb2/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/couchdb2/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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} Modified: head/databases/couchdb3/Makefile ============================================================================== --- head/databases/couchdb3/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/couchdb3/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -3,6 +3,7 @@ PORTNAME= couchdb3 PORTREVISION= 1 DISTVERSION= 3.1.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= APACHE/couchdb/source/${DISTVERSION} DISTNAME= apache-couchdb-${DISTVERSION} Modified: head/databases/evolution-data-server/Makefile ============================================================================== --- head/databases/evolution-data-server/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/evolution-data-server/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -3,6 +3,7 @@ PORTNAME= evolution-data-server PORTVERSION= 3.38.1 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome Modified: head/databases/firebird25-server/Makefile ============================================================================== --- head/databases/firebird25-server/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/firebird25-server/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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 Modified: head/databases/kbibtex/Makefile ============================================================================== --- head/databases/kbibtex/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/kbibtex/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -3,7 +3,7 @@ PORTNAME= kbibtex DISTVERSION= 0.9.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases kde MASTER_SITES= KDE/stable/KBibTeX/${DISTVERSION} Modified: head/databases/kdb/Makefile ============================================================================== --- head/databases/kdb/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/kdb/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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} Modified: head/databases/mysql80-client/Makefile ============================================================================== --- head/databases/mysql80-client/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/mysql80-client/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) Modified: head/databases/mysql80-server/Makefile ============================================================================== --- head/databases/mysql80-server/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/mysql80-server/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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 Added: head/databases/mysql80-server/files/patch-icu68 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql80-server/files/patch-icu68 Tue Nov 3 00:56:26 2020 (r553940) @@ -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, Modified: head/databases/postgresql10-server/Makefile ============================================================================== --- head/databases/postgresql10-server/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/postgresql10-server/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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 Added: head/databases/postgresql10-server/files/patch-icu68 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/postgresql10-server/files/patch-icu68 Tue Nov 3 00:56:26 2020 (r553940) @@ -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 Modified: head/databases/postgresql11-server/Makefile ============================================================================== --- head/databases/postgresql11-server/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/postgresql11-server/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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 Added: head/databases/postgresql11-server/files/patch-icu68 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/postgresql11-server/files/patch-icu68 Tue Nov 3 00:56:26 2020 (r553940) @@ -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", Modified: head/databases/postgresql12-server/Makefile ============================================================================== --- head/databases/postgresql12-server/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/postgresql12-server/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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 Added: head/databases/postgresql12-server/files/patch-icu68 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/postgresql12-server/files/patch-icu68 Tue Nov 3 00:56:26 2020 (r553940) @@ -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", Modified: head/databases/postgresql13-server/Makefile ============================================================================== --- head/databases/postgresql13-server/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/postgresql13-server/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -5,7 +5,7 @@ PORTNAME?= postgresql DISTVERSION?= 13.0 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES?= databases MASTER_SITES= PGSQL/source/v${DISTVERSION} PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} Added: head/databases/postgresql13-server/files/patch-icu68 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/postgresql13-server/files/patch-icu68 Tue Nov 3 00:56:26 2020 (r553940) @@ -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", Modified: head/databases/postgresql96-server/Makefile ============================================================================== --- head/databases/postgresql96-server/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/postgresql96-server/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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 Added: head/databases/postgresql96-server/files/patch-icu68 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/postgresql96-server/files/patch-icu68 Tue Nov 3 00:56:26 2020 (r553940) @@ -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 Modified: head/databases/sqlite3/Makefile ============================================================================== --- head/databases/sqlite3/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/sqlite3/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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/ Modified: head/databases/tarantool/Makefile ============================================================================== --- head/databases/tarantool/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/databases/tarantool/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -3,6 +3,7 @@ PORTNAME= tarantool PORTVERSION= 2.4.2 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/deskutils/calibre/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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}/ Added: head/deskutils/calibre/files/patch-icu68 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/calibre/files/patch-icu68 Tue Nov 3 00:56:26 2020 (r553940) @@ -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; Modified: head/deskutils/osmo/Makefile ============================================================================== --- head/deskutils/osmo/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/deskutils/osmo/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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} Modified: head/deskutils/peaclock/Makefile ============================================================================== --- head/deskutils/peaclock/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/deskutils/peaclock/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -2,6 +2,7 @@ PORTNAME= peaclock DISTVERSION= 0.4.3 +PORTREVISION= 1 CATEGORIES= deskutils MAINTAINER= yuri@FreeBSD.org Modified: head/devel/boost-libs/Makefile ============================================================================== --- head/devel/boost-libs/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/devel/boost-libs/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= boost-libs -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Free portable C++ libraries (without Boost.Python) Modified: head/devel/dee/Makefile ============================================================================== --- head/devel/dee/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/devel/dee/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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/ Modified: head/devel/icu-le-hb/Makefile ============================================================================== --- head/devel/icu-le-hb/Makefile Tue Nov 3 00:55:29 2020 (r553939) +++ head/devel/icu-le-hb/Makefile Tue Nov 3 00:56:26 2020 (r553940) @@ -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 Added: head/devel/icu-le-hb/files/patch-icu68 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/icu-le-hb/files/patch-icu68 Tue Nov 3 00:56:26 2020 (r553940) @@ -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 + { *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***