From 792a66102543a5fcf6f85b8cae4dc4a46e824c0c Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 3 Mar 2016 13:33:14 +0000 Subject: Make wireshark2 the new default wireshark, since it is the default stable version upstream. --- net/wireshark/DESCR | 2 + net/wireshark/Makefile | 6 +- net/wireshark/PLIST | 98 ++++++++++--- net/wireshark/distinfo | 21 +-- net/wireshark/options.mk | 38 ++--- net/wireshark/patches/patch-aa | 16 -- net/wireshark/patches/patch-ac | 17 --- net/wireshark/patches/patch-ba | 15 -- net/wireshark/patches/patch-bb | 163 --------------------- net/wireshark/patches/patch-bc | 15 -- net/wireshark/patches/patch-ca | 50 ------- net/wireshark/patches/patch-configure | 13 ++ net/wireshark/patches/patch-configure.ac | 13 ++ net/wireshark/patches/patch-help_Makefile.in | 15 -- net/wireshark/patches/patch-ui_qt_Makefile.in | 15 -- .../patches/patch-ui_qt_mtp3__summary__dialog.cpp | 33 +++++ 16 files changed, 171 insertions(+), 359 deletions(-) delete mode 100644 net/wireshark/patches/patch-aa delete mode 100644 net/wireshark/patches/patch-ac delete mode 100644 net/wireshark/patches/patch-ba delete mode 100644 net/wireshark/patches/patch-bb delete mode 100644 net/wireshark/patches/patch-bc delete mode 100644 net/wireshark/patches/patch-ca create mode 100644 net/wireshark/patches/patch-configure create mode 100644 net/wireshark/patches/patch-configure.ac delete mode 100644 net/wireshark/patches/patch-help_Makefile.in delete mode 100644 net/wireshark/patches/patch-ui_qt_Makefile.in create mode 100644 net/wireshark/patches/patch-ui_qt_mtp3__summary__dialog.cpp (limited to 'net') diff --git a/net/wireshark/DESCR b/net/wireshark/DESCR index ccd6d02b24f..88792fa01b1 100644 --- a/net/wireshark/DESCR +++ b/net/wireshark/DESCR @@ -9,3 +9,5 @@ code as Wireshark, and with editcap, which is a program to read capture files and write the packets from that capture file, possibly in a different capture file format, and with some packets possibly removed from the capture. + +This package tracks version 2 stable branch. diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index b2e353f9a08..4d1b541c6ae 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.143 2016/02/25 16:20:53 jperkin Exp $ +# $NetBSD: Makefile,v 1.144 2016/03/03 13:33:14 wiz Exp $ -DISTNAME= wireshark-1.12.9 +DISTNAME= wireshark-2.0.2 CATEGORIES= net MASTER_SITES= https://www.wireshark.org/download/src/ EXTRACT_SUFX= .tar.bz2 @@ -21,11 +21,9 @@ CHECK_PORTABILITY_SKIP+=packaging/macosx/*/* GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-static=no -CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} -CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} CONFIGURE_ENV+= ac_cv_path_YACCDUMMY=${TOOLS_PATH.yacc} CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex} diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST index a0fc74e14df..fb926e7390c 100644 --- a/net/wireshark/PLIST +++ b/net/wireshark/PLIST @@ -1,18 +1,19 @@ -@comment $NetBSD: PLIST,v 1.28 2015/11/06 17:35:26 adam Exp $ +@comment $NetBSD: PLIST,v 1.29 2016/03/03 13:33:14 wiz Exp $ +bin/androiddump bin/capinfos bin/captype bin/dftest bin/dumpcap bin/editcap +bin/idl2wrs bin/mergecap bin/randpkt bin/rawshark bin/reordercap bin/text2pcap bin/tshark -${PLIST.gtk3}bin/wireshark -${PLIST.qt5}bin/wireshark-qt -lib/libfiletap.la +${PLIST.gtk3}bin/wireshark-gtk +${PLIST.qt5}bin/wireshark lib/libwireshark.la lib/libwiretap.la lib/libwsutil.la @@ -39,25 +40,40 @@ man/man1/rawshark.1 man/man1/reordercap.1 man/man1/text2pcap.1 man/man1/tshark.1 -${PLIST.icons}man/man1/wireshark.1 +${PLIST.mans}man/man1/wireshark.1 man/man4/wireshark-filter.4 +${PLIST.icons}share/appdata/wireshark.appdata.xml +${PLIST.icons}share/applications/wireshark-gtk.desktop ${PLIST.gtk3}share/applications/wireshark.desktop +${PLIST.icons}share/icons/hicolor/128x128/apps/wireshark.png ${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png +${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png ${PLIST.icons}share/icons/hicolor/16x16/apps/wireshark.png ${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-vnd.tcpdump.pcap.png +${PLIST.icons}share/icons/hicolor/16x16/mimetypes/application-wireshark-doc.png +${PLIST.icons}share/icons/hicolor/24x24/apps/wireshark.png ${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-vnd.tcpdump.pcap.png +${PLIST.icons}share/icons/hicolor/24x24/mimetypes/application-wireshark-doc.png +${PLIST.icons}share/icons/hicolor/256x256/apps/wireshark.png ${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-vnd.tcpdump.pcap.png +${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-wireshark-doc.png ${PLIST.icons}share/icons/hicolor/32x32/apps/wireshark.png ${PLIST.icons}share/icons/hicolor/32x32/mimetypes/application-vnd.tcpdump.pcap.png +${PLIST.icons}share/icons/hicolor/32x32/mimetypes/application-wireshark-doc.png ${PLIST.icons}share/icons/hicolor/48x48/apps/wireshark.png ${PLIST.icons}share/icons/hicolor/48x48/mimetypes/application-vnd.tcpdump.pcap.png +${PLIST.icons}share/icons/hicolor/48x48/mimetypes/application-wireshark-doc.png +${PLIST.icons}share/icons/hicolor/64x64/apps/wireshark.png ${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-vnd.tcpdump.pcap.png +${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-wireshark-doc.png ${PLIST.icons}share/icons/hicolor/scalable/apps/wireshark.svg ${PLIST.icons}share/icons/locolor/16x16/apps/wireshark.png ${PLIST.icons}share/icons/locolor/32x32/apps/wireshark.png ${PLIST.icons}share/icons/locolor/48x48/apps/wireshark.png +${PLIST.icons}share/mime/packages/wireshark.xml share/wireshark/AUTHORS-SHORT share/wireshark/COPYING +share/wireshark/androiddump.html share/wireshark/capinfos.html share/wireshark/cfilters share/wireshark/colorfilters @@ -65,27 +81,22 @@ ${PLIST.lua}share/wireshark/console.lua share/wireshark/dfilters share/wireshark/dftest.html share/wireshark/diameter/AlcatelLucent.xml -share/wireshark/diameter/ChinaTelecom.xml share/wireshark/diameter/Cisco.xml share/wireshark/diameter/Custom.xml share/wireshark/diameter/Ericsson.xml +share/wireshark/diameter/HP.xml share/wireshark/diameter/Nokia.xml -share/wireshark/diameter/NokiaSiemensNetworks.xml -share/wireshark/diameter/SKT.xml +share/wireshark/diameter/NokiaSolutionsAndNetworks.xml +share/wireshark/diameter/Oracle.xml share/wireshark/diameter/Starent.xml -share/wireshark/diameter/TGPPGmb.xml -share/wireshark/diameter/TGPPRx.xml -share/wireshark/diameter/TGPPS9.xml -share/wireshark/diameter/TGPPSh.xml -share/wireshark/diameter/VerizonWireless.xml +share/wireshark/diameter/TGPP.xml +share/wireshark/diameter/TGPP2.xml share/wireshark/diameter/Vodafone.xml share/wireshark/diameter/chargecontrol.xml share/wireshark/diameter/dictionary.dtd share/wireshark/diameter/dictionary.xml share/wireshark/diameter/eap.xml share/wireshark/diameter/etsie2e4.xml -share/wireshark/diameter/gqpolicy.xml -share/wireshark/diameter/imscxdx.xml share/wireshark/diameter/mobileipv4.xml share/wireshark/diameter/mobileipv6.xml share/wireshark/diameter/nasreq.xml @@ -128,17 +139,20 @@ share/wireshark/radius/dictionary.3gpp share/wireshark/radius/dictionary.3gpp2 share/wireshark/radius/dictionary.acc share/wireshark/radius/dictionary.acme +share/wireshark/radius/dictionary.actelis +share/wireshark/radius/dictionary.aerohive share/wireshark/radius/dictionary.airespace share/wireshark/radius/dictionary.alcatel share/wireshark/radius/dictionary.alcatel-lucent.aaa -share/wireshark/radius/dictionary.alcatel-lucent.xylan share/wireshark/radius/dictionary.alcatel.esam share/wireshark/radius/dictionary.alcatel.sr share/wireshark/radius/dictionary.alteon share/wireshark/radius/dictionary.altiga share/wireshark/radius/dictionary.alvarion +share/wireshark/radius/dictionary.alvarion.wimax.v2_2 share/wireshark/radius/dictionary.apc share/wireshark/radius/dictionary.aptis +share/wireshark/radius/dictionary.arbor share/wireshark/radius/dictionary.aruba share/wireshark/radius/dictionary.ascend share/wireshark/radius/dictionary.asn @@ -147,28 +161,47 @@ share/wireshark/radius/dictionary.avaya share/wireshark/radius/dictionary.azaire share/wireshark/radius/dictionary.bay share/wireshark/radius/dictionary.bintec +share/wireshark/radius/dictionary.bluecoat share/wireshark/radius/dictionary.bristol +share/wireshark/radius/dictionary.broadsoft +share/wireshark/radius/dictionary.brocade +share/wireshark/radius/dictionary.bskyb +share/wireshark/radius/dictionary.bt share/wireshark/radius/dictionary.cablelabs share/wireshark/radius/dictionary.cabletron +share/wireshark/radius/dictionary.camiant share/wireshark/radius/dictionary.chillispot share/wireshark/radius/dictionary.cisco +share/wireshark/radius/dictionary.cisco.asa share/wireshark/radius/dictionary.cisco.bbsm share/wireshark/radius/dictionary.cisco.vpn3000 share/wireshark/radius/dictionary.cisco.vpn5000 +share/wireshark/radius/dictionary.citrix share/wireshark/radius/dictionary.clavister share/wireshark/radius/dictionary.colubris share/wireshark/radius/dictionary.columbia_university share/wireshark/radius/dictionary.compat +share/wireshark/radius/dictionary.compatible share/wireshark/radius/dictionary.cosine +share/wireshark/radius/dictionary.dante share/wireshark/radius/dictionary.dhcp share/wireshark/radius/dictionary.digium +share/wireshark/radius/dictionary.dlink +share/wireshark/radius/dictionary.dragonwave +share/wireshark/radius/dictionary.efficientip share/wireshark/radius/dictionary.eltex share/wireshark/radius/dictionary.epygi +share/wireshark/radius/dictionary.equallogic share/wireshark/radius/dictionary.ericsson +share/wireshark/radius/dictionary.ericsson.ab +share/wireshark/radius/dictionary.ericsson.packet.core.networks share/wireshark/radius/dictionary.erx share/wireshark/radius/dictionary.extreme +share/wireshark/radius/dictionary.f5 +share/wireshark/radius/dictionary.fdxtended share/wireshark/radius/dictionary.fortinet share/wireshark/radius/dictionary.foundry +share/wireshark/radius/dictionary.freedhcp share/wireshark/radius/dictionary.freeradius share/wireshark/radius/dictionary.freeradius.internal share/wireshark/radius/dictionary.freeswitch @@ -178,7 +211,9 @@ share/wireshark/radius/dictionary.gemtek share/wireshark/radius/dictionary.h3c share/wireshark/radius/dictionary.hp share/wireshark/radius/dictionary.huawei +share/wireshark/radius/dictionary.iana share/wireshark/radius/dictionary.iea +share/wireshark/radius/dictionary.infoblox share/wireshark/radius/dictionary.infonet share/wireshark/radius/dictionary.ipunplugged share/wireshark/radius/dictionary.issanni @@ -186,12 +221,15 @@ share/wireshark/radius/dictionary.itk share/wireshark/radius/dictionary.jradius share/wireshark/radius/dictionary.juniper share/wireshark/radius/dictionary.karlnet +share/wireshark/radius/dictionary.kineto share/wireshark/radius/dictionary.lancom share/wireshark/radius/dictionary.livingston share/wireshark/radius/dictionary.localweb share/wireshark/radius/dictionary.lucent share/wireshark/radius/dictionary.manzara +share/wireshark/radius/dictionary.meinberg share/wireshark/radius/dictionary.merit +share/wireshark/radius/dictionary.meru share/wireshark/radius/dictionary.microsoft share/wireshark/radius/dictionary.mikrotik share/wireshark/radius/dictionary.motorola @@ -207,12 +245,15 @@ share/wireshark/radius/dictionary.nortel share/wireshark/radius/dictionary.ntua share/wireshark/radius/dictionary.openser share/wireshark/radius/dictionary.packeteer +share/wireshark/radius/dictionary.paloalto share/wireshark/radius/dictionary.patton +share/wireshark/radius/dictionary.perle share/wireshark/radius/dictionary.propel share/wireshark/radius/dictionary.prosoft +share/wireshark/radius/dictionary.proxim +share/wireshark/radius/dictionary.purewave share/wireshark/radius/dictionary.quiconnect share/wireshark/radius/dictionary.quintum -share/wireshark/radius/dictionary.redback share/wireshark/radius/dictionary.redcreek share/wireshark/radius/dictionary.rfc2865 share/wireshark/radius/dictionary.rfc2866 @@ -237,19 +278,37 @@ share/wireshark/radius/dictionary.rfc5607 share/wireshark/radius/dictionary.rfc5904 share/wireshark/radius/dictionary.rfc6519 share/wireshark/radius/dictionary.rfc6572 +share/wireshark/radius/dictionary.rfc6677 +share/wireshark/radius/dictionary.rfc6911 +share/wireshark/radius/dictionary.rfc6929 +share/wireshark/radius/dictionary.rfc6930 +share/wireshark/radius/dictionary.rfc7055 +share/wireshark/radius/dictionary.rfc7155 +share/wireshark/radius/dictionary.rfc7268 +share/wireshark/radius/dictionary.rfc7499 +share/wireshark/radius/dictionary.riverbed share/wireshark/radius/dictionary.riverstone share/wireshark/radius/dictionary.roaringpenguin +share/wireshark/radius/dictionary.ruckus +share/wireshark/radius/dictionary.ruggedcom +share/wireshark/radius/dictionary.sg share/wireshark/radius/dictionary.shasta share/wireshark/radius/dictionary.shiva +share/wireshark/radius/dictionary.siemens share/wireshark/radius/dictionary.slipstream share/wireshark/radius/dictionary.sofaware share/wireshark/radius/dictionary.sonicwall share/wireshark/radius/dictionary.springtide share/wireshark/radius/dictionary.starent +share/wireshark/radius/dictionary.starent.vsa1 +share/wireshark/radius/dictionary.surfnet +share/wireshark/radius/dictionary.symbol share/wireshark/radius/dictionary.t_systems_nova share/wireshark/radius/dictionary.telebit share/wireshark/radius/dictionary.telkom +share/wireshark/radius/dictionary.terena share/wireshark/radius/dictionary.trapeze +share/wireshark/radius/dictionary.travelping share/wireshark/radius/dictionary.tropos share/wireshark/radius/dictionary.ukerna share/wireshark/radius/dictionary.unix @@ -262,9 +321,14 @@ share/wireshark/radius/dictionary.walabi share/wireshark/radius/dictionary.waverider share/wireshark/radius/dictionary.wichorus share/wireshark/radius/dictionary.wimax +share/wireshark/radius/dictionary.wimax.alvarion share/wireshark/radius/dictionary.wimax.wichorus share/wireshark/radius/dictionary.wispr share/wireshark/radius/dictionary.xedia +share/wireshark/radius/dictionary.xylan +share/wireshark/radius/dictionary.yubico +share/wireshark/radius/dictionary.zeus +share/wireshark/radius/dictionary.zte share/wireshark/radius/dictionary.zyxel share/wireshark/randpkt.html share/wireshark/rawshark.html diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index 5d21b8b32b6..8d842b763a5 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,14 +1,9 @@ -$NetBSD: distinfo,v 1.86 2016/01/02 11:39:56 ryoon Exp $ +$NetBSD: distinfo,v 1.87 2016/03/03 13:33:14 wiz Exp $ -SHA1 (wireshark-1.12.9.tar.bz2) = 5a62c3a355289396af946e80aab741ae6ad7eacb -RMD160 (wireshark-1.12.9.tar.bz2) = e2a5cec42205e378f6c7062f2fd00a506be54dfb -SHA512 (wireshark-1.12.9.tar.bz2) = 65688f730f42f7bd052f722ef84c83e59e78b13132dd0a46c46de7763e476a837d0f01f72a11bf8117b9d48c74836ffad35c121ecc1907a80a71ffb9b3d2c2c3 -Size (wireshark-1.12.9.tar.bz2) = 29275437 bytes -SHA1 (patch-aa) = 237c60ae1bd860bdc3ee42a17a46b4e212b97c0f -SHA1 (patch-ac) = 470a2a32a5577f16aef4ba3e638eb6b97c483ba3 -SHA1 (patch-ba) = f2fa69d1254b94c7b6b28d5e056c211a019d1db9 -SHA1 (patch-bb) = 2f6b72aeb99d87821ee6917d6c4c29a276d2e3a8 -SHA1 (patch-bc) = 052ede4ba58502117fe7b355e22a906ff65b773e -SHA1 (patch-ca) = 08c4ae23739fbec238b02a2d0398b4a157f9c077 -SHA1 (patch-help_Makefile.in) = 8d7c27aa5d2c8b7998e4f7235fefaedd52059386 -SHA1 (patch-ui_qt_Makefile.in) = b26c11d7515b3b333c9e9853281fc4e06d7d8007 +SHA1 (wireshark-2.0.2.tar.bz2) = 6a5c18710d6da04ddc84975cdc840812e672c0f4 +RMD160 (wireshark-2.0.2.tar.bz2) = 2a90c7336e9c3862e3782899c500b1451a316016 +SHA512 (wireshark-2.0.2.tar.bz2) = a3645f0c2600091d3af76d12db4b73f83e6af4686a1bd7a336a420e4d7505ed281dfabb05c05cd6f58084fa3f25b6b9014b6f273b875c713ee39c77b4c5c715f +Size (wireshark-2.0.2.tar.bz2) = 31073440 bytes +SHA1 (patch-configure) = 23a639e38dfc3192b55afc3b605efc3bd70588f4 +SHA1 (patch-configure.ac) = e69ef2d5468287e0339ccf30a1f33b077626ff94 +SHA1 (patch-ui_qt_mtp3__summary__dialog.cpp) = 3d434377581e1993802fbe4b02c98849d0e6a9bb diff --git a/net/wireshark/options.mk b/net/wireshark/options.mk index 3b4c8d646c0..fcef2db3680 100644 --- a/net/wireshark/options.mk +++ b/net/wireshark/options.mk @@ -1,17 +1,16 @@ -# $NetBSD: options.mk,v 1.11 2015/11/06 17:35:26 adam Exp $ +# $NetBSD: options.mk,v 1.12 2016/03/03 13:33:14 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark PKG_SUPPORTED_OPTIONS= gtk3 lua qt5 PKG_SUGGESTED_OPTIONS= gtk3 lua -PKG_OPTIONS_LEGACY_OPTS+= gtk2:gtk3 .include "../../mk/bsd.options.mk" -PLIST_VARS+= gtk3 icons qt5 +PLIST_VARS+= gtk3 icons lua mans qt5 .if empty(PKG_OPTIONS:Mqt5) CONFIGURE_ARGS+= --without-qt .else -CONFIGURE_ARGS+= --with-qt +CONFIGURE_ARGS+= --with-qt=5 CONFIGURE_ENV+= MOC=${QTDIR}/bin/moc CONFIGURE_ENV+= RCC=${QTDIR}/bin/rcc CONFIGURE_ENV+= UIC=${QTDIR}/bin/uic @@ -41,7 +40,7 @@ POST_INSTALL_TARGETS+= install-gtk-desktop .PHONY: install-gtk-desktop install-gtk-desktop: ${INSTALL_DATA} ${WRKSRC}/wireshark.desktop \ - ${DESTDIR}${PREFIX}/share/applications + ${DESTDIR}${PREFIX}/share/applications/ .endif @@ -49,23 +48,25 @@ install-gtk-desktop: # so have a generic icon target .if !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mqt5) CONFIGURE_ARGS+= --enable-wireshark +PLIST.mans= yes +INSTALLATION_DIRS+= share/applications +. if ${OPSYS} != "Darwin" PLIST.icons= yes POST_INSTALL_TARGETS+= install-icons -INSTALLATION_DIRS+= share/applications INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps ICON_COLORS= hi lo ICON_SIZES= 16 32 48 MIMEICON_SIZES= 16 24 32 48 64 128 256 -. for c in ${ICON_COLORS} -. for d in ${ICON_SIZES} +. for c in ${ICON_COLORS} +. for d in ${ICON_SIZES} INSTALLATION_DIRS+= share/icons/${c}color/${d}x${d}/apps +. endfor . endfor -. endfor -. for d in ${MIMEICON_SIZES} +. for d in ${MIMEICON_SIZES} INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/mimetypes -. endfor +. endfor .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" @@ -74,28 +75,27 @@ INSTALLATION_DIRS+= share/icons/hicolor/${d}x${d}/mimetypes install-icons: ${INSTALL_DATA} ${WRKSRC}/image/wsicon.svg \ ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wireshark.svg -. for c in ${ICON_COLORS} -. for d in ${ICON_SIZES} +. for c in ${ICON_COLORS} +. for d in ${ICON_SIZES} ${INSTALL_DATA} ${WRKSRC}/image/${c}${d}-app-wireshark.png \ ${DESTDIR}${PREFIX}/share/icons/${c}color/${d}x${d}/apps/wireshark.png +. endfor . endfor -. endfor -. for d in ${MIMEICON_SIZES} +. for d in ${MIMEICON_SIZES} ${INSTALL_DATA} ${WRKSRC}/image/WiresharkDoc-${d}.png \ ${DESTDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png -. endfor +. endfor +. endif .else CONFIGURE_ARGS+= --disable-wireshark .endif -PLIST_VARS+= lua - .if empty(PKG_OPTIONS:Mlua) CONFIGURE_ARGS+= --with-lua=no .else .include "../../lang/lua/buildlink3.mk" -CONFIGURE_ARGS+= --with-lua=${BUILDLINK_PREFIX.lua} +CONFIGURE_ARGS+= --with-lua=yes PLIST.lua= yes .endif diff --git a/net/wireshark/patches/patch-aa b/net/wireshark/patches/patch-aa deleted file mode 100644 index 340c0312b20..00000000000 --- a/net/wireshark/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.14 2014/11/14 12:06:10 tron Exp $ - -Fix build. - ---- ui/time_shift.c.orig 2014-11-12 18:49:17.000000000 +0000 -+++ ui/time_shift.c 2014-11-14 10:08:51.000000000 +0000 -@@ -28,6 +28,9 @@ - #include - #include - #include -+#ifndef HAVE_FLOORL -+#define floorl(a) floor((double)(a)) -+#endif - - #include - diff --git a/net/wireshark/patches/patch-ac b/net/wireshark/patches/patch-ac deleted file mode 100644 index 9a17995a83f..00000000000 --- a/net/wireshark/patches/patch-ac +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2013/12/18 11:52:25 tron Exp $ - -Fix build problem caused by name space polution. - ---- epan/dissectors/packet-mtp3.h.orig 2008-10-20 20:19:32.000000000 +0100 -+++ epan/dissectors/packet-mtp3.h 2008-10-26 13:41:50.000000000 +0000 -@@ -46,6 +46,10 @@ - guint8 ni; - } mtp3_addr_pc_t; - -+#if defined(__NetBSD__) && defined(si_code) -+#undef si_code -+#endif -+ - typedef struct _mtp3_tap_rec_t { - mtp3_addr_pc_t addr_opc; - mtp3_addr_pc_t addr_dpc; diff --git a/net/wireshark/patches/patch-ba b/net/wireshark/patches/patch-ba deleted file mode 100644 index 78b40ed384f..00000000000 --- a/net/wireshark/patches/patch-ba +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ba,v 1.2 2011/07/20 18:42:45 tron Exp $ - -Avoid conflict with NetBSD's popcount(3). - ---- epan/dissectors/packet-x11.c.orig 2011-07-18 21:18:26.000000000 +0100 -+++ epan/dissectors/packet-x11.c 2011-07-20 19:03:27.000000000 +0100 -@@ -3044,7 +3044,7 @@ - g_hash_table_insert(reply_table, (gpointer)name, (gpointer)reply_info); - } - --static int popcount(unsigned int mask) -+static int my_popcount(unsigned int mask) - { - #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) - /* GCC 3.4 or newer */ diff --git a/net/wireshark/patches/patch-bb b/net/wireshark/patches/patch-bb deleted file mode 100644 index 7c97806ab80..00000000000 --- a/net/wireshark/patches/patch-bb +++ /dev/null @@ -1,163 +0,0 @@ -$NetBSD: patch-bb,v 1.4 2015/09/12 19:03:59 tnn Exp $ - -Avoid conflict with NetBSD's popcount(3). - ---- epan/dissectors/x11-extension-implementation.h.orig 2015-08-12 16:47:42.000000000 +0000 -+++ epan/dissectors/x11-extension-implementation.h -@@ -19990,8 +19990,8 @@ static int struct_size_xkb_DeviceLedInfo - int f_namesPresent; - f_namesPresent = VALUE32(tvb, *offsetp + size + 4); - f_mapsPresent = VALUE32(tvb, *offsetp + size + 8); -- size += popcount(f_namesPresent) * 4; -- size += popcount(f_mapsPresent) * 12; -+ size += my_popcount(f_namesPresent) * 4; -+ size += my_popcount(f_mapsPresent) * 12; - return size + 20; - } - -@@ -20018,8 +20018,8 @@ static void struct_xkb_DeviceLedInfo(tvb - *offsetp += 4; - proto_tree_add_item(t, hf_x11_struct_xkb_DeviceLedInfo_state, tvb, *offsetp, 4, byte_order); - *offsetp += 4; -- listOfCard32(tvb, offsetp, t, hf_x11_struct_xkb_DeviceLedInfo_names, hf_x11_struct_xkb_DeviceLedInfo_names_item, popcount(f_namesPresent), byte_order); -- struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_mapsPresent)); -+ listOfCard32(tvb, offsetp, t, hf_x11_struct_xkb_DeviceLedInfo_names, hf_x11_struct_xkb_DeviceLedInfo_names_item, my_popcount(f_namesPresent), byte_order); -+ struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_mapsPresent)); - } - } - -@@ -22060,7 +22060,7 @@ static void xkbGetMap_Reply(tvbuff_t *tv - struct_xkb_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors); - } - if ((f_present & (1 << 6)) != 0) { -- listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn, popcount(f_virtualMods), byte_order); -+ listOfByte(tvb, offsetp, t, hf_x11_xkb_GetMap_reply_VirtualMods_vmods_rtrn, my_popcount(f_virtualMods), byte_order); - if (*offsetp % 4) { - UNUSED(4 - *offsetp % 4); - } -@@ -22210,8 +22210,8 @@ static void xkbSetMap(tvbuff_t *tvb, pac - length -= f_totalKeyBehaviors * 4; - } - if ((f_present & (1 << 6)) != 0) { -- listOfByte(tvb, offsetp, t, hf_x11_xkb_SetMap_VirtualMods_vmods, popcount(f_virtualMods), byte_order); -- length -= popcount(f_virtualMods) * 1; -+ listOfByte(tvb, offsetp, t, hf_x11_xkb_SetMap_VirtualMods_vmods, my_popcount(f_virtualMods), byte_order); -+ length -= my_popcount(f_virtualMods) * 1; - } - if ((f_present & (1 << 3)) != 0) { - struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit); -@@ -22284,7 +22284,7 @@ static void xkbGetCompatMap_Reply(tvbuff - *offsetp += 2; - UNUSED(16); - struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSIRtrn); -- struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn)); -+ struct_xkb_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groupsRtrn)); - } - - static void xkbSetCompatMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) -@@ -22316,8 +22316,8 @@ static void xkbSetCompatMap(tvbuff_t *tv - UNUSED(2); - struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSI); - length -= f_nSI * 10; -- struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groups)); -- length -= popcount(f_groups) * 4; -+ struct_xkb_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groups)); -+ length -= my_popcount(f_groups) * 4; - } - - static void xkbGetIndicatorState(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) -@@ -22378,7 +22378,7 @@ static void xkbGetIndicatorMap_Reply(tvb - proto_tree_add_item(t, hf_x11_xkb_GetIndicatorMap_reply_nIndicators, tvb, *offsetp, 1, byte_order); - *offsetp += 1; - UNUSED(15); -- struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which)); -+ struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_which)); - } - - static void xkbSetIndicatorMap(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) -@@ -22390,8 +22390,8 @@ static void xkbSetIndicatorMap(tvbuff_t - f_which = VALUE32(tvb, *offsetp); - proto_tree_add_item(t, hf_x11_xkb_SetIndicatorMap_which, tvb, *offsetp, 4, byte_order); - *offsetp += 4; -- struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, popcount(f_which)); -- length -= popcount(f_which) * 12; -+ struct_xkb_IndicatorMap(tvb, offsetp, t, byte_order, my_popcount(f_which)); -+ length -= my_popcount(f_which) * 12; - } - - static void xkbGetNamedIndicator(tvbuff_t *tvb, packet_info *pinfo _U_, int *offsetp, proto_tree *t, guint byte_order, int length _U_) -@@ -22806,13 +22806,13 @@ static void xkbGetNames_Reply(tvbuff_t * - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames, hf_x11_xkb_GetNames_reply_KTLevelNames_ktLevelNames_item, sumof_nLevelsPerType, byte_order); - } - if ((f_which & (1 << 8)) != 0) { -- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order); -+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames, hf_x11_xkb_GetNames_reply_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order); - } - if ((f_which & (1 << 11)) != 0) { -- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order); -+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames, hf_x11_xkb_GetNames_reply_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order); - } - if ((f_which & (1 << 12)) != 0) { -- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_GroupNames_groups, hf_x11_xkb_GetNames_reply_GroupNames_groups_item, popcount(f_groupNames), byte_order); -+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetNames_reply_GroupNames_groups, hf_x11_xkb_GetNames_reply_GroupNames_groups_item, my_popcount(f_groupNames), byte_order); - } - if ((f_which & (1 << 9)) != 0) { - struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys); -@@ -22957,16 +22957,16 @@ static void xkbSetNames(tvbuff_t *tvb, p - length -= sumof_nLevelsPerType * 4; - } - if ((f_which & (1 << 8)) != 0) { -- listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order); -- length -= popcount(f_indicators) * 4; -+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames, hf_x11_xkb_SetNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order); -+ length -= my_popcount(f_indicators) * 4; - } - if ((f_which & (1 << 11)) != 0) { -- listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order); -- length -= popcount(f_virtualMods) * 4; -+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames, hf_x11_xkb_SetNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order); -+ length -= my_popcount(f_virtualMods) * 4; - } - if ((f_which & (1 << 12)) != 0) { -- listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_GroupNames_groups, hf_x11_xkb_SetNames_GroupNames_groups_item, popcount(f_groupNames), byte_order); -- length -= popcount(f_groupNames) * 4; -+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_SetNames_GroupNames_groups, hf_x11_xkb_SetNames_GroupNames_groups_item, my_popcount(f_groupNames), byte_order); -+ length -= my_popcount(f_groupNames) * 4; - } - if ((f_which & (1 << 9)) != 0) { - struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys); -@@ -23404,7 +23404,7 @@ static void xkbGetKbdByName_Reply(tvbuff - struct_xkb_SetBehavior(tvb, offsetp, t, byte_order, f_totalKeyBehaviors); - } - if ((f_present & (1 << 6)) != 0) { -- listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_VirtualMods_vmods_rtrn, popcount(f_virtualMods), byte_order); -+ listOfByte(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_Types_VirtualMods_vmods_rtrn, my_popcount(f_virtualMods), byte_order); - } - if ((f_present & (1 << 3)) != 0) { - struct_xkb_SetExplicit(tvb, offsetp, t, byte_order, f_totalKeyExplicit); -@@ -23447,7 +23447,7 @@ static void xkbGetKbdByName_Reply(tvbuff - *offsetp += 2; - UNUSED(16); - struct_xkb_SymInterpret(tvb, offsetp, t, byte_order, f_nSIRtrn); -- struct_xkb_ModDef(tvb, offsetp, t, byte_order, popcount(f_groupsRtrn)); -+ struct_xkb_ModDef(tvb, offsetp, t, byte_order, my_popcount(f_groupsRtrn)); - } - if ((f_reported & (1 << 4)) != 0) { - int f_nIndicators; -@@ -23601,13 +23601,13 @@ static void xkbGetKbdByName_Reply(tvbuff - listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_KTLevelNames_ktLevelNames_item, sumof_nLevelsPerType, byte_order); - } - if ((f_which & (1 << 8)) != 0) { -- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, popcount(f_indicators), byte_order); -+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_IndicatorNames_indicatorNames_item, my_popcount(f_indicators), byte_order); - } - if ((f_which & (1 << 11)) != 0) { -- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames_item, popcount(f_virtualMods), byte_order); -+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames, hf_x11_xkb_GetKbdByName_reply_KeyNames_VirtualModNames_virtualModNames_item, my_popcount(f_virtualMods), byte_order); - } - if ((f_which & (1 << 12)) != 0) { -- listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, popcount(f_groupNames), byte_order); -+ listOfCard32(tvb, offsetp, t, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups, hf_x11_xkb_GetKbdByName_reply_KeyNames_GroupNames_groups_item, my_popcount(f_groupNames), byte_order); - } - if ((f_which & (1 << 9)) != 0) { - struct_xkb_KeyName(tvb, offsetp, t, byte_order, f_nKeys); diff --git a/net/wireshark/patches/patch-bc b/net/wireshark/patches/patch-bc deleted file mode 100644 index a9457ec553b..00000000000 --- a/net/wireshark/patches/patch-bc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2010/09/26 23:15:18 tron Exp $ - -Avoid conflict with NetBSD's popcount(3). - ---- tools/process-x11-xcb.pl.orig 2010-08-29 23:15:01.000000000 +0100 -+++ tools/process-x11-xcb.pl 2010-09-26 23:55:27.000000000 +0100 -@@ -436,7 +436,7 @@ - return '(' . $op->att('op') . "$left)"; - } - when ('popcount') { -- return "popcount($left)"; -+ return "my_popcount($left)"; - } - default { die "Invalid unop element $op->name()\n"; } - } diff --git a/net/wireshark/patches/patch-ca b/net/wireshark/patches/patch-ca deleted file mode 100644 index 2bf74d5d955..00000000000 --- a/net/wireshark/patches/patch-ca +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-ca,v 1.1 2012/08/16 14:52:27 drochner Exp $ - -allow gnutls >= 3 - ---- configure.orig 2012-08-15 15:34:16.000000000 +0000 -+++ configure -@@ -16599,12 +16599,12 @@ if test -n "$LIBGNUTLS_CFLAGS"; then - pkg_cv_LIBGNUTLS_CFLAGS="$LIBGNUTLS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.0 gnutls < 3\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.0 gnutls < 3") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 1.2.0 gnutls < 3" 2>/dev/null` -+ pkg_cv_LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 1.2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -16616,12 +16616,12 @@ if test -n "$LIBGNUTLS_LIBS"; then - pkg_cv_LIBGNUTLS_LIBS="$LIBGNUTLS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.0 gnutls < 3\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.0 gnutls < 3") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.2.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "gnutls >= 1.2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 1.2.0 gnutls < 3" 2>/dev/null` -+ pkg_cv_LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 1.2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -16642,9 +16642,9 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 1.2.0 gnutls < 3" 2>&1` -+ LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 1.2.0" 2>&1` - else -- LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 1.2.0 gnutls < 3" 2>&1` -+ LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 1.2.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBGNUTLS_PKG_ERRORS" >&5 diff --git a/net/wireshark/patches/patch-configure b/net/wireshark/patches/patch-configure new file mode 100644 index 00000000000..d4843e49c9f --- /dev/null +++ b/net/wireshark/patches/patch-configure @@ -0,0 +1,13 @@ +$NetBSD: patch-configure,v 1.1 2016/03/03 13:33:14 wiz Exp $ + +--- configure.orig 2015-12-29 21:49:49.000000000 +0000 ++++ configure +@@ -5014,7 +5014,7 @@ $as_echo "none needed" >&6; } ;; #( + $as_echo "$ac_cv_prog_cc_stdc" >&6; } ;; + esac + +-if test "$ac_cv_prog_cc_stdc" == "no" ++if test "$ac_cv_prog_cc_stdc" = "no" + then + as_fn_error $? "The C compiler does not support standard C" "$LINENO" 5 + fi diff --git a/net/wireshark/patches/patch-configure.ac b/net/wireshark/patches/patch-configure.ac new file mode 100644 index 00000000000..0155bdfe542 --- /dev/null +++ b/net/wireshark/patches/patch-configure.ac @@ -0,0 +1,13 @@ +$NetBSD: patch-configure.ac,v 1.1 2016/03/03 13:33:14 wiz Exp $ + +--- configure.ac.orig 2015-12-29 21:49:18.000000000 +0000 ++++ configure.ac +@@ -60,7 +60,7 @@ AM_DISABLE_STATIC + # Checks for programs used in the main build process. + # + AC_PROG_CC_STDC +-if test "$ac_cv_prog_cc_stdc" == "no" ++if test "$ac_cv_prog_cc_stdc" = "no" + then + AC_MSG_ERROR([The C compiler does not support standard C]) + fi diff --git a/net/wireshark/patches/patch-help_Makefile.in b/net/wireshark/patches/patch-help_Makefile.in deleted file mode 100644 index e2159c42f79..00000000000 --- a/net/wireshark/patches/patch-help_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-help_Makefile.in,v 1.2 2015/09/12 19:03:59 tnn Exp $ - -Not all shells (E.g. pdksh) support '((', whereas '( (' is portable. - ---- help/Makefile.in.orig 2015-08-12 16:48:07.000000000 +0000 -+++ help/Makefile.in -@@ -684,7 +684,7 @@ uninstall-am: uninstall-helpDATA - # can use it exclusively. - faq.txt: $(srcdir)/faq.py - $(AM_V_GEN)$(srcdir)/faq.py >$@.tmp && \ -- (( command -v elinks > /dev/null && elinks -dump -dump-width 72 -no-numbering -no-references < $@.tmp > $@ ) || \ -+ ( ( command -v elinks > /dev/null && elinks -dump -dump-width 72 -no-numbering -no-references < $@.tmp > $@ ) || \ - ( command -v links > /dev/null && links -width 72 -html-numbered-links 0 -dump $@.tmp > $@ ) || \ - ( command -v lynx > /dev/null && lynx -dump -width=72 -nolist -stdin -force-html < $@.tmp > $@ ) || \ - $(srcdir)/../tools/html2text.py --width=72 --no-links $@.tmp > $@ ) && \ diff --git a/net/wireshark/patches/patch-ui_qt_Makefile.in b/net/wireshark/patches/patch-ui_qt_Makefile.in deleted file mode 100644 index efb9650e8b7..00000000000 --- a/net/wireshark/patches/patch-ui_qt_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ui_qt_Makefile.in,v 1.1 2015/11/06 17:35:26 adam Exp $ - -RCC is not configured; see also options.mk. - ---- ui/qt/Makefile.in.orig 2015-11-06 17:00:29.000000000 +0000 -+++ ui/qt/Makefile.in -@@ -1688,7 +1688,7 @@ wireshark-tap-register.c: $(WIRESHARK_QT - - .qrc.rcc.cpp: - $(MKDIR_P) $(@D) -- $(AM_V_RCC)rcc -name `basename $< .qrc` -o $@ $< -+ $(AM_V_RCC)@RCC@ -name `basename $< .qrc` -o $@ $< - - ui_%.h: %.ui - $(AM_V_UIC)$(UIC) $< -o $@ diff --git a/net/wireshark/patches/patch-ui_qt_mtp3__summary__dialog.cpp b/net/wireshark/patches/patch-ui_qt_mtp3__summary__dialog.cpp new file mode 100644 index 00000000000..9706846a5be --- /dev/null +++ b/net/wireshark/patches/patch-ui_qt_mtp3__summary__dialog.cpp @@ -0,0 +1,33 @@ +$NetBSD: patch-ui_qt_mtp3__summary__dialog.cpp,v 1.1 2016/03/03 13:33:14 wiz Exp $ + +--- ui/qt/mtp3_summary_dialog.cpp.orig 2015-12-29 21:49:23.000000000 +0000 ++++ ui/qt/mtp3_summary_dialog.cpp +@@ -208,7 +208,7 @@ QString Mtp3SummaryDialog::summaryToHtml + << table_hheader15_tmpl.arg(tr("Bytes/s")) + << table_row_end; + +- for (size_t si_code = 0; si_code < MTP3_NUM_SI_CODE; si_code++) { ++ for (size_t ws_si_code = 0; ws_si_code < MTP3_NUM_SI_CODE; ws_si_code++) { + int si_msus = 0; + int si_bytes = 0; + QString msus_s_str = n_a; +@@ -216,8 +216,8 @@ QString Mtp3SummaryDialog::summaryToHtml + QString bytes_s_str = n_a; + + for (size_t stat_idx = 0; stat_idx < mtp3_num_used; stat_idx++) { +- si_msus += mtp3_stat[stat_idx].mtp3_si_code[si_code].num_msus; +- si_bytes += mtp3_stat[stat_idx].mtp3_si_code[si_code].size; ++ si_msus += mtp3_stat[stat_idx].mtp3_si_code[ws_si_code].num_msus; ++ si_bytes += mtp3_stat[stat_idx].mtp3_si_code[ws_si_code].size; + } + total_msus += si_msus; + total_bytes += si_bytes; +@@ -232,7 +232,7 @@ QString Mtp3SummaryDialog::summaryToHtml + } + + out << table_row_begin +- << table_data_tmpl.arg(mtp3_service_indicator_code_short_vals[si_code].strptr) ++ << table_data_tmpl.arg(mtp3_service_indicator_code_short_vals[ws_si_code].strptr) + << table_data_tmpl.arg(si_msus) + << table_data_tmpl.arg(msus_s_str) + << table_data_tmpl.arg(si_bytes) -- cgit v1.2.3