Add support for FreeBSD 6.2 kernels only

Package-Manager: portage-2.1.2_rc2-r5

3 files changed, 79 insertions, 29 deletions

diff --git a/net-wireless/ipw2200-firmware/ChangeLog b/net-wireless/ipw2200-firmware/ChangeLog
index 571d44bcaf41..7a9b621f6707 100644
--- a/net-wireless/ipw2200-firmware/ChangeLog
+++ b/net-wireless/ipw2200-firmware/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/ipw2200-firmware
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200-firmware/ChangeLog,v 1.11 2006/04/22 14:38:30 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200-firmware/ChangeLog,v 1.12 2006/12/07 11:06:56 uberlord Exp $
+
+  07 Dec 2006; Roy Marples <uberlord@gentoo.org>
+  ipw2200-firmware-2.4.ebuild:
+  Add FreeBSD support for 6.2 kernels only.
 
   22 Apr 2006; Henrik Brix Andersen <brix@gentoo.org>
   ipw2200-firmware-3.0.ebuild:
diff --git a/net-wireless/ipw2200-firmware/Manifest b/net-wireless/ipw2200-firmware/Manifest
index af85aa656fbe..4120bf948812 100644
--- a/net-wireless/ipw2200-firmware/Manifest
+++ b/net-wireless/ipw2200-firmware/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST ipw2200-fw-2.2.tgz 179280 RMD160 0c41d92a9f34966568bd8a6627b6f6a46aa88afa SHA1 dceaa70fad4a5fb1508d9cf6bc25195c2d39953d SHA256 47edc1badd774a91cb17c7e8f079044a116c8e3b3d009c5e3aab13ad3e2255fe
 DIST ipw2200-fw-2.3.tgz 267413 RMD160 0130a641b14dbc66b1ae3eab953dbfae134c8263 SHA1 38d4c7d51a5da6b0faa7e5a348db701cc370900f SHA256 70cacf6df8fe0e55fc61cdd4abec7052dc8b6eaa41cc8067309509273ad3a2fc
 DIST ipw2200-fw-2.4.tgz 270419 RMD160 6f61717e4a875af322848b5a2e774fe3d5f533c0 SHA1 8b941b9280ac3ecb3503b1f5d3e97cfe35ba2033 SHA256 bdf882541b1deb52ebd4eac846367d32f8a4c8f76d3c2795a09e5f256a6d6b7b
@@ -13,18 +10,18 @@ EBUILD ipw2200-firmware-2.3.ebuild 644 RMD160 bd02d275ef9031fc2d37ab3182b50e00cc
 MD5 7e2bdd25cbff53268b013ff6a3e0b359 ipw2200-firmware-2.3.ebuild 644
 RMD160 bd02d275ef9031fc2d37ab3182b50e00ccfbed8a ipw2200-firmware-2.3.ebuild 644
 SHA256 a2eb6a96450180f15b683fc07c0d6bd8dad5ae758f32426dfae6122e0c557645 ipw2200-firmware-2.3.ebuild 644
-EBUILD ipw2200-firmware-2.4.ebuild 660 RMD160 9ec63fe538a41ffbe42fb1f3c03b464f7ef9f2ee SHA1 6926f5af973c8ba95f342d5a756aec68393d374f SHA256 ac269629de80e6808eee16f79a917dd4eeb5bb436495f3ac9a60245655ea37f4
-MD5 ed5825a57f818d8af1697a83a980d98e ipw2200-firmware-2.4.ebuild 660
-RMD160 9ec63fe538a41ffbe42fb1f3c03b464f7ef9f2ee ipw2200-firmware-2.4.ebuild 660
-SHA256 ac269629de80e6808eee16f79a917dd4eeb5bb436495f3ac9a60245655ea37f4 ipw2200-firmware-2.4.ebuild 660
+EBUILD ipw2200-firmware-2.4.ebuild 2083 RMD160 f3de4ea68e04d6300bca058638fb821a984dbafe SHA1 64c7b6476a7c5ba506a977c5af443d298599d91c SHA256 8415bc9b39dbae601ecfdfcb5fb0f312d571d4398d51fda0e77f0de39e1ce2f1
+MD5 bcbe7903ac02531cb4fd24343c7dd616 ipw2200-firmware-2.4.ebuild 2083
+RMD160 f3de4ea68e04d6300bca058638fb821a984dbafe ipw2200-firmware-2.4.ebuild 2083
+SHA256 8415bc9b39dbae601ecfdfcb5fb0f312d571d4398d51fda0e77f0de39e1ce2f1 ipw2200-firmware-2.4.ebuild 2083
 EBUILD ipw2200-firmware-3.0.ebuild 657 RMD160 497621435f62ef77ed51093e5243ecb1c897415b SHA1 e77c846d12a21b6e30462989335a9a5ffa5d3b20 SHA256 122949661ccd19b96924a05ae72025b8917407e571633f0753e04a3628f093c1
 MD5 5b3aa7b2f3ccd54e1ad74287e0b5303d ipw2200-firmware-3.0.ebuild 657
 RMD160 497621435f62ef77ed51093e5243ecb1c897415b ipw2200-firmware-3.0.ebuild 657
 SHA256 122949661ccd19b96924a05ae72025b8917407e571633f0753e04a3628f093c1 ipw2200-firmware-3.0.ebuild 657
-MISC ChangeLog 1570 RMD160 5356a289fbc4afc58905acefed34ce918dee518f SHA1 d3e94a01cf095090c01501320b9bf58ea882634c SHA256 02912426495f3bea870fad18234b72292040dd2f676d1579229fdb75945e32d4
-MD5 a442bf1a2d6aaa77a455986c5189573c ChangeLog 1570
-RMD160 5356a289fbc4afc58905acefed34ce918dee518f ChangeLog 1570
-SHA256 02912426495f3bea870fad18234b72292040dd2f676d1579229fdb75945e32d4 ChangeLog 1570
+MISC ChangeLog 1699 RMD160 07520968ce2b229c5a1f6a8ec52fe2f808658027 SHA1 ddec86e2941d62605215b030dd46e5373b0b0783 SHA256 3214df9ba5987ddfca325b8a6e6db4d87e6b774bf1d4c1cb756eafc27647ccde
+MD5 f3eec79dfdf8717b704430bc6412e5ef ChangeLog 1699
+RMD160 07520968ce2b229c5a1f6a8ec52fe2f808658027 ChangeLog 1699
+SHA256 3214df9ba5987ddfca325b8a6e6db4d87e6b774bf1d4c1cb756eafc27647ccde ChangeLog 1699
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
@@ -41,10 +38,3 @@ SHA256 bef4439b73631d789081d9e495245c71a77325b2ccbeb8f9eda9790a2b371331 files/di
 MD5 b65cd8f5703df7d3a53b1856130b45cd files/digest-ipw2200-firmware-3.0 235
 RMD160 39d5d5e645cb83fe1fcba8a05a3fdd9299889fe0 files/digest-ipw2200-firmware-3.0 235
 SHA256 8927363abf85df141fbec33d5a483c0747d98d0a05f5b9199b11bb6fdeb54cec files/digest-ipw2200-firmware-3.0 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEtoydflZ8QqxhrsMRAp4XAJ0Qe5NN6WRVvywYHkwg42Lo5hB+OACdEWjJ
-xDrQJVjxXpxGd9gCGr+ce5Y=
-=1HJQ
------END PGP SIGNATURE-----
diff --git a/net-wireless/ipw2200-firmware/ipw2200-firmware-2.4.ebuild b/net-wireless/ipw2200-firmware/ipw2200-firmware-2.4.ebuild
index 6dff41af2128..c248331bb2c7 100644
--- a/net-wireless/ipw2200-firmware/ipw2200-firmware-2.4.ebuild
+++ b/net-wireless/ipw2200-firmware/ipw2200-firmware-2.4.ebuild
@@ -1,25 +1,81 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200-firmware/ipw2200-firmware-2.4.ebuild,v 1.2 2005/11/17 13:36:14 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200-firmware/ipw2200-firmware-2.4.ebuild,v 1.3 2006/12/07 11:06:56 uberlord Exp $
+
+inherit bsdmk
 
 MY_P=${P/firmware/fw}
 S=${WORKDIR}
 
 DESCRIPTION="Firmware for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
 
-HOMEPAGE="http://ipw2200.sourceforge.net"
+HOMEPAGE="http://ipw2200.sourceforge.net/"
 SRC_URI="http://www.bughost.org/firmware/${MY_P}.tgz"
 
 LICENSE="ipw2200-fw"
-SLOT="${PV}"
-KEYWORDS="~amd64 x86"
+SLOT="0"
+KEYWORDS="~amd64 x86 ~x86-fbsd"
+
+IUSE="kernel_linux kernel_FreeBSD"
+DEPEND="kernel_linux? ( >=sys-apps/hotplug-20040923 )
+	kernel_FreeBSD? ( >=sys-freebsd/freebsd-sources-6.2_rc1 )"
+
+src_unpack() {
+	unpack ${A}
+
+	if use kernel_FreeBSD ; then
+		# We create a Makefile for each firmware file
+		# and get FreeBSD to make each kernel module
+		local fw fwname kmod d mfile
+		for fw in "boot:boot" "bss:bss" "bss_ucode:ucode_bss" \
+			"ibss:ibss" "ibss_ucode:ucode_ibss" \
+			"sniffer:monitor" "sniffer_ucode:ucode_monitor"; do
+			fwname="ipw-${PV}-${fw%%:*}.fw"
+			kmod="iwi_${fw#*:}"
+			d="${S}/${kmod}"
+			mkdir "${d}" || die
+			echo "KMOD=${kmod}" > "${d}/Makefile" || die
+			echo "FIRMWS=${fwname}:${kmod}:${PV}" \
+				>> "${d}/Makefile" || die
+			echo ".include <bsd.kmod.mk>" >> "${d}/Makefile" || die
+			mv "${S}/${fwname}" "${d}" || die
+		done
+	fi
+}
 
-IUSE=""
-DEPEND=">=sys-apps/hotplug-20040923"
+src_compile() {
+	if use kernel_FreeBSD ; then
+		local kmod
+		for kmod in boot bss ucode_bss ibss ucode_ibss \
+		monitor ucode_monitor; do
+			cd "${S}/iwi_${kmod}"; mkmake all || die
+		done
+	fi
+}
 
 src_install() {
-	insinto /lib/firmware
-	doins *.fw
+	dodoc LICENSE
+
+	if use kernel_linux ; then
+		insinto /lib/firmware
+		doins *.fw
+	fi
+
+	if use kernel_FreeBSD ; then
+		mkdir -p "${D}/boot/kernel"
+		local kmod
+		for kmod in boot bss ucode_bss ibss ucode_ibss monitor ucode_monitor; do
+			cd "${S}/iwi_${kmod}"; mkmake DESTDIR="${D}" install || die
+		done
+
+		# We never want to own this file
+		rm "${D}/boot/kernel/linker.hints"
+	fi
+}
 
-	newins LICENSE ipw-${PV}-LICENSE
+pkg_postinst() {
+	if use kernel_FreeBSD ; then
+		# Rebuild the linker.hints
+		kldxref "${ROOT}/boot/kernel"
+	fi
 }