${RM} already has -f.

PR:		213570
Submitted by:	mat
Exp-run by:	antoine
Sponsored by:	Absolight

35 files changed, 51 insertions, 51 deletions

diff --git a/mail/batv-milter/Makefile b/mail/batv-milter/Makefile
index c3e9d308d49b..c29fa4bed55b 100644
--- a/mail/batv-milter/Makefile
+++ b/mail/batv-milter/Makefile
@@ -53,7 +53,7 @@ post-install:
 .if !defined(WITH_DEBUG)
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/batv-filter
 .endif
-	@${RM} -f ${MANPREFIX}/man/cat8/batv-filter.8 ${MANPREFIX}/man/cat8/batv-filter.8.gz
+	@${RM} ${MANPREFIX}/man/cat8/batv-filter.8 ${MANPREFIX}/man/cat8/batv-filter.8.gz
 	${INSTALL_MAN} ${WRKSRC}/*/batv-filter.8 ${STAGEDIR}${MANPREFIX}/man/man8/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 1ad414adbcfa..5d27648b74ef 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -39,7 +39,7 @@ post-install:
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mailtool
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/cone
 		${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${STAGEDIR}${PREFIX}/sbin/cone-sysconftool
-		${RM} -f ${STAGEDIR}${PREFIX}/share/cone/rootcerts/.0
+		${RM} ${STAGEDIR}${PREFIX}/share/cone/rootcerts/.0
 		@${MKDIR} ${STAGEDIR}${DOCSDIR}
 		${INSTALL_MAN} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
 
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 217e80caf936..abdb163adb10 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -329,7 +329,7 @@ post-install:
 .endfor
 	@${INSTALL_DATA} ${STAGEDIR}${DATADIR}/htmldoc/* ${STAGEDIR}${DOCSDIR}/html
 .endif
-	@${RM} -rf ${STAGEDIR}${DATADIR}/htmldoc
+	@${RM} -r ${STAGEDIR}${DATADIR}/htmldoc
 	@-${CHOWN} -Rh ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}
 	@${CHMOD} -R a+r ${STAGEDIR}${DATADIR}/courierwebadmin
 	@${CHMOD} -R a-w ${STAGEDIR}${DATADIR} ${STAGEDIR}${LIBEXECDIR}/courier
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index ab2f32e65523..424fa494d689 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -155,7 +155,7 @@ post-patch:
 		${WRKSRC}/tools/masssievec
 
 post-patch-DRAC-on:
-	@${RM} -rf ${WRKSRC}/autom4te.cache
+	@${RM} -r ${WRKSRC}/autom4te.cache
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 0677c0577fd0..2940bc04a22a 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -169,7 +169,7 @@ post-patch:
 		${WRKSRC}/tools/masssievec
 
 post-patch-DRAC-on:
-	@${RM} -rf ${WRKSRC}/autom4te.cache
+	@${RM} -r ${WRKSRC}/autom4te.cache
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile
index d843028befe0..e233e1c18663 100644
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@@ -195,7 +195,7 @@ post-patch:
 		${WRKSRC}/Makefile.in
 
 post-patch-DRAC-on:
-	@${RM} -rf ${WRKSRC}/autom4te.cache
+	@${RM} -r ${WRKSRC}/autom4te.cache
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index e214b0e012b2..893af16861e5 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -74,7 +74,7 @@ DATABASE+=	sqlite
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr
+	@${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -r
 	@${FIND} ${WRKSRC} -name *.orig -type f -delete
 
 post-configure:
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index 2977ef33486f..e5e1b9fd519b 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -107,7 +107,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/dk-filter/gentxt.csh \
 		${STAGEDIR}${PREFIX}/sbin/gentxt-dk
 .for i in dk-filter.8
-	@${RM} -f ${STAGEDIR}${PREFIX}/man/cat8/${i} \
+	@${RM} ${STAGEDIR}${PREFIX}/man/cat8/${i} \
 		${STAGEDIR}${PREFIX}/man/cat8/${i}.gz
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${PREFIX}/man/man8/
 .endfor
diff --git a/mail/ecartis/Makefile b/mail/ecartis/Makefile
index d41e2575b35a..fe6891407cb4 100644
--- a/mail/ecartis/Makefile
+++ b/mail/ecartis/Makefile
@@ -30,6 +30,6 @@ pre-install:
 	${MKDIR} ${IDEST}
 	cd ${WRKDIR}/${PORTNAME}-1.0.0 && ${FIND} * -print | \
 		${CPIO} -pdu --quiet ${IDEST}
-	${RM} -rf ${IDEST}/src/ ${IDEST}/debian ${IDEST}/ecartis.ds[pw]
+	${RM} -r ${IDEST}/src/ ${IDEST}/debian ${IDEST}/ecartis.ds[pw]
 
 .include <bsd.port.mk>
diff --git a/mail/exipick/Makefile b/mail/exipick/Makefile
index e045ed0e0b8e..3d9746edca0b 100644
--- a/mail/exipick/Makefile
+++ b/mail/exipick/Makefile
@@ -19,7 +19,7 @@ USE_PERL5=	run
 NO_BUILD=	yes
 
 do-extract:
-	@${RM} -rf ${WRKDIR}
+	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKSRC}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC}
 
diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile
index 55957974dc9f..85d25d5de9ab 100644
--- a/mail/filtermail/Makefile
+++ b/mail/filtermail/Makefile
@@ -40,6 +40,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|filtermail.sourceforge|mailfilter.sourceforge|g' ${WRKSRC}/README
 
 post-extract:
-	@${RM} -f ${WRKSRC}/src/getopt.h
+	@${RM} ${WRKSRC}/src/getopt.h
 
 .include <bsd.port.mk>
diff --git a/mail/james/Makefile b/mail/james/Makefile
index 90e9024b69bb..c90becf5c5f5 100644
--- a/mail/james/Makefile
+++ b/mail/james/Makefile
@@ -39,7 +39,7 @@ pre-patch:
 
 post-patch:
 	@${ECHO_MSG} -n ">> Removing unneeded files..."
-	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
+	@${RM} `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'`
 	@${ECHO_MSG} " [ DONE ]"
 
 do-install:
diff --git a/mail/libspf/Makefile b/mail/libspf/Makefile
index 928e6675abf2..6b495fc177be 100644
--- a/mail/libspf/Makefile
+++ b/mail/libspf/Makefile
@@ -47,7 +47,7 @@ post-extract:
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${FIND} ${WRKSRC}/docs -type d -name CVS | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC}/docs -type d -name CVS | ${XARGS} ${RM} -r
 .for i in docs docs/API docs/API/doxygen docs/API/doxygen/html docs/RFC docs/qmail \
 	docs/qmail/1.03 docs/qmail/1.04 docs/qmail/1.05 docs/spfqtool docs/Postfix \
 	docs/Postfix/2.1.x docs/Sendmail docs/Sendmail/8.12.x docs/Sendmail/8.13.x \
@@ -59,7 +59,7 @@ post-install:
 .endfor
 .endif
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${FIND} ${WRKSRC}/examples -type d -name CVS | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC}/examples -type d -name CVS | ${XARGS} ${RM} -r
 .for i in examples/qmail examples/qmail/control examples/Sendmail
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${i}
 	@for f in `${FIND} ${WRKSRC}/${i} ! -type d -maxdepth 1`; do \
@@ -67,7 +67,7 @@ post-install:
 	done
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@${FIND} ${WRKSRC}/patches -type d -name CVS | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC}/patches -type d -name CVS | ${XARGS} ${RM} -r
 .for i in patches patches/qmail patches/qmail/1.03 patches/qmail/1.05 patches/Postfix \
 	patches/Postfix/2.1.x patches/Sendmail patches/Sendmail/8.12.x patches/Sendmail/8.13.x \
 	patches/Courier-MTA
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index d250b3c3d2b1..0e941bee77d6 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -179,10 +179,10 @@ post-install:
 	    && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 	    -d ${MAILMANDIR}/${dir} ${dir})
 .endfor
-	@${RM} -f ${STAGEDIR}${MAILMANDIR}/pythonlib/*.egg-info
+	@${RM} ${STAGEDIR}${MAILMANDIR}/pythonlib/*.egg-info
 	@# mm_cfg.py is handled by pkg-plist, no need to archive a copy:
-	@${RM} -f ${STAGEDIR}${MAILMANDIR}/Mailman/mm_cfg.py
-	@${RM} -f ${STAGEDIR}${MAILMANDIR}/Mailman/mm_cfg.pyc
+	@${RM} ${STAGEDIR}${MAILMANDIR}/Mailman/mm_cfg.py
+	@${RM} ${STAGEDIR}${MAILMANDIR}/Mailman/mm_cfg.pyc
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${IMGDIR}
 	${CP} -p ${STAGEDIR}${MAILMANDIR}/icons/* ${STAGEDIR}${PREFIX}/${IMGDIR}
 	${INSTALL_DATA} ${FILESDIR}/powerlogo.png \
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index d3d551e11b76..47808c92c7bc 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -277,7 +277,7 @@ do-install:
 		-e 's,%%LOCALBASE%%,${LOCALBASE},'	\
 		-e 's,%%PREFIX%%,${PREFIX},'		\
 		${STAGEDIR}${DOCSDIR}/Sophos.install.freebsd
-	@${RM} -f ${STAGEDIR}${DOCSDIR}/Sophos.install.freebsd.bak
+	@${RM} ${STAGEDIR}${DOCSDIR}/Sophos.install.freebsd.bak
 .else
 	@${ECHO_MSG} -n ">> Installing manpage..."
 .endif
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index b8004ba32f7a..c28d99b0c167 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -41,7 +41,7 @@ PORTDOCS=	00api 00changes.0 00changes.1 00changes.2 00changes.3 \
 		00diff 00readme dot.emacs dot.mew dot.theme
 
 post-install:
-	@${RM} -f ${STAGEDIR}${PREFIX}/${INFO_PATH}/*.info.~1~
+	@${RM} ${STAGEDIR}${PREFIX}/${INFO_PATH}/*.info.~1~
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index ebf08a4483eb..c2e8d453f6c0 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -297,7 +297,7 @@ post-patch::
 		${WRKSRC}/contrib/Makefile.am
 
 pre-configure::
-	@${RM} -f ${WRKSRC}/missing
+	@${RM} ${WRKSRC}/missing
 .if defined(WITH_KRB5_SYS)
 	@${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in
 	@${REINPLACE_CMD} -e 's|<gssapi/gssapi\.h>|<gssapi.h>|' \
diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index 4d40b0f17f89..438dc3179982 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -86,6 +86,6 @@ post-patch:
 	@${REINPLACE_CMD} '/LIBS=$$/d' ${WRKSRC}/configure.ac
 
 post-install:
-	${RM} -f ${STAGEDIR}${PREFIX}/etc/mime*
+	${RM} ${STAGEDIR}${PREFIX}/etc/mime*
 
 .include <bsd.port.mk>
diff --git a/mail/openemm2013/Makefile b/mail/openemm2013/Makefile
index eb9f061eeff9..6f2e60399cd0 100644
--- a/mail/openemm2013/Makefile
+++ b/mail/openemm2013/Makefile
@@ -79,10 +79,10 @@ post-extract:
 
 	# remove the c libs which are also installed as dependencies ports
 	# ${WRKSRC}/contrib/sa-1.2.6.tar.gz  -> net/ossp-sa   and ${WRKSRC}/contrib/slang-1.4.9.tar.gz -> devel/libslang2
-	${RM} -rf ${WRKSRC}/contrib
+	${RM} -r ${WRKSRC}/contrib
 
 	# remove not needed c buildscripts
-	${RM} -rf ${WRKSRC}/other/make_backend.sh
+	${RM} -r ${WRKSRC}/other/make_backend.sh
 
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
@@ -196,7 +196,7 @@ do-build:
 	${RM} ${WRKSRC}/target/bin/openemm.py
 
 	${MV} ${WRKSRC}/target/USR_SHARE ${WRKSRC}/USR_SHARE
-	${RM} -rf ${WRKSRC}/target/src
+	${RM} -r ${WRKSRC}/target/src
 
 	# remove problem tld with missing classes
 	${RM} ${WRKSRC}/target/webapps/openemm/WEB-INF/struts-tiles.tld
diff --git a/mail/openemm2015/Makefile b/mail/openemm2015/Makefile
index d70b53775b6a..c3e933047c4b 100644
--- a/mail/openemm2015/Makefile
+++ b/mail/openemm2015/Makefile
@@ -77,7 +77,7 @@ post-extract:
 	${RM} ${WRKSRC}/backend/GNUMakefile
 	# remove the c libs which are also installed as dependencies ports
 	# ${WRKSRC}/backend/contrib/sa-1.2.6.tar.gz  -> net/ossp-sa   and ${WRKSRC}/backend/contrib/slang-1.4.9.tar.gz -> devel/libslang2
-	${RM} -rf ${WRKSRC}/backend/contrib
+	${RM} -r ${WRKSRC}/backend/contrib
 
 pre-patch:
 	@${ECHO_MSG} "Installation settings:"
@@ -180,7 +180,7 @@ do-build:
 	${RM} ${WRKSRC}/target/bin/openemm.py
 
 	${MV} ${WRKSRC}/target/bin/USR_SHARE ${WRKSRC}/USR_SHARE
-	${RM} -rf ${WRKSRC}/target/src
+	${RM} -r ${WRKSRC}/target/src
 
 	# remove problem tld with missing classes
 	# SEEMS TO BE REMOVED ... @${RM} ${WRKSRC}/target/webapps/openemm/WEB-INF/struts-tiles.tld
diff --git a/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
index 33bf075fe3e0..02d01553ff0d 100644
--- a/mail/p5-Mail-ClamAV/Makefile
+++ b/mail/p5-Mail-ClamAV/Makefile
@@ -25,6 +25,6 @@ USE_PERL5=	configure
 
 # Do not use bundled Inline::MakeMaker
 post-patch:
-	@${RM} -fr ${WRKSRC}/Inline/
+	@${RM} -r ${WRKSRC}/Inline/
 
 .include <bsd.port.mk>
diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile
index 970f94fe558b..8f42a32febb0 100644
--- a/mail/qmail-conf/Makefile
+++ b/mail/qmail-conf/Makefile
@@ -49,7 +49,7 @@ post-build:
 	@${ECHO_MSG} "===> Rebuilding DJB installer to respect STAGEDIR"
 	@${MV} -f ${WRKSRC}/conf-qmail ${WRKSRC}/conf-qmail.sav
 	@${ECHO_CMD} "${STAGEDIR}${QMAIL_PREFIX}" > ${WRKSRC}/conf-qmail
-	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c
+	@cd ${WRKSRC} ; ${RM} install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c
 	@cd ${WRKSRC} ; ${DO_MAKE_BUILD} install instcheck
 	@${TOUCH} ${WRKSRC}/*-conf
 	@${MV} -f ${WRKSRC}/conf-qmail.sav ${WRKSRC}/conf-qmail
diff --git a/mail/qmail-contrib/Makefile b/mail/qmail-contrib/Makefile
index 8f850ce7aa47..d0978ae00b5c 100644
--- a/mail/qmail-contrib/Makefile
+++ b/mail/qmail-contrib/Makefile
@@ -64,14 +64,14 @@ post-build:
 	@${ECHO_MSG} "===> Rebuilding DJB installer to respect STAGEDIR"
 	${MV} -f ${WRKFF}/conf-qmail ${WRKFF}/conf-qmail.sav
 	${ECHO_CMD} "${STAGEDIR}${QMAIL_PREFIX}" > ${WRKFF}/conf-qmail
-	cd ${WRKFF} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c
+	cd ${WRKFF} ; ${RM} install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c
 	cd ${WRKFF} ; ${DO_MAKE_BUILD} install instcheck
 	${TOUCH} ${WRKFF}/newaliases ${WRKFF}/fastforward ${WRKFF}/newinclude
 	${MV} -f ${WRKFF}/conf-qmail.sav ${WRKFF}/conf-qmail
 
 	${MV} -f ${WRKDF}/conf-qmail ${WRKDF}/conf-qmail.sav
 	${ECHO_CMD} "${STAGEDIR}${QMAIL_PREFIX}" > ${WRKDF}/conf-qmail
-	cd ${WRKDF} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c
+	cd ${WRKDF} ; ${RM} install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c
 	cd ${WRKDF} ; ${DO_MAKE_BUILD} install instcheck
 	${TOUCH} ${WRKDF}/dot-forward
 	${MV} -f ${WRKDF}/conf-qmail.sav ${WRKDF}/conf-qmail
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 51a55710e82a..334c2590a5be 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -818,7 +818,7 @@ post-build:
 	@${MV} -f ${WRKSRC}/conf-qmail ${WRKSRC}/conf-qmail.sav
 	@${ECHO_CMD} "${STAGEDIR}${PREFIX}" > ${WRKSRC}/conf-qmail
 	@${MV} -f ${WRKSRC}/install ${WRKSRC}/install.nostage
-	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c
+	@cd ${WRKSRC} ; ${RM} install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c
 	@cd ${WRKSRC} ; ${DO_MAKE_BUILD} install instcheck
 	@${MV} -f ${WRKSRC}/conf-qmail.sav ${WRKSRC}/conf-qmail
 
@@ -912,7 +912,7 @@ post-install:
 	  ${ECHO_CMD} "@unexec rmdir ${QMAIL_PREFIX} 2>/dev/null || :"; \
 	} >> ${TMPPLIST}
 # Stop check-orphans finding the queue dir
-	${RM} -rf ${STAGEDIR}${PREFIX}/queue/
+	${RM} -r ${STAGEDIR}${PREFIX}/queue/
 
 certificate:
 .if defined(SLAVE_TLS) || defined(SLAVE_LDAP)
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index 4529ecb06d3e..31e40f97063b 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -51,7 +51,7 @@ post-build:
 	@${ECHO_MSG} "===> Rebuilding DJB installer to respect STAGEDIR"
 	@${MV} -f ${WRKSRC}/conf-home ${WRKSRC}/conf-home.sav
 	@${ECHO_CMD} "${STAGEDIR}${QMPREFIX}" > ${WRKSRC}/conf-home
-	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o auto_home.c
+	@cd ${WRKSRC} ; ${RM} install instcheck install.o instcheck.o hier.o auto_home.o auto_home.c
 	@cd ${WRKSRC} ; ${DO_MAKE_BUILD} install instcheck
 	@${MV} -f ${WRKSRC}/conf-home.sav ${WRKSRC}/conf-home
 
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 6843e3f6351d..45ae723f29f6 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -133,7 +133,7 @@ post-patch:
 .if ${COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e 's|-freg-struct-return||' ${WRKSRC}/configure.in
 .endif
-	@${RM} -f ${WRKSRC}/popper/md5.h
+	@${RM} ${WRKSRC}/popper/md5.h
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/man/*
 	@${REINPLACE_CMD} -e \
 		's|\$${sbindir}/sendmail|${LOCALBASE}/sbin/sendmail|g' \
diff --git a/mail/qtools/Makefile b/mail/qtools/Makefile
index f94c6ec4163d..a8ecb3d869b1 100644
--- a/mail/qtools/Makefile
+++ b/mail/qtools/Makefile
@@ -37,7 +37,7 @@ post-build:
 	@${ECHO_MSG} "===> Rebuilding DJB installer to respect STAGEDIR"
 	@${MV} -f ${WRKSRC}/conf-home ${WRKSRC}/conf-home.sav
 	@${ECHO_CMD} "${STAGEDIR}${PREFIX}" > ${WRKSRC}/conf-home
-	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o auto_home.c
+	@cd ${WRKSRC} ; ${RM} install instcheck install.o instcheck.o hier.o auto_home.o auto_home.c
 	@cd ${WRKSRC} ; ${DO_MAKE_BUILD} install instcheck
 	@${TOUCH} ${WRKSRC}/replier-config
 	@${MV} -f ${WRKSRC}/conf-home.sav ${WRKSRC}/conf-home
diff --git a/mail/renattach/Makefile b/mail/renattach/Makefile
index bc8d29706d4c..239826093946 100644
--- a/mail/renattach/Makefile
+++ b/mail/renattach/Makefile
@@ -23,7 +23,7 @@ PLIST_FILES=	bin/renattach \
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	@${RM} -f ${WRKSRC}/src/getopt*
+	@${RM} ${WRKSRC}/src/getopt*
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.ex \
diff --git a/mail/spambnc/Makefile b/mail/spambnc/Makefile
index 8ee42e301c26..47b898032697 100644
--- a/mail/spambnc/Makefile
+++ b/mail/spambnc/Makefile
@@ -38,12 +38,12 @@ pre-extract:
 
 post-extract:
 	${MV} ${EXTRACT_DIR} ${WRKDIR}
-	${RM} -rf ${WRKDIRPREFIX}${.CURDIR}/worktmp
+	${RM} -r ${WRKDIRPREFIX}${.CURDIR}/worktmp
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
-	${RM} -rf ${STAGEDIR}${DATADIR}/docs
+	${RM} -r ${STAGEDIR}${DATADIR}/docs
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/squirrelmail-avelsieve-plugin/Makefile b/mail/squirrelmail-avelsieve-plugin/Makefile
index 237fb4ea0c89..73f5bc47a648 100644
--- a/mail/squirrelmail-avelsieve-plugin/Makefile
+++ b/mail/squirrelmail-avelsieve-plugin/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SquirrelMail plugin for Server-Side Mail Filtering management
 
 pre-install:
-	${RM} -Rf ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/po
+	${RM} -R ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/po
 	${FIND} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} -type f \
 		\( -name '.cvsignore' -o -name '*.bak' -o -name '*.orig' \) -exec ${RM} {} \;
 
diff --git a/mail/squirrelmail-vlogin-plugin/Makefile b/mail/squirrelmail-vlogin-plugin/Makefile
index 2966e48bc661..ab2d3a902448 100644
--- a/mail/squirrelmail-vlogin-plugin/Makefile
+++ b/mail/squirrelmail-vlogin-plugin/Makefile
@@ -23,8 +23,8 @@ pre-install::
 	${RM} ${WRKSRC}/${PORTNAME}/docs/index.php
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/${PORTNAME}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-	${RM} -rf ${WRKSRC}/${PORTNAME}/README
-	${RM} -rf ${WRKSRC}/${PORTNAME}/docs
+	${RM} -r ${WRKSRC}/${PORTNAME}/README
+	${RM} -r ${WRKSRC}/${PORTNAME}/docs
 
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.mk>
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 70a2eef2fa8a..c81efc0a0b71 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -69,10 +69,10 @@ do-build:
 			${MV} $$f doc/`dirname $$f`; \
 		done)
 	@${MV} ${WRKSRC}/doc/plugins/squirrelspell/doc/README ${WRKSRC}/doc/plugins/squirrelspell
-	@${RM} -rf ${WRKSRC}/doc/plugins/squirrelspell/doc
+	@${RM} -r ${WRKSRC}/doc/plugins/squirrelspell/doc
 	@${MV} ${WRKSRC}/plugins/squirrelspell/doc/* ${WRKSRC}/doc/plugins/squirrelspell
-	@${RM} -f ${WRKSRC}/doc/plugins/squirrelspell/index.php
-	@${RM} -rf ${WRKSRC}/plugins/squirrelspell/doc
+	@${RM} ${WRKSRC}/doc/plugins/squirrelspell/index.php
+	@${RM} -r ${WRKSRC}/plugins/squirrelspell/doc
 
 	@${ECHO} "left_refresh=300" >> ${WRKSRC}/data/default_pref
 	@${MV} ${WRKSRC}/config/config_local.php ${WRKSRC}/config/config_local.php.sample
diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile
index 85b3e793268e..0abf1b9a092f 100644
--- a/mail/thunderbird-i18n/Makefile
+++ b/mail/thunderbird-i18n/Makefile
@@ -43,7 +43,7 @@ XPI_ID_${dist}=		langpack-${dist}@thunderbird.mozilla.org
 .endfor
 
 do-extract:
-	@${RM} -rf ${WRKDIR}
+	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKDIR} ${WRKSRC}
 	@for lang in ${THUNDERBIRD_I18N_}; do \
 		if ! (${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org);\
@@ -66,7 +66,7 @@ do-install:
 	done
 	@${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \
 		${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A}
-	@${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS}; { ${RM} -f $$_dir/${WDIR} ; }' ${_A}
+	@${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS}; { ${RM} $$_dir/${WDIR} ; }' ${_A}
 
 post-patch:
 	${FIND} ${WRKSRC} -name install.rdf -print0 | \
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 690714f6e2cc..8fb053427472 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -144,7 +144,7 @@ post-install:
 	@${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}
 	@${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/thunderbird 2>/dev/null || true
 	@${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true' >> ${TMPPLIST}
-	@${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/thunderbird/extensions/${XPI_ID}' >> ${TMPPLIST}
+	@${ECHO_CMD} '@unexec ${RM} ${LOCALBASE}/lib/thunderbird/extensions/${XPI_ID}' >> ${TMPPLIST}
 .endif
 .if ${PORT_OPTIONS:MENIGMAIL}
 	@${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${EM_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/${PORTNAME}
@@ -153,7 +153,7 @@ post-install:
 	@${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${EM_ID}
 	@${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/${PORTNAME} 2>/dev/null || true
 	@${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true' >> ${TMPPLIST}
-	@${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST}
+	@${ECHO_CMD} '@unexec ${RM} ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index 6c7a5d4060de..9dfd76a197d0 100644
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@@ -28,7 +28,7 @@ YOUBINBINDIR=	${LOCALBASE}
 .include <bsd.port.pre.mk>
 
 do-extract:
-	@${RM} -rf ${WRKDIR}
+	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	@(cd ${WRKDIR}; \
 	  if [ ! -f ${DISTDIR}/${DISTNAME}.tar.gz ]; then \
@@ -38,7 +38,7 @@ do-extract:
 	  fi)
 
 pre-patch:
-	@(${RM} -rf ${WRKSRC}/LocPixmap.c; \
+	@(${RM} -r ${WRKSRC}/LocPixmap.c; \
 	  ${CP} ${FILESDIR}/LocPixmap.c ${WRKSRC} );
 
 post-patch: