From 0410a9bb05da9b932751c777320b70ba693b2451 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 2 Feb 2010 13:27:38 +0000
Subject: main/wireshark: upgrade to 1.2.6, build gtk wireshark

---
 main/wireshark/APKBUILD          |  54 +++++++++++++++++++++++++++++----------
 main/wireshark/wireshark.desktop |  10 ++++++++
 main/wireshark/wireshark.png     | Bin 0 -> 18535 bytes
 3 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 main/wireshark/wireshark.desktop
 create mode 100644 main/wireshark/wireshark.png

(limited to 'main')

diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD
index 33126d3f..8cd7aa0f 100644
--- a/main/wireshark/APKBUILD
+++ b/main/wireshark/APKBUILD
@@ -1,19 +1,20 @@
 # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com>
 # Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com>
 pkgname=wireshark
-pkgver=1.2.4
+pkgver=1.2.6
 pkgrel=0
-pkgdesc="A free network protocol analyzer for Unix/Linux and Windows formerly known as Ethereal"
+pkgdesc="network protocol analyzer - GTK version"
 url="http://www.wireshark.org"
 license="GPLv2"
-depends="gnutls bash heimdal"
-makedepends="bison flex perl glib glib-dev pkgconfig libpcap-dev libcap-dev"
+depends="bash"
+makedepends="bison flex perl glib glib-dev pkgconfig libpcap-dev libcap-dev
+	gtk+-dev c-ares-dev pcre-dev openssl-dev"
 install=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark"
+source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2
+	wireshark.desktop
+	wireshark.png"
 
-# append extra dependencies to -dev subpackage
-# remove if not used.
 # depends_dev="somepackage-dev"
 
 build() {
@@ -23,9 +24,7 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-wireshark \
-		--disable-editcap \
-		--disable-mergecap \
+		--with-ssl \
 		--disable-text2pcap \
 		--disable-idl2wrs \
 		--disable-dftest \
@@ -35,7 +34,36 @@ build() {
 
 package() {
 	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
+	make -j1 DESTDIR="$pkgdir" install
+	install -Dm644 "$srcdir"/wireshark.png \
+		"$pkgdir"/usr/share/icons/wireshark.png
+	install -Dm644 "$srcdir"/wireshark.desktop \
+		"$pkgdir"/usr/share/applications/wireshark.desktop
 }
 
-md5sums="ae4533da7d0e54c236e1eed966c42163  wireshark-1.2.4.tar.bz2"
+common() {
+	local i
+	pkgdesc="network protoccol analyzer - common files"
+	mkdir -p "$subpkgdir"/usr/lib "$subpkgdir"/usr/share \
+		"$subpkgdir"/usr/bin
+	mv "$pkgdir"/etc "$subpkgdir"/
+	mv "$pkgdir"/usr/share/wireshark "$subpkgdir"/usr/share/
+	mv "$pkgdir"/usr/lib/* "$subpkgdir"/usr/lib/
+	# move all bins except wireshark
+	for i in "$pkgdir"/usr/bin/*; do
+		case "$i" in
+			*/tshark|*/wireshark) continue;;
+		esac
+		mv "$i" "$subpkgdir"/usr/bin/
+	done
+}
+
+tshark() {
+	pkgdesc="network protoccol analyzer - console version"
+	install -d "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark
+}
+
+md5sums="f3e0917ed393366bbf96c53b58cb0931  wireshark-1.2.6.tar.bz2
+504ede44c02b2a52f6cbd3bffdf93b8d  wireshark.desktop
+e771800a8c977fe223583a453bc27397  wireshark.png"
diff --git a/main/wireshark/wireshark.desktop b/main/wireshark/wireshark.desktop
new file mode 100644
index 00000000..f4317f6d
--- /dev/null
+++ b/main/wireshark/wireshark.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+GenericName=Wireshark
+Comment=Network protocol analyzer
+Name=wireshark
+Exec=wireshark
+Icon=/usr/share/icons/wireshark.png
+Type=Application
+Terminal=false
+Categories=Application;Network;
diff --git a/main/wireshark/wireshark.png b/main/wireshark/wireshark.png
new file mode 100644
index 00000000..4e402630
Binary files /dev/null and b/main/wireshark/wireshark.png differ
-- 
cgit v1.2.3