Index: head/net/ipw-firmware/Makefile =================================================================== --- head/net/ipw-firmware/Makefile (revision 137908) +++ head/net/ipw-firmware/Makefile (revision 137909) @@ -1,100 +1,102 @@ # New ports collection makefile for: ipw-firmware # Date created: May 11 2005 # Whom: Florent Thoumie # # $FreeBSD$ # 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 DISTFILES= ${RELNAME}-fw-${PORTVERSION}.tgz MAINTAINER= flz@FreeBSD.org COMMENT= Intel PRO/Wireless 2100 Driver Firmware 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 WRKSRC= ${WRKDIR} KERNDIR= /boot/kernel 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" \ MANDIR="${PREFIX}/man/man" \ KMODDIR="${KMODDIR}" USE_RC_SUBR= ${DRIVERNAME}.sh MAN8= ${DRIVERNAME}control.8 MANCOMPRESSED= yes .include # That's a bit arbitrary since I have no idea if ${DRIVERNAME}(4) can be # compiled on FreeBSD previous to 5.3-RELEASE. This is just too old, people # should move on. I may change this if I get successful reports though. # Comment this IGNORE line if you want to test it anyway. .if ${OSVERSION} < 503000 IGNORE= Need a fresh version of RELENG_5 .endif .if defined(WITH_MODULE) . if ${OSVERSION} > 600023 IGNORE= ${DRIVERNAME}(4) support is already included in your tree . else PLIST_SUB+= WITH_MODULE="" MAN4+= ${DRIVERNAME}.4 . endif .else PLIST_SUB+= WITH_MODULE="@comment MODULE " .endif # "Might" because people still can include ${DRIVERNAME}(4) support in kernel by extracting # its source in src/ and tweaking src/sys/conf/files. .if ${OSVERSION} <= 600023 && !exists(${KERNDIR}/if_${DRIVERNAME}.ko) && !defined(WITH_MODULE) SUB_LIST+= MIGHT_NEED_MODULE="" .else SUB_LIST+= MIGHT_NEED_MODULE="@comment " .endif do-build: .if defined(WITH_MODULE) cd ${WRKSRC}/${DRIVERDISTNAME}/src/; make all .else cd ${WRKSRC}/${DRIVERDISTNAME}/src/usr.sbin/${DRIVERNAME}control/; make all .endif do-install: .if !defined(PACKAGE_BUILDING) # Let pointyhat build the package, anyway the user will have to agree with license # terms to install the port/package. ${SH} ${PKGREQ} ${PORTNAME} INSTALL .endif ${MKDIR} ${DATADIR} .if defined(WITH_MODULE) cd ${WRKSRC}/${DRIVERDISTNAME}/src/; make install ${MAKE_ENV} .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: @${CAT} ${PKGMESSAGE} .include Property changes on: head/net/ipw-firmware/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/net/ipw-firmware/files/ipw.sh.in =================================================================== --- head/net/ipw-firmware/files/ipw.sh.in (revision 137908) +++ head/net/ipw-firmware/files/ipw.sh.in (revision 137909) @@ -1,66 +1,66 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: %%DRIVERNAME%% # REQUIRE: LOGIN abi # BEFORE: securelevel # KEYWORD: FreeBSD shutdown # Add the following line to /etc/rc.conf to enable `%%DRIVERNAME%%': # # %%DRIVERNAME%%_enable="YES" # . "%%RC_SUBR%%" name="%%DRIVERNAME%%" rcvar=`set_rcvar` start_cmd="%%DRIVERNAME%%_start_cmd" stop_cmd="%%DRIVERNAME%%_stop_cmd" load_rc_config "$name" : ${%%DRIVERNAME%%_enable="NO"} : ${%%DRIVERNAME%%_interfaces="%%DRIVERNAME%%0"} command="/usr/local/sbin/%%DRIVERNAME%%control" %%DRIVERNAME%%_start_cmd() { echo -n "Starting %%DRIVERNAME%%" for i in ${%%DRIVERNAME%%_interfaces}; do 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." exit 1 ;; esac eval _file=\$_%%DRIVERNAME%%_file_${i} echo -n " [${i}:${_mode:=bss}]" ${command} -i ${i} -f %%DATADIR%%/${_file} done echo "." } %%DRIVERNAME%%_stop_cmd() { echo "Stopping %%DRIVERNAME%%." for i in ${%%DRIVERNAME%%_interfaces}; do ${command} -i ${i} -k done } run_rc_command "$1" Property changes on: head/net/ipw-firmware/files/ipw.sh.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/ipw-firmware/files/pkg-message.in =================================================================== --- head/net/ipw-firmware/files/pkg-message.in (revision 137908) +++ head/net/ipw-firmware/files/pkg-message.in (revision 137909) @@ -1,37 +1,37 @@ ------------------------------------------------------------------ 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. You must choose the correct image depending on how you want to 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 : - %%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_ (str) : defaults to "bss", possible values are bss, ibss and monitor (optional). %%MIGHT_NEED_MODULE%% %%MIGHT_NEED_MODULE%%Note: %%MIGHT_NEED_MODULE%% %%MIGHT_NEED_MODULE%%This port requires %%DRIVERNAME%%(4) driver which has not been MFC'ed to %%MIGHT_NEED_MODULE%%RELENG_5. Point your web browser at [1] and install it by hand %%MIGHT_NEED_MODULE%%if not already done or rebuild the port with WITH_MODULE=yes. %%MIGHT_NEED_MODULE%% %%MIGHT_NEED_MODULE%%[1] http://damien.bergamini.free.fr/ipw/ ------------------------------------------------------------------ Property changes on: head/net/ipw-firmware/files/pkg-message.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/net/ipw-firmware/pkg-plist =================================================================== --- head/net/ipw-firmware/pkg-plist (revision 137908) +++ head/net/ipw-firmware/pkg-plist (revision 137909) @@ -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 Property changes on: head/net/ipw-firmware/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property