${RM} already has -f.

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

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

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)

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

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)

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

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}"

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
 

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

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}

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}

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

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
 

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

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)

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

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}

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

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 {} \;

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

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 \

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>

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/

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 \

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" \

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>

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

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>

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,|,,| ; \

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/' \

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>

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>

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>

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

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 ; \

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

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>

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>

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>

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}

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"

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,' \

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

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 \

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>

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>

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

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} && \

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>

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/

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}

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); \

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}

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 \

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:

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:

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>

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:

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

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}

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 \

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}

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>

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 \

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}

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

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>

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>

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

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

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"

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

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

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>

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)

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

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

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

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>

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:

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>

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 \

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\//' \

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:

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}

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>

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>

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}

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.

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/)
 

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>

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/
 

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/
 

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
 

deskutils/gworkspace/Makefile

@@ -27,6 +27,6 @@ USES+=		ghostscript
 .endif
 
 pre-configure:
-	${RM} -rf ${WRKSRC}/GWMetadata
+	${RM} -r ${WRKSRC}/GWMetadata
 
 .include <bsd.port.mk>

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
 

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}

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}

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>

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 \

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>