New firmware (version 3.0) required by the latest version of the iwi(4)

driver to be committed any minute now.

3 files changed, 14 insertions, 24 deletions

diff --git a/sysutils/iwi-firmware/Makefile b/sysutils/iwi-firmware/Makefile
index 627bb21523b..880a7543f41 100644
--- a/sysutils/iwi-firmware/Makefile
+++ b/sysutils/iwi-firmware/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/11/03 06:57:40 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/20 16:29:26 skrll Exp $
 #
 
-DISTNAME=		ipw2200-fw-2.3
-PKGNAME=		iwi-firmware-2.3
-PKGREVISION=		1
+DISTNAME=		ipw2200-fw-3.0
+PKGNAME=		iwi-firmware-3.0
 CATEGORIES=		sysutils
 MASTER_SITES=		http://damien.bergamini.free.fr/iwifw/
 EXTRACT_SUFX=		.tgz
@@ -16,27 +15,22 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 LICENSE=		intel-ipw-license
 
-RESTRICTED=		Intel Licensed Software: see http://ipw2200.sourceforge.net/firmware.php?fid=5
+RESTRICTED=		Intel Licensed Software: see http://ipw2200.sourceforge.net/firmware.php?fid=7
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
-WRKSRC=			${WRKDIR}
-
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 
 INSTALLATION_DIRS+=	libdata/if_iwi
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/libdata/if_iwi
-	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-boot.fw ${DESTDIR}${PREFIX}/libdata/if_iwi/iwi-boot.fw
-	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-bss.fw ${DESTDIR}${PREFIX}/libdata/if_iwi/iwi-bss.fw
-	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-bss_ucode.fw ${DESTDIR}${PREFIX}/libdata/if_iwi/iwi-ucode-bss.fw
-	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-ibss.fw ${DESTDIR}${PREFIX}/libdata/if_iwi/iwi-ibss.fw
-	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-ibss_ucode.fw ${DESTDIR}${PREFIX}/libdata/if_iwi/iwi-ucode-ibss.fw
-	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-sniffer.fw ${DESTDIR}${PREFIX}/libdata/if_iwi/iwi-sniffer.fw
-	${INSTALL_DATA} ${WRKSRC}/ipw-2.3-sniffer_ucode.fw ${DESTDIR}${PREFIX}/libdata/if_iwi/iwi-ucode-sniffer.fw
+	${INSTALL_DATA_DIR} ${DESTDIR}/${PREFIX}/libdata/if_iwi
+	${INSTALL_DATA} ${WRKSRC}/LICENSE.ipw2200-fw ${DESTDIR}/${PREFIX}/libdata/if_iwi/LICENSE
+	${INSTALL_DATA} ${WRKSRC}/ipw2200-bss.fw ${DESTDIR}/${PREFIX}/libdata/if_iwi/iwi-bss.fw
+	${INSTALL_DATA} ${WRKSRC}/ipw2200-ibss.fw ${DESTDIR}/${PREFIX}/libdata/if_iwi/iwi-ibss.fw
+	${INSTALL_DATA} ${WRKSRC}/ipw2200-sniffer.fw ${DESTDIR}/${PREFIX}/libdata/if_iwi/iwi-sniffer.fw
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/iwi-firmware/PLIST b/sysutils/iwi-firmware/PLIST
index 5b165eead19..9fada75c6ff 100644
--- a/sysutils/iwi-firmware/PLIST
+++ b/sysutils/iwi-firmware/PLIST
@@ -1,10 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2005/10/03 16:45:08 skrll Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/12/20 16:29:26 skrll Exp $
 libdata/if_iwi/LICENSE
-libdata/if_iwi/iwi-boot.fw
 libdata/if_iwi/iwi-bss.fw
 libdata/if_iwi/iwi-ibss.fw
 libdata/if_iwi/iwi-sniffer.fw
-libdata/if_iwi/iwi-ucode-bss.fw
-libdata/if_iwi/iwi-ucode-ibss.fw
-libdata/if_iwi/iwi-ucode-sniffer.fw
 @dirrm libdata/if_iwi
diff --git a/sysutils/iwi-firmware/distinfo b/sysutils/iwi-firmware/distinfo
index 31a0f8fad0e..a80ab159d8f 100644
--- a/sysutils/iwi-firmware/distinfo
+++ b/sysutils/iwi-firmware/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/06/09 07:30:03 skrll Exp $
+$NetBSD: distinfo,v 1.4 2006/12/20 16:29:26 skrll Exp $
 
-SHA1 (ipw2200-fw-2.3.tgz) = 38d4c7d51a5da6b0faa7e5a348db701cc370900f
-RMD160 (ipw2200-fw-2.3.tgz) = 0130a641b14dbc66b1ae3eab953dbfae134c8263
-Size (ipw2200-fw-2.3.tgz) = 267413 bytes
+SHA1 (ipw2200-fw-3.0.tgz) = 84c28f1bed09c4d54bedf43492bd7884d0593928
+RMD160 (ipw2200-fw-3.0.tgz) = 6dafe3ef609176eec0f119df93fd586094892100
+Size (ipw2200-fw-3.0.tgz) = 269999 bytes