From 90fb95d1ed28d6229f81d6bfa4a58bcbce824b0c Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 18 Feb 2010 17:36:23 +0000
Subject: main/wpa_supplicant: upgrade to 0.7.1

---
 main/wpa_supplicant/APKBUILD | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'main/wpa_supplicant/APKBUILD')

diff --git a/main/wpa_supplicant/APKBUILD b/main/wpa_supplicant/APKBUILD
index 6a2f978c8..bdcbd9bff 100644
--- a/main/wpa_supplicant/APKBUILD
+++ b/main/wpa_supplicant/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wpa_supplicant
-pkgver=0.6.10
+pkgver=0.7.1
 pkgrel=0
 pkgdesc="A utility providing key negotiation for WPA wireless networks"
 url="http://hostap.epitest.fi/wpa_supplicant"
@@ -88,12 +88,12 @@ prepare() {
 
 build() { 
 	cd "$_builddir"
-	make || return 1
+	make LIBDIR=/lib BINDIR=/sbin || return 1
 }
 
 package() {
 	cd "$_builddir"
-	make PREFIX=/usr DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" LIBDIR=/lib BINDIR=/sbin install || return 1
 	install -Dm644 wpa_supplicant.conf "$pkgdir"/etc/wpa_supplicant.conf
 	install -Dm644 doc/docbook/wpa_supplicant.conf.5 \
 		"$pkgdir"/usr/share/man/man5/wpa_supplicant.conf.5 || return 1
@@ -102,12 +102,15 @@ package() {
 		install -Dm644 doc/docbook/$i.8 \
 			"$pkgdir"/usr/share/man/man8/$i.8 || return 1
 	done
-	install -m755 -d "$pkgdir"/usr/share/dbus-1/system-services
-	sed -e 's/sbin/usr\/sbin/' -i dbus-wpa_supplicant.service 
-	install -m644 dbus-wpa_supplicant.service \
-		"$pkgdir"/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service || return 1
-	install -m755 -d "$pkgdir"/etc/dbus-1/system.d
-	install -m644 dbus-wpa_supplicant.conf \
-		"$pkgdir"/etc/dbus-1/system.d/fi.epitest.hostap.WPASupplicant.conf || return 1
+
+	# dbus
+	cd dbus || return 1
+	install -d "$pkgdir"/etc/dbus-1/system.d
+	install dbus-wpa_supplicant.conf \
+		"$pkgdir"/etc/dbus-1/system.d/wpa_supplicant.conf || return 1
+	install -d "$pkgdir"/usr/share/dbus-1/system-services
+	install fi.epitest.hostap.WPASupplicant.service \
+		"$pkgdir"/usr/share/dbus-1/system-services || return 1
+	install -d "$pkgdir"/var/run/wpa_supplicant
 }
-md5sums="8985b1030d753e5f74f8acfc34e591bb  wpa_supplicant-0.6.10.tar.gz"
+md5sums="02c475f949e5c131856915bbb87fa55d  wpa_supplicant-0.7.1.tar.gz"
-- 
cgit v1.2.3