Add a patch to enable dbus interface to compile on FreeBSD - you'll still need

  the dbus-core from the overlay though AND tweak the ebuild slightly.
  Keyworded ~xf86-fbsd.
Package-Manager: portage-2.1.2_pre1-r4

4 files changed, 44 insertions, 15 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 627f35c6e118..839b283f5050 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.76 2006/09/23 22:51:52 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.77 2006/09/29 09:15:43 uberlord Exp $
+
+  29 Sep 2006; Roy Marples <uberlord@gentoo.org>
+  +files/wpa_supplicant-0.5.5-sigpoll.patch, wpa_supplicant-0.5.5.ebuild:
+  Add a patch to enable dbus interface to compile on FreeBSD - you'll still need
+  the dbus-core from the overlay though AND tweak the ebuild slightly.
+  Keyworded ~xf86-fbsd.
 
   23 Sep 2006; Joseph Jezak <josejx@gentoo.org> wpa_supplicant-0.5.4.ebuild:
   Marked ppc stable for bug #144997.
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 1a8f05844ce1..b51e71163c8f 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -6,6 +6,10 @@ AUX wpa_supplicant-0.5.5-qt4.patch 2398 RMD160 10cf397ac7fa1b2146d55114c95d1663b
 MD5 5d8913030686471a3ab843514c4018b5 files/wpa_supplicant-0.5.5-qt4.patch 2398
 RMD160 10cf397ac7fa1b2146d55114c95d1663b66ef94e files/wpa_supplicant-0.5.5-qt4.patch 2398
 SHA256 cf72c70ab0ce1c79c25bcd02545271e7c1fe395c0b303b55cee87562f50877e1 files/wpa_supplicant-0.5.5-qt4.patch 2398
+AUX wpa_supplicant-0.5.5-sigpoll.patch 346 RMD160 40e2fb841ff85a675beae80f12728c7c1a6ef974 SHA1 4903aeda689a4344510017166a68c34b3c8f8d12 SHA256 5d3ef256e5d0a2a0c731bd86e459655b628160db44ed5c58a65b1b748d47e033
+MD5 aec461f191665981e231a872586fbddc files/wpa_supplicant-0.5.5-sigpoll.patch 346
+RMD160 40e2fb841ff85a675beae80f12728c7c1a6ef974 files/wpa_supplicant-0.5.5-sigpoll.patch 346
+SHA256 5d3ef256e5d0a2a0c731bd86e459655b628160db44ed5c58a65b1b748d47e033 files/wpa_supplicant-0.5.5-sigpoll.patch 346
 DIST wpa_supplicant-0.4.9.tar.gz 483279 RMD160 627ddb6c12f15e08448606f24b3082b50f814a43 SHA1 e6a5cd6fbb7f12cc0a074da212f4fd7fbde0aec0 SHA256 bc7b0dc81248394d2456ea25059bdf1df2173fa8d178cda7d4570671ab916857
 DIST wpa_supplicant-0.5.4.tar.gz 630779 RMD160 34074a4d1ebab4d455eb021a18ef9012943b1fd9 SHA1 53a03be9c39c783cb83f5e32f7aab493ef8b529e SHA256 6c14c9c6c68acc40aa1c860d4fde58424c57b48ea90700da189e6cf5c1dd6bd7
 DIST wpa_supplicant-0.5.5.tar.gz 661097 RMD160 eda95756c49fb140063c14e0b9950b7045f47972 SHA1 b0992a71e759432fa3536bc4013885f0fe65aba1 SHA256 d571021d74fe7433716fc968b568e458451f40cfb333b5a682cd4d8ee2373543
@@ -17,14 +21,14 @@ EBUILD wpa_supplicant-0.5.4.ebuild 5453 RMD160 9c4d1a6041acd7032f1ba4e1a7e93e703
 MD5 976dc6af9ca858f57004edd19a1ff902 wpa_supplicant-0.5.4.ebuild 5453
 RMD160 9c4d1a6041acd7032f1ba4e1a7e93e70305a1de0 wpa_supplicant-0.5.4.ebuild 5453
 SHA256 0bf236255f218eefe9a1b42ab02cb1c3df0dc9b950fa3220ae38d99404c54454 wpa_supplicant-0.5.4.ebuild 5453
-EBUILD wpa_supplicant-0.5.5.ebuild 5293 RMD160 af653659f1a8410065297c3af71170334527aac3 SHA1 c8d8e1597eb4cf5aefc4ba146abb2ea87f3f23e9 SHA256 2ae29a96867d856517fd37af2c7da90dd81c47af45b0b8d12b25996488af182b
-MD5 4c7d0191e38301e4c0f8754bdd9afea8 wpa_supplicant-0.5.5.ebuild 5293
-RMD160 af653659f1a8410065297c3af71170334527aac3 wpa_supplicant-0.5.5.ebuild 5293
-SHA256 2ae29a96867d856517fd37af2c7da90dd81c47af45b0b8d12b25996488af182b wpa_supplicant-0.5.5.ebuild 5293
-MISC ChangeLog 17820 RMD160 9c35f40e2f442042b6cd6a0d4b80feb598237d45 SHA1 6cf394d010afeef4bfd7fc8ffe48c81b93cad5a0 SHA256 31065cf47378fb02f0d21e8ef6cc74b9e05e172bfdeff897cb3aee7b629e6b7b
-MD5 8af8d92ba0077b0db06de4fb9c52a33b ChangeLog 17820
-RMD160 9c35f40e2f442042b6cd6a0d4b80feb598237d45 ChangeLog 17820
-SHA256 31065cf47378fb02f0d21e8ef6cc74b9e05e172bfdeff897cb3aee7b629e6b7b ChangeLog 17820
+EBUILD wpa_supplicant-0.5.5.ebuild 5530 RMD160 184f75a269f6b9090abd4784245c1a6d28fd74a7 SHA1 4ccfbc69bc76c3d06678999b5e8ecce8f25093d5 SHA256 193a11cc0ddebce0c5b8440198c0f2e4936f111ba8d5a6c5e7ff56e153f86dbe
+MD5 36d4d1e146e8d4822571eca513b2dbe5 wpa_supplicant-0.5.5.ebuild 5530
+RMD160 184f75a269f6b9090abd4784245c1a6d28fd74a7 wpa_supplicant-0.5.5.ebuild 5530
+SHA256 193a11cc0ddebce0c5b8440198c0f2e4936f111ba8d5a6c5e7ff56e153f86dbe wpa_supplicant-0.5.5.ebuild 5530
+MISC ChangeLog 18122 RMD160 c2cf7ac3f6a4a08615855fdd1c9bda41ee20116f SHA1 95b13dc73dd1974a7867ad467ac7d5c0a965c0fe SHA256 8d761e991e0753a0abc58df5c3f8eac25a0b2b133572fd93db621c5b6c84acc3
+MD5 2c9fbeb84c5a83fdee43b5ba0b3639c6 ChangeLog 18122
+RMD160 c2cf7ac3f6a4a08615855fdd1c9bda41ee20116f ChangeLog 18122
+SHA256 8d761e991e0753a0abc58df5c3f8eac25a0b2b133572fd93db621c5b6c84acc3 ChangeLog 18122
 MISC metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e SHA1 60f90e59de723ec974b5e2d8c3a952c3ea378f6f SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e
 MD5 672d42771a5a69fdbc5ba1648d133812 metadata.xml 250
 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e metadata.xml 250
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-sigpoll.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-sigpoll.patch
new file mode 100644
index 000000000000..6460e8234c15
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-sigpoll.patch
@@ -0,0 +1,16 @@
+--- ctrl_iface_dbus.h.orig	2006-09-29 09:41:07 +0100
++++ ctrl_iface_dbus.h	2006-09-29 09:44:23 +0100
+@@ -17,6 +17,13 @@
+ 
+ #ifdef CONFIG_CTRL_IFACE_DBUS
+ 
++/* If we don't have SIGPOLL, so use SIGIO instead */
++#ifndef SIGPOLL
++#ifdef SIGIO
++#define SIGPOLL SIGIO
++#endif
++#endif
++
+ #include <dbus/dbus.h>
+ 
+ #define WPAS_DBUS_OBJECT_PATH_MAX 150
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
index 3f603d4cdbec..32cf47b90fc9 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild,v 1.5 2006/09/06 07:53:29 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild,v 1.6 2006/09/29 09:15:43 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,19 +10,19 @@ SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
 LICENSE="|| ( GPL-2 BSD )"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="dbus gsm madwifi qt3 qt4 readline ssl kernel_linux kernel_FreeBSD"
 
-RDEPEND="dbus? ( sys-apps/dbus )
-		gsm? ( sys-apps/pcsc-lite )
+#When dbus-core is out of package mask, this is how it works
+#RDEPEND="dbus? ( || ( sys-apps/dbus-core sys-apps/dbus ) )"
+RDEPEND="kernel_linux? ( dbus? ( sys-apps/dbus ) )
+		kernel_linux? ( gsm? ( sys-apps/pcsc-lite ) )
 		qt4? ( =x11-libs/qt-4* )
 		!qt4? ( qt3? ( =x11-libs/qt-3* ) )
 		readline? ( sys-libs/ncurses sys-libs/readline )
 		ssl? ( dev-libs/openssl )
 		kernel_linux? ( madwifi? ( || ( net-wireless/madwifi-ng net-wireless/madwifi-old ) ) )
 		!kernel_linux? ( net-libs/libpcap )"
-DEPEND="sys-apps/sed
-		${RDEPEND}"
 
 pkg_setup() {
 	if use kernel_linux ; then
@@ -43,6 +43,9 @@ src_unpack() {
 	# Fix QT4 support, #146177 thanks to Horst Schirmeier.
 	epatch "${FILESDIR}/${P}-qt4.patch"
 
+	# If we don't have SIGPOLL (like FreeBSD), use SIGIO instead
+	epatch "${FILESDIR}/${P}-sigpoll.patch"
+
 	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
 	sed -i \
 		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \