CVS commit: pkgsrc/misc/libreoffice5-bin

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Dec  6 00:27:33 UTC 2022

Modified Files:
        pkgsrc/misc/libreoffice5-bin: Makefile

Log Message:
libreoffice5-bin: this also conflicts with libreoffice6-bin


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/misc/libreoffice5-bin/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice5-bin/Makefile
diff -u pkgsrc/misc/libreoffice5-bin/Makefile:1.8 pkgsrc/misc/libreoffice5-bin/Makefile:1.9
--- pkgsrc/misc/libreoffice5-bin/Makefile:1.8   Sun Nov  3 17:04:23 2019
+++ pkgsrc/misc/libreoffice5-bin/Makefile       Tue Dec  6 00:27:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/11/03 17:04:23 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2022/12/06 00:27:33 gutteridge Exp $
 
 DISTNAME=              libreoffice5-bin        # overridden below
 PKGNAME=               libreoffice5-bin-${OO_RELEASE}
@@ -19,6 +19,7 @@ CONFLICTS+=           openoffice3-bin-[0-9]*
 CONFLICTS+=            openoffice-linux-[0-9]*
 CONFLICTS+=            libreoffice3-bin-[0-9]*
 CONFLICTS+=            libreoffice4-bin-[0-9]*
+CONFLICTS+=            libreoffice6-bin-[0-9]*
 
 OO_VER=                        5
 OO_BASEVER=            ${OO_VER}.4