CVS commit: pkgsrc/x11/qt6-qtbase

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Nov 11 22:13:35 UTC 2025

Modified Files:
        pkgsrc/x11/qt6-qtbase: Makefile

Log Message:
qt6-qtbase: mark as conflicting with qt6-qtwayland<6.10.0

some files moved from there to this package with the 6.10 update


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/x11/qt6-qtbase/Makefile

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

Modified files:

Index: pkgsrc/x11/qt6-qtbase/Makefile
diff -u pkgsrc/x11/qt6-qtbase/Makefile:1.61 pkgsrc/x11/qt6-qtbase/Makefile:1.62
--- pkgsrc/x11/qt6-qtbase/Makefile:1.61 Tue Nov 11 14:24:29 2025
+++ pkgsrc/x11/qt6-qtbase/Makefile      Tue Nov 11 22:13:35 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2025/11/11 14:24:29 abs Exp $
+# $NetBSD: Makefile,v 1.62 2025/11/11 22:13:35 wiz Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtbase-${QTVERSION}
@@ -7,6 +7,8 @@ CATEGORIES=     x11
 
 LICENSE=       gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
 
+CONFLICTS+=    qt6-qtwayland<6.10.0
+
 .include "Makefile.common"
 
 HAS_CONFIGURE=         yes