CVS commit: pkgsrc/net/wireshark

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 14 16:51:09 UTC 2023

Modified Files:
        pkgsrc/net/wireshark: Makefile options.mk

Log Message:
wireshark: add a qt6 option

and turn it on by default except on Darwin where I'm told there
are issues with the qt6 packages

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.287 -r1.288 pkgsrc/net/wireshark/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/wireshark/options.mk

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

Modified files:

Index: pkgsrc/net/wireshark/Makefile
diff -u pkgsrc/net/wireshark/Makefile:1.287 pkgsrc/net/wireshark/Makefile:1.288
--- pkgsrc/net/wireshark/Makefile:1.287 Sun Jan 29 21:17:32 2023
+++ pkgsrc/net/wireshark/Makefile       Tue Feb 14 16:51:08 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.287 2023/01/29 21:17:32 ryoon Exp $
+# $NetBSD: Makefile,v 1.288 2023/02/14 16:51:08 wiz Exp $
 
 DISTNAME=      wireshark-4.0.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  https://www.wireshark.org/download/src/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/net/wireshark/options.mk
diff -u pkgsrc/net/wireshark/options.mk:1.28 pkgsrc/net/wireshark/options.mk:1.29
--- pkgsrc/net/wireshark/options.mk:1.28        Tue Nov  1 08:59:25 2022
+++ pkgsrc/net/wireshark/options.mk     Tue Feb 14 16:51:08 2023
@@ -1,8 +1,17 @@
-# $NetBSD: options.mk,v 1.28 2022/11/01 08:59:25 adam Exp $
+# $NetBSD: options.mk,v 1.29 2023/02/14 16:51:08 wiz Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.wireshark
-PKG_SUPPORTED_OPTIONS= http2 lua qt5 spandsp
-PKG_SUGGESTED_OPTIONS= http2 lua qt5
+PKG_OPTIONS_VAR=               PKG_OPTIONS.wireshark
+PKG_SUPPORTED_OPTIONS=         http2 lua spandsp
+PKG_OPTIONS_OPTIONAL_GROUPS=   gui
+PKG_OPTIONS_GROUP.gui=         qt5 qt6
+PKG_SUGGESTED_OPTIONS=         http2 lua
+
+.if ${OPSYS} == "Darwin"
+# problems building qt6 on Darwin as of 2023/01/30
+PKG_SUGGESTED_OPTIONS+=        qt5
+.else
+PKG_SUGGESTED_OPTIONS+=        qt6
+.endif
 
 .include "../../mk/bsd.options.mk"
 
@@ -22,15 +31,25 @@ PLIST.lua=          yes
 CMAKE_ARGS+=           -DENABLE_LUA=OFF
 .endif
 
-.if !empty(PKG_OPTIONS:Mqt5)
-.  include "../../x11/qt5-qtsvg/buildlink3.mk"
-.  include "../../x11/qt5-qttools/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mqt5) || !empty(PKG_OPTIONS:Mqt6)
+.  if !empty(PKG_OPTIONS:Mqt5)
+.    include "../../x11/qt5-qtsvg/buildlink3.mk"
+.    include "../../x11/qt5-qttools/buildlink3.mk"
+.    if ${OPSYS} == "Darwin"
+.      include "../../x11/qt5-qtmacextras/buildlink3.mk"
+.    else
+.      include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.    endif
+.  elif !empty(PKG_OPTIONS:Mqt6)
+CMAKE_ARGS+=           -DUSE_qt6=ON
+.    include "../../graphics/qt6-qtsvg/buildlink3.mk"
+.    include "../../multimedia/qt6-qtmultimedia/buildlink3.mk"
+.    include "../../devel/qt6-qttools/buildlink3.mk"
+.    include "../../devel/qt6-qt5compat/buildlink3.mk"
+.  endif
 PLIST.qt=              yes
-.  if ${OPSYS} == "Darwin"
-.    include "../../x11/qt5-qtmacextras/buildlink3.mk"
-.  else
+.  if ${OPSYS} != "Darwin"
 PLIST.icons=           yes
-.    include "../../x11/qt5-qtx11extras/buildlink3.mk"
 POST_INSTALL_TARGETS+= install-icons
 INSTALLATION_DIRS+=    share/applications
 INSTALLATION_DIRS+=    share/icons/hicolor/scalable/apps