On Thu, Oct 01, 2020 at 09:09:16PM -0400, Brad Smith wrote:
>
> It should go the other way around. Try something like this.
>
I see thanks. Your diff also has the issue which I hit with my diff:
Can't install mariadb-server-10.5.5p0v1 because of conflicts
(mariadb-client-10.5.5p0v1)
I think it needs to be like sthen@ mentioned:
@conflict mariadb-server-<10.5.5p0v1
It's interesting that three people didn't notice that problem, when
preparing the diff or when reviwing it.
I'm really curious about rationale of this unexpected behaviour of
conflict marker. I find it confusing.
I'm testing Brad's diff with conflict marker fix. Will reply when I'm
done with final diff.
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/databases/mariadb/Makefile,v
> retrieving revision 1.96
> diff -u -p -u -p -r1.96 Makefile
> --- Makefile 12 Aug 2020 14:43:54 -0000 1.96
> +++ Makefile 30 Sep 2020 20:21:27 -0000
> @@ -9,8 +9,9 @@ DISTNAME= mariadb-${VERSION}
> PKGNAME-main= mariadb-client-${VERSION}
> PKGNAME-server= mariadb-server-${VERSION}
> PKGNAME-tests= mariadb-tests-${VERSION}
> +REVISION-main= 0
> +REVISION-server= 0
> EPOCH= 1
> -
> CATEGORIES= databases
> MASTER_SITES=
> https://downloads.mariadb.com/MariaDB/${DISTNAME}/source/ \
> https://ftp.osuosl.org/pub/mariadb/${DISTNAME}/source/
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /home/cvs/ports/databases/mariadb/pkg/PLIST-main,v
> retrieving revision 1.21
> diff -u -p -u -p -r1.21 PLIST-main
> --- pkg/PLIST-main 26 Jun 2020 08:46:42 -0000 1.21
> +++ pkg/PLIST-main 30 Sep 2020 21:02:22 -0000
> @@ -1,5 +1,6 @@
> @comment $OpenBSD: PLIST-main,v 1.21 2020/06/26 08:46:42 sthen Exp $
> @conflict mariadb-server-<=10.4.12v1
> +@conflict mariadb-server-<=10.5.5v1
> @conflict mytop-*
> @pkgpath databases/mytop
> @bin bin/mariadb
> @@ -18,6 +19,7 @@ bin/mariadb-hotcopy
> bin/mariadb-setpermission
> @bin bin/mariadb-show
> @bin bin/mariadb-slap
> +@bin bin/mariadb-waitpid
> @bin bin/mariadb_config
> bin/msql2mysql
> bin/mysql
> @@ -88,6 +90,7 @@ lib/pkgconfig/mariadb.pc
> @man man/man1/mariadb-setpermission.1
> @man man/man1/mariadb-show.1
> @man man/man1/mariadb-slap.1
> +@man man/man1/mariadb-waitpid.1
> @man man/man1/mariadb.1
> @man man/man1/mariadb_config.1
> @man man/man1/mbstream.1
> Index: pkg/PLIST-server
> ===================================================================
> RCS file: /home/cvs/ports/databases/mariadb/pkg/PLIST-server,v
> retrieving revision 1.35
> diff -u -p -u -p -r1.35 PLIST-server
> --- pkg/PLIST-server 12 Aug 2020 14:43:54 -0000 1.35
> +++ pkg/PLIST-server 30 Sep 2020 20:19:23 -0000
> @@ -18,7 +18,6 @@ bin/mariadb-install-db
> bin/mariadb-secure-installation
> @bin bin/mariadb-tzinfo-to-sql
> @bin bin/mariadb-upgrade
> -@bin bin/mariadb-waitpid
> bin/mariadbd-multi
> bin/mariadbd-safe
> @bin bin/mariadbd-safe-helper
> @@ -522,7 +521,6 @@ libexec/mysqld
> @man man/man1/mariadb-secure-installation.1
> @man man/man1/mariadb-tzinfo-to-sql.1
> @man man/man1/mariadb-upgrade.1
> -@man man/man1/mariadb-waitpid.1
> @man man/man1/mariadbd-multi.1
> @man man/man1/mariadbd-safe-helper.1
> @man man/man1/mariadbd-safe.1
--
Regards,
Mikolaj
