wireshark: bump version.

* enable libpcap.

net-analyzer/wireshark/patches/wireshark-2.0.0.patchset

@@ -1,22 +0,0 @@
-From 18b6cf8a0bdab1dc663d2df00eb1fdccd80663b6 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Tue, 24 Jan 2017 20:21:08 +0100
-Subject: use data/aclocal
-
-
-diff --git a/aclocal-flags b/aclocal-flags
-index 49af718..62508e5 100755
---- a/aclocal-flags
-+++ b/aclocal-flags
-@@ -107,7 +107,7 @@ if [ -z "$glib_prefix" ]
- then
- 	glib_aclocal_dir=""
- else
--	glib_aclocal_dir=$glib_prefix/share/aclocal
-+	glib_aclocal_dir=$glib_prefix/data/aclocal
- fi
- 
- #
--- 
-2.10.2
-

net-analyzer/wireshark/wireshark-2.2.4.recipe

@@ -13,11 +13,10 @@ from the capture."
 LICENSE="GNU GPL v2"
 COPYRIGHT="1998-2015 Gerald Combs"
 HOMEPAGE="http://www.wireshark.org"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/wireshark/wireshark/archive/wireshark-$portVersion.tar.gz"
-CHECKSUM_SHA256="5e01962638b7ecfce30d3970c909b9dcac4ef4299cdcd77a2bba0ebb85ef94e6"
+CHECKSUM_SHA256="a93096383389a42becfe25294c6ea6d7c1ddc8718a293501d0181f4bfb384a6e"
 SOURCE_DIR="wireshark-wireshark-$portVersion"
-PATCHES="wireshark-$portVersion.patchset"
 ADDITIONAL_FILES="wireshark.rdef"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
@@ -26,39 +25,55 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	wireshark$secondaryArchSuffix = $portVersion
 	cmd:wireshark$secondaryArchSuffix
-	cmd:androiddump$secondaryArchSuffix
 	cmd:capinfos$secondaryArchSuffix
 	cmd:captype$secondaryArchSuffix
 	cmd:dftest$secondaryArchSuffix
+	cmd:dumpcap$secondaryArchSuffix
 	cmd:editcap$secondaryArchSuffix
 	cmd:idl2wrs$secondaryArchSuffix
 	cmd:mergecap$secondaryArchSuffix
 	cmd:randpkt$secondaryArchSuffix
+	cmd:rawshark$secondaryArchSuffix
 	cmd:reordercap$secondaryArchSuffix
 	cmd:text2pcap$secondaryArchSuffix
 	cmd:tshark$secondaryArchSuffix
-	lib:libwireshark$secondaryArchSuffix
-	lib:libwiretap$secondaryArchSuffix
-	lib:libwsutil$secondaryArchSuffix
+	lib:libwireshark$secondaryArchSuffix =8.1.4 compat >= 8
+	lib:libwiretap$secondaryArchSuffix = 6.0.4 compat >= 6
+	lib:libwscodecs$secondaryArchSuffix = 1.0.0 compat >= 1
+	lib:libwsutil$secondaryArchSuffix = 7.0.0 compat >= 7
+	devel:libwireshark$secondaryArchSuffix =8.1.4 compat >= 8
+	devel:libwiretap$secondaryArchSuffix = 6.0.4 compat >= 6
+	devel:libwscodecs$secondaryArchSuffix = 1.0.0 compat >= 1
+	devel:libwsutil$secondaryArchSuffix = 7.0.0 compat >= 7
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libgcrypt$secondaryArchSuffix
 	lib:libgpg_error$secondaryArchSuffix
-	lib:libglib_2.0${secondaryArchSuffix}
-	lib:libqt5$secondaryArchSuffix
+	lib:libglib_2.0$secondaryArchSuffix
+	lib:libgmodule_2.0$secondaryArchSuffix
+	lib:libgthread_2.0$secondaryArchSuffix
+	lib:libpcap$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Multimedia$secondaryArchSuffix
+	lib:libQt5PrintSupport$secondaryArchSuffix
+	lib:libQt5Widgets$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libgcrypt$secondaryArchSuffix
 	devel:libgpg_error$secondaryArchSuffix
 	devel:libgl$secondaryArchSuffix
-	devel:libglib_2.0${secondaryArchSuffix}
-	devel:libqt5$secondaryArchSuffix
+	devel:libglib_2.0$secondaryArchSuffix
 	devel:libpcap$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Multimedia$secondaryArchSuffix
+	devel:libQt5PrintSupport$secondaryArchSuffix
+	devel:libQt5Widgets$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
@@ -77,8 +92,8 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	autoreconf -fi
-	LIBS=-lnetwork CXXFLAGS=-fPIC runConfigure ./configure \
-		--without-gtk3 --with-pcap=no
+	LIBS=-lnetwork CPPFLAGS="-D_BSD_SOURCE -fPIC" runConfigure ./configure \
+		--without-gtk3
 	make $jobArgs
 }
 
@@ -90,6 +105,9 @@ INSTALL()
 	make install-strip
 	find $libDir -name '*.la' -delete
 
+	prepareInstalledDevelLibs libwireshark libwiretap libwscodecs libwsutil
+	fixPkgconfig
+
 	addResourcesToBinaries $portDir/additional-files/wireshark.rdef \
 		$binDir/wireshark
 }