Re-import wireshark-1.12.9 as net/wireshark1.

The default stable version is 2.0.2.

Wireshark is a network traffic analyzer, or "sniffer", for Unix and
Unix-like operating systems.  It uses GTK+, a graphical user interface
library, and libpcap, a packet capture and filtering library.

The Wireshark distribution also comes with TShark, which is a
line-oriented sniffer (similar to Sun's snoop, or tcpdump) that uses the
same dissection, capture-file reading and writing, and packet filtering
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.

13 files changed, 800 insertions, 0 deletions

diff --git a/net/wireshark1/DESCR b/net/wireshark1/DESCR
new file mode 100644
index 00000000000..950a3e91504
--- /dev/null
+++ b/net/wireshark1/DESCR
@@ -0,0 +1,13 @@
+Wireshark is a network traffic analyzer, or "sniffer", for Unix and
+Unix-like operating systems.  It uses GTK+, a graphical user interface
+library, and libpcap, a packet capture and filtering library.
+
+The Wireshark distribution also comes with TShark, which is a
+line-oriented sniffer (similar to Sun's snoop, or tcpdump) that uses the
+same dissection, capture-file reading and writing, and packet filtering
+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 is the old stable release (v1.x).
diff --git a/net/wireshark1/Makefile b/net/wireshark1/Makefile
new file mode 100644
index 00000000000..3496e3d86e5
--- /dev/null
+++ b/net/wireshark1/Makefile
@@ -0,0 +1,85 @@
+# $NetBSD: Makefile,v 1.1 2016/03/03 13:30:27 wiz Exp $
+
+DISTNAME=	wireshark-1.12.9
+CATEGORIES=	net
+MASTER_SITES=	https://www.wireshark.org/download/src/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.wireshark.org/
+COMMENT=	Network protocol analyzer (v1.x)
+LICENSE=	gnu-gpl-v2
+
+CONFLICTS+=		ethereal-[0-9]*
+
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake perl pkg-config yacc lex
+
+USE_LIBTOOL=		yes
+SHLIBTOOL_OVERRIDE=	# empty
+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}
+
+PTHREAD_OPTS+=		require
+
+PYTHON_FOR_BUILD_ONLY=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # not yet ported as of 1.10.5
+REPLACE_PYTHON+=	help/faq.py
+REPLACE_PYTHON+=	tools/asn2deb
+REPLACE_PYTHON+=	tools/asn2wrs.py
+REPLACE_PYTHON+=	tools/dfilter-test.py
+REPLACE_PYTHON+=	tools/ftsanity.py
+REPLACE_PYTHON+=	tools/html2text.py
+REPLACE_PYTHON+=	tools/idl2deb
+REPLACE_PYTHON+=	tools/indexcap.py
+REPLACE_PYTHON+=	tools/make-dissector-reg.py
+REPLACE_PYTHON+=	tools/make-tap-reg.py
+REPLACE_PYTHON+=	tools/msnchat
+REPLACE_PYTHON+=	tools/ncp2222.py
+REPLACE_PYTHON+=	tools/netscreen2dump.py
+REPLACE_PYTHON+=	tools/pkt-from-core.py
+REPLACE_PYTHON+=	tools/rdps.py
+
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
+
+.if !empty(MACHINE_PLATFORM:MDarwin-[567].*-*)
+USE_BUILTIN.libpcap=	no
+.endif
+
+CONFIGURE_ARGS.Darwin+=	--disable-osx-deploy-target
+
+# Extra post install targets are in options.mk
+post-install: ${POST_INSTALL_TARGETS}
+
+# wireshark no longer builds with NetBSD 3.x provided zlib
+BUILDLINK_API_DEPENDS.zlib=zlib>=1.2.1
+
+# wireshark uses gdk_pixbuf_new_from_inline which is deprecated, but asks
+# to hide deprecated prototypes. This leads to pointer truncation.
+# gui_utils.c:514:12: warning: incompatible integer to pointer conversion
+# assigning to 'GdkPixbuf *' (aka 'struct _GdkPixbuf *') from 'int'
+# [-Wint-conversion]
+BUILDLINK_TRANSFORM+=	rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../net/libpcap/buildlink3.mk"
+.include "../../devel/libsmi/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+
+.include "../../lang/python/application.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/wireshark1/PLIST b/net/wireshark1/PLIST
new file mode 100644
index 00000000000..71b27f22ecc
--- /dev/null
+++ b/net/wireshark1/PLIST
@@ -0,0 +1,281 @@
+@comment $NetBSD: PLIST,v 1.1 2016/03/03 13:30:27 wiz Exp $
+bin/capinfos
+bin/captype
+bin/dftest
+bin/dumpcap
+bin/editcap
+bin/mergecap
+bin/randpkt
+bin/rawshark
+bin/reordercap
+bin/text2pcap
+bin/tshark
+${PLIST.gtk3}bin/wireshark
+${PLIST.qt5}bin/wireshark-qt
+lib/libfiletap.la
+lib/libwireshark.la
+lib/libwiretap.la
+lib/libwsutil.la
+lib/wireshark/plugins/${PKGVERSION}/docsis.la
+lib/wireshark/plugins/${PKGVERSION}/ethercat.la
+lib/wireshark/plugins/${PKGVERSION}/gryphon.la
+lib/wireshark/plugins/${PKGVERSION}/irda.la
+lib/wireshark/plugins/${PKGVERSION}/m2m.la
+lib/wireshark/plugins/${PKGVERSION}/mate.la
+lib/wireshark/plugins/${PKGVERSION}/opcua.la
+lib/wireshark/plugins/${PKGVERSION}/profinet.la
+lib/wireshark/plugins/${PKGVERSION}/stats_tree.la
+lib/wireshark/plugins/${PKGVERSION}/unistim.la
+lib/wireshark/plugins/${PKGVERSION}/wimax.la
+lib/wireshark/plugins/${PKGVERSION}/wimaxasncp.la
+lib/wireshark/plugins/${PKGVERSION}/wimaxmacphy.la
+man/man1/capinfos.1
+man/man1/dftest.1
+man/man1/dumpcap.1
+man/man1/editcap.1
+man/man1/mergecap.1
+man/man1/randpkt.1
+man/man1/rawshark.1
+man/man1/reordercap.1
+man/man1/text2pcap.1
+man/man1/tshark.1
+${PLIST.icons}man/man1/wireshark.1
+man/man4/wireshark-filter.4
+${PLIST.gtk3}share/applications/wireshark.desktop
+${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.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/24x24/mimetypes/application-vnd.tcpdump.pcap.png
+${PLIST.icons}share/icons/hicolor/256x256/mimetypes/application-vnd.tcpdump.pcap.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/48x48/apps/wireshark.png
+${PLIST.icons}share/icons/hicolor/48x48/mimetypes/application-vnd.tcpdump.pcap.png
+${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-vnd.tcpdump.pcap.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
+share/wireshark/AUTHORS-SHORT
+share/wireshark/COPYING
+share/wireshark/capinfos.html
+share/wireshark/cfilters
+share/wireshark/colorfilters
+${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/Nokia.xml
+share/wireshark/diameter/NokiaSiemensNetworks.xml
+share/wireshark/diameter/SKT.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/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
+share/wireshark/diameter/sip.xml
+share/wireshark/diameter/sunping.xml
+${PLIST.lua}share/wireshark/dtd_gen.lua
+share/wireshark/dtds/dc.dtd
+share/wireshark/dtds/itunes.dtd
+share/wireshark/dtds/mscml.dtd
+share/wireshark/dtds/pocsettings.dtd
+share/wireshark/dtds/presence.dtd
+share/wireshark/dtds/reginfo.dtd
+share/wireshark/dtds/rlmi.dtd
+share/wireshark/dtds/rss.dtd
+share/wireshark/dtds/smil.dtd
+share/wireshark/dtds/watcherinfo.dtd
+share/wireshark/dtds/xcap-caps.dtd
+share/wireshark/dtds/xcap-error.dtd
+share/wireshark/dumpcap.html
+share/wireshark/editcap.html
+share/wireshark/help/capture_filters.txt
+share/wireshark/help/capturing.txt
+share/wireshark/help/display_filters.txt
+share/wireshark/help/faq.txt
+share/wireshark/help/getting_started.txt
+share/wireshark/help/overview.txt
+share/wireshark/help/toc
+${PLIST.lua}share/wireshark/init.lua
+share/wireshark/ipmap.html
+share/wireshark/manuf
+share/wireshark/mergecap.html
+share/wireshark/pdml2html.xsl
+share/wireshark/profiles/Bluetooth/colorfilters
+share/wireshark/profiles/Classic/colorfilters
+share/wireshark/radius/README.radius_dictionary
+share/wireshark/radius/custom.includes
+share/wireshark/radius/dictionary
+share/wireshark/radius/dictionary.3com
+share/wireshark/radius/dictionary.3gpp
+share/wireshark/radius/dictionary.3gpp2
+share/wireshark/radius/dictionary.acc
+share/wireshark/radius/dictionary.acme
+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.apc
+share/wireshark/radius/dictionary.aptis
+share/wireshark/radius/dictionary.aruba
+share/wireshark/radius/dictionary.ascend
+share/wireshark/radius/dictionary.asn
+share/wireshark/radius/dictionary.audiocodes
+share/wireshark/radius/dictionary.avaya
+share/wireshark/radius/dictionary.azaire
+share/wireshark/radius/dictionary.bay
+share/wireshark/radius/dictionary.bintec
+share/wireshark/radius/dictionary.bristol
+share/wireshark/radius/dictionary.cablelabs
+share/wireshark/radius/dictionary.cabletron
+share/wireshark/radius/dictionary.chillispot
+share/wireshark/radius/dictionary.cisco
+share/wireshark/radius/dictionary.cisco.bbsm
+share/wireshark/radius/dictionary.cisco.vpn3000
+share/wireshark/radius/dictionary.cisco.vpn5000
+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.cosine
+share/wireshark/radius/dictionary.dhcp
+share/wireshark/radius/dictionary.digium
+share/wireshark/radius/dictionary.eltex
+share/wireshark/radius/dictionary.epygi
+share/wireshark/radius/dictionary.ericsson
+share/wireshark/radius/dictionary.erx
+share/wireshark/radius/dictionary.extreme
+share/wireshark/radius/dictionary.fortinet
+share/wireshark/radius/dictionary.foundry
+share/wireshark/radius/dictionary.freeradius
+share/wireshark/radius/dictionary.freeradius.internal
+share/wireshark/radius/dictionary.freeswitch
+share/wireshark/radius/dictionary.gandalf
+share/wireshark/radius/dictionary.garderos
+share/wireshark/radius/dictionary.gemtek
+share/wireshark/radius/dictionary.h3c
+share/wireshark/radius/dictionary.hp
+share/wireshark/radius/dictionary.huawei
+share/wireshark/radius/dictionary.iea
+share/wireshark/radius/dictionary.infonet
+share/wireshark/radius/dictionary.ipunplugged
+share/wireshark/radius/dictionary.issanni
+share/wireshark/radius/dictionary.itk
+share/wireshark/radius/dictionary.jradius
+share/wireshark/radius/dictionary.juniper
+share/wireshark/radius/dictionary.karlnet
+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.merit
+share/wireshark/radius/dictionary.microsoft
+share/wireshark/radius/dictionary.mikrotik
+share/wireshark/radius/dictionary.motorola
+share/wireshark/radius/dictionary.motorola.wimax
+share/wireshark/radius/dictionary.navini
+share/wireshark/radius/dictionary.netscreen
+share/wireshark/radius/dictionary.networkphysics
+share/wireshark/radius/dictionary.nexans
+share/wireshark/radius/dictionary.nokia
+share/wireshark/radius/dictionary.nokia.conflict
+share/wireshark/radius/dictionary.nomadix
+share/wireshark/radius/dictionary.nortel
+share/wireshark/radius/dictionary.ntua
+share/wireshark/radius/dictionary.openser
+share/wireshark/radius/dictionary.packeteer
+share/wireshark/radius/dictionary.patton
+share/wireshark/radius/dictionary.propel
+share/wireshark/radius/dictionary.prosoft
+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
+share/wireshark/radius/dictionary.rfc2867
+share/wireshark/radius/dictionary.rfc2868
+share/wireshark/radius/dictionary.rfc2869
+share/wireshark/radius/dictionary.rfc3162
+share/wireshark/radius/dictionary.rfc3576
+share/wireshark/radius/dictionary.rfc3580
+share/wireshark/radius/dictionary.rfc4072
+share/wireshark/radius/dictionary.rfc4372
+share/wireshark/radius/dictionary.rfc4603
+share/wireshark/radius/dictionary.rfc4675
+share/wireshark/radius/dictionary.rfc4679
+share/wireshark/radius/dictionary.rfc4818
+share/wireshark/radius/dictionary.rfc4849
+share/wireshark/radius/dictionary.rfc5090
+share/wireshark/radius/dictionary.rfc5176
+share/wireshark/radius/dictionary.rfc5447
+share/wireshark/radius/dictionary.rfc5580
+share/wireshark/radius/dictionary.rfc5607
+share/wireshark/radius/dictionary.rfc5904
+share/wireshark/radius/dictionary.rfc6519
+share/wireshark/radius/dictionary.rfc6572
+share/wireshark/radius/dictionary.riverstone
+share/wireshark/radius/dictionary.roaringpenguin
+share/wireshark/radius/dictionary.shasta
+share/wireshark/radius/dictionary.shiva
+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.t_systems_nova
+share/wireshark/radius/dictionary.telebit
+share/wireshark/radius/dictionary.telkom
+share/wireshark/radius/dictionary.trapeze
+share/wireshark/radius/dictionary.tropos
+share/wireshark/radius/dictionary.ukerna
+share/wireshark/radius/dictionary.unix
+share/wireshark/radius/dictionary.usr
+share/wireshark/radius/dictionary.utstarcom
+share/wireshark/radius/dictionary.valemount
+share/wireshark/radius/dictionary.versanet
+share/wireshark/radius/dictionary.vqp
+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.wichorus
+share/wireshark/radius/dictionary.wispr
+share/wireshark/radius/dictionary.xedia
+share/wireshark/radius/dictionary.zyxel
+share/wireshark/randpkt.html
+share/wireshark/rawshark.html
+share/wireshark/reordercap.html
+share/wireshark/services
+share/wireshark/smi_modules
+share/wireshark/text2pcap.html
+share/wireshark/tpncp/tpncp.dat
+share/wireshark/tshark.html
+share/wireshark/wimaxasncp/dictionary.dtd
+share/wireshark/wimaxasncp/dictionary.xml
+share/wireshark/wireshark-filter.html
+share/wireshark/wireshark.html
+share/wireshark/ws.css
diff --git a/net/wireshark1/distinfo b/net/wireshark1/distinfo
new file mode 100644
index 00000000000..4b2f1ffe60f
--- /dev/null
+++ b/net/wireshark1/distinfo
@@ -0,0 +1,14 @@
+$NetBSD: distinfo,v 1.1 2016/03/03 13:30:27 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
diff --git a/net/wireshark1/options.mk b/net/wireshark1/options.mk
new file mode 100644
index 00000000000..bf5a56823d3
--- /dev/null
+++ b/net/wireshark1/options.mk
@@ -0,0 +1,101 @@
+# $NetBSD: options.mk,v 1.1 2016/03/03 13:30:27 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
+
+.if empty(PKG_OPTIONS:Mqt5)
+CONFIGURE_ARGS+=	--without-qt
+.else
+CONFIGURE_ARGS+=	--with-qt
+CONFIGURE_ENV+=		MOC=${QTDIR}/bin/moc
+CONFIGURE_ENV+=		RCC=${QTDIR}/bin/rcc
+CONFIGURE_ENV+=		UIC=${QTDIR}/bin/uic
+# RCC is not configured, so fix it here; see patch-ui_qt_Makefile.in
+SUBST_CLASSES+=		fix-rcc
+SUBST_MESSAGE.fix-rcc=	Fixing rcc path.
+SUBST_STAGE.fix-rcc=	pre-configure
+SUBST_FILES.fix-rcc=	ui/qt/Makefile.in
+SUBST_SED.fix-rcc=	-e 's,@RCC@,${QTDIR}/bin/rcc,'
+PLIST.qt5=		yes
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.  if ${OPSYS} == "Darwin"
+.include "../../x11/qt5-qtmacextras/buildlink3.mk"
+.  else
+.include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.  endif
+.endif
+
+.if empty(PKG_OPTIONS:Mgtk3)
+CONFIGURE_ARGS+=	--without-gtk3
+.else
+CONFIGURE_ARGS+=	--with-gtk3
+PLIST.gtk3=		yes
+POST_INSTALL_TARGETS+=	install-gtk-desktop
+.include "../../x11/gtk3/buildlink3.mk"
+
+.PHONY: install-gtk-desktop
+install-gtk-desktop:
+	${INSTALL_DATA} ${WRKSRC}/wireshark.desktop \
+		${DESTDIR}${PREFIX}/share/applications
+
+.endif
+
+# We might install the qt front end one day as well,
+# so have a generic icon target
+.if !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mqt5)
+CONFIGURE_ARGS+=	--enable-wireshark
+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}
+INSTALLATION_DIRS+=	share/icons/${c}color/${d}x${d}/apps
+.    endfor
+.  endfor
+
+.  for d in ${MIMEICON_SIZES}
+INSTALLATION_DIRS+=	share/icons/hicolor/${d}x${d}/mimetypes
+.  endfor
+
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+
+.PHONY: install-icons
+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}
+	${INSTALL_DATA} ${WRKSRC}/image/${c}${d}-app-wireshark.png \
+		${DESTDIR}${PREFIX}/share/icons/${c}color/${d}x${d}/apps/wireshark.png
+.    endfor
+.  endfor
+
+.  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
+.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}
+PLIST.lua=		yes
+.endif
diff --git a/net/wireshark1/patches/patch-aa b/net/wireshark1/patches/patch-aa
new file mode 100644
index 00000000000..049be53b722
--- /dev/null
+++ b/net/wireshark1/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2016/03/03 13:30:27 wiz 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 <stdio.h>
+ #include <string.h>
+ #include <math.h>
++#ifndef HAVE_FLOORL
++#define floorl(a) floor((double)(a))
++#endif
+ 
+ #include <glib.h>
+ 
diff --git a/net/wireshark1/patches/patch-ac b/net/wireshark1/patches/patch-ac
new file mode 100644
index 00000000000..0de5ca6fde6
--- /dev/null
+++ b/net/wireshark1/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2016/03/03 13:30:27 wiz 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/wireshark1/patches/patch-ba b/net/wireshark1/patches/patch-ba
new file mode 100644
index 00000000000..2fe62836ddb
--- /dev/null
+++ b/net/wireshark1/patches/patch-ba
@@ -0,0 +1,15 @@
+$NetBSD: patch-ba,v 1.1 2016/03/03 13:30:27 wiz 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/wireshark1/patches/patch-bb b/net/wireshark1/patches/patch-bb
new file mode 100644
index 00000000000..618a287f7a5
--- /dev/null
+++ b/net/wireshark1/patches/patch-bb
@@ -0,0 +1,163 @@
+$NetBSD: patch-bb,v 1.1 2016/03/03 13:30:27 wiz 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/wireshark1/patches/patch-bc b/net/wireshark1/patches/patch-bc
new file mode 100644
index 00000000000..cc965ed1a55
--- /dev/null
+++ b/net/wireshark1/patches/patch-bc
@@ -0,0 +1,15 @@
+$NetBSD: patch-bc,v 1.1 2016/03/03 13:30:27 wiz 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/wireshark1/patches/patch-ca b/net/wireshark1/patches/patch-ca
new file mode 100644
index 00000000000..d361163f7a7
--- /dev/null
+++ b/net/wireshark1/patches/patch-ca
@@ -0,0 +1,50 @@
+$NetBSD: patch-ca,v 1.1 2016/03/03 13:30:27 wiz 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/wireshark1/patches/patch-help_Makefile.in b/net/wireshark1/patches/patch-help_Makefile.in
new file mode 100644
index 00000000000..70605c5993b
--- /dev/null
+++ b/net/wireshark1/patches/patch-help_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-help_Makefile.in,v 1.1 2016/03/03 13:30:27 wiz 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/wireshark1/patches/patch-ui_qt_Makefile.in b/net/wireshark1/patches/patch-ui_qt_Makefile.in
new file mode 100644
index 00000000000..f20fc46443b
--- /dev/null
+++ b/net/wireshark1/patches/patch-ui_qt_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-ui_qt_Makefile.in,v 1.1 2016/03/03 13:30:27 wiz 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 $@