${RM} already has -f.

PR: 213570 Submitted by: mat Exp-run by: antoine Sponsored by: Absolight
author: Mathieu Arnold <mat@FreeBSD.org> 2016-10-21 12:51:40 +0000
committer: Mathieu Arnold <mat@FreeBSD.org> 2016-10-21 12:51:40 +0000
commit: eabbfd75e30148b8f686899a638b93547ca83485 (patch)
tree: 5b70e6802d6d9dfe8b4564fc4f09f2d0a5156343
parent: f51fe6e12cc1833af15f8086b22a92af9f8aa4b0 (diff)
download: ports-eabbfd75e30148b8f686899a638b93547ca83485.tar.gz
ports-eabbfd75e30148b8f686899a638b93547ca83485.zip
718 files changed, 986 insertions, 986 deletions
diff --git a/Makefile b/Makefile
index 7e3bed5d4768..9a23c640716d 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ index:
 
 fetchindex: ${INDEXDIR}/${INDEXFILE}.bz2
 	@bunzip2 < ${INDEXDIR}/${INDEXFILE}.bz2 > ${INDEXDIR}/${INDEXFILE} && \
-	chmod a+r ${INDEXDIR}/${INDEXFILE} && ${RM} -f ${INDEXDIR}/${INDEXFILE}.bz2
+	chmod a+r ${INDEXDIR}/${INDEXFILE} && ${RM} ${INDEXDIR}/${INDEXFILE}.bz2
 
 ${INDEXDIR}/${INDEXFILE}.bz2: .PHONY
 	@${FETCHINDEX} ${INDEXDIR}/${INDEXFILE}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2
diff --git a/Mk/Uses/elixir.mk b/Mk/Uses/elixir.mk
index db19d929b165..0f89c49c2871 100644
--- a/Mk/Uses/elixir.mk
+++ b/Mk/Uses/elixir.mk
@@ -81,10 +81,10 @@ do-build:
 	fi
 .endfor
 .endif
-	@${RM} -f ${WRKSRC}/mix.lock
+	@${RM} ${WRKSRC}/mix.lock
 	@cd ${WRKSRC} && ${MIX_COMPILE}
 .for app in ${MIX_EXTRA_APPS}
-	@${RM} -f ${WRKSRC}/${app}/mix.lock
+	@${RM} ${WRKSRC}/${app}/mix.lock
 	@cd ${WRKSRC}/${app} && ${MIX_COMPILE}
 .endfor
 .endif # .if !target(do-build)
diff --git a/Mk/Uses/erlang.mk b/Mk/Uses/erlang.mk
index 968730c0564b..0c001bd35aa9 100644
--- a/Mk/Uses/erlang.mk
+++ b/Mk/Uses/erlang.mk
@@ -86,12 +86,12 @@ post-patch-erlang:
 		${REINPLACE_CMD} -i '' -e "s@\./rebar3@${REBAR3_CMD}@; s@\./rebar@${REBAR_CMD}@" \
 			${WRKSRC}/rebar.config; \
 	fi
-	@${RM} -f ${WRKSRC}/src/*.orig ${WRKSRC}/include/*.orig
+	@${RM} ${WRKSRC}/src/*.orig ${WRKSRC}/include/*.orig
 
 .if !target(do-build)
 do-build:
 # This will cause calls to local rebar and rebar3 to fail; makes it easier to spot them
-	@${RM} -f ${WRKSRC}/rebar ${WRKSRC}/rebar3
+	@${RM} ${WRKSRC}/rebar ${WRKSRC}/rebar3
 .for target in ${REBAR_TARGETS}
 # Remove rebar.lock every time - it can be created again after each run of rebar3
 	@${RM} ${WRKSRC}/rebar.lock
diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk
index ee47a0eb9e5b..18eb230dae26 100644
--- a/Mk/Uses/gem.mk
+++ b/Mk/Uses/gem.mk
@@ -123,7 +123,7 @@ do-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/
 	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' -exec ${STRIP_CMD} {} +
 	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f \( -name mkmf.log -or -name gem_make.out \) -delete
-	${RM} -rf ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext \
+	${RM} -r ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext \
 		${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE}
 	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE}
 .if defined(NOPORTDOCS)
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index 5e856f7722ca..d38e55af82c6 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -712,7 +712,7 @@ gnome-post-omf:
 .if defined(INSTALLS_ICONS)
 _USES_install+=	690:gnome-post-icons
 gnome-post-icons:
-	@${RM} -f ${TMPPLIST}.icons1
+	@${RM} ${TMPPLIST}.icons1
 	@for i in `${GREP} "^share/icons/.*/" ${TMPPLIST} | ${CUT} -d / -f 1-3 | ${SORT} -u`; do \
 		${ECHO_CMD} "@rmtry $${i}/icon-theme.cache" \
 			>> ${TMPPLIST}.icons1; \
@@ -723,7 +723,7 @@ gnome-post-icons:
 	done
 	@if test -f ${TMPPLIST}.icons1; then \
 		${CAT} ${TMPPLIST}.icons1 ${TMPPLIST} > ${TMPPLIST}.icons2; \
-		${RM} -f ${TMPPLIST}.icons1; \
+		${RM} ${TMPPLIST}.icons1; \
 		${MV} -f ${TMPPLIST}.icons2 ${TMPPLIST}; \
 	fi
 .endif
diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk
index 373dd1792d6f..f1e76ffc40b3 100644
--- a/Mk/Uses/gssapi.mk
+++ b/Mk/Uses/gssapi.mk
@@ -187,7 +187,7 @@ debug-krb:
 	    ${GSSAPILIBS} ${GSSAPILDFLAGS} ${_DEBUG_KRB_RPATH} \
 	    /tmp/${.TARGET}.c && \
 	    ldd /tmp/${.TARGET}.x; \
-	    rm -f /tmp/${.TARGET}.x
+	    ${RM} /tmp/${.TARGET}.x
 	@echo "PREFIX: ${PREFIX}"
 	@echo "GSSAPIBASEDIR: ${GSSAPIBASEDIR}"
 	@echo "GSSAPIINCDIR: ${GSSAPIINCDIR}"
diff --git a/Mk/Uses/pear.mk b/Mk/Uses/pear.mk
index fc52f433e1b6..7874bb0ae195 100644
--- a/Mk/Uses/pear.mk
+++ b/Mk/Uses/pear.mk
@@ -117,8 +117,8 @@ do-autogenerate-plist:
 	@${LN} -sf ${WRKDIR}/package.xml ${WRKSRC}/package.xml
 	@cd ${WRKSRC} && ${PEAR} install -n -f -P ${WRKDIR}/inst package.xml > /dev/null 2> /dev/null
 .for R in .channels .depdb .depdblock .filemap .lock .registry
-	@${RM} -rf ${WRKDIR}/inst/${PREFIX}/${LPEARDIR}/${R}
-	@${RM} -rf ${WRKDIR}/inst/${R}
+	@${RM} -r ${WRKDIR}/inst/${PREFIX}/${LPEARDIR}/${R}
+	@${RM} -r ${WRKDIR}/inst/${R}
 .endfor
 	@FILES=`cd ${WRKDIR}/inst && ${FIND} . -type f | ${CUT} -c 2- | \
 	${GREP} -v -E "^${PREFIX}/"` || exit 0; \
@@ -134,8 +134,8 @@ do-install:
 	@cd ${WRKSRC} && ${PEAR} install -n -f -P ${STAGEDIR} package.xml
 # Clean up orphans re-generated by pear-install
 .for R in .channels .depdb .depdblock .filemap .lock .registry
-	@${RM} -rf ${STAGEDIR}${PREFIX}/${LPEARDIR}/${R}
-	@${RM} -rf ${STAGEDIR}/${R}
+	@${RM} -r ${STAGEDIR}${PREFIX}/${LPEARDIR}/${R}
+	@${RM} -r ${STAGEDIR}/${R}
 .endfor
 .endif
 
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index 8d3b0b7eadce..ff736c41768f 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -308,7 +308,7 @@ fix-perl-things:
 # by mistake in their plists.  It is sometime compressed, so use a
 # shell glob for the removal.  Also, remove the directories that
 # contain it to not leave orphans directories around.
-	@${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod* || :
+	@${RM} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod* || :
 	@${RMDIR} -p ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} 2>/dev/null || :
 # Starting at ExtUtils::MakeMaker 7.06 and Perl 5.25.1, the base README.pod is
 # no longer manified into a README.3, as the README.pod is installed and can be
diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk
index 6c2253648cd3..e06a102d98db 100644
--- a/Mk/Uses/php.mk
+++ b/Mk/Uses/php.mk
@@ -242,7 +242,7 @@ do-install:
 		@${INSTALL_DATA} ${WRKSRC}/${header}/*.h \
 			${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/${header}
 .    endfor
-	@${RM} -f ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h
+	@${RM} ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h
 	@${GREP} "#define \(COMPILE\|HAVE\|USE\)_" ${WRKSRC}/config.h \
 		> ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME}/config.h
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
@@ -264,7 +264,7 @@ add-plist-phpext:
 		>> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec grep -v ext/${PHP_MODNAME}/config.h %D/include/php/ext/php_config.h.orig > %D/include/php/ext/php_config.h || true" \
 		>> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rm %D/include/php/ext/php_config.h.orig" \
+	@${ECHO_CMD} "@unexec ${RM} %D/include/php/ext/php_config.h.orig" \
 		>> ${TMPPLIST}
 	@${ECHO_CMD} "${PHP_EXT_INI_FILE}" \
 		>> ${TMPPLIST}
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index a11c546a3b5f..c751110dd62a 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -488,7 +488,7 @@ gecko-post-patch:
 .if exists(${PKGDEINSTALL_INC})
 	@${MOZCONFIG_SED} < ${PKGDEINSTALL_INC} > ${PKGDEINSTALL}
 .endif
-	@${RM} -f ${MOZCONFIG}
+	@${RM} ${MOZCONFIG}
 .if !defined(NOMOZCONFIG)
 	@if [ -e ${PORT_MOZCONFIG} ] ; then \
 		${MOZCONFIG_SED} < ${PORT_MOZCONFIG} >> ${MOZCONFIG} ; \
@@ -579,7 +579,7 @@ post-install-script: gecko-create-plist
 
 gecko-create-plist:
 # Create the plist
-	${RM} -f ${PLISTF}
+	${RM} ${PLISTF}
 .for dir in ${MOZILLA_PLIST_DIRS}
 	@cd ${STAGEDIR}${PREFIX}/${dir} && ${FIND} -H -s * ! -type d | \
 		${SED} -e 's|^|${dir}/|' >> ${PLISTF}
diff --git a/Mk/bsd.licenses.mk b/Mk/bsd.licenses.mk
index da3f75173610..243272cb5e02 100644
--- a/Mk/bsd.licenses.mk
+++ b/Mk/bsd.licenses.mk
@@ -616,12 +616,12 @@ ${_LICENSE_COOKIE}:
 		"$$(${CAT} ${_LICENSE_FILE})" 21 76
 
 .		elif ${_LICENSE_COMB} == "dual"
-	@${RM} -f ${_LICENSE_ASK_DATA}
+	@${RM} ${_LICENSE_ASK_DATA}
 .			for lic in ${_LICENSE_TO_ASK}
 	@${ECHO_CMD} "${lic}:${_LICENSE_FILE_${lic}}" >> ${_LICENSE_ASK_DATA}
 .			endfor
 	@menu_cmd="${DIALOG} --hline \"This port requires you to accept at least one license\" --menu \"License for ${PKGNAME} (dual)\" 21 70 15"; \
-	trap '${RM} -f $$tmpfile' EXIT INT TERM; \
+	trap '${RM} $$tmpfile' EXIT INT TERM; \
 	tmpfile=$$(mktemp -t portlicenses); \
 	for lic in ${_LICENSE_TO_ASK}; do \
 		menu_cmd="$${menu_cmd} VIEW_$${lic} \"View the license $${lic}\" USE_$${lic} \"Accept the license $${lic}\""; \
@@ -642,12 +642,12 @@ ${_LICENSE_COOKIE}:
 	done
 
 .		elif ${_LICENSE_COMB} == "multi"
-	@${RM} -f ${_LICENSE_ASK_DATA}
+	@${RM} ${_LICENSE_ASK_DATA}
 .			for lic in ${_LICENSE_TO_ASK}
 	@${ECHO_CMD} "${lic}:${_LICENSE_FILE_${lic}}" >> ${_LICENSE_ASK_DATA}
 .			endfor
 	@menu_cmd="${DIALOG} --hline \"This port requires you to accept all mentioned licenses\" --menu \"License for ${PKGNAME} (multi)\" 21 70 15"; \
-	trap '${RM} -f $$tmpfile' EXIT INT TERM; \
+	trap '${RM} $$tmpfile' EXIT INT TERM; \
 	tmpfile=$$(mktemp -t portlicenses); \
 	for lic in ${_LICENSE_TO_ASK}; do \
 		menu_cmd="$${menu_cmd} VIEW_$${lic} \"View the license $${lic}\""; \
@@ -693,12 +693,12 @@ ${_LICENSE_COOKIE}:
 	@${ECHO_MSG}
 	@exit 1
 .	endif
-	@${RM} -f ${_LICENSE_ASK_DATA}
+	@${RM} ${_LICENSE_ASK_DATA}
 .endif
 
 # Create report and catalog
 .if !defined(NO_LICENSES_INSTALL)
-	@${RM} -f ${_LICENSE_CATALOG_TMP} ${_LICENSE_REPORT_TMP}
+	@${RM} ${_LICENSE_CATALOG_TMP} ${_LICENSE_REPORT_TMP}
 .	if ${_LICENSE_COMB} == "single"
 # Catalog
 .		for var in _LICENSE _LICENSE_NAME _LICENSE_PERMS _LICENSE_GROUPS _LICENSE_DISTFILES
diff --git a/Mk/bsd.ocaml.mk b/Mk/bsd.ocaml.mk
index 8d7cf2bd9fa8..c56e0db4ca09 100644
--- a/Mk/bsd.ocaml.mk
+++ b/Mk/bsd.ocaml.mk
@@ -185,7 +185,7 @@ ocaml-ldconfig:
 _USES_install+=	745:ocaml-wash
 ocaml-wash:
 #	If ld.conf is empty
-	@${ECHO_CMD} "@postunexec if [ ! -s %D/${OCAML_LDCONF} ]; then ${RM} -f %D/${OCAML_LDCONF}; fi || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@postunexec if [ ! -s %D/${OCAML_LDCONF} ]; then ${RM} %D/${OCAML_LDCONF}; fi || true" >> ${TMPPLIST}
 . endif
 .endif
 
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index c5f7bf75c21b..5ae2a0b4e086 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -3043,7 +3043,7 @@ fetch-url-list: fetch-url-list-int
 # Extract
 
 clean-wrkdir:
-	@${RM} -rf ${WRKDIR}
+	@${RM} -r ${WRKDIR}
 
 .if !target(do-extract)
 do-extract:
@@ -3150,7 +3150,7 @@ run-autotools-fixup:
 			cmp -s $${f}.fbsd10bak $${f} || \
 			${ECHO_MSG} "===>   FreeBSD 10 autotools fix applied to $${f}"; \
 			${TOUCH} ${TOUCH_FLAGS} -mr $${f}.fbsd10bak $${f} ; \
-			${RM} -f $${f}.fbsd10bak ; \
+			${RM} $${f}.fbsd10bak ; \
 		done
 .endif
 .endif
@@ -3349,7 +3349,7 @@ do-package: ${TMPPLIST}
 		fi; \
 	fi
 	@for cat in ${CATEGORIES}; do \
-		${RM} -f ${PACKAGES}/$$cat/${PKGNAMEPREFIX}${PORTNAME}*${PKG_SUFX} ; \
+		${RM} ${PACKAGES}/$$cat/${PKGNAMEPREFIX}${PORTNAME}*${PKG_SUFX} ; \
 	done
 	@${MKDIR} ${WRKDIR}/pkg
 	@if ${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CREATE} ${PKG_CREATE_ARGS} -f ${PKG_SUFX:S/.//} -o ${WRKDIR}/pkg ${PKGNAME}; then \
@@ -3380,12 +3380,12 @@ do-package: ${TMPPLIST}
 delete-package:
 	@${ECHO_MSG} "===>  Deleting package for ${PKGNAME}"
 # When staging, the package may only be in the workdir if not root
-	@${RM} -f ${PKGFILE} ${WRKDIR_PKGFILE} 2>/dev/null || :
+	@${RM} ${PKGFILE} ${WRKDIR_PKGFILE} 2>/dev/null || :
 .endif
 
 .if !target(delete-package-list)
 delete-package-list:
-	@${ECHO_CMD} "[ -f ${PKGFILE} ] && (${ECHO_CMD} deleting ${PKGFILE}; ${RM} -f ${PKGFILE})"
+	@${ECHO_CMD} "[ -f ${PKGFILE} ] && (${ECHO_CMD} deleting ${PKGFILE}; ${RM} ${PKGFILE})"
 .endif
 
 # Used by scripts and users to install a package from local repository.
@@ -3518,7 +3518,7 @@ security-check: ${TMPPLIST}
 #   4.  startup scripts, in conjunction with 2.
 #   5.  world-writable files/dirs
 #
-	-@${RM} -f ${WRKDIR}/.PLIST.setuid ${WRKDIR}/.PLIST.writable ${WRKDIR}/.PLIST.objdump; \
+	-@${RM} ${WRKDIR}/.PLIST.setuid ${WRKDIR}/.PLIST.writable ${WRKDIR}/.PLIST.objdump; \
 	${AWK} -v prefix='${PREFIX}' ' \
 		match($$0, /^@cwd /) { prefix = substr($$0, RSTART + RLENGTH); if (prefix == "/") prefix=""; next; } \
 		/^@/ { next; } \
@@ -3621,13 +3621,13 @@ checkpatch:
 
 .if !target(reinstall)
 reinstall:
-	@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
+	@${RM} ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
 	@cd ${.CURDIR} && DEPENDS_TARGET="${DEPENDS_TARGET}" ${MAKE} -DFORCE_PKG_REGISTER install
 .endif
 
 .if !target(restage)
 restage:
-	@${RM} -rf ${STAGEDIR} ${STAGE_COOKIE} ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
+	@${RM} -r ${STAGEDIR} ${STAGE_COOKIE} ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
 	@cd ${.CURDIR} && ${MAKE} stage
 .endif
 
@@ -3651,7 +3651,7 @@ deinstall:
 	else \
 		${ECHO_MSG} "===>   ${PKGBASE} not installed, skipping"; \
 	fi
-	@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
+	@${RM} ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
 .endif
 .endif
 
@@ -3680,7 +3680,7 @@ deinstall-all:
 	else \
 		${ECHO_MSG} "===>   ${PKGORIGIN} not installed, skipping"; \
 	fi; \
-	${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
+	${RM} ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
 .endif
 .endif
 
@@ -3690,7 +3690,7 @@ deinstall-all:
 do-clean:
 	@if [ -d ${WRKDIR} ]; then \
 		if [ -w ${WRKDIR} ]; then \
-			${RM} -rf ${WRKDIR}; \
+			${RM} -r ${WRKDIR}; \
 		else \
 			${ECHO_MSG} "===>   ${WRKDIR} not writable, skipping"; \
 		fi; \
@@ -3728,7 +3728,7 @@ delete-distfiles:
 	@(if [ "X${RESTRICTED_FILES}" != "X" -a -d ${_DISTDIR} ]; then \
 		cd ${_DISTDIR}; \
 		for file in ${RESTRICTED_FILES}; do \
-			${RM} -f $${file}; \
+			${RM} $${file}; \
 			dir=$${file%/*}; \
 			if [ "$${dir}" != "$${file}" ]; then \
 				${RMDIR} -p $${dir} >/dev/null 2>&1 || :; \
@@ -3745,7 +3745,7 @@ delete-distfiles-list:
 	@${ECHO_CMD} "# ${PKGNAME}"
 	@if [ "X${RESTRICTED_FILES}" != "X" ]; then \
 		for file in ${RESTRICTED_FILES}; do \
-			${ECHO_CMD} "[ -f ${_DISTDIR}/$$file ] && (${ECHO_CMD} deleting ${_DISTDIR}/$$file; ${RM} -f ${_DISTDIR}/$$file)"; \
+			${ECHO_CMD} "[ -f ${_DISTDIR}/$$file ] && (${ECHO_CMD} deleting ${_DISTDIR}/$$file; ${RM} ${_DISTDIR}/$$file)"; \
 			dir=$${file%/*}; \
 			if [ "$${dir}" != "$${file}" ]; then \
 				${ECHO_CMD} "(cd ${_DISTDIR} && ${RMDIR} -p $${dir} 2>/dev/null)"; \
@@ -3848,7 +3848,7 @@ package-name:
 repackage: pre-repackage package
 
 pre-repackage:
-	@${RM} -f ${PACKAGE_COOKIE}
+	@${RM} ${PACKAGE_COOKIE}
 .endif
 
 # Build a package but don't check the cookie for installation, also don't
@@ -4282,7 +4282,7 @@ readmes:	readme
 
 .if !target(readme)
 readme:
-	@${RM} -f ${.CURDIR}/README.html
+	@${RM} ${.CURDIR}/README.html
 	@cd ${.CURDIR} && ${MAKE} ${.CURDIR}/README.html
 .endif
 
@@ -4508,13 +4508,13 @@ compress-man:
 						${GZIP_CMD} $${f} ; \
 						continue ; \
 					fi ; \
-					${RM} -f $${f} ; \
+					${RM} $${f} ; \
 					(cd $${f%/*}; ${LN} -f $${ref##*/} $${f##*/}.gz) ; \
 				done ; \
 			done ; \
 		${FIND} $$dir -type l \! -name "*.gz" | while read link ; do \
 				${LN} -sf $$(readlink $$link).gz $$link.gz ;\
-				${RM} -f $$link ; \
+				${RM} $$link ; \
 		done; \
 	done
 .endif
@@ -4568,7 +4568,7 @@ fake-pkg: create-manifest
 .else
 	@${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CMD} ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST}
 .endif
-	@${RM} -rf ${METADIR}
+	@${RM} -r ${METADIR}
 .endif
 .endif
 
@@ -4766,9 +4766,9 @@ do-config:
 	(${ECHO_MSG} "===> Cannot create $${optionsdir}, check permissions"; exit 1) ; \
 	fi
 	@TMPOPTIONSFILE=$$(mktemp -t portoptions); \
-	trap "${RM} -f $${TMPOPTIONSFILE}; exit 1" 1 2 3 5 10 13 15; \
+	trap "${RM} $${TMPOPTIONSFILE}; exit 1" 1 2 3 5 10 13 15; \
 	${SETENV} ${D4P_ENV} ${SH} ${SCRIPTSDIR}/dialog4ports.sh $${TMPOPTIONSFILE} || { \
-		${RM} -f $${TMPOPTIONSFILE}; \
+		${RM} $${TMPOPTIONSFILE}; \
 		${ECHO_MSG} "===> Options unchanged"; \
 		exit 0; \
 	}; \
@@ -4778,9 +4778,9 @@ do-config:
 		exit 0; \
 	fi; \
 	SELOPTIONS=$$(${CAT} $${TMPOPTIONSFILE}); \
-	${RM} -f $${TMPOPTIONSFILE}; \
+	${RM} $${TMPOPTIONSFILE}; \
 	TMPOPTIONSFILE=$$(mktemp -t portoptions); \
-	trap "${RM} -f $${TMPOPTIONSFILE}; exit 1" 1 2 3 5 10 13 15; \
+	trap "${RM} $${TMPOPTIONSFILE}; exit 1" 1 2 3 5 10 13 15; \
 	${ECHO_CMD} "# This file is auto-generated by 'make config'." > $${TMPOPTIONSFILE}; \
 	${ECHO_CMD} "# Options for ${PKGNAME}" >> $${TMPOPTIONSFILE}; \
 	${ECHO_CMD} "_OPTIONS_READ=${PKGNAME}" >> $${TMPOPTIONSFILE}; \
@@ -4800,7 +4800,7 @@ do-config:
 	else \
 		${CAT} $${TMPOPTIONSFILE} > ${OPTIONS_FILE}; \
 	fi; \
-	${RM} -f $${TMPOPTIONSFILE}
+	${RM} $${TMPOPTIONSFILE}
 	@cd ${.CURDIR} && ${MAKE} sanity-config
 .endif
 .endif # do-config
@@ -4885,11 +4885,11 @@ rmconfig:
 	optionsdir=${OPTIONS_FILE:H}; \
 	if [ ${UID} != 0 -a "x${INSTALL_AS_USER}" = "x" -a ! -w "${OPTIONS_FILE}" ]; then \
 		${ECHO_MSG} "===> Switching to root credentials to remove ${OPTIONS_FILE} and $${optionsdir}"; \
-		${SU_CMD} "${RM} -f ${OPTIONS_FILE} ; \
+		${SU_CMD} "${RM} ${OPTIONS_FILE} ; \
 			${RMDIR} $${optionsdir}"; \
 		${ECHO_MSG} "===> Returning to user credentials"; \
 	else \
-		${RM} -f ${OPTIONS_FILE}; \
+		${RM} ${OPTIONS_FILE}; \
 		${RMDIR} $${optionsdir} 2>/dev/null || return 0; \
 	fi
 .else
diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk
index e673a8e9b523..2321b62bfd44 100644
--- a/Mk/bsd.port.subdir.mk
+++ b/Mk/bsd.port.subdir.mk
@@ -303,7 +303,7 @@ readmes: readme
 
 .if !target(readme)
 readme:
-	@${RM} -f README.html
+	@${RM} README.html
 	@${MAKE} README.html
 .endif
 
@@ -345,7 +345,7 @@ README.html:
 			-e '/%%SUBDIR%%/r$@.tmp2' \
 			-e '/%%SUBDIR%%/d' \
 		> $@
-	@${RM} -f $@.tmp $@.tmp2 $@.tmp3 $@.tmp4
+	@${RM} $@.tmp $@.tmp2 $@.tmp3 $@.tmp4
 
 # Pass in the cached invariant variables to child makes.
 .if !defined(NOPRECIOUSMAKEVARS)
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index e3ddab8ca101..d2f8a75fed28 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -30,7 +30,7 @@ INSTALL_TARGET=	install-strip
 GCONF_SCHEMAS=	at-spi.schemas
 
 post-extract:
-	@${RM} -f ${WRKSRC}/registryd/Accessibility_Registry.server
+	@${RM} ${WRKSRC}/registryd/Accessibility_Registry.server
 
 post-patch:
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" ${WRKSRC}/Makefile.in
diff --git a/accessibility/speech-dispatcher/Makefile b/accessibility/speech-dispatcher/Makefile
index 58422f99c72a..3f9c8945caac 100644
--- a/accessibility/speech-dispatcher/Makefile
+++ b/accessibility/speech-dispatcher/Makefile
@@ -77,7 +77,7 @@ post-install:
 .for f in ${ETCFILES}
 	@${MV} ${STAGEDIR}${ETCDIR}/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
-	@${RM} -rf ${STAGEDIR}${DATADIR}/conf
+	@${RM} -r ${STAGEDIR}${DATADIR}/conf
 	@${RMDIR} ${STAGEDIR}${DATADIR} || ${TRUE}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
diff --git a/arabic/libitl/Makefile b/arabic/libitl/Makefile
index 6f6d757d3f26..a49d3b9ecb6e 100644
--- a/arabic/libitl/Makefile
+++ b/arabic/libitl/Makefile
@@ -19,7 +19,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 post-install:
 .for f in libitl.so libitl.so.0
-	${RM} -f ${STAGEDIR}${PREFIX}/lib/itl/$f
+	${RM} ${STAGEDIR}${PREFIX}/lib/itl/$f
 	${LN} -s libitl.so.0.0.7 ${STAGEDIR}${PREFIX}/lib/itl/$f
 .endfor
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/itl/libitl.so
diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile
index f39477639b3c..111d1a28de3c 100644
--- a/archivers/deco/Makefile
+++ b/archivers/deco/Makefile
@@ -41,7 +41,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/deco ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for i in LICENSE Makefile NEWS README config.mk
-	${RM} -rf ${WRKSRC}/../${PORTNAME}-archive-1.7/${i}
+	${RM} -r ${WRKSRC}/../${PORTNAME}-archive-1.7/${i}
 .endfor
 	@cd ${WRKDIR}/${PORTNAME}-archive-1.7/x/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	@${FIND} ${STAGEDIR}${DATADIR} -type f -exec ${CHMOD} +x {} \;
diff --git a/archivers/minizip/Makefile b/archivers/minizip/Makefile
index 76678a4da93a..1072965194bd 100644
--- a/archivers/minizip/Makefile
+++ b/archivers/minizip/Makefile
@@ -27,12 +27,12 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/*.1 ${STAGEDIR}${PREFIX}/man/man1
 
 regression-test:
-	${RM} -rf ${WRKDIR}/regression-test1
+	${RM} -r ${WRKDIR}/regression-test1
 	${MKDIR} ${WRKDIR}/regression-test1
 	${MV} ${WRKSRC}/*.[cho] ${WRKDIR}/regression-test1
-	${RM} -f ${WRKDIR}/test.zip
+	${RM} ${WRKDIR}/test.zip
 	(cd ${WRKDIR}/regression-test1 && ${WRKSRC}/minizip ${WRKDIR}/test.zip *)
-	${RM} -rf ${WRKDIR}/regression-test2
+	${RM} -r ${WRKDIR}/regression-test2
 	${MKDIR} ${WRKDIR}/regression-test2
 	${WRKSRC}/miniunzip ${WRKDIR}/test.zip -d ${WRKDIR}/regression-test2
 	${DIFF} -ur ${WRKDIR}/regression-test1 ${WRKDIR}/regression-test2 > /dev/null
diff --git a/archivers/unmakeself/Makefile b/archivers/unmakeself/Makefile
index f06ad9e72474..12896ccf949a 100644
--- a/archivers/unmakeself/Makefile
+++ b/archivers/unmakeself/Makefile
@@ -17,7 +17,7 @@ NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/unmakeself
 
 do-configure:
-	@${RM} -f ${WRKSRC}/config.h
+	@${RM} ${WRKSRC}/config.h
 	@if ${GREP} -q memmem /usr/include/string.h; then \
 		${ECHO_CMD} "#define HAS_MEMMEM" > ${WRKSRC}/config.h; \
 	else \
diff --git a/archivers/zipper/Makefile b/archivers/zipper/Makefile
index 4b7b7bea22b4..f23c487f65e7 100644
--- a/archivers/zipper/Makefile
+++ b/archivers/zipper/Makefile
@@ -15,6 +15,6 @@ USES=		gnustep
 USE_GNUSTEP=	back build
 
 post-patch:
-	cd ${WRKSRC} && ${FIND} . -name "*#*" -exec ${RM} -f -v "{}" ";"
+	cd ${WRKSRC} && ${FIND} . -name "*#*" -exec ${RM} -v "{}" ";"
 
 .include <bsd.port.mk>
diff --git a/astro/gpsbabel/Makefile b/astro/gpsbabel/Makefile
index fda673c47ded..6aa5dad2c51a 100644
--- a/astro/gpsbabel/Makefile
+++ b/astro/gpsbabel/Makefile
@@ -36,7 +36,7 @@ post-patch:
 	@${REINPLACE_CMD} '/langPath_ = / \
 		s|QApplication::applicationDirPath()|"${DATADIR}"|' \
 			${WRKSRC}/gui/mainwindow.cc
-	@${RM} -rf ${WRKSRC}/zlib/contrib/minizip
+	@${RM} -r ${WRKSRC}/zlib/contrib/minizip
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gpsbabel ${STAGEDIR}${PREFIX}/bin/
diff --git a/audio/autozen/Makefile b/audio/autozen/Makefile
index f1f81efbc7fe..5a5c60a5cb90 100644
--- a/audio/autozen/Makefile
+++ b/audio/autozen/Makefile
@@ -33,7 +33,7 @@ USE_GNOME=	gtk20
 MAKE_ENV=	GTK_CONFIG="pkg-config gtk+-2.0"
 
 post-extract:
-	@cd ${WRKSRC} && ${RM} -f autozen seq2wav
+	@cd ${WRKSRC} && ${RM} autozen seq2wav
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/audio/eawplus/Makefile b/audio/eawplus/Makefile
index b9ac04f7ca44..da96c66a6fa4 100644
--- a/audio/eawplus/Makefile
+++ b/audio/eawplus/Makefile
@@ -24,8 +24,8 @@ PLIST_SUB=	TIMIDITY_DATADIR=${TIMIDITY_DATADIR}
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	@${RM} -f ${WRKSRC}/timidity/inst/GUS/power/h-hihatp.pat.orig
-	@${RM} -f ${WRKSRC}/timidity/inst/GUS/power/h-snare.pat.orig
+	@${RM} ${WRKSRC}/timidity/inst/GUS/power/h-hihatp.pat.orig
+	@${RM} ${WRKSRC}/timidity/inst/GUS/power/h-snare.pat.orig
 
 do-build:
 	${SED}	-e "s|%%PREFIX%%|${PREFIX}|g" \
diff --git a/audio/festdoc/Makefile b/audio/festdoc/Makefile
index 5f86c4179c01..07542cb780c3 100644
--- a/audio/festdoc/Makefile
+++ b/audio/festdoc/Makefile
@@ -30,7 +30,7 @@ do-install:
 	  ${CP} $$info ${STAGEDIR}${PREFIX}/info && \
 	  ${CP} -r ${WRKSRC}/* ${STAGEDIR}${FDOC} && \
 	  cd ${STAGEDIR}${FDOC} && \
-	  ${RM} -f $$info && \
+	  ${RM} $$info && \
 	  ${RMDIR} festival/info
 
 .include <bsd.port.mk>
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 27faf2aacb9f..2494d0430a0c 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -100,7 +100,7 @@ do-install:
 	${FIND} ${FESTIVAL}/lib -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 	${FIND} ${FESTIVAL} -type f -name *.orig -delete
 	${CP} -pPR ${FESTIVAL}/lib ${FESTIVAL}/examples ${STAGEDIR}${DATADIR}
-	${RM} -rf ${STAGEDIR}${DATADIR}/lib/etc/Makefile ${STAGEDIR}${DATADIR}/lib/etc/*FreeBSD* \
+	${RM} -r ${STAGEDIR}${DATADIR}/lib/etc/Makefile ${STAGEDIR}${DATADIR}/lib/etc/*FreeBSD* \
 	    ${STAGEDIR}${DATADIR}/lib/etc/*unknown
 	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/*/audsp ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival ${STAGEDIR}${PREFIX}/libexec/festival.naked
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index 2ba5af39ed72..b34efb466344 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -29,6 +29,6 @@ post-extract:
 do-install:
 	@${MKDIR} ${STAGEDIR}${FHOME}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${FHOME}
-	${RM} -f ${STAGEDIR}${PREFIX}/share/festival/lib/voices/spanish/el_diphone/COPYING
+	${RM} ${STAGEDIR}${PREFIX}/share/festival/lib/voices/spanish/el_diphone/COPYING
 
 .include <bsd.port.mk>
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index cf509ee016e1..24672fcc76d1 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -30,7 +30,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lltdl
 
 post-extract:
-	@cd ${WRKSRC}/doc && ${RM} -f *.info*
+	@cd ${WRKSRC}/doc && ${RM} *.info*
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| libltdl|| ; s|,$$LIBLTDL,|,,| ; \
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index ce4c3825ff78..44c2595452d9 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -18,7 +18,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/zlib
+	@${RM} -r ${WRKSRC}/zlib
 
 post-patch:
 	@${REINPLACE_CMD} '/main/s/unsigned int/int/' \
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 24c434f89497..3c2ca847b3dd 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -61,9 +61,9 @@ post-patch:
 		${WRKSRC}/example-clients/Makefile.in
 	@${REINPLACE_CMD} -e 's|md5sum|md5 -q|g' \
 		${WRKSRC}/jackd/Makefile.in
-	@${RM} -f ${WRKSRC}/doc/reference/html/*
+	@${RM} ${WRKSRC}/doc/reference/html/*
 
 post-build:
-	@${RM} -f ${WRKSRC}/doc/reference/html/dir__2F*
+	@${RM} ${WRKSRC}/doc/reference/html/dir__2F*
 
 .include <bsd.port.mk>
diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
index 3003c8d9e7ad..789f901d3e21 100644
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -26,6 +26,6 @@ post-patch:
 		 ${WRKSRC}/src/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		 ${WRKSRC}/cmake/modules/*.cmake
-	${RM} -f ${WRKSRC}/cmake/modules/FindLibXml2.cmake
+	${RM} ${WRKSRC}/cmake/modules/FindLibXml2.cmake
 
 .include <bsd.port.mk>
diff --git a/audio/libnoise/Makefile b/audio/libnoise/Makefile
index 312e876decb7..6042c207d63e 100644
--- a/audio/libnoise/Makefile
+++ b/audio/libnoise/Makefile
@@ -36,6 +36,6 @@ do-install:
 		${INSTALL_LIB} libnoise.la ${STAGEDIR}${PREFIX}/lib)
 	(cd ${WRKSRC}/include && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/noise)
-	${RM} -f ${STAGEDIR}${PREFIX}/include/noise/Makefile
+	${RM} ${STAGEDIR}${PREFIX}/include/noise/Makefile
 
 .include <bsd.port.mk>
diff --git a/audio/nosefart/Makefile b/audio/nosefart/Makefile
index 936cb66b4e62..421bee8b9eda 100644
--- a/audio/nosefart/Makefile
+++ b/audio/nosefart/Makefile
@@ -20,7 +20,7 @@ MAKE_ENV=	INSTALL="${INSTALL}" COPY="${COPY}" STRIP="${STRIP}" \
 PLIST_FILES=	bin/nosefart
 
 pre-build:
-	@${RM} -rf ${BUILD_WRKSRC}/nsfobj
+	@${RM} -r ${BUILD_WRKSRC}/nsfobj
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nsfobj/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile
index d2f3661c9c19..e8efa65bda50 100644
--- a/audio/opusfile/Makefile
+++ b/audio/opusfile/Makefile
@@ -50,7 +50,7 @@ post-patch:
 	@${CP} ${FILESDIR}/ftime.c ${WRKSRC}/src/
 
 post-install-DOXYGEN-on:
-	@${RM} -f ${WRKDIR}/PLIST.doc ; \
+	@${RM} ${WRKDIR}/PLIST.doc ; \
 	${FIND} ${STAGEDIR}${DOCSDIR}/html -type f | \
 		${SED} 's|${STAGEDIR}${PREFIX}/||' \
 		>> ${WRKDIR}/PLIST.doc ; \
diff --git a/audio/p5-libvorbis/Makefile b/audio/p5-libvorbis/Makefile
index 4166b7a06880..d9d4c961f48d 100644
--- a/audio/p5-libvorbis/Makefile
+++ b/audio/p5-libvorbis/Makefile
@@ -19,7 +19,7 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/blib ${WRKSRC}/pm_to_blib
+	@${RM} -r ${WRKSRC}/blib ${WRKSRC}/pm_to_blib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/Makefile.PL
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 94a1f49f8f36..d2fa282cac2e 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -92,6 +92,6 @@ post-install:
 .endfor
 
 post-install-BASH-off:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/share/bash-completion
+	@${RM} -r ${STAGEDIR}${PREFIX}/share/bash-completion
 
 .include <bsd.port.mk>
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 396f6ff051bf..a6b7faf98df2 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -92,6 +92,6 @@ post-patch:
 
 # rbzeitgeist plugin needs py3-zeitgeist
 post-install:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/rhythmbox/plugins/rbzeitgeist
+	@${RM} -r ${STAGEDIR}${PREFIX}/lib/rhythmbox/plugins/rbzeitgeist
 
 .include <bsd.port.post.mk>
diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index 95669d7df1a7..a65eff9432e9 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -19,6 +19,6 @@ USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 post-extract:
-	@${RM} -f ${WRKSRC}/src/getopt*
+	@${RM} ${WRKSRC}/src/getopt*
 
 .include <bsd.port.mk>
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 7c5aab909d09..7d7bf4fdabb9 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -63,8 +63,8 @@ CONFLICTS_INSTALL=	timidity-[0-9]*
 DOCFILES=	README.alsaseq README.dl README.m2m README.mts README.sf
 
 pre-patch:
-	@${RM} -f ${WRKSRC}/libarc/*.h
-	@${RM} -f ${WRKSRC}/utils/mblock.h
+	@${RM} ${WRKSRC}/libarc/*.h
+	@${RM} ${WRKSRC}/utils/mblock.h
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${TIMID_LIBDIR}
diff --git a/audio/timidity++/Makefile.interface b/audio/timidity++/Makefile.interface
index d441058ae03a..2f0bfa188666 100644
--- a/audio/timidity++/Makefile.interface
+++ b/audio/timidity++/Makefile.interface
@@ -121,8 +121,8 @@ DESKTOP_ENTRIES="XSkinMidi" "" "" "${LINK}" "AudioVideo;Audio;Midi;" ""
 .endif
 
 post-extract:
-	@${RM} -f ${WRKSRC}/libarc/*.h
-	@${RM} -f ${WRKSRC}/utils/mblock.h
+	@${RM} ${WRKSRC}/libarc/*.h
+	@${RM} ${WRKSRC}/utils/mblock.h
 
 post-patch:
 .if ${INTERFACE} == "slang"
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index bf02cbd6e722..726fc5096abb 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -49,7 +49,7 @@ XMMS_LIB_DEPENDS=	libxmms.so:multimedia/xmms
 XMMS_CONFIGURE_WITH=	xmms
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/players/S
+	@${RM} -r ${WRKSRC}/players/S
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,lib/pkgconfig,libdata/pkgconfig,' \
diff --git a/audio/wildmidi/Makefile b/audio/wildmidi/Makefile
index 525d95d38d20..9b388c38bef7 100644
--- a/audio/wildmidi/Makefile
+++ b/audio/wildmidi/Makefile
@@ -68,7 +68,7 @@ post-patch:
 		${REINPLACE_CMD} '/INSTALL/s@share/man@man@'
 
 pre-install:
-	@${RM} -f ${WRKSRC}/docs/man/man1/wildmidi.1${REINPLACE_ARGS:S/-i//} \
+	@${RM} ${WRKSRC}/docs/man/man1/wildmidi.1${REINPLACE_ARGS:S/-i//} \
 		${WRKSRC}/docs/man/man5/wildmidi.cfg.5${REINPLACE_ARGS:S/-i//}
 	${MKDIR} ${STAGEDIR}${DATADIR} ; \
 	${CP} ${WRKSRC}/cfg/wildmidi.cfg ${STAGEDIR}${DATADIR}/wildmidi.cfg.sample
diff --git a/audio/xmms-gbsplay/Makefile b/audio/xmms-gbsplay/Makefile
index 3389a121e882..adde84452817 100644
--- a/audio/xmms-gbsplay/Makefile
+++ b/audio/xmms-gbsplay/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS=	--disable-nas --prefix=${PREFIX}
 PLIST_FILES=	lib/xmms/Input/gbsxmms.so
 
 post-extract:
-	@${RM} -f ${WRKSRC}/po/subdir.mk
+	@${RM} ${WRKSRC}/po/subdir.mk
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/base/gcc/Makefile b/base/gcc/Makefile
index ba279c7feacd..610c7ad42f80 100644
--- a/base/gcc/Makefile
+++ b/base/gcc/Makefile
@@ -72,6 +72,6 @@ post-install:
 	${LN} -sf ${GCC_TARGET}-g++.1.gz ${STAGEDIR}/${MANDIR}1/c++.1.gz
 	${LN} -sf ${GCC_TARGET}-gcc  ${STAGEDIR}/usr/bin/cc ; \
 	${LN} -sf ${GCC_TARGET}-gcc.1.gz ${STAGEDIR}/${MANDIR}1/cc.1.gz
-	${RM} -rf ${STAGEDIR}/usr/share/info
+	${RM} -r ${STAGEDIR}/usr/share/info
 
 .include <bsd.port.mk>
diff --git a/benchmarks/flowgrind/Makefile b/benchmarks/flowgrind/Makefile
index 506cd3e3509d..c6ad32ff976d 100644
--- a/benchmarks/flowgrind/Makefile
+++ b/benchmarks/flowgrind/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--enable-pcap --enable-gsl
 CONFIGURE_ENV=  LIBS="${LIBS} -lpcap"
 
 post-patch:
-	@${RM} -rf ${WRKSRC}/build-aux
+	@${RM} -r ${WRKSRC}/build-aux
 	@${REINPLACE_CMD} -e 's|AC_LIB_RPATH||g' ${WRKSRC}/configure.ac
 
 .include <bsd.port.mk>
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index 853ab774874c..ee74b5417e59 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -40,7 +40,7 @@ post-extract:
 # Clean up turds from building the library.  Some systems just have
 # .o, some also end up with .s, so clean up both.
 post-build:
-	@${RM} -f ${WRKSRC}/bin/*/*.[os]
+	@${RM} ${WRKSRC}/bin/*/*.[os]
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/lmbench
diff --git a/benchmarks/nqueens/Makefile b/benchmarks/nqueens/Makefile
index 6c59879d19a2..6a428e816ca1 100644
--- a/benchmarks/nqueens/Makefile
+++ b/benchmarks/nqueens/Makefile
@@ -35,7 +35,7 @@ PROGS+=		qn24b_mpi
 .endif
 
 post-extract:
-	@${RM} -f ${WRKSRC}/qn24b_base
+	@${RM} ${WRKSRC}/qn24b_base
 
 do-build:
 	cd ${WRKSRC} && \
diff --git a/benchmarks/siege/Makefile b/benchmarks/siege/Makefile
index 89220f3d2bea..5fa3c93d2e85 100644
--- a/benchmarks/siege/Makefile
+++ b/benchmarks/siege/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} --disable-shared \
 		--sysconfdir=${ETCDIR}
 
 pre-configure:
-	@${RM} -f ${WRKSRC}/acinclude.m4
-	@${RM} -f ${WRKSRC}/utils/missing
+	@${RM} ${WRKSRC}/acinclude.m4
+	@${RM} ${WRKSRC}/utils/missing
 
 .include <bsd.port.mk>
diff --git a/benchmarks/unixbench/Makefile b/benchmarks/unixbench/Makefile
index 3e4b6b42bad8..57c9802450dd 100644
--- a/benchmarks/unixbench/Makefile
+++ b/benchmarks/unixbench/Makefile
@@ -17,7 +17,7 @@ SUB_FILES=	unixbench
 MAKE_JOBS_UNSAFE=	yes
 
 post-extract:
-	${RM} -f ${WRKSRC}/pgms/select
+	${RM} ${WRKSRC}/pgms/select
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/unixbench ${STAGEDIR}${PREFIX}/bin/
diff --git a/biology/artemis/Makefile b/biology/artemis/Makefile
index 64cb567766b7..4dcee45a2973 100644
--- a/biology/artemis/Makefile
+++ b/biology/artemis/Makefile
@@ -21,7 +21,7 @@ NO_BUILD=	yes
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
 post-extract:
-	@${FIND} ${WRKSRC} -type d -name CVS -exec ${RM} -rf {} +
+	@${FIND} ${WRKSRC} -type d -name CVS -exec ${RM} -r {} +
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}-${PORTVERSION}
diff --git a/biology/fasta/Makefile b/biology/fasta/Makefile
index 7ce6dbd3e2ec..0ed374934edc 100644
--- a/biology/fasta/Makefile
+++ b/biology/fasta/Makefile
@@ -22,7 +22,7 @@ PORTDOCS=	COPYRIGHT README.versions fasta20.doc fasta20.me format.doc \
 OPTIONS_DEFINE=	DOCS
 
 do-extract:
-	@ ${RM} -rf ${WRKDIR}
+	@ ${RM} -r ${WRKDIR}
 	@ ${MKDIR} ${WRKSRC}
 	@ for f in ${EXTRACT_ONLY}; do \
 	  cd ${WRKSRC} && (${GZCAT} ${DISTDIR}/$${f} | ${SH} >/dev/null); \
diff --git a/biology/tinker/Makefile b/biology/tinker/Makefile
index 43163dff6f82..76c17c9e0876 100644
--- a/biology/tinker/Makefile
+++ b/biology/tinker/Makefile
@@ -45,7 +45,7 @@ post-extract:
 	@${CHMOD} -R u+w ${WRKSRC}
 
 pre-build:
-	@${RM} -f ${BUILD_WRKSRC}/*.c
+	@${RM} ${BUILD_WRKSRC}/*.c
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/cad/impact/Makefile b/cad/impact/Makefile
index 876d6f6ff023..02497552bdda 100644
--- a/cad/impact/Makefile
+++ b/cad/impact/Makefile
@@ -49,7 +49,7 @@ GMSH_RUN_DEPENDS=	gmsh:cad/gmsh
 
 post-extract:
 	@${FIND} ${WRKSRC} -name CVS -type d -print0 -or -name .cvsignore -type f -print0 | \
-		${XARGS} -0 ${RM} -rf
+		${XARGS} -0 ${RM} -r
 
 do-install:
 	(cd ${WRKDIR} && ${INSTALL_SCRIPT} impact impactgui \
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile
index 3e9efbe7877e..e258661f1a3d 100644
--- a/cad/kicad/Makefile
+++ b/cad/kicad/Makefile
@@ -80,7 +80,7 @@ post-install-NLS-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}/internat
 	(cd ${WRKSRC}/doc/internat &&	\
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/internat)
-	${RM} -f ${STAGEDIR}${DATADIR}/internat/CMakeLists.txt
+	${RM} ${STAGEDIR}${DATADIR}/internat/CMakeLists.txt
 	${FIND} ${STAGEDIR}${DATADIR}/internat -name kicad.po -delete
 
 post-install-DOCS-on:
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index dd9798ccfe23..1d373c5307ee 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -124,7 +124,7 @@ post-install:
 	done)
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/OpenCASCADE
 	(cd ${STAGEDIR}${OCCROOT}/inc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/OpenCASCADE)
-	${RM} -rf ${STAGEDIR}${OCCROOT}/inc
+	${RM} -r ${STAGEDIR}${OCCROOT}/inc
 	${LN} -sf ${PREFIX}/include/OpenCASCADE ${STAGEDIR}${OCCROOT}/inc
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} tests ${STAGEDIR}${OCCROOT})
 post-install-DOCS-on:
diff --git a/cad/tochnog/Makefile b/cad/tochnog/Makefile
index 9d9ce50dfaba..13a58e615bdc 100644
--- a/cad/tochnog/Makefile
+++ b/cad/tochnog/Makefile
@@ -94,7 +94,7 @@ do-install:
 	  ${STAGEDIR}${GID_PTYPES}/tochnog.gid
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${RM} -f ${WRKDIR}/Sources/test/*.orig
+	${RM} ${WRKDIR}/Sources/test/*.orig
 	${INSTALL_DATA} ${WRKDIR}/Sources/test/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/chinese/cnprint/Makefile b/chinese/cnprint/Makefile
index b6824bf51976..53af8e06825b 100644
--- a/chinese/cnprint/Makefile
+++ b/chinese/cnprint/Makefile
@@ -31,7 +31,7 @@ do-extract:
 .endfor
 	cd ${WRKSRC} ; \
 	${TAR} pzvxf hbf.tar.gz ; ${MV} hbf/* . ; \
-	${RM} -fr hbf ; \
+	${RM} -r hbf ; \
 	${GUNZIP_CMD} *.gz || ${TRUE}
 
 post-patch:
diff --git a/chinese/fireflyttf/Makefile b/chinese/fireflyttf/Makefile
index 79d45646a871..7d9fddb83afe 100644
--- a/chinese/fireflyttf/Makefile
+++ b/chinese/fireflyttf/Makefile
@@ -37,7 +37,7 @@ post-extract:
 	@${TAR} -C ${WRKSRC} -zxf ${DISTDIR}/fireflysung-1.3.0p1.tar.gz \
 		fireflysung-1.3.0p1/fireflysung.ttf
 	@${MV} ${WRKSRC}/fireflysung-1.3.0p1/fireflysung.ttf  ${WRKSRC}
-	@${RM} -rf ${WRKSRC}/fireflysung-1.3.0p1
+	@${RM} -r ${WRKSRC}/fireflysung-1.3.0p1
 .else
 	${TRUE}
 .endif
diff --git a/chinese/phpbb-tw/Makefile b/chinese/phpbb-tw/Makefile
index ad1bf6c8b1de..b9dfdf99a35e 100644
--- a/chinese/phpbb-tw/Makefile
+++ b/chinese/phpbb-tw/Makefile
@@ -70,7 +70,7 @@ pre-everything::
 post-patch:
 	@ ${REINPLACE_CMD} -e "s#\.\./templates#/${PHPBB_URL}/templates#" \
 	  ${WRKSRC}/docs/*.html
-	@${RM} -f `${FIND} ${WRKSRC} -name '*.orig'`
+	@${RM} `${FIND} ${WRKSRC} -name '*.orig'`
 
 do-install:
 	@ ${MKDIR} -m 0775 ${STAGEDIR}${PREFIX}/${PHPBBDIR}
diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
index 66c2387f8f7b..18bd996088b8 100644
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -44,7 +44,7 @@ QT4_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/qt/interfaces.ppu:edito
 QT4_MAKE_ARGS=	PLATFORM=qt
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/src/lnet/lib/openssl.pas
+	@${RM} -r ${WRKSRC}/src/lnet/lib/openssl.pas
 
 post-patch:
 	@${SED} -e s!%%LOCALBASE%%!${LOCALBASE}!g \
@@ -65,7 +65,7 @@ post-patch:
 		${WRKSRC}/src/dData.pas ${WRKSRC}/src/fGrayline.pas
 	${REINPLACE_CMD} -e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \
 		${WRKSRC}/Makefile
-	${RM} -rf ${WRKSRC}/src/mysql
+	${RM} -r ${WRKSRC}/src/mysql
 	${LAZARUS_DIR}/tools/lazres ${WRKSRC}/src/fLoTWExport.lrs \
 		${WRKSRC}/src/fLoTWExport.lfm
 	${LAZARUS_DIR}/tools/lazres ${WRKSRC}/src/fPreferences.lrs \
diff --git a/comms/wwl/Makefile b/comms/wwl/Makefile
index 8f3f8a2452c9..c02a0aa64023 100644
--- a/comms/wwl/Makefile
+++ b/comms/wwl/Makefile
@@ -15,7 +15,7 @@ CONFLICTS=	locator*
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/wwl ${STAGEDIR}${PREFIX}/bin
-	@${RM} -f ${STAGEDIR}${PREFIX}/bin/locator
+	@${RM} ${STAGEDIR}${PREFIX}/bin/locator
 	@${LN} -sf wwl ${STAGEDIR}${PREFIX}/bin/locator
 	@${INSTALL_DATA} ${WRKSRC}/wwl.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/comms/yaac/Makefile b/comms/yaac/Makefile
index 203bc8f803b7..5696a04c5bd4 100644
--- a/comms/yaac/Makefile
+++ b/comms/yaac/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/yaac
 
 do-install:
 	${UNZIP_NATIVE_CMD} -d ${STAGEDIR}/${JAVASHAREDIR}/${PORTNAME} ${WRKSRC}/YAAC.zip
-	${RM} -rf ${STAGEDIR}/${JAVASHAREDIR}/${PORTNAME}/lib/rxtx-2.2pre2-bins
+	${RM} -r ${STAGEDIR}/${JAVASHAREDIR}/${PORTNAME}/lib/rxtx-2.2pre2-bins
 	${INSTALL_SCRIPT} ${WRKDIR}/yaac.sh ${STAGEDIR}${PREFIX}/bin/yaac
 
 .include <bsd.port.mk>
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index 5648f8d23af7..2a647a898268 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -26,7 +26,7 @@ INFO=		recode
 
 post-extract:
 	@${CP} ${FILESDIR}/ru.po ${WRKSRC}/i18n
-	@${RM} -f ${WRKSRC}/doc/${PORTNAME}.info*
+	@${RM} ${WRKSRC}/doc/${PORTNAME}.info*
 
 post-patch:
 	@${REINPLACE_CMD} -E \
diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index d6d3dbbe33a6..1bf0724e66d1 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -31,7 +31,7 @@ OPTIONS_SUB=	yes
 TESTS_DESC=	Install tests
 
 post-patch:
-	@cd ${WRKSRC}; ${RM} -f cute_icons_for_site/Thumbs.db
+	@cd ${WRKSRC}; ${RM} cute_icons_for_site/Thumbs.db
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/databases/cassandra2/Makefile b/databases/cassandra2/Makefile
index 104c54e76df5..a82b638954ca 100644
--- a/databases/cassandra2/Makefile
+++ b/databases/cassandra2/Makefile
@@ -75,7 +75,7 @@ post-patch:
 .endfor
 	${REINPLACE_CMD} -e 's|\`dirname \$$\0\`/..|${DATADIR}|' \
 		${WRKSRC}/bin/cassandra.in.sh
-	${RM} -f ${WRKSRC}/conf/*.orig
+	${RM} ${WRKSRC}/conf/*.orig
 .if ${PORT_OPTIONS:MCQL}
 	${REINPLACE_CMD} -e 's|os.path.dirname(__file__)|"${DATADIR}/bin"|' \
 		${WRKSRC}/bin/cqlsh
diff --git a/databases/db5/Makefile b/databases/db5/Makefile
index 276aaef9a889..1cd700569e22 100644
--- a/databases/db5/Makefile
+++ b/databases/db5/Makefile
@@ -93,13 +93,13 @@ post-install:
 		       ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBMAJ} ; done
 
 post-install-JAVA-off:
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/java
+	${RM} -r ${STAGEDIR}${DOCSDIR}/java
 .for i in gsg gsg_db_rep gsg_txn
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}/JAVA
+	${RM} -r ${STAGEDIR}${DOCSDIR}/${i}/JAVA
 .endfor
 
 post-install-SQL-off:
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql
+	${RM} -r ${STAGEDIR}${DOCSDIR}/bdb-sql
 
 post-install-TCL-on:
 	echo "package ifneeded Db_tcl ${BDBVER} \
@@ -108,7 +108,7 @@ post-install-TCL-on:
 
 post-install-TCL-off:
 .for i in api_reference/TCL
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}
+	${RM} -r ${STAGEDIR}${DOCSDIR}/${i}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/databases/db6/Makefile b/databases/db6/Makefile
index 9f0540054235..415d97289c9e 100644
--- a/databases/db6/Makefile
+++ b/databases/db6/Makefile
@@ -81,13 +81,13 @@ post-install:
 	for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done
 
 post-install-JAVA-off:
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/java
+	${RM} -r ${STAGEDIR}${DOCSDIR}/java
 .for i in gsg gsg_db_rep gsg_txn
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}/JAVA
+	${RM} -r ${STAGEDIR}${DOCSDIR}/${i}/JAVA
 .endfor
 
 post-install-SQL-off:
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql
+	${RM} -r ${STAGEDIR}${DOCSDIR}/bdb-sql
 
 post-install-SQL-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/../lang/sql/upgrade61.sh \
@@ -100,7 +100,7 @@ post-install-TCL-on:
 
 post-install-TCL-off:
 .for i in api_reference/TCL
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}
+	${RM} -r ${STAGEDIR}${DOCSDIR}/${i}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile
index b720bbe94ae9..96ee43d6c463 100644
--- a/databases/dbconnect/Makefile
+++ b/databases/dbconnect/Makefile
@@ -33,7 +33,7 @@ PGSQL_CONFIGURE_ON=	--enable-pgsql=yes \
 			--with-pgsql_lib=${LOCALBASE}/lib
 
 post-patch:
-	@${RM} -f ${WRKSRC}/include/dbconn/README
+	@${RM} ${WRKSRC}/include/dbconn/README
 	@${REINPLACE_CMD} 's|gcc|${CC}|' \
 		${WRKSRC}/src/dbconnect/Makefile.in \
 		${WRKSRC}/src/driver_*/Makefile.in
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index 7e20d88f79d2..b1c2c5b35330 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -28,7 +28,7 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	progref
 
 post-extract:
-	${RM} -f ${WRKSRC}/doc/progref/progref-stamp
+	${RM} ${WRKSRC}/doc/progref/progref-stamp
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ltermcap|-lncurses|' ${WRKSRC}/configure
diff --git a/databases/mariadb100-client/Makefile b/databases/mariadb100-client/Makefile
index f5098c445737..866c578ab633 100644
--- a/databases/mariadb100-client/Makefile
+++ b/databases/mariadb100-client/Makefile
@@ -21,6 +21,6 @@ CLIENT_ONLY=	yes
 
 post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
-	${RM} -rf ${STAGEDIR}${PREFIX}/include/mysql/private
+	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile
index c21fae07e2e3..fc1f8a3a5d38 100644
--- a/databases/mariadb100-server/Makefile
+++ b/databases/mariadb100-server/Makefile
@@ -154,7 +154,7 @@ USE_GCC=	yes
 .endif
 
 post-extract-OQGRAPH-off:
-	@${RM} -rf ${WRKSRC}/storage/oqgraph
+	@${RM} -r ${WRKSRC}/storage/oqgraph
 
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile
index 606afc678bd8..06152a0ca0be 100644
--- a/databases/mariadb55-server/Makefile
+++ b/databases/mariadb55-server/Makefile
@@ -117,7 +117,7 @@ USE_GCC=	yes
 .endif
 
 post-extract-OQGRAPH-off:
-	@${RM} -rf ${WRKSRC}/storage/oqgraph
+	@${RM} -r ${WRKSRC}/storage/oqgraph
 
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index f418b2b7c55f..5ca6b464b47a 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -38,6 +38,6 @@ post-install:
 		${SED} -e "s|/usr/include/mysql|${LOCALBASE}/include/mysql|" | \
 		${SED} -e "s|-lmysqlpp|-L${PREFIX}/lib -L${LOCALBASE}/lib/mysql -lmysqlpp|" \
 		> ${STAGEDIR}${EXAMPLESDIR}/Makefile
-	@${RM} -f ${STAGEDIR}${EXAMPLESDIR}/Makefile.temp
+	@${RM} ${STAGEDIR}${EXAMPLESDIR}/Makefile.temp
 
 .include <bsd.port.mk>
diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index 16afa1d0f36e..5edfb371c1b8 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -31,7 +31,7 @@ CMAKE_ARGS+=-DCMAKE_ENABLE_C++11=ON
 .endif
 
 post-install:
-	@${RM} -f ${STAGEDIR}${DOCSDIR}/INSTALL \
+	@${RM} ${STAGEDIR}${DOCSDIR}/INSTALL \
 		${STAGEDIR}${DOCSDIR}/COPYING
 
 .if defined(MAINTAINER_MODE)
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 73d82ccf134c..22130fd04ea4 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -148,7 +148,7 @@ CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
 .endif
 
 post-extract:
-	@${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
+	@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
 
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
diff --git a/databases/p5-DBD-SQLite2/Makefile b/databases/p5-DBD-SQLite2/Makefile
index 3f9ead5be90e..40714f87dd78 100644
--- a/databases/p5-DBD-SQLite2/Makefile
+++ b/databases/p5-DBD-SQLite2/Makefile
@@ -20,7 +20,7 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
-	@${RM} -f ${WRKSRC}/getsqlite.pl
+	@${RM} ${WRKSRC}/getsqlite.pl
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/SQLite2/SQLite2.so
diff --git a/databases/pgfouine/Makefile b/databases/pgfouine/Makefile
index 7fd2a89260f0..d949eb09d386 100644
--- a/databases/pgfouine/Makefile
+++ b/databases/pgfouine/Makefile
@@ -19,7 +19,7 @@ pre-configure:
 	${REINPLACE_CMD} -e 's,/usr/bin/php,${LOCALBASE}/bin/php,g;' \
 		-e 's,!!PREFIX!!,${PREFIX},g' \
 		${WRKSRC}/pgfouine.php ${WRKSRC}/pgfouine_vacuum.php
-	${FIND} -d ${WRKSRC} -type d -name 'CVS' -exec ${RM} -rf {} \;
+	${FIND} -d ${WRKSRC} -type d -name 'CVS' -exec ${RM} -r {} \;
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pgfouine.php ${STAGEDIR}${PREFIX}/bin/pgfouine
diff --git a/databases/pgmodeler/Makefile b/databases/pgmodeler/Makefile
index f770a76c8d7b..65cf5f548223 100644
--- a/databases/pgmodeler/Makefile
+++ b/databases/pgmodeler/Makefile
@@ -30,6 +30,6 @@ pre-install:
 	@${MKDIR} ${STAGEDIR}/${LOCALBASE}/lib/${PORTNAME}/plugins
 
 post-install:
-	@${RM} -f ${STAGEDIR}${PREFIX}/bin/tests
+	@${RM} ${STAGEDIR}${PREFIX}/bin/tests
 
 .include <bsd.port.mk>
diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index 0cb76fe9a850..83cd5d0531d2 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -32,7 +32,7 @@ pre-everything::
 do-configure:
 	${REINPLACE_CMD} -e "s|/usr/bin/pg|${LOCALBASE}/bin/pg|" \
 		${WRKSRC}/conf/config.inc.php-dist
-	${RM} -f ${WRKSRC}/conf/config.inc.php \
+	${RM} ${WRKSRC}/conf/config.inc.php \
 		${WRKSRC}/conf/config.inc.php-dist.bak
 
 do-install:
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile
index fbbb26871a12..af8a90bd1393 100644
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@@ -22,7 +22,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	graphite-project
 
 post-stage:
-	${RM} -rf ${STAGEDIR}${PREFIX}/examples/init.d
+	${RM} -r ${STAGEDIR}${PREFIX}/examples/init.d
 	${RMDIR} ${STAGEDIR}${PREFIX}/examples
 
 .include <bsd.port.mk>
diff --git a/databases/py-pymssql/Makefile b/databases/py-pymssql/Makefile
index 04691c2a0bbc..9f3c0091d4bb 100644
--- a/databases/py-pymssql/Makefile
+++ b/databases/py-pymssql/Makefile
@@ -20,7 +20,7 @@ USES=		python
 USE_PYTHON=	autoplist distutils
 
 post-extract:
-	@${RM} -f ${WRKSRC}/_mssql.c
+	@${RM} ${WRKSRC}/_mssql.c
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_mssql.so \
diff --git a/databases/riak/Makefile b/databases/riak/Makefile
index 61cab647f488..c39153af2edb 100644
--- a/databases/riak/Makefile
+++ b/databases/riak/Makefile
@@ -52,7 +52,7 @@ post-patch:
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/rel/vars.config
 
 pre-install:
-	${RM} -f ${PLIST}
+	${RM} ${PLIST}
 	${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
 	(cd ${WRKSRC}/rel/${PORTNAME}; ${FIND} releases -type f \
 		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
diff --git a/databases/ruby-cdb/Makefile b/databases/ruby-cdb/Makefile
index 0bcd0418e36b..9e6cb4893e16 100644
--- a/databases/ruby-cdb/Makefile
+++ b/databases/ruby-cdb/Makefile
@@ -33,7 +33,7 @@ post-patch:
 		${WRKSRC}/cdb.c
 
 post-extract:
-	${RM} -f ${WRKSRC}/cdb
+	${RM} ${WRKSRC}/cdb
 	${LN} -s `cd ${CDB_PORTDIR}; ${MAKE} -V WRKSRC` ${WRKSRC}/cdb
 
 post-install:
diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile
index 9e292debf103..fe0aaa14aa6c 100644
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@@ -31,7 +31,7 @@ DESKTOP_ENTRIES="Squirrel-SQL Client" \
 		false
 
 post-extract:
-	cd "${WRKSRC}" && ${RM} -rf Uninstaller *.bat *.sh .installationinformation
+	cd "${WRKSRC}" && ${RM} -r Uninstaller *.bat *.sh .installationinformation
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/deskutils/charmtimetracker/Makefile b/deskutils/charmtimetracker/Makefile
index 42f30ff60534..ca0ebbb36fcc 100644
--- a/deskutils/charmtimetracker/Makefile
+++ b/deskutils/charmtimetracker/Makefile
@@ -27,6 +27,6 @@ PORTDOCS=	ReadMe.txt
 OPTIONS_DEFINE=	DOCS
 
 post-install:
-	${RM} -f ${STAGEDIR}${DOCSDIR}/License.txt
+	${RM} ${STAGEDIR}${DOCSDIR}/License.txt
 
 .include <bsd.port.mk>
diff --git a/deskutils/conkyemail/Makefile b/deskutils/conkyemail/Makefile
index 21278e8aa008..683e5d2f6cc9 100644
--- a/deskutils/conkyemail/Makefile
+++ b/deskutils/conkyemail/Makefile
@@ -23,6 +23,6 @@ WRKSRC=		${WRKDIR}/src
 post-patch:
 	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/share/${PORTNAME},${DATADIR},g' \
 		conkyEmail  conkyEmail.py setup.py example/conkyrc
-	cd ${WRKSRC} && ${RM} -fr example/conkyrc.bak
+	cd ${WRKSRC} && ${RM} -r example/conkyrc.bak
 
 .include <bsd.port.mk>
diff --git a/deskutils/conkyforecast/Makefile b/deskutils/conkyforecast/Makefile
index 4ac063ba2d35..2deb5d8a862a 100644
--- a/deskutils/conkyforecast/Makefile
+++ b/deskutils/conkyforecast/Makefile
@@ -39,7 +39,7 @@ post-patch:
 	@cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/bin/python,/usr/bin/env,g' \
 		conkyForecast \
 		conkyForecast-SunsetSunriseCountdown
-	@cd ${WRKSRC} && ${RM} -fr test/*.bak example/*.bak
+	@cd ${WRKSRC} && ${RM} -r test/*.bak example/*.bak
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
diff --git a/deskutils/docear/Makefile b/deskutils/docear/Makefile
index 2bf0e0974ca7..d64eae949521 100644
--- a/deskutils/docear/Makefile
+++ b/deskutils/docear/Makefile
@@ -29,7 +29,7 @@ WRKSRC=		${WRKDIR}/docear-1.2.0.0_stable_build291
 SUB_FILES=	docear.desktop
 
 do-install:
-	@${RM} -f ${WRKSRC}/docear.bat ${WRKSRC}/docear.exe ${WRKSRC}/*.bak
+	@${RM} ${WRKSRC}/docear.bat ${WRKSRC}/docear.exe ${WRKSRC}/*.bak
 # We can't install into $DOCSDIR or support disabling a DOCS option
 # since the documentation is an integral part of the installation,
 # such as online help via the program menus.
diff --git a/deskutils/gnome-shell-extension-backslide/Makefile b/deskutils/gnome-shell-extension-backslide/Makefile
index 90c95a773841..a76fdce492e4 100644
--- a/deskutils/gnome-shell-extension-backslide/Makefile
+++ b/deskutils/gnome-shell-extension-backslide/Makefile
@@ -42,7 +42,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/
 	@(cd ${WRKSRC} && ${CP} backslide\@codeisland.org/schemas/org.gnome.shell.extensions.backslide.gschema.xml \
 		${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/)
-	@${RM} -fr ${WRKSRC}/backslide\@codeisland.org/schemas
+	@${RM} -r ${WRKSRC}/backslide\@codeisland.org/schemas
 	@(cd ${WRKSRC} && ${CP} -pPR backslide\@codeisland.org \
 		${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/)
 
diff --git a/deskutils/gnome-shell-extension-coverflow/Makefile b/deskutils/gnome-shell-extension-coverflow/Makefile
index 0f189855d806..d6ee9a505bf0 100644
--- a/deskutils/gnome-shell-extension-coverflow/Makefile
+++ b/deskutils/gnome-shell-extension-coverflow/Makefile
@@ -34,7 +34,7 @@ do-install:
 		@${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/
 		@(cd ${WRKSRC} && ${CP} CoverflowAltTab\@dmo60.de/schemas/org.gnome.shell.extensions.coverflowalttab.gschema.xml \
 			${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/)
-		@${RM} -fr ${WRKSRC}/CoverflowAltTab\@dmo60.de/schemas
+		@${RM} -r ${WRKSRC}/CoverflowAltTab\@dmo60.de/schemas
 		@(cd ${WRKSRC} && ${CP} -pPR CoverflowAltTab\@dmo60.de ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/)
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-shell-extension-hidetopbar/Makefile b/deskutils/gnome-shell-extension-hidetopbar/Makefile
index e3ee244c2032..3076273a1011 100644
--- a/deskutils/gnome-shell-extension-hidetopbar/Makefile
+++ b/deskutils/gnome-shell-extension-hidetopbar/Makefile
@@ -34,7 +34,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca
 	${INSTALL_DATA} ${WRKSRC}/org.gnome.shell.extensions.hidetopbar.gschema.xml \
 		${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
-	@${RM} -fr ${WRKSRC}/org.gnome.shell.extensions.hidetopbar.gschema.xml
+	@${RM} -r ${WRKSRC}/org.gnome.shell.extensions.hidetopbar.gschema.xml
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/hidetopbar@mathieu.bidon.ca/
 
diff --git a/deskutils/gnome-shell-extension-lockkeys/Makefile b/deskutils/gnome-shell-extension-lockkeys/Makefile
index 5d305d4d68cb..4fa82e4a658a 100644
--- a/deskutils/gnome-shell-extension-lockkeys/Makefile
+++ b/deskutils/gnome-shell-extension-lockkeys/Makefile
@@ -33,7 +33,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/
 	${INSTALL_DATA} ${WRKSRC}/lockkeys\@vaina.lt/schemas/org.gnome.shell.extensions.lockkeys.gschema.xml \
 		${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
-	@${RM} -fr ${WRKSRC}/lockkeys\@vaina.lt/schemas/
+	@${RM} -r ${WRKSRC}/lockkeys\@vaina.lt/schemas/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} lockkeys\@vaina.lt \
 		${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/
 
diff --git a/deskutils/gnome-shell-extension-overlay-icons/Makefile b/deskutils/gnome-shell-extension-overlay-icons/Makefile
index b21a04a9a53e..e572d9f1f944 100644
--- a/deskutils/gnome-shell-extension-overlay-icons/Makefile
+++ b/deskutils/gnome-shell-extension-overlay-icons/Makefile
@@ -34,7 +34,7 @@ do-install:
 		@${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/
 		cd ${WRKSRC} && ${INSTALL_DATA} ${WRKSRC}/windowoverlay-icons/schemas/org.gnome.shell.extensions.windowoverlay-icons.gschema.xml \
 			${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
-		@${RM} -fr ${WRKSRC}/windowoverlay-icons/schemas/
+		@${RM} -r ${WRKSRC}/windowoverlay-icons/schemas/
 		cd ${WRKSRC}/windowoverlay-icons && ${COPYTREE_SHARE} . \
 			${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/windowoverlay-icons@sustmidown.centrum.cz
 
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile
index d17d0910b631..912708e26f5e 100644
--- a/deskutils/gworkspace/Makefile
+++ b/deskutils/gworkspace/Makefile
@@ -27,6 +27,6 @@ USES+=		ghostscript
 .endif
 
 pre-configure:
-	${RM} -rf ${WRKSRC}/GWMetadata
+	${RM} -r ${WRKSRC}/GWMetadata
 
 .include <bsd.port.mk>
diff --git a/deskutils/myitcrm/Makefile b/deskutils/myitcrm/Makefile
index 93d36846cd88..ad12041acbb7 100644
--- a/deskutils/myitcrm/Makefile
+++ b/deskutils/myitcrm/Makefile
@@ -52,7 +52,7 @@ trace-distfile: distclean
 	@cd ${.CURDIR} && make FETCH_ARGS=-vFpr makesum
 
 rm-install:
-	${SU_CMD} '${RM} -rf ${WWWDIR}/install'
+	${SU_CMD} '${RM} -r ${WWWDIR}/install'
 
 .endif
 
diff --git a/deskutils/plans/Makefile b/deskutils/plans/Makefile
index f3f2d6348eea..2687a9e6df6d 100644
--- a/deskutils/plans/Makefile
+++ b/deskutils/plans/Makefile
@@ -47,7 +47,7 @@ SUB_FILES=	pkg-message
 post-extract:
 	@${CP} ${_DISTDIR}/powerani.gif ${WRKSRC}/theme/graphics/freebsd.gif
 	@${CP} ${_DISTDIR}/*.pl ${WRKSRC}/
-	@${RM} -rf ${WRKSRC}/theme/us_english.pl
+	@${RM} -r ${WRKSRC}/theme/us_english.pl
 	@for i in ${WRKSRC}/data/*xml ${WRKSRC}/*config.pl;\
 		do ${MV} $$i $$i.sample; done
 	@${SED} -e 's/iso-8859-1/utf-8/' ${WRKSRC}/us_english.pl >\
@@ -55,7 +55,7 @@ post-extract:
 	@${TOUCH} ${WRKSRC}/theme/ical/.keep_me
 
 post-patch:
-	@${RM} -f ${WRKSRC}/theme/plans.template.orig
+	@${RM} ${WRKSRC}/theme/plans.template.orig
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/devel/arduino/Makefile b/devel/arduino/Makefile
index 9141883af1de..f84116a52305 100644
--- a/devel/arduino/Makefile
+++ b/devel/arduino/Makefile
@@ -82,7 +82,7 @@ pre-patch:
 .endif
 
 post-patch:
-	@${RM} -rf ${WRKSRC}/hardware/tools/
+	@${RM} -r ${WRKSRC}/hardware/tools/
 	@${MKDIR} ${WRKSRC}/hardware/tools/avr/
 	@${LN} -s ${PREFIX}/bin ${WRKSRC}/hardware/tools/avr/bin
 	@${LN} -s ${PREFIX}/etc ${WRKSRC}/hardware/tools/avr/etc
@@ -91,7 +91,7 @@ post-patch:
 	@${LN} -s ${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar ${WRKSRC}/lib/RXTXcomm.jar
 
 	@${MV} ${WRKSRC}/reference/img/logo.png ${WRKSRC}/
-	@${RM} -rf ${WRKSRC}/reference/img/
+	@${RM} -r ${WRKSRC}/reference/img/
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
diff --git a/devel/arm-elf-binutils/Makefile b/devel/arm-elf-binutils/Makefile
index 9879e19ffb92..fdede1ca79f9 100644
--- a/devel/arm-elf-binutils/Makefile
+++ b/devel/arm-elf-binutils/Makefile
@@ -23,7 +23,7 @@ post-install:
 .endfor
 	cd ${WRKSRC}/libiberty ; ${CP} libiberty.a \
 		${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}/lib
-	${RM} -f ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info/*
+	${RM} ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info/*
 	${RMDIR} ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
 
 .include <bsd.port.mk>
diff --git a/devel/arm-none-eabi-gdb/Makefile b/devel/arm-none-eabi-gdb/Makefile
index 0b3ed13b68c9..0a54fa5d7d7a 100644
--- a/devel/arm-none-eabi-gdb/Makefile
+++ b/devel/arm-none-eabi-gdb/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS=	--target=arm-none-eabi --program-prefix=arm-none-eabi- --disable
 		--disable-werror
 
 pre-configure:
-	cd ${WRKSRC} ; ${RM} -rf dejagnu expect tcl texinfo
+	cd ${WRKSRC} ; ${RM} -r dejagnu expect tcl texinfo
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb \
diff --git a/devel/atf/Makefile b/devel/atf/Makefile
index d1031c688dce..c53dad3e4ec3 100644
--- a/devel/atf/Makefile
+++ b/devel/atf/Makefile
@@ -33,7 +33,7 @@ PLIST_SUB+=	TEST=
 
 post-install:
 .if empty(PORT_OPTIONS:MTEST)
-	@${RM} -rf ${STAGEDIR}${PREFIX}/tests
+	@${RM} -r ${STAGEDIR}${PREFIX}/tests
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index da2b8dde268b..391a788c823b 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -36,7 +36,7 @@ post-patch:
 			${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2-${BUILD_VERSION},g ; \
 						s,(config\.guess|config\.sub|ifnames),\1-${BUILD_VERSION},g' $$file ; \
 		done)
-	@(cd ${WRKSRC}/doc && ${RM} -f *.info)
+	@(cd ${WRKSRC}/doc && ${RM} *.info)
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|@PACKAGE@$$|@PACKAGE@-@VERSION@|'
 
diff --git a/devel/avr-gdb/Makefile b/devel/avr-gdb/Makefile
index bf78d1a2b113..b29293702872 100644
--- a/devel/avr-gdb/Makefile
+++ b/devel/avr-gdb/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS=	--target=avr --program-prefix=avr --disable-nls \
 		--disable-werror
 
 pre-configure:
-	cd ${WRKSRC} ; ${RM} -rf dejagnu expect tcl texinfo
+	cd ${WRKSRC} ; ${RM} -r dejagnu expect tcl texinfo
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb \
diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index 80df5b9d4956..e7f701ec3f7e 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -63,7 +63,7 @@ post-patch:
 .endif
 
 do-install:
-		${RM} -f ${TMPPLIST}
+		${RM} ${TMPPLIST}
 .if ${PORT_OPTIONS:MDOXYGEN}
 		(cd ${BUILD_WRKSRC}/doc/api/avr-libc-user-manual && \
 		 ${FIND} . -type f \
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 4c7dbeaf71af..42fb76b698a4 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -101,18 +101,18 @@ post-install:
 	${REINPLACE_CMD} '/#include "ansidecl.h"/d' ${STAGEDIR}${PREFIX}/include/bfd.h
 .else
 .if ${PKGNAMEPREFIX:S/-$//} != ${BUTARGET}
-	${RM} -rf ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}
+	${RM} -r ${STAGEDIR}${PREFIX}/${PKGNAMEPREFIX:S/-$//}
 .endif
 	@if [ -d ${STAGEDIR}${PREFIX}/${INFO_PATH} ] ; then rm -rf ${STAGEDIR}${PREFIX}/${INFO_PATH}; fi
 	${LN} -fs ../../bin/${BUTARGET}-size ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/size
 .endif
 .for tool in ${BUREMOVE}
-	@${RM} -f ${STAGEDIR}${PREFIX}/bin/${BUTARGET}-${tool} \
+	@${RM} ${STAGEDIR}${PREFIX}/bin/${BUTARGET}-${tool} \
 	    ${STAGEDIR}${PREFIX}/man/man1/${BUTARGET}-${tool}.1 \
 	    ${STAGEDIR}${PREFIX}/${BUTARGET}/bin/${tool}
 .endfor
 .if defined(BUREMOVE) && ${BUREMOVE:Mld}
-	@${RM} -rf ${STAGEDIR}${PREFIX}/${BUTARGET}/lib/ldscripts
+	@${RM} -r ${STAGEDIR}${PREFIX}/${BUTARGET}/lib/ldscripts
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index dfb8dea0579c..1ce275becc19 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -30,7 +30,7 @@ NLS_CONFIGURE_ENABLE=	nls
 OPTIONS_SUB=	yes
 
 post-extract:
-	@${RM} -f ${WRKSRC}/doc/bison.info*
+	@${RM} ${WRKSRC}/doc/bison.info*
 	@${REINPLACE_CMD} 's/MANS = yacc.1/MANS =/' ${WRKSRC}/doc/Makefile.in
 
 PORTEXAMPLES=	calc++
diff --git a/devel/boost_build/Makefile b/devel/boost_build/Makefile
index 3dd58ec08ff1..304441c83662 100644
--- a/devel/boost_build/Makefile
+++ b/devel/boost_build/Makefile
@@ -38,7 +38,7 @@ do-install:
 		${STAGEDIR}${DATADIR})
 	${INSTALL_MAN} ${WRKSRC}/boost.png \
 		${STAGEDIR}${PREFIX}/share/doc/boost.png
-	(cd ${WRKSRC}/doc && ${RM} -rf Jamfile.v2 project-root.jam \
+	(cd ${WRKSRC}/doc && ${RM} -r Jamfile.v2 project-root.jam \
 		html/userman_HTML.manifest src)
 
 do-install-DOCS-on:
diff --git a/devel/cil/Makefile b/devel/cil/Makefile
index f98873e5fe44..e20f321b05ee 100644
--- a/devel/cil/Makefile
+++ b/devel/cil/Makefile
@@ -85,7 +85,7 @@ do-install:
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${RM} -rf ${WRKSRC}/doc/cilcode.tmp
+	@${RM} -r ${WRKSRC}/doc/cilcode.tmp
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/cook/Makefile b/devel/cook/Makefile
index 8bff3e467586..32c00e91829f 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -28,6 +28,6 @@ pre-install:
 # cook installs extra copies of the manpages in a directory that MANLANG can't
 # cope with.  Delete the extra copies.
 post-install:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/share/cook/en/man1
+	@${RM} -r ${STAGEDIR}${PREFIX}/share/cook/en/man1
 
 .include <bsd.port.mk>
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index 304ba6f7bb7e..7b9428a3251f 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -42,8 +42,8 @@ LIBXMDIR=	${LOCALBASE}
 .endif
 
 pre-patch:
-	@${RM} -fv ${WRKSRC}/ddd/ddd.info*
-	@${RM} -fv ${WRKSRC}/ddd/ddd-themes.info*
+	@${RM}v ${WRKSRC}/ddd/ddd.info*
+	@${RM}v ${WRKSRC}/ddd/ddd-themes.info*
 
 pre-configure:
 	@${FIND} ${WRKSRC} -name configure | ${XARGS} \
diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index 3083b226534f..4157d16de522 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -158,7 +158,7 @@ pre-patch:
 		${WRKSRC}/Makefile.am
 
 post-stage:
-	${RM} -rf ${STAGEDIR}${PREFIX}/share/gdb
+	${RM} -r ${STAGEDIR}${PREFIX}/share/gdb
 	for i in `${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f`; do \
 	    if ${FILE} $$i | ${GREP} -q "not stripped"; then ${STRIP_CMD} $$i; fi; \
 	done
diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index 801d68593913..1cd60f74a390 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -31,7 +31,7 @@ post-patch:
 	${REINPLACE_CMD} -e "s/-lstdc++//g" ${WRKSRC}/libfam/Makefile.am
 
 pre-configure:
-	${RM} -fr ${WRKSRC}/util
+	${RM} -r ${WRKSRC}/util
 	${MV} ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.am.orig
 	${SED} -e s/util// -e /SUBDIRS/q \
 		<${WRKSRC}/Makefile.am.orig >${WRKSRC}/Makefile.am
diff --git a/devel/gcc-arm-embedded/Makefile b/devel/gcc-arm-embedded/Makefile
index 5ab8fad031fb..5c94e104edda 100644
--- a/devel/gcc-arm-embedded/Makefile
+++ b/devel/gcc-arm-embedded/Makefile
@@ -115,12 +115,12 @@ post-extract:
 	@${TAR} -xf ${SRC_DIR}/newlib.tar.bz2 -C ${SRC_DIR}
 
 do-configure:
-	@${RM} -rf ${BUILD_DIR}
+	@${RM} -r ${BUILD_DIR}
 	@${MKDIR} ${BUILD_DIR}
-	@${RM} -rf ${INTERIM_PREFIX}
+	@${RM} -r ${INTERIM_PREFIX}
 	@${MKDIR} ${INTERIM_PREFIX}
 	@${CP} ${FILESDIR}/Makefile ${WRKDIR}
-	@${RM} -f ${WRKDIR}/Makefile.inc
+	@${RM} ${WRKDIR}/Makefile.inc
 .for VAR in ${VAR_TO_SUBMAKE}
 	@${ECHO} '${VAR}=${${VAR}}' >> ${WRKDIR}/Makefile.inc
 .endfor
diff --git a/devel/gcc-msp430-ti-toolchain/Makefile b/devel/gcc-msp430-ti-toolchain/Makefile
index 69dfa13e3b38..e7bc7d8a9403 100644
--- a/devel/gcc-msp430-ti-toolchain/Makefile
+++ b/devel/gcc-msp430-ti-toolchain/Makefile
@@ -110,11 +110,11 @@ pre-extract:
 
 # Till we don't have Insight, we don't need to build tcl anyway
 post-patch:
-	@${RM} -rf ${WRKSRC}/tcl ${WRKSRC}/tk ${WRKSRC}/itcl \
+	@${RM} -r ${WRKSRC}/tcl ${WRKSRC}/tk ${WRKSRC}/itcl \
 		${WRKSRC}/libgui
 
 post-patch-PURE-off:
-	@${RM} -rf ${WRKSRC}/gmp ${WRKSRC}/mpfr ${WRKSRC}/mpc
+	@${RM} -r ${WRKSRC}/gmp ${WRKSRC}/mpfr ${WRKSRC}/mpc
 
 post-stage:
 	@${ECHO_MSG} "Remove unneeded host files..."
@@ -122,7 +122,7 @@ post-stage:
 		${RM} "${STAGEDIR}${GNU_CONFIGURE_PREFIX}/$$f" ; \
 	done
 	@for f in ${UNNEEDED_HOST_DIRS} ; do \
-		${RM} -rf "${STAGEDIR}${GNU_CONFIGURE_PREFIX}/$$f" ; \
+		${RM} -r "${STAGEDIR}${GNU_CONFIGURE_PREFIX}/$$f" ; \
 	done
 	@${ECHO_MSG} "Install devices' headers and linker scripts..."
 	@${MKDIR} ${STAGEDIR}${GNU_CONFIGURE_PREFIX}/include
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 330e87104dba..5ee6c4c16bec 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -183,7 +183,7 @@ post-install:
 	# recreate it after. This is necessary because the distfile is
 	# extracted with --no-same-owner. If the distfile is extracted as a
 	# non-root user then the symlink will have the incorrect owner.
-	${RM} -f ${WRKDIR}/htmldocs/index.html
+	${RM} ${WRKDIR}/htmldocs/index.html
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKDIR}/htmldocs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${LN} -s git.html ${STAGEDIR}${DOCSDIR}/index.html
diff --git a/devel/glademm/Makefile b/devel/glademm/Makefile
index 0cd160618285..b801cd25e888 100644
--- a/devel/glademm/Makefile
+++ b/devel/glademm/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES=	bin/glade-- bin/glademm-embed
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${RM} -f ${WRKSRC}/src/getopt.*
+	@${RM} ${WRKSRC}/src/getopt.*
 	@${REINPLACE_CMD} \
 		-Ee '/^@AMDEP/!s|getopt([^[:space:]])+||g' \
 		-Ee '/^@AMDEP(.)+getopt/d' \
diff --git a/devel/gps/Makefile b/devel/gps/Makefile
index 4f619cccaf9c..e87dcbca2491 100644
--- a/devel/gps/Makefile
+++ b/devel/gps/Makefile
@@ -109,7 +109,7 @@ do-build:
 	${PYTHON_CMD} ${PYCOMPILE} ${WRKSRC}/share/support
 
 post-install:
-	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gps/html/*/_sources
+	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/gps/html/*/_sources
 	${INSTALL_SCRIPT} ${WRKDIR}/gps ${STAGEDIR}${PREFIX}/bin
 	echo "This is the GPS GPL Edition for the ${OPSYS} Ports Collection." \
 		> ${STAGEDIR}${PREFIX}/share/gps/about.txt
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index d4ba52d89ed3..90ad653eebe5 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -94,6 +94,6 @@ PLIST_SUB+=	HAL="@comment "
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/remote-volume-monitors
-	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/systemd
+	@${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
 
 .include <bsd.port.mk>
diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index 93065f0f59a0..0dc39df6cb57 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -59,7 +59,7 @@ post-patch:
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${KBUILD_ENV} ./kBuild/env.sh --full ${MAKE_CMD} -f bootstrap.gmk
-	cd ${WRKSRC} && ${RM} -rf out
+	cd ${WRKSRC} && ${RM} -r out
 	cd ${WRKSRC} && ./kBuild/env.sh kmk
 	cd ${WRKSRC} && ./kBuild/env.sh kmk NIX_INSTALL_DIR=${PREFIX} BUILD_TYPE=release -C ${WRKSRC}
 
diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index adfecab25180..ecfc5b1d9618 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -53,7 +53,7 @@ post-install:
 	@${RMDIR} ${STAGEDIR}${DATADIR}/examples
 .endif
 .if ! ${PORT_OPTIONS:MDOCS} && ! ${PORT_OPTIONS:MEXAMPLES}
-	@${RM} -rf ${STAGEDIR}${DATADIR}/*
+	@${RM} -r ${STAGEDIR}${DATADIR}/*
 .endif
 	@${TEST} -d ${STAGEDIR}${DATADIR} && \
 		${RMDIR} ${STAGEDIR}${DATADIR} || ${TRUE}
diff --git a/devel/liborcus07/Makefile b/devel/liborcus07/Makefile
index 74a7de364c39..b0e7fc096df5 100644
--- a/devel/liborcus07/Makefile
+++ b/devel/liborcus07/Makefile
@@ -30,6 +30,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-stage:
-	@${RM} -f ${STAGEDIR}${PREFIX}/bin/*
+	@${RM} ${STAGEDIR}${PREFIX}/bin/*
 
 .include <bsd.port.mk>
diff --git a/devel/libsearpc/Makefile b/devel/libsearpc/Makefile
index d56d91e3a89c..48c2b6356251 100644
--- a/devel/libsearpc/Makefile
+++ b/devel/libsearpc/Makefile
@@ -41,6 +41,6 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${SEALIB}
 	(cd ${STAGEDIR}${PREFIX}/lib && \
 		${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
-	${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
+	${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index 2b2d159d50cd..48e58c64532e 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -22,7 +22,7 @@ USES+=		makeinfo
 INFO=		libtool
 
 post-patch:
-	@${RM} -f ${WRKSRC}/doc/*.info*
+	@${RM} ${WRKSRC}/doc/*.info*
 	@${TOUCH} ${WRKSRC}/doc/libtool.1
 
 .include <bsd.port.mk>
diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index 7080c01b11f5..12e16d45a384 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -213,7 +213,7 @@ regression-test: ${BUILD_COOKIE}
 	fi
 
 build-plist:
-	${RM} -f ${PLIST} ${PLIST}.tmp
+	${RM} ${PLIST} ${PLIST}.tmp
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${COMMAND_PREFIX}${command}%%COMMAND_SUFFIX%% >> ${PLIST}.tmp
 .endfor
@@ -234,7 +234,7 @@ build-plist:
 	    -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' | \
 	    ${SORT} >> ${PLIST}.tmp
 	awk '{if ($$0 ~ /clang/ && $$0 !~ /omp.h/) {printf "%%%%CLANG%%%%"} if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} print}' ${PLIST}.tmp >> ${PLIST}
-	${RM} -f ${PLIST}.tmp
+	${RM} ${PLIST}.tmp
 
 check-commands:
 .for command in ${COMMANDS}
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 4e8a8e204a4b..dd9cdfd22fbe 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -364,7 +364,7 @@ regression-test: ${BUILD_COOKIE}
 	fi
 
 build-plist:
-	${RM} -f ${PLIST} ${PLIST}.tmp
+	${RM} ${PLIST} ${PLIST}.tmp
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}${LLVM_SUFFIX} >> ${PLIST}.tmp
 .endfor
diff --git a/devel/llvm33/Makefile b/devel/llvm33/Makefile
index 7be33630737d..db46240bd8b0 100644
--- a/devel/llvm33/Makefile
+++ b/devel/llvm33/Makefile
@@ -241,7 +241,7 @@ regression-test: ${BUILD_COOKIE}
 	fi
 
 build-plist:
-	${RM} -f ${PLIST}
+	${RM} ${PLIST}
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}${LLVM_SUFFIX} >> ${PLIST}
 .endfor
diff --git a/devel/llvm34/Makefile b/devel/llvm34/Makefile
index f16417456a2d..b107dc03f0b1 100644
--- a/devel/llvm34/Makefile
+++ b/devel/llvm34/Makefile
@@ -246,7 +246,7 @@ regression-test: ${BUILD_COOKIE}
 	fi
 
 build-plist:
-	${RM} -f ${PLIST}
+	${RM} ${PLIST}
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}
 .endfor
diff --git a/devel/llvm35/Makefile b/devel/llvm35/Makefile
index 0f300fff9500..2f8f8898bd84 100644
--- a/devel/llvm35/Makefile
+++ b/devel/llvm35/Makefile
@@ -244,7 +244,7 @@ regression-test: ${BUILD_COOKIE}
 	fi
 
 build-plist:
-	${RM} -f ${PLIST}
+	${RM} ${PLIST}
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}
 .endfor
diff --git a/devel/llvm36/Makefile b/devel/llvm36/Makefile
index eefe16f2185a..63ca2d268534 100644
--- a/devel/llvm36/Makefile
+++ b/devel/llvm36/Makefile
@@ -250,7 +250,7 @@ regression-test: ${BUILD_COOKIE}
 	fi
 
 build-plist:
-	${RM} -f ${PLIST}
+	${RM} ${PLIST}
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}
 .endfor
diff --git a/devel/llvm37/Makefile b/devel/llvm37/Makefile
index 17b980bd0fe0..b6663502fd71 100644
--- a/devel/llvm37/Makefile
+++ b/devel/llvm37/Makefile
@@ -368,7 +368,7 @@ regression-test: ${BUILD_COOKIE}
 	fi
 
 build-plist:
-	${RM} -f ${PLIST} ${PLIST}.tmp
+	${RM} ${PLIST} ${PLIST}.tmp
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}${LLVM_SUFFIX} >> ${PLIST}.tmp
 .endfor
@@ -395,7 +395,7 @@ build-plist:
 	    if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} \
 	    if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \
 	    if ($$0 !~ /libclang_rt/) {print}}' ${PLIST}.tmp >> ${PLIST}
-	${RM} -f ${PLIST}.tmp
+	${RM} ${PLIST}.tmp
 
 check-commands:
 .for command in ${COMMANDS}
diff --git a/devel/llvm38/Makefile b/devel/llvm38/Makefile
index ce815c32556a..9281e7402732 100644
--- a/devel/llvm38/Makefile
+++ b/devel/llvm38/Makefile
@@ -393,7 +393,7 @@ regression-test: ${BUILD_COOKIE}
 	fi
 
 build-plist:
-	${RM} -f ${PLIST} ${PLIST}.tmp
+	${RM} ${PLIST} ${PLIST}.tmp
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}${LLVM_SUFFIX} >> ${PLIST}.tmp
 .endfor
@@ -421,7 +421,7 @@ build-plist:
 	    if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} \
 	    if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \
 	    if ($$0 !~ /libclang_rt/) {print}}' ${PLIST}.tmp >> ${PLIST}
-	${RM} -f ${PLIST}.tmp
+	${RM} ${PLIST}.tmp
 
 
 check-commands:
diff --git a/devel/llvm39/Makefile b/devel/llvm39/Makefile
index 60727d0c0e58..f39020a72247 100644
--- a/devel/llvm39/Makefile
+++ b/devel/llvm39/Makefile
@@ -398,7 +398,7 @@ regression-test: ${BUILD_COOKIE}
 	fi
 
 build-plist:
-	${RM} -f ${PLIST} ${PLIST}.tmp
+	${RM} ${PLIST} ${PLIST}.tmp
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}${LLVM_SUFFIX} >> ${PLIST}.tmp
 .endfor
diff --git a/devel/lutok/Makefile b/devel/lutok/Makefile
index 6fcbe64b0a99..391ae5befc77 100644
--- a/devel/lutok/Makefile
+++ b/devel/lutok/Makefile
@@ -53,7 +53,7 @@ PLIST_SUB+=	TESTS="@comment "
 
 .if ! ${PORT_OPTIONS:MDOCS}
 pre-install: .SILENT
-	${RM} -rf ${WRKSRC}/api-docs
+	${RM} -r ${WRKSRC}/api-docs
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/maven3/Makefile b/devel/maven3/Makefile
index 330ddeefcd53..78d8043c6630 100644
--- a/devel/maven3/Makefile
+++ b/devel/maven3/Makefile
@@ -29,7 +29,7 @@ INSTANCE_FILE=	030005-${PORTNAME}-${PORTVERSION}
 INSTANCES_DIR=	etc/maven-wrapper/instances.d/
 
 post-extract:
-	${RM} -f ${WRKSRC}/bin/*.bat
+	${RM} ${WRKSRC}/bin/*.bat
 	${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE}
 
 do-install:
diff --git a/devel/maven31/Makefile b/devel/maven31/Makefile
index a927dcb3571c..c6765da4982d 100644
--- a/devel/maven31/Makefile
+++ b/devel/maven31/Makefile
@@ -30,7 +30,7 @@ INSTANCE_FILE=	030101-${PORTNAME}-${PORTVERSION}
 INSTANCES_DIR=	etc/maven-wrapper/instances.d/
 
 post-extract:
-	${RM} -f ${WRKSRC}/bin/*.bat
+	${RM} ${WRKSRC}/bin/*.bat
 	${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE}
 
 do-install:
diff --git a/devel/maven33/Makefile b/devel/maven33/Makefile
index f874d87ae631..92e45f1fe849 100644
--- a/devel/maven33/Makefile
+++ b/devel/maven33/Makefile
@@ -28,7 +28,7 @@ INSTANCE_FILE=	030303-${PORTNAME}-${PORTVERSION}
 INSTANCES_DIR=	etc/maven-wrapper/instances.d/
 
 post-extract:
-	${RM} -f ${WRKSRC}/bin/*.bat
+	${RM} ${WRKSRC}/bin/*.bat
 	${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE}
 
 do-install:
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index 83fcf7fc7e4d..a2ebea0fbfe2 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -86,7 +86,7 @@ post-patch:
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
-	@${RM} -f ${SRCDIR}/gcc/*/*.info*
+	@${RM} ${SRCDIR}/gcc/*/*.info*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-install:
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index ce8ca04746d5..f2064d387e43 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -37,7 +37,7 @@ NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
 post-extract:
-	@${RM} -f ${WRKSRC}/monotone.info*
+	@${RM} ${WRKSRC}/monotone.info*
 
 post-patch:
 	@${REINPLACE_CMD} \
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 8bac3bad8f53..0a27e1528435 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -125,7 +125,7 @@ post-install:
 . endfor
 .endfor
 
-	${RM} -f ${STAGEDIR}${PREFIX}/lib/libncurses.so \
+	${RM} ${STAGEDIR}${PREFIX}/lib/libncurses.so \
 		${STAGEDIR}${PREFIX}/lib/libncursesw.so
 	${ECHO} "INPUT(libncurses.so.${PORTVERSION:R} AS_NEEDED(-ltinfo))" > ${STAGEDIR}${PREFIX}/lib/libncurses.so
 	${ECHO} "INPUT(libncursesw.so.${PORTVERSION:R} AS_NEEDED(-ltinfow))" > ${STAGEDIR}${PREFIX}/lib/libncursesw.so
diff --git a/devel/p5-MooseX-Async/Makefile b/devel/p5-MooseX-Async/Makefile
index 39c205f8d960..630c6df339ab 100644
--- a/devel/p5-MooseX-Async/Makefile
+++ b/devel/p5-MooseX-Async/Makefile
@@ -19,6 +19,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-extract:
-	@${RM} -f ${WRKSRC}/lib/MooseX/._Async.pm
+	@${RM} ${WRKSRC}/lib/MooseX/._Async.pm
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Parse-Pidl/Makefile b/devel/p5-Parse-Pidl/Makefile
index 4aa9699f6df1..8260e05f5cad 100644
--- a/devel/p5-Parse-Pidl/Makefile
+++ b/devel/p5-Parse-Pidl/Makefile
@@ -29,6 +29,6 @@ PATCH_WRKSRC=		${WRKDIR}/${DISTNAME}
 WRKSRC=			${WRKDIR}/${DISTNAME}/pidl
 
 post-extract:
-			@${RM} -rf ${WRKSRC}/lib/Parse/Yapp ${WRKSRC}/lib/wscript_build
+			@${RM} -r ${WRKSRC}/lib/Parse/Yapp ${WRKSRC}/lib/wscript_build
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/p5-PerlIO-via-symlink/Makefile b/devel/p5-PerlIO-via-symlink/Makefile
index a9451e8e27db..bd838c797f85 100644
--- a/devel/p5-PerlIO-via-symlink/Makefile
+++ b/devel/p5-PerlIO-via-symlink/Makefile
@@ -21,6 +21,6 @@ USE_PERL5=	configure
 
 post-patch:
 	# Really old M::I code
-	${RM} -rf ${WRKSRC}/inc
+	${RM} -r ${WRKSRC}/inc
 
 .include <bsd.port.mk>
diff --git a/devel/p5-System2/Makefile b/devel/p5-System2/Makefile
index 4dbeb6a84c64..8b930f28a2ba 100644
--- a/devel/p5-System2/Makefile
+++ b/devel/p5-System2/Makefile
@@ -15,6 +15,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 pre-configure:
-	${RM} -f ${WRKSRC}/io_test.pl
+	${RM} ${WRKSRC}/io_test.pl
 
 .include <bsd.port.mk>
diff --git a/devel/p5-VCP-Source-cvsbk/Makefile b/devel/p5-VCP-Source-cvsbk/Makefile
index 6269f83088e3..9d49bb2b04fa 100644
--- a/devel/p5-VCP-Source-cvsbk/Makefile
+++ b/devel/p5-VCP-Source-cvsbk/Makefile
@@ -21,6 +21,6 @@ USE_PERL5=	configure
 
 post-patch:
 	# Really old M::I code
-	${RM} -rf ${WRKSRC}/inc
+	${RM} -r ${WRKSRC}/inc
 
 .include <bsd.port.mk>
diff --git a/devel/p5-VCP-autrijus/Makefile b/devel/p5-VCP-autrijus/Makefile
index 5c3242f68778..0ea2e01d99d0 100644
--- a/devel/p5-VCP-autrijus/Makefile
+++ b/devel/p5-VCP-autrijus/Makefile
@@ -28,6 +28,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
-	${FIND} ${WRKSRC} -name "*.orig" -a -exec ${RM} -f {} \;
+	${FIND} ${WRKSRC} -name "*.orig" -a -exec ${RM} {} \;
 
 .include <bsd.port.mk>
diff --git a/devel/pas2dox/Makefile b/devel/pas2dox/Makefile
index d5b5412147d4..8712ae0663fd 100644
--- a/devel/pas2dox/Makefile
+++ b/devel/pas2dox/Makefile
@@ -33,7 +33,7 @@ post-patch:
 		's|yy_flex_realloc|yyrealloc|' ${WRKSRC}/${PORTNAME}.l
 
 pre-build:
-	@${RM} -f ${WRKSRC}/${PORTNAME}.cpp
+	@${RM} ${WRKSRC}/${PORTNAME}.cpp
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
diff --git a/devel/pear/Makefile b/devel/pear/Makefile
index 8887719d53da..864a69f22519 100644
--- a/devel/pear/Makefile
+++ b/devel/pear/Makefile
@@ -37,9 +37,9 @@ do-install:
 		${STAGEDIR}${PEARDIR}/peclcmd.php
 # pear violates stage when staging as root, hide this
 .if defined(PACKAGE_BUILDING)
-	@${RM} -rf ${PEARDIR}
+	@${RM} -r ${PEARDIR}
 .endif
 # Clean up orphans re-generated by pkg-install
-	@${RM} -rf ${STAGEDIR}${PEARDIR}/.depdb ${STAGEDIR}${PEARDIR}/.depdblock ${STAGEDIR}${PEARDIR}/.filemap ${STAGEDIR}${PEARDIR}/.lock
+	@${RM} -r ${STAGEDIR}${PEARDIR}/.depdb ${STAGEDIR}${PEARDIR}/.depdblock ${STAGEDIR}${PEARDIR}/.filemap ${STAGEDIR}${PEARDIR}/.lock
 
 .include <bsd.port.mk>
diff --git a/devel/php-libawl/Makefile b/devel/php-libawl/Makefile
index f024981d02d6..ab9f8fbc39d7 100644
--- a/devel/php-libawl/Makefile
+++ b/devel/php-libawl/Makefile
@@ -29,7 +29,7 @@ pre-everything::
 	@${ECHO_CMD} "# by setting LIBAWLDIR in /etc/make.conf"
 
 post-patch:
-	${RM} -f ${WRKSRC}/inc/*.orig
+	${RM} ${WRKSRC}/inc/*.orig
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${LIBAWLDIR}
diff --git a/devel/plan9port/Makefile b/devel/plan9port/Makefile
index ee39c481d00e..2a53331cdf50 100644
--- a/devel/plan9port/Makefile
+++ b/devel/plan9port/Makefile
@@ -79,8 +79,8 @@ do-build:
 
 # Dynamic PLIST sucks, but it's over 8K lines, which sucks even more :(
 post-build:
-	${RM} -rf `${FIND} ${WRKSRC}/dist -type f ! -regex ".*\.png"`
-	${RM} -rf `${FIND} ${WRKSRC} -name .hg -o -name .hgignore \
+	${RM} -r `${FIND} ${WRKSRC}/dist -type f ! -regex ".*\.png"`
+	${RM} -r `${FIND} ${WRKSRC} -name .hg -o -name .hgignore \
 		-o -name .hgtags -o -name .cvsignore`
 	@( cd ${WRKDIR} ; \
 	  ${FIND} plan9 -type f; \
diff --git a/devel/ptypes/Makefile b/devel/ptypes/Makefile
index 9a69ceeda89c..c02de1537d1d 100644
--- a/devel/ptypes/Makefile
+++ b/devel/ptypes/Makefile
@@ -29,8 +29,8 @@ DEBUG_VARS=		DEBUG_FLAGS="-DDEBUG -g"
 OPTIMIZED_CFLAGS_VARS=	PTYPES_CFLAGS+="-O2"
 
 pre-install:
-	@${RM} -f ${WRKSRC}/include/*.orig
-	@${RM} -f ${WRKSRC}/wshare/*.o ${WRKSRC}/wshare/*.orig
+	@${RM} ${WRKSRC}/include/*.orig
+	@${RM} ${WRKSRC}/wshare/*.o ${WRKSRC}/wshare/*.orig
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/ptypes
diff --git a/devel/py-calendar/Makefile b/devel/py-calendar/Makefile
index 857bc2e380cb..2e298c7cce34 100644
--- a/devel/py-calendar/Makefile
+++ b/devel/py-calendar/Makefile
@@ -24,13 +24,13 @@ SVN_CMD2=	svn export -r15423
 
 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 PyCalendar from svn.calendarserver.org/..."; \
 		${SVN_CMD2} ${SVN_REPOSITORY_URL}/${SVN_TAG2} > /dev/null ; \
 		${MV} trunk ${DISTNAME} ; \
 		${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/devel/py-freezegun/Makefile b/devel/py-freezegun/Makefile
index b0c5f4882188..1ab91a6d6ba3 100644
--- a/devel/py-freezegun/Makefile
+++ b/devel/py-freezegun/Makefile
@@ -25,7 +25,7 @@ USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 post-extract:
-	${FIND} ${WRKSRC} -type d -name __pycache__ -or -type f -name '*.py[co]' -exec ${RM} -rf {} +
+	${FIND} ${WRKSRC} -type d -name __pycache__ -or -type f -name '*.py[co]' -exec ${RM} -r {} +
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/devel/py-funcparserlib/Makefile b/devel/py-funcparserlib/Makefile
index f947752a814c..2ac09f4080d9 100644
--- a/devel/py-funcparserlib/Makefile
+++ b/devel/py-funcparserlib/Makefile
@@ -22,7 +22,7 @@ DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 OPTIONS_DEFINE=	DOCS
 
 post-install:
-	@${RM} -f ${WRKSRC}/doc/Makefile
+	@${RM} ${WRKSRC}/doc/Makefile
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${INSTALL_WRKSRC} \
 	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/\{} \; \
diff --git a/devel/py-mongoengine/Makefile b/devel/py-mongoengine/Makefile
index 7817cdac9b9e..ccd4ab8e85e9 100644
--- a/devel/py-mongoengine/Makefile
+++ b/devel/py-mongoengine/Makefile
@@ -21,6 +21,6 @@ USE_PYTHON=	autoplist distutils
 
 # bson is provided by pymongo
 post-patch:
-	@${RM} -rf ${WRKSRC}/bson
+	@${RM} -r ${WRKSRC}/bson
 
 .include <bsd.port.mk>
diff --git a/devel/py-protocols/Makefile b/devel/py-protocols/Makefile
index f3986100820f..57b0808b534b 100644
--- a/devel/py-protocols/Makefile
+++ b/devel/py-protocols/Makefile
@@ -16,6 +16,6 @@ USES=		python
 USE_PYTHON=	distutils autoplist
 
 post-patch:
-	@${RM} -rf ${WRKSRC}/setuptools
+	@${RM} -r ${WRKSRC}/setuptools
 
 .include <bsd.port.mk>
diff --git a/devel/py-pytest-xdist/Makefile b/devel/py-pytest-xdist/Makefile
index 97300d6eef3b..3cb17618da0e 100644
--- a/devel/py-pytest-xdist/Makefile
+++ b/devel/py-pytest-xdist/Makefile
@@ -26,7 +26,7 @@ USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 
 post-extract:
-	${RM} -rf ${WRKSRC}/testing/__pycache__
+	${RM} -r ${WRKSRC}/testing/__pycache__
 
 do-test:
 	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
diff --git a/devel/py-qt4-core/Makefile b/devel/py-qt4-core/Makefile
index dc85de1c1ef3..da7c53d76f9b 100644
--- a/devel/py-qt4-core/Makefile
+++ b/devel/py-qt4-core/Makefile
@@ -34,9 +34,9 @@ DEBUG_CONFIGURE_ON=	--debug --trace
 PLIST_SUB+=	PYTHON_MAJOR_VER="${PYTHON_MAJOR_VER}"
 post-patch:
 .if ${PYTHON_MAJOR_VER} == "2"
-	${RM} -rf ${WRKSRC}/pyuic/uic/port_v3
+	${RM} -r ${WRKSRC}/pyuic/uic/port_v3
 .elif ${PYTHON_MAJOR_VER} == "3"
-	${RM} -rf ${WRKSRC}/pyuic/uic/port_v2
+	${RM} -r ${WRKSRC}/pyuic/uic/port_v2
 .endif
 
 post-install:
diff --git a/devel/py-qt5-core/Makefile b/devel/py-qt5-core/Makefile
index 14ee561a9785..ce29992893d1 100644
--- a/devel/py-qt5-core/Makefile
+++ b/devel/py-qt5-core/Makefile
@@ -33,9 +33,9 @@ DEBUG_CONFIGURE_ON=	--debug --trace
 PLIST_SUB+=	PYTHON_MAJOR_VER="${PYTHON_MAJOR_VER}"
 post-patch:
 .if ${PYTHON_MAJOR_VER} == "2"
-	${RM} -rf ${WRKSRC}/pyuic/uic/port_v3
+	${RM} -r ${WRKSRC}/pyuic/uic/port_v3
 .elif ${PYTHON_MAJOR_VER} == "3"
-	${RM} -rf ${WRKSRC}/pyuic/uic/port_v2
+	${RM} -r ${WRKSRC}/pyuic/uic/port_v2
 .endif
 
 post-install:
diff --git a/devel/py-traits/Makefile b/devel/py-traits/Makefile
index 318778d71adf..91a0b0971b27 100644
--- a/devel/py-traits/Makefile
+++ b/devel/py-traits/Makefile
@@ -23,6 +23,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-extract:
 # Remove traits/testing directory files are not compatible with Python 3
-	cd ${WRKSRC} && ${RM} -Rf traits/testing/
+	cd ${WRKSRC} && ${RM} -R traits/testing/
 
 .include <bsd.port.mk>
diff --git a/devel/py-twext/Makefile b/devel/py-twext/Makefile
index 1d95fdb8b62f..feaf0fc56731 100644
--- a/devel/py-twext/Makefile
+++ b/devel/py-twext/Makefile
@@ -38,13 +38,13 @@ SVN_CMD3=	svn export -r15423
 
 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 twext from svn.calendarserver.org/..."; \
 		${SVN_CMD3} ${SVN_REPOSITORY_URL}/${SVN_TAG3} > /dev/null ; \
 		${MV} trunk ${DISTNAME} ; \
 		${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/devel/py-vcrpy/Makefile b/devel/py-vcrpy/Makefile
index bf482afc0850..09d4fc7d177f 100644
--- a/devel/py-vcrpy/Makefile
+++ b/devel/py-vcrpy/Makefile
@@ -37,7 +37,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
 .endif
 
 post-patch:
-	${FIND} ${WRKSRC} -name __pycache__ -type d -exec ${RM} -rf {} +
+	${FIND} ${WRKSRC} -name __pycache__ -type d -exec ${RM} -r {} +
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
diff --git a/devel/pydbus-common/Makefile b/devel/pydbus-common/Makefile
index 8e4cf5a1372a..4118765e2dcd 100644
--- a/devel/pydbus-common/Makefile
+++ b/devel/pydbus-common/Makefile
@@ -76,9 +76,9 @@ USES+=		python:3
 .endif
 
 post-install:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/include/dbus-1.0 \
+	@${RM} -r ${STAGEDIR}${PREFIX}/include/dbus-1.0 \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc
-	@${RM} -fr ${STAGEDIR}/${DOCSDIR}
+	@${RM} -r ${STAGEDIR}/${DOCSDIR}
 .endif # end of slaving block
 
 .include <bsd.port.mk>
diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile
index 431fc747f3a3..a2e81ac6b8fc 100644
--- a/devel/pygobject3-common/Makefile
+++ b/devel/pygobject3-common/Makefile
@@ -69,7 +69,7 @@ PLIST_SUB+=	PYTVER=${PYTHON_VER:S/.//}
 .endif
 
 post-install:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/include/pygobject-3.0 \
+	@${RM} -r ${STAGEDIR}${PREFIX}/include/pygobject-3.0 \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc
 .endif
 
diff --git a/devel/qmake/Makefile b/devel/qmake/Makefile
index 59761e757a22..bb7fb23ca018 100644
--- a/devel/qmake/Makefile
+++ b/devel/qmake/Makefile
@@ -38,7 +38,7 @@ post-install:
 .endif
 
 post-patch:
-	@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
+	@${RM} -r ${WRKSRC}/examples ${WRKSRC}/tutorial
 	@${REINPLACE_CMD} -e 's|-O2|${CXXFLAGS}|' \
 		-e 's|gcc|${CC}|' \
 		-e 's|g++|${CXX}|' \
diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile
index a7d6dbf92102..e2685b9bd133 100644
--- a/devel/qmake4/Makefile
+++ b/devel/qmake4/Makefile
@@ -54,7 +54,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix
 	@${REINPLACE_CMD} -e 's|unix.conf|freebsd.conf|' \
 		${WRKSRC:H}/mkspecs/freebsd-icc/qmake.conf
-	@${RM} -Rf ${WRKSRC:H}/mkspecs/freebsd-g++46
+	@${RM} -R ${WRKSRC:H}/mkspecs/freebsd-g++46
 
 # Add mkspec for clang
 	@${CP} -a ${WRKSRC:H}/mkspecs/freebsd-g++ \
diff --git a/devel/qmake5/Makefile b/devel/qmake5/Makefile
index 50b948787574..2488f754f3c3 100644
--- a/devel/qmake5/Makefile
+++ b/devel/qmake5/Makefile
@@ -52,7 +52,7 @@ post-patch:
 		${WRKSRC}/mkspecs/freebsd-g++/qplatformdefs.h
 # Clean up files created by patching
 	@${RM} ${WRKSRC}/mkspecs/*/*.orig
-	@${RM} -Rf ${WRKSRC}/mkspecs/unsupported/freebsd-g++46
+	@${RM} -R ${WRKSRC}/mkspecs/unsupported/freebsd-g++46
 
 post-build:
 # Complete configure stage to generate *.pri files.
diff --git a/devel/rapidjson/Makefile b/devel/rapidjson/Makefile
index 22b5a2ab3e7a..7f86effd057e 100644
--- a/devel/rapidjson/Makefile
+++ b/devel/rapidjson/Makefile
@@ -47,6 +47,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|add_subdirectory.*googletest.*|link_directories(${LOCALBASE}/lib)|' ${WRKSRC}/test/CMakeLists.txt
 
 post-stage:
-	@${RM} -rf ${STAGEDIR}${EXAMPLESDIR}/CMake*
+	@${RM} -r ${STAGEDIR}${EXAMPLESDIR}/CMake*
 
 .include <bsd.port.mk>
diff --git a/devel/sfml1/Makefile b/devel/sfml1/Makefile
index 5c4233ae6471..e1fb15a0d0c7 100644
--- a/devel/sfml1/Makefile
+++ b/devel/sfml1/Makefile
@@ -36,7 +36,7 @@ PORTSCOUT=	limit:[^c]$$
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	@${RM} -f ${WRKSRC}/lib/*
+	@${RM} ${WRKSRC}/lib/*
 	@${FIND} ${WRKSRC}/samples/bin/ -type f -maxdepth 1 -delete
 
 post-install:
diff --git a/devel/shtk/Makefile b/devel/shtk/Makefile
index a52b9e6641c4..6832dfd7a5de 100644
--- a/devel/shtk/Makefile
+++ b/devel/shtk/Makefile
@@ -30,7 +30,7 @@ PLIST_SUB+=	TEST=
 
 post-install:
 .if empty(PORT_OPTIONS:MTEST)
-	@${RM} -rf ${STAGEDIR}${PREFIX}/tests
+	@${RM} -r ${STAGEDIR}${PREFIX}/tests
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/sonarqube/Makefile b/devel/sonarqube/Makefile
index 916923822234..0f9c4f7856e5 100644
--- a/devel/sonarqube/Makefile
+++ b/devel/sonarqube/Makefile
@@ -74,10 +74,10 @@ do-install:
 		${STAGEDIR}${SQ_HOME}/conf/sonar.properties.sample
 	@${MV} -f ${STAGEDIR}${SQ_HOME}/conf/wrapper.conf \
 		${STAGEDIR}${SQ_HOME}/conf/wrapper.conf.sample
-	@${RM} -drf ${STAGEDIR}${SQ_HOME}/bin/linux-x86-32
-	@${RM} -drf ${STAGEDIR}${SQ_HOME}/bin/linux-x86-64
-	@${RM} -drf ${STAGEDIR}${SQ_HOME}/bin/macosx-universal-64
-	@${RM} -drf ${STAGEDIR}${SQ_HOME}/bin/windows-x86-32
-	@${RM} -drf ${STAGEDIR}${SQ_HOME}/bin/windows-x86-64
+	@${RM} -r ${STAGEDIR}${SQ_HOME}/bin/linux-x86-32
+	@${RM} -r ${STAGEDIR}${SQ_HOME}/bin/linux-x86-64
+	@${RM} -r ${STAGEDIR}${SQ_HOME}/bin/macosx-universal-64
+	@${RM} -r ${STAGEDIR}${SQ_HOME}/bin/windows-x86-32
+	@${RM} -r ${STAGEDIR}${SQ_HOME}/bin/windows-x86-64
 
 .include <bsd.port.mk>
diff --git a/devel/srecord/Makefile b/devel/srecord/Makefile
index 1e47746c0d86..471bf444dd7d 100644
--- a/devel/srecord/Makefile
+++ b/devel/srecord/Makefile
@@ -52,7 +52,7 @@ test:
 	@cd ${WRKSRC} && ${MAKE} sure
 
 build-plist:
-	${RM} -f ${PLIST}
+	${RM} ${PLIST}
 	${MAKE} makeplist | \
 	    ${GREP} -v /you/have/to/check/what/makeplist/gives/you >> ${PLIST}
 
diff --git a/devel/st/Makefile b/devel/st/Makefile
index af30c39cc48d..b8e58cba1c52 100644
--- a/devel/st/Makefile
+++ b/devel/st/Makefile
@@ -22,7 +22,7 @@ EXAMPLES=	Makefile README error.c lookupdns.c proxy.c \
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
-	@${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/examples/Makefile
+	@${RM} ${WRKSRC}/Makefile ${WRKSRC}/examples/Makefile
 	@${CP} ${FILESDIR}/Makefile.main ${WRKSRC}/Makefile
 	@${CP} ${FILESDIR}/Makefile.examples ${WRKSRC}/examples/Makefile
 
diff --git a/devel/storm/Makefile b/devel/storm/Makefile
index 9f1431e7ccc4..aaac69477cba 100644
--- a/devel/storm/Makefile
+++ b/devel/storm/Makefile
@@ -26,11 +26,11 @@ STORM_CFG_DIRS=	conf logback
 STORM_CFG_FILES=	conf/storm.yaml conf/storm_env.ini logback/cluster.xml
 
 post-extract:
-		${RM} -f ${WRKSRC}/bin/*.cmd
+		${RM} ${WRKSRC}/bin/*.cmd
 
 post-patch:
 		${REINPLACE_CMD} -e "s|/usr/bin/python|${LOCALBASE}/bin/python2.7|" ${WRKSRC}/bin/storm
-		${RM} -f ${WRKSRC}/bin/*.bak
+		${RM} ${WRKSRC}/bin/*.bak
 .for i in ${STORM_CFG_FILES}
 		${MV} ${WRKSRC}/${i} ${WRKSRC}/${i}.sample
 .endfor
diff --git a/devel/tcllibc/Makefile b/devel/tcllibc/Makefile
index c1f684892af4..1a4e331dcac5 100644
--- a/devel/tcllibc/Makefile
+++ b/devel/tcllibc/Makefile
@@ -18,7 +18,7 @@ post-patch:
 	cd ${WRKSRC}/modules/json/c && ${YACC} -b json json.y
 
 do-install:
-	${RM} -f ${WRKSRC}/modules/tcllibc/license.terms
+	${RM} ${WRKSRC}/modules/tcllibc/license.terms
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/tcllib
 	${MV} ${WRKSRC}/modules/tcllibc ${STAGEDIR}${PREFIX}/lib/tcllib/
 	${SED} -e s,%%PLATFORM%%,`${LOCALBASE}/bin/critcl -show | ${SED} -n 's| *platform *||p'`,\
diff --git a/devel/tkinspect/Makefile b/devel/tkinspect/Makefile
index 4e551acf538c..2070d590733e 100644
--- a/devel/tkinspect/Makefile
+++ b/devel/tkinspect/Makefile
@@ -32,6 +32,6 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/stl-lite/* \
 			${STAGEDIR}${PREFIX}/lib/tkinspect/stl-lite
 		(cd ${STAGEDIR}${PREFIX}/lib/tkinspect && \
-			${RM} -f README dot.tkinspect_init install.tcl sls.xbm stl-lite/COPYRIGHT tkinspect.tcl)
+			${RM} README dot.tkinspect_init install.tcl sls.xbm stl-lite/COPYRIGHT tkinspect.tcl)
 
 .include <bsd.port.mk>
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index cfaec392254c..49383456f407 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -40,7 +40,7 @@ test:
 	cd ${WRKSRC} ; ${MAKE_CMD} test
 
 pre-install:
-	${RM} -rf ${ORIGWRKSRC}/docs-tla/PLUGIN \
+	${RM} -r ${ORIGWRKSRC}/docs-tla/PLUGIN \
 		${ORIGWRKSRC}/docs-tla/{arch} ${ORIGWRKSRC}/docs-tla/.arch-ids
 
 do-install:
diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile
index bdb264355ebb..d81427557c7e 100644
--- a/devel/tmake/Makefile
+++ b/devel/tmake/Makefile
@@ -17,7 +17,7 @@ USES=		perl5 shebangfix
 SHEBANG_FILES=	bin/progen bin/tmake
 
 post-patch:
-	@${RM} -f ${WRKSRC}/bin/tmake.orig ${WRKSRC}/lib/unix/generic.t.orig
+	@${RM} ${WRKSRC}/bin/tmake.orig ${WRKSRC}/lib/unix/generic.t.orig
 	@${REINPLACE_CMD} \
 		-e 's|/usr/local|${LOCALBASE}|g' \
 		-e 's|/usr/X11R6|${LOCALBASE}|g' \
diff --git a/devel/valgrind-devel/Makefile b/devel/valgrind-devel/Makefile
index 0e117c64f824..66f497078f3c 100644
--- a/devel/valgrind-devel/Makefile
+++ b/devel/valgrind-devel/Makefile
@@ -85,7 +85,7 @@ PLIST_SUB+=	AMD64="@comment "
 
 .if !${PORT_OPTIONS:MDOCS}
 post-patch:
-	@${RM} -rf ${WRKSRC}/docs/html
+	@${RM} -r ${WRKSRC}/docs/html
 .endif
 
 post-build:
diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index 74fcc366cf9a..3aa0eb6b7c4d 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -83,7 +83,7 @@ PLIST_SUB+=	AMD64="@comment "
 
 .if !${PORT_OPTIONS:MDOCS}
 post-patch:
-	@${RM} -rf ${WRKSRC}/docs/html
+	@${RM} -r ${WRKSRC}/docs/html
 .endif
 
 post-build:
diff --git a/devel/xmake/Makefile b/devel/xmake/Makefile
index d822a58d1252..677f6bdcd8e4 100644
--- a/devel/xmake/Makefile
+++ b/devel/xmake/Makefile
@@ -15,7 +15,7 @@ WRKSRC=		${WRKDIR}/xmake
 PLIST_FILES=	bin/xmake man/man1/xmake.1.gz
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/obj
+	@${RM} -r ${WRKSRC}/obj
 
 post-patch:
 	@${REINPLACE_CMD} 's|gcc|cc|' ${WRKSRC}/defs.h
diff --git a/devel/xsd/Makefile b/devel/xsd/Makefile
index 3cdd93180229..a159b57f44cd 100644
--- a/devel/xsd/Makefile
+++ b/devel/xsd/Makefile
@@ -37,7 +37,7 @@ USES=		gmake tar:bzip2
 
 post-patch:
 # Use devel/build instead of the port's bundled copy.
-	${RM} -fr ${WRKSRC}/build-0.3
+	${RM} -r ${WRKSRC}/build-0.3
 	${LN} -s ${LOCALBASE}/include/build-0.3 ${WRKSRC}/build-0.3
 
 post-install:
diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index 9a56660bfa76..09267d3173ef 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -136,7 +136,7 @@ post-build:
 	@${ECHO_MSG} "===> Rebuilding DJB installer to respect STAGEDIR"
 	@${MV} -f ${WRKSRC}/conf-home ${WRKSRC}/conf-home.sav
 	@${MV} -f ${WRKSRC}/conf-home.stage ${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}/*-conf
 	@${MV} -f ${WRKSRC}/conf-home.sav ${WRKSRC}/conf-home
diff --git a/dns/knot1/Makefile b/dns/knot1/Makefile
index e58e10430625..83d10f45ffb6 100644
--- a/dns/knot1/Makefile
+++ b/dns/knot1/Makefile
@@ -58,7 +58,7 @@ post-patch:
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|' \
 		${WRKSRC}/src/Makefile.in
-	@${RM} -rf ${WRKSRC}/src/zscanner/scanner.c
+	@${RM} -r ${WRKSRC}/src/zscanner/scanner.c
 
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/knot.sample.conf \
diff --git a/dns/knot2/Makefile b/dns/knot2/Makefile
index 39a4d2f6249d..d2f16b91dcb5 100644
--- a/dns/knot2/Makefile
+++ b/dns/knot2/Makefile
@@ -64,7 +64,7 @@ post-patch:
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|' \
 		${WRKSRC}/src/Makefile.in
-	@${RM} -rf ${WRKSRC}/src/zscanner/scanner.c
+	@${RM} -r ${WRKSRC}/src/zscanner/scanner.c
 
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/knot.sample.conf \
diff --git a/dns/maradns/Makefile b/dns/maradns/Makefile
index 360ecac518a3..f67215802b75 100644
--- a/dns/maradns/Makefile
+++ b/dns/maradns/Makefile
@@ -66,7 +66,7 @@ do-install:
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-	@${RM} -rf ${STAGEDIR}${DOCSDIR}/man \
+	@${RM} -r ${STAGEDIR}${DOCSDIR}/man \
 		${STAGEDIR}${DOCSDIR}/source \
 		${STAGEDIR}${DOCSDIR}/pdf
 	@${FIND} ${STAGEDIR}${DOCSDIR} -name Makefile -delete
diff --git a/editors/2bsd-vi/Makefile b/editors/2bsd-vi/Makefile
index 49839fc388c7..55f87ee23d7b 100644
--- a/editors/2bsd-vi/Makefile
+++ b/editors/2bsd-vi/Makefile
@@ -21,7 +21,7 @@ PRESERVEDIR=	/var/preserve/${PKGBASE}
 PLIST_SUB=	PRESERVEDIR="${PRESERVEDIR}"
 
 post-extract:	.SILENT
-	${RM} -fr ${WRKSRC}/libuxre ${WRKSRC}/regexp.h
+	${RM} -r ${WRKSRC}/libuxre ${WRKSRC}/regexp.h
 
 post-patch:
 .for f in Makefile ex.1 expreserve.c exrecover.c vi.1
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 728e80193387..fc551bc2cdc1 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -241,7 +241,7 @@ LDFLAGS+=-ltinfo
 .endif
 
 post-patch:
-	@${RM} -f ${WRKSRC}/info/*
+	@${RM} ${WRKSRC}/info/*
 
 ## stage-qa will give a warning, but don't pull in desktop-file-utils
 ## portlint -AC will give a warning about INSTALL_ICONS, but don't pull in those
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index d4b767575167..f9c4233b7459 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -202,7 +202,7 @@ info-package-install:
 	done)
 
 manifest-install:
-	@${RM} -f ${WRKDIR}/${MANIFEST}
+	@${RM} ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index 98caba8d3d1e..c9df3849d71f 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -110,7 +110,7 @@ do-build:
 
 post-build:
 	@cd ${WRKSRC} && \
-		${RM} -Rf COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \
+		${RM} -R COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \
 			ide/Makefile*.orig ide/Makefile*.bak lcl/units components/ideintf/units \
 				components/synedit/units components/lazcontrols/lib
 
@@ -119,8 +119,8 @@ pre-install:
 	@${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/lazarus-wrapper
 	@${ECHO} "exec ./startlazarus" >> ${WRKDIR}/lazarus-wrapper
 
-	@${RM} -f ${PLIST}
-	@${RM} -f ${WRKSRC}/lcl/units
+	@${RM} ${PLIST}
+	@${RM} ${WRKSRC}/lcl/units
 	@${RM} -r ${WRKSRC}/components/chmhelp/lhelp/lhelp.app/Contents/MacOS \
 		${WRKSRC}/lazarus.app/Contents/MacOS \
 		${WRKSRC}/lazarus.app/Contents/Resources/startlazarus.app/Contents/MacOS
diff --git a/editors/lazarus/Makefile.common b/editors/lazarus/Makefile.common
index 59731ba60b32..df135661f810 100644
--- a/editors/lazarus/Makefile.common
+++ b/editors/lazarus/Makefile.common
@@ -61,7 +61,7 @@ do-build:
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
 
 pre-install:
-	@${RM} -f ${PLIST}
+	@${RM} ${PLIST}
 
 	@cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/lcl/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST}
diff --git a/editors/libreoffice4/Makefile b/editors/libreoffice4/Makefile
index 2311262f90f2..f4a50afa2b2e 100644
--- a/editors/libreoffice4/Makefile
+++ b/editors/libreoffice4/Makefile
@@ -359,7 +359,7 @@ post-configure:
 
 do-install:
 	@cd ${WRKSRC} && ${MAKE_CMD} ${MAKE_ARGS} distro-pack-install
-	@${RM} -f ${PLISTD} ${PLISTF}
+	@${RM} ${PLISTD} ${PLISTF}
 	@cd ${STAGEDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \
 	    -empty -exec ${ECHO_CMD} "@dir {}" \; >> ${PLISTD}
 	@cd ${STAGEDIR}${PREFIX} && ${FIND} -H -s bin etc lib man \
diff --git a/editors/linux-sublime/Makefile b/editors/linux-sublime/Makefile
index c66fc665264d..5f7f957228fd 100644
--- a/editors/linux-sublime/Makefile
+++ b/editors/linux-sublime/Makefile
@@ -35,7 +35,7 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/Icon/48x48/sublime_text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/
 	@${INSTALL_DATA} ${WRKSRC}/Icon/128x128/sublime_text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/
 	@${INSTALL_DATA} ${WRKSRC}/Icon/256x256/sublime_text.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/
-	@${RM} -rf ${WRKSRC}/Icon/
+	@${RM} -r ${WRKSRC}/Icon/
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	@${CHMOD} +x ${STAGEDIR}${DATADIR}/sublime_text
 	@${INSTALL_SCRIPT} ${WRKDIR}/sublime ${STAGEDIR}${PREFIX}/bin/sublime
diff --git a/editors/mined/Makefile b/editors/mined/Makefile
index ac9cd85b8aec..b559858db923 100644
--- a/editors/mined/Makefile
+++ b/editors/mined/Makefile
@@ -45,8 +45,8 @@ post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/usrshare/package_doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}
-	${RM} -rf ${STAGEDIR}${DATADIR}/setup_install/cyg
-	@${RM} -rf ${STAGEDIR}${DOCSDIR}/CHANGES ${STAGEDIR}${DOCSDIR}/LICENCE.GPL
-	@${RM} -rf ${STAGEDIR}${DATADIR}/doc_user ${STAGEDIR}${DATADIR}/package_doc
+	${RM} -r ${STAGEDIR}${DATADIR}/setup_install/cyg
+	@${RM} -r ${STAGEDIR}${DOCSDIR}/CHANGES ${STAGEDIR}${DOCSDIR}/LICENCE.GPL
+	@${RM} -r ${STAGEDIR}${DATADIR}/doc_user ${STAGEDIR}${DATADIR}/package_doc
 
 .include <bsd.port.mk>
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index 81c8abb99a05..3a2514a057ff 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -282,13 +282,13 @@ pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
-	${RM} -f ${WRKDIR}/.PLIST*
-	${RM} -f ${WRKDIR}/.install_done.*
-	${RM} -f ${WRKDIR}/.package_done.*
-	${RM} -f ${WRKDIR}/.extract_done.*
-	${RM} -f ${WRKDIR}/.patch_done.*
-	${RM} -f ${WRKDIR}/.configure_done.*
-	${RM} -f ${WRKDIR}/.build_done.*
+	${RM} ${WRKDIR}/.PLIST*
+	${RM} ${WRKDIR}/.install_done.*
+	${RM} ${WRKDIR}/.package_done.*
+	${RM} ${WRKDIR}/.extract_done.*
+	${RM} ${WRKDIR}/.patch_done.*
+	${RM} ${WRKDIR}/.configure_done.*
+	${RM} ${WRKDIR}/.build_done.*
 	${MKDIR} ${WRKDIR}
 	${TOUCH} ${EXTRACT_COOKIE}
 	${TOUCH} ${PATCH_COOKIE}
@@ -301,7 +301,7 @@ post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
 	${CP} ${FILESDIR}/freebsd-aoo-intro.png ${WRKSRC}/default_images/introabout/intro.png
 	${CP} ${FILESDIR}/freebsd-aoo-about.png ${WRKSRC}/default_images/introabout/about.png
-	${RM} -rf ${WRKSRC}/l10n
+	${RM} -r ${WRKSRC}/l10n
 	${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
 	${SED}  -e '\|^For main/vcl/unx/generic/fontmanager/parseAFM|,/^__/p' \
 		-e '\|^For PostScript(R) AFM|,/^__/p'			\
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 319a50e5fb6d..a82428629af7 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -292,13 +292,13 @@ pre-everything::
 # really tweak, extremely useful when you build all localized language versions
 # needed after when you build with ALL_LOCALIZED_LANGS.
 .if defined(TWEAK_L10N)
-	${RM} -f ${WRKDIR}/.PLIST*
-	${RM} -f ${WRKDIR}/.install_done.*
-	${RM} -f ${WRKDIR}/.package_done.*
-	${RM} -f ${WRKDIR}/.extract_done.*
-	${RM} -f ${WRKDIR}/.patch_done.*
-	${RM} -f ${WRKDIR}/.configure_done.*
-	${RM} -f ${WRKDIR}/.build_done.*
+	${RM} ${WRKDIR}/.PLIST*
+	${RM} ${WRKDIR}/.install_done.*
+	${RM} ${WRKDIR}/.package_done.*
+	${RM} ${WRKDIR}/.extract_done.*
+	${RM} ${WRKDIR}/.patch_done.*
+	${RM} ${WRKDIR}/.configure_done.*
+	${RM} ${WRKDIR}/.build_done.*
 	${MKDIR} ${WRKDIR}
 	${TOUCH} ${EXTRACT_COOKIE}
 	${TOUCH} ${PATCH_COOKIE}
@@ -311,7 +311,7 @@ post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
 	${CP} ${FILESDIR}/freebsd-aoo-intro-developer.png ${WRKSRC}/default_images/introabout/intro.png
 	${CP} ${FILESDIR}/freebsd-aoo-about-developer.png ${WRKSRC}/default_images/introabout/about.png
-	${RM} -rf ${WRKSRC}/l10n
+	${RM} -r ${WRKSRC}/l10n
 	${LN} -sf ${UNZIP_CMD} ${WRKSRC}/solenv/bin/unzip
 	${SED}  -e '\|^For main/vcl/unx/generic/fontmanager/parseAFM|,/^__/p' \
 		-e '\|^For PostScript(R) AFM|,/^__/p'			\
diff --git a/editors/rox-edit/Makefile b/editors/rox-edit/Makefile
index 7c706651364c..912796102130 100644
--- a/editors/rox-edit/Makefile
+++ b/editors/rox-edit/Makefile
@@ -17,7 +17,7 @@ USES=		python tar:bzip2
 
 post-extract:
 	@${FIND} ${WRKSRC} -name .cvsignore | ${XARGS} ${RM}
-	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -r
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 02b67a2bdbb9..39887ba902ec 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -176,7 +176,7 @@ info-package-install:
 	done)
 
 manifest-install:
-	@${RM} -f ${WRKDIR}/${MANIFEST}
+	@${RM} ${WRKDIR}/${MANIFEST}
 	@${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
 		${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
 	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc
index aa1861cfffd8..7ed54198adb6 100644
--- a/emulators/i386-wine-devel/Makefile.inc
+++ b/emulators/i386-wine-devel/Makefile.inc
@@ -75,7 +75,7 @@ DISTFILES=
 .endif
 
 do-extract:
-	@${RM} -rf ${WRKDIR}
+	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/${DISTNAME}/LICENSE' -s '|/usr/local/share/licenses/${DISTNAME}/||g'
 
@@ -87,7 +87,7 @@ ${PLIST}: fetch
 	${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} -v '/$$\|ldconfig32' | ${SED} 's|/usr/local/||g' | sort > ${PLIST}
 
 port-update:
-	${RM} -f ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.*
+	${RM} ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.*
 .for osrel in 9 10 11 12
 .for suffix in -devel -staging
 	${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 UNAME_r=${osrel} PKGNAMESUFFIX=${suffix}
diff --git a/emulators/i386-wine/Makefile.inc b/emulators/i386-wine/Makefile.inc
index 98f60d8209ec..852a4a2507c5 100644
--- a/emulators/i386-wine/Makefile.inc
+++ b/emulators/i386-wine/Makefile.inc
@@ -63,7 +63,7 @@ DISTFILES=
 .endif
 
 do-extract:
-	@${RM} -rf ${WRKDIR}
+	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/${DISTNAME}/LICENSE' -s '|/usr/local/share/licenses/${DISTNAME}/||g'
 
@@ -74,7 +74,7 @@ ${PLIST}: fetch
 	${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} -v '/$$\|ldconfig32' | ${SED} 's|/usr/local/||g' | sort > ${PLIST}
 
 port-update:
-	${RM} -f ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.*
+	${RM} ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.*
 .for osrel in 9 10 11 12
 	${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 UNAME_r=${osrel}
 	${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 UNAME_r=${osrel}
diff --git a/emulators/ia64sim/Makefile b/emulators/ia64sim/Makefile
index 2dc43b7c5492..bb781901dce9 100644
--- a/emulators/ia64sim/Makefile
+++ b/emulators/ia64sim/Makefile
@@ -25,7 +25,7 @@ PORTDOCS=	ia64user.txt readme
 OPTIONS_DEFINE=	DOCS
 
 pre-build:
-	@${RM} -f ${WRKSRC}/obj/*.o ${WRKSRC}/ia64sim
+	@${RM} ${WRKSRC}/obj/*.o ${WRKSRC}/ia64sim
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ia64sim ${STAGEDIR}${PREFIX}/bin
diff --git a/emulators/mupen64plus-core/Makefile.common b/emulators/mupen64plus-core/Makefile.common
index 4ffcb2c7b9f1..7f419af1fcfc 100644
--- a/emulators/mupen64plus-core/Makefile.common
+++ b/emulators/mupen64plus-core/Makefile.common
@@ -42,7 +42,7 @@ post-patch:
 .	endif
 
 pre-install:
-	@${RM} -f ${PLIST}
+	@${RM} ${PLIST}
 .	if ${PKGNAMESUFFIX} == "-video-rice"
 		@${ECHO_CMD} "%%DATADIR%%/RiceVideoLinux.ini" >> ${PLIST}
 .	endif
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 6872edf04945..4b53e46ef6ab 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -142,7 +142,7 @@ USE_SDL=	sdl
 .endif
 
 post-extract:
-	@${RM} -f ${WRKSRC}/doc/vice.info*
+	@${RM} ${WRKSRC}/doc/vice.info*
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
diff --git a/emulators/virtio-kmod/Makefile b/emulators/virtio-kmod/Makefile
index 15c235571f4f..5fadbcb4c9e4 100644
--- a/emulators/virtio-kmod/Makefile
+++ b/emulators/virtio-kmod/Makefile
@@ -68,7 +68,7 @@ maintainer-tar:
 	cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/stable/9/sys/dev/virtio dev/virtio
 	cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/stable/9/sys/modules/virtio modules/virtio
 	cd ${EXPDIR} && ${TAR} cfvz ${DISTDIR}/${FILE_9} dev modules
-	cd ${EXPDIR} && ${RM} -rf dev modules
+	cd ${EXPDIR} && ${RM} -r dev modules
 	cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/stable/8/sys/dev/virtio dev/virtio
 	cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/stable/8/sys/modules/virtio modules/virtio
 	cd ${EXPDIR} && ${TAR} cfvz ${DISTDIR}/${FILE_8} dev modules
diff --git a/emulators/visualboyadvance-m/Makefile b/emulators/visualboyadvance-m/Makefile
index 0d1b4562edfe..2cf9571fee01 100644
--- a/emulators/visualboyadvance-m/Makefile
+++ b/emulators/visualboyadvance-m/Makefile
@@ -134,7 +134,7 @@ maint-gen-distfile:
 	svn export -r${SVN_REV} \
 		 https://svn.code.sf.net/p/vbam/code/trunk/ ${DISTNAME}
 	${TAR} jcf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}
-	${RM} -rf ${DISTNAME}
+	${RM} -r ${DISTNAME}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vbam
diff --git a/emulators/x49gp/Makefile b/emulators/x49gp/Makefile
index 37d1e22ae154..b09406031b5a 100644
--- a/emulators/x49gp/Makefile
+++ b/emulators/x49gp/Makefile
@@ -89,7 +89,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/x49gp ${STAGEDIR}${PREFIX}/bin/x49gp-bin
 
 	${INSTALL_SCRIPT} ${WRKDIR}/hp50g.sh ${STAGEDIR}${PREFIX}/bin/hp50g
-	${RM} -f ${STAGEDIR}${PREFIX}/bin/hp49g+
+	${RM} ${STAGEDIR}${PREFIX}/bin/hp49g+
 	${LN} ${STAGEDIR}${PREFIX}/bin/hp50g ${STAGEDIR}${PREFIX}/bin/hp49g+
 
 	${INSTALL_DATA} ${DISTDIR}/sdcard64.tar.gz ${STAGEDIR}${DATADIR}/
diff --git a/finance/aqbanking/Makefile b/finance/aqbanking/Makefile
index 28a4770d7b10..b11196c1cd60 100644
--- a/finance/aqbanking/Makefile
+++ b/finance/aqbanking/Makefile
@@ -61,7 +61,7 @@ post-build-DOXYGEN-on:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} srcdoc
 
 post-install-DOCS-off:
-	@${RM} -rf ${STAGEDIR}${DOCSDIR}
+	@${RM} -r ${STAGEDIR}${DOCSDIR}
 
 post-install-DOXYGEN-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/apidoc
diff --git a/finance/bitcoin-armory/Makefile b/finance/bitcoin-armory/Makefile
index 23995df4cf7b..119af6f3bb1b 100644
--- a/finance/bitcoin-armory/Makefile
+++ b/finance/bitcoin-armory/Makefile
@@ -47,7 +47,7 @@ post-patch:
 
 post-stage:
 	@${SED} -i.bak -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${STAGEDIR}/${LOCALBASE}/bin/armory && \
-		${RM} -f ${STAGEDIR}/${LOCALBASE}/bin/armory.bak
+		${RM} ${STAGEDIR}/${LOCALBASE}/bin/armory.bak
 	@${REINPLACE_CMD} 's|Exec=/usr/bin/armory|Exec=${LOCALBASE}/bin/armory|' ${STAGEDIR}/${LOCALBASE}/share/applications/*.desktop
 .for s in ${ICON_SIZES}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/
diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile
index 87fcaa47be9d..78c7c83609b2 100644
--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@@ -29,6 +29,6 @@ PORTDOCS=	*
 OPTIONS_DEFINE=	DOCS
 
 post-install:
-	${RM} -f ${STAGEDIR}${DOCSDIR}/COPYING
+	${RM} ${STAGEDIR}${DOCSDIR}/COPYING
 
 .include <bsd.port.mk>
diff --git a/french/aster/Makefile b/french/aster/Makefile
index b2ea62b08be7..2ad59f4f070f 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -341,12 +341,12 @@ do-install:
 	@${DO_NADA}
 
 post-install:
-	${RM} -rf ${STAGEDIR}${inst_dir}/etc	# Installed by cad/astk-serveur
+	${RM} -r ${STAGEDIR}${inst_dir}/etc	# Installed by cad/astk-serveur
 	${MV} ${STAGEDIR}${inst_dir}/${VE}/share/aster/tests	\
 		${STAGEDIR}${inst_dir}/${VE}/
 	${MV} ${STAGEDIR}${inst_dir}/${VE}/share/aster/*	\
 		${STAGEDIR}${inst_dir}/${VE}/
-	${RM} -rf ${STAGEDIR}${inst_dir}/${VE}/share
+	${RM} -r ${STAGEDIR}${inst_dir}/${VE}/share
 .for f in ${V_H2FIX}
 	${REINPLACE_CMD} -e 's|${V_HOMARD0}|${V_HOMARD}|' ${STAGEDIR}${inst_dir}/${f}
 .endfor
diff --git a/ftp/bftpd/Makefile b/ftp/bftpd/Makefile
index dc0ad6cbf77b..dceb693981bd 100644
--- a/ftp/bftpd/Makefile
+++ b/ftp/bftpd/Makefile
@@ -24,7 +24,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,/etc/bftpd.conf,${PREFIX}/etc/bftpd.conf,' \
 		${WRKSRC}/mypaths.h
 	@${REINPLACE_CMD} -e 's, -ldl,,g' ${WRKSRC}/configure.in
-	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -r
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin/
diff --git a/games/7kaa/Makefile b/games/7kaa/Makefile
index cb3ecfadb82a..66a881a35a06 100644
--- a/games/7kaa/Makefile
+++ b/games/7kaa/Makefile
@@ -27,6 +27,6 @@ PORTDATA=	*
 OPTIONS_DEFINE=	DOCS
 
 post-install:
-	@${RM} -f ${STAGEDIR}${DOCSDIR}/COPYING
+	@${RM} ${STAGEDIR}${DOCSDIR}/COPYING
 
 .include <bsd.port.mk>
diff --git a/games/atris/Makefile b/games/atris/Makefile
index 6694fbde67aa..c5a8e14ff38a 100644
--- a/games/atris/Makefile
+++ b/games/atris/Makefile
@@ -42,7 +42,7 @@ post-patch:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${RM} -f ${WRKSRC}/Docs/Makefile*
+	@${RM} ${WRKSRC}/Docs/Makefile*
 	${CP} -R ${WRKSRC}/Docs/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/barbie_seahorse_adventures/Makefile b/games/barbie_seahorse_adventures/Makefile
index bfbad91476ae..1614ac24a4a7 100644
--- a/games/barbie_seahorse_adventures/Makefile
+++ b/games/barbie_seahorse_adventures/Makefile
@@ -35,7 +35,7 @@ DESKTOP_ENTRIES="Barbie Seahorse Adventures" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
 
 post-extract:
-	@cd ${WRKSRC} && ${RM} -f data/REMOVE_ME.txt data/sample.txt \
+	@cd ${WRKSRC} && ${RM} data/REMOVE_ME.txt data/sample.txt \
 		lib/pgu/LICENSE.txt
 
 post-patch:
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index 15306a243321..04d5dc84d196 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -30,7 +30,7 @@ OPTIONS_DEFINE=	DOCS
 post-extract:
 	@${GZCAT} ${DISTDIR}/battalionSUN4.tar.gz | \
 		(cd ${WRKDIR} && ${TAR} --unlink -xf -)
-	@${RM} -f ${WRKSRC}/*.o
+	@${RM} ${WRKSRC}/*.o
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/games/biniax2/Makefile b/games/biniax2/Makefile
index 680fd0dc9f2f..a505a0d9a79c 100644
--- a/games/biniax2/Makefile
+++ b/games/biniax2/Makefile
@@ -24,7 +24,7 @@ PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 
 post-patch:
-	@${RM} -f ${WRKSRC}/data/Thumbs.db
+	@${RM} ${WRKSRC}/data/Thumbs.db
 	@${REINPLACE_CMD} -e 's|data/|${DATADIR}/|g' \
 		${WRKSRC}/desktop/gfx.c ${WRKSRC}/desktop/snd.c
 
diff --git a/games/block/Makefile b/games/block/Makefile
index e8760453346a..10d3cf4fc85f 100644
--- a/games/block/Makefile
+++ b/games/block/Makefile
@@ -16,8 +16,8 @@ ALL_TARGET=	block bed
 MAKE_ARGS=	LL="${LDFLAGS} -lncurses" CLL="${LDFLAGS} -lncurses"
 
 post-extract:
-	@${RM} -f ${WRKSRC}/block
-	@${RM} -f ${WRKSRC}/bed
+	@${RM} ${WRKSRC}/block
+	@${RM} ${WRKSRC}/bed
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/block ${STAGEDIR}${PREFIX}/bin
diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index 7e25a2cc52bd..c80a5bc81f77 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -27,7 +27,7 @@ DESKTOP_ENTRIES="BomberMan clone" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
 
 post-extract:
-	@${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -rf ;
+	@${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -r ;
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/games/${PACKAGE}|share/${PACKAGE}|' \
diff --git a/games/bubbros/Makefile b/games/bubbros/Makefile
index 60c84065cb3d..fa391c9e0118 100644
--- a/games/bubbros/Makefile
+++ b/games/bubbros/Makefile
@@ -33,7 +33,7 @@ post-patch:
 		${WRKSRC}/display/setup.py
 	@${FIND} ${WRKSRC} -name "*.bak" -delete -or -name "*.orig" -delete \
 		-or -name "*.cvsignore" -delete
-	@${FIND} ${WRKSRC} -name CVS -print0 | ${XARGS} -0 ${RM} -fr
+	@${FIND} ${WRKSRC} -name CVS -print0 | ${XARGS} -0 ${RM} -r
 
 do-build:
 	# Compile the statesaver extension module
@@ -41,7 +41,7 @@ do-build:
 	# Compile the X-window client extension module
 	cd ${WRKSRC}/display; ${PYTHON_CMD} setup.py build_ext -i
 .for d in bubbob display
-	@(cd ${WRKSRC}/${d} && ${RM} -fr build)
+	@(cd ${WRKSRC}/${d} && ${RM} -r build)
 .endfor
 
 do-install:
diff --git a/games/bugsquish/Makefile b/games/bugsquish/Makefile
index 30aa6c5f1cf8..365ce964efc0 100644
--- a/games/bugsquish/Makefile
+++ b/games/bugsquish/Makefile
@@ -31,8 +31,8 @@ OPTIONS_DEFINE=	DOCS
 post-extract:
 	${TAR} xfjp ${_DISTDIR}/${PORTNAME}_music${EXTRACT_SUFX} -C \
 		${WRKSRC}/data/music/
-	@cd ${WRKSRC}/data/music ; ${RM} -f *.mod
-	@${FIND} ${WRKDIR} -name .xvpics -print0 | ${XARGS} -0 ${RM} -fr
+	@cd ${WRKSRC}/data/music ; ${RM} *.mod
+	@${FIND} ${WRKDIR} -name .xvpics -print0 | ${XARGS} -0 ${RM} -r
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/bugsquish/|${DATADIR}/| ; \
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 1b96c14d223e..b1aebd24c123 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -39,6 +39,6 @@ post-patch:
 		${WRKSRC}/etc/enigma.desktop
 
 post-install:
-	@${RM} -d ${STAGEDIR}${DOCSDIR}/COPYING
+	@${RM} ${STAGEDIR}${DOCSDIR}/COPYING
 
 .include <bsd.port.mk>
diff --git a/games/evq3/Makefile b/games/evq3/Makefile
index cc107ebebff3..d607f514fbae 100644
--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@@ -154,6 +154,6 @@ maint-gen-distfile:
 	fi
 	svn export svn://70.86.44.154/evolution/trunk/evq3 ${PORTNAME}
 	tar cjf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}
-	${RM} -rf ${PORTNAME}
+	${RM} -r ${PORTNAME}
 
 .include <bsd.port.post.mk>
diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile
index 8a88333a9b8c..cd121507f683 100644
--- a/games/flightgear-aircraft/Makefile
+++ b/games/flightgear-aircraft/Makefile
@@ -72,7 +72,7 @@ post-patch:
 		\( -name COPYING -or -name LICENSE -or -name copyright \) -delete
 
 pre-install:
-	@${RM} -f ${PLIST}
+	@${RM} ${PLIST}
 	@cd ${WRKSRC} && \
 	${FIND} * -type d -empty | ${SORT} \
 		| ${SED} -e 's|^|@exec ${MKDIR} %D/share/flightgear/Aircraft/|' >> ${PLIST} && \
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index 0ec7b13c62f9..5ed4ffebf0eb 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -21,10 +21,10 @@ PLIST=		${WRKDIR}/pkg-plist
 PLIST_DIRS=	%%DATADIR%%
 
 post-patch:
-	@${RM} -f ${WRKSRC}/COPYING
+	@${RM} ${WRKSRC}/COPYING
 
 pre-install:
-	@${RM} -f ${PLIST}
+	@${RM} ${PLIST}
 	@cd ${WRKSRC} && \
 	${FIND} * -type d -empty | ${SORT} \
 		| ${SED} -e 's|^|@exec ${MKDIR} %D/share/flightgear/|' >> ${PLIST} && \
diff --git a/games/flightgear-mb339-pan/Makefile b/games/flightgear-mb339-pan/Makefile
index de3741d9715f..e698097918f8 100644
--- a/games/flightgear-mb339-pan/Makefile
+++ b/games/flightgear-mb339-pan/Makefile
@@ -28,7 +28,7 @@ pre-extract:
 	@${MKDIR} ${WRKSRC}
 
 pre-install:
-	@${RM} -f ${PLIST}
+	@${RM} ${PLIST}
 	@cd ${WRKSRC} && \
 	${FIND} * -type d -empty | ${SORT} \
 		| ${SED} -e 's|^|@exec ${MKDIR} %D/share/flightgear/Aircraft/|' >> ${PLIST} && \
diff --git a/games/freera/Makefile b/games/freera/Makefile
index 2cbc897f0cb5..fd4a88f6b6f6 100644
--- a/games/freera/Makefile
+++ b/games/freera/Makefile
@@ -29,7 +29,7 @@ post-patch:
 		${WRKSRC}/src/video/graphicsengine.cpp ${WRKSRC}/src/vfs/vfs.cpp \
 		${WRKSRC}/data/settings/files.ini
 	@${RM} ${WRKSRC}/data/settings/files.ini.bak
-	@${RM} -rf ${WRKSRC}/data/settings/ra/.svn ${WRKSRC}/data/settings/td/.svn
+	@${RM} -r ${WRKSRC}/data/settings/ra/.svn ${WRKSRC}/data/settings/td/.svn
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/freera ${STAGEDIR}${PREFIX}/bin/
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index a11146a7394c..2b899658b4a3 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -34,7 +34,7 @@ post-patch:
 	s|CXX=gcc|CXX?=${CC}| ; \
 	s|CFLAGS=-Wall ${SDL_CFLAGS}|CFLAGS+=-w ${SDL_CFLAGS}|' \
 		${WRKSRC}/Makefile
-	@${FIND} ${WRKDIR} -name .xvpics | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKDIR} -name .xvpics | ${XARGS} ${RM} -r
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
diff --git a/games/gnugo/Makefile b/games/gnugo/Makefile
index 53ab9b3523bf..e32bc9433722 100644
--- a/games/gnugo/Makefile
+++ b/games/gnugo/Makefile
@@ -17,6 +17,6 @@ PLIST_FILES=	bin/gnugo \
 		man/man6/gnugo.6.gz
 
 post-extract:
-	${RM} -f ${WRKSRC}/doc/gnugo.info*
+	${RM} ${WRKSRC}/doc/gnugo.info*
 
 .include <bsd.port.mk>
diff --git a/games/gondola/Makefile b/games/gondola/Makefile
index 03ce7d2b5a01..f4295a63f9b0 100644
--- a/games/gondola/Makefile
+++ b/games/gondola/Makefile
@@ -37,7 +37,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|data/|${DATADIR}/|g' ${WRKSRC}/gamelib/*.py
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
 		${WRKSRC}/gamelib/data.py ${WRKSRC}/gamelib/main.py
-	@${RM} -f ${WRKSRC}/gamelib/*.{bak,orig}
+	@${RM} ${WRKSRC}/gamelib/*.{bak,orig}
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "snowui gamelib simplejson run_game.py" \
diff --git a/games/gretools/Makefile b/games/gretools/Makefile
index 8592be370040..debaeae4d058 100644
--- a/games/gretools/Makefile
+++ b/games/gretools/Makefile
@@ -28,8 +28,8 @@ post-patch:
 		 s|gtk\.idle_add|gobject\.idle_add|g' ${WRKSRC}/gretools.py
 
 post-install:
-	${RM} -f ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/gretools/gretools.pyc
-	${RM} -f ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/gretools/gretools.pyo
+	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/gretools/gretools.pyc
+	${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/gretools/gretools.pyo
 	${PYTHON_CMD} -m compileall \
 		-d ${PYTHONPREFIX_SITELIBDIR}/gretools \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/gretools
diff --git a/games/grubik/Makefile b/games/grubik/Makefile
index 93af7ef6e7a8..7304e97ae140 100644
--- a/games/grubik/Makefile
+++ b/games/grubik/Makefile
@@ -16,7 +16,7 @@ USES=		tar:tgz gnustep
 USE_GNUSTEP=	back build
 
 post-patch:
-	${RM} -rf ${WRKSRC}/GRubik.app/ix86
+	${RM} -r ${WRKSRC}/GRubik.app/ix86
 	${REINPLACE_CMD} -e 's|^//|# //|' \
 		-e "/GNUSTEP_INSTALLATION_DIR/d" ${WRKSRC}/GNUmakefile
 
diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index 1e2fc613e6d7..2396e1b71224 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -49,8 +49,8 @@ post-patch:
 	@for dir in ${DATASRC} ${SOUNDSRC} ${MUSICSRC}; do \
 		${FIND} $${dir} -name "Makefile*" -delete; \
 	done
-	@${RM} -f ${WRKSRC}/lib/getopt.h
-	@${RM} -f ${WRKSRC}/doc/*.info*
+	@${RM} ${WRKSRC}/lib/getopt.h
+	@${RM} ${WRKSRC}/doc/*.info*
 
 post-install:
 .for dir in levels pics tilesets
diff --git a/games/jigzo/Makefile b/games/jigzo/Makefile
index 09abb2bdee3b..63134635896d 100644
--- a/games/jigzo/Makefile
+++ b/games/jigzo/Makefile
@@ -41,7 +41,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|${i}/|${DATADIR}/${i}/|g" \
 	    ${WRKSRC}/src/main.cxx
 .endfor
-	@${FIND} ${WRKSRC} -name .thumbnails | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC} -name .thumbnails | ${XARGS} ${RM} -r
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
diff --git a/games/jools/Makefile b/games/jools/Makefile
index 239be8eea76d..2ec7e0b2b6f2 100644
--- a/games/jools/Makefile
+++ b/games/jools/Makefile
@@ -32,7 +32,7 @@ post-extract:
 .endfor
 
 post-patch:
-	@${FIND} ${WRKSRC} -name ".arch-ids" | ${XARGS} ${RM} -fr
+	@${FIND} ${WRKSRC} -name ".arch-ids" | ${XARGS} ${RM} -r
 	@${FIND} ${WRKSRC} -name ".arch-ids" -delete \
 		-or -name ".placeholder" -delete
 
diff --git a/games/kobodeluxe/Makefile b/games/kobodeluxe/Makefile
index dce333f8007a..33358fdbcef0 100644
--- a/games/kobodeluxe/Makefile
+++ b/games/kobodeluxe/Makefile
@@ -45,7 +45,7 @@ post-patch:
 		${WRKSRC}/enemy.cpp
 
 post-install:
-	@${RM} -rf ${STAGEDIR}/var
+	@${RM} -r ${STAGEDIR}/var
 	${INSTALL_DATA} ${WRKSRC}/icons/Ubuntu/kobodeluxe.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/icons/Ubuntu/kobo-icon.xpm \
diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile
index 92d78e01f067..e802ffaa7739 100644
--- a/games/ldmud/Makefile
+++ b/games/ldmud/Makefile
@@ -66,7 +66,7 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc && ${FIND} . \
 		| ${CPIO} -pdmu ${STAGEDIR}${DOCSDIR}
-	@${RM} -f ${STAGEDIR}${DOCSDIR}/Makefile
+	@${RM} ${STAGEDIR}${DOCSDIR}/Makefile
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/linux-unrealgold/Makefile b/games/linux-unrealgold/Makefile
index c5ee895b149a..6e5c17d1d524 100644
--- a/games/linux-unrealgold/Makefile
+++ b/games/linux-unrealgold/Makefile
@@ -97,7 +97,7 @@ do-extract:
 .for group in System_English Sounds_All System_All Manual_English
 	@${CP} -Rp ${WRKDIR}/source/${group}/ \
 		${WRKDIR}/source/${group:S,_English,,:S,_All,,}
-	@${RM} -rf ${WRKDIR}/source/${group}
+	@${RM} -r ${WRKDIR}/source/${group}
 .endfor
 	@${MV} ${WRKDIR}/source/Sounds_English ${WRKDIR}/source/Sounds/int
 # Original CD
diff --git a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile
index 94b385db0573..195ec22ce831 100644
--- a/games/linux-ut2003-demo/Makefile
+++ b/games/linux-ut2003-demo/Makefile
@@ -52,7 +52,7 @@ do-extract:
 	@cd ${WRKSRC} && ${TAR} zxf setupstuff.tar.gz
 
 pre-install:
-	@${RM} -f ${PLIST}
+	@${RM} ${PLIST}
 	@cd ${WRKSRC} && \
 	${FIND} ${LIBDIRS} -type f | ${SORT} \
 		| ${SED} -e 's|^|${UTDIR_REL}/|' >> ${PLIST}
diff --git a/games/marsnomercy/Makefile b/games/marsnomercy/Makefile
index a94e86d5aa4f..f1af4bad6c7b 100644
--- a/games/marsnomercy/Makefile
+++ b/games/marsnomercy/Makefile
@@ -50,6 +50,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/mars-nomercy ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/mars ${STAGEDIR}${PREFIX}/libexec/mars
 	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
-	@${RM} -f ${STAGEDIR}${DATADIR}/SConscript
+	@${RM} ${STAGEDIR}${DATADIR}/SConscript
 
 .include <bsd.port.mk>
diff --git a/games/njam/Makefile b/games/njam/Makefile
index f62bbcd1bd93..afc449540124 100644
--- a/games/njam/Makefile
+++ b/games/njam/Makefile
@@ -29,7 +29,7 @@ DESKTOP_ENTRIES="njam" \
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	@${RM} -f ${WRKSRC}/src/*.o
+	@${RM} ${WRKSRC}/src/*.o
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib/games|/var/games|' \
diff --git a/games/numptyphysics-npcomplete/Makefile b/games/numptyphysics-npcomplete/Makefile
index 2998715b8d49..ed2898fbbc22 100644
--- a/games/numptyphysics-npcomplete/Makefile
+++ b/games/numptyphysics-npcomplete/Makefile
@@ -21,7 +21,7 @@ DATADIR=	${PREFIX}/share/numptyphysics
 
 post-extract:
 # this level will crash the game
-	@${RM} -f "${WRKSRC}/L02_bridge Gaps tut.nph"
+	@${RM} "${WRKSRC}/L02_bridge Gaps tut.nph"
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/games/optimax/Makefile b/games/optimax/Makefile
index d4dea428f2f1..06f245850e15 100644
--- a/games/optimax/Makefile
+++ b/games/optimax/Makefile
@@ -26,7 +26,7 @@ ALL_TARGET=	exmars
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/fsh94nop0.2
+	@${RM} -r ${WRKSRC}/fsh94nop0.2
 	@${MV} ${WRKDIR}/fsh* ${WRKDIR}/optimax/fsh* ${WRKSRC}
 
 post-patch:
diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index fbdf1be55455..cab806b35f88 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -45,7 +45,7 @@ post-patch:
 		-e 's|^Exec.*|Exec=${PORTNAME}|' \
 		${WRKSRC}/data/pysol.desktop
 	@${FIND} ${WRKDIR} -name .thumbnails -or -name .xvpics | \
-		${XARGS} ${RM} -rf
+		${XARGS} ${RM} -r
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 
 post-patch-NLS-off:
@@ -58,7 +58,7 @@ post-install:
 
 post-install-CARDSETS-on:
 .for cdir in ${CARDSET_DUPS}
-	@${RM} -rf ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION}/cardset-${cdir}
+	@${RM} -r ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION}/cardset-${cdir}
 .endfor
 	@cd ${WRKDIR}/PySolFC-Cardsets-${PORTVERSION} && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}
diff --git a/games/pythonchess/Makefile b/games/pythonchess/Makefile
index 855b5e119d64..4e7986baf1ef 100644
--- a/games/pythonchess/Makefile
+++ b/games/pythonchess/Makefile
@@ -31,7 +31,7 @@ DESKTOP_ENTRIES="Python Chess" "" "${PORTNAME}" \
 
 post-patch:
 	@${FIND} ${WRKDIR} -name Thumbs.db -or -name pygame2exe_Chess.py | \
-		${XARGS} ${RM} -fr
+		${XARGS} ${RM} -r
 	@${REINPLACE_CMD} -e 's|^.*#!.*python.*$$|#!${PYTHON_CMD}|' \
 		${WRKSRC}/*.py
 	@(cd ${WRKSRC} && ${RM} *.py.bak)
diff --git a/games/q2pro/Makefile b/games/q2pro/Makefile
index ec145d6836bd..85a250ad2bb2 100644
--- a/games/q2pro/Makefile
+++ b/games/q2pro/Makefile
@@ -129,7 +129,7 @@ generate-distfile:
 	svn export -r${SVN_REV} \
 		https://svn.sourceforge.net/svnroot/q2pro/q2pro q2pro
 	${TAR} jcf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} q2pro
-	${RM} -rf q2pro
+	${RM} -r q2pro
 
 .include "${.CURDIR}/../quake2-data/Makefile.include"
 .include <bsd.port.mk>
diff --git a/games/quadra/Makefile b/games/quadra/Makefile
index cd5af5a06620..e09952fb04ac 100644
--- a/games/quadra/Makefile
+++ b/games/quadra/Makefile
@@ -39,6 +39,6 @@ maint-gen-distfile:
 	fi
 	svn export -r${SVN_REV} ${SVN_SRC} ${PORTNAME}-${PORTVERSION}
 	${TAR} cjf ${DISTDIR}/${DISTNAME}.tar.bz2 ${PORTNAME}-${PORTVERSION}
-	${RM} -rf ${PORTNAME}-${PORTVERSION}
+	${RM} -r ${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/games/quake-dpmod/Makefile b/games/quake-dpmod/Makefile
index a8ad8a8c1493..2bae302b2f86 100644
--- a/games/quake-dpmod/Makefile
+++ b/games/quake-dpmod/Makefile
@@ -22,7 +22,7 @@ DATADIR=	${Q1DIR}/${PORTNAME}
 
 post-extract:
 # Remove CVS directories
-	@${FIND} ${WRKSRC} -type d -name CVS -print0 | ${XARGS} -0 ${RM} -rf
+	@${FIND} ${WRKSRC} -type d -name CVS -print0 | ${XARGS} -0 ${RM} -r
 # Fix permissions
 	@${CHMOD} go-w ${WRKSRC}/dpmod/progs.dat
 
diff --git a/games/quake3-data/Makefile b/games/quake3-data/Makefile
index bb3bb05dc5cd..80ecbfeea958 100644
--- a/games/quake3-data/Makefile
+++ b/games/quake3-data/Makefile
@@ -30,7 +30,7 @@ TEAMARENA_DESC=		Install Quake III Team Arena data files
 .include <bsd.port.options.mk>
 
 do-extract:
-	@${RM} -rf ${WRKSRC}
+	@${RM} -r ${WRKSRC}
 	@${MKDIR} ${WRKSRC}
 	@${TAIL} +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} xzf - -C ${WRKSRC}
diff --git a/games/rnd_jue/Makefile b/games/rnd_jue/Makefile
index 0ed7ede6e81b..42f04199202f 100644
--- a/games/rnd_jue/Makefile
+++ b/games/rnd_jue/Makefile
@@ -56,10 +56,10 @@ post-extract-script:
 		"Tutorial Alpha" rnd_tutorial_alpha)
 
 	@(cd ${WRKSRC}/levels/"Walpurgis Collection" && \
-		${RM} -fr "Walpurgis Gardens" "Walpurgis World")
-	@(cd ${WRKSRC}/levels/rnd_the_h_world && ${RM} -fr hwld_dceos)
-	@${RM} -f ${WRKDIR}/${PORTNAME}/Readme.txt
-	@${RM} -f ${WRKSRC}/levels/Readme.txt
+		${RM} -r "Walpurgis Gardens" "Walpurgis World")
+	@(cd ${WRKSRC}/levels/rnd_the_h_world && ${RM} -r hwld_dceos)
+	@${RM} ${WRKDIR}/${PORTNAME}/Readme.txt
+	@${RM} ${WRKSRC}/levels/Readme.txt
 
 post-patch:
 	@${REINPLACE_CMD} \
diff --git a/games/rockdodger/Makefile b/games/rockdodger/Makefile
index e6e36de81e3d..02cb6a9b3e84 100644
--- a/games/rockdodger/Makefile
+++ b/games/rockdodger/Makefile
@@ -28,7 +28,7 @@ DESKTOP_ENTRIES="Rock Dodger" "" "${PORTNAME}" \
 post-extract:
 	${TAR} xfjp ${_DISTDIR}/${PORTNAME}_music${EXTRACT_SUFX} -C \
 		${WRKSRC}/data/
-	@cd ${WRKSRC}/data ; ${RM} -f *.mod
+	@cd ${WRKSRC}/data ; ${RM} *.mod
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@gamesdir@|${DATADIR}|; \
diff --git a/games/rocksndiamonds-data/Makefile b/games/rocksndiamonds-data/Makefile
index 9adb5791bf25..5035ed8c8dbc 100644
--- a/games/rocksndiamonds-data/Makefile
+++ b/games/rocksndiamonds-data/Makefile
@@ -104,7 +104,7 @@ post-extract-script:
 	@(cd ${WRKDIR}/${PORTNAME} && ${MV} "Gavin Davidson 2006" \
 		Gavin_Davidson_2006)
 	@(cd ${WRKDIR}/${PORTNAME} && ${MV} "Veysi Orak 2006" Veysi_Orak_2006)
-	@(cd ${WRKDIR}/${PORTNAME} && ${RM} -f Readme.txt levelinfo.conf)
+	@(cd ${WRKDIR}/${PORTNAME} && ${RM} Readme.txt levelinfo.conf)
 
 do-install:
 	@(cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} . \
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 6f0115408110..3df86ff4d1db 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -65,7 +65,7 @@ OPTIONS_DEFINE=	DOCS
 
 post-extract-script:
 	@${MKDIR} ${WRKDIR}/${PORTNAME}
-	@(cd ${WRKDIR}/rnd_jue*/levels/rnd_jue && ${RM} -fr jue_sobigo)
+	@(cd ${WRKDIR}/rnd_jue*/levels/rnd_jue && ${RM} -r jue_sobigo)
 	@(cd ${WRKDIR}/rnd_jue*/levels && ${COPYTREE_SHARE} rnd_jue \
 		${WRKDIR}/${PORTNAME})
 .for l in ${LEVELS_ARTSOFT:S/$/.zip/} ${LEVELS_BD_FANS:S/$/.zip/}
@@ -75,7 +75,7 @@ post-extract-script:
 		${_DISTDIR}/Tutorial_Alpha.zip
 	@(cd ${WRKDIR}/${PORTNAME}/Tutorials && \
 		${MV} "Tutorial Alpha" rnd_tutorial_alpha)
-	@${RM} -f ${WRKDIR}/${PORTNAME}/Readme.txt
+	@${RM} ${WRKDIR}/${PORTNAME}/Readme.txt
 
 post-patch:
 	@${REINPLACE_CMD} \
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 3a7fa520e580..f8f45710cc47 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -48,7 +48,7 @@ PLIST_FILES=	bin/scorched3d \
 PORTDATA=	*
 
 post-extract:
-	@${RM} -f ${WRKSRC}/src/client/GLEXT/[a-z]*
+	@${RM} ${WRKSRC}/src/client/GLEXT/[a-z]*
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/games/sdb/Makefile b/games/sdb/Makefile
index 3b97a33d0bf8..475203762957 100644
--- a/games/sdb/Makefile
+++ b/games/sdb/Makefile
@@ -51,7 +51,7 @@ PLIST_SUB+=	MODEL_SUFFIX="md2b"
 post-extract:
 	${RM} ${WRKSRC}/models/*
 	@cd ${WRKSRC}/models && \
-		${RM} -f * && \
+		${RM} * && \
 		${UNZIP_CMD} -qj ${DISTDIR}/shotgun-debugger-1.0.mac-ppc.zip \
 			'sdb-1.0-macosx/models/*.md2b'
 .endif
diff --git a/games/sdl_jewels/Makefile b/games/sdl_jewels/Makefile
index af07b0bef9fa..17b41d35d3b5 100644
--- a/games/sdl_jewels/Makefile
+++ b/games/sdl_jewels/Makefile
@@ -28,7 +28,7 @@ DESKTOP_ENTRIES="SDL Jewels" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;BoardGame;" ""
 
 post-patch:
-	@${RM} -rf ${WRKSRC}/data/CVS
+	@${RM} -r ${WRKSRC}/data/CVS
 	@${REINPLACE_CMD} -e 's|data/bigfont.ppm|${DATADIR}/data/bigfont.ppm| ; \
 	s|dirlist\[\]="data";|dirlist[]="${DATADIR}/data";| ; \
 	s|char name[256],|char name[512],|' \
diff --git a/games/stransball2/Makefile b/games/stransball2/Makefile
index 72f5f983afcf..b9898c9b427a 100644
--- a/games/stransball2/Makefile
+++ b/games/stransball2/Makefile
@@ -27,7 +27,7 @@ PORTDOCS=	*
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	@${RM} -f ${WRKSRC}/sound/WS_FTP.LOG
+	@${RM} ${WRKSRC}/sound/WS_FTP.LOG
 
 post-patch:
 	@${FIND} ${BUILD_WRKSRC} -name '*.cpp' | ${XARGS} ${REINPLACE_CMD} \
diff --git a/games/trigger-data/Makefile b/games/trigger-data/Makefile
index 417723c7ffa5..1db1f7e988ab 100644
--- a/games/trigger-data/Makefile
+++ b/games/trigger-data/Makefile
@@ -24,7 +24,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/trigger.png
 .endfor
 # Avoid conflict with trigger-rally
-	@${RM} -f ${STAGEDIR}${DATADIR}/COPYING* \
+	@${RM} ${STAGEDIR}${DATADIR}/COPYING* \
 		${STAGEDIR}${DATADIR}/README*
 
 .include <bsd.port.mk>
diff --git a/games/tuxpaint/Makefile b/games/tuxpaint/Makefile
index 8bead808b02c..b402e45816fa 100644
--- a/games/tuxpaint/Makefile
+++ b/games/tuxpaint/Makefile
@@ -47,7 +47,7 @@ OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${CHMOD} -R a+rX ${WRKSRC}
-	@${RM} -rf ${WRKSRC}/fonts/locale/vi_docs
+	@${RM} -r ${WRKSRC}/fonts/locale/vi_docs
 
 post-patch:
 .for file in src/tuxpaint-import.sh src/tp_magic_api.h.in src/tuxpaint.conf \
diff --git a/games/ufoai-data/Makefile b/games/ufoai-data/Makefile
index 96403a3707fa..d3774e3099f0 100644
--- a/games/ufoai-data/Makefile
+++ b/games/ufoai-data/Makefile
@@ -32,7 +32,7 @@ post-extract:
 	@${RM} ${WRKSRC}/base/*.pk3
 
 pre-install:
-	@${RM} -f ${PLIST}
+	@${RM} ${PLIST}
 	@cd ${WRKSRC}/base && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/base/|' >> ${PLIST}
 
diff --git a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile
index 731e37e55abd..27e998176005 100644
--- a/games/ultimatestunts/Makefile
+++ b/games/ultimatestunts/Makefile
@@ -43,7 +43,7 @@ DESKTOP_ENTRIES="Ultimate Stunts" "" "${PORTNAME}" \
 .include <bsd.port.options.mk>
 
 post-extract:
-	@${FIND} ${WRKSRC} -name .svn -print0 | ${XARGS} -0 ${RM} -fr
+	@${FIND} ${WRKSRC} -name .svn -print0 | ${XARGS} -0 ${RM} -r
 	@(cd ${WRKSRC} && ${CP} ${PORTNAME}.conf.in ${PORTNAME}.conf)
 
 post-patch:
diff --git a/games/vectoroids/Makefile b/games/vectoroids/Makefile
index c7cd76125ed9..a9227bb5f52a 100644
--- a/games/vectoroids/Makefile
+++ b/games/vectoroids/Makefile
@@ -23,7 +23,7 @@ DESKTOP_ENTRIES="Vectoroids" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ""
 
 post-patch:
-	@${FIND} ${WRKDIR} -name .xvpics | ${XARGS} ${RM} -fr
+	@${FIND} ${WRKDIR} -name .xvpics | ${XARGS} ${RM} -r
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
diff --git a/games/worldofpadman/Makefile b/games/worldofpadman/Makefile
index c9acc8071e25..1e9a434188a5 100644
--- a/games/worldofpadman/Makefile
+++ b/games/worldofpadman/Makefile
@@ -154,6 +154,6 @@ generate-distfile:
 	fi
 	svn export https://wop-engine.svn.sourceforge.net/svnroot/wop-engine/trunk ${SRC_FILE}
 	tar cjf ${DISTDIR}/${SRC_FILE}.tar.bz2 ${SRC_FILE}
-	${RM} -rf ${SRC_FILE}
+	${RM} -r ${SRC_FILE}
 
 .include <bsd.port.mk>
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 7efa7842d5f0..6488ee84dae8 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -61,7 +61,7 @@ BROKEN=		does not build with gcc 4.2
 .endif
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/src/ode
+	@${RM} -r ${WRKSRC}/src/ode
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/lua5.1/lua-${LUA_VER}/g" ${WRKSRC}/configure
diff --git a/games/znibbles/Makefile b/games/znibbles/Makefile
index 9915290a2d14..b9baf208c2fd 100644
--- a/games/znibbles/Makefile
+++ b/games/znibbles/Makefile
@@ -29,7 +29,7 @@ GTK1_PLIST_FILES=	bin/gznibbles man/man6/gznibbles.6.gz
 GTK1_CONFIGURE_ENABLE=	gtk
 
 post-extract:
-	@${RM} -f ${WRKSRC}/src/getopt.h
+	@${RM} ${WRKSRC}/src/getopt.h
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/german/BBBike/Makefile b/german/BBBike/Makefile
index f67a3ab694d0..28cd5687db81 100644
--- a/german/BBBike/Makefile
+++ b/german/BBBike/Makefile
@@ -76,19 +76,19 @@ do-build:
 	${MV} ${WRKSRC}/$f ${WRKSRC}/$f.tmp
 	${ECHO_CMD} "#! ${PERL}" > ${WRKSRC}/$f
 	${CAT} ${WRKSRC}/$f.tmp >> ${WRKSRC}/$f
-	${RM} -f ${WRKSRC}/$f.tmp
+	${RM} ${WRKSRC}/$f.tmp
 	${CHMOD} 0755 ${WRKSRC}/$f
 .endfor
 
 do-install:
-	-${RM} -rf ${MYDESTDIR}
+	-${RM} -r ${MYDESTDIR}
 	${INSTALL_MAN} ${WRKSRC}/bbbike.1 ${STAGEDIR}${PREFIX}/man/man1
 	${FIND} ${WRKSRC} | ${XARGS} ${CHMOD} ugo+r
 	${FIND} ${WRKSRC} -perm -u=x | ${XARGS} ${CHMOD} go+x
 	${CP} -rp ${WRKSRC} ${MYDESTDIR}
-	${RM} -f ${MYDESTDIR}/bbbike.1
+	${RM} ${MYDESTDIR}/bbbike.1
 .for f in ${BBBIKE_PERL_EXE}
-	-${RM} -f ${STAGEDIR}${PREFIX}/bin/$f
+	-${RM} ${STAGEDIR}${PREFIX}/bin/$f
 	${LN} -s  ../BBBike/$f ${STAGEDIR}${PREFIX}/bin/$f
 .endfor
 
diff --git a/german/mediathek/Makefile b/german/mediathek/Makefile
index b59f1d666ca3..0a1dc483057a 100644
--- a/german/mediathek/Makefile
+++ b/german/mediathek/Makefile
@@ -47,7 +47,7 @@ DESKTOP_ENTRIES="MediathekView" \
 		false
 
 do-extract:
-	@${RM} -rf ${WRKDIR}
+	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKSRC}
 	@${UNZIP_CMD} -q -d ${WRKSRC} ${DISTDIR}/${EXTRACT_ONLY}
 
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 7d501433355f..afbc0cf78379 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -33,10 +33,10 @@ CONFIGURE_ARGS=	--with-x=no
 .endif
 
 post-extract:
-	@${RM} -f ${WRKSRC}/doc/aalib.info*
+	@${RM} ${WRKSRC}/doc/aalib.info*
 
 post-patch:
-	@${RM} -f ${WRKSRC}/config.cache
+	@${RM} ${WRKSRC}/config.cache
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
 		s|MAKEINFO=makeinfo|MAKEINFO="makeinfo --no-split"|g' \
 		${WRKSRC}/configure
diff --git a/graphics/acidwarp/Makefile b/graphics/acidwarp/Makefile
index 3ea7f7671417..b79db771d7b0 100644
--- a/graphics/acidwarp/Makefile
+++ b/graphics/acidwarp/Makefile
@@ -29,7 +29,7 @@ BINMODE=	4555
 .endif
 
 post-extract:
-	${RM} -f ${WRKSRC}/acidwarp
+	${RM} ${WRKSRC}/acidwarp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/acidwarp ${STAGEDIR}${PREFIX}/bin
diff --git a/graphics/blender-doc/Makefile b/graphics/blender-doc/Makefile
index 6bb747fe11e5..b4d15fe83f14 100644
--- a/graphics/blender-doc/Makefile
+++ b/graphics/blender-doc/Makefile
@@ -21,7 +21,7 @@ post-extract:
 	@${CHMOD} u+rwx ${WRKSRC}/* && ${CHMOD} u+rwx ${WRKSRC}/*/* && \
 		${CHMOD} u+rwx ${WRKSRC}/*/*/* && ${CHMOD} u+rwx ${WRKSRC}/*/*/*/*
 	@cd ${WRKSRC}/htmlI/PartAT/volumetrics/gfx/ && \
-		${RM} -rf  "Nuova cartella" "Nuova cartella (2)"
+		${RM} -r  "Nuova cartella" "Nuova cartella (2)"
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/graphics/compupic/Makefile b/graphics/compupic/Makefile
index 24c635e6c913..a55ed19067ef 100644
--- a/graphics/compupic/Makefile
+++ b/graphics/compupic/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 do-install:
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTNAME}.tar.gz \
 		${EXTRACT_AFTER_ARGS} -C ${STAGEDIR}${PREFIX}
-	${RM} -f ${STAGEDIR}${PREFIX}/bin/compupic
+	${RM} ${STAGEDIR}${PREFIX}/bin/compupic
 	${LN} -sf ${PREFIX}/compupic/compupic ${STAGEDIR}${PREFIX}/bin/compupic
 	${INSTALL_MAN} ${STAGEDIR}${PREFIX}/compupic/compupic.1 \
 		${STAGEDIR}${PREFIX}/man/man1
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 26617b3a30d4..1afb11b0af45 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -34,6 +34,6 @@ PKGHELP=	${.CURDIR}/pkg-help
 .include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
 
 post-install:
-	@${RM} -rf ${STAGEDIR}/etc/OpenCL
+	@${RM} -r ${STAGEDIR}/etc/OpenCL
 
 .include <bsd.port.mk>
diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile
index 66d337e20880..b2bda40383dd 100644
--- a/graphics/exact-image/Makefile
+++ b/graphics/exact-image/Makefile
@@ -38,7 +38,7 @@ PLIST_FILES=	${BINS:S|^|bin/|} \
 		%%PYTHON_SITELIBDIR%%/_ExactImage.so
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/agg-2.4/
+	@${RM} -r ${WRKSRC}/agg-2.4/
 
 post-patch:
 	@${REINPLACE_CMD} -e '1s|/.*|/bin/sh|;s|/usr/local|${LOCALBASE}|;\
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 22ad58378bc3..452d716e20ef 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -114,14 +114,14 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/GNUmakefile
 	@${REINPLACE_CMD} -e 's|-lminizip|-lkmlminizip|' ${WRKSRC}/configure
 # Cleanup bundled libraries
-	@${RM} -fr ${WRKSRC}/frmts/gif/giflib/
-	@${RM} -fr ${WRKSRC}/frmts/gtiff/libgeotiff/
-	@${RM} -fr ${WRKSRC}/frmts/gtiff/libtiff/
-	@${RM} -fr ${WRKSRC}/frmts/jpeg/libjpeg/
-	@${RM} -fr ${WRKSRC}/frmts/jpeg/libjpeg12/
-	@${RM} -fr ${WRKSRC}/frmts/png/libpng/
-	@${RM} -fr ${WRKSRC}/frmts/zlib/
-	@${RM} -fr ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/
+	@${RM} -r ${WRKSRC}/frmts/gif/giflib/
+	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/
+	@${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/
+	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg/
+	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg12/
+	@${RM} -r ${WRKSRC}/frmts/png/libpng/
+	@${RM} -r ${WRKSRC}/frmts/zlib/
+	@${RM} -r ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile
index f0be63c2d290..fa923f281cca 100644
--- a/graphics/ilmbase/Makefile
+++ b/graphics/ilmbase/Makefile
@@ -35,7 +35,7 @@ regression-test regression test check:	build
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libHalf.so.${VER}
-	${RM} -f ${STAGEDIR}${PREFIX}/lib/*.la
+	${RM} ${STAGEDIR}${PREFIX}/lib/*.la
 .for l in libIex libIexMath libImath libIlmThread
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${l}-${MAJORVER}.so.${VER}
 	${LN} -s ${l}-${MAJORVER}.so.${VER} ${STAGEDIR}${PREFIX}/lib/${l}.so
diff --git a/graphics/libboard/Makefile b/graphics/libboard/Makefile
index 6a2c5c8a9835..5f7cef89763a 100644
--- a/graphics/libboard/Makefile
+++ b/graphics/libboard/Makefile
@@ -43,13 +43,13 @@ post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
-	${RM} -rf ${STAGEDIR}${DOCSDIR}/.svn
+	${RM} -r ${STAGEDIR}${DOCSDIR}/.svn
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/
 	cd ${WRKSRC}/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${EXAMPLESDIR}/
-	${RM} -rf ${STAGEDIR}${EXAMPLESDIR}/.svn
+	${RM} -r ${STAGEDIR}${EXAMPLESDIR}/.svn
 .endif
 
 regression-test:
diff --git a/graphics/libglapi/Makefile b/graphics/libglapi/Makefile
index 57fc54a667d7..b3f98cea3430 100644
--- a/graphics/libglapi/Makefile
+++ b/graphics/libglapi/Makefile
@@ -27,8 +27,8 @@ MESA_INSTALL_WRKSRC=	src/mapi
 .include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
 
 post-install:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/include/GLES*
-	@${RM} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so*
-	@${RM} -f ${STAGEDIR}${PREFIX}/libdata/pkgconfig/glesv2.pc
+	@${RM} -r ${STAGEDIR}${PREFIX}/include/GLES*
+	@${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so*
+	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/glesv2.pc
 
 .include <bsd.port.mk>
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 9c2da2d1625e..0cec95467f38 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -37,7 +37,7 @@ X11_MAKE_ENV=	WITH_X11=yes
 MANPAGES_DISTFILES=	netpbm-manpages-2013-03-09${EXTRACT_SUFX}:man
 
 post-extract-X11-off:
-	@-${RM} -f ${WRKDIR}/doc/pamx.1 # only relevant for MANPAGES=on
+	@-${RM} ${WRKDIR}/doc/pamx.1 # only relevant for MANPAGES=on
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|doc/USERDOC|${DOCSDIR}/USERDOC|g' \
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 898e2d81001b..568ffc55010b 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -71,7 +71,7 @@ PLIST_SUB+=	UNAMEP=${ARCH}
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${RM} -f ${WRKSRC}/include/stamp-h.in
+	@${RM} ${WRKSRC}/include/stamp-h.in
 .for dir in doc help html man
 	@${FIND} ${WRKSRC}/${dir} -type f | ${XARGS} \
 		${REINPLACE_CMD} -e "s;/usr/lpp;${PREFIX};g"
diff --git a/graphics/p5-Image-IPTCInfo/Makefile b/graphics/p5-Image-IPTCInfo/Makefile
index 59b96b465636..618d2e95c02d 100644
--- a/graphics/p5-Image-IPTCInfo/Makefile
+++ b/graphics/p5-Image-IPTCInfo/Makefile
@@ -18,7 +18,7 @@ SHEBANG_FILES=	demo.pl
 OPTIONS_DEFINE=	EXAMPLES
 
 post-patch:
-	@${RM} -f ${WRKSRC}/._*
+	@${RM} ${WRKSRC}/._*
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/graphics/p5-SVG-Metadata/Makefile b/graphics/p5-SVG-Metadata/Makefile
index 9ab5f9f00dd2..698811608801 100644
--- a/graphics/p5-SVG-Metadata/Makefile
+++ b/graphics/p5-SVG-Metadata/Makefile
@@ -18,6 +18,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
-	${RM} -f ${WRKSRC}/lib/SVG/Metadata.pm.orig
+	${RM} ${WRKSRC}/lib/SVG/Metadata.pm.orig
 
 .include <bsd.port.mk>
diff --git a/graphics/processing/Makefile b/graphics/processing/Makefile
index 15aa06ad97a1..0e7473f97805 100644
--- a/graphics/processing/Makefile
+++ b/graphics/processing/Makefile
@@ -27,7 +27,7 @@ SUB_FILES=	processing
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 post-extract:
-	${RM} -rf ${WRKSRC}/java
+	${RM} -r ${WRKSRC}/java
 	${MV} ${WRKSRC}/processing ${WRKSRC}/start-processing
 	${LN} -s ${JAVA_HOME} ${WRKSRC}/java
 	${FIND} ${WRKSRC}/modes/java/reference/ -exec ${CHMOD} 555 {} \;
diff --git a/graphics/py-graphy/Makefile b/graphics/py-graphy/Makefile
index ad08dd14ee42..c2c0f4d85e21 100644
--- a/graphics/py-graphy/Makefile
+++ b/graphics/py-graphy/Makefile
@@ -30,7 +30,7 @@ post-patch:
 		${WRKSRC}/examples/*.py \
 		${WRKSRC}/${PORTNAME}/*.py
 	@${FIND} ${WRKSRC} -name '.svn' -or -name '*.bak' | \
-		${XARGS} ${RM} -rf
+		${XARGS} ${RM} -r
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}
diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile
index efb78c7ddaeb..fd789595dc7e 100644
--- a/graphics/qslim/Makefile
+++ b/graphics/qslim/Makefile
@@ -34,7 +34,7 @@ FLTK_CONFIG=	${LOCALBASE}/bin/fltk-config
 GUI_LIBS=	$$(${FLTK_CONFIG} --use-gl --ldflags)
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/libgfx/
+	@${RM} -r ${WRKSRC}/libgfx/
 
 post-patch:
 	@${REINPLACE_CMD} -e '/gfx-config/d' ${CONFIGURE_WRKSRC}/mix-config.in
diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile
index 91277314d173..c0b2229aed09 100644
--- a/graphics/raster3d/Makefile
+++ b/graphics/raster3d/Makefile
@@ -60,7 +60,7 @@ do-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-	${RM} -rf ${STAGEDIR}${EXAMPLESDIR}/msms/CVS
+	${RM} -r ${STAGEDIR}${EXAMPLESDIR}/msms/CVS
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/structuresynth/Makefile b/graphics/structuresynth/Makefile
index b23b4d068ace..9f029cf5d0ac 100644
--- a/graphics/structuresynth/Makefile
+++ b/graphics/structuresynth/Makefile
@@ -24,7 +24,7 @@ PORTDATA=	*
 
 post-extract:
 	@${MV} "${WRKDIR}/Structure Synth Source Code" ${WRKSRC}
-	@${RM} -rf ${WRKSRC}/Examples/DontDeploy
+	@${RM} -r ${WRKSRC}/Examples/DontDeploy
 
 post-patch:
 	@${REINPLACE_CMD} -e '/examplesDir/ s|"Examples"|"${DATADIR}/Examples"|; \
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 3ea593295ed4..62c35bbd6167 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -53,9 +53,9 @@ USES+=	gettext
 
 post-extract:
 	@cd ${WRKSRC}/Doc && ${FIND} . -type f -name "*.orig" -delete
-	@${RM} -f ${WRKSRC}/Doc/html/images/pspbrwse.jbf
-	@${RM} -f ${WRKSRC}/Libraries/Examples/xfig.exe.stackdump
-	@${RM} -f ${WRKSRC}/Libraries/Fasteners/Fasteners.tar
+	@${RM} ${WRKSRC}/Doc/html/images/pspbrwse.jbf
+	@${RM} ${WRKSRC}/Libraries/Examples/xfig.exe.stackdump
+	@${RM} ${WRKSRC}/Libraries/Fasteners/Fasteners.tar
 	@cd ${WRKSRC}/Doc && ${FIND} -s . -type d -print0 | ${XARGS} -0 ${CHMOD} a+rx
 	@cd ${WRKSRC}/Doc && ${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} a-x+r
 	@${CHMOD} a+rx ${WRKSRC}/Libraries
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 7f0e186c0953..42180c871b04 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -29,10 +29,10 @@ SHEBANG_FILES=	share/bin/imgmerge share/bin/xpaint_ocr
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
-MAKE_ENV+=	RM="${RM} -f"
+MAKE_ENV+=	RM="${RM}"
 
 post-patch:
-	@${RM} -f ${WRKSRC}/XPaint.ad
+	@${RM} ${WRKSRC}/XPaint.ad
 	@${REINPLACE_CMD} -e 's/-ldl //' \
 		${WRKSRC}/configure ${WRKSRC}/rw/configure
 	@${REINPLACE_CMD} -e '/^LIBTOOL =/s|=.*|= ${LOCALBASE}/bin/libtool|' \
diff --git a/graphics/zathura/Makefile b/graphics/zathura/Makefile
index 63968326d7db..3fde4bc43d98 100644
--- a/graphics/zathura/Makefile
+++ b/graphics/zathura/Makefile
@@ -52,7 +52,7 @@ post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's|/etc|${PREFIX}&|g' \
 		${WRKSRC}/zathura/config.h \
 		${WRKSRC}/doc/man/zathurarc.5.rst
-	(cd ${WRKSRC}; ${RM} -f zathura.1 zathurarc.5)
+	(cd ${WRKSRC}; ${RM} zathura.1 zathurarc.5)
 
 post-patch-NLS-off: .SILENT
 	${REINPLACE_CMD} -e '/-C po/d'\
diff --git a/irc/atheme-services/Makefile b/irc/atheme-services/Makefile
index 9b69708cb6fd..3f1072d0d249 100644
--- a/irc/atheme-services/Makefile
+++ b/irc/atheme-services/Makefile
@@ -90,7 +90,7 @@ post-install:
 	@${RMDIR} ${STAGEDIR}/var/log/atheme
 	@${RMDIR} ${STAGEDIR}/var/run/atheme
 .if !${PORT_OPTIONS:MDOCS}
-	@${RM} -Rf ${STAGEDIR}${PREFIX}/share/doc/atheme
+	@${RM} -R ${STAGEDIR}${PREFIX}/share/doc/atheme
 .endif
 
 .include <bsd.port.mk>
diff --git a/irc/eggdrop-devel/Makefile b/irc/eggdrop-devel/Makefile
index 6ffe432588f6..cba37c680c0d 100644
--- a/irc/eggdrop-devel/Makefile
+++ b/irc/eggdrop-devel/Makefile
@@ -118,7 +118,7 @@ do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}/html
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/settings
-	cd ${WRKSRC}/doc/settings && ${RM} -rf CVS \
+	cd ${WRKSRC}/doc/settings && ${RM} -r CVS \
 		&& ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/settings
 
 .include <bsd.port.mk>
diff --git a/irc/epic4/Makefile b/irc/epic4/Makefile
index e284382c9a1b..eea10ecbcfe8 100644
--- a/irc/epic4/Makefile
+++ b/irc/epic4/Makefile
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+=	--with-termcap
 .endif
 
 post-extract:
-	@${FIND} ${WRKDIR} -type d -name CVS | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKDIR} -type d -name CVS | ${XARGS} ${RM} -r
 
 post-patch:
 	@${RM} ${WRKDIR}/help/Makefile
diff --git a/irc/gseen.mod/Makefile b/irc/gseen.mod/Makefile
index 317c9e773b38..963650c2fc31 100644
--- a/irc/gseen.mod/Makefile
+++ b/irc/gseen.mod/Makefile
@@ -27,7 +27,7 @@ MAKE_JOBS_UNSAFE=	yes
 SUB_FILES=	pkg-message
 
 do-extract:
-	@${RM} -rf ${WRKDIR}
+	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	@${CP} -R $$(${MAKE} -C ${PORTSDIR}/irc/eggdrop -V WRKSRC) ${WRKSRC}
 	cd ${WRKSRC}/src/mod && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS}
diff --git a/irc/irssi-dcc_send_limiter/Makefile b/irc/irssi-dcc_send_limiter/Makefile
index 9454bab92cc5..ce9846c6bfe2 100644
--- a/irc/irssi-dcc_send_limiter/Makefile
+++ b/irc/irssi-dcc_send_limiter/Makefile
@@ -29,7 +29,7 @@ PLIST_FILES=	lib/irssi/modules/lib/${DISTNAME}.so
 CFLAGS+=	-shared -fPIC -I${LOCALBASE}/include/irssi -I${LOCALBASE}/include/irssi/src -I${LOCALBASE}/include/irssi/src/core -I${LOCALBASE}/include/irssi/src/irc/core -I${LOCALBASE}/include/irssi/src/irc/dcc `pkg-config --cflags glib-2.0`
 
 do-extract:
-	@${RM} -rf ${WRKSRC}
+	@${RM} -r ${WRKSRC}
 	@${MKDIR} ${WRKSRC}
 	@${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}
 
diff --git a/irc/keitairc2/Makefile b/irc/keitairc2/Makefile
index 62fca32c64b0..3f50cc1fd67d 100644
--- a/irc/keitairc2/Makefile
+++ b/irc/keitairc2/Makefile
@@ -25,10 +25,10 @@ NO_BUILD=	yes
 SHEBANG_FILES=	keitairc
 
 post-extract:
-	${FIND} ${WRKSRC} -name .cvsignore | ${XARGS} ${RM} -rf
+	${FIND} ${WRKSRC} -name .cvsignore | ${XARGS} ${RM} -r
 
 post-patch:
-	${FIND} ${WRKSRC} -name '*.orig' | ${XARGS} ${RM} -rf
+	${FIND} ${WRKSRC} -name '*.orig' | ${XARGS} ${RM} -r
 	${REINPLACE_CMD} -i '' -e "s,/usr/share/keitairc/lib,${DATADIR}/lib,"  \
 		${WRKSRC}/keitairc
 	${REINPLACE_CMD} -i '' -e "s,__KEITAIRC_DATA_DIR__,${DATADIR}/lib,"  \
diff --git a/irc/py-supybot-plugins/Makefile b/irc/py-supybot-plugins/Makefile
index 5cc792dadc55..148f5f7df9c2 100644
--- a/irc/py-supybot-plugins/Makefile
+++ b/irc/py-supybot-plugins/Makefile
@@ -19,7 +19,7 @@ USES=		python tar:bzip2
 post-extract:
 # Delete, because it now included in irc/py-supybot
 .for data in BadWords Dunno Success _darcs
-	@${RM} -rf ${WRKSRC}/${data}
+	@${RM} -r ${WRKSRC}/${data}
 .endfor
 
 do-build:
diff --git a/irc/thales/Makefile b/irc/thales/Makefile
index a3b05217e021..05895ab75cc4 100644
--- a/irc/thales/Makefile
+++ b/irc/thales/Makefile
@@ -55,7 +55,7 @@ CONFIGURE_ARGS:=	--with-ircd=${_IRCD} \
 MODES_CONFIGURE_OFF=	--enable-no-modes
 
 post-patch: .SILENT
-	${FIND} -d ${WRKSRC} -type d -name CVS -exec ${RM} -rf {} \;
+	${FIND} -d ${WRKSRC} -type d -name CVS -exec ${RM} -r {} \;
 	${REINPLACE_CMD} -e 's,thales.conf,${PREFIX}/etc/&,' \
 		${WRKSRC}/src/conf.h
 
diff --git a/irc/xchat-fish/Makefile b/irc/xchat-fish/Makefile
index 97869512f50d..3be609b92301 100644
--- a/irc/xchat-fish/Makefile
+++ b/irc/xchat-fish/Makefile
@@ -31,7 +31,7 @@ PORTDOCS=	FiSH-xchat.txt \
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	${RM} -f ${WRKSRC}/mir*
+	${RM} ${WRKSRC}/mir*
 	${CP} -pf ${FILESDIR}/Makefile ${WRKSRC}/
 
 do-install:
diff --git a/japanese/VTPSfont/Makefile b/japanese/VTPSfont/Makefile
index 26db52ed9e62..8a7600f6a93a 100644
--- a/japanese/VTPSfont/Makefile
+++ b/japanese/VTPSfont/Makefile
@@ -18,7 +18,7 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 do-extract:
-		@${RM} -rf ${WRKSRC}
+		@${RM} -r ${WRKSRC}
 		@${MKDIR} ${WRKSRC}
 		@for file in ${DISTFILES}; do \
 			${CP} ${DISTDIR}/${DIST_SUBDIR}/$${file} ${WRKSRC}; \
diff --git a/japanese/celrw/Makefile b/japanese/celrw/Makefile
index 640eb27bf29c..feeb84a77a8d 100644
--- a/japanese/celrw/Makefile
+++ b/japanese/celrw/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE=	DOCS
 
 post-extract:
 .for file in config.guess config.sub install.sh
-	@${RM} -f ${WRKSRC}/${file}
+	@${RM} ${WRKSRC}/${file}
 	@${TOUCH} ${WRKSRC}/${file}
 .endfor
 
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index debbb3f59e2b..74bdd3d77634 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -83,7 +83,7 @@ NLS_CONFIGURE_ON=	--with-gettext-includes=${LOCALBASE}/include \
 NLS_CONFIGURE_OFF=	--disable-nls
 
 post-extract:
-	${RM} -fr ${WRKSRC}/zlib
+	${RM} -r ${WRKSRC}/zlib
 	${MKDIR} ${WRKDIR}/appendix
 .for file in ${APPENDIXFILES}
 	${TAR} --exclude CVS -C ${WRKDIR}/appendix -zxmf \
diff --git a/japanese/edict-utf-8/Makefile b/japanese/edict-utf-8/Makefile
index c9bf769bde86..e6595a16350d 100644
--- a/japanese/edict-utf-8/Makefile
+++ b/japanese/edict-utf-8/Makefile
@@ -34,7 +34,7 @@ PLIST_SUB= 	OWNER="${SHAREOWN}" GROUP="${SHAREGRP}" MODE="${SHAREMODE}"
 NO_WRKSUBDIR=	yes
 
 do-extract:
-	@${RM} -rf ${WRKSRC}
+	@${RM} -r ${WRKSRC}
 	@${MKDIR} ${WRKSRC}
 	@for file in ${DICTFILES}; do \
 		${ECHO} "Extracting $$file"; \
diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile
index 9a4010d8fc6c..5946950f0eba 100644
--- a/japanese/edict/Makefile
+++ b/japanese/edict/Makefile
@@ -72,7 +72,7 @@ do-install:
 	(cd ${STAGEDIR}${DATADIR} && ${CHMOD} ${SHAREMODE} \
 		${dict:R} ${dict:R}.xjdx)
 .endfor
-	${RM} -f ${STAGEDIR}${PREFIX}/bin/xjdic
+	${RM} ${STAGEDIR}${PREFIX}/bin/xjdic
 	${LN} -s ${PREFIX}/bin/xjdic_sa ${STAGEDIR}${PREFIX}/bin/xjdic
 	(cd ${WRKSRC} && ${INSTALL_DATA} radicals.tm radkfile kanjstroke \
 		romkana.cnv vconj ${STAGEDIR}${DATADIR})
diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index c559d32e2e99..20ce3e6c184b 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -50,7 +50,7 @@ post-patch:
 	    ${WRKSRC}/doc/groff.texinfo
 
 post-build:
-	${RM} -f ${WRKSRC}/doc/groff ${WRKSRC}/doc/groff-*
+	${RM} ${WRKSRC}/doc/groff ${WRKSRC}/doc/groff-*
 	cd ${WRKSRC}/doc && makeinfo --no-split groff.texinfo
 	cd ${WRKSRC} && ${FIND} font -name DESC \
 	    | ${XARGS} ${REINPLACE_CMD} -E \
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index cc88d9f8b6ca..75e391bdca0f 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD} \
 
 post-install:
 .if (${EMACS_PORT_NAME} == "xemacs21-mule")
-	${RM} -f ${WRKDIR}/${MANIFEST}
+	${RM} ${WRKDIR}/${MANIFEST}
 	emacsdir=`${ECHO_CMD} ${EMACSDIR} | ${SED} -e "s;^${PREFIX}/;;"`; \
 	${CAT} ${PLIST} | ${GREP} -e "^$${emacsdir}" | \
 		${SED} -e "s;^$${emacsdir}/;;" > ${WRKDIR}/${MANIFEST}
diff --git a/japanese/mailman/Makefile b/japanese/mailman/Makefile
index b81ce751b296..912e3d3d2894 100644
--- a/japanese/mailman/Makefile
+++ b/japanese/mailman/Makefile
@@ -147,10 +147,10 @@ post-install:
 	    && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 	    -f -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:
-	@${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}
 .for imgfile in ${IMGFILES}
 	${CP} ${STAGEDIR}${MAILMANDIR}/icons/${imgfile} ${STAGEDIR}${PREFIX}/${IMGDIR}
diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile
index d8144d20a268..147d1a394136 100644
--- a/japanese/man-doc/Makefile
+++ b/japanese/man-doc/Makefile
@@ -66,7 +66,7 @@ pre-install:
 # XXX: make gendist generates distfile.  Use with WITH_CVS.
 gendist: extract
 	cd ${WRKDIR} && \
-		${FIND} . -type d -a -name CVS | ${XARGS} ${RM} -rf && \
+		${FIND} . -type d -a -name CVS | ${XARGS} ${RM} -r && \
 		${TAR} czf ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}
 
 .include <bsd.port.mk>
diff --git a/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile b/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
index e44de2cdd87c..d9d0ccb07026 100644
--- a/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
+++ b/japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
@@ -27,7 +27,7 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
-	@${RM} -rf ${WRKSRC}/inc
+	@${RM} -r ${WRKSRC}/inc
 
 .include <bsd.port.pre.mk>
 
diff --git a/java/eclipse-findbugs/Makefile b/java/eclipse-findbugs/Makefile
index d5d030a033dd..740dd0d75edc 100644
--- a/java/eclipse-findbugs/Makefile
+++ b/java/eclipse-findbugs/Makefile
@@ -25,7 +25,7 @@ PLIST_SUB=	\
 	DISTNAME="${DISTNAME}"
 
 post-extract:
-	@${RM} -Rf ${WRKSRC}/src
+	@${RM} -R ${WRKSRC}/src
 
 do-install:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/eclipse/plugins/${DISTNAME})
diff --git a/java/eclipse-shelled/Makefile b/java/eclipse-shelled/Makefile
index 615c935296a0..3eded7ba4199 100644
--- a/java/eclipse-shelled/Makefile
+++ b/java/eclipse-shelled/Makefile
@@ -35,6 +35,6 @@ do-install:
 		| ${SED} -ne 's,^,@dir lib/,p' >> ${TMPPLIST}
 	@${MV} ${WRKSRC}/eclipse/plugins ${WRKSRC}/plugins
 	@${MV} ${WRKSRC}/eclipse/features ${WRKSRC}/features
-	@${RM} -rf ${WRKSRC}/eclipse
+	@${RM} -r ${WRKSRC}/eclipse
 
 .include <bsd.port.mk>
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index e4af9adfe0b2..62f7e087a411 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -110,7 +110,7 @@ do-build:
 		-DbuildId=${ECLIPSE_BUILDID})
 
 do-install:
-	@${RM} -rf ${STAGEDIR}${PORTDESTDIR}
+	@${RM} -r ${STAGEDIR}${PORTDESTDIR}
 	@( cd ${STAGEDIR}${PREFIX}/lib; ${TAR} xfz ${PRODUCT_TARFILE} )
 	@${FIND} ${STAGEDIR}${PREFIX}/lib -type f -name \*.orig -delete
 	@${SED} \
@@ -139,6 +139,6 @@ do-install:
 	@${ECHO_CMD} "@dir share/eclipse/dropins" >> ${TMPPLIST}
 
 distclean:
-	${RM} -rf ${DISTDIR}/eclipse
+	${RM} -r ${DISTDIR}/eclipse
 
 .include <bsd.port.mk>
diff --git a/java/javahelp/Makefile b/java/javahelp/Makefile
index d7d8bdbdfd84..fcf130607401 100644
--- a/java/javahelp/Makefile
+++ b/java/javahelp/Makefile
@@ -23,7 +23,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 post-patch:
 	${REINPLACE_CMD} -e 's|$$JAVAHELP_HOME/javahelp/bin/|${JAVAJARDIR}/|' ${WRKSRC}/javahelp/bin/jhindexer
 	${REINPLACE_CMD} -e 's|$$JAVAHELP_HOME/javahelp/bin/|${JAVAJARDIR}/|' ${WRKSRC}/javahelp/bin/jhsearch
-	(cd ${WRKSRC} && ${RM} -rf `${FIND} . -type d -name .svn`)
+	(cd ${WRKSRC} && ${RM} -r `${FIND} . -type d -name .svn`)
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/LICENSE.html ${STAGEDIR}${JAVAJARDIR}/LICENSE.${PORTNAME}.html
diff --git a/java/jdbcpool/Makefile b/java/jdbcpool/Makefile
index c0dfab23c191..38e0f5218f19 100644
--- a/java/jdbcpool/Makefile
+++ b/java/jdbcpool/Makefile
@@ -20,7 +20,7 @@ PORTDOCS+=	javadoc
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
-	@${FIND} ${WRKSRC} -name CVS -type dir | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC} -name CVS -type dir | ${XARGS} ${RM} -r
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
diff --git a/java/jgraph/Makefile b/java/jgraph/Makefile
index 39c68c1648a4..cd1606b4b49f 100644
--- a/java/jgraph/Makefile
+++ b/java/jgraph/Makefile
@@ -45,7 +45,7 @@ do-build:
 .if ${PORT_OPTIONS:MCOMPILE} || ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKSRC} && ${ANT} ${ANT_TARGETS}
 	@${MV} -f ${WRKSRC}/build/lib/${PORTNAME}.jar ${WRKSRC}/lib
-	@${RM} -fr ${WRKSRC}/doc && \
+	@${RM} -r ${WRKSRC}/doc && \
 		${MV} -f ${WRKSRC}/build/doc/api ${WRKSRC}/doc
 .endif
 
diff --git a/java/jlex/Makefile b/java/jlex/Makefile
index 70224319ac10..cbb18343fefa 100644
--- a/java/jlex/Makefile
+++ b/java/jlex/Makefile
@@ -21,7 +21,7 @@ SUB_FILES=	jlex.sh pkg-message
 SUB_LIST=	JAVAJARDIR=${JAVAJARDIR}
 
 do-extract:
-	@${RM} -rf ${WRKDIR}
+	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	@${CP} ${DISTDIR}/Main.java ${WRKDIR}
 
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index 44c09331a29c..3478a5bfc45e 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -265,11 +265,11 @@ post-build:
 .if ${PORT_OPTIONS:MTZUPDATE}
 	@# Update time zones
 .if defined(BUILD_JRE)
-	@${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi
+	@${RM} -r ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi
 	@${LN} -s -f ${LOCALBASE}/share/java/zi \
 	    ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib
 .else
-	@${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib/zi
+	@${RM} -r ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib/zi
 	@${LN} -s -f ${LOCALBASE}/share/java/zi \
 	    ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib
 .endif
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 2bed337a74e6..7343d924c57b 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -170,11 +170,11 @@ post-patch:
 pre-install:
 	@# Update time zones
 .if !defined(BUILD_JRE)
-	@${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib/zi
+	@${RM} -r ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib/zi
 	@${LN} -s -f ${LOCALBASE}/share/java/zi \
 	    ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib
 .else
-	@${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi
+	@${RM} -r ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi
 	@${LN} -s -f ${LOCALBASE}/share/java/zi \
 	    ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib
 .endif
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 5a145a3888ba..bfb0a3272c19 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -418,7 +418,7 @@ post-build:
 
 post-build-TZUPDATE-on:
 	@# Update time zones
-	@${RM} -rf ${JRE_IMAGEDIR}/lib/zi
+	@${RM} -r ${JRE_IMAGEDIR}/lib/zi
 	@${LN} -sf ${LOCALBASE}/share/java/zi ${JRE_IMAGEDIR}/lib
 
 do-install:
diff --git a/java/visualvm/Makefile b/java/visualvm/Makefile
index 3dc56f712e5a..67f87efd933f 100644
--- a/java/visualvm/Makefile
+++ b/java/visualvm/Makefile
@@ -24,8 +24,8 @@ SUB_FILES=	visualvm.desktop
 
 post-extract:
 	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.dll' -or -name '*.exe' \) -delete
-	@${RM} -rf ${WRKSRC}/profiler/lib/deployed
-	@${RM} -rf ${WRKSRC}/profiler/lib/jfluid-server-15.jar
+	@${RM} -r ${WRKSRC}/profiler/lib/deployed
+	@${RM} -r ${WRKSRC}/profiler/lib/jfluid-server-15.jar
 
 post-patch:
 	@${REINPLACE_CMD} 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/bin/visualvm
diff --git a/java/wildfly100/Makefile b/java/wildfly100/Makefile
index 478e4a28cfed..2020c7e8a9b8 100644
--- a/java/wildfly100/Makefile
+++ b/java/wildfly100/Makefile
@@ -60,8 +60,8 @@ post-patch:
 do-build:
 	${RM} ${WRKSRC}/bin/*.bat
 	${RM} ${WRKSRC}/bin/*.ps1
-	${RM} -rf ${WRKSRC}/bin/service
-	${RM} -rf ${WRKSRC}/bin/init.d
+	${RM} -r ${WRKSRC}/bin/service
+	${RM} -r ${WRKSRC}/bin/init.d
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/wildfly-${PORTVERSION}
diff --git a/java/wildfly90/Makefile b/java/wildfly90/Makefile
index 3e2e73f563aa..89371818925d 100644
--- a/java/wildfly90/Makefile
+++ b/java/wildfly90/Makefile
@@ -59,8 +59,8 @@ post-patch:
 do-build:
 	${RM} ${WRKSRC}/bin/*.bat
 	${RM} ${WRKSRC}/bin/*.ps1
-	${RM} -rf ${WRKSRC}/bin/service
-	${RM} -rf ${WRKSRC}/bin/init.d
+	${RM} -r ${WRKSRC}/bin/service
+	${RM} -r ${WRKSRC}/bin/init.d
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/wildfly-${PORTVERSION}
diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile
index 357477087dbe..5ffa271892ce 100644
--- a/korean/kaistfonts/Makefile
+++ b/korean/kaistfonts/Makefile
@@ -23,7 +23,7 @@ NO_WRKSUBDIR=	yes
 MAKE_ENV=	DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}" FONTSDIR="${FONTSDIR}"
 
 do-extract:
-	@${RM} -fr ${WRKSRC} && \
+	@${RM} -r ${WRKSRC} && \
 	${MKDIR} ${WRKSRC} && \
 	cd ${WRKSRC} && \
 	for file in ${DISTFILES}; do \
diff --git a/korean/ko.TeX/Makefile b/korean/ko.TeX/Makefile
index 6e9554e2acaa..0ad8ac464f1b 100644
--- a/korean/ko.TeX/Makefile
+++ b/korean/ko.TeX/Makefile
@@ -45,8 +45,8 @@ do-build:
 	@${CC} ${CFLAGS} -o ${WRKSRC}/build/hmakeindex \
 		${WRKSRC}/util/hmakeindex.c
 
-	@${RM} -rf ${WRKSRC}/latex/euc/unfonts
-	@${RM} -rf ${WRKSRC}/latex/utf/unfonts
+	@${RM} -r ${WRKSRC}/latex/euc/unfonts
+	@${RM} -r ${WRKSRC}/latex/utf/unfonts
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/korean/man-doc/Makefile b/korean/man-doc/Makefile
index e4e23f4041fc..ea6dc5cc04d2 100644
--- a/korean/man-doc/Makefile
+++ b/korean/man-doc/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/groff:japanese/groff
 post-patch:
 	${SED} -e 's,%%PREFIX%%,${PREFIX},g' -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 		-e 's,gnroff,groff,g' ${WRKSRC}/scripts/kman.in > ${WRKDIR}/kman
-	${RM} -rf ${WRKSRC}/scripts
+	${RM} -r ${WRKSRC}/scripts
 
 do-build:
 	${FIND} ${WRKSRC} -type f | ${XARGS} ${GZIP_CMD}
diff --git a/lang/asis/Makefile b/lang/asis/Makefile
index 54220ad0b23d..abd44ae3043b 100644
--- a/lang/asis/Makefile
+++ b/lang/asis/Makefile
@@ -33,7 +33,7 @@ post-extract:
 		${WRKSRC}/Makefile \
 		${WRKSRC}/Makefile.stub \
 		${WRKSRC}/common.gpr
-	@${RM} -rf ${WRKSRC}/gnat
+	@${RM} -r ${WRKSRC}/gnat
 
 do-build:
 	# This target is recreated because -j cannot be set, but
diff --git a/lang/ats/bsd.ats.mk b/lang/ats/bsd.ats.mk
index 78bb435ff487..9a46bc3220ef 100644
--- a/lang/ats/bsd.ats.mk
+++ b/lang/ats/bsd.ats.mk
@@ -34,7 +34,7 @@ pre-build:
 do-install:
 	${MKDIR} ${ATS_LIBDIR}/contrib
 	cd ${INSTALL_WRKSRC}/contrib && \
-	${RM} -f ${ATS_CTRB}/contrib && \
+	${RM} ${ATS_CTRB}/contrib && \
 	${COPYTREE_SHARE} ${ATS_CTRB} ${ATS_LIBDIR}/contrib
 .if !defined(NOPORTEXAMPLES) && defined(ATS_CTRBEXAMPLE)
 	${MKDIR} ${ATS_CTRBEXAMPLEDIR}
diff --git a/lang/beignet/Makefile b/lang/beignet/Makefile
index 3c2391e9618a..0ffc834e1cd4 100644
--- a/lang/beignet/Makefile
+++ b/lang/beignet/Makefile
@@ -51,7 +51,7 @@ post-patch:
 		${WRKSRC}/CMakeLists.txt
 
 post-install:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/include/CL
+	@${RM} -r ${STAGEDIR}${PREFIX}/include/CL
 
 #post-install-TESTS-on:
 #	@cd ${WRKSRC}/utests && sh ./setenv.sh && ./utest_run
diff --git a/lang/ccl/Makefile b/lang/ccl/Makefile
index df23dd752148..0db44f228fbe 100644
--- a/lang/ccl/Makefile
+++ b/lang/ccl/Makefile
@@ -42,11 +42,11 @@ SUB_FILES=	ccl.sh
 post-patch:
 	@${SED}	-i '' -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/tools/asdf.lisp
 	@${FIND} ${WRKSRC} -name .svn -or -name .cvsignore -or -name "*.orig" \
-		| ${XARGS} ${RM} -r -f
+		| ${XARGS} ${RM} -r
 
 do-build:
-	@${RM} -f ${WRKSRC}/fx86cl ${WRKSRC}/fx86cl64
-	@cd ${WRKSRC}/lisp-kernel/freebsd${LISP_ARCH} && ${MAKE} && ${RM} -f *.o
+	@${RM} ${WRKSRC}/fx86cl ${WRKSRC}/fx86cl64
+	@cd ${WRKSRC}/lisp-kernel/freebsd${LISP_ARCH} && ${MAKE} && ${RM} *.o
 	@cd ${WRKSRC} && ${ECHO_CMD} | ${SETENV} -u CCL_DEFAULT_DIRECTORY ./${FX86CL} --no-init --batch --quiet \
 		--eval "(ccl:rebuild-ccl :full t)" \
 		--eval "(quit)"
@@ -55,7 +55,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ccl
 	${CP} -r ${WRKSRC}/* ${STAGEDIR}${CCL_DIRECTORY}
 	@for i in ${EXCLUDE}; do \
-		${RM} -r -f ${STAGEDIR}${CCL_DIRECTORY}/$${i}; \
+		${RM} -r ${STAGEDIR}${CCL_DIRECTORY}/$${i}; \
 	done
 	${INSTALL_SCRIPT} ${WRKDIR}/ccl.sh ${STAGEDIR}${PREFIX}/bin/ccl
 
diff --git a/lang/ceylon/Makefile b/lang/ceylon/Makefile
index 5f3d131586ce..cb521554dc9b 100644
--- a/lang/ceylon/Makefile
+++ b/lang/ceylon/Makefile
@@ -27,7 +27,7 @@ CEYLON_DIRS=	contrib lib repo samples templates
 .include <bsd.port.pre.mk>
 
 do-install:
-	${RM} -f ${WRKSRC}/bin/*.bat
+	${RM} ${WRKSRC}/bin/*.bat
 
 	${INSTALL_MAN} ${WRKSRC}/doc/man/man1/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
 
diff --git a/lang/clang33/Makefile b/lang/clang33/Makefile
index 28e0ba0ea3c3..f379e737d622 100644
--- a/lang/clang33/Makefile
+++ b/lang/clang33/Makefile
@@ -102,7 +102,7 @@ pre-fetch:
 .endif
 
 post-extract:
-	${RM} -f ${BUILD_WRKSRC}
+	${RM} ${BUILD_WRKSRC}
 	${MV} ${WRKDIR}/${CLANG_NAME} ${BUILD_WRKSRC}
 
 post-patch:
@@ -179,7 +179,7 @@ PLIST_DIR_LIST=		include/clang \
 			lib/python
 
 build-plist:
-	${RM} -f ${PLIST}
+	${RM} ${PLIST}
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}${LLVM_SUFFIX} >> ${PLIST}
 .endfor
diff --git a/lang/clang34/Makefile b/lang/clang34/Makefile
index b2057e8986fb..69070a323b02 100644
--- a/lang/clang34/Makefile
+++ b/lang/clang34/Makefile
@@ -104,7 +104,7 @@ pre-fetch:
 .endif
 
 post-extract:
-	${RM} -f ${BUILD_WRKSRC}
+	${RM} ${BUILD_WRKSRC}
 	${MV} ${WRKDIR}/${CLANG_EXTRACT} ${BUILD_WRKSRC}
 
 post-patch:
@@ -180,7 +180,7 @@ PLIST_DIR_LIST=		include/clang \
 			lib/python
 
 build-plist:
-	${RM} -f ${PLIST}
+	${RM} ${PLIST}
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}
 .endfor
diff --git a/lang/clang35/Makefile b/lang/clang35/Makefile
index c1ad8e30a1e9..e2c5cf359370 100644
--- a/lang/clang35/Makefile
+++ b/lang/clang35/Makefile
@@ -100,7 +100,7 @@ pre-fetch:
 .endif
 
 post-extract:
-	${RM} -f ${BUILD_WRKSRC}
+	${RM} ${BUILD_WRKSRC}
 	${MV} ${WRKDIR}/${CLANG_EXTRACT} ${BUILD_WRKSRC}
 
 post-patch:
@@ -176,7 +176,7 @@ PLIST_DIR_LIST=		include/clang \
 			lib/python
 
 build-plist:
-	${RM} -f ${PLIST}
+	${RM} ${PLIST}
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}
 .endfor
diff --git a/lang/clang36/Makefile b/lang/clang36/Makefile
index bbebaca0bb0d..48760be5050a 100644
--- a/lang/clang36/Makefile
+++ b/lang/clang36/Makefile
@@ -103,7 +103,7 @@ pre-fetch:
 .endif
 
 post-extract:
-	${RM} -f ${BUILD_WRKSRC}
+	${RM} ${BUILD_WRKSRC}
 	${MV} ${WRKDIR}/${CLANG_EXTRACT} ${BUILD_WRKSRC}
 
 post-patch:
@@ -174,7 +174,7 @@ PLIST_DIR_LIST=		include/clang \
 			lib/python
 
 build-plist:
-	${RM} -f ${PLIST}
+	${RM} ${PLIST}
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}
 .endfor
diff --git a/lang/cocor/Makefile b/lang/cocor/Makefile
index 806a18cf24c5..c3942b8990ea 100644
--- a/lang/cocor/Makefile
+++ b/lang/cocor/Makefile
@@ -27,7 +27,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS|#CFLAGS|' ${WRKSRC}/${i}
 .endfor
 .for i in cplus2 taste taste_cp
-	@${RM} -f ${WRKSRC}/${i}/unix.mk.*
+	@${RM} ${WRKSRC}/${i}/unix.mk.*
 .endfor
 
 do-install:
diff --git a/lang/erlang-runtime15/Makefile b/lang/erlang-runtime15/Makefile
index 9e9a330f56ea..03ea9d6619cc 100644
--- a/lang/erlang-runtime15/Makefile
+++ b/lang/erlang-runtime15/Makefile
@@ -178,7 +178,7 @@ post-install:
 			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
 	done
-	${RM} -rf ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
+	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
 .if ${PORT_OPTIONS:MDOCS}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
diff --git a/lang/erlang-runtime16/Makefile b/lang/erlang-runtime16/Makefile
index 65407014a506..7a7ae95c27c9 100644
--- a/lang/erlang-runtime16/Makefile
+++ b/lang/erlang-runtime16/Makefile
@@ -183,7 +183,7 @@ post-install:
 			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
 	done
-	${RM} -rf ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
+	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
 .if ${PORT_OPTIONS:MDOCS}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
diff --git a/lang/erlang-runtime17/Makefile b/lang/erlang-runtime17/Makefile
index 54affd8487ed..300279e31bc3 100644
--- a/lang/erlang-runtime17/Makefile
+++ b/lang/erlang-runtime17/Makefile
@@ -200,7 +200,7 @@ post-install:
 			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
 	done
-	${RM} -rf ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
+	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
 .if ${PORT_OPTIONS:MDOCS}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
diff --git a/lang/erlang-runtime18/Makefile b/lang/erlang-runtime18/Makefile
index f9c067af283b..8faffa5662d5 100644
--- a/lang/erlang-runtime18/Makefile
+++ b/lang/erlang-runtime18/Makefile
@@ -197,7 +197,7 @@ post-install:
 			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
 	done
-	${RM} -rf ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
+	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
 .if ${PORT_OPTIONS:MDOCS}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
diff --git a/lang/erlang-runtime19/Makefile b/lang/erlang-runtime19/Makefile
index f74a5ca44029..afdcf715d50d 100644
--- a/lang/erlang-runtime19/Makefile
+++ b/lang/erlang-runtime19/Makefile
@@ -211,7 +211,7 @@ post-install:
 			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
 	done
-	${RM} -rf ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
+	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
 .if ${PORT_OPTIONS:MDOCS}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 111a543be823..6c9f44acfae1 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -235,7 +235,7 @@ post-install:
 			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
 	done
-	${RM} -rf ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
+	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
 .if ${PORT_OPTIONS:MDOCS}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 4ac795babe48..cc6b57adb7ab 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -41,7 +41,7 @@ LATE_INSTALL_ARGS=	fpc_exampleinstall
 
 post-extract:
 	@cd ${WRKDIR}/${WRKUNITDIR} && \
-		${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -rf
+		${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -r
 .if ${PKGNAMESUFFIX:M-utils} || ${PKGNAMESUFFIX:M-ide}
 	${REINPLACE_CMD} -e '/globalunit/ s|\.\./packages|${FPCDIR}|' \
 		${WRKDIR}/${WRKUNITDIR}/Makefile
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 43dba893ac01..e7e055a04829 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -31,7 +31,7 @@ INSTALL_TARGET=	install-strip
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 post-patch:
-	@${RM} -f ${WRKSRC}/doc/*.info
+	@${RM} ${WRKSRC}/doc/*.info
 	@${REINPLACE_CMD} -e 's/ -export-dynamic/ -Wl,--export-dynamic/' \
 		${WRKSRC}/configure
 
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 551be7766464..afd60ff9c1d0 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -145,7 +145,7 @@ pre-everything::
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
-	@${RM} -f ${WRKSRC}/gcc/*/*.info*
+	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
@@ -154,11 +154,11 @@ full-regression-test: build
 .endif
 
 post-stage:
-	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
-	${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
+	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
 	# Add target libraries and include files to packaging list.
-	${RM} -f ${WRKDIR}/PLIST.lib
+	${RM} ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 5171b9a4ae16..b474cb5b5074 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -113,7 +113,7 @@ pre-everything::
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
-	@${RM} -f ${WRKSRC}/gcc/*/*.info*
+	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
@@ -122,11 +122,11 @@ full-regression-test: build
 .endif
 
 post-stage:
-	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
-	${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
+	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
 	# Add target libraries and include files to packaging list.
-	${RM} -f ${WRKDIR}/PLIST.lib
+	${RM} ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 063b89fa4c75..02dcf2608372 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -121,7 +121,7 @@ pre-everything::
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
-	@${RM} -f ${WRKSRC}/gcc/*/*.info*
+	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
@@ -130,11 +130,11 @@ full-regression-test: build
 .endif
 
 post-stage:
-	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
-	${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
+	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
 	# Add target libraries and include files to packaging list.
-	${RM} -f ${WRKDIR}/PLIST.lib
+	${RM} ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index bc23ed34fe79..6b2baf724802 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -135,7 +135,7 @@ pre-everything::
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
-	@${RM} -f ${WRKSRC}/gcc/*/*.info*
+	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
@@ -144,11 +144,11 @@ full-regression-test: build
 .endif
 
 post-stage:
-	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
-	${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
+	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
 	# Add target libraries and include files to packaging list.
-	${RM} -f ${WRKDIR}/PLIST.lib
+	${RM} ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile
index 5bfab9bcea54..6071e48924c3 100644
--- a/lang/gcc49/Makefile
+++ b/lang/gcc49/Makefile
@@ -149,7 +149,7 @@ pre-everything::
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
-	@${RM} -f ${WRKSRC}/gcc/*/*.info*
+	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
@@ -158,11 +158,11 @@ full-regression-test: build
 .endif
 
 post-stage:
-	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
-	${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
+	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
 	# Add target libraries and include files to packaging list.
-	${RM} -f ${WRKDIR}/PLIST.lib
+	${RM} ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
diff --git a/lang/gcc5-aux/Makefile b/lang/gcc5-aux/Makefile
index e26b90222856..65aa4aec034b 100644
--- a/lang/gcc5-aux/Makefile
+++ b/lang/gcc5-aux/Makefile
@@ -287,7 +287,7 @@ post-stage:
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/include ${NEWBSDIR}/
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/libexec ${NEWBSDIR}/
 	${RM} ${NEWBSDIR}/bin/${GARCH}*
-	${RM} -rf ${NEWBSDIR}/lib/gcc/${BLD_TARGET}/${GCC_VERSION}/include-fixed
+	${RM} -r ${NEWBSDIR}/lib/gcc/${BLD_TARGET}/${GCC_VERSION}/include-fixed
 	(cd ${NEWBSDIR}/.. ; ${TAR} -cyf ${BSFILENAME} bootstrap)
 .endif
 
diff --git a/lang/gcc5-devel/Makefile b/lang/gcc5-devel/Makefile
index fd9cfb2d1350..f2ded9855d65 100644
--- a/lang/gcc5-devel/Makefile
+++ b/lang/gcc5-devel/Makefile
@@ -152,7 +152,7 @@ pre-everything::
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
-	@${RM} -f ${WRKSRC}/gcc/*/*.info*
+	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
@@ -161,11 +161,11 @@ full-regression-test: build
 .endif
 
 post-stage:
-	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
-	${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
+	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
 	# Add target libraries and include files to packaging list.
-	${RM} -f ${WRKDIR}/PLIST.lib
+	${RM} ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile
index 2542712f893e..85b638d95cd9 100644
--- a/lang/gcc5/Makefile
+++ b/lang/gcc5/Makefile
@@ -152,7 +152,7 @@ pre-everything::
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
-	@${RM} -f ${WRKSRC}/gcc/*/*.info*
+	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
@@ -161,11 +161,11 @@ full-regression-test: build
 .endif
 
 post-stage:
-	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
-	${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
+	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
 	# Add target libraries and include files to packaging list.
-	${RM} -f ${WRKDIR}/PLIST.lib
+	${RM} ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
diff --git a/lang/gcc6-aux/Makefile b/lang/gcc6-aux/Makefile
index 69175b6b3e80..0e5063fe3cea 100644
--- a/lang/gcc6-aux/Makefile
+++ b/lang/gcc6-aux/Makefile
@@ -273,7 +273,7 @@ post-stage:
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/include ${NEWBSDIR}/
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/libexec ${NEWBSDIR}/
 	${RM} ${NEWBSDIR}/bin/${GARCH}*
-	${RM} -rf ${NEWBSDIR}/lib/gcc/${BLD_TARGET}/${GCC_VERSION}/include-fixed
+	${RM} -r ${NEWBSDIR}/lib/gcc/${BLD_TARGET}/${GCC_VERSION}/include-fixed
 	(cd ${NEWBSDIR}/.. ; ${TAR} -cyf ${BSFILENAME} bootstrap)
 .endif
 
diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile
index c6bb2a95991a..223078a68cc0 100644
--- a/lang/gcc6-devel/Makefile
+++ b/lang/gcc6-devel/Makefile
@@ -155,7 +155,7 @@ pre-everything::
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
-	@${RM} -f ${WRKSRC}/gcc/*/*.info*
+	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
@@ -164,11 +164,11 @@ full-regression-test: build
 .endif
 
 post-stage:
-	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
-	${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
+	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
 	# Add target libraries and include files to packaging list.
-	${RM} -f ${WRKDIR}/PLIST.lib
+	${RM} ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
diff --git a/lang/gcc6/Makefile b/lang/gcc6/Makefile
index 4aec349e0365..cf6ed2b288c6 100644
--- a/lang/gcc6/Makefile
+++ b/lang/gcc6/Makefile
@@ -156,7 +156,7 @@ pre-everything::
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
-	@${RM} -f ${WRKSRC}/gcc/*/*.info*
+	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
@@ -165,11 +165,11 @@ full-regression-test: build
 .endif
 
 post-stage:
-	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
-	${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
+	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
 	# Add target libraries and include files to packaging list.
-	${RM} -f ${WRKDIR}/PLIST.lib
+	${RM} ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
diff --git a/lang/gcc7-devel/Makefile b/lang/gcc7-devel/Makefile
index 8d5bd86939bb..a81b177a0014 100644
--- a/lang/gcc7-devel/Makefile
+++ b/lang/gcc7-devel/Makefile
@@ -128,7 +128,7 @@ pre-everything::
 
 pre-configure:
 	cd ${WRKSRC} ; contrib/gcc_update --touch
-	@${RM} -f ${WRKSRC}/gcc/*/*.info*
+	@${RM} ${WRKSRC}/gcc/*/*.info*
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
@@ -137,9 +137,9 @@ full-regression-test: build
 .endif
 
 post-stage:
-	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	# Add target libraries and include files to packaging list.
-	${RM} -f ${WRKDIR}/PLIST.lib
+	${RM} ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index c557f980d7f5..b5f743fa7736 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -70,7 +70,7 @@ install-doc:
 
 # Remove unused file
 remove-empty-files:
-	@${RM} -f ${STAGEDIR}${DATADIR}/site-forth/siteinit.fs
+	@${RM} ${STAGEDIR}${DATADIR}/site-forth/siteinit.fs
 
 # Remove unused directories
 remove-empty-dirs:
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 95d1cfbe9a74..1122fe03ae9e 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -253,11 +253,11 @@ post-install-script:
 		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
 .if ${PORT_OPTIONS:MDOCS}
 	# Cleanup the indexen created by gen_contents_index
-	@${ECHO} "@unexec ${RM} -f %D/${DOCSDIR_REL}/html/libraries/doc-index-*.html" >> ${TMPPLIST}
-	@${ECHO} "@unexec ${RM} -f %D/${DOCSDIR_REL}/html/libraries/index*.html" >> ${TMPPLIST}
-	@${ECHO} "@unexec ${RM} -f %D/${DOCSDIR_REL}/html/libraries/*.png" >> ${TMPPLIST}
+	@${ECHO} "@unexec ${RM} %D/${DOCSDIR_REL}/html/libraries/doc-index-*.html" >> ${TMPPLIST}
+	@${ECHO} "@unexec ${RM} %D/${DOCSDIR_REL}/html/libraries/index*.html" >> ${TMPPLIST}
+	@${ECHO} "@unexec ${RM} %D/${DOCSDIR_REL}/html/libraries/*.png" >> ${TMPPLIST}
 .endif
-	@${ECHO} '@unexec ${RM} -f %D/${GHC_LIBDIR_REL}/package.conf.d/package.cache' >>${TMPPLIST}
+	@${ECHO} '@unexec ${RM} %D/${GHC_LIBDIR_REL}/package.conf.d/package.cache' >>${TMPPLIST}
 	@${ECHO} "@exec %D/bin/ghc-pkg recache" >>${TMPPLIST}
 .if ${PORT_OPTIONS:MDOCS}
 	@${ECHO} '@exec ${SH} -c "cd %D/${DOCSDIR_REL}/html/libraries && ./gen_contents_index"' >> ${TMPPLIST}
@@ -299,7 +299,7 @@ pre-configure:
 .endif
 
 post-install:
-	@${RM} -f ${STAGEDIR}${PREFIX}/bin/haddock
+	@${RM} ${STAGEDIR}${PREFIX}/bin/haddock
 .if ${PORT_OPTIONS:MDOCS}
 	@${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock
 .endif
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 6fa5940dacb2..f1f599264375 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -24,6 +24,6 @@ LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 post-install:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/libexec/gjs
+	@${RM} -r ${STAGEDIR}${PREFIX}/libexec/gjs
 
 .include <bsd.port.mk>
diff --git a/lang/gscheme/Makefile b/lang/gscheme/Makefile
index a95ec86ab6d3..39e9d8dde531 100644
--- a/lang/gscheme/Makefile
+++ b/lang/gscheme/Makefile
@@ -26,7 +26,7 @@ post-patch:
 		${WRKSRC}/SchemeTypes.h ${WRKSRC}/SchemeTypes.m
 
 post-install:
-	${RM} -f ${STAGEDIR}${GNUSTEP_PREFIX}/System/Applications/GScheme.app/Resources/library.scm~
+	${RM} ${STAGEDIR}${GNUSTEP_PREFIX}/System/Applications/GScheme.app/Resources/library.scm~
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/GScheme.app/GScheme
 
 .include <bsd.port.mk>
diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index a157c30a44d1..7da2a6f6e1e0 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -88,11 +88,11 @@ intel-patch: extract
 pre-patch: intel-patch
 # Remove files we do not need on FreeBSD.
 	for i in `${CAT} ${FILESDIR}/exclude`; do \
-		${RM} -rf ${WRKSRC}/opt/${COMPILERDIR}/$$i; done
+		${RM} -r ${WRKSRC}/opt/${COMPILERDIR}/$$i; done
 .if ! ${PORT_OPTIONS:MDOCS}
 # Remove docs.
 	for i in `${CAT} ${FILESDIR}/exclude_noportdocs`; do \
-		${RM} -rf ${WRKSRC}/opt/${COMPILERDIR}/$$i; done
+		${RM} -r ${WRKSRC}/opt/${COMPILERDIR}/$$i; done
 .endif
 # Allow everyone to use it.
 	${CHMOD} a+rx ${WRKSRC}/opt
@@ -180,17 +180,17 @@ do-install:
 		${CPIO} -pdu --quiet ${STAGEDIR}${PREFIX}
 
 	${MV} ${STAGEDIR}${PREFIX}/${COMPILERDIR}/man/man1/icc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	${RM} -rf ${STAGEDIR}${PREFIX}/${COMPILERDIR}/man
+	${RM} -r ${STAGEDIR}${PREFIX}/${COMPILERDIR}/man
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 	${MV} ${STAGEDIR}${PREFIX}/${COMPILERDIR}/doc/* ${STAGEDIR}${DOCSDIR}
-	${RM} -rf ${STAGEDIR}${PREFIX}/${COMPILERDIR}/doc
+	${RM} -r ${STAGEDIR}${PREFIX}/${COMPILERDIR}/doc
 .else
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MV} ${STAGEDIR}${PREFIX}/${COMPILERDIR}/doc/* ${STAGEDIR}${DOCSDIR}
-	${RM} -rf ${STAGEDIR}${PREFIX}/${COMPILERDIR}/doc
+	${RM} -r ${STAGEDIR}${PREFIX}/${COMPILERDIR}/doc
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/jakarta-commons-jelly/Makefile b/lang/jakarta-commons-jelly/Makefile
index 1e344bbf1f8d..34a440723d0f 100644
--- a/lang/jakarta-commons-jelly/Makefile
+++ b/lang/jakarta-commons-jelly/Makefile
@@ -27,7 +27,7 @@ PORTDATA=	*
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	${RM} -f ${WRKSRC}/bin/jelly.bat ${WRKSRC}/bin/jelly
+	${RM} ${WRKSRC}/bin/jelly.bat ${WRKSRC}/bin/jelly
 
 do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "custom lib bin" \
diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile
index d5258053ec47..91c78ad7b459 100644
--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@@ -51,7 +51,7 @@ post-patch:
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Removing unneeded files..."
-	@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'` `${FIND} ${WRKSRC} -name '*.bak'`
+	@${RM} `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'` `${FIND} ${WRKSRC} -name '*.exe'` `${FIND} ${WRKSRC} -name '*.bak'`
 	@${ECHO_MSG} " [ DONE ]"
 
 .for target in ${REPLACE_FILES}
diff --git a/lang/modula3/Makefile b/lang/modula3/Makefile
index bfc8bca9991a..8741d6166e28 100644
--- a/lang/modula3/Makefile
+++ b/lang/modula3/Makefile
@@ -128,7 +128,7 @@ do-install:
 		${RM} cm3 && ${LN} -s ../../../bin/cm3 .)
 
 new-bootstrap:
-	@${RM} -rf ${NEWBOOTDIR}
+	@${RM} -r ${NEWBOOTDIR}
 	@${MKDIR} ${NEWBOOTDIR:H}
 	${CP} -a ${INTERMED}/min-dist ${NEWBOOTDIR}
 	@${FIND} ${NEWBOOTDIR} -type f -perm +111 | \
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 39010d9d7230..3b68c5e6a74f 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -147,7 +147,7 @@ post-configure:
 		-e 's,(${PATTERN}+.*(MANDIR|MANODIR|MANEXT)),\1\$${BSD_INSTALL_MAN} \4,'
 
 check-test: do-install
-	@cd ${WRKSRC}/testsuite; ${RM} -f _log; for d in tests/* ; do \
+	@cd ${WRKSRC}/testsuite; ${RM} _log; for d in tests/* ; do \
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} one DIR=$${d} \
 	2>&1 | tee -a _log || ${TRUE} ; done ; \
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report
diff --git a/lang/p2c/Makefile b/lang/p2c/Makefile
index 231565789a95..a86b68d0e8c6 100644
--- a/lang/p2c/Makefile
+++ b/lang/p2c/Makefile
@@ -20,7 +20,7 @@ USE_PERL5=	run
 ALL_TARGET=	all p2cc
 
 pre-build:
-	@${RM} -f ${WRKSRC}/p2c.man.inst
+	@${RM} ${WRKSRC}/p2c.man.inst
 
 post-build:
 	@${LN} -sf p2c.man.inst ${WRKSRC}/p2c.1
diff --git a/lang/pbasic/Makefile b/lang/pbasic/Makefile
index a4fffc0070f1..48ea0f3baf54 100644
--- a/lang/pbasic/Makefile
+++ b/lang/pbasic/Makefile
@@ -24,7 +24,7 @@ post-patch:	.SILENT
 	${ECHO_CMD} '.PHONY: $$(SYSTEMS)' >>${WRKSRC}/makefile
 
 do-configure:
-	-cd ${WRKSRC} ; ${RM} -rf termio m68000 msdos vax pyramid ns32000 \
+	-cd ${WRKSRC} ; ${RM} -r termio m68000 msdos vax pyramid ns32000 \
 			pdp11 cursor/cursor.dos cursor/cursor.ukc
 
 do-install:
diff --git a/lang/pure/Makefile b/lang/pure/Makefile
index 71a2e5ec388e..1c921a3a8b18 100644
--- a/lang/pure/Makefile
+++ b/lang/pure/Makefile
@@ -95,7 +95,7 @@ post-install:
 		${STAGEDIR}${PREFIX}/lib/libpure.so.*.*
 .if ${PORT_OPTIONS:METC}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/etc/
-	@(cd ${WRKSRC} && ${RM} -f etc/*.in && ${COPYTREE_SHARE} etc/ ${STAGEDIR}${DATADIR})
+	@(cd ${WRKSRC} && ${RM} etc/*.in && ${COPYTREE_SHARE} etc/ ${STAGEDIR}${DATADIR})
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/lang/ruby21/Makefile b/lang/ruby21/Makefile
index b63c8bd81610..578d1c478c3f 100644
--- a/lang/ruby21/Makefile
+++ b/lang/ruby21/Makefile
@@ -146,11 +146,11 @@ post-patch:
 # Remove modules we don't want
 #
 .for d in win32ole
-	@${RM} -rf ${BUILD_WRKSRC}/ext/${d}
+	@${RM} -r ${BUILD_WRKSRC}/ext/${d}
 .endfor
 # We get rake from ports.
 .for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb
-	@${RM} -rf ${BUILD_WRKSRC}/${d}
+	@${RM} -r ${BUILD_WRKSRC}/${d}
 .endfor
 # We get the gem executable from ports.
 	@${RM} ${BUILD_WRKSRC}/bin/gem
@@ -239,7 +239,7 @@ regression-test test:
 
 validate:
 	@${MKDIR} ${WRKSRC}/rubyspec
-	${RM} -rf ${WRKSRC}/rubyspec/*
+	${RM} -r ${WRKSRC}/rubyspec/*
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/rubyspec.git)
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/mspec.git)
 	(cd ${WRKSRC}/rubyspec/rubyspec && ${SETENV} PATH=${WRKSRC}/rubyspec/mspec/bin:${PATH} mspec -t ${PREFIX}/bin/ruby${RUBY_SUFFIX} .)
diff --git a/lang/ruby22/Makefile b/lang/ruby22/Makefile
index e6a3bc16e150..aaf78c88e446 100644
--- a/lang/ruby22/Makefile
+++ b/lang/ruby22/Makefile
@@ -143,11 +143,11 @@ post-patch:
 # Remove modules we don't want
 #
 .for d in win32ole
-	@${RM} -rf ${BUILD_WRKSRC}/ext/${d}
+	@${RM} -r ${BUILD_WRKSRC}/ext/${d}
 .endfor
 # We get rake from ports.
 .for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb
-	@${RM} -rf ${BUILD_WRKSRC}/${d}
+	@${RM} -r ${BUILD_WRKSRC}/${d}
 .endfor
 # We get the gem executable from ports.
 	@${RM} ${BUILD_WRKSRC}/bin/gem
@@ -236,7 +236,7 @@ regression-test test:
 
 validate:
 	@${MKDIR} ${WRKSRC}/rubyspec
-	${RM} -rf ${WRKSRC}/rubyspec/*
+	${RM} -r ${WRKSRC}/rubyspec/*
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/rubyspec.git)
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/mspec.git)
 	(cd ${WRKSRC}/rubyspec/rubyspec && ${SETENV} PATH=${WRKSRC}/rubyspec/mspec/bin:${PATH} mspec -t ${PREFIX}/bin/ruby${RUBY_SUFFIX} .)
diff --git a/lang/ruby23/Makefile b/lang/ruby23/Makefile
index 2daf681fd2de..12cfb1222308 100644
--- a/lang/ruby23/Makefile
+++ b/lang/ruby23/Makefile
@@ -146,11 +146,11 @@ post-patch:
 # Remove modules we don't want
 #
 .for d in win32ole
-	@${RM} -rf ${BUILD_WRKSRC}/ext/${d}
+	@${RM} -r ${BUILD_WRKSRC}/ext/${d}
 .endfor
 # We get rake from ports.
 .for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb
-	@${RM} -rf ${BUILD_WRKSRC}/${d}
+	@${RM} -r ${BUILD_WRKSRC}/${d}
 .endfor
 # We get the gem executable from ports.
 	@${RM} ${BUILD_WRKSRC}/bin/gem
diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index bc3dadf7fc32..69bd3a78466c 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -177,7 +177,7 @@ post-patch:
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} CC="${CC}" ${SH} make.sh ${MAKE_SH_ARGS})
-	${RM} -rf ${WRKSRC}/contrib/sb-cover/test-output
+	${RM} -r ${WRKSRC}/contrib/sb-cover/test-output
 	${REINPLACE_CMD} -E -e \
 		's|\$$Date\$$|'"`${SETENV} LANG=C /bin/date '+%B %d, %Y'`|g" \
 		${WRKSRC}/doc/sbcl.1
diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index 4c9c6b630e99..afd2d9ee5f1a 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -225,7 +225,7 @@ do-build:
 	./makeml
 	@${ECHO} '(* Removing old libs and heaps: *)'
 	cd ${WRKSRC}/${RECOMPILEDIR} && \
-	${RM} -rf ../../lib && ${MKDIR} ../../lib && \
+	${RM} -r ../../lib && ${MKDIR} ../../lib && \
 	${FIND} ../../bin/.heap -name '*.${MLARCH}-bsd' \
 	\! -name 'sml.${MLARCH}-bsd' -delete -print
 	@${ECHO} '(* Installing the recompiled libs and heap: *)'
diff --git a/lang/yorick/Makefile b/lang/yorick/Makefile
index e668d844b3e4..5cb91e9f75dd 100644
--- a/lang/yorick/Makefile
+++ b/lang/yorick/Makefile
@@ -41,7 +41,7 @@ post-build:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/emacs/yorick.el ${WRKSRC}/relocatable
-	@${RM} -rf ${WRKSRC}/relocatable/doc ${PREFIX}/lib/${PORTNAME}
+	@${RM} -r ${WRKSRC}/relocatable/doc ${PREFIX}/lib/${PORTNAME}
 	@${MV} ${WRKSRC}/relocatable ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 .for f in gist yorick
 	${INSTALL_MAN} ${WRKSRC}/doc/${f}.1 ${STAGEDIR}${MANPREFIX}/man/man1
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:
diff --git a/math/blacs/Makefile b/math/blacs/Makefile
index 05c81b2ba1f0..1a1b2f7d5cc1 100644
--- a/math/blacs/Makefile
+++ b/math/blacs/Makefile
@@ -83,7 +83,7 @@ do-build:
 	(cd ${WRKSRC_SHARED}; make mpi; make tester)
 
 post-build:
-	${RM} -rf ${WRKDIR}/tmp_shared
+	${RM} -r ${WRKDIR}/tmp_shared
 	${MKDIR} ${WRKDIR}/tmp_shared
 	${MV} ${WRKSRC_SHARED}/LIB/blacs_MPI-FreeBSD-${DEBUG_LEVEL}.a          ${WRKSRC_SHARED}/LIB/libblacsc.a
 	${MV} ${WRKSRC_SHARED}/LIB/blacsF77init_MPI-FreeBSD-${DEBUG_LEVEL}.a   ${WRKSRC_SHARED}/LIB/libblacsf77.a
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index abb7a6977f74..7541e313a000 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -54,6 +54,6 @@ pre-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 
 post-install:
-	@${RM} -f ${STAGEDIR}${PREFIX}/bin/*.bak*
+	@${RM} ${STAGEDIR}${PREFIX}/bin/*.bak*
 
 .include <bsd.port.mk>
diff --git a/math/gmp/Makefile b/math/gmp/Makefile
index 49d2954125ac..8016e54fdd0f 100644
--- a/math/gmp/Makefile
+++ b/math/gmp/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ENV+=	ABI="32"
 .endif
 
 post-extract:
-	@${RM} -f ${WRKSRC}/doc/gmp.info*
+	@${RM} ${WRKSRC}/doc/gmp.info*
 
 post-patch:
 	@${REINPLACE_CMD} "s/\(athlon64\-\*\-\*\)/amd64-*-* | \1/;s/\(x86_64)\)/amd64 | \1/" \
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index 95eaffbf4d39..1a46aa8f3a3e 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -21,7 +21,7 @@ INSTALL_TARGET=	install-strip
 INFO=		gsl-ref
 
 post-extract:
-	@${RM} -f ${WRKSRC}/doc/gsl-ref.info*
+	@${RM} ${WRKSRC}/doc/gsl-ref.info*
 
 #prevent regression test coredumps from causing failures on the
 #package-building cluster:
diff --git a/math/ipopt/Makefile b/math/ipopt/Makefile
index 9e41a98c711b..5b3af3b607da 100644
--- a/math/ipopt/Makefile
+++ b/math/ipopt/Makefile
@@ -47,13 +47,13 @@ post-extract:
 	@(${MV} ${WRKSRC}/ThirdParty/Mumps/MUMPS_4.10.0 ${WRKSRC}/ThirdParty/Mumps/MUMPS);
 
 post-install-DOCS-off:
-	${RM} -rf ${STAGEDIR}${PREFIX}/share/coin
+	${RM} -r ${STAGEDIR}${PREFIX}/share/coin
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Ipopt/doc/documentation.pdf\
 	   ${STAGEDIR}${DOCSDIR}
 	${MV} ${STAGEDIR}${PREFIX}/share/coin/doc ${STAGEDIR}${DOCSDIR}
-	${RM} -rf ${STAGEDIR}${PREFIX}/share/coin
+	${RM} -r ${STAGEDIR}${PREFIX}/share/coin
 
 .include <bsd.port.mk>
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index e6a77cf31ed2..95735064aba1 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -213,7 +213,7 @@ post-install:
 
 .if defined(MAINTAINER_MODE)
 package-manpages: build-manpages
-	@${RM} -f ${WRKDIR}/lapack-manpages-${PORTVERSION}.tar.gz ; \
+	@${RM} ${WRKDIR}/lapack-manpages-${PORTVERSION}.tar.gz ; \
 	cd ${WRKSRC}/DOCS/man; \
 	${TAR} -czvf ${WRKDIR}/lapack-manpages-${PORTVERSION}.tar.gz \
 	${MAN3L:S|^|man3/|}
diff --git a/math/mingw32-libgmp/Makefile b/math/mingw32-libgmp/Makefile
index cdec25a067b5..d1af106dbce9 100644
--- a/math/mingw32-libgmp/Makefile
+++ b/math/mingw32-libgmp/Makefile
@@ -37,6 +37,6 @@ INFO=		gmp
 INFO_PATH=	${GMP_TARG}/info
 
 post-extract:
-	@${RM} -f ${WRKSRC}/doc/gmp.info*
+	@${RM} ${WRKSRC}/doc/gmp.info*
 
 .include <bsd.port.mk>
diff --git a/math/miracl/Makefile b/math/miracl/Makefile
index 6c1a24a33bea..026ff2ee4257 100644
--- a/math/miracl/Makefile
+++ b/math/miracl/Makefile
@@ -56,7 +56,7 @@ post-patch:
 # Don't error when files not found
 # Fix mrmuldv.cc not existing due to s/gcc/CC/ replacement above.
 	@${REINPLACE_CMD} -E \
-		-e 's|^rm |${RM} -f |' \
+		-e 's|^rm |${RM} |' \
 		-e 's|^cp mrmuldv\.${CC} mrmuldv\.c|${CP} mrmuldv.gcc mrmuldv.c|' \
 		${WRKSRC}/${BUILDCMD}
 
diff --git a/math/octave-forge-actuarial/Makefile b/math/octave-forge-actuarial/Makefile
index 3868c7079826..577188445899 100644
--- a/math/octave-forge-actuarial/Makefile
+++ b/math/octave-forge-actuarial/Makefile
@@ -22,7 +22,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-bim/Makefile b/math/octave-forge-bim/Makefile
index 22e96197749f..a9f9a0c45aac 100644
--- a/math/octave-forge-bim/Makefile
+++ b/math/octave-forge-bim/Makefile
@@ -25,7 +25,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-cgi/Makefile b/math/octave-forge-cgi/Makefile
index dc82f82acbe2..140fe55c1b15 100644
--- a/math/octave-forge-cgi/Makefile
+++ b/math/octave-forge-cgi/Makefile
@@ -23,7 +23,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-communications/Makefile b/math/octave-forge-communications/Makefile
index aae000650e6b..9d55ce8e7a52 100644
--- a/math/octave-forge-communications/Makefile
+++ b/math/octave-forge-communications/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS+=	${TARBALLS_DIR}/signal.tar.gz:math/octave-forge-signal
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-control/Makefile b/math/octave-forge-control/Makefile
index d8c78335e7f9..4376429f08e5 100644
--- a/math/octave-forge-control/Makefile
+++ b/math/octave-forge-control/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-data-smoothing/Makefile b/math/octave-forge-data-smoothing/Makefile
index 5fbfed9372cf..d4e9381e22ec 100644
--- a/math/octave-forge-data-smoothing/Makefile
+++ b/math/octave-forge-data-smoothing/Makefile
@@ -22,7 +22,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
diff --git a/math/octave-forge-database/Makefile b/math/octave-forge-database/Makefile
index 4236fde8eef9..ffac69bdb620 100644
--- a/math/octave-forge-database/Makefile
+++ b/math/octave-forge-database/Makefile
@@ -23,7 +23,7 @@ USES+=		pgsql
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 post-patch:
diff --git a/math/octave-forge-dataframe/Makefile b/math/octave-forge-dataframe/Makefile
index d42220985537..f37127b44437 100644
--- a/math/octave-forge-dataframe/Makefile
+++ b/math/octave-forge-dataframe/Makefile
@@ -22,7 +22,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-dicom/Makefile b/math/octave-forge-dicom/Makefile
index 2aa4c3eb6f7b..537833118c3e 100644
--- a/math/octave-forge-dicom/Makefile
+++ b/math/octave-forge-dicom/Makefile
@@ -34,7 +34,7 @@ post-patch:
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-divand/Makefile b/math/octave-forge-divand/Makefile
index 66a5a5ee284d..80491137d08d 100644
--- a/math/octave-forge-divand/Makefile
+++ b/math/octave-forge-divand/Makefile
@@ -24,7 +24,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-doctest/Makefile b/math/octave-forge-doctest/Makefile
index 49a8e10cb1e0..bc9b4494cc33 100644
--- a/math/octave-forge-doctest/Makefile
+++ b/math/octave-forge-doctest/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-econometrics/Makefile b/math/octave-forge-econometrics/Makefile
index 951c959976c2..0367406fde36 100644
--- a/math/octave-forge-econometrics/Makefile
+++ b/math/octave-forge-econometrics/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS+=	${TARBALLS_DIR}/optim.tar.gz:math/octave-forge-optim
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-fenv/Makefile b/math/octave-forge-fenv/Makefile
index 1110490068fd..fe7a61b93185 100644
--- a/math/octave-forge-fenv/Makefile
+++ b/math/octave-forge-fenv/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-financial/Makefile b/math/octave-forge-financial/Makefile
index 0c97e38100dc..6186b1248ca4 100644
--- a/math/octave-forge-financial/Makefile
+++ b/math/octave-forge-financial/Makefile
@@ -23,7 +23,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-fits/Makefile b/math/octave-forge-fits/Makefile
index 8a9dc4cd1699..9812d268859c 100644
--- a/math/octave-forge-fits/Makefile
+++ b/math/octave-forge-fits/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS+=	libcfitsio.so:astro/cfitsio
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-fl-core/Makefile b/math/octave-forge-fl-core/Makefile
index b9276c6e0aaa..881246ce22b1 100644
--- a/math/octave-forge-fl-core/Makefile
+++ b/math/octave-forge-fl-core/Makefile
@@ -22,7 +22,7 @@ USES=		dos2unix
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-fuzzy-logic-toolkit/Makefile b/math/octave-forge-fuzzy-logic-toolkit/Makefile
index bd302af4fc35..cb083d1ea3f6 100644
--- a/math/octave-forge-fuzzy-logic-toolkit/Makefile
+++ b/math/octave-forge-fuzzy-logic-toolkit/Makefile
@@ -22,7 +22,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-ga/Makefile b/math/octave-forge-ga/Makefile
index 31f63e86c40a..6b944f0d17e5 100644
--- a/math/octave-forge-ga/Makefile
+++ b/math/octave-forge-ga/Makefile
@@ -22,7 +22,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-general/Makefile b/math/octave-forge-general/Makefile
index 9beafa0a6ccb..1387c33f6edb 100644
--- a/math/octave-forge-general/Makefile
+++ b/math/octave-forge-general/Makefile
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-generate_html/Makefile b/math/octave-forge-generate_html/Makefile
index 6ad90db378e5..870ff9f8600d 100644
--- a/math/octave-forge-generate_html/Makefile
+++ b/math/octave-forge-generate_html/Makefile
@@ -21,7 +21,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-gnuplot/Makefile b/math/octave-forge-gnuplot/Makefile
index 5835e6bd295c..502aa116a7b1 100644
--- a/math/octave-forge-gnuplot/Makefile
+++ b/math/octave-forge-gnuplot/Makefile
@@ -22,7 +22,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-image/Makefile b/math/octave-forge-image/Makefile
index 9b2397a4177c..1320d9394757 100644
--- a/math/octave-forge-image/Makefile
+++ b/math/octave-forge-image/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.pre.mk>
diff --git a/math/octave-forge-interval/Makefile b/math/octave-forge-interval/Makefile
index a8902b8b01c8..af6614b4348f 100644
--- a/math/octave-forge-interval/Makefile
+++ b/math/octave-forge-interval/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-io/Makefile b/math/octave-forge-io/Makefile
index c200bb9f8fd9..f98b5c8e3c26 100644
--- a/math/octave-forge-io/Makefile
+++ b/math/octave-forge-io/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-level-set/Makefile b/math/octave-forge-level-set/Makefile
index 51fed3825860..b2480d9859fd 100644
--- a/math/octave-forge-level-set/Makefile
+++ b/math/octave-forge-level-set/Makefile
@@ -24,7 +24,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.pre.mk>
diff --git a/math/octave-forge-linear-algebra/Makefile b/math/octave-forge-linear-algebra/Makefile
index 9ce147d484a6..0694331c6ad9 100644
--- a/math/octave-forge-linear-algebra/Makefile
+++ b/math/octave-forge-linear-algebra/Makefile
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-lssa/Makefile b/math/octave-forge-lssa/Makefile
index b7517ea7fe11..fa8b09730641 100644
--- a/math/octave-forge-lssa/Makefile
+++ b/math/octave-forge-lssa/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-ltfat/Makefile b/math/octave-forge-ltfat/Makefile
index c2cc375d5f12..340f0a9dd94b 100644
--- a/math/octave-forge-ltfat/Makefile
+++ b/math/octave-forge-ltfat/Makefile
@@ -26,9 +26,9 @@ GNU_CONFIGURE=	yes
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
-	${RM} -f ${WRKSRC}/../inst/DESCRIPTION
-	${RM} -f ${WRKSRC}/../inst/ltfat/DESCRIPTION
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/../inst/DESCRIPTION
+	${RM} ${WRKSRC}/../inst/ltfat/DESCRIPTION
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-mapping/Makefile b/math/octave-forge-mapping/Makefile
index 37494b26a31f..d2d4d47949f5 100644
--- a/math/octave-forge-mapping/Makefile
+++ b/math/octave-forge-mapping/Makefile
@@ -22,7 +22,7 @@ ALL_TARGET=	# nada
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-mechanics/Makefile b/math/octave-forge-mechanics/Makefile
index b4640885df44..4ee5ab0b6ecc 100644
--- a/math/octave-forge-mechanics/Makefile
+++ b/math/octave-forge-mechanics/Makefile
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/inst/molecularDynamics/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-miscellaneous/Makefile b/math/octave-forge-miscellaneous/Makefile
index e0a1cf16b758..66fb5f7ed655 100644
--- a/math/octave-forge-miscellaneous/Makefile
+++ b/math/octave-forge-miscellaneous/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS+=	${TARBALLS_DIR}/general.tar.gz:math/octave-forge-general
 MAKE_ENV+=	MKOCTFILE=mkoctfile
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-msh/Makefile b/math/octave-forge-msh/Makefile
index c8336fe53a05..8e884cee4e7d 100644
--- a/math/octave-forge-msh/Makefile
+++ b/math/octave-forge-msh/Makefile
@@ -28,7 +28,7 @@ post-patch:
 	${REINPLACE_CMD} 's/ $$(LDFLAGS)//' ${WRKSRC}/Makefile.in
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-mvn/Makefile b/math/octave-forge-mvn/Makefile
index d4aae9ed9c87..c0773b303aa6 100644
--- a/math/octave-forge-mvn/Makefile
+++ b/math/octave-forge-mvn/Makefile
@@ -22,7 +22,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-nan/Makefile b/math/octave-forge-nan/Makefile
index 50b6a3b81a27..6f8bdf9776a9 100644
--- a/math/octave-forge-nan/Makefile
+++ b/math/octave-forge-nan/Makefile
@@ -24,7 +24,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 ALL_TARGET=	octave
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-ncarray/Makefile b/math/octave-forge-ncarray/Makefile
index 649f935ae541..ceb01028816f 100644
--- a/math/octave-forge-ncarray/Makefile
+++ b/math/octave-forge-ncarray/Makefile
@@ -27,7 +27,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-netcdf/Makefile b/math/octave-forge-netcdf/Makefile
index fd57c22f9736..4aab8cb32295 100644
--- a/math/octave-forge-netcdf/Makefile
+++ b/math/octave-forge-netcdf/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS+=	libnetcdf.so:science/netcdf
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-nlwing2/Makefile b/math/octave-forge-nlwing2/Makefile
index 6bd1dc988cff..3697b70b8405 100644
--- a/math/octave-forge-nlwing2/Makefile
+++ b/math/octave-forge-nlwing2/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-nnet/Makefile b/math/octave-forge-nnet/Makefile
index 510e4070d473..3fcec9518f4c 100644
--- a/math/octave-forge-nnet/Makefile
+++ b/math/octave-forge-nnet/Makefile
@@ -22,7 +22,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-nurbs/Makefile b/math/octave-forge-nurbs/Makefile
index 9646f8f2c7ff..170a3c65a98d 100644
--- a/math/octave-forge-nurbs/Makefile
+++ b/math/octave-forge-nurbs/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-ocs/Makefile b/math/octave-forge-ocs/Makefile
index 94f4d482aa7b..a776932393be 100644
--- a/math/octave-forge-ocs/Makefile
+++ b/math/octave-forge-ocs/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS+=	${TARBALLS_DIR}/odepkg.tar.gz:math/octave-forge-odepkg
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-octcdf/Makefile b/math/octave-forge-octcdf/Makefile
index da64b1613b39..28238523cd32 100644
--- a/math/octave-forge-octcdf/Makefile
+++ b/math/octave-forge-octcdf/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS+=	libnetcdf.so:science/netcdf
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-octclip/Makefile b/math/octave-forge-octclip/Makefile
index 4eaeab88d0ff..f01ef1f47670 100644
--- a/math/octave-forge-octclip/Makefile
+++ b/math/octave-forge-octclip/Makefile
@@ -24,7 +24,7 @@ post-patch:
 	${REINPLACE_CMD} -e s/CC/MKOCTFILE/ -e s/-Wall// -e s/-Wextra// ${WRKSRC}/Makefile
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-octgpr/Makefile b/math/octave-forge-octgpr/Makefile
index 731fe1b99c1b..0619064976ca 100644
--- a/math/octave-forge-octgpr/Makefile
+++ b/math/octave-forge-octgpr/Makefile
@@ -26,7 +26,7 @@ GNU_CONFIGURE=	yes
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-octproj/Makefile b/math/octave-forge-octproj/Makefile
index 43260feb761a..cc9865662058 100644
--- a/math/octave-forge-octproj/Makefile
+++ b/math/octave-forge-octproj/Makefile
@@ -26,7 +26,7 @@ post-patch:
 	${REINPLACE_CMD} -e s/CC/MKOCTFILE/ -e s/-Wall// -e s/-Wextra// ${WRKSRC}/Makefile
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-odepkg/Makefile b/math/octave-forge-odepkg/Makefile
index bc232045aaad..105822107356 100644
--- a/math/octave-forge-odepkg/Makefile
+++ b/math/octave-forge-odepkg/Makefile
@@ -26,7 +26,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-optics/Makefile b/math/octave-forge-optics/Makefile
index b3555b63a913..143f8a0d7872 100644
--- a/math/octave-forge-optics/Makefile
+++ b/math/octave-forge-optics/Makefile
@@ -23,7 +23,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-optim/Makefile b/math/octave-forge-optim/Makefile
index 4d8f7653aa5e..b73a88a2d8d2 100644
--- a/math/octave-forge-optim/Makefile
+++ b/math/octave-forge-optim/Makefile
@@ -26,7 +26,7 @@ GNU_CONFIGURE=	yes
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-optiminterp/Makefile b/math/octave-forge-optiminterp/Makefile
index 21cab9b7686c..504bc4c1189d 100644
--- a/math/octave-forge-optiminterp/Makefile
+++ b/math/octave-forge-optiminterp/Makefile
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 MAKE_ENV+=	MKOCTFILE_FORTRAN_90=yes MKOCTFILE=mkoctfile
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-parallel/Makefile b/math/octave-forge-parallel/Makefile
index 67407a73d763..4dfb2312f651 100644
--- a/math/octave-forge-parallel/Makefile
+++ b/math/octave-forge-parallel/Makefile
@@ -22,7 +22,7 @@ USES=		compiler:gcc-c++11-lib
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-plot/Makefile b/math/octave-forge-plot/Makefile
index c603df263c57..045daa179b55 100644
--- a/math/octave-forge-plot/Makefile
+++ b/math/octave-forge-plot/Makefile
@@ -22,7 +22,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-pt_br/Makefile b/math/octave-forge-pt_br/Makefile
index 3766034608ad..1dd04ee202d7 100644
--- a/math/octave-forge-pt_br/Makefile
+++ b/math/octave-forge-pt_br/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-quaternion/Makefile b/math/octave-forge-quaternion/Makefile
index 209b59cd2b69..99602fbb81dd 100644
--- a/math/octave-forge-quaternion/Makefile
+++ b/math/octave-forge-quaternion/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-queueing/Makefile b/math/octave-forge-queueing/Makefile
index 7e3fac44afb9..ea231038a0f1 100644
--- a/math/octave-forge-queueing/Makefile
+++ b/math/octave-forge-queueing/Makefile
@@ -21,7 +21,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-secs1d/Makefile b/math/octave-forge-secs1d/Makefile
index 96abbbb07032..d3adee954a43 100644
--- a/math/octave-forge-secs1d/Makefile
+++ b/math/octave-forge-secs1d/Makefile
@@ -24,7 +24,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-secs3d/Makefile b/math/octave-forge-secs3d/Makefile
index b621261aef06..3ab387fae54a 100644
--- a/math/octave-forge-secs3d/Makefile
+++ b/math/octave-forge-secs3d/Makefile
@@ -25,7 +25,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-signal/Makefile b/math/octave-forge-signal/Makefile
index df8f0ebc3309..9a390cc46ee6 100644
--- a/math/octave-forge-signal/Makefile
+++ b/math/octave-forge-signal/Makefile
@@ -26,7 +26,7 @@ post-patch:
 	${REINPLACE_CMD} s/-Wall// ${WRKSRC}/Makefile
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-sockets/Makefile b/math/octave-forge-sockets/Makefile
index 7c51f835e3c9..6344a933adbb 100644
--- a/math/octave-forge-sockets/Makefile
+++ b/math/octave-forge-sockets/Makefile
@@ -26,7 +26,7 @@ post-patch:
 	${REINPLACE_CMD} 's/sed/gsed/g' ${WRKSRC}/Makefile
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-sparsersb/Makefile b/math/octave-forge-sparsersb/Makefile
index 1bcb7ccdaa96..91a2830723c9 100644
--- a/math/octave-forge-sparsersb/Makefile
+++ b/math/octave-forge-sparsersb/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-specfun/Makefile b/math/octave-forge-specfun/Makefile
index dc861a2de213..7da327a1b8e4 100644
--- a/math/octave-forge-specfun/Makefile
+++ b/math/octave-forge-specfun/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-splines/Makefile b/math/octave-forge-splines/Makefile
index 471847ba0d50..cace427cc9c2 100644
--- a/math/octave-forge-splines/Makefile
+++ b/math/octave-forge-splines/Makefile
@@ -24,7 +24,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-statistics/Makefile b/math/octave-forge-statistics/Makefile
index 5d21bc1a3941..b7c776eab4a5 100644
--- a/math/octave-forge-statistics/Makefile
+++ b/math/octave-forge-statistics/Makefile
@@ -21,7 +21,7 @@ do-build:
 	@${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-stk/Makefile b/math/octave-forge-stk/Makefile
index a81ac75a3daf..ee37c073d358 100644
--- a/math/octave-forge-stk/Makefile
+++ b/math/octave-forge-stk/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-strings/Makefile b/math/octave-forge-strings/Makefile
index fcc2093700c3..9e71c8db6d45 100644
--- a/math/octave-forge-strings/Makefile
+++ b/math/octave-forge-strings/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 ALL_TARGET=	# Intentionally left empty
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-struct/Makefile b/math/octave-forge-struct/Makefile
index 9362dbe3f48f..456c98938e88 100644
--- a/math/octave-forge-struct/Makefile
+++ b/math/octave-forge-struct/Makefile
@@ -22,7 +22,7 @@ GNU_CONFIGURE=	yes
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-symbolic/Makefile b/math/octave-forge-symbolic/Makefile
index 5f046bb8ed52..80fa7287117a 100644
--- a/math/octave-forge-symbolic/Makefile
+++ b/math/octave-forge-symbolic/Makefile
@@ -26,7 +26,7 @@ do-build:
 	${DO_NADA}
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-tisean/Makefile b/math/octave-forge-tisean/Makefile
index 2ed9482f0812..b0382e8c94c0 100644
--- a/math/octave-forge-tisean/Makefile
+++ b/math/octave-forge-tisean/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.pre.mk>
diff --git a/math/octave-forge-tsa/Makefile b/math/octave-forge-tsa/Makefile
index daeaa597f439..1d64b3506974 100644
--- a/math/octave-forge-tsa/Makefile
+++ b/math/octave-forge-tsa/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/${OCTSRC}/src
 ALL_TARGET=	octave
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-video/Makefile b/math/octave-forge-video/Makefile
index e169f8175771..4df0ff2cbd2d 100644
--- a/math/octave-forge-video/Makefile
+++ b/math/octave-forge-video/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-zeromq/Makefile b/math/octave-forge-zeromq/Makefile
index a28b197132cc..5128233fa56d 100644
--- a/math/octave-forge-zeromq/Makefile
+++ b/math/octave-forge-zeromq/Makefile
@@ -25,7 +25,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
-	${RM} -f ${WRKSRC}/Makefile ${WRKSRC}/configure
+	${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/math/py-bitvector/Makefile b/math/py-bitvector/Makefile
index 64c0a4cab4a6..f04b1bb88c2d 100644
--- a/math/py-bitvector/Makefile
+++ b/math/py-bitvector/Makefile
@@ -20,7 +20,7 @@ PYDISTUTILS_PKGNAME=	BitVector
 PORTDOCS=	README BitVector-${PORTVERSION}.html
 
 post-extract:
-	@${RM} -f ${WRKSRC}/test.py
+	@${RM} ${WRKSRC}/test.py
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
diff --git a/math/py-numarray/Makefile b/math/py-numarray/Makefile
index ab949868d824..7279417b74a0 100644
--- a/math/py-numarray/Makefile
+++ b/math/py-numarray/Makefile
@@ -32,6 +32,6 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${TAR} -C ${WRKSRC}/Doc -cf- .|${TAR} -C ${STAGEDIR}${DOCSDIR} -xf-
 	@${TAR} -C ${WRKSRC}/Examples -cf- .|${TAR} -C ${STAGEDIR}${EXAMPLESDIR} -xf-
-	@${RM} -fr ${STAGEDIR}${EXAMPLESDIR}/ufunc/build
+	@${RM} -r ${STAGEDIR}${EXAMPLESDIR}/ufunc/build
 
 .include <bsd.port.mk>
diff --git a/math/qtiplot-doc/Makefile b/math/qtiplot-doc/Makefile
index d92dd1b12839..37ec91acddcf 100644
--- a/math/qtiplot-doc/Makefile
+++ b/math/qtiplot-doc/Makefile
@@ -25,7 +25,7 @@ post-patch:
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	${RM} -rf ${WRKSRC}/html/pics-it
+	${RM} -r ${WRKSRC}/html/pics-it
 	cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/math/sage/Makefile b/math/sage/Makefile
index 6fdcf06a5172..311683522e1d 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -62,14 +62,14 @@ post-patch:
 	@${CHMOD} +x ${WRKSRC}/local/bin/ld
 
 post-build:
-	${RM} -rf ${WRKSRC}/tmp/.sage
+	${RM} -r ${WRKSRC}/tmp/.sage
 	${CHMOD} -R a+rX ${WRKSRC}
 
 check regression-test test: build
 	@${ECHO_MSG} This test can also be performed after installation by typing \"sage -testall\".
 	@${ECHO_MSG}
 	cd ${WRKSRC} && ${SETENV} DOT_SAGE=${WRKSRC}/tmp/.sage ./sage -testall
-	${RM} -f ${WRKSRC}/python*.core
+	${RM} ${WRKSRC}/python*.core
 
 # Don't build docs (because of mysterious race conditions).
 ALL_TARGET=	build
@@ -83,7 +83,7 @@ do-install:
 		${SED} -e 's#${WRKDIR}/##' | \
 		${CPIO} -pmud -R ${BINOWN}:${BINGRP} ${STAGEDIR}${PREFIX}
 	${ECHO_CMD} | ${SETENV} DOT_SAGE=${STAGED_SAGE_DIR}/tmp/.sage ${STAGED_SAGE_DIR}/sage
-	${RM} -rf ${STAGED_SAGE_DIR}/tmp/.sage
+	${RM} -r ${STAGED_SAGE_DIR}/tmp/.sage
 	${SED} -e "s+#SAGE_ROOT.*+SAGE_ROOT=${INSTALL_SAGE_DIR}+" ${WRKSRC}/sage > ${STAGEDIR}${PREFIX}/bin/sage
 	${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/bin/sage
 
@@ -99,7 +99,7 @@ MAKE_ENV+=	MAKE="${MAKE} -j${MAKE_JOBS_NUMBER}"
 
 .ifdef MAINTAINER_MODE
 test-fbsd-patches:	patch
-	${RM} -rf ${WRKSRC}/build/pkgs/*/src; \
+	${RM} -r ${WRKSRC}/build/pkgs/*/src; \
 	for d in ${WRKSRC}/build/pkgs/*; do \
 		if ls $$d/fbsd-patch-* > /dev/null 2>&1; then \
 			${ECHO_MSG} Testing patches in $${d##*/}; \
@@ -123,7 +123,7 @@ test-fbsd-patches:	patch
 			fi; \
 		fi; \
 	done; \
-	${RM} -rf ${WRKSRC}/build/pkgs/*/src
+	${RM} -r ${WRKSRC}/build/pkgs/*/src
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile
index 65758c3c931f..ad5a07347eff 100644
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@@ -109,7 +109,7 @@ pre-configure:
 .endfor
 
 post-build:
-	${RM} -rf ${WRKSRC}/CMakeFiles ${WRKSRC}/CMakeCache.txt
+	${RM} -r ${WRKSRC}/CMakeFiles ${WRKSRC}/CMakeCache.txt
 	${CP} -p ${WRKSRC}/Makefile.dist ${WRKSRC}/Makefile
 	(cd ${WRKSRC} &&	\
 	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:C|BUILD_STATIC_LIBS|BUILD_SHARED_LIBS|} ${CMAKE_SOURCE_PATH})
diff --git a/math/superlu_mt/Makefile b/math/superlu_mt/Makefile
index cf3afb7bd37b..80143825c86f 100644
--- a/math/superlu_mt/Makefile
+++ b/math/superlu_mt/Makefile
@@ -88,15 +88,15 @@ post-patch:
 do-build:
 	cd ${WRKSRC} ; ${MAKE_CMD} LDFLAGS="${LDFLAGS}"
 	cd ${WRKSRC_SHARED} ; ${MAKE_CMD} LDFLAGS="${LDFLAGS}"
-	${RM} -rf ${WRKDIR}/tmp_static
+	${RM} -r ${WRKDIR}/tmp_static
 	${MKDIR} ${WRKDIR}/tmp_static
 	cd ${WRKDIR}/tmp_static
 	${FIND} ${WRKSRC} -name "*\.a" -exec ${CP} {} ${WRKDIR}/tmp_static \;
-	${RM} -rf ${WRKDIR}/tmp_shared
+	${RM} -r ${WRKDIR}/tmp_shared
 	${MKDIR} ${WRKDIR}/tmp_shared
 	${FIND} ${WRKSRC_SHARED} -name "*\.a" -exec ${CP} {} ${WRKDIR}/tmp_shared \;
 	@cd ${WRKDIR}/tmp_shared ; for i in `ls *.a | ${SED}  's/\.a//' `; do \
-	${RM} -f $${i}.so.* $${i}.so ; \
+	${RM} $${i}.so.* $${i}.so ; \
 	${FC} ${CFLAGS} ${FPIC} ${LDFLAGS} -shared -o $${i}.so.${SVERSION} \
 	-Wl,-soname,$${i}.so.${SVERSION} -Wl,--allow-multiple-definition \
 	-Wl,--whole-archive $${i}.a -Wl,--no-whole-archive -Wl,--as-needed; \
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index 32d2fd80fc22..17949cdc70e4 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -246,7 +246,7 @@ post-install:
 	done
 	@cd ${STAGEDIR}${LIBDIR}; \
 	for lib in *.so; do \
-	    ${RM} -f $$lib; \
+	    ${RM} $$lib; \
 	    ${LN} -sf $$lib.${PORTVERSION} $$lib.${PORTVERSION:R}; \
 	    ${LN} -sf $$lib.${PORTVERSION:R} $$lib.${PORTVERSION:R:R}; \
 	    ${LN} -sf $$lib.${PORTVERSION:R:R} $$lib; \
@@ -254,7 +254,7 @@ post-install:
 .if ${PORT_OPTIONS:MQT4}
 	@cd ${STAGEDIR}${LIBDIR}; \
 	for lib in libQVTK*.so; do \
-	    ${RM} -f $$lib; \
+	    ${RM} $$lib; \
 	    ${LN} -sf $$lib.${PORTVERSION} $$lib; \
 	    ${LN} -sf $$lib.${PORTVERSION} $$lib.${PORTVERSION:R:R}; \
 	done
diff --git a/math/xppaut/Makefile b/math/xppaut/Makefile
index e35e9138c8bb..6564f1ba3044 100644
--- a/math/xppaut/Makefile
+++ b/math/xppaut/Makefile
@@ -25,6 +25,6 @@ DOCS_MAKE_ENV_OFF=	NOPORTDOCS=yes
 EXAMPLES_MAKE_ENV_OFF=	NOPORTEXAMPLES=yes
 
 post-build:
-	${RM} -f ${WRKSRC}/ode/._*
+	${RM} ${WRKSRC}/ode/._*
 
 .include <bsd.port.mk>
diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile
index 717a28e29874..16413be46b48 100644
--- a/misc/compat4x/Makefile
+++ b/misc/compat4x/Makefile
@@ -77,7 +77,7 @@ do-extract:
 	@(cd ${DISTDIR}/${DIST_SUBDIR} && ${CAT} ${DISTFILES} | ${TAR} -xzf - -C ${WRKDIR} )
 .if !defined(FORCE_VULNERABLE_OPENSSL)
 .for lib in ${OPENSSL_LIBS}
-	@${RM} -f ${WRKSRC}/${lib}
+	@${RM} ${WRKSRC}/${lib}
 .endfor
 .endif
 
diff --git a/misc/compat5x/Makefile b/misc/compat5x/Makefile
index 1025bc78ba57..b1b1a149a4d8 100644
--- a/misc/compat5x/Makefile
+++ b/misc/compat5x/Makefile
@@ -54,12 +54,12 @@ PLIST_SUB+=	SPARC64="@comment "
 
 do-install:
 	@${MKDIR} -m 0755 ${STAGEDIR}${TARGET_DIR}
-	${RM} -f ${WRKSRC}/libpthread.so.1
+	${RM} ${WRKSRC}/libpthread.so.1
 	(cd ${STAGEDIR}${TARGET_DIR} && ${LN} -sf libthr.so.1 libpthread.so.1)
 	(cd ${WRKSRC} && ${INSTALL_DATA} *.so.* ${STAGEDIR}${TARGET_DIR})
 .if ${ARCH} == amd64
 	@${MKDIR} ${STAGEDIR}${TARGET32_DIR}
-	${RM} -f ${WRKSRC}/lib32/libpthread.so.1
+	${RM} ${WRKSRC}/lib32/libpthread.so.1
 	(cd ${STAGEDIR}${TARGET32_DIR} && ${LN} -sf libthr.so.1 libpthread.so.1)
 	(cd ${WRKSRC}/lib32 && ${INSTALL_DATA} *.so.* ${STAGEDIR}${TARGET32_DIR})
 .endif
diff --git a/misc/compat6x/Makefile b/misc/compat6x/Makefile
index ab28da2f4e78..b5b0b75d4e5b 100644
--- a/misc/compat6x/Makefile
+++ b/misc/compat6x/Makefile
@@ -33,12 +33,12 @@ USE_LDCONFIG32=	${TARGET32_DIR}
 
 do-install:
 	@${MKDIR} -m 755 ${STAGEDIR}${TARGET_DIR}
-	${RM} -f ${WRKSRC}/lib/libpthread.so.2
+	${RM} ${WRKSRC}/lib/libpthread.so.2
 	(cd ${STAGEDIR}${TARGET_DIR} && ${LN} -sf libthr.so.2 libpthread.so.2)
 	(cd ${WRKSRC}/lib && ${INSTALL_DATA} *.so.* ${STAGEDIR}${TARGET_DIR})
 .if ${ARCH} == amd64
 	@${MKDIR} ${STAGEDIR}${TARGET32_DIR}
-	${RM} -f ${WRKSRC}/lib32/libpthread.so.2
+	${RM} ${WRKSRC}/lib32/libpthread.so.2
 	(cd ${STAGEDIR}${TARGET32_DIR} && ${LN} -sf libthr.so.2 libpthread.so.2)
 	(cd ${WRKSRC}/lib32 && ${INSTALL_DATA} *.so.* ${STAGEDIR}${TARGET32_DIR})
 .endif
diff --git a/misc/figlet-fonts/Makefile b/misc/figlet-fonts/Makefile
index c7450924c490..b0eec645edf1 100644
--- a/misc/figlet-fonts/Makefile
+++ b/misc/figlet-fonts/Makefile
@@ -24,19 +24,19 @@ post-extract:
 		${TAR} xf Obanner-canon.tgz -C ${WRKSRC}/contributed/ && \
 		${MV} ./Obanner-canon/* ${WRKSRC}/contributed/ && \
 		${RMDIR} ./Obanner-canon && \
-		${RM} -f Obanner-canon.tgz && \
+		${RM} Obanner-canon.tgz && \
 		${TAR} xf Obanner.tgz -C ${WRKSRC}/contributed/ && \
 		${MV} ./Obanner/* ${WRKSRC}/contributed/ && \
 		${RMDIR} ./Obanner && \
-		${RM} -f Obanner.tgz && \
+		${RM} Obanner.tgz && \
 		${MV} ./C64-fonts/* ${WRKSRC}/contributed/ && \
 		${RMDIR} ./C64-fonts && \
 		${MV} ./bdffonts/* ${WRKSRC}/contributed/ && \
 		${RMDIR} ./bdffonts
 	@cd ${WRKSRC}/international && \
 		${TAR} xf cjkfonts.tar.gz -C ${WRKSRC}/international/ && \
-		${RM} -f cjkfonts.tar.gz
-	@${RM} -f ${WRKSRC}/contributed/banner.flf
+		${RM} cjkfonts.tar.gz
+	@${RM} ${WRKSRC}/contributed/banner.flf
 
 do-install:
 .for f in contributed international
diff --git a/misc/gnuit/Makefile b/misc/gnuit/Makefile
index 81ec6fcc6a41..339eb43d21f4 100644
--- a/misc/gnuit/Makefile
+++ b/misc/gnuit/Makefile
@@ -15,8 +15,8 @@ CONFIGURE_ARGS=	--disable-transition
 
 post-install:
 	# Clean stage from orphans.
-	${RM} -f ${STAGEDIR}${PREFIX}/man/man1/gitmkdirs.1
-	${RM} -f ${STAGEDIR}${PREFIX}/man/man1/gitwhich.1
-	${RM} -f ${STAGEDIR}${PREFIX}/man/man1/gitxgrep.1
+	${RM} ${STAGEDIR}${PREFIX}/man/man1/gitmkdirs.1
+	${RM} ${STAGEDIR}${PREFIX}/man/man1/gitwhich.1
+	${RM} ${STAGEDIR}${PREFIX}/man/man1/gitxgrep.1
 
 .include <bsd.port.mk>
diff --git a/misc/jargon/Makefile b/misc/jargon/Makefile
index 49a5972545e3..6e3b5fd798d4 100644
--- a/misc/jargon/Makefile
+++ b/misc/jargon/Makefile
@@ -15,7 +15,7 @@ DATADIR=	${PREFIX}/share/jargon
 
 post-extract:
 	(cd ${WRKSRC}; \
-	 ${RM} -rf html/graphics/.xvpics graphics/.xvpics \
+	 ${RM} -r html/graphics/.xvpics graphics/.xvpics \
 		html/letters.html~ html/online-preface.html~)
 
 do-install:
diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile
index 3639460c76dc..edf2756ef5ee 100644
--- a/misc/lingoteach/Makefile
+++ b/misc/lingoteach/Makefile
@@ -54,7 +54,7 @@ post-patch::
 .if ${PORT_OPTIONS:MSOUND}
 post-install::
 	cd ${WRKDIR}/${PORTNAME}-sound-${SOUNDV}/data; \
-		${RM} -f Make*; \
+		${RM} Make*; \
 		${CP} -R ${WRKDIR}/${PORTNAME}-sound-${SOUNDV}/data \
 		${STAGEDIR}${DATADIR};
 .endif
diff --git a/misc/posixtestsuite/Makefile b/misc/posixtestsuite/Makefile
index 1a8a90da9da6..7b1e67f2ed61 100644
--- a/misc/posixtestsuite/Makefile
+++ b/misc/posixtestsuite/Makefile
@@ -63,7 +63,7 @@ help:	pre-everything
 
 aclean:	all
 	@${ECHO} "Cleaning tests tree..."
-	-@(cd ${WRKSRC} && ${RM} -f ${RUN_RESULT} && ${MAKE_CMD} clean)
+	-@(cd ${WRKSRC} && ${RM} ${RUN_RESULT} && ${MAKE_CMD} clean)
 
 rerun:	all
 .if defined(WITH_THRLIB)
diff --git a/misc/py-qt4-demo/Makefile b/misc/py-qt4-demo/Makefile
index 637a0500c103..4a0d011ddbf9 100644
--- a/misc/py-qt4-demo/Makefile
+++ b/misc/py-qt4-demo/Makefile
@@ -26,7 +26,7 @@ USE_PYQT=	assistant_run core_run dbus_run dbussupport_run declarative_run \
 		xmlpatterns_run sip_run qscintilla2_run
 
 do-install:
-	${RM} -f ${WRKSRC}/examples/designer/plugins/plugins.py.orig
+	${RM} ${WRKSRC}/examples/designer/plugins/plugins.py.orig
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
diff --git a/misc/talkfilters/Makefile b/misc/talkfilters/Makefile
index e222196cd5b6..2bea4854ff76 100644
--- a/misc/talkfilters/Makefile
+++ b/misc/talkfilters/Makefile
@@ -28,7 +28,7 @@ post-extract:
 	@${CHMOD} +x ${WRKSRC}/install-sh
 
 post-patch:
-	@${RM} -f ${WRKSRC}/*.info*
+	@${RM} ${WRKSRC}/*.info*
 	@${REINPLACE_CMD} -e \
 		's|^\(pkgconfigdir\ =\ \).*|\1$$(prefix)/libdata/pkgconfig|' \
 			${WRKSRC}/Makefile.am \
diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile
index 35a77faa1655..c8a7f1919a06 100644
--- a/multimedia/kissdx/Makefile
+++ b/multimedia/kissdx/Makefile
@@ -43,7 +43,7 @@ post-patch:
 		 /^all:/s| $$(OBJS)||' ${WRKSRC}/Makefile
 
 pre-build:
-	@${RM} -f ${WRKSRC}/kissdx.o
+	@${RM} ${WRKSRC}/kissdx.o
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/kissdx ${STAGEDIR}${PREFIX}/sbin
diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile
index 2ffe3fcd4dd0..4cda46d0ffce 100644
--- a/multimedia/libmediainfo/Makefile
+++ b/multimedia/libmediainfo/Makefile
@@ -50,6 +50,6 @@ post-patch:
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/libmediainfo-config ${STAGEDIR}${PREFIX}/bin/libmediainfo-config
 	${INSTALL_DATA} ${WRKSRC}/libmediainfo.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libmediainfo.pc
-	${RM} -fr ${STAGEDIR}${PREFIX}/include/MediaInfoDLL/
+	${RM} -r ${STAGEDIR}${PREFIX}/include/MediaInfoDLL/
 
 .include <bsd.port.mk>
diff --git a/multimedia/mlt/Makefile b/multimedia/mlt/Makefile
index 0977d9af8096..b311d4794f6b 100644
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -125,7 +125,7 @@ pre-configure:
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/melt.1 ${STAGEDIR}${MANPREFIX}/man/man1/melt.1
-	@${RM} -f ${WRKSRC}/docs/melt.1
+	@${RM} ${WRKSRC}/docs/melt.1
 .if ${PORT_OPTIONS:MDOCS}
 . for f in ${PORTDOCS}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${DOCSDIR}
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index daa5f52a14cb..34b82a6ab852 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -133,7 +133,7 @@ pre-configure:
 
 # replace bundled mp4v2 with placeholder
 post-configure:
-	@${RM} -rf ${WRKSRC}/lib/mp4v2
+	@${RM} -r ${WRKSRC}/lib/mp4v2
 	@${MKDIR} ${WRKSRC}/lib/mp4v2
 	@echo '#include "mpeg4ip.h"' > ${WRKSRC}/lib/mp4v2/mp4.h
 
diff --git a/multimedia/oscam/Makefile b/multimedia/oscam/Makefile
index acc2d6c4dd87..b69eb40d73b7 100644
--- a/multimedia/oscam/Makefile
+++ b/multimedia/oscam/Makefile
@@ -25,7 +25,7 @@ SVN_REV=	11062
 SVN_SRC=	http://www.streamboard.tv/svn/oscam/trunk
 
 do-install:
-	${RM} -f ${WRKSRC}/Distribution/*.debug
+	${RM} ${WRKSRC}/Distribution/*.debug
 	${INSTALL_PROGRAM} ${WRKSRC}/Distribution/${PORTNAME}-${PORTVERSION}-* ${STAGEDIR}${PREFIX}/bin/oscam
 	${INSTALL_MAN} ${WRKSRC}/Distribution/doc/man/*.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/Distribution/doc/man/*.5 ${STAGEDIR}${PREFIX}/man/man5/
diff --git a/multimedia/py-openlp/Makefile b/multimedia/py-openlp/Makefile
index c25a8d7b51db..825c28884dd3 100644
--- a/multimedia/py-openlp/Makefile
+++ b/multimedia/py-openlp/Makefile
@@ -43,7 +43,7 @@ QT_LRELEASE=	${LOCALBASE}/bin/lrelease-qt4
 NO_ARCH=	yes
 
 pre-build:
-	@${RM} -f ${WRKSRC}/resources/__init__.py
+	@${RM} ${WRKSRC}/resources/__init__.py
 	@${MKDIR} ${WRKSRC}/resources/i18n/qm
 	@set -e; \
 	for TSFILE in ${WRKSRC}/resources/i18n/*.ts; do \
diff --git a/multimedia/pymp/Makefile b/multimedia/pymp/Makefile
index f5ee7b760831..1b1dd015ce0f 100644
--- a/multimedia/pymp/Makefile
+++ b/multimedia/pymp/Makefile
@@ -34,7 +34,7 @@ OPTIONS_DEFINE=	DOCS
 post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|; \
 		s|PREFIX/lib/pymp|${DATADIR}|' ${WRKSRC}/${PORTNAME}
-	@${RM} -f ${WRKSRC}/build.py
+	@${RM} ${WRKSRC}/build.py
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
diff --git a/multimedia/qmmp-plugin-pack-qt5/Makefile b/multimedia/qmmp-plugin-pack-qt5/Makefile
index 7765b38a6868..a1f4777153a7 100644
--- a/multimedia/qmmp-plugin-pack-qt5/Makefile
+++ b/multimedia/qmmp-plugin-pack-qt5/Makefile
@@ -53,6 +53,6 @@ XMP_LIB_DEPENDS=	libxmp.so:audio/libxmp
 XMP_CMAKE_BOOL=	USE_XMP
 
 pre-configure:
-	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
+	@${RM} ${BUILD_WRKSRC}/CMakeCache.txt
 
 .include <bsd.port.mk>
diff --git a/multimedia/qmmp-plugin-pack/Makefile b/multimedia/qmmp-plugin-pack/Makefile
index f792a0f823c6..84fcdba785ae 100644
--- a/multimedia/qmmp-plugin-pack/Makefile
+++ b/multimedia/qmmp-plugin-pack/Makefile
@@ -57,6 +57,6 @@ XMP_CMAKE_ON=	-DUSE_XMP:BOOL=TRUE
 XMP_CMAKE_OFF=	-DUSE_XMP:BOOL=FALSE
 
 pre-configure:
-	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
+	@${RM} ${BUILD_WRKSRC}/CMakeCache.txt
 
 .include <bsd.port.mk>
diff --git a/multimedia/qmmp-qt5/Makefile b/multimedia/qmmp-qt5/Makefile
index 62728ceae3d5..6188aa2765f8 100644
--- a/multimedia/qmmp-qt5/Makefile
+++ b/multimedia/qmmp-qt5/Makefile
@@ -287,7 +287,7 @@ post-patch:
 		${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|'
 
 pre-configure:
-	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
+	@${RM} ${BUILD_WRKSRC}/CMakeCache.txt
 
 post-build-DOXYGEN-on:
 	cd ${WRKSRC}/doc && doxygen Doxyfile
@@ -302,7 +302,7 @@ post-install-DOXYGEN-on:
 		${INSTALL_MAN} *.html *.png *.css ${STAGEDIR}${DOCSDIR}/html ; \
 	cd ${WRKSRC}/doc/html/search && \
 		${INSTALL_MAN} *.html *.png *.css *.js ${STAGEDIR}${DOCSDIR}/html/search ; \
-	${RM} -f ${WRKDIR}/PLIST.doc ; \
+	${RM} ${WRKDIR}/PLIST.doc ; \
 	${FIND} ${STAGEDIR}${DOCSDIR}/html -type f | \
 		${SED} 's|${STAGEDIR}${PREFIX}/||' \
 		>> ${WRKDIR}/PLIST.doc ; \
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 48435a584403..e0a05cd8269b 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -292,7 +292,7 @@ post-patch:
 		${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|'
 
 pre-configure:
-	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
+	@${RM} ${BUILD_WRKSRC}/CMakeCache.txt
 
 post-build-DOXYGEN-on:
 	cd ${WRKSRC}/doc && doxygen Doxyfile
@@ -307,7 +307,7 @@ post-install-DOXYGEN-on:
 		${INSTALL_MAN} *.html *.png *.css ${STAGEDIR}${DOCSDIR}/html ; \
 	cd ${WRKSRC}/doc/html/search && \
 		${INSTALL_MAN} *.html *.png *.css *.js ${STAGEDIR}${DOCSDIR}/html/search ; \
-	${RM} -f ${WRKDIR}/PLIST.doc ; \
+	${RM} ${WRKDIR}/PLIST.doc ; \
 	${FIND} ${STAGEDIR}${DOCSDIR}/html -type f | \
 		${SED} 's|${STAGEDIR}${PREFIX}/||' \
 		>> ${WRKDIR}/PLIST.doc ; \
diff --git a/multimedia/v4l-utils/Makefile b/multimedia/v4l-utils/Makefile
index a2d897b4db80..f3ee37ed4e14 100644
--- a/multimedia/v4l-utils/Makefile
+++ b/multimedia/v4l-utils/Makefile
@@ -15,6 +15,6 @@ INSTALL_WRKSRC=	${WRKSRC}/utils
 
 # no need for udev rules
 post-install:
-	@${RM} -rf ${STAGEDIR}/lib/udev
+	@${RM} -r ${STAGEDIR}/lib/udev
 
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 8e0148c928a5..864d2c476a11 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -358,7 +358,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/dev/cdrom|${WITH_CDROM_DEVICE}|g' \
 		-e 's|/dev/dvd|${WITH_DVD_DEVICE}|g' \
 		${WRKSRC}/src/libvlc-module.c
-	@${RM} -rf ${WRKSRC}/modules/access/v4l2/linux
+	@${RM} -r ${WRKSRC}/modules/access/v4l2/linux
 # XXX FreeBSD doesn't have strerror_l() - use the android version of error.c
 	@${CP} ${WRKSRC}/src/android/error.c ${WRKSRC}/src/posix
 .if ${PORT_OPTIONS:MQT4}
diff --git a/net-im/p5-Net-AIM/Makefile b/net-im/p5-Net-AIM/Makefile
index 3cb96f7b60ec..062de4c435ec 100644
--- a/net-im/p5-Net-AIM/Makefile
+++ b/net-im/p5-Net-AIM/Makefile
@@ -18,6 +18,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-extract:
-	@${RM} -f ${WRKSRC}/Net
+	@${RM} ${WRKSRC}/Net
 
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-skype/Makefile b/net-im/pidgin-skype/Makefile
index c5d1f242153d..2f2616c04afb 100644
--- a/net-im/pidgin-skype/Makefile
+++ b/net-im/pidgin-skype/Makefile
@@ -25,11 +25,11 @@ USE_GNOME=	glib20
 # Note that googlecode.com is gone.
 build-tarball: ${DISTFILES}
 ${DISTFILES}:
-	${RM} -rf ${WRKSRC}
+	${RM} -r ${WRKSRC}
 	svn export -r${PORTVERSION:E} \
 	    http://skype4pidgin.googlecode.com/svn/trunk/ ${WRKSRC}
 	tar -C ${WRKSRC}/.. -cvf - ${WRKSRC:T} | ${XZ_CMD} -vvc >${DISTFILES} || \
-	    { ${RM} -f ${DISTFILES} ; exit 1 ; }
+	    { ${RM} ${DISTFILES} ; exit 1 ; }
 
 upload-tarball: build-tarball
 	scp ${DISTFILES} freefall.freebsd.org:public_distfiles/
diff --git a/net-im/pwytter/Makefile b/net-im/pwytter/Makefile
index 9ba9de46e0fd..bd01a6091122 100644
--- a/net-im/pwytter/Makefile
+++ b/net-im/pwytter/Makefile
@@ -28,7 +28,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DOS2UNIX_GLOB=	 *.py
 
 post-patch:
-	@${RM} -rf ${WRKSRC}/twclient/simplejson
+	@${RM} -r ${WRKSRC}/twclient/simplejson
 	@${REINPLACE_CMD} -e "s|'simplejson|}, #&|" \
 		-e "s|pwParam|pwCache','&|" \
 		-e "s|d\[p\]|d\['share/'+p\]|g" \
diff --git a/net-im/turpial/Makefile b/net-im/turpial/Makefile
index dcde24c6dadb..d43caa3dc3d0 100644
--- a/net-im/turpial/Makefile
+++ b/net-im/turpial/Makefile
@@ -28,7 +28,7 @@ LOCALES_DIR=	ca de eo es fr it ja pt_BR pt_PT ru_RU tr
 post-extract:
 # setuptools doesn't exclude these directories
 .for dir in unity gtk
-	@${RM} -Rf ${WRKSRC}/turpial/ui/${dir}
+	@${RM} -R ${WRKSRC}/turpial/ui/${dir}
 .endfor
 
 post-patch:
diff --git a/net-mgmt/ccnet/Makefile b/net-mgmt/ccnet/Makefile
index 8682f1b6bd60..e7871e447040 100644
--- a/net-mgmt/ccnet/Makefile
+++ b/net-mgmt/ccnet/Makefile
@@ -65,7 +65,7 @@ post-install:
 		${STAGEDIR}${PREFIX}/bin/ccnet-servtool
 	(cd ${STAGEDIR}${PREFIX}/lib && \
 		${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
-	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
+	@${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
 	${LN} -s ${PREFIX}/${SEABIN}/ccnet-server ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile
index 59a3baecc22b..2a32f28c93be 100644
--- a/net-mgmt/cricket/Makefile
+++ b/net-mgmt/cricket/Makefile
@@ -38,7 +38,7 @@ do-install:
 	${MKDIR} -m 755 ${CRICKETBASE}/cricket-${PORTVERSION}
 	${CP} -R ${WRKSRC}/* ${CRICKETBASE}/cricket-${PORTVERSION}
 	${FIND} ${CRICKETBASE}/cricket-${PORTVERSION} -name \*.orig -or \
-		-name \*.bak | ${XARGS} ${RM} -f
+		-name \*.bak | ${XARGS} ${RM}
 	${LN} -s cricket-${PORTVERSION} \
 		${CRICKETBASE}/cricket
 	if [ -f ${LOCALBASE}/cricket/compile ] ; then \
diff --git a/net-mgmt/mk-livestatus/Makefile b/net-mgmt/mk-livestatus/Makefile
index 1a578f4d4eb9..5ee034248f6d 100644
--- a/net-mgmt/mk-livestatus/Makefile
+++ b/net-mgmt/mk-livestatus/Makefile
@@ -47,7 +47,7 @@ COMMAND_FILE?=	/var/spool/nagios/rw/live
 # Actual version can be found on CPAN
 # http://search.cpan.org/~nierlein/Monitoring-Livestatus/
 post-extract:
-	@${RM} -rf ${WRKSRC}/api/perl
+	@${RM} -r ${WRKSRC}/api/perl
 
 post-patch:
 	@${SED} -i '' -e 's|/usr/bin/python|${LOCALBASE}/bin/python2.7|g' \
diff --git a/net-mgmt/nagvis/Makefile b/net-mgmt/nagvis/Makefile
index ba0eac43dfd0..3f115cb8a215 100644
--- a/net-mgmt/nagvis/Makefile
+++ b/net-mgmt/nagvis/Makefile
@@ -53,7 +53,7 @@ RUN_DEPENDS+=	dot:graphics/graphviz
 .endif
 
 post-extract:
-	@${RM} -f ${WRKSRC}/.gitignore ${WRKSRC}/install.sh ${WRKSRC}/INSTALL
+	@${RM} ${WRKSRC}/.gitignore ${WRKSRC}/install.sh ${WRKSRC}/INSTALL
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -e 's|@NAGVIS_WEB@|/nagvis|g' \
diff --git a/net-mgmt/p5-Net-NSCA-Client/Makefile b/net-mgmt/p5-Net-NSCA-Client/Makefile
index e0629784a5e5..1132f73a1ec4 100644
--- a/net-mgmt/p5-Net-NSCA-Client/Makefile
+++ b/net-mgmt/p5-Net-NSCA-Client/Makefile
@@ -45,8 +45,8 @@ USES=		perl5
 USE_PERL5=	modbuild
 
 post-patch:
-	@cd ${WRKSRC} && ${RM} -f bin/send_nsca
-	@cd ${WRKSRC} && ${RM} -f t/send_nsca.t
+	@cd ${WRKSRC} && ${RM} bin/send_nsca
+	@cd ${WRKSRC} && ${RM} t/send_nsca.t
 
 regression-test: build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build test
diff --git a/net-mgmt/pandorafms_agent/Makefile b/net-mgmt/pandorafms_agent/Makefile
index d637f02568af..3645f1bb2ba3 100644
--- a/net-mgmt/pandorafms_agent/Makefile
+++ b/net-mgmt/pandorafms_agent/Makefile
@@ -40,8 +40,8 @@ post-patch:
 	@${REINPLACE_CMD} -e '\|PREFIX=|s|=[^;]*|=${PREFIX}|' ${WRKSRC}/pandora_agent_installer
 
 post-install:
-	@${RM} -f ${STAGEDIR}${LOGDIR}/pandora_agent.log
-	@${RM} -f ${STAGEDIR}${DATADIR}/collections/.empty
+	@${RM} ${STAGEDIR}${LOGDIR}/pandora_agent.log
+	@${RM} ${STAGEDIR}${DATADIR}/collections/.empty
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
diff --git a/net-mgmt/pandorafms_console/Makefile b/net-mgmt/pandorafms_console/Makefile
index d7da7e1267be..82691244ebbb 100644
--- a/net-mgmt/pandorafms_console/Makefile
+++ b/net-mgmt/pandorafms_console/Makefile
@@ -56,7 +56,7 @@ post-patch:
 
 post-install:
 	@cd ${STAGEDIR}${WWWDIR} \
-		&& ${RM} -rf pandora_console_[il]* DEBIAN/ *.spec \
+		&& ${RM} -r pandora_console_[il]* DEBIAN/ *.spec \
 			attachment/downloads/.gitignore ${PORTDOCS} \
 			Dockerfile docker_entrypoint.sh \
 			*.sql.bak extras/check_other_languages.sh.bak
diff --git a/net-mgmt/pixilate/Makefile b/net-mgmt/pixilate/Makefile
index 1609927e7d81..ed706fb96871 100644
--- a/net-mgmt/pixilate/Makefile
+++ b/net-mgmt/pixilate/Makefile
@@ -26,7 +26,7 @@ PLIST_FILES=	bin/pixilate man/man1/pixilate.1.gz
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@cd ${WRKSRC} && ${RM} -f INSTALL install-sh missing mkinstalldirs
+	@cd ${WRKSRC} && ${RM} INSTALL install-sh missing mkinstalldirs
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/net-mgmt/sblim-wbemcli/Makefile b/net-mgmt/sblim-wbemcli/Makefile
index c99a08fa395d..8e06c1c3225d 100644
--- a/net-mgmt/sblim-wbemcli/Makefile
+++ b/net-mgmt/sblim-wbemcli/Makefile
@@ -16,6 +16,6 @@ USES=	tar:bzip2
 GNU_CONFIGURE=	YES
 CPPFLAGS+=	-I${PREFIX}/include
 LDFLAGS+=	-L${PREFIX}/lib
-MAKE_ARGS=	RM="${RM} -f"
+MAKE_ARGS=	RM="${RM}"
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/seafile/Makefile b/net-mgmt/seafile/Makefile
index 99877252d7b1..ba60c7ccb378 100644
--- a/net-mgmt/seafile/Makefile
+++ b/net-mgmt/seafile/Makefile
@@ -117,7 +117,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/seaf-cli-wrapper.sh ${STAGEDIR}${PREFIX}/bin/seaf-cli
 	(cd ${STAGEDIR}${PREFIX}/lib && \
 		${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
-	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION} \
+	@${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION} \
 		${WRKSRC}/scripts/seaf-cli-wrapper.sh \
 		${WRKSRC}/scripts/sqlite2mysql.[ps][yh] \
 		${WRKSRC}/scripts/setup-seafile.sh \
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index ef28e5eaeb45..c5dbac99b2a9 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -149,7 +149,7 @@ post-patch:
 .endif
 	@${REINPLACE_CMD} -Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \
 		${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in
-	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) -exec ${RM} -f {} +
+	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) -exec ${RM} {} +
 
 post-install:
 .if ${PORT_OPTIONS:MJAVAGW}
diff --git a/net-mgmt/zabbix22-server/Makefile b/net-mgmt/zabbix22-server/Makefile
index 1ee307e99255..0cf04bafa7ee 100644
--- a/net-mgmt/zabbix22-server/Makefile
+++ b/net-mgmt/zabbix22-server/Makefile
@@ -146,7 +146,7 @@ post-patch:
 .endif
 	@${REINPLACE_CMD} -Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \
 		${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in
-	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) -exec ${RM} -f {} +
+	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) -exec ${RM} {} +
 
 .if ${ZABBIX_BUILD} == "server"
 	@${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \
diff --git a/net-mgmt/zabbix24-server/Makefile b/net-mgmt/zabbix24-server/Makefile
index 6cc26e55f1ce..0a4be0d95e49 100644
--- a/net-mgmt/zabbix24-server/Makefile
+++ b/net-mgmt/zabbix24-server/Makefile
@@ -157,7 +157,7 @@ post-patch:
 		-Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \
 		${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in
 	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \
-		-exec ${RM} -f {} +
+		-exec ${RM} {} +
 
 post-install:
 
diff --git a/net-mgmt/zabbix3-server/Makefile b/net-mgmt/zabbix3-server/Makefile
index d027f0ec5777..d4ddd7935708 100644
--- a/net-mgmt/zabbix3-server/Makefile
+++ b/net-mgmt/zabbix3-server/Makefile
@@ -195,7 +195,7 @@ post-patch:
 		-Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \
 		${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in
 	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \
-		-exec ${RM} -f {} +
+		-exec ${RM} {} +
 
 post-install:
 
diff --git a/net-mgmt/zabbix32-server/Makefile b/net-mgmt/zabbix32-server/Makefile
index 121bf244a39b..a4f521f1f387 100644
--- a/net-mgmt/zabbix32-server/Makefile
+++ b/net-mgmt/zabbix32-server/Makefile
@@ -195,7 +195,7 @@ post-patch:
 		-Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \
 		${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in
 	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \
-		-exec ${RM} -f {} +
+		-exec ${RM} {} +
 
 post-install:
 
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index 4b26e5d9d46c..b5e3a396da21 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -78,7 +78,7 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent-nox.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/
 .endif
-	@${RM} -rf ${STAGEDIR}${PREFIX}/share/man
+	@${RM} -r ${STAGEDIR}${PREFIX}/share/man
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile
index b99deeb48b4c..35755225ef28 100644
--- a/net-p2p/vuze/Makefile
+++ b/net-p2p/vuze/Makefile
@@ -56,7 +56,7 @@ CLASSPATH:=${CLASSPATH}:${JAVALIBDIR}/${jar}
 .endfor
 
 post-patch:
-	${RM} -rf ${WRKSRC}/org/eclipse
+	${RM} -r ${WRKSRC}/org/eclipse
 	@${SED} -E -e 's|%%CLASSPATH%%|${CLASSPATH}|' \
 		${FILESDIR}/build.xml > ${WRKSRC}/build.xml
 
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 7ffff2748aaa..a675892cc1aa 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -93,7 +93,7 @@ post-patch: avahi-post-patch
 avahi-post-patch:
 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \
 		${WRKSRC}/man/*.*
-	@${RM} -f ${WRKSRC}/man/*.bak
+	@${RM} ${WRKSRC}/man/*.bak
 	@${REINPLACE_CMD} -e 's|-ldl||g ; s|netdev|network|g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/avahi-client/Makefile.in \
diff --git a/net/binkd/Makefile b/net/binkd/Makefile
index d54d2f068675..590e1b21ec35 100644
--- a/net/binkd/Makefile
+++ b/net/binkd/Makefile
@@ -22,7 +22,7 @@ AMIGA4D_CONFIGUTE_WITH=	aso
 HTTPS_CONFIGURE_WITH=	https
 
 pre-configure:
-	@${RM} -rf ${WRKSRC}/mkfls/unix/CVS
+	@${RM} -r ${WRKSRC}/mkfls/unix/CVS
 	@${CP} ${WRKSRC}/mkfls/unix/* ${WRKSRC}/
 	@${CHMOD} a+x ${WRKSRC}/configure
 
diff --git a/net/dshell/Makefile b/net/dshell/Makefile
index e5ed66a55d94..38d445221e8f 100644
--- a/net/dshell/Makefile
+++ b/net/dshell/Makefile
@@ -38,7 +38,7 @@ post-patch:
 .endfor
 
 post-build:
-	${RM} -rf ${WRKSRC}/lib/${PYTHON_VERSION}
+	${RM} -r ${WRKSRC}/lib/${PYTHON_VERSION}
 	${REINPLACE_CMD} -e 's|${WRKSRC}|${ETCDIR}|' ${WRKSRC}/dshell ${WRKSRC}/dshell-decode
 	${REINPLACE_CMD} -e 's|BINPATH=${WRKSRC}/bin|BINPATH=${PREFIX}/libexec/dshell|' \
 		-e 's|DSHELL=${WRKSRC}|DSHELL=${PYTHON_SITELIBDIR}|' \
diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index 9ed2c5b4f816..e8c0d2d88f3e 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -361,7 +361,7 @@ post-patch:
 		${WRKSRC}/src/modules/rlm_krb5/configure
 .endif
 .if empty(PORT_OPTIONS:MRUBY)
-	@${RM} -fr ${WRKSRC}/src/modules/rlm_ruby/
+	@${RM} -r ${WRKSRC}/src/modules/rlm_ruby/
 .endif
 
 post-build:
diff --git a/net/ldapdiff/Makefile b/net/ldapdiff/Makefile
index 4184ce4ac61f..c823a0a84c4d 100644
--- a/net/ldapdiff/Makefile
+++ b/net/ldapdiff/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=--with-iconv-dir=${LOCALBASE}
 .endif
 
 post-extract:
-	@cd ${WRKSRC} && ${RM} -f *.o ldapdiff Makefile config.h
+	@cd ${WRKSRC} && ${RM} *.o ldapdiff Makefile config.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ldapdiff ${STAGEDIR}${PREFIX}/bin
diff --git a/net/libp0f/Makefile b/net/libp0f/Makefile
index d4a64d09775e..1b319f6e2864 100644
--- a/net/libp0f/Makefile
+++ b/net/libp0f/Makefile
@@ -20,8 +20,8 @@ USES=		gmake libtool pathfix pkgconfig tar:tgz
 USE_LDCONFIG=	yes
 
 post-stage:
-	${RM} -f ${STAGEDIR}${LOCALBASE}/bin/p0f
+	${RM} ${STAGEDIR}${LOCALBASE}/bin/p0f
 	${MV} ${STAGEDIR}/etc/p0f ${STAGEDIR}${LOCALBASE}/etc/libp0f
-	${RM} -rf ${STAGEDIR}/etc
+	${RM} -r ${STAGEDIR}/etc
 
 .include <bsd.port.mk>
diff --git a/net/linux-c6-openldap/Makefile b/net/linux-c6-openldap/Makefile
index 5861defb7221..d89bec14425b 100644
--- a/net/linux-c6-openldap/Makefile
+++ b/net/linux-c6-openldap/Makefile
@@ -22,7 +22,7 @@ PORTDOCS=	ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README
 
 # do not install any openldap configuration directories/files
 post-extract:
-	${RM} -rf ${WRKSRC}/etc
+	${RM} -r ${WRKSRC}/etc
 
 # use a native openldap configuration directories/files
 post-install:
diff --git a/net/linux-f10-nss_ldap/Makefile b/net/linux-f10-nss_ldap/Makefile
index 0b2e1ead6273..e601f905c485 100644
--- a/net/linux-f10-nss_ldap/Makefile
+++ b/net/linux-f10-nss_ldap/Makefile
@@ -48,11 +48,11 @@ post-patch:
 	fi
 .if !${PORT_OPTIONS:MPAM}
 	@if [ -f ${WRKSRC}/lib/security/pam_ldap.so ]; then \
-		${RM} -rf ${WRKSRC}/lib/; \
+		${RM} -r ${WRKSRC}/lib/; \
 	fi
 	@if [ -f ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/COPYING.pam_ldap ]; then \
 		${RM} ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/*.pam*; \
-		${RM} -rf ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/pam.d; \
+		${RM} -r ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/pam.d; \
 	fi
 	@if [ -f ${WRKSRC}/usr/share/man/man5/pam_ldap.5.gz ]; then \
 		${RM} ${WRKSRC}/usr/share/man/man5/pam_ldap.5.gz; \
@@ -60,7 +60,7 @@ post-patch:
 .else
 .if !${PORT_OPTIONS:MDOCS}
 	@if [ -d ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/pam.d ]; then \
-		${RM} -rf ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/pam.d/; \
+		${RM} -r ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/pam.d/; \
 	fi
 .endif
 .endif
diff --git a/net/linux-f10-openldap/Makefile b/net/linux-f10-openldap/Makefile
index 9ca426478bd3..6c6d9fa9ffef 100644
--- a/net/linux-f10-openldap/Makefile
+++ b/net/linux-f10-openldap/Makefile
@@ -21,7 +21,7 @@ PORTDOCS=	ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README
 
 # do not install any openldap configuration directories/files
 post-extract:
-	${RM} -rf ${WRKSRC}/etc
+	${RM} -r ${WRKSRC}/etc
 
 # use a native openldap configuration directories/files
 post-install:
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 883e03b60cd4..5c0525f094d5 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -118,7 +118,7 @@ post-patch:
 		${WRKSRC}/configure
 
 post-install:
-	@${RM} -f ${STAGEDIR}${PREFIX}/bin/nu ${STAGEDIR}${PREFIX}/bin/lp2pap.sh \
+	@${RM} ${STAGEDIR}${PREFIX}/bin/nu ${STAGEDIR}${PREFIX}/bin/lp2pap.sh \
 		${STAGEDIR}${PREFIX}/bin/test_parse_mtab \
 		${STAGEDIR}${PREFIX}/bin/afpd-mtab.pl
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \
diff --git a/net/neubot/Makefile b/net/neubot/Makefile
index 1a93b4944e97..266a2dae9bad 100644
--- a/net/neubot/Makefile
+++ b/net/neubot/Makefile
@@ -35,7 +35,7 @@ PKGMESSAGE=	${WRKDIR}/pkg_message
 OPTIONS_DEFINE=	DOCS
 
 post-install:
-	${RM} -rf ${STAGEDIR}${LSTATEDIR}
+	${RM} -r ${STAGEDIR}${LSTATEDIR}
 	(cd ${STAGEDIR}${PREFIX} \
 	&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 	-d ${PREFIX} -f ${DATADIR:S;${PREFIX}/;;})
diff --git a/net/nph/Makefile b/net/nph/Makefile
index 6a1497fdae9c..0fe586a18712 100644
--- a/net/nph/Makefile
+++ b/net/nph/Makefile
@@ -21,6 +21,6 @@ do-install:
 	PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 post-clean:
-	@${RM} -f ${STAGEDIR}${PREFIX}/etc/ph_server
+	@${RM} ${STAGEDIR}${PREFIX}/etc/ph_server
 
 .include <bsd.port.mk>
diff --git a/net/ntlmaps/Makefile b/net/ntlmaps/Makefile
index 7ae4edc34356..e22698450d1d 100644
--- a/net/ntlmaps/Makefile
+++ b/net/ntlmaps/Makefile
@@ -19,7 +19,7 @@ OPTIONS_DEFINE=	DOCS
 post-patch:
 	@${REINPLACE_CMD} -e \
 	    's,^#! /usr/bin/python,#!${PYTHON_CMD},' ${WRKSRC}/main.py
-	@${RM} -rf ${WRKSRC}/main.py.bak
+	@${RM} -r ${WRKSRC}/main.py.bak
 
 do-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index 7394e9f1d1a6..d3bf4a19a186 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -19,7 +19,7 @@ USE_PERL5=	configure
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 post-patch:
-	@${FIND} ${WRKSRC} -name ".svn" | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKSRC} -name ".svn" | ${XARGS} ${RM} -r
 	@${REINPLACE_CMD} -i '' -e 's/perldoc -t/echo perldoc -t/' \
 		${WRKSRC}/Makefile.PL
 
diff --git a/net/py-pystun/Makefile b/net/py-pystun/Makefile
index 9a6ed8509380..2c382e652fa2 100644
--- a/net/py-pystun/Makefile
+++ b/net/py-pystun/Makefile
@@ -18,6 +18,6 @@ USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/tests
+	@${RM} -r ${WRKSRC}/tests
 
 .include <bsd.port.mk>
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index 6b3862e927c0..ec185e558501 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -483,8 +483,8 @@ pre-configure:
 
 post-configure:
 # It's in another port
-	@${RM} -f ${WRKDIR}/${DISTNAME}/docs/htmldocs/manpages/libsmbclient.7.html
-	@${RM} -rf ${WRKDIR}/${DISTNAME}/examples/libsmbclient
+	@${RM} ${WRKDIR}/${DISTNAME}/docs/htmldocs/manpages/libsmbclient.7.html
+	@${RM} -r ${WRKDIR}/${DISTNAME}/examples/libsmbclient
 
 pre-install:
 	-@${FIND} "${STAGEDIR}${SAMBA_MODULEDIR}" -type f -o -type l 2>/dev/null | ${SORT} | ${SED} -E 's|^${STAGEDIR}${PREFIX}/?||;' > ${WRKDIR}/.PLIST.exclude
@@ -494,7 +494,7 @@ pre-install:
 .endif
 
 post-install:
-	@${RM} -f ${STAGEDIR}/${PREFIX}/bin/findsmb
+	@${RM} ${STAGEDIR}/${PREFIX}/bin/findsmb
 .for sect in 1 3 5 7 8
 	@${MKDIR} ${STAGEDIR}${MAN${sect}PREFIX}/man/man${sect}
 .	for man in ${SAMBA_MAN${sect}}
diff --git a/net/samba42/Makefile b/net/samba42/Makefile
index 18392f2bc8e6..55971f6cda81 100644
--- a/net/samba42/Makefile
+++ b/net/samba42/Makefile
@@ -453,7 +453,7 @@ PORTDOCS=		README.FreeBSD
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-extract:
-			@${RM} -rf ${WRKSRC}/pidl
+			@${RM} -r ${WRKSRC}/pidl
 
 post-patch:
 			@${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \
diff --git a/net/samba43/Makefile b/net/samba43/Makefile
index 99fadc28619e..fd31fa878bb6 100644
--- a/net/samba43/Makefile
+++ b/net/samba43/Makefile
@@ -453,7 +453,7 @@ PORTDOCS=		README.FreeBSD
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-extract:
-			@${RM} -rf ${WRKSRC}/pidl
+			@${RM} -r ${WRKSRC}/pidl
 
 post-patch:
 			@${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \
diff --git a/net/samba44/Makefile b/net/samba44/Makefile
index 0b50f31c7b31..d1a041bd5245 100644
--- a/net/samba44/Makefile
+++ b/net/samba44/Makefile
@@ -439,7 +439,7 @@ PORTDOCS=		README.FreeBSD
 IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
 
 post-extract:
-			@${RM} -rf ${WRKSRC}/pidl
+			@${RM} -r ${WRKSRC}/pidl
 
 post-patch:
 			@${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \
diff --git a/net/stf-6rd-kmod/Makefile b/net/stf-6rd-kmod/Makefile
index e70649ddc953..8a02d04e6466 100644
--- a/net/stf-6rd-kmod/Makefile
+++ b/net/stf-6rd-kmod/Makefile
@@ -64,7 +64,7 @@ maintainer-diff:
 	${FETCH_CMD} -o ${MASTERDIR}/files-9.1/patch-aa https://github.com/kuriyama/freebsd/compare/freebsd:releng/9.1...6rd-releng-9.1.diff
 
 maintainer-tar:
-	-${RM} -rf ${EXPDIR}
+	-${RM} -r ${EXPDIR}
 	${MKDIR} ${EXPDIR}
 	cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/releng/${OSREL}/sys/net net
 	cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/releng/${OSREL}/sys/modules/if_stf modules/if_stf
@@ -77,11 +77,11 @@ maintainer-check:
 	if [ "$${new}" != "$${old}" ]; then ${ECHO_MSG} "New stf rev: $${new}"; fi
 
 make-distinfo:
-	${RM} -f distinfo.tmp.*
+	${RM} distinfo.tmp.*
 .for r in 8.4 9.1 9.3 10.1
 	${MAKE} OSREL=${r} OSVERSION=${r:C/\.//}0000 UNAMER=${r}-RELEASE DISTINFO_FILE=${MASTERDIR}/distinfo.tmp.${r} makesum
 .endfor
 	${CAT} ${MASTERDIR}/distinfo.tmp.* > ${MASTERDIR}/distinfo
-	${RM} -f distinfo.tmp.*
+	${RM} distinfo.tmp.*
 
 .include <bsd.port.post.mk>
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 596fc244e928..2997435cb8bd 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -74,7 +74,7 @@ PLIST_SUB+=	SERVER="@comment "
 post-extract:
 .if ${PORT_OPTIONS:MSERVER}
 	@cd ${WRKSRC} && ${TAR} -cf - -C ${WRKDIR} xc | ${TAR} -xf - && \
-	${RM} -rf ${WRKDIR}/xc
+	${RM} -r ${WRKDIR}/xc
 .endif
 
 post-patch:
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 0917dbba4573..fc5ddcb295cd 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -82,7 +82,7 @@ IGNORE=		RIPNGD requires IPV6 option
 .endif
 
 post-install:
-	@( cd ${WRKSRC}/doc; ${RM} -f zebra*info*; \
+	@( cd ${WRKSRC}/doc; ${RM} zebra*info*; \
 	   ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} zebra.info install )
 	@${ECHO_MSG} "===>     installing zebra startup file..."
 	${INSTALL_SCRIPT} ${WRKDIR}/zebractl ${STAGEDIR}${PREFIX}/sbin/zebractl
diff --git a/news/diablo/Makefile b/news/diablo/Makefile
index 838f0f02cf64..b4c9c3ebad18 100644
--- a/news/diablo/Makefile
+++ b/news/diablo/Makefile
@@ -48,7 +48,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/group
 	${MKDIR} ${STAGEDIR}${PREFIX}/news/spool/postq
 	(cd ${WRKSRC} && xmake install)
-	@${RM} -rf ${STAGEDIR}${PREFIX}/news/man
+	@${RM} -r ${STAGEDIR}${PREFIX}/news/man
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/news/dbin/*
 	${INSTALL_SCRIPT} ${WRKDIR}/diablo ${STAGEDIR}${PREFIX}/etc/rc.d
 
diff --git a/news/fidogate/Makefile b/news/fidogate/Makefile
index 5e8ef662048b..c401e54f6560 100644
--- a/news/fidogate/Makefile
+++ b/news/fidogate/Makefile
@@ -34,8 +34,8 @@ post-patch:
 
 pre-configure:
 	${TOUCH} ${WRKSRC}/doc/fidogate.info
-	${RM} -f ${WRKSRC}/doc/fidogate.info-?
-	${RM} -f ${WRKSRC}/doc/fidogate.txt
+	${RM} ${WRKSRC}/doc/fidogate.info-?
+	${RM} ${WRKSRC}/doc/fidogate.txt
 	${REINPLACE_CMD} -e "s|[.]info-|.info|" ${WRKSRC}/doc/Makefile
 	${REINPLACE_CMD} -e "s|.{PREFIX}|${PREFIX}|g" \
 		 -e "s|.{LOCALBASE}|${LOCALBASE}|g" \
diff --git a/ports-mgmt/porttree/Makefile b/ports-mgmt/porttree/Makefile
index 6b84fe41be8a..5e7dafb9ca85 100644
--- a/ports-mgmt/porttree/Makefile
+++ b/ports-mgmt/porttree/Makefile
@@ -33,7 +33,7 @@ do-install:
 
 gen-dist:
 	${MKDIR} ${WRKDIR}
-	${RM} -rf ${WRKSRC}
+	${RM} -r ${WRKSRC}
 	svn export -r ${SVN_REV} ${SVNROOT} ${WRKSRC}
 	${TAR} -cvy -C ${WRKDIR} --exclude FreeBSDport -f ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
 
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 300078429364..a39d8ca194b8 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -86,6 +86,6 @@ post-install:
 .endif
 	cd ${WRKSRC}/doc && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${.MAKEFLAGS} ${MAKE_ARGS} ${INSTALL_TARGET}
-	${RM} -f ${STAGEDIR}${PREFIX}/lib/liba2ps.la
+	${RM} ${STAGEDIR}${PREFIX}/lib/liba2ps.la
 
 .include <bsd.port.mk>
diff --git a/print/adobe-cmaps/Makefile b/print/adobe-cmaps/Makefile
index 3ba92c0f7269..2d7c2fdf80ff 100644
--- a/print/adobe-cmaps/Makefile
+++ b/print/adobe-cmaps/Makefile
@@ -21,7 +21,7 @@ INSTDIRS=	ac15 ag15 ai0 aj16 aj20 ak12 rksj-cmaps
 FONTSDIR=	${PREFIX}/share/fonts/${PORTNAME}
 
 post-extract:
-	${RM} -f ${WRKSRC}/ag15/.nfsFA55
+	${RM} ${WRKSRC}/ag15/.nfsFA55
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
diff --git a/print/afm/Makefile b/print/afm/Makefile
index d744271d5b7f..ab34293811e6 100644
--- a/print/afm/Makefile
+++ b/print/afm/Makefile
@@ -14,6 +14,6 @@ COMMENT=	Adobe Font Metrics
 
 NO_BUILD=	yes
 pre-patch:
-	@${RM} -rf ${WRKSRC}/RCS
+	@${RM} -r ${WRKSRC}/RCS
 
 .include <bsd.port.mk>
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index b0d7acd18ffb..90a42d81dc81 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -136,7 +136,7 @@ RUN_DEPENDS+=	${_DEPENDS_CONVERT}
 .endif
 
 post-install:
-	${RM} -f ${STAGEDIR}${PREFIX}/etc/apsfilter/basedir
+	${RM} ${STAGEDIR}${PREFIX}/etc/apsfilter/basedir
 	${LN} -sfn ${PREFIX}/share/apsfilter ${STAGEDIR}${PREFIX}/etc/apsfilter/basedir
 
 .include <bsd.port.mk>
diff --git a/print/ghostscript8-base/Makefile b/print/ghostscript8-base/Makefile
index ee172ca21468..5f90fdf9488a 100644
--- a/print/ghostscript8-base/Makefile
+++ b/print/ghostscript8-base/Makefile
@@ -134,7 +134,7 @@ pre-build: pre-build-drivers.mak
 	    ${WRKSRC}/freetype/objs/freetype214MT_D.so
 
 pre-install:
-	cd ${WRKSRC}/Resource/Init && ${RM} -f \
+	cd ${WRKSRC}/Resource/Init && ${RM} \
 	    gs_statd.ps.orig gs_ttf.ps.orig pdf_font.ps.orig
 	${MKDIR} ${STAGEDIR}${DATADIR}
 
diff --git a/print/ghostscript9-agpl-base/Makefile b/print/ghostscript9-agpl-base/Makefile
index b8df4fd68672..52fecbfe06cb 100644
--- a/print/ghostscript9-agpl-base/Makefile
+++ b/print/ghostscript9-agpl-base/Makefile
@@ -129,7 +129,7 @@ pre-build: pre-build-drivers.mak
 	${MKDIR} ${WRKSRC}/bin
 
 pre-install:
-	cd ${WRKSRC}/Resource/Init && ${RM} -f \
+	cd ${WRKSRC}/Resource/Init && ${RM} \
 	    gs_statd.ps.orig gs_ttf.ps.orig pdf_font.ps.orig
 	${MKDIR} ${STAGEDIR}${DATADIR}
 
diff --git a/print/ghostscript9-base/Makefile b/print/ghostscript9-base/Makefile
index 83cebb902b35..75d90bff39a1 100644
--- a/print/ghostscript9-base/Makefile
+++ b/print/ghostscript9-base/Makefile
@@ -130,7 +130,7 @@ pre-build: pre-build-drivers.mak
 	${MKDIR} ${WRKSRC}/bin
 
 pre-install:
-	cd ${WRKSRC}/Resource/Init && ${RM} -f \
+	cd ${WRKSRC}/Resource/Init && ${RM} \
 	    gs_statd.ps.orig gs_ttf.ps.orig pdf_font.ps.orig
 	${MKDIR} ${STAGEDIR}${DATADIR}
 
diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile
index 047f6b8de71e..808dcb47b733 100644
--- a/print/muttprint/Makefile
+++ b/print/muttprint/Makefile
@@ -56,7 +56,7 @@ pre-everything::
 	@${ECHO}
 
 post-patch:
-	@${RM} -f ${WRKSRC}/pics/*.orig
+	@${RM} ${WRKSRC}/pics/*.orig
 .if ${PAPERSIZE}==a4
 	@${REINPLACE_CMD} 's|%%PAPERSIZE%%|${PAPERSIZE:tu}|' \
 		${WRKSRC}/muttprint
diff --git a/print/openprinting/Makefile b/print/openprinting/Makefile
index edf46ebbd74a..73df9256077c 100644
--- a/print/openprinting/Makefile
+++ b/print/openprinting/Makefile
@@ -93,7 +93,7 @@ post-patch:
 
 post-install:
 .for unneeded in bin sbin man/man1 man/mani share
-	@${RM} -rf ${STAGEDIR}${PREFIX}/${unneeded}
+	@${RM} -r ${STAGEDIR}${PREFIX}/${unneeded}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/print/p5-Text-PDF/Makefile b/print/p5-Text-PDF/Makefile
index 791e5202912f..8ed6375aacae 100644
--- a/print/p5-Text-PDF/Makefile
+++ b/print/p5-Text-PDF/Makefile
@@ -17,7 +17,7 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
-	@${RM} -f ${WRKSRC}/pm_to_blib
+	@${RM} ${WRKSRC}/pm_to_blib
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/Text/PDF/examples
diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index dc03596dab4a..9abfaf12e087 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -56,7 +56,7 @@ post-patch:
 
 post-install:
 	${MKDIR} -m 0755 ${STAGEDIR}${EXAMPLESDIR}
-	@${RM} -f ${EX_WRKSRC}/Makefile.unix ${EX_WRKSRC}/ChangeLog \
+	@${RM} ${EX_WRKSRC}/Makefile.unix ${EX_WRKSRC}/ChangeLog \
 		${EX_WRKSRC}/CMakeLists.txt
 	cd ${EX_WRKSRC} && ${PAX} -rw * ${STAGEDIR}${EXAMPLESDIR}
 
diff --git a/russian/koi8r-ps/Makefile b/russian/koi8r-ps/Makefile
index 82873885ef75..6b0d6564bb79 100644
--- a/russian/koi8r-ps/Makefile
+++ b/russian/koi8r-ps/Makefile
@@ -64,7 +64,7 @@ do-install:
 		else \
 			${SETENV} SIMPLE_BACKUP_SUFFIX=.CyrPS VERSION_CONTROL= \
 				${PATCH} "${FONTMAP}" ${WRKSRC}/Fontmap.diff ; \
-			${RM} -f "${FONTMAP}".CyrPS ; \
+			${RM} "${FONTMAP}".CyrPS ; \
 	fi
 .endif
 	${ECHO_CMD} ${FONTMAP} > ${STAGEDIR}${CPS_DIR}/fontmap.path
diff --git a/science/minc2/Makefile b/science/minc2/Makefile
index e4e100508983..83e0768b55b8 100644
--- a/science/minc2/Makefile
+++ b/science/minc2/Makefile
@@ -38,8 +38,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFLICTS=	minc-1* zh-tk-[0-9]*
 
 pre-patch:
-	@${RM} -f ${WRKSRC}/ac_config_aux/*
-	@${RM} -f ${WRKSRC}/progs/minccalc/gram.[ch]
-	@${RM} -f ${WRKSRC}/progs/mincgen/ncgentab.[ch]
+	@${RM} ${WRKSRC}/ac_config_aux/*
+	@${RM} ${WRKSRC}/progs/minccalc/gram.[ch]
+	@${RM} ${WRKSRC}/progs/mincgen/ncgentab.[ch]
 
 .include <bsd.port.mk>
diff --git a/security/bdc/Makefile b/security/bdc/Makefile
index 8766a8dcc9e6..6f528ffd66a8 100644
--- a/security/bdc/Makefile
+++ b/security/bdc/Makefile
@@ -47,7 +47,7 @@ do-install:
 
 	${MV} ${STAGEDIR}${PREFIX}/bdc/doc ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${STAGEDIR}${PREFIX}/bdc/man/bdc.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${RM} -f ${STAGEDIR}${PREFIX}/bdc/man
+	${RM} ${STAGEDIR}${PREFIX}/bdc/man
 
 	${INSTALL_SCRIPT} ${WRKDIR}/bdc ${STAGEDIR}${PREFIX}/bin
 
diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
index f55873d26d9d..e182753f9792 100644
--- a/security/ca_root_nss/Makefile
+++ b/security/ca_root_nss/Makefile
@@ -47,7 +47,7 @@ do-extract:
 	@${TAR} -C ${WRKDIR} -xf ${DISTDIR}/nss-${VERSION_NSS}${NSS_SUFFIX}${EXTRACT_SUFX} \
 	    ${CERTDATA_TXT_PATH}
 	@${CP} ${WRKDIR}/${CERTDATA_TXT_PATH} ${WRKDIR}
-	@${RM} -rf ${WRKDIR}/nss-${VERSION_NSS}
+	@${RM} -r ${WRKDIR}/nss-${VERSION_NSS}
 
 do-build:	apply-slist
 	@${SETENV} PATH=${LOCALBASE}/bin:$${PATH} \
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 07e75cdd2505..43447db915d4 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -179,7 +179,7 @@ post-patch:
 
 pre-configure:
 	@if [ -f "${WRKDIR}/courier-authlib.cache" -a -s "${WRKDIR}/courier-authlib.cache" ] ; then \
-		${RM} -f "${WRKDIR}/courier-authlib.cache" ; \
+		${RM} "${WRKDIR}/courier-authlib.cache" ; \
 	fi
 
 post-install:
diff --git a/security/doorman/Makefile b/security/doorman/Makefile
index f7e42abde40b..7ae1bb51893e 100644
--- a/security/doorman/Makefile
+++ b/security/doorman/Makefile
@@ -32,7 +32,7 @@ pre-patch:
 		${WRKSRC}/doormand.c
 
 post-install:
-	${RM} -f ${STAGEDIR}${PREFIX}/etc/doormand/ipf_add
+	${RM} ${STAGEDIR}${PREFIX}/etc/doormand/ipf_add
 	(cd ${FILESDIR} && ${INSTALL_SCRIPT} ipf_add.atend ipf_delete \
 		ipf_add.before_block ${STAGEDIR}${PREFIX}/etc/doormand)
 	${INSTALL_DATA} ${WRKDIR}/doormand.cf.EXAMPLE \
diff --git a/security/hamachi/Makefile b/security/hamachi/Makefile
index 87ed335d1384..e8e8319870b2 100644
--- a/security/hamachi/Makefile
+++ b/security/hamachi/Makefile
@@ -22,7 +22,7 @@ PORTDOCS=	README CHANGES
 MAKE_ENV=	HAMACHI_DST=${STAGEDIR}${PREFIX}/bin TUNCFG_DST=${STAGEDIR}${PREFIX}/sbin
 
 post-patch:
-	${RM} -f ${WRKSRC}/tuncfg/tuncfg
+	${RM} ${WRKSRC}/tuncfg/tuncfg
 	${LOCALBASE}/bin/upx -d ${WRKSRC}/hamachi
 
 do-build:
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 781eb36c79af..8d59a62db2f1 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -92,7 +92,7 @@ post-install:
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
-	@${RM} -f ${WRKSRC}/src/racoon/samples/*.in
+	@${RM} ${WRKSRC}/src/racoon/samples/*.in
 	@${CP} -r ${WRKSRC}/src/racoon/samples/* ${STAGEDIR}/${EXAMPLESDIR}
 
 post-install-DOCS-on:
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 63dd6d02aa8f..878480ed653d 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=	--disable-asm
 .endif
 
 post-patch:
-	${RM} -f ${WRKSRC}/doc/gcrypt.info*
+	${RM} ${WRKSRC}/doc/gcrypt.info*
 	${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S
 
 post-install:
diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile
index 0fbc68ed3a65..2cde312b6a3e 100644
--- a/security/libressl-devel/Makefile
+++ b/security/libressl-devel/Makefile
@@ -38,10 +38,10 @@ post-stage-NC-on:
 	${INSTALL_MAN} ${WRKSRC}/apps/nc/nc.1 ${STAGEDIR}/${PREFIX}/man/man1/nc.1
 
 post-stage:
-	${RM} -rf ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem
+	${RM} -r ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem
 
 post-install-MAN3-off:
-	${RM} -rf ${STAGEDIR}/${PREFIX}/man/man3
+	${RM} -r ${STAGEDIR}/${PREFIX}/man/man3
 	${REINPLACE_CMD} -e '/^man\/man3/d' ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/security/libressl/Makefile b/security/libressl/Makefile
index 8447257ffc26..15c68cae204f 100644
--- a/security/libressl/Makefile
+++ b/security/libressl/Makefile
@@ -37,10 +37,10 @@ post-stage-NC-on:
 	${INSTALL_MAN} ${WRKSRC}/apps/nc/nc.1 ${STAGEDIR}/${PREFIX}/man/man1/nc.1
 
 post-stage:
-	${RM} -rf ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem
+	${RM} -r ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem
 
 post-install-MAN3-off:
-	${RM} -rf ${STAGEDIR}/${PREFIX}/man/man3
+	${RM} -r ${STAGEDIR}/${PREFIX}/man/man3
 	${REINPLACE_CMD} -e '/^man\/man3/d' ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/security/nacl/Makefile b/security/nacl/Makefile
index 2efca4bcf203..a3897b9eefaa 100644
--- a/security/nacl/Makefile
+++ b/security/nacl/Makefile
@@ -30,7 +30,7 @@ post-patch:
 	@${REINPLACE_CMD} -i -e "s|c++|${CXX}|" ${WRKSRC}/okcompilers/cpp
 
 pre-build:
-	${RM} -rf ${WRKSRC}/crypto_onetimeauth/poly1305/amd64
+	${RM} -r ${WRKSRC}/crypto_onetimeauth/poly1305/amd64
 
 do-build:
 	cd ${WRKSRC} && ./do
diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index e509561afd92..962746081909 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -47,7 +47,7 @@ CONFIGURE_ARGS+=--without-localdirs \
 
 # XXX limit results if we do a grep in the sources!
 post-extract:
-	@${RM} -rf ${WRKSRC}/mswin32
+	@${RM} -r ${WRKSRC}/mswin32
 
 post-configure:
 	@${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" ${WRKSRC}/Makefile
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 9df343a05971..1d688fd29978 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -130,7 +130,7 @@ post-patch:
 
 post-patch-MAN3-off:
 	${GREP} -L openssl_manual_section ${WRKSRC}/doc/crypto/*.pod | ${XARGS} ${RM}
-	${RM} -rf ${WRKSRC}/doc/ssl/*.pod
+	${RM} -r ${WRKSRC}/doc/ssl/*.pod
 	${REINPLACE_CMD} -e 's|pod doc/ssl/\*\.pod|pod|' ${WRKSRC}/Makefile.org
 
 do-configure:
diff --git a/security/openvpn-auth-ldap/Makefile b/security/openvpn-auth-ldap/Makefile
index 70bef88ef51f..1715350187b2 100644
--- a/security/openvpn-auth-ldap/Makefile
+++ b/security/openvpn-auth-ldap/Makefile
@@ -63,11 +63,11 @@ CC+=		${DEBUG_FLAGS}
 # Note that googlecode.com is gone.
 build-tarball: ${DISTFILES}
 ${DISTFILES}:
-	${RM} -rf ${WRKSRC}
+	${RM} -r ${WRKSRC}
 	svn export -r${PORTVERSION:E:C/^s//} \
 	    http://openvpn-auth-ldap.googlecode.com/svn/trunk/ ${WRKSRC}
 	tar -C ${WRKSRC}/.. -cvf - ${WRKSRC:T} | ${XZ_CMD} -vvc >${DISTFILES} || \
-	    { ${RM} -f ${DISTFILES} ; exit 1 ; }
+	    { ${RM} ${DISTFILES} ; exit 1 ; }
 
 upload-tarball: build-tarball
 	scp ${DISTFILES} freefall.freebsd.org:public_distfiles/
diff --git a/security/p5-Authen-TypeKey/Makefile b/security/p5-Authen-TypeKey/Makefile
index ed3ac976482c..759f4b5f7f21 100644
--- a/security/p5-Authen-TypeKey/Makefile
+++ b/security/p5-Authen-TypeKey/Makefile
@@ -26,6 +26,6 @@ USES=		perl5
 
 post-patch:
 	# Really old M::I code
-	${RM} -rf ${WRKSRC}/inc
+	${RM} -r ${WRKSRC}/inc
 
 .include <bsd.port.mk>
diff --git a/security/p5-Crypt-OpenPGP/Makefile b/security/p5-Crypt-OpenPGP/Makefile
index f47f6386531d..3a21ef0cd896 100644
--- a/security/p5-Crypt-OpenPGP/Makefile
+++ b/security/p5-Crypt-OpenPGP/Makefile
@@ -31,6 +31,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
-	@${RM} -f ${WRKSRC}/lib/Crypt/OpenPGP/Ciphertext.pm.orig
+	@${RM} ${WRKSRC}/lib/Crypt/OpenPGP/Ciphertext.pm.orig
 
 .include <bsd.port.mk>
diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index fadef7561c03..af9d078baca3 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -103,7 +103,7 @@ post-patch:
 	${CAT} filelist | ${XARGS} -0 -I % ${REINPLACE_CMD} -e 's|/etc/openxpki|${PREFIX}/etc/openxpki|g' "%"; \
 	${CAT} filelist | ${XARGS} -0 -I % ${REINPLACE_CMD} -e 's|/var/run/openxpkid.pid|/var/openxpki/openxpkid.pid|g' "%"; \
 	${CAT} filelist | ${XARGS} -0 -I % ${REINPLACE_CMD} -e 's|/var/openxpki/\([^\.]*\)\.log|/var/log/openxpki/\1\.log|g' "%"; \
-	${CAT} filelist | ${XARGS} -0 -I % ${RM} -f "%.bak"; \
+	${CAT} filelist | ${XARGS} -0 -I % ${RM} "%.bak"; \
 	${RM} filelist; \
 	)
 	@${MKDIR} ${WRKSRC}/t/var/log/openxpki
diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index 42892c0bbdd9..3d2e654cc724 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -22,7 +22,7 @@ PGPLIB=		${STAGEDIR}${PREFIX}/share/pgp
 
 post-extract:
 	cd ${WRKDIR}; ${TAR} -xf pgp263ii.tar; \
-		${RM} -f pgp263ii.tar
+		${RM} pgp263ii.tar
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pgp ${STAGEDIR}${PREFIX}/bin/
diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index b32fcf793f18..b9cf1413e809 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -35,7 +35,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 post-extract:
-	@${RM} -f ${WRKSRC}/doc/shishi.info*
+	@${RM} ${WRKSRC}/doc/shishi.info*
 	@cd ${WRKSRC}/db/gl && ${LN} -s ../../build-aux/link-warning.h
 
 post-patch:
diff --git a/security/sks/Makefile b/security/sks/Makefile
index b66f0a476060..120a682f36c6 100644
--- a/security/sks/Makefile
+++ b/security/sks/Makefile
@@ -30,7 +30,7 @@ OPTIONS_DEFINE=	DOCS
 post-extract:
 	@: > ${WRKSRC}/Makefile.local
 	@${REINPLACE_CMD} 's/-ccopt -pg //' ${WRKSRC}/Makefile
-	@cd ${WRKSRC} && ${RM} -f .depend
+	@cd ${WRKSRC} && ${RM} .depend
 
 post-patch:
 	@${REINPLACE_CMD} -Ee '/^CC=/d; /^CFLAGS=/s/=/+=/' \
diff --git a/security/spike-proxy/Makefile b/security/spike-proxy/Makefile
index 95a9e1dca230..c7a83ce184c6 100644
--- a/security/spike-proxy/Makefile
+++ b/security/spike-proxy/Makefile
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@${RM} -rf ${WRKSRC}/*.bak
+	@${RM} -r ${WRKSRC}/*.bak
 	${CP} -Rp ${WRKSRC}/* ${STAGEDIR}${DATADIR}
 	${SED} "s|DATADIR|${DATADIR}|" ${SCRIPTDIR}/spkproxy.sh > \
 		${STAGEDIR}${PREFIX}/bin/spkproxy.sh
diff --git a/security/vuxml/Makefile b/security/vuxml/Makefile
index d8a73fac3c1f..1f07767e1d0e 100644
--- a/security/vuxml/Makefile
+++ b/security/vuxml/Makefile
@@ -33,7 +33,7 @@ dir_DTD=	share/xml/dtd/vuxml
 VUXML_FILE?=	${PKGDIR}/vuln.xml
 
 do-extract:
-	@${RM} -rf ${WRKDIR}
+	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 .for f in ${DISTFILES}
 	${CP} ${_DISTDIR}/${f} ${WRKDIR}/${f}
diff --git a/sysutils/amrstat/Makefile b/sysutils/amrstat/Makefile
index b4b072d69fcf..0e74e2565f2a 100644
--- a/sysutils/amrstat/Makefile
+++ b/sysutils/amrstat/Makefile
@@ -35,7 +35,7 @@ NO_WRKSUBDIR=	yes
 SUB_FILES+=	${PERIODICSCRIPT}
 
 post-extract:
-	${RM} -f ${WRKSRC}/amrstat
+	${RM} ${WRKSRC}/amrstat
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/amrstat ${STAGEDIR}${PREFIX}/sbin
diff --git a/sysutils/bsdadminscripts/Makefile b/sysutils/bsdadminscripts/Makefile
index 8a382398f1a7..c39f309b67bb 100644
--- a/sysutils/bsdadminscripts/Makefile
+++ b/sysutils/bsdadminscripts/Makefile
@@ -49,7 +49,7 @@ do-install:
 .endfor
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MV} ${STAGEDIR}${PREFIX}/etc/*.sample ${STAGEDIR}${ETCDIR}
-	${RM} -rf ${STAGEDIR}${PREFIX}/etc/*.sample
+	${RM} -r ${STAGEDIR}${PREFIX}/etc/*.sample
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 344a9ce6e0a1..d1ca2f067800 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -63,22 +63,22 @@ post-patch-PEXPECT-off:
 		-name '*ssh_pexpect*' -delete
 
 post-patch-FTP-off:
-	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/ftpbackend.py
+	@${RM} ${WRKSRC}/${PORTNAME}/backends/ftpbackend.py
 
 post-patch-FTPS-off:
-	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/ftpsbackend.py
+	@${RM} ${WRKSRC}/${PORTNAME}/backends/ftpsbackend.py
 
 post-patch-S3-off:
 .for f in botobackend _boto_multi _boto_single
-	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/${f}.py
+	@${RM} ${WRKSRC}/${PORTNAME}/backends/${f}.py
 .endfor
 
 post-patch-GDOCS-off:
-	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/gdocsbackend.py
+	@${RM} ${WRKSRC}/${PORTNAME}/backends/gdocsbackend.py
 
 post-patch-CLOUDFILES-off:
 .for f in cfbackend _cf_cloudfiles _cf_pyrax
-	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/${f}.py
+	@${RM} ${WRKSRC}/${PORTNAME}/backends/${f}.py
 .endfor
 
 post-patch-CLOUDFILES-on:
@@ -87,7 +87,7 @@ post-patch-CLOUDFILES-on:
 	@${REINPLACE_CMD} 's|"pyrax"|"cloudfiles"|' ${WRKSRC}/${PORTNAME}/globals.py
 
 post-patch-GIO-off:
-	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/giobackend.py
+	@${RM} ${WRKSRC}/${PORTNAME}/backends/giobackend.py
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/duplicity/_librsync.so
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index dbdeaa923ef7..4bbcbe22564f 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -162,7 +162,7 @@ post-build:
 # system are statically linked against anything that is outside the root fs,
 # else we're in trouble if e2fsck is needed for boot:
 # (we don't use e2fsck.static, since we can link libc.so dynamically)
-	cd ${WRKSRC}/e2fsck && ${RM} -f e2fsck \
+	cd ${WRKSRC}/e2fsck && ${RM} e2fsck \
 		&& ${MAKE_CMD} e2fsck \
 		STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
 		../lib/libblkid.a  ../lib/libuuid.a" \
@@ -202,7 +202,7 @@ post-build:
 .endif
 
 post-install:
-	${RM} -f ${STAGEDIR}${PREFIX}/sbin/uuidd
+	${RM} ${STAGEDIR}${PREFIX}/sbin/uuidd
 	${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${STAGEDIR}${PREFIX}/sbin/
 	${INSTALL_MAN} ${FILESDIR}/fsck_ext2fs.8 ${STAGEDIR}${PREFIX}/man/man8/
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/sysutils/freesbie/Makefile b/sysutils/freesbie/Makefile
index d27a7035f90c..7240dfeea701 100644
--- a/sysutils/freesbie/Makefile
+++ b/sysutils/freesbie/Makefile
@@ -30,7 +30,7 @@ pre-configure:
 
 do-install:
 	@ ${MKDIR} ${STAGEDIR}${DATADIR}
-	@ ${RM} -f ${WRKSRC}/scripts/iso.sh.orig \
+	@ ${RM} ${WRKSRC}/scripts/iso.sh.orig \
 		${WRKSRC}/scripts/pkginstall.sh.orig \
 		${WRKSRC}/scripts/pkgselect.sh.orig
 	@ cd ${WRKSRC} && ${FIND} . -type f -print | tar -cf - -T - | \
diff --git a/sysutils/gosa/Makefile b/sysutils/gosa/Makefile
index 3c67f1d39679..ed420a418b98 100644
--- a/sysutils/gosa/Makefile
+++ b/sysutils/gosa/Makefile
@@ -53,7 +53,7 @@ post-patch:
 .endfor
 
 	@${MV} -f ${WRKSRC}/contrib/gosa.conf.5 ${WRKSRC}
-	@${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} +
+	@${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} {} +
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/sysutils/grub2-pcbsd/Makefile b/sysutils/grub2-pcbsd/Makefile
index a5c9b87ca908..5600c8b8bd4c 100644
--- a/sysutils/grub2-pcbsd/Makefile
+++ b/sysutils/grub2-pcbsd/Makefile
@@ -85,7 +85,7 @@ post-configure:
 	@${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 ${WRKSRC}/grub-core
 
 post-install:
-	${RM} -rf ${STAGEDIR}${PREFIX}/lib/charset.alias
+	${RM} -r ${STAGEDIR}${PREFIX}/lib/charset.alias
 	${INSTALL_SCRIPT} ${WRKDIR}/00_header ${STAGEDIR}${PREFIX}/etc/grub.d/
 	${INSTALL_SCRIPT} ${WRKDIR}/10_kfreebsd ${STAGEDIR}${PREFIX}/etc/grub.d/
 	${INSTALL_SCRIPT} ${WRKDIR}/10_ktrueos ${STAGEDIR}${PREFIX}/etc/grub.d/
diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile
index 83fa328785c0..a627a2e6a6a4 100644
--- a/sysutils/ldap-account-manager/Makefile
+++ b/sysutils/ldap-account-manager/Makefile
@@ -30,10 +30,10 @@ WRITEABLES=	config sess tmp
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	@${ECHO_CMD} '@exec if [ -f %D/${WWWDIR_REL}/config/shells ]; then ${RM} -f %D/${WWWDIR_REL}/config/shells; fi' >> ${TMPPLIST}
+	@${ECHO_CMD} '@exec if [ -f %D/${WWWDIR_REL}/config/shells ]; then ${RM} %D/${WWWDIR_REL}/config/shells; fi' >> ${TMPPLIST}
 .for CONFIG in ${CONFIGS}
 	@${ECHO_CMD} '@sample ${WWWDIR_REL}/config/${CONFIG}.sample' >> ${TMPPLIST}
-	@${ECHO_CMD} '@exec if [ -f %D/${WWWDIR_REL}/config/${CONFIG}_sample ]; then ${RM} -f %D/${WWWDIR_REL}/config/${CONFIG}_sample; fi' >> ${TMPPLIST}
+	@${ECHO_CMD} '@exec if [ -f %D/${WWWDIR_REL}/config/${CONFIG}_sample ]; then ${RM} %D/${WWWDIR_REL}/config/${CONFIG}_sample; fi' >> ${TMPPLIST}
 .endfor
 .for I in ${LAMDATA}
 	@${FIND} -s ${WRKSRC}/${I} -type f -not -name '*.sample' | ${SED} -e 's,^${WRKSRC},${WWWDIR_REL},' >> ${TMPPLIST}
diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile
index 2817f7495c0e..bf5bde5b01b6 100644
--- a/sysutils/radmind/Makefile
+++ b/sysutils/radmind/Makefile
@@ -40,7 +40,7 @@ IGNORE_TIMESTAMPS_DESC=	Add '-t' option to fsdiff
 
 post-install:
 	# Ugly hack to remove generated man pages
-	${RM} -rf ${WRKSRC}/tmp
+	${RM} -r ${WRKSRC}/tmp
 
 	# Port's Docs (Copyright & wire protocol info)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/scprotect/Makefile b/sysutils/scprotect/Makefile
index 80061f11492a..226c2791cb87 100644
--- a/sysutils/scprotect/Makefile
+++ b/sysutils/scprotect/Makefile
@@ -22,6 +22,6 @@ BROKEN=		does not build on 11.x
 .endif
 
 post-extract:
-	@cd ${WRKSRC}/kmod && ${RM} -f machine
+	@cd ${WRKSRC}/kmod && ${RM} machine
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/u-boot-pine64/Makefile b/sysutils/u-boot-pine64/Makefile
index 7b5bff065abb..bd0b3022c026 100644
--- a/sysutils/u-boot-pine64/Makefile
+++ b/sysutils/u-boot-pine64/Makefile
@@ -38,7 +38,7 @@ IGNORE=		requires FreeBSD 10 or later
 
 post-extract:
 	(cd ${WRKSRC}; ${EXTRACT_CMD} xvf ${DISTDIR}/firmware-pine64-20160329-6.1.src.rpm)
-	${RM} -fr ${WRKSRC}/arm-trusted-firmware
+	${RM} -r ${WRKSRC}/arm-trusted-firmware
 	(cd ${WRKSRC}; ${EXTRACT_CMD} xvf pine64atf.tar.xz)
 
 do-configure:
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index e51de613a9a8..bfe4bf634730 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -26,7 +26,7 @@ SUB_FILES=	pkg-message
 WEBMIN_MODULES=
 
 post-extract:
-	@${RM} -f ${WRKSRC}/mount/freebsd-mounts-?
+	@${RM} ${WRKSRC}/mount/freebsd-mounts-?
 	@if [ "${WEBMIN_MODULES}" != "" ]; then \
 		for webmin_module in ${WEBMIN_MODULES}; do \
 			${ECHO} "===> Unpacking updated module: $${webmin_module}"; \
diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index 5dc3f6e05f10..d3605bb4a77e 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -54,7 +54,7 @@ post-patch:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${RM} -f ${NULLDOCS:S|^|${STAGEDIR}${DOCSDIR}/|}
+	${RM} ${NULLDOCS:S|^|${STAGEDIR}${DOCSDIR}/|}
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/ansifilter/Makefile b/textproc/ansifilter/Makefile
index 68a494037606..8e88250f17de 100644
--- a/textproc/ansifilter/Makefile
+++ b/textproc/ansifilter/Makefile
@@ -47,7 +47,7 @@ post-patch:
 		 s|$$(CFLAGS)|$$(CXXFLAGS)|' ${WRKSRC}/src/${MAKEFILE}
 
 pre-build:
-	@${RM} -f ${WRKSRC}/src/qt-gui/moc_*.cpp
+	@${RM} ${WRKSRC}/src/qt-gui/moc_*.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \
diff --git a/textproc/asm-xml/Makefile b/textproc/asm-xml/Makefile
index 0b6a90b69817..102c9d508864 100644
--- a/textproc/asm-xml/Makefile
+++ b/textproc/asm-xml/Makefile
@@ -17,7 +17,7 @@ USES=		dos2unix uidfix
 PLIST_FILES=	include/asm-xml.h lib/libasm-xml.a
 
 post-extract:
-	${RM} -rf ${WRKSRC}/obj
+	${RM} -r ${WRKSRC}/obj
 
 post-patch:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile
diff --git a/textproc/docbook-sgml/Makefile b/textproc/docbook-sgml/Makefile
index 72fb16d2f060..f1c4bec500fe 100644
--- a/textproc/docbook-sgml/Makefile
+++ b/textproc/docbook-sgml/Makefile
@@ -26,7 +26,7 @@ DBCAT=	${PREFIX}/${DBKDIR}/catalog
 PLIST_SUB=	DBKDIR=${DBKDIR}
 
 do-extract:
-	@${RM} -rf ${WRKDIR}
+	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 .for df in ${DISTFILES:C,:.*,,}
 	@cd ${WRKDIR} && ${TAR} \
diff --git a/textproc/docbook-utils/Makefile b/textproc/docbook-utils/Makefile
index 8f3cd0d9e00d..03a81dcbe9b4 100644
--- a/textproc/docbook-utils/Makefile
+++ b/textproc/docbook-utils/Makefile
@@ -39,6 +39,6 @@ post-patch:
 			${WRKSRC}/backends/txt
 
 pre-configure:
-	${RM} -f ${WRKSRC}/config.cache
+	${RM} ${WRKSRC}/config.cache
 
 .include <bsd.port.mk>
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index 82fa0d5a0a3a..db4d3f26b495 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -27,7 +27,7 @@ DBCAT_SGML=	${PREFIX}/${DBKDIR}/catalog
 PLIST_SUB=	DBKDIR=${DBKDIR}
 
 do-extract:
-	@${RM} -rf ${WRKDIR}
+	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 .for df in ${DISTFILES:C,:.*,,}
 	@cd ${WRKDIR} && ${TAR} \
diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index 85695af0400c..43de76b965bf 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -148,7 +148,7 @@ PLIST_SUB+=	XHTML11="@comment "
 post-extract:
 	${FIND} ${WRKSRC} \( -name '.*' -or -name '*.sh' -or -name '*.LOG' \) -delete
 	${FIND} ${WRKSRC}/extensions -type d -mindepth 1 -maxdepth 1 -print0 |\
-		${XARGS} -0 ${RM} -rf
+		${XARGS} -0 ${RM} -r
 
 do-install:
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile
index f8f09521a093..3219b53abec4 100644
--- a/textproc/dsssl-docbook-modular/Makefile
+++ b/textproc/dsssl-docbook-modular/Makefile
@@ -27,7 +27,7 @@ RELDIR=		docbook/dsssl/modular
 INSTDIR=	${PREFIX}/share/sgml/${RELDIR}
 
 do-build:
-	${RM} -Rf ${WRKSRC}/docsrc
+	${RM} -R ${WRKSRC}/docsrc
 
 do-install:
 	${MKDIR} ${STAGEDIR}${INSTDIR}
diff --git a/textproc/flex/Makefile b/textproc/flex/Makefile
index d54c41defd20..6f14c8adb9f0 100644
--- a/textproc/flex/Makefile
+++ b/textproc/flex/Makefile
@@ -34,7 +34,7 @@ post-patch:	.SILENT
 	${REINPLACE_CMD} -Ee 's/tests//' \
 		-e '/mode=compile ..CC/s/\\$$/-fPIC -DPIC &/' \
 		${WRKSRC}/Makefile.in
-	${RM} -f ${WRKSRC}/doc/*.info*
+	${RM} ${WRKSRC}/doc/*.info*
 
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index 79a46ae849eb..924cf6cd8d10 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -16,7 +16,7 @@ USE_ALEX=	yes
 
 # Force regeneration of the lexer.
 post-patch::
-	@${RM} -rf ${WRKSRC}/dist
+	@${RM} -r ${WRKSRC}/dist
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/textproc/htmlc/Makefile b/textproc/htmlc/Makefile
index b7e0dc53bd2e..114016f24214 100644
--- a/textproc/htmlc/Makefile
+++ b/textproc/htmlc/Makefile
@@ -22,7 +22,7 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix ${LOCALBASE}
 
 post-patch:
-	${RM} -f ${WRKSRC}/doc/Makefile
+	${RM} ${WRKSRC}/doc/Makefile
 	${TOUCH} ${WRKSRC}/doc/Makefile
 	${ECHO} "all:" > ${WRKSRC}/doc/Makefile
 	${REINPLACE_CMD} 's|-warn-error A||g' ${WRKSRC}/config/Makefile
diff --git a/textproc/hyperestraier/Makefile b/textproc/hyperestraier/Makefile
index 4f57c68b2544..847c8fab7062 100644
--- a/textproc/hyperestraier/Makefile
+++ b/textproc/hyperestraier/Makefile
@@ -42,7 +42,7 @@ post-patch:
 		-e 's/@MYCFLAGS@/@CFLAGS@ -Wall -fPIC -fsigned-char/' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
-	@${RM} -f ${WRKSRC}/doc/intro-en.html~ ${WRKSRC}/doc/intro-ja.html~
+	@${RM} ${WRKSRC}/doc/intro-en.html~ ${WRKSRC}/doc/intro-ja.html~
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libestraier.so
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index b1835e128c08..50cf701204df 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -31,7 +31,7 @@ post-extract:
 
 pre-install:
 	@${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) \
-		-exec ${RM} -f \{} \;
+		-exec ${RM} \{} \;
 
 post-install:
 .for i in jade nsgmls sgmlnorm spam spent sx
diff --git a/textproc/kibana41/Makefile b/textproc/kibana41/Makefile
index 3820250d8efb..79cf1ba6223b 100644
--- a/textproc/kibana41/Makefile
+++ b/textproc/kibana41/Makefile
@@ -24,7 +24,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	@cd ${WRKSRC}/src && \
 		${RM} config/kibana.yml bin/kibana.sh bin/kibana.bat && \
-		${RM} -rf node_modules/bunyan/node_modules/dtrace-provider && \
+		${RM} -r node_modules/bunyan/node_modules/dtrace-provider && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 	@${CP} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${PREFIX}/etc/kibana.yml.sample
 
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index 415594e266ad..5457a0db9055 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -94,7 +94,7 @@ pgo-clean:
 . endfor
 # Only remove some files from lib to preserve profiling information.
 	@${FIND} -E ${BUILD_WRKSRC}/lib -iregex ".*\.(a|la|lai|lo|o|so|so\..*)$$" \
-		-exec ${RM} -f {} \;
+		-exec ${RM} {} \;
 .endif # if ${PORT_OPTIONS:MPGO}
 
 .include <bsd.port.mk>
diff --git a/textproc/libwps03/Makefile b/textproc/libwps03/Makefile
index a05b09bbb71c..42f9ce286600 100644
--- a/textproc/libwps03/Makefile
+++ b/textproc/libwps03/Makefile
@@ -33,6 +33,6 @@ CONFIGURE_ARGS+=	--with-sharedptr=boost
 .endif
 
 post-stage:
-	@${RM} -f ${STAGEDIR}${PREFIX}/bin/*
+	@${RM} ${STAGEDIR}${PREFIX}/bin/*
 
 .include <bsd.port.post.mk>
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index a7c953a1eb4a..0d9774900361 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -63,7 +63,7 @@ post-patch:
 
 .if !defined(MASTERDIR)
 post-install:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/share/gtk-doc
+	@${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-HTML-Truncate/Makefile b/textproc/p5-HTML-Truncate/Makefile
index 47a03d271cba..4fbed55dbd7e 100644
--- a/textproc/p5-HTML-Truncate/Makefile
+++ b/textproc/p5-HTML-Truncate/Makefile
@@ -19,6 +19,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
-	${RM} -f ${WRKSRC}/lib/HTML/Truncate.pm.orig
+	${RM} ${WRKSRC}/lib/HTML/Truncate.pm.orig
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-IDNA-Punycode/Makefile b/textproc/p5-IDNA-Punycode/Makefile
index 2fc2b52fe5c7..d29d8eff6ae1 100644
--- a/textproc/p5-IDNA-Punycode/Makefile
+++ b/textproc/p5-IDNA-Punycode/Makefile
@@ -16,6 +16,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
-	@${RM} -f ${WRKSRC}/lib/IDNA/.Punycode.pm.swp
+	@${RM} ${WRKSRC}/lib/IDNA/.Punycode.pm.swp
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Sentence/Makefile b/textproc/p5-Lingua-EN-Sentence/Makefile
index 36ba28216f41..fa0e3d7ed86f 100644
--- a/textproc/p5-Lingua-EN-Sentence/Makefile
+++ b/textproc/p5-Lingua-EN-Sentence/Makefile
@@ -16,6 +16,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-extract:
-	@${RM} -f ${WRKSRC}/lib/Lingua/EN/Sentence.pm~
+	@${RM} ${WRKSRC}/lib/Lingua/EN/Sentence.pm~
 
 .include <bsd.port.mk>
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile
index f579b3c7caa5..e9da6621373a 100644
--- a/textproc/sdcv/Makefile
+++ b/textproc/sdcv/Makefile
@@ -37,7 +37,7 @@ post-patch:
 		's|@mandir@/uk|@mandir@|' ${WRKSRC}/doc/uk/Makefile.am
 	@${REINPLACE_CMD} -e \
 		's|getopt1.c getopt.h||' ${WRKSRC}/src/Makefile.am
-	@${RM} -f ${WRKSRC}/src/getopt.h
+	@${RM} ${WRKSRC}/src/getopt.h
 	@${REINPLACE_CMD} '/AM_GNU_GETTEXT_VERSION/s/0\.14\.1/0.19.1/' \
 		${WRKSRC}/configure.ac
 
diff --git a/textproc/srilm/Makefile b/textproc/srilm/Makefile
index ab0926ffc244..4c0f062997d9 100644
--- a/textproc/srilm/Makefile
+++ b/textproc/srilm/Makefile
@@ -59,7 +59,7 @@ into ${DISTDIR}/, and then run make again.\n
 .endif
 
 do-extract:
-	@${RM} -rf ${WRKDIR}
+	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKSRC}
 	@if ! (cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS} );\
 	then \
diff --git a/textproc/tclExpat/Makefile b/textproc/tclExpat/Makefile
index 820244e93214..23ad3d7ca125 100644
--- a/textproc/tclExpat/Makefile
+++ b/textproc/tclExpat/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFINE=	DOCS
 
 # Remove the old version of expat bundled with the package:
 post-extract:
-	${RM} -rf ${WRKSRC}/expat
+	${RM} -r ${WRKSRC}/expat
 
 post-build test:
 	${LN} -sf libtclexpat.so ${WRKSRC}/tclexpat.so
diff --git a/textproc/templates_parser/Makefile b/textproc/templates_parser/Makefile
index 1c9a45b72cb1..7eee4a491faf 100644
--- a/textproc/templates_parser/Makefile
+++ b/textproc/templates_parser/Makefile
@@ -44,7 +44,7 @@ do-build-DOCS-on:
 		${MAKE_CMD} ${MAKE_ARGS} html
 
 post-install:
-	${RM} -rf ${STAGEDIR}${PREFIX}/share/gpr/manifests
+	${RM} -r ${STAGEDIR}${PREFIX}/share/gpr/manifests
 	${MV} ${DESTINC}.relocatable/templates_parser-conf*.ads \
 		${DESTINC}.relocatable/templates_parser-configuration.ads
 	${MV} ${DESTINC}/templates_parser-conf*.ads \
diff --git a/vietnamese/vnroff/Makefile b/vietnamese/vnroff/Makefile
index 86203398d7ca..2b8eca57620f 100644
--- a/vietnamese/vnroff/Makefile
+++ b/vietnamese/vnroff/Makefile
@@ -15,7 +15,7 @@ PLIST_FILES=	bin/vnroff man/man1/vnroff.1.gz
 NO_WRKSUBDIR=	yes
 
 do-extract:
-	@${RM} -rf ${WRKSRC}
+	@${RM} -r ${WRKSRC}
 	@${MKDIR} ${WRKSRC}
 	@(cd ${WRKSRC} && ${GZCAT} ${DISTDIR}/vnroff.c.Z \
 		| ${SED} -e '1,/-cut here-/d' \
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}/)
diff --git a/x11-clocks/asclock-gtk/Makefile b/x11-clocks/asclock-gtk/Makefile
index 7c80541fbf6b..f235bf011562 100644
--- a/x11-clocks/asclock-gtk/Makefile
+++ b/x11-clocks/asclock-gtk/Makefile
@@ -38,7 +38,7 @@ SHAPED_THEME_DESC=	Shaped theme
 
 do-configure:
 	@(cd ${WRKSRC}; \
-	  ${RM} -rf default_theme; \
+	  ${RM} -r default_theme; \
 	  ${LN} -s themes/${PORT_OPTIONS:M*_THEME:S/_THEME//:tl} default_theme)
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile
index 697988d8d260..a942909ce5c3 100644
--- a/x11-clocks/asclock-xlib/Makefile
+++ b/x11-clocks/asclock-xlib/Makefile
@@ -24,7 +24,7 @@ post-patch:
 
 pre-configure:
 	@(cd ${WRKSRC}; \
-	  ${RM} -rf default_theme; \
+	  ${RM} -r default_theme; \
 	  ${LN} -s themes/Orb default_theme)
 
 post-install:
diff --git a/x11-clocks/pclock/Makefile b/x11-clocks/pclock/Makefile
index 879dbc127404..ef50ce992f11 100644
--- a/x11-clocks/pclock/Makefile
+++ b/x11-clocks/pclock/Makefile
@@ -19,7 +19,7 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" OBJS="Main.o Graphics.o" \
 		LIBDIR="-L${LOCALBASE}/lib ${LDFLAGS}"
 
 post-extract:
-	cd ${WRKSRC} && ${RM} -f getopt*
+	cd ${WRKSRC} && ${RM} getopt*
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pclock ${STAGEDIR}${PREFIX}/bin
diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index 73c4b0e91691..149694028005 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -212,10 +212,10 @@ do-build:
 		${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --bm="${BUILD_MODE}" --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE}
 
 post-build:
-	@${RM} -rf ${DOCSRC}/*/dev-help
+	@${RM} -r ${DOCSRC}/*/dev-help
 
 pre-install:
-	@${RM} -f ${PLIST}
+	@${RM} ${PLIST}
 
 	@${ECHO_CMD} "@dir %%DATADIR%%/plugins/wcx" >> ${PLIST}
 	@${ECHO_CMD} "@dir %%DATADIR%%/plugins/wdx" >> ${PLIST}
diff --git a/x11-fm/gentoo/Makefile b/x11-fm/gentoo/Makefile
index 3a87992256f6..91ef3fa1efe0 100644
--- a/x11-fm/gentoo/Makefile
+++ b/x11-fm/gentoo/Makefile
@@ -41,6 +41,6 @@ post-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-	${RM} -f ${STAGEDIR}${DOCSDIR}/gentoo.1x
+	${RM} ${STAGEDIR}${DOCSDIR}/gentoo.1x
 
 .include <bsd.port.mk>
diff --git a/x11-fm/gprename/Makefile b/x11-fm/gprename/Makefile
index 77f38255256d..5d54c39749f5 100644
--- a/x11-fm/gprename/Makefile
+++ b/x11-fm/gprename/Makefile
@@ -26,7 +26,7 @@ NO_BUILD=	yes
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/build
+	@${RM} -r ${WRKSRC}/build
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/x11-themes/adwaita-icon-theme/Makefile b/x11-themes/adwaita-icon-theme/Makefile
index b825dbe7e602..b806aa6e0d27 100644
--- a/x11-themes/adwaita-icon-theme/Makefile
+++ b/x11-themes/adwaita-icon-theme/Makefile
@@ -17,7 +17,7 @@ CONFIGURE_ENV=	ac_cv_path_GTK_ENCODE_SYMBOLIC_SVG="false"
 INSTALLS_ICONS=	yes
 
 post-install:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/locale
-	@${RM} -rf ${STAGEDIR}${PREFIX}/locale
+	@${RM} -r ${STAGEDIR}${PREFIX}/lib/locale
+	@${RM} -r ${STAGEDIR}${PREFIX}/locale
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-digital-harmony-theme/Makefile b/x11-themes/gtk-digital-harmony-theme/Makefile
index 28c4e161872c..f84ea4d0af11 100644
--- a/x11-themes/gtk-digital-harmony-theme/Makefile
+++ b/x11-themes/gtk-digital-harmony-theme/Makefile
@@ -28,7 +28,7 @@ PLIST_SUB+=	GTK20="@comment " METACITY=""
 .endif
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/gtk-2.0/Scrollbars/Backup \
+	@${RM} -r ${WRKSRC}/gtk-2.0/Scrollbars/Backup \
 		${WRKSRC}/gtk-2.0/ReadME.txt
 	@${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
 
diff --git a/x11-themes/gtk-equinox-engine/Makefile b/x11-themes/gtk-equinox-engine/Makefile
index 66dd255df0c4..7dfd31be9e82 100644
--- a/x11-themes/gtk-equinox-engine/Makefile
+++ b/x11-themes/gtk-equinox-engine/Makefile
@@ -41,7 +41,7 @@ ANIMATION_CONFIGURE_ENABLE=	animation
 post-patch:
 	@${FIND} ${WRKDIR} -name 'gtkrc' -exec \
 	    ${REINPLACE_CMD} -e 's!^include "apps/nautilus\.rc"!#&!' {} +
-	@${FIND} ${WRKDIR} -type f -name 'gtkrc.bak' -exec ${RM} -f {} +
+	@${FIND} ${WRKDIR} -type f -name 'gtkrc.bak' -exec ${RM} {} +
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/src/animation.c
 
diff --git a/x11-themes/openbox-themes/Makefile b/x11-themes/openbox-themes/Makefile
index bf1dc755e56f..7cc681e128fc 100644
--- a/x11-themes/openbox-themes/Makefile
+++ b/x11-themes/openbox-themes/Makefile
@@ -20,7 +20,7 @@ NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/debian
+	@${RM} -r ${WRKSRC}/debian
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/themes
diff --git a/x11-themes/sawfish-themes/Makefile b/x11-themes/sawfish-themes/Makefile
index 1b5f3ec95377..6bcd9d594349 100644
--- a/x11-themes/sawfish-themes/Makefile
+++ b/x11-themes/sawfish-themes/Makefile
@@ -26,7 +26,7 @@ DATA_DIRS=	2YearsToNever Anonymous Aquiline BWM Big Blackwindow \
 		debian gorilla gorillaz mxflat typo
 
 post-extract:
-	${FIND} ${WRKSRC} -name .xvpics | ${XARGS} ${RM} -rf
+	${FIND} ${WRKSRC} -name .xvpics | ${XARGS} ${RM} -r
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/sawfish/themes
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index b8f7c9d47107..b56b9872ee56 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -41,7 +41,7 @@ post-patch:
 	@${MV} ${WRKSRC}/gtk/gtkrc.zh_TW.big5 ${WRKSRC}/gtk/gtkrc.zh_TW.Big5
 
 pre-build:
-	${RM} -rf ${WRKSRC}/docs/gtk.info*
+	${RM} -r ${WRKSRC}/docs/gtk.info*
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk/themes/engines
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index dae4a8092ae2..795032716c6b 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -87,7 +87,7 @@ pre-configure:
 	fi
 
 pre-build:
-	@${RM} -rf ${WRKSRC}/docs/gtk.info*
+	@${RM} -r ${WRKSRC}/docs/gtk.info*
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules
diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile
index 597891ae8227..15ff6f36ba96 100644
--- a/x11-toolkits/gtkada/Makefile
+++ b/x11-toolkits/gtkada/Makefile
@@ -66,6 +66,6 @@ do-build:
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata
 	@${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata/
-	${RM} -rf ${STAGEDIR}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources
+	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index 05997d5534a3..2d3d4c6e5710 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -36,7 +36,7 @@ post-patch:
 		-e 's,@ITCL_VERSION@,3.3,g' ${WRKSRC}/Makefile.in
 
 post-install:
-	${RM} -f ${STAGEDIR}${PREFIX}/lib/iwidgets
+	${RM} ${STAGEDIR}${PREFIX}/lib/iwidgets
 	${LN} -s ${DISTNAME} ${STAGEDIR}${PREFIX}/lib/iwidgets
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/x11-toolkits/linux-c6-qt47-x11/Makefile b/x11-toolkits/linux-c6-qt47-x11/Makefile
index 2b3135b7d12c..b79933036dd1 100644
--- a/x11-toolkits/linux-c6-qt47-x11/Makefile
+++ b/x11-toolkits/linux-c6-qt47-x11/Makefile
@@ -30,6 +30,6 @@ NVIDIA_GL_USE_OFF=	LINUX=dri
 DESCR=	${.CURDIR}/../../devel/qt4/pkg-descr
 
 post-patch:
-	${RM} -f ${WRKSRC}/usr/share/qt47/translations/qt_help_*.qm
+	${RM} ${WRKSRC}/usr/share/qt47/translations/qt_help_*.qm
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile
index 65eaf933cf6f..590b9c1b48e1 100644
--- a/x11-toolkits/py-gui/Makefile
+++ b/x11-toolkits/py-gui/Makefile
@@ -29,7 +29,7 @@ OPENGL_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolk
 post-patch:
 	@${REINPLACE_CMD} -e 's|"GUI.Cocoa",||g' ${WRKSRC}/setup.py
 	@${TOUCH} ${WRKSRC}/GUI/Generic/__init__.py ${WRKSRC}/GUI/Gtk/__init__.py
-	@${RM} -fr ${WRKSRC}/Demos/BlobEdit/.gdb_history ${WRKSRC}/Demos/BlobEdit/Makefile ${WRKSRC}/GUI/Cocoa
+	@${RM} -r ${WRKSRC}/Demos/BlobEdit/.gdb_history ${WRKSRC}/Demos/BlobEdit/Makefile ${WRKSRC}/GUI/Cocoa
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index b0bd0bfa94d0..246729550435 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -125,10 +125,10 @@ post-install:
 	${CHMOD} -R a+rX \
 		${STAGEDIR}${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/${WX_PYTHON_DIR}
 # Remove unwanted .egg-info
-	${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/wxPython_common-*.egg-info
-	${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/wx.pth
-	${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/wxversion*
-	${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/${WX_PYTHON_DIR}/*.egg-info
+	${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/wxPython_common-*.egg-info
+	${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/wx.pth
+	${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/wxversion*
+	${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/${WX_PYTHON_DIR}/*.egg-info
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile
index 38f07b140447..89afcf129401 100644
--- a/x11-toolkits/swt-devel/Makefile
+++ b/x11-toolkits/swt-devel/Makefile
@@ -80,7 +80,7 @@ DIST_EXT=	gtk-linux-x86
 
 post-extract:
 	@(cd ${WRKSRC} && ${UNZIP_NATIVE_CMD} -qo *.zip)
-	@${RM} -f ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar
+	@${RM} ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar
 
 post-patch:
 	@${SED} -E -e 's|%%ARCH%%|${ARCH}|' \
diff --git a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile
index 03be78a04a97..3631b4902966 100644
--- a/x11-toolkits/swt/Makefile
+++ b/x11-toolkits/swt/Makefile
@@ -80,7 +80,7 @@ DIST_EXT=	gtk-linux-x86
 
 post-extract:
 	@(cd ${WRKSRC} && ${UNZIP_CMD} -qo "*.zip")
-	@${RM} -f ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar
+	@${RM} ${WRKSRC}/*.o ${WRKSRC}/*.so ${WRKSRC}/*.jar
 
 post-patch:
 	${SED} -e 's|freebsd|dragonfly|g' ${WRKSRC}/make_freebsd.mak \
diff --git a/x11-wm/fvwm-crystal/Makefile b/x11-wm/fvwm-crystal/Makefile
index c81ef6c1d923..c424c5957c48 100644
--- a/x11-wm/fvwm-crystal/Makefile
+++ b/x11-wm/fvwm-crystal/Makefile
@@ -41,7 +41,7 @@ DOCS_INSTALL_TARGET=	install-doc
 
 post-extract:
 	@cd ${WRKSRC} && ${FIND} . -depth -type d -name .svn \
-		-exec ${RM} -rf {} \;
+		-exec ${RM} -r {} \;
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|cp -r -d|cp -r|; s|cp -d|cp|' \
diff --git a/x11-wm/gcompmgr/Makefile b/x11-wm/gcompmgr/Makefile
index cc66d6000698..3b16a8feaccd 100644
--- a/x11-wm/gcompmgr/Makefile
+++ b/x11-wm/gcompmgr/Makefile
@@ -28,7 +28,7 @@ DESKTOP_ENTRIES="gcompmgr" \
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${RM} -f ${WRKSRC}/INSTALL
+	@${RM} ${WRKSRC}/INSTALL
 	@${REINPLACE_CMD} -e 's|connect(SigC::slot|connect(sigc::mem_fun|g ; \
 		s|#include <sigc++\/compatibility\.h>||g' \
 			${WRKSRC}/src/*.cc
diff --git a/x11/bmpanel2/Makefile b/x11/bmpanel2/Makefile
index 495c400acef8..23f11ba01235 100644
--- a/x11/bmpanel2/Makefile
+++ b/x11/bmpanel2/Makefile
@@ -34,7 +34,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,uint,unsigned,' ${WRKSRC}/args.c
 # Disable unused optional features (and thus unbreak "make clean")
 	@${REINPLACE_CMD} -e '/^OPTION/s, ON, OFF,' ${WRKSRC}/CMakeLists.txt
-	@${RM} -f ${WRKSRC}/themes/striped/theme.orig
+	@${RM} ${WRKSRC}/themes/striped/theme.orig
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/bmpanel2
diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
index 56d059dd1b8e..8cce99c12227 100644
--- a/x11/cinnamon-screensaver/Makefile
+++ b/x11/cinnamon-screensaver/Makefile
@@ -45,7 +45,7 @@ post-patch:
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/cinnamon-screensaver.pam \
 		${STAGEDIR}${PREFIX}/etc/pam.d/cinnamon-screensaver
-	${RM} -fr ${STAGEDIR}${PREFIX}/etc/pam.d/pam.d/
+	${RM} -r ${STAGEDIR}${PREFIX}/etc/pam.d/pam.d/
 
 pre-configure:
 	cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile
index 02741611f956..e4072ae91de2 100644
--- a/x11/eaglemode/Makefile
+++ b/x11/eaglemode/Makefile
@@ -62,13 +62,13 @@ post-patch:
 		${REINPLACE_CMD} -e '1s|/usr/bin/perl|${perl_CMD}|'
 
 post-patch-XINE-off:
-	@${RM} -f ${WRKSRC}/makers/emAv.maker.pm
+	@${RM} ${WRKSRC}/makers/emAv.maker.pm
 
 post-patch-RSVG-off:
-	@${RM} -f ${WRKSRC}/makers/emSvg.maker.pm
+	@${RM} ${WRKSRC}/makers/emSvg.maker.pm
 
 post-patch-PDF-off:
-	@${RM} -f ${WRKSRC}/makers/emPdf.maker.pm
+	@${RM} ${WRKSRC}/makers/emPdf.maker.pm
 
 do-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index 1c62f20299da..168f7ea1cc52 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -24,6 +24,6 @@ post-patch:
 		's,FL_REVISION>=80,FL_REVISION >= 80 || FL_VERSION != 0,g'
 
 pre-configure:
-	@${RM} -f ${WRKSRC}/xbackdrop/backdrops/index?*
+	@${RM} ${WRKSRC}/xbackdrop/backdrops/index?*
 
 .include <bsd.port.mk>
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index 8934952839eb..327774156560 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -22,7 +22,7 @@ IMLIB2_LIB_DEPENDS= 	libImlib2.so:graphics/imlib2
 IMLIB2_CONFIGURE_ENABLE=Imlib2
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/icons/CVS
+	@${RM} -r ${WRKSRC}/icons/CVS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/x11/wmxss/Makefile b/x11/wmxss/Makefile
index 46fadcfce315..bc060eb8ee11 100644
--- a/x11/wmxss/Makefile
+++ b/x11/wmxss/Makefile
@@ -16,7 +16,7 @@ PLIST_FILES=	bin/wmxss
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/Src
 
 post-extract:
-	@( cd ${WRKSRC} ; ${MAKE} clean ; ${RM} -f .nfs* )
+	@( cd ${WRKSRC} ; ${MAKE} clean ; ${RM} .nfs* )
 
 post-patch:
 	@${REINPLACE_CMD} -E \
diff --git a/x11/xkbctrl/Makefile b/x11/xkbctrl/Makefile
index c89407c94f5a..fc6a076c5789 100644
--- a/x11/xkbctrl/Makefile
+++ b/x11/xkbctrl/Makefile
@@ -18,7 +18,7 @@ USE_XORG=	x11 xkbfile
 NO_WRKSUBDIR=	yes
 
 do-extract:
-		@${RM} -rf ${WRKSRC}
+		@${RM} -r ${WRKSRC}
 		@${MKDIR} ${WRKSRC}
 		@for _file in ${DISTFILES}; do \
 			${CP} ${DISTDIR}/${DIST_SUBDIR}/$${_file} ${WRKSRC}; \
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index e28d1115b4e3..951f6b4bd4fe 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -28,7 +28,7 @@ GTK1_USE_OFF=	GNOME=gtk20
 GTK1_VARS_OFF=	GTK_PC=gtk+-2.0
 
 post-extract:
-	@${RM} -f ${WRKSRC}/getopt.h
+	@${RM} ${WRKSRC}/getopt.h
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} ${PORTNAME}.c -o ${PORTNAME} \
author	Mathieu Arnold <mat@FreeBSD.org>	2016-10-21 12:51:40 +0000
committer	Mathieu Arnold <mat@FreeBSD.org>	2016-10-21 12:51:40 +0000
commit	eabbfd75e30148b8f686899a638b93547ca83485 (patch)
tree	5b70e6802d6d9dfe8b4564fc4f09f2d0a5156343
parent	f51fe6e12cc1833af15f8086b22a92af9f8aa4b0 (diff)
download	ports-eabbfd75e30148b8f686899a638b93547ca83485.tar.gz ports-eabbfd75e30148b8f686899a638b93547ca83485.zip