[pkgsrc/trunk]: pkgsrc/sysutils/iwi-firmware Restore old version with conflic...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/43f33f0122f1
branches:  trunk
changeset: 522777:43f33f0122f1
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Dec 20 17:40:53 2006 +0000

description:
Restore old version with conflict on the new firmware version and
bump revision.

diffstat:

 sysutils/iwi-firmware/DESCR    |   2 ++
 sysutils/iwi-firmware/Makefile |  26 +++++++++++++++++---------
 sysutils/iwi-firmware/PLIST    |   6 +++++-
 sysutils/iwi-firmware/distinfo |   8 ++++----
 4 files changed, 28 insertions(+), 14 deletions(-)

diffs (94 lines):

diff -r cca05966195c -r 43f33f0122f1 sysutils/iwi-firmware/DESCR
--- a/sysutils/iwi-firmware/DESCR       Wed Dec 20 17:32:31 2006 +0000
+++ b/sysutils/iwi-firmware/DESCR       Wed Dec 20 17:40:53 2006 +0000
@@ -1,4 +1,6 @@
 Firmware binary images for use with the iwi(4) driver.
+This is version 2.3 of the firmware which might not be
+compatible with newer drivers.
 
 Original archive is available from Intel at:
 http://ipw2200.sourceforge.net/firmware.php?fid=4
diff -r cca05966195c -r 43f33f0122f1 sysutils/iwi-firmware/Makefile
--- a/sysutils/iwi-firmware/Makefile    Wed Dec 20 17:32:31 2006 +0000
+++ b/sysutils/iwi-firmware/Makefile    Wed Dec 20 17:40:53 2006 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2006/12/20 16:29:26 skrll Exp $
+# $NetBSD: Makefile,v 1.10 2006/12/20 17:40:53 joerg Exp $
 #
 
-DISTNAME=              ipw2200-fw-3.0
-PKGNAME=               iwi-firmware-3.0
+DISTNAME=              ipw2200-fw-2.3
+PKGNAME=               iwi-firmware-2.3
+PKGREVISION=           2
 CATEGORIES=            sysutils
 MASTER_SITES=          http://damien.bergamini.free.fr/iwifw/
 EXTRACT_SUFX=          .tgz
@@ -11,26 +12,33 @@
 HOMEPAGE=              http://damien.bergamini.free.fr/ipw/
 COMMENT=               Firmware binary images for iwi(4) driver
 
+CONFLICTS+=            iwi-firmware3-[0-9]*
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 LICENSE=               intel-ipw-license
 
-RESTRICTED=            Intel Licensed Software: see http://ipw2200.sourceforge.net/firmware.php?fid=7
+RESTRICTED=            Intel Licensed Software: see http://ipw2200.sourceforge.net/firmware.php?fid=5
 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_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
+       ${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
 
 .include "../../mk/bsd.pkg.mk"
diff -r cca05966195c -r 43f33f0122f1 sysutils/iwi-firmware/PLIST
--- a/sysutils/iwi-firmware/PLIST       Wed Dec 20 17:32:31 2006 +0000
+++ b/sysutils/iwi-firmware/PLIST       Wed Dec 20 17:40:53 2006 +0000
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2006/12/20 16:29:26 skrll Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/12/20 17:40:53 joerg 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 -r cca05966195c -r 43f33f0122f1 sysutils/iwi-firmware/distinfo
--- a/sysutils/iwi-firmware/distinfo    Wed Dec 20 17:32:31 2006 +0000
+++ b/sysutils/iwi-firmware/distinfo    Wed Dec 20 17:40:53 2006 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2006/12/20 16:29:26 skrll Exp $
+$NetBSD: distinfo,v 1.5 2006/12/20 17:40:53 joerg Exp $
 
-SHA1 (ipw2200-fw-3.0.tgz) = 84c28f1bed09c4d54bedf43492bd7884d0593928
-RMD160 (ipw2200-fw-3.0.tgz) = 6dafe3ef609176eec0f119df93fd586094892100
-Size (ipw2200-fw-3.0.tgz) = 269999 bytes
+SHA1 (ipw2200-fw-2.3.tgz) = 38d4c7d51a5da6b0faa7e5a348db701cc370900f
+RMD160 (ipw2200-fw-2.3.tgz) = 0130a641b14dbc66b1ae3eab953dbfae134c8263
+Size (ipw2200-fw-2.3.tgz) = 267413 bytes