On Mon, 11 Nov 2024 23:29:27 +0100 "Dr. Peter Voigt" <[email protected]> wrote:
> I am unable to upgrade MariaDB from 10.11.9 to 10.11.10. > > I am using FreeBSD 13.4-RELEASE-p2 and have tried to upgrade MariaDB > using portmaster and make install. > > Build of MariaDB 10.11.10 completes just fine but I am unable to > install: > > pkg-static: mariadb1011-server-10.11.10 conflicts with mariadb1011- > client-10.11.10 (installs files into the same place). > Problematic file: /usr/local/bin/mytop > *** Error code 1 > > I have not installed databases/mytop at all. > > I've left a comment for closed bug report 266630: > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=266630 > > because it seems related to my issue. Starting with 10.11.10 MariaDB > shipped mytop is installed per default which seems to conflict with > server and client port. > > Howver, bug report 266630 has status "closed" and my comment might not > be read at all. > > Could anybody please give me a hint, how to upgrade to MariaDB > 10.11.10 or should I place a new bug report? You can patch locally databases/mariadb1011-server/pkg-plist by reversing the latest delta to the file. patch -R < attached_file HTH, -- Piotr Smyrak
commit a8e7b5f4b6bd64d7a805c08b5027a41da51640c3 Author: Bernard Spil <[email protected]> Date: 2024-11-10 14:34:56 +0100 databases/mytop: Adopt port and fix conflicts * The MariaDB ports have shipped a mytop for a long time. This was commented out due to earlier conflicts. These changes use the packaged mytop for MariaDB ports whilst providing the port for MySQL versions. Reported by: till php net PR: 266630 diff --git databases/mariadb1011-server/pkg-plist databases/mariadb1011-server/pkg-plist index 2f45fcfa3815..94b7ef49acc7 100644 --- databases/mariadb1011-server/pkg-plist +++ databases/mariadb1011-server/pkg-plist @@ -26,7 +26,7 @@ bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack -@comment bin/mytop +bin/mytop %%ROCKSDB%%bin/myrocks_hotbackup bin/mysql_client_test bin/mysql_client_test_embedded @@ -305,7 +305,7 @@ libexec/mysqld @comment share/man/man1/mysqlslap.1.gz @comment share/man/man1/mysqltest.1.gz @comment share/man/man1/mysqltest_embedded.1.gz -@comment @comment share/man/man1/mytop.1.gz +share/man/man1/mytop.1.gz @comment share/man/man1/mysql.server.1.gz @comment share/man/man1/mysql_fix_extensions.1.gz @comment share/man/man1/mysql_install_db.1.gz
