Tue Feb 21 09:10:03 2023 UTC ()
wireshark: always use += with GCC_REQD


(wiz)
diff -r1.30 -r1.31 pkgsrc/net/wireshark/options.mk
cvs diff -r1.30 -r1.31 pkgsrc/net/wireshark/options.mk (switch to unified diff)

--- pkgsrc/net/wireshark/options.mk 2023/02/20 21:50:03 1.30
+++ pkgsrc/net/wireshark/options.mk 2023/02/21 09:10:03 1.31
@@ -1,90 +1,90 @@ @@ -1,90 +1,90 @@
1# $NetBSD: options.mk,v 1.30 2023/02/20 21:50:03 wiz Exp $ 1# $NetBSD: options.mk,v 1.31 2023/02/21 09:10:03 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark 3PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark
4PKG_SUPPORTED_OPTIONS= http2 lua spandsp 4PKG_SUPPORTED_OPTIONS= http2 lua spandsp
5PKG_OPTIONS_OPTIONAL_GROUPS= gui 5PKG_OPTIONS_OPTIONAL_GROUPS= gui
6PKG_OPTIONS_GROUP.gui= qt5 qt6 6PKG_OPTIONS_GROUP.gui= qt5 qt6
7PKG_SUGGESTED_OPTIONS= http2 lua 7PKG_SUGGESTED_OPTIONS= http2 lua
8 8
9.if ${OPSYS} == "Darwin" 9.if ${OPSYS} == "Darwin"
10# problems building qt6 on Darwin as of 2023/01/30 10# problems building qt6 on Darwin as of 2023/01/30
11PKG_SUGGESTED_OPTIONS+= qt5 11PKG_SUGGESTED_OPTIONS+= qt5
12.else 12.else
13PKG_SUGGESTED_OPTIONS+= qt6 13PKG_SUGGESTED_OPTIONS+= qt6
14.endif 14.endif
15 15
16.include "../../mk/bsd.options.mk" 16.include "../../mk/bsd.options.mk"
17 17
18PLIST_VARS+= icons lua qt spandsp 18PLIST_VARS+= icons lua qt spandsp
19 19
20.if !empty(PKG_OPTIONS:Mhttp2) 20.if !empty(PKG_OPTIONS:Mhttp2)
21. include "../../www/nghttp2/buildlink3.mk" 21. include "../../www/nghttp2/buildlink3.mk"
22.else 22.else
23CMAKE_ARGS+= -DENABLE_NGHTTP2=OFF 23CMAKE_ARGS+= -DENABLE_NGHTTP2=OFF
24.endif 24.endif
25 25
26.if !empty(PKG_OPTIONS:Mlua) 26.if !empty(PKG_OPTIONS:Mlua)
27LUA_VERSIONS_ACCEPTED= 52 51 27LUA_VERSIONS_ACCEPTED= 52 51
28. include "../../lang/lua/buildlink3.mk" 28. include "../../lang/lua/buildlink3.mk"
29PLIST.lua= yes 29PLIST.lua= yes
30.else 30.else
31CMAKE_ARGS+= -DENABLE_LUA=OFF 31CMAKE_ARGS+= -DENABLE_LUA=OFF
32.endif 32.endif
33 33
34.if !empty(PKG_OPTIONS:Mqt5) || !empty(PKG_OPTIONS:Mqt6) 34.if !empty(PKG_OPTIONS:Mqt5) || !empty(PKG_OPTIONS:Mqt6)
35. if !empty(PKG_OPTIONS:Mqt5) 35. if !empty(PKG_OPTIONS:Mqt5)
36. include "../../x11/qt5-qtsvg/buildlink3.mk" 36. include "../../x11/qt5-qtsvg/buildlink3.mk"
37. include "../../x11/qt5-qttools/buildlink3.mk" 37. include "../../x11/qt5-qttools/buildlink3.mk"
38. if ${OPSYS} == "Darwin" 38. if ${OPSYS} == "Darwin"
39. include "../../x11/qt5-qtmacextras/buildlink3.mk" 39. include "../../x11/qt5-qtmacextras/buildlink3.mk"
40. else 40. else
41. include "../../x11/qt5-qtx11extras/buildlink3.mk" 41. include "../../x11/qt5-qtx11extras/buildlink3.mk"
42. endif 42. endif
43. elif !empty(PKG_OPTIONS:Mqt6) 43. elif !empty(PKG_OPTIONS:Mqt6)
44GCC_REQD= 8 # std::filesystem 44GCC_REQD+= 8 # std::filesystem
45CMAKE_ARGS+= -DUSE_qt6=ON 45CMAKE_ARGS+= -DUSE_qt6=ON
46. include "../../graphics/qt6-qtsvg/buildlink3.mk" 46. include "../../graphics/qt6-qtsvg/buildlink3.mk"
47. include "../../multimedia/qt6-qtmultimedia/buildlink3.mk" 47. include "../../multimedia/qt6-qtmultimedia/buildlink3.mk"
48. include "../../devel/qt6-qttools/buildlink3.mk" 48. include "../../devel/qt6-qttools/buildlink3.mk"
49. include "../../devel/qt6-qt5compat/buildlink3.mk" 49. include "../../devel/qt6-qt5compat/buildlink3.mk"
50. endif 50. endif
51PLIST.qt= yes 51PLIST.qt= yes
52. if ${OPSYS} != "Darwin" 52. if ${OPSYS} != "Darwin"
53PLIST.icons= yes 53PLIST.icons= yes
54POST_INSTALL_TARGETS+= install-icons 54POST_INSTALL_TARGETS+= install-icons
55INSTALLATION_DIRS+= share/applications 55INSTALLATION_DIRS+= share/applications
56INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps 56INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps
57ICON_SIZES= 16 32 48 57ICON_SIZES= 16 32 48
58MIMEICON_SIZES= 16 24 32 48 64 128 256 58MIMEICON_SIZES= 16 24 32 48 64 128 256
59 59
60. for d in ${ICON_SIZES} 60. for d in ${ICON_SIZES}
61INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/apps 61INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/apps
62. endfor 62. endfor
63 63
64. for d in ${MIMEICON_SIZES} 64. for d in ${MIMEICON_SIZES}
65INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/mimetypes 65INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/mimetypes
66. endfor 66. endfor
67 67
68. include "../../sysutils/desktop-file-utils/desktopdb.mk" 68. include "../../sysutils/desktop-file-utils/desktopdb.mk"
69. include "../../graphics/hicolor-icon-theme/buildlink3.mk" 69. include "../../graphics/hicolor-icon-theme/buildlink3.mk"
70 70
71.PHONY: install-icons 71.PHONY: install-icons
72install-icons: 72install-icons:
73 ${INSTALL_DATA} ${WRKSRC}/resources/icons/wsicon.svg \ 73 ${INSTALL_DATA} ${WRKSRC}/resources/icons/wsicon.svg \
74 ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wireshark.svg 74 ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wireshark.svg
75. for d in ${MIMEICON_SIZES} 75. for d in ${MIMEICON_SIZES}
76 ${INSTALL_DATA} ${WRKSRC}/resources/icons/WiresharkDoc-${d}.png \ 76 ${INSTALL_DATA} ${WRKSRC}/resources/icons/WiresharkDoc-${d}.png \
77 ${DESTDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png 77 ${DESTDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png
78. endfor 78. endfor
79. endif 79. endif
80.else 80.else
81CMAKE_ARGS+= -DBUILD_wireshark=OFF 81CMAKE_ARGS+= -DBUILD_wireshark=OFF
82.endif 82.endif
83 83
84.if !empty(PKG_OPTIONS:Mspandsp) 84.if !empty(PKG_OPTIONS:Mspandsp)
85.include "../../comms/spandsp/buildlink3.mk" 85.include "../../comms/spandsp/buildlink3.mk"
86PLIST.spandsp= yes 86PLIST.spandsp= yes
87CMAKE_ARGS+= -DENABLE_SPANDSP=ON 87CMAKE_ARGS+= -DENABLE_SPANDSP=ON
88.else 88.else
89CMAKE_ARGS+= -DENABLE_SPANDSP=OFF 89CMAKE_ARGS+= -DENABLE_SPANDSP=OFF
90.endif 90.endif