Add support for Gentoo FreeBSD, bug #130369. Thanks to Flameeyes for compile-testing.

Package-Manager: portage-2.0.54

3 files changed, 38 insertions, 19 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 7c88c060c434..6b93647f2350 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,11 @@
 # 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.56 2006/04/14 13:56:52 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.57 2006/04/22 16:33:34 brix Exp $
+
+  22 Apr 2006; Henrik Brix Andersen <brix@gentoo.org>
+  wpa_supplicant-0.5.2.ebuild:
+  Add support for Gentoo FreeBSD, bug #130369. Thanks to Flameeyes for
+  compile-testing.
 
   14 Apr 2006; Henrik Brix Andersen <brix@gentoo.org>
   wpa_supplicant-0.4.8.ebuild, wpa_supplicant-0.5.2.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 1eac14a93b81..860c113d07e0 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -1,4 +1,4 @@
-MD5 0657aec96bcc79d15c40b2c2fd32e698 ChangeLog 13877
+MD5 cbdbd54d62975e119ed16ff601da383a ChangeLog 14053
 MD5 399c0ed3e8d999a49b9435a83705f96c files/digest-wpa_supplicant-0.4.7 72
 MD5 3c1bdab1affb98719ab98620e2863c8d files/digest-wpa_supplicant-0.4.8 72
 MD5 a9017f6f882a41e700a0a517ef60e964 files/digest-wpa_supplicant-0.5.2 72
@@ -8,4 +8,4 @@ MD5 7557dcc784bddabf268e1c49eee4fb59 files/wpa_supplicant-0.5.2-wpa_cli.sh 1229
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 e160e685fea1c7c2717acebbe4fe6dff wpa_supplicant-0.4.7.ebuild 3564
 MD5 3ecc467d6e993983e8fc11a3a021b0e1 wpa_supplicant-0.4.8.ebuild 3898
-MD5 5655216e36f10baca198b03f253ea260 wpa_supplicant-0.5.2.ebuild 4309
+MD5 6a5f32065e686a4bd5acad27f39e2723 wpa_supplicant-0.5.2.ebuild 4687
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.2.ebuild
index 27351db327f5..0fa83322a64d 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.2.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.2.ebuild,v 1.3 2006/04/14 14:07:58 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.2.ebuild,v 1.4 2006/04/22 16:33:34 brix Exp $
 
 inherit eutils toolchain-funcs
 
@@ -21,7 +21,8 @@ RDEPEND="gsm? ( sys-apps/pcsc-lite )
 		readline? ( sys-libs/ncurses
 					sys-libs/readline )
 		ssl? ( dev-libs/openssl )
-		madwifi? ( || ( net-wireless/madwifi-ng net-wireless/madwifi-old ) )"
+		kernel_linux? ( madwifi? ( || ( net-wireless/madwifi-ng net-wireless/madwifi-old ) ) )
+		!kernel_linux? ( net-libs/libpcap )"
 DEPEND="sys-apps/sed
 		${RDEPEND}"
 
@@ -30,6 +31,11 @@ src_unpack() {
 
 	unpack ${A}
 
+	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
+	sed -i \
+		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
+		${S}/l2_packet_freebsd.c
+
 	# toolchain setup
 	echo "CC = $(tc-getCC)" > ${CONFIG}
 
@@ -68,23 +74,31 @@ src_unpack() {
 		echo "CONFIG_SMARTCARD=y"    >> ${CONFIG}
 	fi
 
-	# Linux specific drivers
-	echo "CONFIG_WIRELESS_EXTENSION=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_ATMEL=y"       >> ${CONFIG}
-	echo "CONFIG_DRIVER_HOSTAP=y"      >> ${CONFIG}
-	echo "CONFIG_DRIVER_IPW=y"         >> ${CONFIG}
-	echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
-	echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
-	echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
-	echo "CONFIG_DRIVER_WIRED=y"       >> ${CONFIG}
+	if use kernel_linux; then
+		# Linux specific drivers
+		echo "CONFIG_WIRELESS_EXTENSION=y" >> ${CONFIG}
+		echo "CONFIG_DRIVER_ATMEL=y"       >> ${CONFIG}
+		echo "CONFIG_DRIVER_HOSTAP=y"      >> ${CONFIG}
+		echo "CONFIG_DRIVER_IPW=y"         >> ${CONFIG}
+		echo "CONFIG_DRIVER_NDISWRAPPER=y" >> ${CONFIG}
+		echo "CONFIG_DRIVER_PRISM54=y"     >> ${CONFIG}
+		echo "CONFIG_DRIVER_WEXT=y"        >> ${CONFIG}
+		echo "CONFIG_DRIVER_WIRED=y"       >> ${CONFIG}
+
+		if use madwifi; then
+			# Add include path for madwifi-driver headers
+			echo "CFLAGS += -I${ROOT}/usr/include/madwifi" >> ${CONFIG}
+			echo "CONFIG_DRIVER_MADWIFI=y"                 >> ${CONFIG}
+		fi
+	fi
 
-	if use madwifi; then
-		# Add include path for madwifi-driver headers
-		echo "CFLAGS += -I${ROOT}/usr/include/madwifi" >> ${CONFIG}
-		echo "CONFIG_DRIVER_MADWIFI=y"                 >> ${CONFIG}
+	if use kernel_FreeBSD; then
+		# FreeBSD specific driver
+		echo "CONFIG_DRIVER_BSD=y" >> ${CONFIG}
 	fi
 
-	# people seem to take the example file too literally, bug #102361
+	# people seem to take the example configuration file too literally
+	# bug #102361
 	sed -i \
 		-e "s:^\(opensc_engine_path\):#\1:" \
 		-e "s:^\(pkcs11_engine_path\):#\1:" \