${RM} already has -f.

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

59 files changed, 77 insertions, 77 deletions

diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 98f17ef44b60..e02fc4f18081 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -150,7 +150,7 @@ USE_GNOME=	libxml2
 
 post-extract:
 # remove possible leftover .svn directories in the sources
-	@${FIND} ${WRKSRC} -type d -name .svn -print | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC} -type d -name .svn -print | ${XARGS} ${RM} -r
 # limit grep results ...
 	@${FIND} ${WRKSRC} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' -o -name '*.vbs' -o -name '*.wsf' \) -delete
 # make sure the configure script contains our patches, preserve the original script for comparsion
@@ -168,7 +168,7 @@ post-patch:
 		${WRKSRC}/include/httpd.h
 	${REINPLACE_CMD} -e 's|perlbin=.*|perlbin=${PERL}|' \
 		${WRKSRC}/configure.in
-	${RM} -f ${WRKSRC}/docs/docroot/*.bak
+	${RM} ${WRKSRC}/docs/docroot/*.bak
 	${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual
 
 pre-configure::
diff --git a/www/calendarserver/Makefile b/www/calendarserver/Makefile
index 98e799066a59..280cfaf36095 100644
--- a/www/calendarserver/Makefile
+++ b/www/calendarserver/Makefile
@@ -63,12 +63,12 @@ GROUPS=		${CALDAVD_USER}
 
 maint-gen-distfile:
 	@if [ ! -f "${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}" ] ; then \
-		${MKDIR} ${WRKDIR} ; cd ${WRKDIR} ; ${RM} -Rf ${WRKDIR}/${DISTNAME} ; \
+		${MKDIR} ${WRKDIR} ; cd ${WRKDIR} ; ${RM} -R ${WRKDIR}/${DISTNAME} ; \
 		${ECHO_MSG} "=> Checking out CalendarServer from svn.calendarserver.org/..."; \
 		${SVN_CMD1} ${SVN_REPOSITORY_URL}/${SVN_TAG1} > /dev/null ; \
 		${ECHO_MSG} "=> Creating tar archive ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}"; \
 		cd ${WRKDIR} ; tar -czf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${DISTNAME} ; \
-		${RM} -Rf ${WRKDIR}/${DISTNAME} ; \
+		${RM} -R ${WRKDIR}/${DISTNAME} ; \
 	else \
 		${ECHO_MSG} "===>	${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} found." ; \
 	fi
diff --git a/www/cmsmadesimple/Makefile b/www/cmsmadesimple/Makefile
index 3c2c5d1fb452..f0af9d321b83 100644
--- a/www/cmsmadesimple/Makefile
+++ b/www/cmsmadesimple/Makefile
@@ -26,7 +26,7 @@ WRITABLE_DIRS=	tmp tmp/templates_c tmp/cache \
 		uploads uploads/images modules
 
 post-extract:
-	cd ${WRKSRC} && ${RM} -f config.php
+	cd ${WRKSRC} && ${RM} config.php
 
 do-install:
 .for i in ${CMS_DIRS}
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index 42b068ab11f0..178747ddca1a 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -35,7 +35,7 @@ post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-	@${RM} -f ${STAGEDIR}${DOCSDIR}/*.[13]
+	@${RM} ${STAGEDIR}${DOCSDIR}/*.[13]
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile
index e8b3cd15a30b..17f612732cfb 100644
--- a/www/firefox-esr-i18n/Makefile
+++ b/www/firefox-esr-i18n/Makefile
@@ -74,7 +74,7 @@ do-install:
 	@${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A}
 	@${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/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile
index 2e5fd21961f7..3460a87ec270 100644
--- a/www/firefox-i18n/Makefile
+++ b/www/firefox-i18n/Makefile
@@ -73,7 +73,7 @@ do-install:
 	@${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A}
 	@${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/www/foswiki/Makefile b/www/foswiki/Makefile
index 7abc498206fb..fbfc144d1ea6 100644
--- a/www/foswiki/Makefile
+++ b/www/foswiki/Makefile
@@ -53,7 +53,7 @@ SUB_FILES+=	LocalSite.cfg
 PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 post-patch:
-	@${RM} -rf ${WRKSRC}/lib/CPAN
+	@${RM} -r ${WRKSRC}/lib/CPAN
 	@${MV} ${WRKSRC}/bin-htaccess.txt ${WRKSRC}/bin/.htaccess.txt
 	@${CP} ${WRKSRC}/subdir-htaccess.txt ${WRKSRC}/working/.htaccess
 	@cd ${WRKSRC} && \
diff --git a/www/geronimo/Makefile b/www/geronimo/Makefile
index 600bb3dece39..4562127e5b7c 100644
--- a/www/geronimo/Makefile
+++ b/www/geronimo/Makefile
@@ -76,7 +76,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 ]"
 	@${REINPLACE_CMD} -e '/^activemq.data/s|= |= ${APP_HOME}/|' ${WRKSRC}/var/config/config-substitutions.properties
 
diff --git a/www/grafana2/Makefile b/www/grafana2/Makefile
index 26f18c7f8bee..222e06981bc6 100644
--- a/www/grafana2/Makefile
+++ b/www/grafana2/Makefile
@@ -127,7 +127,7 @@ post-extract:
 	@${MV} ${WRKSRC_ldap} ${WRKSRC}/src/github.com/go-ldap/ldap
 	@${MV} ${WRKSRC_pq} ${WRKSRC}/src/github.com/lib/pq
 
-	${RM} -rf ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana/public
+	${RM} -r ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana/public
 	${MV} ${WRKDIR}/public  ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana/
 	${RM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana/public/.DS_Store
 	${RM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana/public/app/.DS_Store
diff --git a/www/grafana3/Makefile b/www/grafana3/Makefile
index 39b5523ddea3..04301b574abf 100644
--- a/www/grafana3/Makefile
+++ b/www/grafana3/Makefile
@@ -219,7 +219,7 @@ post-extract:
 	@${MV} ${WRKSRC_redis} \
 		${WRKSRC}/src/gopkg.in/redis.v2
 
-	${RM} -rf ${WRKSRC}/src/github.com/grafana/grafana/public
+	${RM} -r ${WRKSRC}/src/github.com/grafana/grafana/public
 	${MV} ${WRKSRC_grafana_public} ${WRKSRC}/src/github.com/grafana/grafana/public
 	${MV} ${WRKSRC}/src/github.com/grafana/grafana/public/public_gen \
 		${WRKSRC}/src/github.com/grafana/grafana/public_gen
diff --git a/www/iwebcal/Makefile b/www/iwebcal/Makefile
index 17cdce389f71..fac337ee4724 100644
--- a/www/iwebcal/Makefile
+++ b/www/iwebcal/Makefile
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}/iWebCal
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
 post-extract:
-	-@${FIND} ${WRKSRC}/ -type d -name '.svn' | ${XARGS} ${RM} -rf
+	-@${FIND} ${WRKSRC}/ -type d -name '.svn' | ${XARGS} ${RM} -r
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/www/jericho-html/Makefile b/www/jericho-html/Makefile
index 799fe84bd813..e79f3b58d5c4 100644
--- a/www/jericho-html/Makefile
+++ b/www/jericho-html/Makefile
@@ -20,7 +20,7 @@ PORTDOCS=	*
 PLIST_FILES+=	%%JAVAJARDIR%%/${PORTNAME}.jar
 
 do-build:
-	(cd ${WRKSRC} && ${RM} -rf classes/* && ${SETENV}         \
+	(cd ${WRKSRC} && ${RM} -r classes/* && ${SETENV}         \
 		LANG=en_US.ISO8859-1 ${JAVAC}                     \
 		-classpath ${INTERFACES:S, ,,g}                   \
 		-d classes src/java/net/htmlparser/jericho/*.java \
diff --git a/www/linux-seamonkey/Makefile.common b/www/linux-seamonkey/Makefile.common
index 6bb0576de639..33f1f0d843c1 100644
--- a/www/linux-seamonkey/Makefile.common
+++ b/www/linux-seamonkey/Makefile.common
@@ -35,7 +35,7 @@ _Q=	2>/dev/null || true
 
 .if !target(post-extract)
 post-extract:
-	@${RM} -rf ${WRKSRC}/updates
+	@${RM} -r ${WRKSRC}/updates
 	@${LN} -sf ${LOCALBASE}/lib/browser_plugins/symlinks/${APP_NAME} \
 		${WRKSRC}/${APP_SUBDIR}plugins
 .endif
diff --git a/www/magento/Makefile b/www/magento/Makefile
index 9fe1e5479b6a..439ed33676f8 100644
--- a/www/magento/Makefile
+++ b/www/magento/Makefile
@@ -35,7 +35,7 @@ SUB_LIST+=	MAGENTODIR=${MAGENTODIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 PLIST_SUB+=	${SUB_LIST}
 
 post-patch:
-	@${RM} -f ${WRKSRC}/cron.sh ${WRKSRC}/.htaccess
+	@${RM} ${WRKSRC}/cron.sh ${WRKSRC}/.htaccess
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MAGENTODIR}
@@ -47,7 +47,7 @@ do-install:
 do-install-SESSIONS-on:
 	@${REINPLACE_CMD} -e 's,<active>false,<active>true,' \
 		${STAGEDIR}${PREFIX}/${MAGENTODIR}/app/etc/modules/Cm_RedisSession.xml
-	@${RM} -f ${STAGEDIR}${PREFIX}/${MAGENTODIR}/app/etc/modules/Cm_RedisSession.xml.bak
+	@${RM} ${STAGEDIR}${PREFIX}/${MAGENTODIR}/app/etc/modules/Cm_RedisSession.xml.bak
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKDIR}/crontab ${STAGEDIR}${PREFIX}/${EXAMPLESDIR}
diff --git a/www/otrs/Makefile b/www/otrs/Makefile
index f05279a5a948..9583900cf681 100644
--- a/www/otrs/Makefile
+++ b/www/otrs/Makefile
@@ -134,7 +134,7 @@ post-patch:
 		${XARGS} ${REINPLACE_CMD} -i '' \
 			-e 's|Digest::SHA::PurePerl|Digest::SHA|g'
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
-	@${RM} -rf ${WRKSRC}/Kernel/cpan-lib/ \
+	@${RM} -r ${WRKSRC}/Kernel/cpan-lib/ \
 		${CLEAN_FILES:S!^!${WRKSRC}/!}
 
 do-build:
diff --git a/www/p5-HTTP-Recorder/Makefile b/www/p5-HTTP-Recorder/Makefile
index ec4dd3454c3f..ffcf2e2315b1 100644
--- a/www/p5-HTTP-Recorder/Makefile
+++ b/www/p5-HTTP-Recorder/Makefile
@@ -22,6 +22,6 @@ USES=		perl5 dos2unix
 USE_PERL5=	configure
 
 post-patch:
-	@${RM} -f ${WRKSRC}/lib/HTTP/Recorder.pm.orig
+	@${RM} ${WRKSRC}/lib/HTTP/Recorder.pm.orig
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTTP-Server-Simple-PSGI/Makefile b/www/p5-HTTP-Server-Simple-PSGI/Makefile
index 384261fe9c06..f1db507aab6a 100644
--- a/www/p5-HTTP-Server-Simple-PSGI/Makefile
+++ b/www/p5-HTTP-Server-Simple-PSGI/Makefile
@@ -23,6 +23,6 @@ USES=		perl5
 
 post-patch:
 # Remove bundle Plack::Handler::HTTP::Server::Simple
-	@${RM} -fr ${WRKSRC}/lib/Plack/
+	@${RM} -r ${WRKSRC}/lib/Plack/
 
 .include <bsd.port.mk>
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index 8a421b30de86..862f2ac74ffa 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -39,7 +39,7 @@ post-patch:
 post-stage:
 	# remove all the non-perl stuff
 	${RM} ${STAGEDIR}${PREFIX}/bin/apreq2-config
-	${RM} -rf ${STAGEDIR}${PREFIX}/include/apreq2
+	${RM} -r ${STAGEDIR}${PREFIX}/include/apreq2
 	${RM} ${STAGEDIR}${PREFIX}/${APACHEINCLUDEDIR}/apreq2/apreq_module_apache2.h
 	${RM} ${STAGEDIR}${PREFIX}/lib/libapreq2*
 	${RM} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_apreq2*
diff --git a/www/phpwebapp/Makefile b/www/phpwebapp/Makefile
index 3f1d8eb0b956..838dfa31e731 100644
--- a/www/phpwebapp/Makefile
+++ b/www/phpwebapp/Makefile
@@ -20,7 +20,7 @@ SHEBANG_FILES=	web_app/boxes/menu/edit/xsl/test/*.sh \
 		web_app/l10n-module/app/*.sh
 
 post-patch:
-	@${FIND} ${WRKSRC}/web_app/ -name .svn -type d | ${XARGS} -J % ${RM} -fr %
+	@${FIND} ${WRKSRC}/web_app/ -name .svn -type d | ${XARGS} -J % ${RM} -r %
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/
diff --git a/www/pivotx/Makefile b/www/pivotx/Makefile
index c7fafa0ba127..1bc33f80b4c5 100644
--- a/www/pivotx/Makefile
+++ b/www/pivotx/Makefile
@@ -71,7 +71,7 @@ post-extract:
 post-patch:
 .for FILES in ${PORTEXAMPLES}
 	@${SED} -e 's#%%BLOGURL%%#${BLOGURL}#g' '${WRKSRC}/${FILES}' >'${TEMP_WRKSRC}/${FILES}'
-	@${RM} -f '${WRKSRC}/${FILES}'
+	@${RM} '${WRKSRC}/${FILES}'
 .endfor
 	@cd '${WRKSRC}' && ${FIND} . -type f -name '*.orig' -delete
 
diff --git a/www/piwigo/Makefile b/www/piwigo/Makefile
index 7603c757ec21..eed1205f0747 100644
--- a/www/piwigo/Makefile
+++ b/www/piwigo/Makefile
@@ -64,7 +64,7 @@ pre-install-EXAMPLES-on:
 
 do-install:
 	@cd ${WRKSRC}/doc/ && ${RM} ${PORTDOCS}
-	@${RM} -fr ${WRKSRC}/tools ${WRKSRC}/_data/dummy.txt
+	@${RM} -r ${WRKSRC}/tools ${WRKSRC}/_data/dummy.txt
 	@${INSTALL} -d ${STAGEDIR}${WWWDIR}
 	@${TAR} -C ${WRKSRC} -cf - . | \
 	${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf -
diff --git a/www/planet/Makefile b/www/planet/Makefile
index 0c2716f5158d..a791b48aabff 100644
--- a/www/planet/Makefile
+++ b/www/planet/Makefile
@@ -20,7 +20,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 post-extract:
 	@${RM}	${WRKSRC}/.bzrignore
-	@${FIND} ${WRKSRC}/ -type d -name '.bzr' | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC}/ -type d -name '.bzr' | ${XARGS} ${RM} -r
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/www/py-flask-restplus/Makefile b/www/py-flask-restplus/Makefile
index c11bfeef9e1c..c526997e01d1 100644
--- a/www/py-flask-restplus/Makefile
+++ b/www/py-flask-restplus/Makefile
@@ -36,7 +36,7 @@ TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 .endif
 
 do-test:
-	@${RM} -fr ${TEST_WRKSRC}/build/lib/tests
+	@${RM} -r ${TEST_WRKSRC}/build/lib/tests
 	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
 
 .include <bsd.port.post.mk>
diff --git a/www/py-flask-restplus08/Makefile b/www/py-flask-restplus08/Makefile
index 3eac90983f3f..9267d9f65fc6 100644
--- a/www/py-flask-restplus08/Makefile
+++ b/www/py-flask-restplus08/Makefile
@@ -38,7 +38,7 @@ TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 .endif
 
 do-test:
-	@${RM} -fr ${TEST_WRKSRC}/build/lib/tests
+	@${RM} -r ${TEST_WRKSRC}/build/lib/tests
 	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
 
 .include <bsd.port.post.mk>
diff --git a/www/py-gandi.cli/Makefile b/www/py-gandi.cli/Makefile
index d345976dde99..3ca7da0b0020 100644
--- a/www/py-gandi.cli/Makefile
+++ b/www/py-gandi.cli/Makefile
@@ -30,8 +30,8 @@ TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 .endif
 
 post-extract:
-	${FIND} ${WRKSRC} -type d -name __pycache__ -exec ${RM} -rf {} + && \
-	${FIND} ${WRKSRC} -type f -name '*.py[co]' -exec ${RM} -f {} +
+	${FIND} ${WRKSRC} -type d -name __pycache__ -exec ${RM} -r {} + && \
+	${FIND} ${WRKSRC} -type f -name '*.py[co]' -exec ${RM} {} +
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/www/pydio/Makefile b/www/pydio/Makefile
index ff0db5379688..f180ac93f36d 100644
--- a/www/pydio/Makefile
+++ b/www/pydio/Makefile
@@ -27,7 +27,7 @@ SUB_FILES=	pkg-deinstall pkg-message
 SUB_LIST+=	GOWDIR=${WWWDIR:H}
 
 post-patch:
-	@${RM} -f ${WRKSRC}/plugins/gui.ajax/res/themes/vision/images/mimes/16/._users-folder.png
+	@${RM} ${WRKSRC}/plugins/gui.ajax/res/themes/vision/images/mimes/16/._users-folder.png
 	@${MV} ${WRKSRC}/conf/bootstrap_conf.php ${WRKDIR}/bootstrap_conf.php.sample
 	@${MV} ${WRKSRC}/conf/bootstrap_context.php ${WRKDIR}/bootstrap_context.php.sample
 	@${MV} ${WRKSRC}/conf/bootstrap_repositories.php ${WRKDIR}/bootstrap_repositories.php.sample
diff --git a/www/rt40/Makefile b/www/rt40/Makefile
index 6fdc483a9b2d..042004984688 100644
--- a/www/rt40/Makefile
+++ b/www/rt40/Makefile
@@ -195,7 +195,7 @@ pre-fetch:
 .endif
 
 post-patch:
-	@${RM} -f ${WRKSRC}/lib/RT.pm.in.orig
+	@${RM} ${WRKSRC}/lib/RT.pm.in.orig
 	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!g' ${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's!%%SITE_PERL%%!${PREFIX}/${SITE_PERL_REL}!g' ${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's!/path/to/your/etc!${RT_ETC_PATH}!g' ${WRKSRC}/etc/RT_SiteConfig.pm
@@ -203,10 +203,10 @@ post-patch:
 	    ${RM} ${WRKSRC}/lib/RT/Interface/CLI.pm.bak
 
 pre-install:
-	@${RM} -f ${WRKSRC}/lib/RT.pm.in
+	@${RM} ${WRKSRC}/lib/RT.pm.in
 
 post-install:
-	@${RM} -rf ${STAGEDIR}/${WWWDIR}${PKGNAMESUFFIX}
+	@${RM} -r ${STAGEDIR}/${WWWDIR}${PKGNAMESUFFIX}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/upgrade
 	(cd ${WRKSRC}/etc && \
 	    ${COPYTREE_SHARE} upgrade ${STAGEDIR}${DOCSDIR} "! -name *\.in")
diff --git a/www/rt42/Makefile b/www/rt42/Makefile
index 0c6fc8654d71..79f895dde832 100644
--- a/www/rt42/Makefile
+++ b/www/rt42/Makefile
@@ -185,7 +185,7 @@ pre-fetch:
 .endif
 
 post-patch:
-	@${RM} -f ${WRKSRC}/lib/RT.pm.in.orig
+	@${RM} ${WRKSRC}/lib/RT.pm.in.orig
 	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!g' ${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's!%%SITE_PERL%%!${PREFIX}/${SITE_PERL_REL}!g' ${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's!/path/to/your/etc!${RT_ETC_PATH}!g' ${WRKSRC}/etc/RT_SiteConfig.pm
@@ -193,10 +193,10 @@ post-patch:
 	    ${RM} ${WRKSRC}/lib/RT/Interface/CLI.pm.bak
 
 pre-install:
-	@${RM} -f ${WRKSRC}/lib/RT.pm.in
+	@${RM} ${WRKSRC}/lib/RT.pm.in
 
 post-install:
-	@${RM} -rf ${STAGEDIR}/${WWWDIR}${PKGNAMESUFFIX}
+	@${RM} -r ${STAGEDIR}/${WWWDIR}${PKGNAMESUFFIX}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/upgrade
 	(cd ${WRKSRC}/etc && \
 	    ${COPYTREE_SHARE} upgrade ${STAGEDIR}${DOCSDIR} "! -name *\.in")
diff --git a/www/rt44/Makefile b/www/rt44/Makefile
index 751bd11b9ead..08d81bc8179a 100644
--- a/www/rt44/Makefile
+++ b/www/rt44/Makefile
@@ -188,7 +188,7 @@ pre-fetch:
 .endif
 
 post-patch:
-	@${RM} -f ${WRKSRC}/lib/RT.pm.in.orig
+	@${RM} ${WRKSRC}/lib/RT.pm.in.orig
 	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!g' ${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's!%%SITE_PERL%%!${PREFIX}/${SITE_PERL_REL}!g' ${WRKSRC}/config.layout
 	@${REINPLACE_CMD} -e 's!/path/to/your/etc!${RT_ETC_PATH}!g' ${WRKSRC}/etc/RT_SiteConfig.pm
@@ -196,10 +196,10 @@ post-patch:
 	    ${RM} ${WRKSRC}/lib/RT/Interface/CLI.pm.bak
 
 pre-install:
-	@${RM} -f ${WRKSRC}/lib/RT.pm.in
+	@${RM} ${WRKSRC}/lib/RT.pm.in
 
 post-install:
-	@${RM} -rf ${STAGEDIR}/${WWWDIR}${PKGNAMESUFFIX}
+	@${RM} -r ${STAGEDIR}/${WWWDIR}${PKGNAMESUFFIX}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/upgrade
 	(cd ${WRKSRC}/etc && \
 	    ${COPYTREE_SHARE} upgrade ${STAGEDIR}${DOCSDIR} "! -name *\.in")
diff --git a/www/rubygem-scrapi/Makefile b/www/rubygem-scrapi/Makefile
index 7254ee03a9f5..20d2df9ef61d 100644
--- a/www/rubygem-scrapi/Makefile
+++ b/www/rubygem-scrapi/Makefile
@@ -22,8 +22,8 @@ PLIST_FILES=	${GEM_LIB_DIR}/lib/tidy/libtidy.so
 .include <bsd.port.pre.mk>
 
 post-install:
-	${RM} -f ${LOCALBASE}/${GEM_LIB_DIR}/lib/tidy/libtidy.dll
-	${RM} -f ${LOCALBASE}/${GEM_LIB_DIR}/lib/tidy/libtidy.so
+	${RM} ${LOCALBASE}/${GEM_LIB_DIR}/lib/tidy/libtidy.dll
+	${RM} ${LOCALBASE}/${GEM_LIB_DIR}/lib/tidy/libtidy.so
 	${LN} -sf ${LOCALBASE}/lib/libtidy.so ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/lib/tidy/
 
 .include <bsd.port.post.mk>
diff --git a/www/seamonkey-i18n/Makefile b/www/seamonkey-i18n/Makefile
index 2d81820fee69..add54d96aa9c 100644
--- a/www/seamonkey-i18n/Makefile
+++ b/www/seamonkey-i18n/Makefile
@@ -68,7 +68,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/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 667ce0b76702..5e0f6c757d64 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -168,7 +168,7 @@ post-install:
 	@${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}
 	@${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/seamonkey 2>/dev/null || true
 	@${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/seamonkey/extensions 2>/dev/null || true' >> ${TMPPLIST}
-	@${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/seamonkey/extensions/${XPI_ID}' >> ${TMPPLIST}
+	@${ECHO_CMD} '@unexec ${RM} ${LOCALBASE}/lib/seamonkey/extensions/${XPI_ID}' >> ${TMPPLIST}
 .endif
 .if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL}
 	@${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${EM_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/${PORTNAME}
@@ -177,7 +177,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/www/tclwebtest/Makefile b/www/tclwebtest/Makefile
index 7694605f36dc..39e59130c670 100644
--- a/www/tclwebtest/Makefile
+++ b/www/tclwebtest/Makefile
@@ -22,7 +22,7 @@ PLIST_SUB+=	LIBDIR="${LIBDIR}"
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -r
 	@${SED}	-i "" -e "s| tclsh | ${LOCALBASE}/bin/tclsh |g" ${WRKSRC}/tclwebtest
 
 do-install:
diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index ff476db91e00..bffa54bdcb21 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -76,7 +76,7 @@ pre-patch:
 	@${RM} ${WRKSRC}/config.ru
 	@${RM} ${WRKSRC}/tdiary.gemspec
 	@${RM} ${WRKSRC}/tmp/.gitkeep
-	@${RM} -rf ${WRKSRC}/.bundle
+	@${RM} -r ${WRKSRC}/.bundle
 	@${RM} -r ${WRKSRC}/misc/lib/bundler-1.11.2
 	@${RM} -r ${WRKSRC}/public
 	@${RM} -r ${WRKSRC}/spec
diff --git a/www/tdom/Makefile b/www/tdom/Makefile
index 9616dc694542..ce5836bfe710 100644
--- a/www/tdom/Makefile
+++ b/www/tdom/Makefile
@@ -17,7 +17,7 @@ USES=		gmake tar:tgz tcl:tea
 USE_GITHUB=	yes
 
 pre-configure:
-	${RM} -f ${WRKSRC}/generic/domalloc.?
+	${RM} ${WRKSRC}/generic/domalloc.?
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
diff --git a/www/testlink/Makefile b/www/testlink/Makefile
index eb9e43c90a6f..e8869a81b577 100644
--- a/www/testlink/Makefile
+++ b/www/testlink/Makefile
@@ -61,7 +61,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/var/testlink|${WWWDIR}|' ${WRKSRC}/config.inc.php
 	@${FIND} ${WRKSRC} -name "\.*" -delete
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
-	@${RM} -rf ${WRKSRC}/.idea
+	@${RM} -r ${WRKSRC}/.idea
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/www/thundersnarf/Makefile b/www/thundersnarf/Makefile
index 14a2629bec08..abd645b5e0b6 100644
--- a/www/thundersnarf/Makefile
+++ b/www/thundersnarf/Makefile
@@ -48,7 +48,7 @@ SUB_FILES=	pkg-message
 
 post-extract:
 	# Present on FreeBSD 8 and 9 after extraction
-	@${RM} -f ${WRKSRC}/protected/data/bin/._thundersnarf
+	@${RM} ${WRKSRC}/protected/data/bin/._thundersnarf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index b1bc53ad3679..a5c811a12939 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -65,8 +65,8 @@ getcvs:
 	CVSROOT=${CVSROOT} CVS_PASSFILE=${CVS_PASSFILE} cvs -z3 co -P tidy
 
 tarball:
-	${RM} -rf ${WRKDIR}/cvs/tidy/CVSROOT
-	${FIND} ${WRKDIR}/cvs -name CVS | ${XARGS} ${RM} -rf
+	${RM} -r ${WRKDIR}/cvs/tidy/CVSROOT
+	${FIND} ${WRKDIR}/cvs -name CVS | ${XARGS} ${RM} -r
 	cd ${WRKDIR}/cvs &&	\
 	${TAR} cfj ${_DISTDIR}${DISTFILES} tidy
 
diff --git a/www/tt-rss/Makefile b/www/tt-rss/Makefile
index 404b03413123..0a5af6c05fab 100644
--- a/www/tt-rss/Makefile
+++ b/www/tt-rss/Makefile
@@ -82,7 +82,7 @@ do-configure:
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "*" ${STAGEDIR}${WWWDIR} "! -name LICENSE")
-	${RM} -rf ${STAGEDIR}${WWWDIR}/debian
+	${RM} -r ${STAGEDIR}${WWWDIR}/debian
 	${MKDIR} ${STAGEDIR}${WWWDIR}/icons/	# Not used for fresh installation
 	${TOUCH} ${STAGEDIR}${WWWDIR}/icons/.empty
 	${INSTALL_DATA} ${WRKDIR}/httpd-tt-rss.conf ${STAGEDIR}${DATADIR}
diff --git a/www/twiki/Makefile b/www/twiki/Makefile
index 3c7301baee2d..bbb19bef13ee 100644
--- a/www/twiki/Makefile
+++ b/www/twiki/Makefile
@@ -32,12 +32,12 @@ WRKSRC=	${WRKDIR}/twiki
 USES+=		cpe
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/lib/CPAN
+	@${RM} -r ${WRKSRC}/lib/CPAN
 	@${CAT} ${.CURDIR}/../twiki-*/pkg-plist |\
 		${SED} -e 's|%%TWDIR%%|${WRKSRC}|;/^@/d' |\
-		${XARGS} ${RM} -f
+		${XARGS} ${RM}
 	@${FIND} ${WRKSRC} -name \*,v | while read f; do\
-		[ -e $${f%%,v} ] || ${RM} -f $$f; done
+		[ -e $${f%%,v} ] || ${RM} $$f; done
 	@${FIND} ${WRKSRC} -type d -empty -delete
 
 post-patch:
diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile
index c7f16c005010..c8b9b43dea26 100644
--- a/www/uzbl/Makefile
+++ b/www/uzbl/Makefile
@@ -49,7 +49,7 @@ post-patch:
 		${WRKSRC}/bin/uzbl-tabbed
 
 post-build:
-	@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} -f {} \;
+	@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" \) -exec ${RM} {} \;
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/www/varnish4/Makefile b/www/varnish4/Makefile
index 18162494466c..b15cead63d01 100644
--- a/www/varnish4/Makefile
+++ b/www/varnish4/Makefile
@@ -42,7 +42,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.am
 .if defined(BAD_TESTS)
-	${RM} -f ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|}
+	${RM} ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|}
 .endif
 
 regression-test check test: build
diff --git a/www/webstone-ssl/Makefile b/www/webstone-ssl/Makefile
index 95a962fd9d40..8e018fe5fbb8 100644
--- a/www/webstone-ssl/Makefile
+++ b/www/webstone-ssl/Makefile
@@ -31,7 +31,7 @@ CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 
 pre-configure:
-	@${RM} -f ${WRKSRC}/src/config.cache
+	@${RM} ${WRKSRC}/src/config.cache
 
 do-install:
 	@${RMDIR} ${WRKSRC}/bin/runs
diff --git a/www/wikicalc/Makefile b/www/wikicalc/Makefile
index 69963d1cb7b7..cf4a3178656d 100644
--- a/www/wikicalc/Makefile
+++ b/www/wikicalc/Makefile
@@ -18,7 +18,7 @@ SHEBANG_FILES=	*.pl
 perl_CMD=	${LOCALBASE}/bin/perl -I${DATADIR}
 
 post-extract:
-	@${RM} -f ${WRKSRC}/gpl.txt
+	@${RM} ${WRKSRC}/gpl.txt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/www/wt/Makefile b/www/wt/Makefile
index 83bc406133eb..a2eba0fb40be 100644
--- a/www/wt/Makefile
+++ b/www/wt/Makefile
@@ -220,7 +220,7 @@ CMAKE_ARGS+=	-DMYSQL_PREFIX:STRING=${LOCALBASE}
 .endif
 
 post-stage:
-	@${RM} -f ${STAGEDIR}${ETCDIR}/wt_config.xml
+	@${RM} ${STAGEDIR}${ETCDIR}/wt_config.xml
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${CP} -p ${BUILD_WRKSRC}/wt_config.xml \
 		${STAGEDIR}${ETCDIR}/wt_config.xml.sample
diff --git a/www/xpi-adblock/Makefile b/www/xpi-adblock/Makefile
index 9c795d48b86d..4b0ddc01b565 100644
--- a/www/xpi-adblock/Makefile
+++ b/www/xpi-adblock/Makefile
@@ -17,7 +17,7 @@ XPI_DIRS=	chrome/adblock chrome components defaults/preferences defaults
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|2.0a3|2.0.*|g' ${WRKSRC}/install.rdf
-	@${RM} -f ${WRKSRC}/install.rdf?*
+	@${RM} ${WRKSRC}/install.rdf?*
 
 .include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
 .include <bsd.port.mk>
diff --git a/www/xpi-adblock/Makefile.xpi b/www/xpi-adblock/Makefile.xpi
index 81790907ebc6..866f3b2aa31f 100644
--- a/www/xpi-adblock/Makefile.xpi
+++ b/www/xpi-adblock/Makefile.xpi
@@ -168,7 +168,7 @@ do-install:
 		${ECHO_CMD} "@dir $${sldir}" ${_A}; \
 	done
 	@${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q}; }' ${_A}
-	@${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${XPI_ID} ; }' ${_A}
+	@${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} $$_dir/${XPI_ID} ; }' ${_A}
 .endif
 
 .if !target(relink)
@@ -187,7 +187,7 @@ xpi-post-extract:
 .endif
 
 post-extract: xpi-post-extract
-	@${RM} -rf ${WRKSRC}/META-INF
+	@${RM} -r ${WRKSRC}/META-INF
 
 # Maintainer section
 xpi-gen:	extract
@@ -210,7 +210,7 @@ xpi-plist:	extract
 
 xpi-pre-chrome:
 	@${CHMOD} g+w ${_TD_FULL}
-	@${RM} -f ${_TD_FULL}/chrome.manifest
+	@${RM} ${_TD_FULL}/chrome.manifest
 
 xpi-post-chrome:
 	@${CP} -f ${_TD_FULL}/chrome.manifest ${FILESDIR}/
diff --git a/www/xpi-clear_cache_button/Makefile b/www/xpi-clear_cache_button/Makefile
index 62a1e2d66809..ba7c515b82c6 100644
--- a/www/xpi-clear_cache_button/Makefile
+++ b/www/xpi-clear_cache_button/Makefile
@@ -41,6 +41,6 @@ post-patch:
 		${WRKSRC}/install.rdf
 
 pre-install:
-	@${RM} -f ${WRKSRC}/install.rdf.bak
+	@${RM} ${WRKSRC}/install.rdf.bak
 
 .include <bsd.port.mk>
diff --git a/www/xpi-conkeror/Makefile b/www/xpi-conkeror/Makefile
index 541f4d5bd552..2aaeaf333d18 100644
--- a/www/xpi-conkeror/Makefile
+++ b/www/xpi-conkeror/Makefile
@@ -31,8 +31,8 @@ post-patch:
 		cd ${WRKSRC} && \
 			${MV} contrib/conkeror.desktop . && \
 			${MV} contrib/man/conkeror.1 . && \
-			${RM} -rf contrib/debian contrib/dist contrib/man debian tests && \
-			${RM} -f contrib/build.sh contrib/install.sh contrib/mketags.sh \
+			${RM} -r contrib/debian contrib/dist contrib/man debian tests && \
+			${RM} contrib/build.sh contrib/install.sh contrib/mketags.sh \
 			contrib/testrun.sh contrib/run-conkeror && \
 			${MKDIR} share  && \
 			${MV} branding chrome components content \
diff --git a/www/xpi-flashblock/Makefile b/www/xpi-flashblock/Makefile
index 9e346e20ecbc..d10c50efde0b 100644
--- a/www/xpi-flashblock/Makefile
+++ b/www/xpi-flashblock/Makefile
@@ -19,7 +19,7 @@ post-patch:
 	    ${WRKSRC}/install.rdf
 
 pre-install:
-	@${RM} -f ${WRKSRC}/install.rdf.bak
+	@${RM} ${WRKSRC}/install.rdf.bak
 
 .include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
 .include <bsd.port.mk>
diff --git a/www/xpi-imagezoom/Makefile b/www/xpi-imagezoom/Makefile
index 51b207e8933c..afc488912b00 100644
--- a/www/xpi-imagezoom/Makefile
+++ b/www/xpi-imagezoom/Makefile
@@ -18,7 +18,7 @@ XPI_DIRS=	chrome defaults/preferences defaults
 
 post-patch:
 	@${REINPLACE_CMD} -e '/maxVersion/s|3.0b4|3.0.\*|' ${WRKSRC}/install.rdf
-	@${RM} -f ${WRKSRC}/install.rdf.bak
+	@${RM} ${WRKSRC}/install.rdf.bak
 
 .include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
 .include <bsd.port.mk>
diff --git a/www/xpi-jslib/Makefile b/www/xpi-jslib/Makefile
index 667ef88d6431..979c5e0250ef 100644
--- a/www/xpi-jslib/Makefile
+++ b/www/xpi-jslib/Makefile
@@ -20,7 +20,7 @@ XPI_DIRS=	chrome/jsliblive chrome components defaults/preferences defaults
 
 post-patch:
 		${REINPLACE_CMD} -Ee '/Suite/,/Flock/s/>2[.]0[.][*]</>2.4.*</' ${WRKSRC}/install.rdf
-		${RM} -f ${WRKSRC}/install.rdf.bak
+		${RM} ${WRKSRC}/install.rdf.bak
 
 .include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
 .include <bsd.port.mk>
diff --git a/www/xpi-jsview/Makefile b/www/xpi-jsview/Makefile
index 123d52adacea..6ca1b0e4c82e 100644
--- a/www/xpi-jsview/Makefile
+++ b/www/xpi-jsview/Makefile
@@ -23,7 +23,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|<em:maxVersion>9\.0a1<|<em:maxVersion>99.*<|' ${WRKSRC}/install.rdf
 
 pre-install:
-	@${RM} -f ${WRKSRC}/install.rdf.bak
+	@${RM} ${WRKSRC}/install.rdf.bak
 
 .include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
 .include <bsd.port.mk>
diff --git a/www/xpi-server_spy/Makefile b/www/xpi-server_spy/Makefile
index dffaa9379cb7..6642d48d8e7f 100644
--- a/www/xpi-server_spy/Makefile
+++ b/www/xpi-server_spy/Makefile
@@ -19,7 +19,7 @@ post-patch:
 		${WRKSRC}/install.rdf
 
 pre-install:
-	@${RM} -f ${WRKSRC}/install.rdf.bak
+	@${RM} ${WRKSRC}/install.rdf.bak
 
 .include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
 .include <bsd.port.mk>
diff --git a/www/xpi-showip/Makefile b/www/xpi-showip/Makefile
index 590a0ae87822..244c38082332 100644
--- a/www/xpi-showip/Makefile
+++ b/www/xpi-showip/Makefile
@@ -20,7 +20,7 @@ post-patch:
 	    ${WRKSRC}/install.rdf
 
 pre-install:
-	@${RM} -f ${WRKSRC}/install.rdf.bak
+	@${RM} ${WRKSRC}/install.rdf.bak
 
 .include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
 .include <bsd.port.mk>
diff --git a/www/yabb/Makefile b/www/yabb/Makefile
index 93c4760372fe..6f32fdcaddf3 100644
--- a/www/yabb/Makefile
+++ b/www/yabb/Makefile
@@ -44,7 +44,7 @@ PERLFILES=	AdminIndex.pl BoardConvert.pl Convert.pl \
 		Convert2x.pl Setup.pl Sources/SpellChecker.pl YaBB.pl
 
 post-extract:
-	@${RM} -rf ${WCGI}/Convert ${WCGI}/Modules ${WCGI}/FixFile.pl
+	@${RM} -r ${WCGI}/Convert ${WCGI}/Modules ${WCGI}/FixFile.pl
 
 do-patch:
 .for _I in ${PERLFILES}
diff --git a/www/yanopaste/Makefile b/www/yanopaste/Makefile
index 9a2bec416a4e..6260b3c8539c 100644
--- a/www/yanopaste/Makefile
+++ b/www/yanopaste/Makefile
@@ -15,7 +15,7 @@ USE_PHP=	xsl session xmlwriter xmlreader
 SUB_FILES=	pkg-message
 
 post-patch:
-	${FIND} ${WRKSRC} -name .svn -type d | ${XARGS} ${RM} -rf
+	${FIND} ${WRKSRC} -name .svn -type d | ${XARGS} ${RM} -r
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/www/youtube_dl/Makefile b/www/youtube_dl/Makefile
index 62ee21fa8555..9b5ca3e40967 100644
--- a/www/youtube_dl/Makefile
+++ b/www/youtube_dl/Makefile
@@ -39,7 +39,7 @@ RTMPDUMP_RUN_DEPENDS=	${LOCALBASE}/bin/rtmpdump:multimedia/rtmpdump
 
 post-extract:
 	@# remove tarball provided version, build our own
-	@${RM} -f ${WRKSRC}/youtube-dl
+	@${RM} ${WRKSRC}/youtube-dl
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|python devscripts/|${PYTHON_CMD} devscripts/|' ${WRKSRC}/Makefile
diff --git a/www/zen-cart/Makefile b/www/zen-cart/Makefile
index 2264221bd1a5..2715e1795a03 100644
--- a/www/zen-cart/Makefile
+++ b/www/zen-cart/Makefile
@@ -31,7 +31,7 @@ OPTIONS_DEFINE=	EXAMPLES
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${EXAMPLESDIR} && ${RM} -rf ${WRKSRC}/docs)
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${EXAMPLESDIR} && ${RM} -r ${WRKSRC}/docs)
 	(cd ${WRKSRC} && ${MV} vbv_learn_more.html ${STAGEDIR}${EXAMPLESDIR}/)
 	(cd ${WRKSRC} && ${MV} mcs_learn_more.html ${STAGEDIR}${EXAMPLESDIR}/)
 	(cd ${WRKSRC} && ${MV} robots_example.txt ${STAGEDIR}${EXAMPLESDIR}/)