From 65282bc4830f929df8ae4d8121c9a832a4ff81be Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 30 Nov 2013 11:56:11 +0000
Subject: main/wireshark: specify license

---
 main/wireshark/APKBUILD | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'main/wireshark')

diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD
index 38d9186a6..7d7690eae 100644
--- a/main/wireshark/APKBUILD
+++ b/main/wireshark/APKBUILD
@@ -2,23 +2,24 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wireshark
 pkgver=1.10.3
-pkgrel=0
-pkgdesc="network protocol analyzer - GTK version"
+pkgrel=1
+pkgdesc="A network protocol analyzer - GTK version"
 url="http://www.wireshark.org"
 arch="all"
-license="GPLv2"
+license="GPL2+"
 depends="bash"
 makedepends="bison flex perl glib glib-dev pkgconfig libpcap-dev libcap-dev
 	gtk+-dev c-ares-dev pcre-dev gnutls-dev libgcrypt-dev openssl-dev
 	libnl3-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-common tshark"
-source="http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.bz2
+source="http://www.wireshark.org/download/src/$pkgname-$pkgver.tar.bz2
 	wireshark.desktop
 	wireshark.png"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	for i in $source; do
 		case "$i" in
 		*.patch)
@@ -30,8 +31,7 @@ prepare() {
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -45,12 +45,12 @@ build() {
 		--disable-dftest \
 		--disable-randpkt \
 		|| return 1
-	make
+	make || return 1
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make -j1 DESTDIR="$pkgdir" install
+	cd "$_builddir"
+	make -j1 DESTDIR="$pkgdir" install || return 1
 	install -Dm644 "$srcdir"/wireshark.png \
 		"$pkgdir"/usr/share/icons/wireshark.png
 	install -Dm644 "$srcdir"/wireshark.desktop \
-- 
cgit v1.2.3