4 files changed, 17 insertions, 15 deletions

diff --git a/net/ipw-firmware/Makefile b/net/ipw-firmware/Makefile
index a8558b0a2771..ca82447e325f 100644
--- a/net/ipw-firmware/Makefile
+++ b/net/ipw-firmware/Makefile
@@ -8,7 +8,7 @@
 PORTNAME?=	ipw-firmware
 RELNAME?=	ipw2100
 PORTVERSION?=	1.3
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	net sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	flz/ipw
@@ -21,7 +21,9 @@ DRIVERNAME?=	ipw
 DRIVERVERSION?=	1.6.4
 DRIVERDISTNAME=	${DRIVERNAME}-freebsd-${DRIVERVERSION}
 DISTFILES+=	${DRIVERDISTNAME}.tgz
-FIRMWARES?=	${RELNAME}-${PORTVERSION}-i.fw ${RELNAME}-${PORTVERSION}-p.fw ${RELNAME}-${PORTVERSION}.fw
+FIRMWARES?=	${RELNAME}-${PORTVERSION}-i.fw:${DRIVERNAME}-i.fw \
+		${RELNAME}-${PORTVERSION}-p.fw:${DRIVERNAME}-p.fw \
+		${RELNAME}-${PORTVERSION}.fw:${DRIVERNAME}.fw
 
 OPTIONS=	MODULE	"Install ${DRIVERNAME}(4) kernel module"	off
 
@@ -31,7 +33,6 @@ KMODDIR=	/boot/modules
 SUB_FILES=	pkg-message
 SUB_LIST=	DRIVERNAME="${DRIVERNAME}" \
 		RELNAME="${RELNAME}" \
-		PORTVERSION="${PORTVERSION}" \
 		KMODDIR="${KMODDIR}"
 PLIST_SUB:=	${SUB_LIST}
 MAKE_ENV=	BINDIR="${PREFIX}/sbin" \
@@ -90,8 +91,9 @@ do-install:
 .else
 	cd ${WRKSRC}/${DRIVERDISTNAME}/src/usr.sbin/${DRIVERNAME}control/; make install ${MAKE_ENV}
 .endif
-.for i in LICENSE ${FIRMWARES}
-	${INSTALL_DATA} ${WRKSRC}/$i ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/
+.for i in ${FIRMWARES}
+	${INSTALL_DATA} ${WRKSRC}/${i:C/:.*//} ${DATADIR}/${i:C/.*://}
 .endfor
 
 post-install:
diff --git a/net/ipw-firmware/files/ipw.sh.in b/net/ipw-firmware/files/ipw.sh.in
index 87ab2f4f4d37..b20894b99a0a 100644
--- a/net/ipw-firmware/files/ipw.sh.in
+++ b/net/ipw-firmware/files/ipw.sh.in
@@ -34,13 +34,13 @@ command="/usr/local/sbin/%%DRIVERNAME%%control"
 		eval _mode=\$%%DRIVERNAME%%_mode_${i}
 		case ${_mode} in
 		""|bss)
-			eval _%%DRIVERNAME%%_file_${i}="%%RELNAME%%-%%PORTVERSION%%.fw"
+			eval _%%DRIVERNAME%%_file_${i}="%%DRIVERNAME%%.fw"
 			;;
 		ibss)
-			eval _%%DRIVERNAME%%_file_${i}="%%RELNAME%%-%%PORTVERSION%%-i.fw"
+			eval _%%DRIVERNAME%%_file_${i}="%%DRIVERNAME%%-i.fw"
 			;;
 		monitor)
-			eval _%%DRIVERNAME%%_file_${i}="%%RELNAME%%-%%PORTVERSION%%-p.fw"
+			eval _%%DRIVERNAME%%_file_${i}="%%DRIVERNAME%%-p.fw"
 			;;
 		*)
 			echo "${_mode} - Possible values for %%DRIVERNAME%%_mode_${i} are bss|ibss|monitor."
diff --git a/net/ipw-firmware/files/pkg-message.in b/net/ipw-firmware/files/pkg-message.in
index b300d56ca2cb..5fb6f43982c9 100644
--- a/net/ipw-firmware/files/pkg-message.in
+++ b/net/ipw-firmware/files/pkg-message.in
@@ -2,9 +2,9 @@
 This port has installed following files in %%DATADIR%%:
 
   - LICENSE : License terms,
-  - %%RELNAME%%-%%PORTVERSION%%-i.fw : IBSS mode (aka ad-hoc mode) firmware,
-  - %%RELNAME%%-%%PORTVERSION%%-p.fw : Monitor mode firmware,
-  - %%RELNAME%%-%%PORTVERSION%%.fw : BSS mode (aka infrastructure mode) firmware.
+  - %%DRIVERNAME%%-i.fw : IBSS mode (aka ad-hoc mode) firmware,
+  - %%DRIVERNAME%%-p.fw : Monitor mode firmware,
+  - %%DRIVERNAME%%.fw : BSS mode (aka infrastructure mode) firmware.
 
 Ensure you've read license terms carefully before you use this
 firmware.
@@ -15,7 +15,7 @@ use your adapter.
 For instance, to download firmware for BSS mode:
 
   # %%DRIVERNAME%%control -i %%DRIVERNAME%%0 \
-	-f %%DATADIR%%/%%RELNAME%%-%%PORTVERSION%%.fw
+	-f %%DATADIR%%/%%DRIVERNAME%%.fw
 
 The port has installed a startup script (%%DRIVERNAME%%.sh). Add these lines
 to /etc/rc.conf to use it :
diff --git a/net/ipw-firmware/pkg-plist b/net/ipw-firmware/pkg-plist
index 5c82b5f813e2..71ffef5ff7ed 100644
--- a/net/ipw-firmware/pkg-plist
+++ b/net/ipw-firmware/pkg-plist
@@ -1,8 +1,8 @@
 sbin/%%DRIVERNAME%%control
 %%DATADIR%%/LICENSE
-%%DATADIR%%/%%RELNAME%%-%%PORTVERSION%%-i.fw
-%%DATADIR%%/%%RELNAME%%-%%PORTVERSION%%-p.fw
-%%DATADIR%%/%%RELNAME%%-%%PORTVERSION%%.fw
+%%DATADIR%%/%%DRIVERNAME%%-i.fw
+%%DATADIR%%/%%DRIVERNAME%%-p.fw
+%%DATADIR%%/%%DRIVERNAME%%.fw
 @dirrm %%DATADIR%%
 %%WITH_MODULE%%@cwd /
 %%WITH_MODULE%%%%KMODDIR%%/if_%%DRIVERNAME%%.ko