CVS commit: pkgsrc/x11/qt6-qtbase

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Wed Sep  3 00:04:32 UTC 2025

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

Log Message:
Fix building x11/qt6-qtbase on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/x11/qt6-qtbase/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/qt6-qtbase/PLIST

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.51 pkgsrc/x11/qt6-qtbase/Makefile:1.52
--- pkgsrc/x11/qt6-qtbase/Makefile:1.51 Sat Aug 30 22:46:45 2025
+++ pkgsrc/x11/qt6-qtbase/Makefile      Wed Sep  3 00:04:32 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2025/08/30 22:46:45 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2025/09/03 00:04:32 js Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtbase-${QTVERSION}
@@ -65,7 +65,11 @@ CONFIGURE_ARGS+=     -no-rpath       # avoid @rpat
 QMAKE_CONF=            qmake.conf.mac
 .endif
 
-PLIST_VARS+=   egl egldevice x11
+PLIST_VARS+=   egl egldevice x11 NotDarwin
+
+.if ${OPSYS} != "Darwin"
+PLIST.NotDarwin=       yes
+.endif
 
 .include "../../mk/compiler.mk"
 

Index: pkgsrc/x11/qt6-qtbase/PLIST
diff -u pkgsrc/x11/qt6-qtbase/PLIST:1.22 pkgsrc/x11/qt6-qtbase/PLIST:1.23
--- pkgsrc/x11/qt6-qtbase/PLIST:1.22    Thu Jul 17 15:35:55 2025
+++ pkgsrc/x11/qt6-qtbase/PLIST Wed Sep  3 00:04:32 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2025/07/17 15:35:55 leot Exp $
+@comment $NetBSD: PLIST,v 1.23 2025/09/03 00:04:32 js Exp $
 lib/pkgconfig/Qt6Concurrent.pc
 lib/pkgconfig/Qt6Core.pc
 ${PLIST.dbus}lib/pkgconfig/Qt6DBus.pc
@@ -323,7 +323,7 @@ qt6/include/QtCore/${PKGVERSION}/QtCore/
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qthreadstorage_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qtimer_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qtimerinfo_unix_p.h
-qt6/include/QtCore/${PKGVERSION}/QtCore/private/qtimezonelocale_p.h
+${PLIST.NotDarwin}qt6/include/QtCore/${PKGVERSION}/QtCore/private/qtimezonelocale_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qtimezoneprivate_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qtipccommon_p.h
 qt6/include/QtCore/${PKGVERSION}/QtCore/private/qtools_p.h