diff options
Diffstat (limited to 'net/wireshark')
| -rw-r--r-- | net/wireshark/Makefile | 5 | ||||
| -rw-r--r-- | net/wireshark/distinfo | 13 | ||||
| -rw-r--r-- | net/wireshark/options.mk | 14 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-ui_qt_packet__format__group__box.cpp | 14 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-ui_qt_time__shift__dialog.cpp | 14 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-ui_qt_wireless__frame.cpp | 14 |
6 files changed, 14 insertions, 60 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index b971df7c5e6..c934368bff1 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.190 2018/06/21 12:22:10 adam Exp $ +# $NetBSD: Makefile,v 1.190.2.1 2018/09/10 19:32:13 spz Exp $ -DISTNAME= wireshark-2.6.1 -PKGREVISION= 1 +DISTNAME= wireshark-2.6.3 CATEGORIES= net MASTER_SITES= https://www.wireshark.org/download/src/ EXTRACT_SUFX= .tar.xz diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index b89a0bbd056..12becd161c7 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.112 2018/06/21 12:22:10 adam Exp $ +$NetBSD: distinfo,v 1.112.2.1 2018/09/10 19:32:13 spz Exp $ -SHA1 (wireshark-2.6.1.tar.xz) = a0cf45d99ab9a42e087af150cbdec08650b9977a -RMD160 (wireshark-2.6.1.tar.xz) = a7f187de0c44b801b51e8b72df41681bbc1835f8 -SHA512 (wireshark-2.6.1.tar.xz) = e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444 -Size (wireshark-2.6.1.tar.xz) = 28386244 bytes -SHA1 (patch-ui_qt_packet__format__group__box.cpp) = 05d45f3aaa246622ed16a8b7819587ca89e66f14 -SHA1 (patch-ui_qt_time__shift__dialog.cpp) = 4622d8828fee3baf625ee00e36f03cca9c491d58 -SHA1 (patch-ui_qt_wireless__frame.cpp) = 4ba3a2fc90ae0058be2c27b6313d6ff777b9adac +SHA1 (wireshark-2.6.3.tar.xz) = d239fd091d59968ac8a1b42b28e61aeef09c20b7 +RMD160 (wireshark-2.6.3.tar.xz) = 74a558e7a004c64ff118870d525025beda4a665d +SHA512 (wireshark-2.6.3.tar.xz) = 87e5335840baa401a1064ee83e3f0ee859c059dd37a09f63f19eb5d91ad273e84f1c0e7a8fdd63fe8a7076abff5e79593827544c5796d921cf7dc7682c7c3f80 +Size (wireshark-2.6.3.tar.xz) = 28384004 bytes diff --git a/net/wireshark/options.mk b/net/wireshark/options.mk index b3c8f9ddfec..338faf96deb 100644 --- a/net/wireshark/options.mk +++ b/net/wireshark/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.19 2018/06/21 12:22:10 adam Exp $ +# $NetBSD: options.mk,v 1.19.2.1 2018/09/10 19:32:13 spz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark PKG_SUPPORTED_OPTIONS= gtk3 lua @@ -33,9 +33,7 @@ CONFIGURE_ENV+= UIC=${QTDIR}/bin/uic PLIST.qt= yes .endif -.if empty(PKG_OPTIONS:Mgtk3) -CONFIGURE_ARGS+= --without-gtk -.else +.if !empty(PKG_OPTIONS:Mgtk3) CONFIGURE_ARGS+= --with-gtk=3 PLIST.gtk3= yes POST_INSTALL_TARGETS+= install-gtk-desktop @@ -47,6 +45,8 @@ install-gtk-desktop: ${INSTALL_DATA} ${WRKSRC}/wireshark.desktop \ ${DESTDIR}${PREFIX}/share/applications/ +.else +CONFIGURE_ARGS+= --without-gtk .endif # We might install the qt front end one day as well, @@ -86,12 +86,12 @@ install-icons: . endif .endif -.if empty(PKG_OPTIONS:Mlua) -CONFIGURE_ARGS+= --with-lua=no -.else +.if !empty(PKG_OPTIONS:Mlua) LUA_VERSIONS_INCOMPATIBLE= 53 .include "../../lang/lua/buildlink3.mk" CONFIGURE_ARGS+= --with-lua=yes PLIST.lua= yes +.else +CONFIGURE_ARGS+= --with-lua=no .endif diff --git a/net/wireshark/patches/patch-ui_qt_packet__format__group__box.cpp b/net/wireshark/patches/patch-ui_qt_packet__format__group__box.cpp deleted file mode 100644 index f36db70e020..00000000000 --- a/net/wireshark/patches/patch-ui_qt_packet__format__group__box.cpp +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ui_qt_packet__format__group__box.cpp,v 1.1 2018/06/21 12:22:10 adam Exp $ - -Fix for Qt 5.11. - ---- ui/qt/packet_format_group_box.cpp.orig 2018-06-21 09:11:22.000000000 +0000 -+++ ui/qt/packet_format_group_box.cpp -@@ -10,6 +10,7 @@ - #include <ui_packet_format_group_box.h> - - #include <QStyle> -+#include <QStyleOption> - - PacketFormatGroupBox::PacketFormatGroupBox(QWidget *parent) : - QGroupBox(parent), diff --git a/net/wireshark/patches/patch-ui_qt_time__shift__dialog.cpp b/net/wireshark/patches/patch-ui_qt_time__shift__dialog.cpp deleted file mode 100644 index ef3ff639198..00000000000 --- a/net/wireshark/patches/patch-ui_qt_time__shift__dialog.cpp +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ui_qt_time__shift__dialog.cpp,v 1.1 2018/06/21 12:22:10 adam Exp $ - -Fix for Qt 5.11. - ---- ui/qt/time_shift_dialog.cpp.orig 2018-06-21 09:15:54.000000000 +0000 -+++ ui/qt/time_shift_dialog.cpp -@@ -14,6 +14,7 @@ - #include <ui/time_shift.h> - #include <ui/qt/utils/tango_colors.h> - -+#include <QStyleOption> - - TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) : - QDialog(parent), diff --git a/net/wireshark/patches/patch-ui_qt_wireless__frame.cpp b/net/wireshark/patches/patch-ui_qt_wireless__frame.cpp deleted file mode 100644 index 8c051361114..00000000000 --- a/net/wireshark/patches/patch-ui_qt_wireless__frame.cpp +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ui_qt_wireless__frame.cpp,v 1.1 2018/06/21 12:22:10 adam Exp $ - -Fix for Qt 5.11. - ---- ui/qt/wireless_frame.cpp.orig 2018-06-21 09:19:08.000000000 +0000 -+++ ui/qt/wireless_frame.cpp -@@ -23,6 +23,7 @@ - #include <wsutil/frequency-utils.h> - - #include <QProcess> -+#include <QAbstractItemView> - - // To do: - // - Disable or hide invalid channel types. |