- Finally fix the mtree problem both in HEAD and in stable branches.

Reported by:	kris

net/ipw-firmware/Makefile

@@ -67,11 +67,13 @@ IGNORE=		needs at least FreeBSD 5.3-RELEASE
 
 .if ${OSVERSION} > ${MIN7OSVERSION}
 SUB_LIST+=	DONT_NEED_CONTROL="@comment "
+PLIST_SUB+=	MTREE_DIRRM="@comment "
 . if !defined(WITHOUT_CONTROL)
 IGNORE=		is configured with ${DRIVERNAME}control(8) which you don't need
 . endif
 .else
 SUB_LIST+=	DONT_NEED_CONTROL=""
+PLIST_SUB+=	MTREE_DIRRM=""
 MAN8+=		${DRIVERNAME}control.8
 USE_RCORDER=	${DRIVERNAME}.sh
 .endif

net/ipw-firmware/pkg-plist

@@ -1,10 +1,11 @@
 @cwd /
 %%WITH_CONTROL%%usr/sbin/%%DRIVERNAME%%control
-@exec mkdir -p %%FWDIR%%
+%%MTREE_DIRRM%%@exec mkdir -p %%FWDIR%%
 @cwd %%FWDIR%%
 LICENSE.%%DRIVERNAME%%
 %%DRIVERNAME%%-i.fw
 %%DRIVERNAME%%-p.fw
 %%DRIVERNAME%%.fw
+%%MTREE_DIRRM%%@unexec rmdir %%FWDIR%% 2>/dev/null || true
 %%WITH_MODULE%%@cwd /
 %%WITH_MODULE%%%%KMODDIR%%/if_%%DRIVERNAME%%.ko

net/iwi-firmware/pkg-plist

@@ -1,6 +1,6 @@
 @cwd /
 %%WITH_CONTROL%%usr/sbin/%%DRIVERNAME%%control
-@exec mkdir -p %%FWDIR%%
+%%MTREE_DIRRM%%@exec mkdir -p %%FWDIR%%
 @cwd %%FWDIR%%
 LICENSE.%%DRIVERNAME%%
 %%DRIVERNAME%%-boot.fw
@@ -10,5 +10,6 @@ LICENSE.%%DRIVERNAME%%
 %%DRIVERNAME%%-ucode-ibss.fw
 %%DRIVERNAME%%-sniffer.fw
 %%DRIVERNAME%%-ucode-sniffer.fw
+%%MTREE_DIRRM%%@unexec rmdir %%FWDIR%% 2>/dev/null || true
 %%WITH_MODULE%%@cwd /
 %%WITH_MODULE%%%%KMODDIR%%/if_%%DRIVERNAME%%.ko