qt*: rename PLIST.unix to PLIST.notdarwin, to reflect what it's used for.

The previous name was confusing. Darwin *is* UNIX(R) according to TOG.

7 files changed, 95 insertions, 95 deletions

diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
index 00e24d849d3..33d9350a8b2 100644
--- a/x11/qt4-libs/Makefile.common
+++ b/x11/qt4-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.50 2020/03/17 19:23:46 tnn Exp $
+# $NetBSD: Makefile.common,v 1.51 2020/03/18 21:55:23 tnn Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -49,14 +49,14 @@ LIBQT?=			-lQtCore -lQtGui
 
 MAKE_ENV+=		QTPREFIX=${QTPREFIX:Q}
 MAKE_ENV+=		QTDIR=${WRKSRC}
-PLIST_VARS+=		mac unix
+PLIST_VARS+=		mac notdarwin
 .if ${OPSYS} == "Darwin"
 CFLAGS+=		-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1
 PLIST.mac=		yes
 QMAKE_CONF=		qmake.conf.mac
 QMAKE_RANLIB=		${RANLIB}
 .else
-PLIST.unix=		yes
+PLIST.notdarwin=	yes
 QMAKE_CONF=		qmake.conf
 QMAKE_RANLIB=		${TRUE}
 .endif
diff --git a/x11/qt4-libs/PLIST b/x11/qt4-libs/PLIST
index 04780c9dd3e..7fbacf6dff2 100644
--- a/x11/qt4-libs/PLIST
+++ b/x11/qt4-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2018/01/01 22:30:04 rillig Exp $
+@comment $NetBSD: PLIST,v 1.21 2020/03/18 21:55:23 tnn Exp $
 lib/pkgconfig/Qt3Support.pc
 lib/pkgconfig/QtCore.pc
 lib/pkgconfig/QtDeclarative.pc
@@ -58,7 +58,7 @@ qt4/plugins/imageformats/libqico.la
 qt4/plugins/imageformats/libqjpeg.la
 qt4/plugins/imageformats/libqsvg.la
 qt4/plugins/imageformats/libqtga.la
-${PLIST.unix}qt4/plugins/inputmethods/libqimsw-multi.la
+${PLIST.notdarwin}qt4/plugins/inputmethods/libqimsw-multi.la
 qt4/q3porting.xml
 ${PLIST.mac}qt4/qt_menu.nib/classes.nib
 ${PLIST.mac}qt4/qt_menu.nib/info.nib
diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST
index 84ff8362188..dcfa2845251 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2015/07/08 17:49:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.37 2020/03/18 21:55:23 tnn Exp $
 lib/pkgconfig/QtCLucene.pc
 lib/pkgconfig/QtDesigner.pc
 lib/pkgconfig/QtDesignerComponents.pc
@@ -19,7 +19,7 @@ qt4/bin/qhelpgenerator
 qt4/bin/qmake
 qt4/bin/qmlviewer
 qt4/bin/qt3to4
-${PLIST.unix}qt4/bin/qtconfig
+${PLIST.notdarwin}qt4/bin/qtconfig
 qt4/bin/qttracereplay
 qt4/bin/xmlpatterns
 qt4/bin/xmlpatternsvalidator
diff --git a/x11/qt5-qtbase/Makefile.common b/x11/qt5-qtbase/Makefile.common
index 81231ab280c..870284246f9 100644
--- a/x11/qt5-qtbase/Makefile.common
+++ b/x11/qt5-qtbase/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2020/03/14 11:41:00 nia Exp $
+# $NetBSD: Makefile.common,v 1.40 2020/03/18 21:55:23 tnn Exp $
 # used by x11/qt5-mysql/Makefile
 # used by x11/qt5-odbc/Makefile
 # used by x11/qt5-psql/Makefile
@@ -52,9 +52,9 @@ BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-rpath-link,${PREFIX}/qt5/lib
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-rpath-link,${WRKSRC}/lib
 
 MAKE_ENV+=		QTPREFIX=${QTPREFIX:Q}
-PLIST_VARS+=		unix
+PLIST_VARS+=		notdarwin
 .if ${OPSYS} != "Darwin"
-PLIST.unix=		yes
+PLIST.notdarwin=	yes
 .endif
 
 # avoid creating a .qt directory in the users home directory
diff --git a/x11/qt5-qtbase/PLIST b/x11/qt5-qtbase/PLIST
index abcf9cc3957..d41148f85d3 100644
--- a/x11/qt5-qtbase/PLIST
+++ b/x11/qt5-qtbase/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2020/03/18 21:48:03 tnn Exp $
+@comment $NetBSD: PLIST,v 1.30 2020/03/18 21:55:23 tnn Exp $
 lib/pkgconfig/Qt5Concurrent.pc
 lib/pkgconfig/Qt5Core.pc
 ${PLIST.dbus}lib/pkgconfig/Qt5DBus.pc
@@ -1033,11 +1033,11 @@ qt5/include/QtFontDatabaseSupport/QtFontDatabaseSupport
 qt5/include/QtFontDatabaseSupport/QtFontDatabaseSupportDepends
 qt5/include/QtFontDatabaseSupport/QtFontDatabaseSupportVersion
 qt5/include/QtFontDatabaseSupport/qtfontdatabasesupportversion.h
-${PLIST.unix}qt5/include/QtGlxSupport/${PKGVERSION}/QtGlxSupport/private/qglxconvenience_p.h
-${PLIST.unix}qt5/include/QtGlxSupport/QtGlxSupport
-${PLIST.unix}qt5/include/QtGlxSupport/QtGlxSupportDepends
-${PLIST.unix}qt5/include/QtGlxSupport/QtGlxSupportVersion
-${PLIST.unix}qt5/include/QtGlxSupport/qtglxsupportversion.h
+${PLIST.notdarwin}qt5/include/QtGlxSupport/${PKGVERSION}/QtGlxSupport/private/qglxconvenience_p.h
+${PLIST.notdarwin}qt5/include/QtGlxSupport/QtGlxSupport
+${PLIST.notdarwin}qt5/include/QtGlxSupport/QtGlxSupportDepends
+${PLIST.notdarwin}qt5/include/QtGlxSupport/QtGlxSupportVersion
+${PLIST.notdarwin}qt5/include/QtGlxSupport/qtglxsupportversion.h
 qt5/include/QtGui/${PKGVERSION}/QtGui/private/cs_tdr_p.h
 qt5/include/QtGui/${PKGVERSION}/QtGui/private/qabstractlayoutstyleinfo_p.h
 qt5/include/QtGui/${PKGVERSION}/QtGui/private/qabstracttextdocumentlayout_p.h
@@ -1653,36 +1653,36 @@ qt5/include/QtGui/qvulkanwindow.h
 qt5/include/QtGui/qwindow.h
 qt5/include/QtGui/qwindowdefs.h
 qt5/include/QtGui/qwindowdefs_win.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/devicehandlerlist_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevkeyboard_defaultmap_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevkeyboardhandler_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevkeyboardmanager_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevmousehandler_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevmousemanager_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtablethandler_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtabletmanager_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtouchfilter_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtouchhandler_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtouchmanager_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevutil_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qlibinputhandler_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qlibinputkeyboard_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qlibinputpointer_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qlibinputtouch_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qtouchoutputmapping_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qtslib_p.h
-${PLIST.unix}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qxkbcommon_p.h
-${PLIST.unix}qt5/include/QtInputSupport/QIntegrityHIDManager
-${PLIST.unix}qt5/include/QtInputSupport/QtInputSupport
-${PLIST.unix}qt5/include/QtInputSupport/QtInputSupportDepends
-${PLIST.unix}qt5/include/QtInputSupport/QtInputSupportVersion
-${PLIST.unix}qt5/include/QtInputSupport/qintegrityhidmanager.h
-${PLIST.unix}qt5/include/QtInputSupport/qtinputsupportversion.h
-${PLIST.unix}qt5/include/QtKmsSupport/${PKGVERSION}/QtKmsSupport/private/qkmsdevice_p.h
-${PLIST.unix}qt5/include/QtKmsSupport/QtKmsSupport
-${PLIST.unix}qt5/include/QtKmsSupport/QtKmsSupportDepends
-${PLIST.unix}qt5/include/QtKmsSupport/QtKmsSupportVersion
-${PLIST.unix}qt5/include/QtKmsSupport/qtkmssupportversion.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/devicehandlerlist_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevkeyboard_defaultmap_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevkeyboardhandler_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevkeyboardmanager_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevmousehandler_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevmousemanager_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtablethandler_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtabletmanager_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtouchfilter_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtouchhandler_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevtouchmanager_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qevdevutil_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qlibinputhandler_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qlibinputkeyboard_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qlibinputpointer_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qlibinputtouch_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qtouchoutputmapping_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qtslib_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/${PKGVERSION}/QtInputSupport/private/qxkbcommon_p.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/QIntegrityHIDManager
+${PLIST.notdarwin}qt5/include/QtInputSupport/QtInputSupport
+${PLIST.notdarwin}qt5/include/QtInputSupport/QtInputSupportDepends
+${PLIST.notdarwin}qt5/include/QtInputSupport/QtInputSupportVersion
+${PLIST.notdarwin}qt5/include/QtInputSupport/qintegrityhidmanager.h
+${PLIST.notdarwin}qt5/include/QtInputSupport/qtinputsupportversion.h
+${PLIST.notdarwin}qt5/include/QtKmsSupport/${PKGVERSION}/QtKmsSupport/private/qkmsdevice_p.h
+${PLIST.notdarwin}qt5/include/QtKmsSupport/QtKmsSupport
+${PLIST.notdarwin}qt5/include/QtKmsSupport/QtKmsSupportDepends
+${PLIST.notdarwin}qt5/include/QtKmsSupport/QtKmsSupportVersion
+${PLIST.notdarwin}qt5/include/QtKmsSupport/qtkmssupportversion.h
 ${PLIST.gtk3}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/application_p.h
 ${PLIST.gtk3}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/atspiadaptor_p.h
 ${PLIST.gtk3}qt5/include/QtLinuxAccessibilitySupport/${PKGVERSION}/QtLinuxAccessibilitySupport/private/bridge_p.h
@@ -2629,11 +2629,11 @@ qt5/include/QtWidgets/qwhatsthis.h
 qt5/include/QtWidgets/qwidget.h
 qt5/include/QtWidgets/qwidgetaction.h
 qt5/include/QtWidgets/qwizard.h
-${PLIST.unix}qt5/include/QtXkbCommonSupport/${PKGVERSION}/QtXkbCommonSupport/private/qxkbcommon_p.h
-${PLIST.unix}qt5/include/QtXkbCommonSupport/QtXkbCommonSupport
-${PLIST.unix}qt5/include/QtXkbCommonSupport/QtXkbCommonSupportDepends
-${PLIST.unix}qt5/include/QtXkbCommonSupport/QtXkbCommonSupportVersion
-${PLIST.unix}qt5/include/QtXkbCommonSupport/qtxkbcommonsupportversion.h
+${PLIST.notdarwin}qt5/include/QtXkbCommonSupport/${PKGVERSION}/QtXkbCommonSupport/private/qxkbcommon_p.h
+${PLIST.notdarwin}qt5/include/QtXkbCommonSupport/QtXkbCommonSupport
+${PLIST.notdarwin}qt5/include/QtXkbCommonSupport/QtXkbCommonSupportDepends
+${PLIST.notdarwin}qt5/include/QtXkbCommonSupport/QtXkbCommonSupportVersion
+${PLIST.notdarwin}qt5/include/QtXkbCommonSupport/qtxkbcommonsupportversion.h
 qt5/include/QtXml/${PKGVERSION}/QtXml/private/qtxml-config_p.h
 qt5/include/QtXml/${PKGVERSION}/QtXml/private/qxml_p.h
 qt5/include/QtXml/QDomAttr
@@ -2710,12 +2710,12 @@ qt5/lib/cmake/Qt5FbSupport/Qt5FbSupportConfig.cmake
 qt5/lib/cmake/Qt5FbSupport/Qt5FbSupportConfigVersion.cmake
 qt5/lib/cmake/Qt5FontDatabaseSupport/Qt5FontDatabaseSupportConfig.cmake
 qt5/lib/cmake/Qt5FontDatabaseSupport/Qt5FontDatabaseSupportConfigVersion.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5GlxSupport/Qt5GlxSupportConfig.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5GlxSupport/Qt5GlxSupportConfigVersion.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5GlxSupport/Qt5GlxSupportConfig.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5GlxSupport/Qt5GlxSupportConfigVersion.cmake
 qt5/lib/cmake/Qt5Gui/Qt5GuiConfig.cmake
 qt5/lib/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake
 qt5/lib/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake
 ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSEmulatorIntegrationPlugin.cmake
 ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
 ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSKmsEglDeviceIntegrationPlugin.cmake
@@ -2724,21 +2724,21 @@ ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSX11IntegrationPlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake
 ${PLIST.gtk3}qt5/lib/cmake/Qt5Gui/Qt5Gui_QGtk3ThemePlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake
-${PLIST.dbus}${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
+${PLIST.dbus}${PLIST.notdarwin}qt5/lib/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake
 ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
 qt5/lib/cmake/Qt5Gui/Qt5Gui_QTuioTouchPlugin.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QVncIntegrationPlugin.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5Gui/Qt5Gui_QVncIntegrationPlugin.cmake
 ${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
 ${PLIST.dbus}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXdgDesktopPortalThemePlugin.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5InputSupport/Qt5InputSupportConfig.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5InputSupport/Qt5InputSupportConfigVersion.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5KmsSupport/Qt5KmsSupportConfig.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5KmsSupport/Qt5KmsSupportConfigVersion.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5InputSupport/Qt5InputSupportConfig.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5InputSupport/Qt5InputSupportConfigVersion.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5KmsSupport/Qt5KmsSupportConfig.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5KmsSupport/Qt5KmsSupportConfigVersion.cmake
 ${PLIST.gtk3}qt5/lib/cmake/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfig.cmake
 ${PLIST.gtk3}qt5/lib/cmake/Qt5LinuxAccessibilitySupport/Qt5LinuxAccessibilitySupportConfigVersion.cmake
 qt5/lib/cmake/Qt5Network/Qt5NetworkConfig.cmake
@@ -2767,10 +2767,10 @@ qt5/lib/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake
 qt5/lib/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake
 qt5/lib/cmake/Qt5Widgets/Qt5WidgetsConfigVersion.cmake
 qt5/lib/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5XcbQpa/Qt5XcbQpaConfig.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5XcbQpa/Qt5XcbQpaConfigVersion.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfig.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfigVersion.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5XcbQpa/Qt5XcbQpaConfig.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5XcbQpa/Qt5XcbQpaConfigVersion.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfig.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5XkbCommonSupport/Qt5XkbCommonSupportConfigVersion.cmake
 qt5/lib/cmake/Qt5Xml/Qt5XmlConfig.cmake
 qt5/lib/cmake/Qt5Xml/Qt5XmlConfigVersion.cmake
 qt5/lib/libQt5AccessibilitySupport.a
@@ -2814,17 +2814,17 @@ qt5/lib/libQt5FbSupport.a
 qt5/lib/libQt5FbSupport.prl
 qt5/lib/libQt5FontDatabaseSupport.a
 qt5/lib/libQt5FontDatabaseSupport.prl
-${PLIST.unix}qt5/lib/libQt5GlxSupport.a
-${PLIST.unix}qt5/lib/libQt5GlxSupport.prl
+${PLIST.notdarwin}qt5/lib/libQt5GlxSupport.a
+${PLIST.notdarwin}qt5/lib/libQt5GlxSupport.prl
 qt5/lib/libQt5Gui.prl
 qt5/lib/libQt5Gui.so
 qt5/lib/libQt5Gui.so.${PKGVERSION}
 qt5/lib/libQt5Gui.so.5
 qt5/lib/libQt5Gui.so.5.14
-${PLIST.unix}qt5/lib/libQt5InputSupport.a
-${PLIST.unix}qt5/lib/libQt5InputSupport.prl
-${PLIST.unix}qt5/lib/libQt5KmsSupport.a
-${PLIST.unix}qt5/lib/libQt5KmsSupport.prl
+${PLIST.notdarwin}qt5/lib/libQt5InputSupport.a
+${PLIST.notdarwin}qt5/lib/libQt5InputSupport.prl
+${PLIST.notdarwin}qt5/lib/libQt5KmsSupport.a
+${PLIST.notdarwin}qt5/lib/libQt5KmsSupport.prl
 ${PLIST.gtk3}qt5/lib/libQt5LinuxAccessibilitySupport.a
 ${PLIST.gtk3}qt5/lib/libQt5LinuxAccessibilitySupport.prl
 qt5/lib/libQt5Network.prl
@@ -2868,13 +2868,13 @@ qt5/lib/libQt5Widgets.so
 qt5/lib/libQt5Widgets.so.${PKGVERSION}
 qt5/lib/libQt5Widgets.so.5
 qt5/lib/libQt5Widgets.so.5.14
-${PLIST.unix}qt5/lib/libQt5XcbQpa.prl
-${PLIST.unix}qt5/lib/libQt5XcbQpa.so
-${PLIST.unix}qt5/lib/libQt5XcbQpa.so.${PKGVERSION}
-${PLIST.unix}qt5/lib/libQt5XcbQpa.so.5
-${PLIST.unix}qt5/lib/libQt5XcbQpa.so.5.14
-${PLIST.unix}qt5/lib/libQt5XkbCommonSupport.a
-${PLIST.unix}qt5/lib/libQt5XkbCommonSupport.prl
+${PLIST.notdarwin}qt5/lib/libQt5XcbQpa.prl
+${PLIST.notdarwin}qt5/lib/libQt5XcbQpa.so
+${PLIST.notdarwin}qt5/lib/libQt5XcbQpa.so.${PKGVERSION}
+${PLIST.notdarwin}qt5/lib/libQt5XcbQpa.so.5
+${PLIST.notdarwin}qt5/lib/libQt5XcbQpa.so.5.14
+${PLIST.notdarwin}qt5/lib/libQt5XkbCommonSupport.a
+${PLIST.notdarwin}qt5/lib/libQt5XkbCommonSupport.prl
 qt5/lib/libQt5Xml.prl
 qt5/lib/libQt5Xml.so
 qt5/lib/libQt5Xml.so.${PKGVERSION}
@@ -3334,11 +3334,11 @@ ${PLIST.egl}qt5/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri
 qt5/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri
 qt5/mkspecs/modules/qt_lib_fb_support_private.pri
 qt5/mkspecs/modules/qt_lib_fontdatabase_support_private.pri
-${PLIST.unix}qt5/mkspecs/modules/qt_lib_glx_support_private.pri
+${PLIST.notdarwin}qt5/mkspecs/modules/qt_lib_glx_support_private.pri
 qt5/mkspecs/modules/qt_lib_gui.pri
 qt5/mkspecs/modules/qt_lib_gui_private.pri
-${PLIST.unix}qt5/mkspecs/modules/qt_lib_input_support_private.pri
-${PLIST.unix}qt5/mkspecs/modules/qt_lib_kms_support_private.pri
+${PLIST.notdarwin}qt5/mkspecs/modules/qt_lib_input_support_private.pri
+${PLIST.notdarwin}qt5/mkspecs/modules/qt_lib_kms_support_private.pri
 ${PLIST.gtk3}qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri
 qt5/mkspecs/modules/qt_lib_network.pri
 qt5/mkspecs/modules/qt_lib_network_private.pri
@@ -3357,8 +3357,8 @@ qt5/mkspecs/modules/qt_lib_testlib_private.pri
 qt5/mkspecs/modules/qt_lib_theme_support_private.pri
 qt5/mkspecs/modules/qt_lib_widgets.pri
 qt5/mkspecs/modules/qt_lib_widgets_private.pri
-${PLIST.unix}qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri
-${PLIST.unix}qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri
+${PLIST.notdarwin}qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri
+${PLIST.notdarwin}qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri
 qt5/mkspecs/modules/qt_lib_xml.pri
 qt5/mkspecs/modules/qt_lib_xml_private.pri
 qt5/mkspecs/netbsd-g++/qmake.conf
@@ -3454,17 +3454,17 @@ qt5/plugins/generic/libqtuiotouchplugin.so
 qt5/plugins/imageformats/libqgif.so
 qt5/plugins/imageformats/libqico.so
 qt5/plugins/imageformats/libqjpeg.so
-${PLIST.unix}qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so
-${PLIST.dbus}${PLIST.unix}qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
+${PLIST.notdarwin}qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so
+${PLIST.dbus}${PLIST.notdarwin}qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
 ${PLIST.egl}qt5/plugins/platforms/libqeglfs.so
 qt5/plugins/platforms/libqminimal.so
 ${PLIST.egl}qt5/plugins/platforms/libqminimalegl.so
 qt5/plugins/platforms/libqoffscreen.so
-${PLIST.unix}qt5/plugins/platforms/libqvnc.so
-${PLIST.unix}qt5/plugins/platforms/libqxcb.so
+${PLIST.notdarwin}qt5/plugins/platforms/libqvnc.so
+${PLIST.notdarwin}qt5/plugins/platforms/libqxcb.so
 ${PLIST.gtk3}qt5/plugins/platformthemes/libqgtk3.so
 ${PLIST.dbus}qt5/plugins/platformthemes/libqxdgdesktopportal.so
 ${PLIST.cups}qt5/plugins/printsupport/libcupsprintersupport.so
 qt5/plugins/sqldrivers/libqsqlite.so
 ${PLIST.egl}qt5/plugins/xcbglintegrations/libqxcb-egl-integration.so
-${PLIST.unix}qt5/plugins/xcbglintegrations/libqxcb-glx-integration.so
+${PLIST.notdarwin}qt5/plugins/xcbglintegrations/libqxcb-glx-integration.so
diff --git a/x11/qt5-qtmultimedia/PLIST b/x11/qt5-qtmultimedia/PLIST
index 29d42b73825..217e0822e50 100644
--- a/x11/qt5-qtmultimedia/PLIST
+++ b/x11/qt5-qtmultimedia/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2020/03/05 12:32:40 nia Exp $
+@comment $NetBSD: PLIST,v 1.21 2020/03/18 21:55:23 tnn Exp $
 lib/pkgconfig/Qt5Multimedia.pc
 lib/pkgconfig/Qt5MultimediaWidgets.pc
 qt5/include/QtMultimedia/${PKGVERSION}/QtMultimedia/private/qabstractvideobuffer_p.h
@@ -282,7 +282,7 @@ qt5/include/QtMultimediaWidgets/qvideowidget.h
 qt5/include/QtMultimediaWidgets/qvideowidgetcontrol.h
 qt5/lib/cmake/Qt5Multimedia/Qt5MultimediaConfig.cmake
 qt5/lib/cmake/Qt5Multimedia/Qt5MultimediaConfigVersion.cmake
-${PLIST.unix}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CameraBinServicePlugin.cmake
+${PLIST.notdarwin}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_CameraBinServicePlugin.cmake
 ${PLIST.alsa}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QAlsaPlugin.cmake
 ${PLIST.gst}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerAudioDecoderServicePlugin.cmake
 ${PLIST.gst}qt5/lib/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerCaptureServicePlugin.cmake
diff --git a/x11/qt5-qttools/PLIST b/x11/qt5-qttools/PLIST
index ba2c04f3e45..fd7c88f7a2c 100644
--- a/x11/qt5-qttools/PLIST
+++ b/x11/qt5-qttools/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.17 2020/03/06 13:56:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2020/03/18 21:55:24 tnn Exp $
 lib/pkgconfig/Qt5Designer.pc
 lib/pkgconfig/Qt5Help.pc
 lib/pkgconfig/Qt5UiTools.pc
-${PLIST.unix}qt5/bin/assistant
-${PLIST.unix}qt5/bin/designer
+${PLIST.notdarwin}qt5/bin/assistant
+${PLIST.notdarwin}qt5/bin/designer
 qt5/bin/lconvert
-${PLIST.unix}qt5/bin/linguist
+${PLIST.notdarwin}qt5/bin/linguist
 qt5/bin/lprodump
 qt5/bin/lrelease
 qt5/bin/lrelease-pro