4 files changed, 46 insertions, 28 deletions

diff --git a/net/iwi-firmware/Makefile b/net/iwi-firmware/Makefile
index 093b2d107680..dce224592abe 100644
--- a/net/iwi-firmware/Makefile
+++ b/net/iwi-firmware/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	iwi-firmware
 RELNAME=	ipw2200
 PORTVERSION=	2.4
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net sysutils
 
 MAINTAINER=	flz@FreeBSD.org
@@ -30,4 +30,6 @@ FIRMWARES=	ipw-${PORTVERSION}-boot.fw:${DRIVERNAME}-boot.fw \
 		ipw-${PORTVERSION}-sniffer.fw:${DRIVERNAME}-sniffer.fw \
 		ipw-${PORTVERSION}-sniffer_ucode.fw:${DRIVERNAME}-ucode-sniffer.fw
 
+MIN7OSVERSION=	700006
+
 .include "${MASTERDIR}/Makefile"
diff --git a/net/iwi-firmware/files/iwi.sh.in b/net/iwi-firmware/files/iwi.sh.in
index 602dd8efd3df..c19accaabae9 100644
--- a/net/iwi-firmware/files/iwi.sh.in
+++ b/net/iwi-firmware/files/iwi.sh.in
@@ -4,8 +4,8 @@
 #
 
 # PROVIDE: %%DRIVERNAME%%
-# REQUIRE: LOGIN abi
-# BEFORE:  securelevel
+# REQUIRE: mountcritlocal
+# BEFORE:  ipfilter
 # KEYWORD: FreeBSD shutdown
 
 # Add the following line to /etc/rc.conf to enable `%%DRIVERNAME%%':
@@ -43,7 +43,7 @@ command="/usr/local/sbin/%%DRIVERNAME%%control"
 
 		eval _mode=\$_%%DRIVERNAME%%_file_${i}
 		echo -n " [${i}:${_mode:=bss}]"
-		${command} -i ${i} -d %%DATADIR%% -m ${_mode:=bss}
+		${command} -i ${i} -d %%FWDIR%% -m ${_mode:=bss}
 		ifconfig ${i} up
 	done
 	echo "."
diff --git a/net/iwi-firmware/files/pkg-message.in b/net/iwi-firmware/files/pkg-message.in
index e38843d9d53e..5d9473418a93 100644
--- a/net/iwi-firmware/files/pkg-message.in
+++ b/net/iwi-firmware/files/pkg-message.in
@@ -1,20 +1,34 @@
 ------------------------------------------------------------------
-You must choose the correct mode depending on how you want to
-use your adapter.
+This port has installed following files in %%FWDIR%%:
 
-For instance, to download firmware for BSS mode:
+  - LICENSE.%%DRIVERNAME%% : License terms,
+  - %%DRIVERNAME%%-boot.fw : Boot mode firmware,
+  - %%DRIVERNAME%%-bss.fw : BSS mode firmware,
+  - %%DRIVERNAME%%-ucode-bss.fw : BSS mode micro-code,
+  - %%DRIVERNAME%%-ibss.fw : IBSS mode firmware,
+  - %%DRIVERNAME%%-ucode-ibss.fw : IBSS mode micro-code,
+  - %%DRIVERNAME%%-sniffer.fw : Sniffer mode firmware,
+  - %%DRIVERNAME%%-ucode-sniffer.fw : Sniffer mode micro-code.
 
-  # %%DRIVERNAME%%control -i %%DRIVERNAME%%0 -d %%DATADIR%% -m bss
-
-The port has installed a startup script (%%DRIVERNAME%%.sh). Add these lines
-to /etc/rc.conf to use it :
-
-  - %%DRIVERNAME%%_enable (bool) : defaults to "NO", set it to "YES" to
-    use the startup script.
-  - %%DRIVERNAME%%_interfaces (str) : defaults to "%%DRIVERNAME%%0", override it to
-    change to interface names list (optional).
-  - %%DRIVERNAME%%_mode_<iface> (str) : defaults to "bss", possible values
-    are bss, ibss and sniffer (optional).
+Ensure you've read license terms carefully before you use this
+firmware.
+%%DONT_NEED_CONTROL%%
+%%DONT_NEED_CONTROL%%You must choose the correct mode depending on how you want to
+%%DONT_NEED_CONTROL%%use your adapter.
+%%DONT_NEED_CONTROL%%
+%%DONT_NEED_CONTROL%%For instance, to download firmware for BSS mode:
+%%DONT_NEED_CONTROL%%
+%%DONT_NEED_CONTROL%%  # %%DRIVERNAME%%control -i %%DRIVERNAME%%0 -d %%DATADIR%% -m bss
+%%DONT_NEED_CONTROL%%
+%%DONT_NEED_CONTROL%%The port has installed a startup script (%%DRIVERNAME%%.sh). Add these lines
+%%DONT_NEED_CONTROL%%to /etc/rc.conf to use it :
+%%DONT_NEED_CONTROL%%
+%%DONT_NEED_CONTROL%%  - %%DRIVERNAME%%_enable (bool) : defaults to "NO", set it to "YES" to
+%%DONT_NEED_CONTROL%%    use the startup script.
+%%DONT_NEED_CONTROL%%  - %%DRIVERNAME%%_interfaces (str) : defaults to "%%DRIVERNAME%%0", override it to
+%%DONT_NEED_CONTROL%%    change to interface names list (optional).
+%%DONT_NEED_CONTROL%%  - %%DRIVERNAME%%_mode_<iface> (str) : defaults to "bss", possible values
+%%DONT_NEED_CONTROL%%    are bss, ibss and sniffer (optional).
 %%MIGHT_NEED_MODULE%%
 %%MIGHT_NEED_MODULE%%Note: 
 %%MIGHT_NEED_MODULE%%
diff --git a/net/iwi-firmware/pkg-plist b/net/iwi-firmware/pkg-plist
index af65766a487c..88df01e2791b 100644
--- a/net/iwi-firmware/pkg-plist
+++ b/net/iwi-firmware/pkg-plist
@@ -1,12 +1,14 @@
-sbin/%%DRIVERNAME%%control
-%%DATADIR%%/LICENSE
-%%DATADIR%%/%%DRIVERNAME%%-boot.fw
-%%DATADIR%%/%%DRIVERNAME%%-bss.fw
-%%DATADIR%%/%%DRIVERNAME%%-ucode-bss.fw
-%%DATADIR%%/%%DRIVERNAME%%-ibss.fw
-%%DATADIR%%/%%DRIVERNAME%%-ucode-ibss.fw
-%%DATADIR%%/%%DRIVERNAME%%-sniffer.fw
-%%DATADIR%%/%%DRIVERNAME%%-ucode-sniffer.fw
-@dirrm %%DATADIR%%
+@cwd /
+%%WITH_CONTROL%%usr/sbin/%%DRIVERNAME%%control
+@exec mkdir -p %%FWDIR%%
+@cwd %%FWDIR%%
+LICENSE.%%DRIVERNAME%%
+%%DRIVERNAME%%-boot.fw
+%%DRIVERNAME%%-bss.fw
+%%DRIVERNAME%%-ucode-bss.fw
+%%DRIVERNAME%%-ibss.fw
+%%DRIVERNAME%%-ucode-ibss.fw
+%%DRIVERNAME%%-sniffer.fw
+%%DRIVERNAME%%-ucode-sniffer.fw
 %%WITH_MODULE%%@cwd /
 %%WITH_MODULE%%%%KMODDIR%%/if_%%DRIVERNAME%%.ko