Attachment 175869 Details for Bug 213570 – v1

[patch] v1

rm-f.diff (text/plain), 372.40 KB, created by Mathieu Arnold on 2016-10-17 14:27:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2016-10-17 14:27:27 UTC

Size: 372.40 KB

patch

obsolete

>diff --git Makefile Makefile
>index 7e3bed5..9a23c64 100644
>--- Makefile
>+++ 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 Mk/Uses/elixir.mk Mk/Uses/elixir.mk
>index db19d92..0f89c49 100644
>--- Mk/Uses/elixir.mk
>+++ 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 Mk/Uses/erlang.mk Mk/Uses/erlang.mk
>index 968730c..0c001bd 100644
>--- Mk/Uses/erlang.mk
>+++ 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 Mk/Uses/gem.mk Mk/Uses/gem.mk
>index ee47a0e..18eb230 100644
>--- Mk/Uses/gem.mk
>+++ 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 Mk/Uses/gnome.mk Mk/Uses/gnome.mk
>index 5e856f7..d38e55a 100644
>--- Mk/Uses/gnome.mk
>+++ 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 Mk/Uses/gssapi.mk Mk/Uses/gssapi.mk
>index 373dd17..f1e76ff 100644
>--- Mk/Uses/gssapi.mk
>+++ 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 Mk/Uses/pear.mk Mk/Uses/pear.mk
>index fc52f43..7874bb0 100644
>--- Mk/Uses/pear.mk
>+++ 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 Mk/Uses/perl5.mk Mk/Uses/perl5.mk
>index 8d3b0b7..ff736c4 100644
>--- Mk/Uses/perl5.mk
>+++ 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 Mk/Uses/php.mk Mk/Uses/php.mk
>index 6ed6197..1798085 100644
>--- Mk/Uses/php.mk
>+++ Mk/Uses/php.mk
>@@ -245,7 +245,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
>@@ -267,7 +267,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 Mk/bsd.gecko.mk Mk/bsd.gecko.mk
>index a11c546..c751110 100644
>--- Mk/bsd.gecko.mk
>+++ 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 Mk/bsd.licenses.mk Mk/bsd.licenses.mk
>index da3f751..243272c 100644
>--- Mk/bsd.licenses.mk
>+++ 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 Mk/bsd.ocaml.mk Mk/bsd.ocaml.mk
>index 8d7cf2b..c56e0db 100644
>--- Mk/bsd.ocaml.mk
>+++ 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 Mk/bsd.port.mk Mk/bsd.port.mk
>index d7384b7..e9479a8 100644
>--- Mk/bsd.port.mk
>+++ 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 Mk/bsd.port.subdir.mk Mk/bsd.port.subdir.mk
>index e673a8e..2321b62 100644
>--- Mk/bsd.port.subdir.mk
>+++ 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 accessibility/at-spi/Makefile accessibility/at-spi/Makefile
>index e3ddab8..d2f8a75 100644
>--- accessibility/at-spi/Makefile
>+++ 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 accessibility/speech-dispatcher/Makefile accessibility/speech-dispatcher/Makefile
>index 58422f9..3f9c894 100644
>--- accessibility/speech-dispatcher/Makefile
>+++ 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 arabic/libitl/Makefile arabic/libitl/Makefile
>index 6f6d757..a49d3b9 100644
>--- arabic/libitl/Makefile
>+++ 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 archivers/deco/Makefile archivers/deco/Makefile
>index f394776..111d1a2 100644
>--- archivers/deco/Makefile
>+++ 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 archivers/minizip/Makefile archivers/minizip/Makefile
>index 76678a4..1072965 100644
>--- archivers/minizip/Makefile
>+++ 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 archivers/unmakeself/Makefile archivers/unmakeself/Makefile
>index f06ad9e..12896cc 100644
>--- archivers/unmakeself/Makefile
>+++ 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 archivers/zipper/Makefile archivers/zipper/Makefile
>index 4b7b7be..f23c487 100644
>--- archivers/zipper/Makefile
>+++ 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 astro/gpsbabel/Makefile astro/gpsbabel/Makefile
>index fda673c..6aa5dad 100644
>--- astro/gpsbabel/Makefile
>+++ 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 audio/autozen/Makefile audio/autozen/Makefile
>index f1f81ef..5a5c60a 100644
>--- audio/autozen/Makefile
>+++ 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 audio/eawplus/Makefile audio/eawplus/Makefile
>index b9ac04f..da96c66 100644
>--- audio/eawplus/Makefile
>+++ 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 audio/festdoc/Makefile audio/festdoc/Makefile
>index 5f86c41..07542cb 100644
>--- audio/festdoc/Makefile
>+++ 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 audio/festival/Makefile audio/festival/Makefile
>index 27faf2a..2494d04 100644
>--- audio/festival/Makefile
>+++ 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 audio/festvox-el11/Makefile audio/festvox-el11/Makefile
>index 2ba5af3..b34efb4 100644
>--- audio/festvox-el11/Makefile
>+++ 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 audio/glame/Makefile audio/glame/Makefile
>index cf509ee..24672fc 100644
>--- audio/glame/Makefile
>+++ 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 audio/id3lib/Makefile audio/id3lib/Makefile
>index ce4c382..44c2595 100644
>--- audio/id3lib/Makefile
>+++ 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 audio/jack/Makefile audio/jack/Makefile
>index 24c434f..3c2ca84 100644
>--- audio/jack/Makefile
>+++ 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 audio/libmusicbrainz5/Makefile audio/libmusicbrainz5/Makefile
>index 3003c8d..789f901 100644
>--- audio/libmusicbrainz5/Makefile
>+++ 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 audio/libnoise/Makefile audio/libnoise/Makefile
>index 312e876..6042c20 100644
>--- audio/libnoise/Makefile
>+++ 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 audio/nosefart/Makefile audio/nosefart/Makefile
>index 936cb66..421bee8b 100644
>--- audio/nosefart/Makefile
>+++ 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 audio/opusfile/Makefile audio/opusfile/Makefile
>index d2f3661..e8efa65 100644
>--- audio/opusfile/Makefile
>+++ 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 audio/p5-libvorbis/Makefile audio/p5-libvorbis/Makefile
>index 4166b7a..d9d4c96 100644
>--- audio/p5-libvorbis/Makefile
>+++ 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 audio/pulseaudio/Makefile audio/pulseaudio/Makefile
>index 94a1f49..d2fa282 100644
>--- audio/pulseaudio/Makefile
>+++ 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 audio/rhythmbox/Makefile audio/rhythmbox/Makefile
>index 396f6ff..a6b7faf 100644
>--- audio/rhythmbox/Makefile
>+++ 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 audio/rioutil/Makefile audio/rioutil/Makefile
>index 95669d7..a65eff9 100644
>--- audio/rioutil/Makefile
>+++ 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 audio/timidity++/Makefile audio/timidity++/Makefile
>index 7c5aab9..7d7bf4f 100644
>--- audio/timidity++/Makefile
>+++ 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 audio/timidity++/Makefile.interface audio/timidity++/Makefile.interface
>index d441058..2f0bfa1 100644
>--- audio/timidity++/Makefile.interface
>+++ 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 audio/uade/Makefile audio/uade/Makefile
>index bf02cbd..726fc50 100644
>--- audio/uade/Makefile
>+++ 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 audio/wildmidi/Makefile audio/wildmidi/Makefile
>index 525d95d..9b388c3 100644
>--- audio/wildmidi/Makefile
>+++ 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 audio/xmms-gbsplay/Makefile audio/xmms-gbsplay/Makefile
>index 3389a12..adde844 100644
>--- audio/xmms-gbsplay/Makefile
>+++ 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 base/gcc/Makefile base/gcc/Makefile
>index ba279c7..610c7ad 100644
>--- base/gcc/Makefile
>+++ 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 benchmarks/flowgrind/Makefile benchmarks/flowgrind/Makefile
>index 506cd3e..c6ad32f 100644
>--- benchmarks/flowgrind/Makefile
>+++ 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 benchmarks/lmbench/Makefile benchmarks/lmbench/Makefile
>index 853ab77..ee74b54 100644
>--- benchmarks/lmbench/Makefile
>+++ 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 benchmarks/nqueens/Makefile benchmarks/nqueens/Makefile
>index 6c59879..6a428e8 100644
>--- benchmarks/nqueens/Makefile
>+++ 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 benchmarks/siege/Makefile benchmarks/siege/Makefile
>index 89220f3..5fa3c93 100644
>--- benchmarks/siege/Makefile
>+++ 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 benchmarks/unixbench/Makefile benchmarks/unixbench/Makefile
>index 3e4b6b4..57c9802 100644
>--- benchmarks/unixbench/Makefile
>+++ 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 biology/artemis/Makefile biology/artemis/Makefile
>index 64cb567..4dcee45 100644
>--- biology/artemis/Makefile
>+++ 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 biology/fasta/Makefile biology/fasta/Makefile
>index 7ce6dbd..0ed3749 100644
>--- biology/fasta/Makefile
>+++ 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 biology/tinker/Makefile biology/tinker/Makefile
>index 43163df..76c17c9 100644
>--- biology/tinker/Makefile
>+++ 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 cad/impact/Makefile cad/impact/Makefile
>index 876d6f6..0249755 100644
>--- cad/impact/Makefile
>+++ 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 cad/kicad/Makefile cad/kicad/Makefile
>index 3e9efbe..e258661 100644
>--- cad/kicad/Makefile
>+++ 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 cad/opencascade/Makefile cad/opencascade/Makefile
>index 5da1bf6..c245950 100644
>--- cad/opencascade/Makefile
>+++ 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 cad/tochnog/Makefile cad/tochnog/Makefile
>index 9d9ce50..13a58e6 100644
>--- cad/tochnog/Makefile
>+++ 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 chinese/cnprint/Makefile chinese/cnprint/Makefile
>index b6824bf..53af8e0 100644
>--- chinese/cnprint/Makefile
>+++ 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 chinese/fireflyttf/Makefile chinese/fireflyttf/Makefile
>index 79d4564..7d9fddb 100644
>--- chinese/fireflyttf/Makefile
>+++ 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 chinese/phpbb-tw/Makefile chinese/phpbb-tw/Makefile
>index ad1bf6c..b9dfdf9 100644
>--- chinese/phpbb-tw/Makefile
>+++ 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 comms/cqrlog/Makefile comms/cqrlog/Makefile
>index 66c2387..18bd996 100644
>--- comms/cqrlog/Makefile
>+++ 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 comms/wwl/Makefile comms/wwl/Makefile
>index 8f3f8a2..c02a0aa 100644
>--- comms/wwl/Makefile
>+++ 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 comms/yaac/Makefile comms/yaac/Makefile
>index 203bc8f..5696a04 100644
>--- comms/yaac/Makefile
>+++ 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 converters/recode/Makefile converters/recode/Makefile
>index 5648f8d..2a647a8 100644
>--- converters/recode/Makefile
>+++ 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 databases/adodb/Makefile databases/adodb/Makefile
>index d6d3dbb..1bf0724 100644
>--- databases/adodb/Makefile
>+++ 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 databases/cassandra2/Makefile databases/cassandra2/Makefile
>index 104c54e..a82b638 100644
>--- databases/cassandra2/Makefile
>+++ 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 databases/db5/Makefile databases/db5/Makefile
>index 276aaef..1cd7005 100644
>--- databases/db5/Makefile
>+++ 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 databases/db6/Makefile databases/db6/Makefile
>index 9f05400..415d972 100644
>--- databases/db6/Makefile
>+++ 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 databases/dbconnect/Makefile databases/dbconnect/Makefile
>index b720bbe..96ee43d 100644
>--- databases/dbconnect/Makefile
>+++ 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 databases/libodbc++/Makefile databases/libodbc++/Makefile
>index 7e20d88..b1c2c5b 100644
>--- databases/libodbc++/Makefile
>+++ 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 databases/mariadb100-client/Makefile databases/mariadb100-client/Makefile
>index f5098c4..866c578 100644
>--- databases/mariadb100-client/Makefile
>+++ 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 databases/mariadb100-server/Makefile databases/mariadb100-server/Makefile
>index c21fae0..fc1f8a3 100644
>--- databases/mariadb100-server/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
>diff --git databases/mariadb55-server/Makefile databases/mariadb55-server/Makefile
>index 606afc6..06152a0 100644
>--- databases/mariadb55-server/Makefile
>+++ 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 databases/mysql++1/Makefile databases/mysql++1/Makefile
>index f418b2b..5ca6b46 100644
>--- databases/mysql++1/Makefile
>+++ 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 databases/mysql-connector-c++/Makefile databases/mysql-connector-c++/Makefile
>index 16afa1d..5edfb37 100644
>--- databases/mysql-connector-c++/Makefile
>+++ 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 databases/mysql57-server/Makefile databases/mysql57-server/Makefile
>index 73d82cc..22130fd 100644
>--- databases/mysql57-server/Makefile
>+++ 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 databases/p5-DBD-SQLite2/Makefile databases/p5-DBD-SQLite2/Makefile
>index 3f9ead5..40714f8 100644
>--- databases/p5-DBD-SQLite2/Makefile
>+++ 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 databases/pgfouine/Makefile databases/pgfouine/Makefile
>index 7fd2a89..d949eb0 100644
>--- databases/pgfouine/Makefile
>+++ 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 databases/pgmodeler/Makefile databases/pgmodeler/Makefile
>index f770a76..65cf5f5 100644
>--- databases/pgmodeler/Makefile
>+++ 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 databases/phppgadmin/Makefile databases/phppgadmin/Makefile
>index 0cb76fe..83cd5d0 100644
>--- databases/phppgadmin/Makefile
>+++ 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 databases/py-carbon/Makefile databases/py-carbon/Makefile
>index fbbb268..af8a90b 100644
>--- databases/py-carbon/Makefile
>+++ 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 databases/py-pymssql/Makefile databases/py-pymssql/Makefile
>index 04691c2..9f3c009 100644
>--- databases/py-pymssql/Makefile
>+++ 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 databases/riak/Makefile databases/riak/Makefile
>index 61cab64..c39153a 100644
>--- databases/riak/Makefile
>+++ 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 databases/ruby-cdb/Makefile databases/ruby-cdb/Makefile
>index 0bcd041..9e6cb48 100644
>--- databases/ruby-cdb/Makefile
>+++ 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 databases/squirrel-sql/Makefile databases/squirrel-sql/Makefile
>index 9e292de..fe0aaa1 100644
>--- databases/squirrel-sql/Makefile
>+++ 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 deskutils/charmtimetracker/Makefile deskutils/charmtimetracker/Makefile
>index 42f30ff..ca0ebbb 100644
>--- deskutils/charmtimetracker/Makefile
>+++ 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 deskutils/conkyemail/Makefile deskutils/conkyemail/Makefile
>index 21278e8..683e5d2 100644
>--- deskutils/conkyemail/Makefile
>+++ 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 deskutils/conkyforecast/Makefile deskutils/conkyforecast/Makefile
>index 4ac063b..2deb5d8 100644
>--- deskutils/conkyforecast/Makefile
>+++ 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 deskutils/docear/Makefile deskutils/docear/Makefile
>index 2bf0e09..d64eae9 100644
>--- deskutils/docear/Makefile
>+++ 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 deskutils/gnome-shell-extension-backslide/Makefile deskutils/gnome-shell-extension-backslide/Makefile
>index 90c95a7..a76fdce 100644
>--- deskutils/gnome-shell-extension-backslide/Makefile
>+++ 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 deskutils/gnome-shell-extension-coverflow/Makefile deskutils/gnome-shell-extension-coverflow/Makefile
>index 0f18985..d6ee9a5 100644
>--- deskutils/gnome-shell-extension-coverflow/Makefile
>+++ 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 deskutils/gnome-shell-extension-hidetopbar/Makefile deskutils/gnome-shell-extension-hidetopbar/Makefile
>index e3ee244..3076273 100644
>--- deskutils/gnome-shell-extension-hidetopbar/Makefile
>+++ 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 deskutils/gnome-shell-extension-lockkeys/Makefile deskutils/gnome-shell-extension-lockkeys/Makefile
>index 5d305d4..4fa82e4 100644
>--- deskutils/gnome-shell-extension-lockkeys/Makefile
>+++ 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 deskutils/gnome-shell-extension-overlay-icons/Makefile deskutils/gnome-shell-extension-overlay-icons/Makefile
>index b21a04a9..e572d9f 100644
>--- deskutils/gnome-shell-extension-overlay-icons/Makefile
>+++ 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 deskutils/gworkspace/Makefile deskutils/gworkspace/Makefile
>index d17d091..912708e 100644
>--- deskutils/gworkspace/Makefile
>+++ 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 deskutils/myitcrm/Makefile deskutils/myitcrm/Makefile
>index 93d3684..ad12041 100644
>--- deskutils/myitcrm/Makefile
>+++ 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 deskutils/plans/Makefile deskutils/plans/Makefile
>index f3f2d63..2687a9e 100644
>--- deskutils/plans/Makefile
>+++ 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 devel/arduino/Makefile devel/arduino/Makefile
>index 9141883..f84116a 100644
>--- devel/arduino/Makefile
>+++ 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 devel/arm-elf-binutils/Makefile devel/arm-elf-binutils/Makefile
>index 9879e19..fdede1c 100644
>--- devel/arm-elf-binutils/Makefile
>+++ 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 devel/arm-none-eabi-gdb/Makefile devel/arm-none-eabi-gdb/Makefile
>index 0b3ed13..0a54fa5 100644
>--- devel/arm-none-eabi-gdb/Makefile
>+++ 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 devel/atf/Makefile devel/atf/Makefile
>index d1031c6..c53dad3 100644
>--- devel/atf/Makefile
>+++ 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 devel/autoconf/Makefile devel/autoconf/Makefile
>index da2b8dd..391a788 100644
>--- devel/autoconf/Makefile
>+++ 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 devel/avr-gdb/Makefile devel/avr-gdb/Makefile
>index bf78d1a..b292937 100644
>--- devel/avr-gdb/Makefile
>+++ 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 devel/avr-libc/Makefile devel/avr-libc/Makefile
>index 80df5b9..e7f701e 100644
>--- devel/avr-libc/Makefile
>+++ 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 devel/binutils/Makefile devel/binutils/Makefile
>index 4c7dbea..42fb76b 100644
>--- devel/binutils/Makefile
>+++ 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 devel/bison/Makefile devel/bison/Makefile
>index dfb8dea..1ce275b 100644
>--- devel/bison/Makefile
>+++ 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 devel/boost_build/Makefile devel/boost_build/Makefile
>index 3dd58ec..304441c 100644
>--- devel/boost_build/Makefile
>+++ 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 devel/cil/Makefile devel/cil/Makefile
>index f98873e..e20f321 100644
>--- devel/cil/Makefile
>+++ 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 devel/cook/Makefile devel/cook/Makefile
>index 8bff3e4..32c00e9 100644
>--- devel/cook/Makefile
>+++ 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 devel/ddd/Makefile devel/ddd/Makefile
>index 304ba6f..7b9428a 100644
>--- devel/ddd/Makefile
>+++ 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 devel/efl/Makefile devel/efl/Makefile
>index 3083b22..4157d16 100644
>--- devel/efl/Makefile
>+++ 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 devel/fam/Makefile devel/fam/Makefile
>index 801d685..1cd60f7 100644
>--- devel/fam/Makefile
>+++ 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 devel/gcc-arm-embedded/Makefile devel/gcc-arm-embedded/Makefile
>index 5ab8fad..5c94e10 100644
>--- devel/gcc-arm-embedded/Makefile
>+++ 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 devel/gcc-msp430-ti-toolchain/Makefile devel/gcc-msp430-ti-toolchain/Makefile
>index 69dfa13..e7bc7d8 100644
>--- devel/gcc-msp430-ti-toolchain/Makefile
>+++ 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 devel/git/Makefile devel/git/Makefile
>index 330e871..5ee6c4c 100644
>--- devel/git/Makefile
>+++ 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 devel/glademm/Makefile devel/glademm/Makefile
>index 0cd1606..b801cd2 100644
>--- devel/glademm/Makefile
>+++ 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 devel/gps/Makefile devel/gps/Makefile
>index 4f619cc..e87dcbc 100644
>--- devel/gps/Makefile
>+++ 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 devel/gvfs/Makefile devel/gvfs/Makefile
>index d4ba52d..90ad653 100644
>--- devel/gvfs/Makefile
>+++ 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 devel/kBuild/Makefile devel/kBuild/Makefile
>index 93065f0..0dc39df 100644
>--- devel/kBuild/Makefile
>+++ 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 devel/lasi/Makefile devel/lasi/Makefile
>index adfecab..ecfc5b1 100644
>--- devel/lasi/Makefile
>+++ 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 devel/liborcus07/Makefile devel/liborcus07/Makefile
>index 74a7de3..b0e7fc0 100644
>--- devel/liborcus07/Makefile
>+++ 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 devel/libsearpc/Makefile devel/libsearpc/Makefile
>index d56d91e..48c2b63 100644
>--- devel/libsearpc/Makefile
>+++ 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 devel/libtool/Makefile devel/libtool/Makefile
>index 2b2d159..48e58c6 100644
>--- devel/libtool/Makefile
>+++ 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 devel/llvm-cheri/Makefile devel/llvm-cheri/Makefile
>index 7080c01..12e16d4 100644
>--- devel/llvm-cheri/Makefile
>+++ 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 devel/llvm-devel/Makefile devel/llvm-devel/Makefile
>index 4e8a8e2..dd9cdfd 100644
>--- devel/llvm-devel/Makefile
>+++ 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 devel/llvm33/Makefile devel/llvm33/Makefile
>index 7be3363..db46240 100644
>--- devel/llvm33/Makefile
>+++ 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 devel/llvm34/Makefile devel/llvm34/Makefile
>index f164174..b107dc0 100644
>--- devel/llvm34/Makefile
>+++ 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 devel/llvm35/Makefile devel/llvm35/Makefile
>index 0f300ff..2f8f889 100644
>--- devel/llvm35/Makefile
>+++ 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 devel/llvm36/Makefile devel/llvm36/Makefile
>index eefe16f..63ca2d2 100644
>--- devel/llvm36/Makefile
>+++ 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 devel/llvm37/Makefile devel/llvm37/Makefile
>index 17b980b..b666350 100644
>--- devel/llvm37/Makefile
>+++ 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 devel/llvm38/Makefile devel/llvm38/Makefile
>index ce815c3..9281e74 100644
>--- devel/llvm38/Makefile
>+++ 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 devel/llvm39/Makefile devel/llvm39/Makefile
>index 60727d0..f39020a 100644
>--- devel/llvm39/Makefile
>+++ 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 devel/lutok/Makefile devel/lutok/Makefile
>index 6fcbe64..391ae5b 100644
>--- devel/lutok/Makefile
>+++ 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 devel/maven3/Makefile devel/maven3/Makefile
>index 330ddee..78d8043 100644
>--- devel/maven3/Makefile
>+++ 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 devel/maven31/Makefile devel/maven31/Makefile
>index a927dcb..c6765da 100644
>--- devel/maven31/Makefile
>+++ 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 devel/maven33/Makefile devel/maven33/Makefile
>index f874d87..92e45f1 100644
>--- devel/maven33/Makefile
>+++ 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 devel/mingw32-gcc/Makefile devel/mingw32-gcc/Makefile
>index 83fcf7f..a2ebea0 100644
>--- devel/mingw32-gcc/Makefile
>+++ 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 devel/monotone/Makefile devel/monotone/Makefile
>index ce8ca04..f2064d3 100644
>--- devel/monotone/Makefile
>+++ 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 devel/ncurses/Makefile devel/ncurses/Makefile
>index 8bac3ba..0a27e15 100644
>--- devel/ncurses/Makefile
>+++ 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 devel/p5-MooseX-Async/Makefile devel/p5-MooseX-Async/Makefile
>index 39c205f..630c6df 100644
>--- devel/p5-MooseX-Async/Makefile
>+++ 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 devel/p5-Parse-Pidl/Makefile devel/p5-Parse-Pidl/Makefile
>index 4aa9699..8260e05 100644
>--- devel/p5-Parse-Pidl/Makefile
>+++ 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 devel/p5-PerlIO-via-symlink/Makefile devel/p5-PerlIO-via-symlink/Makefile
>index a9451e8..bd838c7 100644
>--- devel/p5-PerlIO-via-symlink/Makefile
>+++ 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 devel/p5-System2/Makefile devel/p5-System2/Makefile
>index 4dbeb6a..8b930f2 100644
>--- devel/p5-System2/Makefile
>+++ 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 devel/p5-VCP-Source-cvsbk/Makefile devel/p5-VCP-Source-cvsbk/Makefile
>index 6269f83..9d49bb2 100644
>--- devel/p5-VCP-Source-cvsbk/Makefile
>+++ 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 devel/p5-VCP-autrijus/Makefile devel/p5-VCP-autrijus/Makefile
>index 5c3242f..0ea2e01 100644
>--- devel/p5-VCP-autrijus/Makefile
>+++ 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 devel/pas2dox/Makefile devel/pas2dox/Makefile
>index d5b5412..8712ae0 100644
>--- devel/pas2dox/Makefile
>+++ 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 devel/pear/Makefile devel/pear/Makefile
>index 8887719..864a69f 100644
>--- devel/pear/Makefile
>+++ 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 devel/php-libawl/Makefile devel/php-libawl/Makefile
>index f024981..ab9f8fb 100644
>--- devel/php-libawl/Makefile
>+++ 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 devel/plan9port/Makefile devel/plan9port/Makefile
>index ee39c48..2a53331 100644
>--- devel/plan9port/Makefile
>+++ 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 devel/ptypes/Makefile devel/ptypes/Makefile
>index 9a69cee..c02de15 100644
>--- devel/ptypes/Makefile
>+++ 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 devel/py-calendar/Makefile devel/py-calendar/Makefile
>index 857bc2e..2e298c7 100644
>--- devel/py-calendar/Makefile
>+++ 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 devel/py-freezegun/Makefile devel/py-freezegun/Makefile
>index b0c5f48..1ab91a6 100644
>--- devel/py-freezegun/Makefile
>+++ 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 devel/py-funcparserlib/Makefile devel/py-funcparserlib/Makefile
>index f947752..2ac09f4 100644
>--- devel/py-funcparserlib/Makefile
>+++ 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 devel/py-mongoengine/Makefile devel/py-mongoengine/Makefile
>index 7817cda..ccd4ab8 100644
>--- devel/py-mongoengine/Makefile
>+++ 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 devel/py-protocols/Makefile devel/py-protocols/Makefile
>index f398610..57b0808 100644
>--- devel/py-protocols/Makefile
>+++ 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 devel/py-pytest-xdist/Makefile devel/py-pytest-xdist/Makefile
>index 97300d6..3cb1761 100644
>--- devel/py-pytest-xdist/Makefile
>+++ 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 devel/py-qt4-core/Makefile devel/py-qt4-core/Makefile
>index dc85de1..da7c53d 100644
>--- devel/py-qt4-core/Makefile
>+++ 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 devel/py-qt5-core/Makefile devel/py-qt5-core/Makefile
>index 14ee561..ce29992 100644
>--- devel/py-qt5-core/Makefile
>+++ 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 devel/py-traits/Makefile devel/py-traits/Makefile
>index 318778d..91a0b09 100644
>--- devel/py-traits/Makefile
>+++ 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 devel/py-twext/Makefile devel/py-twext/Makefile
>index 1d95fdb..feaf0fc 100644
>--- devel/py-twext/Makefile
>+++ 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 devel/py-vcrpy/Makefile devel/py-vcrpy/Makefile
>index bf482af..09d4fc7 100644
>--- devel/py-vcrpy/Makefile
>+++ 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 devel/pydbus-common/Makefile devel/pydbus-common/Makefile
>index 8e4cf5a..4118765 100644
>--- devel/pydbus-common/Makefile
>+++ 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 devel/pygobject3-common/Makefile devel/pygobject3-common/Makefile
>index 431fc74..a2e81ac 100644
>--- devel/pygobject3-common/Makefile
>+++ 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 devel/qmake/Makefile devel/qmake/Makefile
>index 59761e7..bb7fb23 100644
>--- devel/qmake/Makefile
>+++ 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 devel/qmake4/Makefile devel/qmake4/Makefile
>index a7d6dbf..e2685b9 100644
>--- devel/qmake4/Makefile
>+++ 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 devel/qmake5/Makefile devel/qmake5/Makefile
>index 50b9487..2488f75 100644
>--- devel/qmake5/Makefile
>+++ 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 devel/rapidjson/Makefile devel/rapidjson/Makefile
>index 22b5a2a..7f86eff 100644
>--- devel/rapidjson/Makefile
>+++ 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 devel/sfml1/Makefile devel/sfml1/Makefile
>index 5c4233a..e1fb15a 100644
>--- devel/sfml1/Makefile
>+++ 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 devel/shtk/Makefile devel/shtk/Makefile
>index a52b9e6..6832dfd 100644
>--- devel/shtk/Makefile
>+++ 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 devel/sonarqube/Makefile devel/sonarqube/Makefile
>index 9169238..0f9c4f7 100644
>--- devel/sonarqube/Makefile
>+++ 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 devel/srecord/Makefile devel/srecord/Makefile
>index 1e47746..471bf44 100644
>--- devel/srecord/Makefile
>+++ 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 devel/st/Makefile devel/st/Makefile
>index af30c39..b8e58cb 100644
>--- devel/st/Makefile
>+++ 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 devel/storm/Makefile devel/storm/Makefile
>index 9f1431e..aaac694 100644
>--- devel/storm/Makefile
>+++ 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 devel/tcllibc/Makefile devel/tcllibc/Makefile
>index c1f6848..1a4e331 100644
>--- devel/tcllibc/Makefile
>+++ 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 devel/tkinspect/Makefile devel/tkinspect/Makefile
>index 4e551ac..2070d59 100644
>--- devel/tkinspect/Makefile
>+++ 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 devel/tla/Makefile devel/tla/Makefile
>index cfaec39..4938345 100644
>--- devel/tla/Makefile
>+++ 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 devel/tmake/Makefile devel/tmake/Makefile
>index bdb2643..d814275 100644
>--- devel/tmake/Makefile
>+++ 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 devel/valgrind-devel/Makefile devel/valgrind-devel/Makefile
>index 0e117c6..66f4970 100644
>--- devel/valgrind-devel/Makefile
>+++ 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 devel/valgrind/Makefile devel/valgrind/Makefile
>index 74fcc36..3aa0eb6 100644
>--- devel/valgrind/Makefile
>+++ 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 devel/xmake/Makefile devel/xmake/Makefile
>index d822a58..677f6bd 100644
>--- devel/xmake/Makefile
>+++ 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 devel/xsd/Makefile devel/xsd/Makefile
>index 3cdd931..a159b57 100644
>--- devel/xsd/Makefile
>+++ 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 dns/djbdns/Makefile dns/djbdns/Makefile
>index 9a56660..09267d3 100644
>--- dns/djbdns/Makefile
>+++ 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 dns/knot1/Makefile dns/knot1/Makefile
>index e58e104..83d10f4 100644
>--- dns/knot1/Makefile
>+++ 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 dns/knot2/Makefile dns/knot2/Makefile
>index 39a4d2f..d2f16b9 100644
>--- dns/knot2/Makefile
>+++ 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 dns/maradns/Makefile dns/maradns/Makefile
>index 360ecac..f672158 100644
>--- dns/maradns/Makefile
>+++ 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 editors/2bsd-vi/Makefile editors/2bsd-vi/Makefile
>index 49839fc..55f87ee 100644
>--- editors/2bsd-vi/Makefile
>+++ 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 editors/emacs-devel/Makefile editors/emacs-devel/Makefile
>index 728e801..fc551bc 100644
>--- editors/emacs-devel/Makefile
>+++ 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 editors/flim/Makefile editors/flim/Makefile
>index d4b7675..f9c4233 100644
>--- editors/flim/Makefile
>+++ 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 editors/lazarus/Makefile editors/lazarus/Makefile
>index 98caba8..c9df384 100644
>--- editors/lazarus/Makefile
>+++ 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 editors/lazarus/Makefile.common editors/lazarus/Makefile.common
>index 59731ba..df13566 100644
>--- editors/lazarus/Makefile.common
>+++ 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 editors/libreoffice4/Makefile editors/libreoffice4/Makefile
>index 2311262..f4a50af 100644
>--- editors/libreoffice4/Makefile
>+++ 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 editors/linux-sublime/Makefile editors/linux-sublime/Makefile
>index c66fc66..5f7f9572 100644
>--- editors/linux-sublime/Makefile
>+++ 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 editors/mined/Makefile editors/mined/Makefile
>index ac9cd85..b559858 100644
>--- editors/mined/Makefile
>+++ 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 editors/openoffice-4/Makefile editors/openoffice-4/Makefile
>index 81c8abb..3a2514a 100644
>--- editors/openoffice-4/Makefile
>+++ 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 editors/openoffice-devel/Makefile editors/openoffice-devel/Makefile
>index 319a50e..a824286 100644
>--- editors/openoffice-devel/Makefile
>+++ 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 editors/rox-edit/Makefile editors/rox-edit/Makefile
>index 7c70665..9127961 100644
>--- editors/rox-edit/Makefile
>+++ 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 editors/semi/Makefile editors/semi/Makefile
>index 02b67a2..39887ba 100644
>--- editors/semi/Makefile
>+++ 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 emulators/i386-wine-devel/Makefile.inc emulators/i386-wine-devel/Makefile.inc
>index aa1861c..7ed5419 100644
>--- emulators/i386-wine-devel/Makefile.inc
>+++ 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 emulators/i386-wine/Makefile.inc emulators/i386-wine/Makefile.inc
>index 98f60d8..852a4a2 100644
>--- emulators/i386-wine/Makefile.inc
>+++ 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 emulators/ia64sim/Makefile emulators/ia64sim/Makefile
>index 2dc43b7..bb78190 100644
>--- emulators/ia64sim/Makefile
>+++ 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 emulators/mupen64plus-core/Makefile.common emulators/mupen64plus-core/Makefile.common
>index 4ffcb2c..7f419af 100644
>--- emulators/mupen64plus-core/Makefile.common
>+++ 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 emulators/vice/Makefile emulators/vice/Makefile
>index 6872edf..4b53e46 100644
>--- emulators/vice/Makefile
>+++ 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 emulators/virtio-kmod/Makefile emulators/virtio-kmod/Makefile
>index 15c2355..5fadbcb 100644
>--- emulators/virtio-kmod/Makefile
>+++ 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 emulators/visualboyadvance-m/Makefile emulators/visualboyadvance-m/Makefile
>index 0d1b456..2cf9571 100644
>--- emulators/visualboyadvance-m/Makefile
>+++ 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 emulators/x49gp/Makefile emulators/x49gp/Makefile
>index 37d1e22..b094060 100644
>--- emulators/x49gp/Makefile
>+++ 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 finance/aqbanking/Makefile finance/aqbanking/Makefile
>index 28a4770..b11196c 100644
>--- finance/aqbanking/Makefile
>+++ 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 finance/bitcoin-armory/Makefile finance/bitcoin-armory/Makefile
>index 23995df..119af6f 100644
>--- finance/bitcoin-armory/Makefile
>+++ 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 finance/libofx/Makefile finance/libofx/Makefile
>index 87fcaa4..78c7c83 100644
>--- finance/libofx/Makefile
>+++ 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 french/aster/Makefile french/aster/Makefile
>index b2ea62b..2ad59f4 100644
>--- french/aster/Makefile
>+++ 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 ftp/bftpd/Makefile ftp/bftpd/Makefile
>index dc0ad6c..dceb693 100644
>--- ftp/bftpd/Makefile
>+++ 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 games/7kaa/Makefile games/7kaa/Makefile
>index cb3ecfa..66a881a 100644
>--- games/7kaa/Makefile
>+++ 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 games/atris/Makefile games/atris/Makefile
>index 6694fbd..c5a8e14 100644
>--- games/atris/Makefile
>+++ 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 games/barbie_seahorse_adventures/Makefile games/barbie_seahorse_adventures/Makefile
>index bfbad91..1614ac2 100644
>--- games/barbie_seahorse_adventures/Makefile
>+++ 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 games/battalion/Makefile games/battalion/Makefile
>index 15306a2..04d5dc8 100644
>--- games/battalion/Makefile
>+++ 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 games/biniax2/Makefile games/biniax2/Makefile
>index 680fd0d..a505a0d 100644
>--- games/biniax2/Makefile
>+++ 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 games/block/Makefile games/block/Makefile
>index e876045..10d3cf4 100644
>--- games/block/Makefile
>+++ 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 games/bomberclone/Makefile games/bomberclone/Makefile
>index 7e25a2c..c80a5bc 100644
>--- games/bomberclone/Makefile
>+++ 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 games/bubbros/Makefile games/bubbros/Makefile
>index 60c8406..fa391c9 100644
>--- games/bubbros/Makefile
>+++ 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 games/bugsquish/Makefile games/bugsquish/Makefile
>index 30aa6c5..365ce96 100644
>--- games/bugsquish/Makefile
>+++ 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 games/enigma/Makefile games/enigma/Makefile
>index 1b96c14..b1aebd2 100644
>--- games/enigma/Makefile
>+++ 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 games/evq3/Makefile games/evq3/Makefile
>index cc107ebe..d607f51 100644
>--- games/evq3/Makefile
>+++ 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 games/flightgear-aircraft/Makefile games/flightgear-aircraft/Makefile
>index 8a88333..cd12150 100644
>--- games/flightgear-aircraft/Makefile
>+++ 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 games/flightgear-data/Makefile games/flightgear-data/Makefile
>index 0ec7b13..5ed4ffe 100644
>--- games/flightgear-data/Makefile
>+++ 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 games/flightgear-mb339-pan/Makefile games/flightgear-mb339-pan/Makefile
>index de3741d..e698097 100644
>--- games/flightgear-mb339-pan/Makefile
>+++ 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 games/freera/Makefile games/freera/Makefile
>index 2cbc897..fd4a88f 100644
>--- games/freera/Makefile
>+++ 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 games/gemdropx/Makefile games/gemdropx/Makefile
>index a11146a..2b89965 100644
>--- games/gemdropx/Makefile
>+++ 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 games/gnugo/Makefile games/gnugo/Makefile
>index 53ab9b3..e32bc94 100644
>--- games/gnugo/Makefile
>+++ 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 games/gondola/Makefile games/gondola/Makefile
>index 03ce7d2..f4295a6 100644
>--- games/gondola/Makefile
>+++ 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 games/gretools/Makefile games/gretools/Makefile
>index 8592be3..debaeae 100644
>--- games/gretools/Makefile
>+++ 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 games/grubik/Makefile games/grubik/Makefile
>index 93af7ef..7304e97 100644
>--- games/grubik/Makefile
>+++ 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 games/heroes/Makefile games/heroes/Makefile
>index 1e2fc61..2396e1b 100644
>--- games/heroes/Makefile
>+++ 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 games/jigzo/Makefile games/jigzo/Makefile
>index 09abb2b..6313463 100644
>--- games/jigzo/Makefile
>+++ 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 games/jools/Makefile games/jools/Makefile
>index 239be8e..2ec7e0b 100644
>--- games/jools/Makefile
>+++ 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 games/kobodeluxe/Makefile games/kobodeluxe/Makefile
>index dce333f..33358fd 100644
>--- games/kobodeluxe/Makefile
>+++ 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 games/ldmud/Makefile games/ldmud/Makefile
>index 92d78e0..e802ffa 100644
>--- games/ldmud/Makefile
>+++ 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 games/linux-unrealgold/Makefile games/linux-unrealgold/Makefile
>index c5ee895..6e5c17d 100644
>--- games/linux-unrealgold/Makefile
>+++ 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 games/linux-ut2003-demo/Makefile games/linux-ut2003-demo/Makefile
>index 94b385d..195ec22 100644
>--- games/linux-ut2003-demo/Makefile
>+++ 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 games/marsnomercy/Makefile games/marsnomercy/Makefile
>index a94e86d..f1af4ba 100644
>--- games/marsnomercy/Makefile
>+++ 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 games/njam/Makefile games/njam/Makefile
>index f62bbcd..afc4495 100644
>--- games/njam/Makefile
>+++ 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 games/numptyphysics-npcomplete/Makefile games/numptyphysics-npcomplete/Makefile
>index 2998715..ed2898f 100644
>--- games/numptyphysics-npcomplete/Makefile
>+++ 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 games/optimax/Makefile games/optimax/Makefile
>index d4dea42..06f2458 100644
>--- games/optimax/Makefile
>+++ 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 games/pysolfc/Makefile games/pysolfc/Makefile
>index fbdf1be..cab806b 100644
>--- games/pysolfc/Makefile
>+++ 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 games/pythonchess/Makefile games/pythonchess/Makefile
>index 855b5e1..4e7986b 100644
>--- games/pythonchess/Makefile
>+++ 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 games/q2pro/Makefile games/q2pro/Makefile
>index ec145d6..85a250a 100644
>--- games/q2pro/Makefile
>+++ 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 games/quadra/Makefile games/quadra/Makefile
>index cd5af5a..e09952f 100644
>--- games/quadra/Makefile
>+++ 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 games/quake-dpmod/Makefile games/quake-dpmod/Makefile
>index a8ad8a8..2bae302 100644
>--- games/quake-dpmod/Makefile
>+++ 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 games/quake3-data/Makefile games/quake3-data/Makefile
>index bb3bb05..80ecbfe 100644
>--- games/quake3-data/Makefile
>+++ 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 games/rnd_jue/Makefile games/rnd_jue/Makefile
>index 0ed7ede..42f0419 100644
>--- games/rnd_jue/Makefile
>+++ 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 games/rockdodger/Makefile games/rockdodger/Makefile
>index e6e36de..02cb6a9 100644
>--- games/rockdodger/Makefile
>+++ 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 games/rocksndiamonds-data/Makefile games/rocksndiamonds-data/Makefile
>index 9adb579..5035ed8 100644
>--- games/rocksndiamonds-data/Makefile
>+++ 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 games/rocksndiamonds/Makefile games/rocksndiamonds/Makefile
>index 6f01154..3df86ff 100644
>--- games/rocksndiamonds/Makefile
>+++ 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 games/scorched3d/Makefile games/scorched3d/Makefile
>index 3a7fa52..f8f4571 100644
>--- games/scorched3d/Makefile
>+++ 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 games/sdb/Makefile games/sdb/Makefile
>index 3b97a33..4752037 100644
>--- games/sdb/Makefile
>+++ 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 games/sdl_jewels/Makefile games/sdl_jewels/Makefile
>index af07b0b..17b41d3 100644
>--- games/sdl_jewels/Makefile
>+++ 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 games/stransball2/Makefile games/stransball2/Makefile
>index 72f5f98..b9898c9 100644
>--- games/stransball2/Makefile
>+++ 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 games/trigger-data/Makefile games/trigger-data/Makefile
>index 077a29e..be000fe 100644
>--- games/trigger-data/Makefile
>+++ 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 games/tuxpaint/Makefile games/tuxpaint/Makefile
>index 8bead80..b402e45 100644
>--- games/tuxpaint/Makefile
>+++ 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 games/ufoai-data/Makefile games/ufoai-data/Makefile
>index 96403a3..d3774e3 100644
>--- games/ufoai-data/Makefile
>+++ 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 games/ultimatestunts/Makefile games/ultimatestunts/Makefile
>index 731e37e..27e9981 100644
>--- games/ultimatestunts/Makefile
>+++ 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 games/vectoroids/Makefile games/vectoroids/Makefile
>index c7cd761..a9227bb 100644
>--- games/vectoroids/Makefile
>+++ 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 games/worldofpadman/Makefile games/worldofpadman/Makefile
>index c9acc80..1e9a434 100644
>--- games/worldofpadman/Makefile
>+++ 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 games/xmoto/Makefile games/xmoto/Makefile
>index 7efa784..6488ee8 100644
>--- games/xmoto/Makefile
>+++ 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 games/znibbles/Makefile games/znibbles/Makefile
>index 9915290..b9baf20 100644
>--- games/znibbles/Makefile
>+++ 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 german/BBBike/Makefile german/BBBike/Makefile
>index f67a3ab..28cd568 100644
>--- german/BBBike/Makefile
>+++ 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 german/mediathek/Makefile german/mediathek/Makefile
>index b59f1d6..0a1dc48 100644
>--- german/mediathek/Makefile
>+++ 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 graphics/aalib/Makefile graphics/aalib/Makefile
>index 7d50143..afbc0cf 100644
>--- graphics/aalib/Makefile
>+++ 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 graphics/acidwarp/Makefile graphics/acidwarp/Makefile
>index 3ea7f76..b79db77 100644
>--- graphics/acidwarp/Makefile
>+++ 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 graphics/blender-doc/Makefile graphics/blender-doc/Makefile
>index 6bb747f..b4d15fe 100644
>--- graphics/blender-doc/Makefile
>+++ 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 graphics/compupic/Makefile graphics/compupic/Makefile
>index 24c635e..a55ed19 100644
>--- graphics/compupic/Makefile
>+++ 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 graphics/dri/Makefile graphics/dri/Makefile
>index 26617b3..1afb11b 100644
>--- graphics/dri/Makefile
>+++ 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 graphics/exact-image/Makefile graphics/exact-image/Makefile
>index 66d337e..b2bda40 100644
>--- graphics/exact-image/Makefile
>+++ 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 graphics/gdal/Makefile graphics/gdal/Makefile
>index 22ad583..452d716 100644
>--- graphics/gdal/Makefile
>+++ 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 graphics/ilmbase/Makefile graphics/ilmbase/Makefile
>index f0be63c..fa923f2 100644
>--- graphics/ilmbase/Makefile
>+++ 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 graphics/libboard/Makefile graphics/libboard/Makefile
>index 6a2c5c8..5f7cef8 100644
>--- graphics/libboard/Makefile
>+++ 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 graphics/libglapi/Makefile graphics/libglapi/Makefile
>index 57fc54a..b3f98ce 100644
>--- graphics/libglapi/Makefile
>+++ 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 graphics/netpbm/Makefile graphics/netpbm/Makefile
>index 9c2da2d..0cec954 100644
>--- graphics/netpbm/Makefile
>+++ 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 graphics/opendx/Makefile graphics/opendx/Makefile
>index 898e2d8..568ffc5 100644
>--- graphics/opendx/Makefile
>+++ 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 graphics/p5-Image-IPTCInfo/Makefile graphics/p5-Image-IPTCInfo/Makefile
>index 59b96b4..618d2e9 100644
>--- graphics/p5-Image-IPTCInfo/Makefile
>+++ 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 graphics/p5-SVG-Metadata/Makefile graphics/p5-SVG-Metadata/Makefile
>index 9ab5f9f..6988116 100644
>--- graphics/p5-SVG-Metadata/Makefile
>+++ 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 graphics/processing/Makefile graphics/processing/Makefile
>index 15aa06a..0e7473f 100644
>--- graphics/processing/Makefile
>+++ 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 graphics/py-graphy/Makefile graphics/py-graphy/Makefile
>index ad08dd1..c2c0f4d 100644
>--- graphics/py-graphy/Makefile
>+++ 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 graphics/qslim/Makefile graphics/qslim/Makefile
>index efb78c7..fd78959 100644
>--- graphics/qslim/Makefile
>+++ 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 graphics/raster3d/Makefile graphics/raster3d/Makefile
>index 9127731..c0b2229 100644
>--- graphics/raster3d/Makefile
>+++ 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 graphics/structuresynth/Makefile graphics/structuresynth/Makefile
>index b23b4d0..9f029cf 100644
>--- graphics/structuresynth/Makefile
>+++ 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 graphics/xfig/Makefile graphics/xfig/Makefile
>index 3ea5932..62c35bb 100644
>--- graphics/xfig/Makefile
>+++ 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 graphics/xpaint/Makefile graphics/xpaint/Makefile
>index 7f0e186..42180c8 100644
>--- graphics/xpaint/Makefile
>+++ 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 graphics/zathura/Makefile graphics/zathura/Makefile
>index 6396832..3fde4bc 100644
>--- graphics/zathura/Makefile
>+++ 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 irc/atheme-services/Makefile irc/atheme-services/Makefile
>index 9b69708..3f1072d 100644
>--- irc/atheme-services/Makefile
>+++ 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 irc/eggdrop-devel/Makefile irc/eggdrop-devel/Makefile
>index 6ffe432..cba37c6 100644
>--- irc/eggdrop-devel/Makefile
>+++ 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 irc/epic4/Makefile irc/epic4/Makefile
>index e284382..eea10ec 100644
>--- irc/epic4/Makefile
>+++ 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 irc/gseen.mod/Makefile irc/gseen.mod/Makefile
>index 317c9e7..963650c 100644
>--- irc/gseen.mod/Makefile
>+++ 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 irc/irssi-dcc_send_limiter/Makefile irc/irssi-dcc_send_limiter/Makefile
>index 9454bab..ce9846c 100644
>--- irc/irssi-dcc_send_limiter/Makefile
>+++ 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 irc/keitairc2/Makefile irc/keitairc2/Makefile
>index 62fca32..3f50cc1 100644
>--- irc/keitairc2/Makefile
>+++ 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 irc/py-supybot-plugins/Makefile irc/py-supybot-plugins/Makefile
>index 5cc792d..148f5f7 100644
>--- irc/py-supybot-plugins/Makefile
>+++ 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 irc/thales/Makefile irc/thales/Makefile
>index a3b0521..05895ab 100644
>--- irc/thales/Makefile
>+++ 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 irc/xchat-fish/Makefile irc/xchat-fish/Makefile
>index 9786951..3be609b 100644
>--- irc/xchat-fish/Makefile
>+++ 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 japanese/VTPSfont/Makefile japanese/VTPSfont/Makefile
>index 26db52e..8a7600f 100644
>--- japanese/VTPSfont/Makefile
>+++ 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 japanese/celrw/Makefile japanese/celrw/Makefile
>index 640eb27..feeb84a 100644
>--- japanese/celrw/Makefile
>+++ 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 japanese/eb/Makefile japanese/eb/Makefile
>index debbb3f..74bdd3d 100644
>--- japanese/eb/Makefile
>+++ 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 japanese/edict-utf-8/Makefile japanese/edict-utf-8/Makefile
>index c9bf769..e6595a1 100644
>--- japanese/edict-utf-8/Makefile
>+++ 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 japanese/edict/Makefile japanese/edict/Makefile
>index 9a4010d..5946950 100644
>--- japanese/edict/Makefile
>+++ 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 japanese/groff/Makefile japanese/groff/Makefile
>index c559d32..20ce3e6 100644
>--- japanese/groff/Makefile
>+++ 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 japanese/lookup/Makefile japanese/lookup/Makefile
>index cc88d9f..75e391b 100644
>--- japanese/lookup/Makefile
>+++ 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 japanese/mailman/Makefile japanese/mailman/Makefile
>index b81ce75..912e3d3 100644
>--- japanese/mailman/Makefile
>+++ 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 japanese/man-doc/Makefile japanese/man-doc/Makefile
>index d8144d2..147d1a3 100644
>--- japanese/man-doc/Makefile
>+++ 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 japanese/p5-DateTime-Calendar-Japanese-Era/Makefile japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
>index e44de2c..d9d0ccb 100644
>--- japanese/p5-DateTime-Calendar-Japanese-Era/Makefile
>+++ 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 java/eclipse-findbugs/Makefile java/eclipse-findbugs/Makefile
>index d5d030a..740dd0d 100644
>--- java/eclipse-findbugs/Makefile
>+++ 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 java/eclipse-shelled/Makefile java/eclipse-shelled/Makefile
>index 615c935..3eded7b 100644
>--- java/eclipse-shelled/Makefile
>+++ 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 java/eclipse/Makefile java/eclipse/Makefile
>index e4af9ad..62f7e08 100644
>--- java/eclipse/Makefile
>+++ 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 java/javahelp/Makefile java/javahelp/Makefile
>index 242c14a..a49be17 100644
>--- java/javahelp/Makefile
>+++ 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 java/jdbcpool/Makefile java/jdbcpool/Makefile
>index c0dfab2..38e0f521 100644
>--- java/jdbcpool/Makefile
>+++ 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 java/jgraph/Makefile java/jgraph/Makefile
>index 39c68c1..cd1606b 100644
>--- java/jgraph/Makefile
>+++ 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 java/jlex/Makefile java/jlex/Makefile
>index 7022431..cbb1834 100644
>--- java/jlex/Makefile
>+++ 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 java/openjdk6/Makefile java/openjdk6/Makefile
>index 44c0933..3478a5b 100644
>--- java/openjdk6/Makefile
>+++ 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 java/openjdk7/Makefile java/openjdk7/Makefile
>index 2bed337..7343d92 100644
>--- java/openjdk7/Makefile
>+++ 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 java/openjdk8/Makefile java/openjdk8/Makefile
>index 5a145a3..bfb0a32 100644
>--- java/openjdk8/Makefile
>+++ 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 java/visualvm/Makefile java/visualvm/Makefile
>index 3dc56f7..67f87ef 100644
>--- java/visualvm/Makefile
>+++ 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 java/wildfly100/Makefile java/wildfly100/Makefile
>index 478e4a2..2020c7e 100644
>--- java/wildfly100/Makefile
>+++ 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 java/wildfly90/Makefile java/wildfly90/Makefile
>index 3e2e73f..8937181 100644
>--- java/wildfly90/Makefile
>+++ 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 korean/kaistfonts/Makefile korean/kaistfonts/Makefile
>index 3574770..5ffa271 100644
>--- korean/kaistfonts/Makefile
>+++ 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 korean/ko.TeX/Makefile korean/ko.TeX/Makefile
>index 6e9554e..0ad8ac4 100644
>--- korean/ko.TeX/Makefile
>+++ 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 korean/man-doc/Makefile korean/man-doc/Makefile
>index e4e23f4..ea6dc5c 100644
>--- korean/man-doc/Makefile
>+++ 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 lang/asis/Makefile lang/asis/Makefile
>index 54220ad..abd44ae 100644
>--- lang/asis/Makefile
>+++ 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 lang/ats/bsd.ats.mk lang/ats/bsd.ats.mk
>index 78bb435..9a46bc3 100644
>--- lang/ats/bsd.ats.mk
>+++ 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 lang/beignet/Makefile lang/beignet/Makefile
>index 3c2391e..0ffc834 100644
>--- lang/beignet/Makefile
>+++ 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 lang/ccl/Makefile lang/ccl/Makefile
>index df23dd7..0db44f2 100644
>--- lang/ccl/Makefile
>+++ 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 lang/ceylon/Makefile lang/ceylon/Makefile
>index 5f3d131..cb52155 100644
>--- lang/ceylon/Makefile
>+++ 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 lang/clang33/Makefile lang/clang33/Makefile
>index 28e0ba0..f379e73 100644
>--- lang/clang33/Makefile
>+++ 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 lang/clang34/Makefile lang/clang34/Makefile
>index b2057e8..69070a3 100644
>--- lang/clang34/Makefile
>+++ 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 lang/clang35/Makefile lang/clang35/Makefile
>index c1ad8e3..e2c5cf3 100644
>--- lang/clang35/Makefile
>+++ 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 lang/clang36/Makefile lang/clang36/Makefile
>index bbebaca..48760be 100644
>--- lang/clang36/Makefile
>+++ 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 lang/cocor/Makefile lang/cocor/Makefile
>index 806a18c..c3942b8 100644
>--- lang/cocor/Makefile
>+++ 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 lang/erlang-runtime15/Makefile lang/erlang-runtime15/Makefile
>index 9e9a330..03ea9d6 100644
>--- lang/erlang-runtime15/Makefile
>+++ 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 lang/erlang-runtime16/Makefile lang/erlang-runtime16/Makefile
>index 6540701..7a7ae95 100644
>--- lang/erlang-runtime16/Makefile
>+++ 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 lang/erlang-runtime17/Makefile lang/erlang-runtime17/Makefile
>index 54affd8..300279e 100644
>--- lang/erlang-runtime17/Makefile
>+++ 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 lang/erlang-runtime18/Makefile lang/erlang-runtime18/Makefile
>index f9c067a..8faffa5 100644
>--- lang/erlang-runtime18/Makefile
>+++ 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 lang/erlang-runtime19/Makefile lang/erlang-runtime19/Makefile
>index 7be3e70..4825ed4 100644
>--- lang/erlang-runtime19/Makefile
>+++ 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 lang/erlang/Makefile lang/erlang/Makefile
>index 80b302f..f2e8d3e 100644
>--- lang/erlang/Makefile
>+++ 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 lang/fpc/Makefile.units lang/fpc/Makefile.units
>index 4ac795b..cc6b57a 100644
>--- lang/fpc/Makefile.units
>+++ 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 lang/gawk/Makefile lang/gawk/Makefile
>index 43dba89..e7e055a0 100644
>--- lang/gawk/Makefile
>+++ 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 lang/gcc/Makefile lang/gcc/Makefile
>index 551be77..afd60ff 100644
>--- lang/gcc/Makefile
>+++ 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 lang/gcc46/Makefile lang/gcc46/Makefile
>index 5171b9a..b474cb5 100644
>--- lang/gcc46/Makefile
>+++ 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 lang/gcc47/Makefile lang/gcc47/Makefile
>index 063b89f..02dcf26 100644
>--- lang/gcc47/Makefile
>+++ 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 lang/gcc48/Makefile lang/gcc48/Makefile
>index bc23ed3..6b2baf7 100644
>--- lang/gcc48/Makefile
>+++ 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 lang/gcc49/Makefile lang/gcc49/Makefile
>index 5bfab9b..6071e48 100644
>--- lang/gcc49/Makefile
>+++ 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 lang/gcc5-aux/Makefile lang/gcc5-aux/Makefile
>index e26b902..65aa4ae 100644
>--- lang/gcc5-aux/Makefile
>+++ 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 lang/gcc5-devel/Makefile lang/gcc5-devel/Makefile
>index 3b1a845..b07bdf7 100644
>--- lang/gcc5-devel/Makefile
>+++ 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 lang/gcc5/Makefile lang/gcc5/Makefile
>index 2542712..85b638d 100644
>--- lang/gcc5/Makefile
>+++ 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 lang/gcc6-aux/Makefile lang/gcc6-aux/Makefile
>index 69175b6..0e5063f 100644
>--- lang/gcc6-aux/Makefile
>+++ 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 lang/gcc6-devel/Makefile lang/gcc6-devel/Makefile
>index c6bb2a9..223078a 100644
>--- lang/gcc6-devel/Makefile
>+++ 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 lang/gcc6/Makefile lang/gcc6/Makefile
>index 4aec349..cf6ed2b 100644
>--- lang/gcc6/Makefile
>+++ 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 lang/gcc7-devel/Makefile lang/gcc7-devel/Makefile
>index 697fd81..cca9e89 100644
>--- lang/gcc7-devel/Makefile
>+++ 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 lang/gforth/Makefile lang/gforth/Makefile
>index c557f98..b5f743f 100644
>--- lang/gforth/Makefile
>+++ 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 lang/ghc/Makefile lang/ghc/Makefile
>index 95d1cfb..1122fe0 100644
>--- lang/ghc/Makefile
>+++ 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 lang/gjs/Makefile lang/gjs/Makefile
>index 6fa5940..f1f5992 100644
>--- lang/gjs/Makefile
>+++ 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 lang/gscheme/Makefile lang/gscheme/Makefile
>index a95ec86..39e9d8d 100644
>--- lang/gscheme/Makefile
>+++ 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 lang/icc/Makefile lang/icc/Makefile
>index a157c30..7da2a6f 100644
>--- lang/icc/Makefile
>+++ 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 lang/jakarta-commons-jelly/Makefile lang/jakarta-commons-jelly/Makefile
>index 1e344bb..34a4407 100644
>--- lang/jakarta-commons-jelly/Makefile
>+++ 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 lang/jruby/Makefile lang/jruby/Makefile
>index d525805..91c78ad 100644
>--- lang/jruby/Makefile
>+++ 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 lang/modula3/Makefile lang/modula3/Makefile
>index bfc8bca..8741d61 100644
>--- lang/modula3/Makefile
>+++ 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 lang/ocaml/Makefile lang/ocaml/Makefile
>index 39010d9..3b68c5e 100644
>--- lang/ocaml/Makefile
>+++ 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 lang/p2c/Makefile lang/p2c/Makefile
>index 2315657..a86b68d0 100644
>--- lang/p2c/Makefile
>+++ 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 lang/pbasic/Makefile lang/pbasic/Makefile
>index a4fffc0..48ea0f3 100644
>--- lang/pbasic/Makefile
>+++ 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 lang/pure/Makefile lang/pure/Makefile
>index 71a2e5e..1c921a3 100644
>--- lang/pure/Makefile
>+++ 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 lang/ruby21/Makefile lang/ruby21/Makefile
>index b63c8bd..578d1c4 100644
>--- lang/ruby21/Makefile
>+++ 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 lang/ruby22/Makefile lang/ruby22/Makefile
>index e6a3bc1..aaf78c8 100644
>--- lang/ruby22/Makefile
>+++ 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 lang/ruby23/Makefile lang/ruby23/Makefile
>index 2daf681..12cfb12 100644
>--- lang/ruby23/Makefile
>+++ 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 lang/sbcl/Makefile lang/sbcl/Makefile
>index bc3dadf..69bd3a7 100644
>--- lang/sbcl/Makefile
>+++ 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 lang/smlnj/Makefile lang/smlnj/Makefile
>index 4c9c6b6..afd2d9e 100644
>--- lang/smlnj/Makefile
>+++ 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 lang/yorick/Makefile lang/yorick/Makefile
>index e668d84..5cb91e9 100644
>--- lang/yorick/Makefile
>+++ 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 mail/batv-milter/Makefile mail/batv-milter/Makefile
>index c3e9d30..c29fa4b 100644
>--- mail/batv-milter/Makefile
>+++ 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 mail/cone/Makefile mail/cone/Makefile
>index 1ad414a..5d27648 100644
>--- mail/cone/Makefile
>+++ 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 mail/courier/Makefile mail/courier/Makefile
>index 217e80c..abdb163 100644
>--- mail/courier/Makefile
>+++ 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 mail/cyrus-imapd23/Makefile mail/cyrus-imapd23/Makefile
>index ab2f32e..424fa49 100644
>--- mail/cyrus-imapd23/Makefile
>+++ 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 mail/cyrus-imapd24/Makefile mail/cyrus-imapd24/Makefile
>index 0677c05..2940bc0 100644
>--- mail/cyrus-imapd24/Makefile
>+++ 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 mail/cyrus-imapd25/Makefile mail/cyrus-imapd25/Makefile
>index 2561894..68f84df 100644
>--- mail/cyrus-imapd25/Makefile
>+++ 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 mail/dbmail22/Makefile mail/dbmail22/Makefile
>index e214b0e..893af16 100644
>--- mail/dbmail22/Makefile
>+++ 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 mail/dk-milter/Makefile mail/dk-milter/Makefile
>index 2977ef3..e5e1b9f 100644
>--- mail/dk-milter/Makefile
>+++ 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 mail/ecartis/Makefile mail/ecartis/Makefile
>index d41e257..fe68914 100644
>--- mail/ecartis/Makefile
>+++ 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 mail/exipick/Makefile mail/exipick/Makefile
>index e045ed0..3d9746e 100644
>--- mail/exipick/Makefile
>+++ 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 mail/filtermail/Makefile mail/filtermail/Makefile
>index 5595797..85d25d5 100644
>--- mail/filtermail/Makefile
>+++ 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 mail/james/Makefile mail/james/Makefile
>index 90e9024..c90becf 100644
>--- mail/james/Makefile
>+++ 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 mail/libspf/Makefile mail/libspf/Makefile
>index 928e667..6b495fc 100644
>--- mail/libspf/Makefile
>+++ 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 mail/mailman/Makefile mail/mailman/Makefile
>index d250b3c..0e941be 100644
>--- mail/mailman/Makefile
>+++ 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 mail/mailscanner/Makefile mail/mailscanner/Makefile
>index d3d551e..47808c9 100644
>--- mail/mailscanner/Makefile
>+++ 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 mail/mew/Makefile mail/mew/Makefile
>index b8004ba..c28d99b 100644
>--- mail/mew/Makefile
>+++ 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 mail/mutt/Makefile mail/mutt/Makefile
>index ebf08a4..c2e8d45 100644
>--- mail/mutt/Makefile
>+++ 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 mail/neomutt/Makefile mail/neomutt/Makefile
>index 4d40b0f..438dc31 100644
>--- mail/neomutt/Makefile
>+++ 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 mail/openemm2013/Makefile mail/openemm2013/Makefile
>index eb9f061..6f2e603 100644
>--- mail/openemm2013/Makefile
>+++ 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 mail/openemm2015/Makefile mail/openemm2015/Makefile
>index d70b537..c3e9330 100644
>--- mail/openemm2015/Makefile
>+++ 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 mail/p5-Mail-ClamAV/Makefile mail/p5-Mail-ClamAV/Makefile
>index 33bf075..02d0155 100644
>--- mail/p5-Mail-ClamAV/Makefile
>+++ 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 mail/qmail-conf/Makefile mail/qmail-conf/Makefile
>index 970f94f..8f42a32 100644
>--- mail/qmail-conf/Makefile
>+++ 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 mail/qmail-contrib/Makefile mail/qmail-contrib/Makefile
>index 8f850ce..d0978ae 100644
>--- mail/qmail-contrib/Makefile
>+++ 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 mail/qmail/Makefile mail/qmail/Makefile
>index 51a5571..334c259 100644
>--- mail/qmail/Makefile
>+++ 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 mail/qmailanalog/Makefile mail/qmailanalog/Makefile
>index 4529ecb..31e40f9 100644
>--- mail/qmailanalog/Makefile
>+++ 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 mail/qpopper/Makefile mail/qpopper/Makefile
>index 6843e3f..45ae723 100644
>--- mail/qpopper/Makefile
>+++ 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 mail/qtools/Makefile mail/qtools/Makefile
>index f94c6ec..a8ecb3d 100644
>--- mail/qtools/Makefile
>+++ 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 mail/renattach/Makefile mail/renattach/Makefile
>index bc8d297..2398260 100644
>--- mail/renattach/Makefile
>+++ 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 mail/spambnc/Makefile mail/spambnc/Makefile
>index 8ee42e3..47b8980 100644
>--- mail/spambnc/Makefile
>+++ 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 mail/squirrelmail-avelsieve-plugin/Makefile mail/squirrelmail-avelsieve-plugin/Makefile
>index 237fb4e..73f5bc4 100644
>--- mail/squirrelmail-avelsieve-plugin/Makefile
>+++ 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 mail/squirrelmail-vlogin-plugin/Makefile mail/squirrelmail-vlogin-plugin/Makefile
>index 2966e48..ab2d3a9 100644
>--- mail/squirrelmail-vlogin-plugin/Makefile
>+++ 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 mail/squirrelmail/Makefile mail/squirrelmail/Makefile
>index 70a2eef..c81efc0 100644
>--- mail/squirrelmail/Makefile
>+++ 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 mail/thunderbird-i18n/Makefile mail/thunderbird-i18n/Makefile
>index 85b3e79..0abf1b9 100644
>--- mail/thunderbird-i18n/Makefile
>+++ 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 mail/thunderbird/Makefile mail/thunderbird/Makefile
>index 690714f..8fb0534 100644
>--- mail/thunderbird/Makefile
>+++ 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 mail/xpbiff/Makefile mail/xpbiff/Makefile
>index 6c7a5d4..9dfd76a 100644
>--- mail/xpbiff/Makefile
>+++ 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 math/blacs/Makefile math/blacs/Makefile
>index 05c81b2..1a1b2f7 100644
>--- math/blacs/Makefile
>+++ 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 math/eukleides/Makefile math/eukleides/Makefile
>index abb7a69..7541e31 100644
>--- math/eukleides/Makefile
>+++ 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 math/gmp/Makefile math/gmp/Makefile
>index 49d2954..8016e54 100644
>--- math/gmp/Makefile
>+++ 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 math/gsl/Makefile math/gsl/Makefile
>index 95eaffb..1a46aa8 100644
>--- math/gsl/Makefile
>+++ 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 math/ipopt/Makefile math/ipopt/Makefile
>index 9e41a98..5b3af3b 100644
>--- math/ipopt/Makefile
>+++ 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 math/lapack/Makefile math/lapack/Makefile
>index e6a77cf..9573506 100644
>--- math/lapack/Makefile
>+++ 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 math/mingw32-libgmp/Makefile math/mingw32-libgmp/Makefile
>index cdec25a..d1af106 100644
>--- math/mingw32-libgmp/Makefile
>+++ 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 math/miracl/Makefile math/miracl/Makefile
>index 6c1a24a..026ff2e 100644
>--- math/miracl/Makefile
>+++ 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 math/octave-forge-actuarial/Makefile math/octave-forge-actuarial/Makefile
>index 3868c70..5771884 100644
>--- math/octave-forge-actuarial/Makefile
>+++ 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 math/octave-forge-bim/Makefile math/octave-forge-bim/Makefile
>index 22e9619..a9f9a0c 100644
>--- math/octave-forge-bim/Makefile
>+++ 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 math/octave-forge-cgi/Makefile math/octave-forge-cgi/Makefile
>index dc82f82a..140fe55 100644
>--- math/octave-forge-cgi/Makefile
>+++ 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 math/octave-forge-communications/Makefile math/octave-forge-communications/Makefile
>index aae0006..9d55ce8 100644
>--- math/octave-forge-communications/Makefile
>+++ 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 math/octave-forge-control/Makefile math/octave-forge-control/Makefile
>index d8c7833..4376429 100644
>--- math/octave-forge-control/Makefile
>+++ 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 math/octave-forge-data-smoothing/Makefile math/octave-forge-data-smoothing/Makefile
>index 5fbfed9..d4e9381 100644
>--- math/octave-forge-data-smoothing/Makefile
>+++ 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 math/octave-forge-database/Makefile math/octave-forge-database/Makefile
>index 4236fde..ffac69b 100644
>--- math/octave-forge-database/Makefile
>+++ 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 math/octave-forge-dataframe/Makefile math/octave-forge-dataframe/Makefile
>index d422209..f37127b 100644
>--- math/octave-forge-dataframe/Makefile
>+++ 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 math/octave-forge-dicom/Makefile math/octave-forge-dicom/Makefile
>index 2aa4c3e..5378331 100644
>--- math/octave-forge-dicom/Makefile
>+++ 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 math/octave-forge-divand/Makefile math/octave-forge-divand/Makefile
>index 66a5a5e..8049113 100644
>--- math/octave-forge-divand/Makefile
>+++ 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 math/octave-forge-doctest/Makefile math/octave-forge-doctest/Makefile
>index 49a8e10..bc9b449 100644
>--- math/octave-forge-doctest/Makefile
>+++ 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 math/octave-forge-econometrics/Makefile math/octave-forge-econometrics/Makefile
>index 951c959..0367406 100644
>--- math/octave-forge-econometrics/Makefile
>+++ 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 math/octave-forge-fenv/Makefile math/octave-forge-fenv/Makefile
>index 1110490..fe7a61b 100644
>--- math/octave-forge-fenv/Makefile
>+++ 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 math/octave-forge-financial/Makefile math/octave-forge-financial/Makefile
>index 0c97e38..6186b12 100644
>--- math/octave-forge-financial/Makefile
>+++ 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 math/octave-forge-fits/Makefile math/octave-forge-fits/Makefile
>index 8a9dc4c..9812d26 100644
>--- math/octave-forge-fits/Makefile
>+++ 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 math/octave-forge-fl-core/Makefile math/octave-forge-fl-core/Makefile
>index b9276c6..881246c 100644
>--- math/octave-forge-fl-core/Makefile
>+++ 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 math/octave-forge-fuzzy-logic-toolkit/Makefile math/octave-forge-fuzzy-logic-toolkit/Makefile
>index bd302af..cb083d1 100644
>--- math/octave-forge-fuzzy-logic-toolkit/Makefile
>+++ 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 math/octave-forge-ga/Makefile math/octave-forge-ga/Makefile
>index 31f63e8..6b944f0 100644
>--- math/octave-forge-ga/Makefile
>+++ 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 math/octave-forge-general/Makefile math/octave-forge-general/Makefile
>index 9beafa0..1387c33 100644
>--- math/octave-forge-general/Makefile
>+++ 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 math/octave-forge-generate_html/Makefile math/octave-forge-generate_html/Makefile
>index 6ad90db..870ff9f 100644
>--- math/octave-forge-generate_html/Makefile
>+++ 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 math/octave-forge-gnuplot/Makefile math/octave-forge-gnuplot/Makefile
>index 5835e6b..502aa11 100644
>--- math/octave-forge-gnuplot/Makefile
>+++ 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 math/octave-forge-image/Makefile math/octave-forge-image/Makefile
>index 9b2397a..1320d93 100644
>--- math/octave-forge-image/Makefile
>+++ 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 math/octave-forge-interval/Makefile math/octave-forge-interval/Makefile
>index a8902b8..af6614b 100644
>--- math/octave-forge-interval/Makefile
>+++ 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 math/octave-forge-io/Makefile math/octave-forge-io/Makefile
>index c200bb9..f98b5c8 100644
>--- math/octave-forge-io/Makefile
>+++ 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 math/octave-forge-level-set/Makefile math/octave-forge-level-set/Makefile
>index 51fed38..b2480d9 100644
>--- math/octave-forge-level-set/Makefile
>+++ 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 math/octave-forge-linear-algebra/Makefile math/octave-forge-linear-algebra/Makefile
>index 9ce147d..0694331 100644
>--- math/octave-forge-linear-algebra/Makefile
>+++ 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 math/octave-forge-lssa/Makefile math/octave-forge-lssa/Makefile
>index b7517ea..fa8b097 100644
>--- math/octave-forge-lssa/Makefile
>+++ 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 math/octave-forge-ltfat/Makefile math/octave-forge-ltfat/Makefile
>index c2cc375..340f0a9 100644
>--- math/octave-forge-ltfat/Makefile
>+++ 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 math/octave-forge-mapping/Makefile math/octave-forge-mapping/Makefile
>index 37494b2..d2d4d47 100644
>--- math/octave-forge-mapping/Makefile
>+++ 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 math/octave-forge-mechanics/Makefile math/octave-forge-mechanics/Makefile
>index b4640885..4ee5ab0 100644
>--- math/octave-forge-mechanics/Makefile
>+++ 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 math/octave-forge-miscellaneous/Makefile math/octave-forge-miscellaneous/Makefile
>index e0a1cf1..66fb5f7 100644
>--- math/octave-forge-miscellaneous/Makefile
>+++ 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 math/octave-forge-msh/Makefile math/octave-forge-msh/Makefile
>index c8336fe..8e884ce 100644
>--- math/octave-forge-msh/Makefile
>+++ 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 math/octave-forge-mvn/Makefile math/octave-forge-mvn/Makefile
>index d4aae9e..c0773b3 100644
>--- math/octave-forge-mvn/Makefile
>+++ 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 math/octave-forge-nan/Makefile math/octave-forge-nan/Makefile
>index 50b6a3b..6f8bdf9 100644
>--- math/octave-forge-nan/Makefile
>+++ 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 math/octave-forge-ncarray/Makefile math/octave-forge-ncarray/Makefile
>index 649f935..ceb0102 100644
>--- math/octave-forge-ncarray/Makefile
>+++ 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 math/octave-forge-netcdf/Makefile math/octave-forge-netcdf/Makefile
>index fd57c22..4aab8cb 100644
>--- math/octave-forge-netcdf/Makefile
>+++ 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 math/octave-forge-nlwing2/Makefile math/octave-forge-nlwing2/Makefile
>index 6bd1dc9..3697b70 100644
>--- math/octave-forge-nlwing2/Makefile
>+++ 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 math/octave-forge-nnet/Makefile math/octave-forge-nnet/Makefile
>index 510e407..3fcec95 100644
>--- math/octave-forge-nnet/Makefile
>+++ 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 math/octave-forge-nurbs/Makefile math/octave-forge-nurbs/Makefile
>index 9646f8f..170a3c6 100644
>--- math/octave-forge-nurbs/Makefile
>+++ 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 math/octave-forge-ocs/Makefile math/octave-forge-ocs/Makefile
>index 94f4d48..a776932 100644
>--- math/octave-forge-ocs/Makefile
>+++ 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 math/octave-forge-octcdf/Makefile math/octave-forge-octcdf/Makefile
>index da64b16..2823852 100644
>--- math/octave-forge-octcdf/Makefile
>+++ 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 math/octave-forge-octclip/Makefile math/octave-forge-octclip/Makefile
>index 4eaeab8..f01ef1f 100644
>--- math/octave-forge-octclip/Makefile
>+++ 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 math/octave-forge-octgpr/Makefile math/octave-forge-octgpr/Makefile
>index 731fe1b..06190649 100644
>--- math/octave-forge-octgpr/Makefile
>+++ 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 math/octave-forge-octproj/Makefile math/octave-forge-octproj/Makefile
>index 43260fe..cc986566 100644
>--- math/octave-forge-octproj/Makefile
>+++ 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 math/octave-forge-odepkg/Makefile math/octave-forge-odepkg/Makefile
>index bc23204..1058221 100644
>--- math/octave-forge-odepkg/Makefile
>+++ 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 math/octave-forge-optics/Makefile math/octave-forge-optics/Makefile
>index b3555b6..143f8a0 100644
>--- math/octave-forge-optics/Makefile
>+++ 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 math/octave-forge-optim/Makefile math/octave-forge-optim/Makefile
>index 4d8f765..b73a88a 100644
>--- math/octave-forge-optim/Makefile
>+++ 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 math/octave-forge-optiminterp/Makefile math/octave-forge-optiminterp/Makefile
>index 21cab9b..504bc4c 100644
>--- math/octave-forge-optiminterp/Makefile
>+++ 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 math/octave-forge-parallel/Makefile math/octave-forge-parallel/Makefile
>index 67407a7..4dfb231 100644
>--- math/octave-forge-parallel/Makefile
>+++ 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 math/octave-forge-plot/Makefile math/octave-forge-plot/Makefile
>index c603df2..045daa1 100644
>--- math/octave-forge-plot/Makefile
>+++ 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 math/octave-forge-pt_br/Makefile math/octave-forge-pt_br/Makefile
>index 3766034..1dd04ee 100644
>--- math/octave-forge-pt_br/Makefile
>+++ 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 math/octave-forge-quaternion/Makefile math/octave-forge-quaternion/Makefile
>index 209b59c..99602fb 100644
>--- math/octave-forge-quaternion/Makefile
>+++ 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 math/octave-forge-queueing/Makefile math/octave-forge-queueing/Makefile
>index 7e3fac4..ea23103 100644
>--- math/octave-forge-queueing/Makefile
>+++ 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 math/octave-forge-secs1d/Makefile math/octave-forge-secs1d/Makefile
>index 96abbbb..d3adee9 100644
>--- math/octave-forge-secs1d/Makefile
>+++ 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 math/octave-forge-secs3d/Makefile math/octave-forge-secs3d/Makefile
>index b621261..3ab387f 100644
>--- math/octave-forge-secs3d/Makefile
>+++ 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 math/octave-forge-signal/Makefile math/octave-forge-signal/Makefile
>index df8f0eb..9a390cc 100644
>--- math/octave-forge-signal/Makefile
>+++ 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 math/octave-forge-sockets/Makefile math/octave-forge-sockets/Makefile
>index 7c51f83..6344a93 100644
>--- math/octave-forge-sockets/Makefile
>+++ 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 math/octave-forge-sparsersb/Makefile math/octave-forge-sparsersb/Makefile
>index 1bcb7cc..91a2830 100644
>--- math/octave-forge-sparsersb/Makefile
>+++ 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 math/octave-forge-specfun/Makefile math/octave-forge-specfun/Makefile
>index dc861a2..7da327a 100644
>--- math/octave-forge-specfun/Makefile
>+++ 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 math/octave-forge-splines/Makefile math/octave-forge-splines/Makefile
>index 471847b..cace427 100644
>--- math/octave-forge-splines/Makefile
>+++ 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 math/octave-forge-statistics/Makefile math/octave-forge-statistics/Makefile
>index 5d21bc1..b7c776e 100644
>--- math/octave-forge-statistics/Makefile
>+++ 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 math/octave-forge-stk/Makefile math/octave-forge-stk/Makefile
>index a81ac75..ee37c07 100644
>--- math/octave-forge-stk/Makefile
>+++ 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 math/octave-forge-strings/Makefile math/octave-forge-strings/Makefile
>index fcc2093..9e71c8d 100644
>--- math/octave-forge-strings/Makefile
>+++ 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 math/octave-forge-struct/Makefile math/octave-forge-struct/Makefile
>index 9362dbe..456c989 100644
>--- math/octave-forge-struct/Makefile
>+++ 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 math/octave-forge-symbolic/Makefile math/octave-forge-symbolic/Makefile
>index 5f046bb..80fa728 100644
>--- math/octave-forge-symbolic/Makefile
>+++ 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 math/octave-forge-tisean/Makefile math/octave-forge-tisean/Makefile
>index 2ed9482..b0382e8 100644
>--- math/octave-forge-tisean/Makefile
>+++ 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 math/octave-forge-tsa/Makefile math/octave-forge-tsa/Makefile
>index daeaa59..1d64b35 100644
>--- math/octave-forge-tsa/Makefile
>+++ 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 math/octave-forge-video/Makefile math/octave-forge-video/Makefile
>index e169f81..4df0ff2 100644
>--- math/octave-forge-video/Makefile
>+++ 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 math/octave-forge-zeromq/Makefile math/octave-forge-zeromq/Makefile
>index a28b197..5128233 100644
>--- math/octave-forge-zeromq/Makefile
>+++ 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 math/py-bitvector/Makefile math/py-bitvector/Makefile
>index 64c0a4c..f04b1bb 100644
>--- math/py-bitvector/Makefile
>+++ 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 math/py-numarray/Makefile math/py-numarray/Makefile
>index ab94986..7279417 100644
>--- math/py-numarray/Makefile
>+++ 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 math/qtiplot-doc/Makefile math/qtiplot-doc/Makefile
>index 263613b..fc7a6f6 100644
>--- math/qtiplot-doc/Makefile
>+++ 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 math/sage/Makefile math/sage/Makefile
>index 6fdcf06..3116835 100644
>--- math/sage/Makefile
>+++ 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 math/scalapack/Makefile math/scalapack/Makefile
>index 65758c3..ad5a073 100644
>--- math/scalapack/Makefile
>+++ 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 math/superlu_mt/Makefile math/superlu_mt/Makefile
>index cf3afb7..8014382 100644
>--- math/superlu_mt/Makefile
>+++ 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 math/vtk5/Makefile math/vtk5/Makefile
>index 32d2fd8..17949cd 100644
>--- math/vtk5/Makefile
>+++ 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 math/xppaut/Makefile math/xppaut/Makefile
>index e35e913..6564f1b 100644
>--- math/xppaut/Makefile
>+++ 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 misc/compat4x/Makefile misc/compat4x/Makefile
>index 717a28e..16413be 100644
>--- misc/compat4x/Makefile
>+++ 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 misc/compat5x/Makefile misc/compat5x/Makefile
>index 1025bc7..b1b1a14 100644
>--- misc/compat5x/Makefile
>+++ 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 misc/compat6x/Makefile misc/compat6x/Makefile
>index ab28da2..b5b0b75 100644
>--- misc/compat6x/Makefile
>+++ 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 misc/figlet-fonts/Makefile misc/figlet-fonts/Makefile
>index c745092..b0eec64 100644
>--- misc/figlet-fonts/Makefile
>+++ 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 misc/gnuit/Makefile misc/gnuit/Makefile
>index 81ec6fc..339eb43 100644
>--- misc/gnuit/Makefile
>+++ 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 misc/jargon/Makefile misc/jargon/Makefile
>index 49a5972..6e3b5fd 100644
>--- misc/jargon/Makefile
>+++ 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 misc/lingoteach/Makefile misc/lingoteach/Makefile
>index 3639460..edf2756 100644
>--- misc/lingoteach/Makefile
>+++ 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 misc/posixtestsuite/Makefile misc/posixtestsuite/Makefile
>index 1a8a90d..7b1e67f 100644
>--- misc/posixtestsuite/Makefile
>+++ 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 misc/py-qt4-demo/Makefile misc/py-qt4-demo/Makefile
>index 637a050..4a0d011 100644
>--- misc/py-qt4-demo/Makefile
>+++ 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 misc/talkfilters/Makefile misc/talkfilters/Makefile
>index e222196..2bea485 100644
>--- misc/talkfilters/Makefile
>+++ 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 multimedia/kissdx/Makefile multimedia/kissdx/Makefile
>index 35a77fa..c8a7f19 100644
>--- multimedia/kissdx/Makefile
>+++ 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 multimedia/libmediainfo/Makefile multimedia/libmediainfo/Makefile
>index 2ffe3fc..4cda46d 100644
>--- multimedia/libmediainfo/Makefile
>+++ 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 multimedia/mlt/Makefile multimedia/mlt/Makefile
>index 0977d9a..b311d47 100644
>--- multimedia/mlt/Makefile
>+++ 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 multimedia/mpeg4ip/Makefile multimedia/mpeg4ip/Makefile
>index daa5f52..34b82a6 100644
>--- multimedia/mpeg4ip/Makefile
>+++ 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 multimedia/oscam/Makefile multimedia/oscam/Makefile
>index acc2d6c..b69eb40 100644
>--- multimedia/oscam/Makefile
>+++ 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 multimedia/py-openlp/Makefile multimedia/py-openlp/Makefile
>index c25a8d7..825c288 100644
>--- multimedia/py-openlp/Makefile
>+++ 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 multimedia/pymp/Makefile multimedia/pymp/Makefile
>index f5ee7b7..1b1dd01 100644
>--- multimedia/pymp/Makefile
>+++ 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 multimedia/qmmp-plugin-pack-qt5/Makefile multimedia/qmmp-plugin-pack-qt5/Makefile
>index 7765b38..a1f4777 100644
>--- multimedia/qmmp-plugin-pack-qt5/Makefile
>+++ 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 multimedia/qmmp-plugin-pack/Makefile multimedia/qmmp-plugin-pack/Makefile
>index f792a0f..84fcdba 100644
>--- multimedia/qmmp-plugin-pack/Makefile
>+++ 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 multimedia/qmmp-qt5/Makefile multimedia/qmmp-qt5/Makefile
>index 62728ce..6188aa2 100644
>--- multimedia/qmmp-qt5/Makefile
>+++ 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 multimedia/qmmp/Makefile multimedia/qmmp/Makefile
>index 48435a5..e0a05cd 100644
>--- multimedia/qmmp/Makefile
>+++ 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 multimedia/v4l-utils/Makefile multimedia/v4l-utils/Makefile
>index a2d897b..f3ee37e 100644
>--- multimedia/v4l-utils/Makefile
>+++ 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 multimedia/vlc/Makefile multimedia/vlc/Makefile
>index 8e0148c..864d2c4 100644
>--- multimedia/vlc/Makefile
>+++ 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 net-im/p5-Net-AIM/Makefile net-im/p5-Net-AIM/Makefile
>index 3cb96f7..062de4c 100644
>--- net-im/p5-Net-AIM/Makefile
>+++ 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 net-im/pidgin-skype/Makefile net-im/pidgin-skype/Makefile
>index c5d1f24..2f2616c 100644
>--- net-im/pidgin-skype/Makefile
>+++ 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 net-im/pwytter/Makefile net-im/pwytter/Makefile
>index 9ba9de4..bd01a60 100644
>--- net-im/pwytter/Makefile
>+++ 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 net-im/turpial/Makefile net-im/turpial/Makefile
>index dcde24c..d43caa3 100644
>--- net-im/turpial/Makefile
>+++ 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 net-mgmt/ccnet/Makefile net-mgmt/ccnet/Makefile
>index 8682f1b..e7871e4 100644
>--- net-mgmt/ccnet/Makefile
>+++ 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 net-mgmt/cricket/Makefile net-mgmt/cricket/Makefile
>index 59a3bae..2a32f28 100644
>--- net-mgmt/cricket/Makefile
>+++ 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 net-mgmt/mk-livestatus/Makefile net-mgmt/mk-livestatus/Makefile
>index 1a578f4..5ee0342 100644
>--- net-mgmt/mk-livestatus/Makefile
>+++ 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 net-mgmt/nagvis/Makefile net-mgmt/nagvis/Makefile
>index ba0eac4..3f115cb 100644
>--- net-mgmt/nagvis/Makefile
>+++ 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 net-mgmt/p5-Net-NSCA-Client/Makefile net-mgmt/p5-Net-NSCA-Client/Makefile
>index e062978..1132f73 100644
>--- net-mgmt/p5-Net-NSCA-Client/Makefile
>+++ 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 net-mgmt/pandorafms_agent/Makefile net-mgmt/pandorafms_agent/Makefile
>index d637f02..3645f1b 100644
>--- net-mgmt/pandorafms_agent/Makefile
>+++ 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 net-mgmt/pandorafms_console/Makefile net-mgmt/pandorafms_console/Makefile
>index d7da7e1..8269124 100644
>--- net-mgmt/pandorafms_console/Makefile
>+++ 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 net-mgmt/pixilate/Makefile net-mgmt/pixilate/Makefile
>index 1609927..ed706fb 100644
>--- net-mgmt/pixilate/Makefile
>+++ 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 net-mgmt/sblim-wbemcli/Makefile net-mgmt/sblim-wbemcli/Makefile
>index c99a08f..8e06c1c 100644
>--- net-mgmt/sblim-wbemcli/Makefile
>+++ 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 net-mgmt/seafile/Makefile net-mgmt/seafile/Makefile
>index 9987725..ba60c7c 100644
>--- net-mgmt/seafile/Makefile
>+++ 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 net-mgmt/zabbix2-server/Makefile net-mgmt/zabbix2-server/Makefile
>index ef28e5e..c5dbac9 100644
>--- net-mgmt/zabbix2-server/Makefile
>+++ 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 net-mgmt/zabbix22-server/Makefile net-mgmt/zabbix22-server/Makefile
>index 1ee307e..0cf04ba 100644
>--- net-mgmt/zabbix22-server/Makefile
>+++ 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 net-mgmt/zabbix24-server/Makefile net-mgmt/zabbix24-server/Makefile
>index 6cc26e5..0a4be0d 100644
>--- net-mgmt/zabbix24-server/Makefile
>+++ 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 net-mgmt/zabbix3-server/Makefile net-mgmt/zabbix3-server/Makefile
>index d027f0e..d4ddd79 100644
>--- net-mgmt/zabbix3-server/Makefile
>+++ 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 net-mgmt/zabbix32-server/Makefile net-mgmt/zabbix32-server/Makefile
>index 121bf24..a4f521f 100644
>--- net-mgmt/zabbix32-server/Makefile
>+++ 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 net-p2p/qbittorrent/Makefile net-p2p/qbittorrent/Makefile
>index 5dfc415..56c0e75 100644
>--- net-p2p/qbittorrent/Makefile
>+++ net-p2p/qbittorrent/Makefile
>@@ -90,7 +90,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 net-p2p/vuze/Makefile net-p2p/vuze/Makefile
>index b99deeb..3575522 100644
>--- net-p2p/vuze/Makefile
>+++ 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 net/avahi-app/Makefile net/avahi-app/Makefile
>index 7ffff27..a675892 100644
>--- net/avahi-app/Makefile
>+++ 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 net/binkd/Makefile net/binkd/Makefile
>index d54d2f0..590e1b2 100644
>--- net/binkd/Makefile
>+++ 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 net/dshell/Makefile net/dshell/Makefile
>index e5ed66a..38d4452 100644
>--- net/dshell/Makefile
>+++ 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 net/freeradius3/Makefile net/freeradius3/Makefile
>index ab483f7..9922bba 100644
>--- net/freeradius3/Makefile
>+++ net/freeradius3/Makefile
>@@ -362,7 +362,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 net/ldapdiff/Makefile net/ldapdiff/Makefile
>index 4184ce4..c823a0a 100644
>--- net/ldapdiff/Makefile
>+++ 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 net/libp0f/Makefile net/libp0f/Makefile
>index d4a64d0..1b319f6 100644
>--- net/libp0f/Makefile
>+++ 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 net/linux-c6-openldap/Makefile net/linux-c6-openldap/Makefile
>index 5861def..d89bec1 100644
>--- net/linux-c6-openldap/Makefile
>+++ 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 net/linux-f10-nss_ldap/Makefile net/linux-f10-nss_ldap/Makefile
>index 0b2e1ea..e601f90 100644
>--- net/linux-f10-nss_ldap/Makefile
>+++ 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 net/linux-f10-openldap/Makefile net/linux-f10-openldap/Makefile
>index 9ca4264..6c6d9fa 100644
>--- net/linux-f10-openldap/Makefile
>+++ 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 net/netatalk/Makefile net/netatalk/Makefile
>index 883e03b..5c0525f 100644
>--- net/netatalk/Makefile
>+++ 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 net/neubot/Makefile net/neubot/Makefile
>index 1a93b49..266a2da 100644
>--- net/neubot/Makefile
>+++ 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 net/nph/Makefile net/nph/Makefile
>index 6a1497f..0fe586a 100644
>--- net/nph/Makefile
>+++ 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 net/ntlmaps/Makefile net/ntlmaps/Makefile
>index 7ae4edc..e226984 100644
>--- net/ntlmaps/Makefile
>+++ 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 net/p5-PlRPC/Makefile net/p5-PlRPC/Makefile
>index 7394e9f..d3bf4a1 100644
>--- net/p5-PlRPC/Makefile
>+++ 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 net/py-pystun/Makefile net/py-pystun/Makefile
>index 9a6ed85..2c382e6 100644
>--- net/py-pystun/Makefile
>+++ 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 net/samba36/Makefile net/samba36/Makefile
>index 6b3862e..ec185e5 100644
>--- net/samba36/Makefile
>+++ 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 net/samba42/Makefile net/samba42/Makefile
>index 18392f2..55971f6 100644
>--- net/samba42/Makefile
>+++ 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 net/samba43/Makefile net/samba43/Makefile
>index 99fadc2..fd31fa8 100644
>--- net/samba43/Makefile
>+++ 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 net/samba44/Makefile net/samba44/Makefile
>index 0b50f31..d1a041b 100644
>--- net/samba44/Makefile
>+++ 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 net/stf-6rd-kmod/Makefile net/stf-6rd-kmod/Makefile
>index e70649d..8a02d04 100644
>--- net/stf-6rd-kmod/Makefile
>+++ 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 net/vnc/Makefile net/vnc/Makefile
>index 596fc24..2997435 100644
>--- net/vnc/Makefile
>+++ 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 net/zebra/Makefile net/zebra/Makefile
>index 0917dbb..fc5ddcb 100644
>--- net/zebra/Makefile
>+++ 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 news/diablo/Makefile news/diablo/Makefile
>index 838f0f0..b4c9c3e 100644
>--- news/diablo/Makefile
>+++ 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 news/fidogate/Makefile news/fidogate/Makefile
>index 5e8ef66..c401e54 100644
>--- news/fidogate/Makefile
>+++ 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 ports-mgmt/porttree/Makefile ports-mgmt/porttree/Makefile
>index 6b84fe4..5e7dafb 100644
>--- ports-mgmt/porttree/Makefile
>+++ 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 print/a2ps/Makefile print/a2ps/Makefile
>index 30007842..a39d8ca 100644
>--- print/a2ps/Makefile
>+++ 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 print/adobe-cmaps/Makefile print/adobe-cmaps/Makefile
>index 3ba92c0..2d7c2fd 100644
>--- print/adobe-cmaps/Makefile
>+++ 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 print/afm/Makefile print/afm/Makefile
>index d744271..ab34293 100644
>--- print/afm/Makefile
>+++ 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 print/apsfilter/Makefile print/apsfilter/Makefile
>index b0d7acd1..90a42d8 100644
>--- print/apsfilter/Makefile
>+++ 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 print/ghostscript8-base/Makefile print/ghostscript8-base/Makefile
>index ee172ca..5f90fdf 100644
>--- print/ghostscript8-base/Makefile
>+++ 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 print/ghostscript9-agpl-base/Makefile print/ghostscript9-agpl-base/Makefile
>index b8df4fd..52fecbf 100644
>--- print/ghostscript9-agpl-base/Makefile
>+++ 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 print/ghostscript9-base/Makefile print/ghostscript9-base/Makefile
>index 83cebb9..75d90bf 100644
>--- print/ghostscript9-base/Makefile
>+++ 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 print/muttprint/Makefile print/muttprint/Makefile
>index 047f6b8..808dcb4 100644
>--- print/muttprint/Makefile
>+++ 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 print/openprinting/Makefile print/openprinting/Makefile
>index edf46eb..73df925 100644
>--- print/openprinting/Makefile
>+++ 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 print/p5-Text-PDF/Makefile print/p5-Text-PDF/Makefile
>index 791e520..8ed6375 100644
>--- print/p5-Text-PDF/Makefile
>+++ 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 print/pslib/Makefile print/pslib/Makefile
>index dc03596..9abfaf1 100644
>--- print/pslib/Makefile
>+++ 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 russian/koi8r-ps/Makefile russian/koi8r-ps/Makefile
>index 8287388..6b0d656 100644
>--- russian/koi8r-ps/Makefile
>+++ 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 science/minc2/Makefile science/minc2/Makefile
>index e4e1005..83e0768 100644
>--- science/minc2/Makefile
>+++ 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 security/bdc/Makefile security/bdc/Makefile
>index 8766a8d..6f528ff 100644
>--- security/bdc/Makefile
>+++ 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 security/ca_root_nss/Makefile security/ca_root_nss/Makefile
>index f55873d..e182753 100644
>--- security/ca_root_nss/Makefile
>+++ 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 security/courier-authlib/Makefile security/courier-authlib/Makefile
>index 07e75cd..43447db 100644
>--- security/courier-authlib/Makefile
>+++ 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 security/doorman/Makefile security/doorman/Makefile
>index f7e42ab..7ae1bb5 100644
>--- security/doorman/Makefile
>+++ 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 security/hamachi/Makefile security/hamachi/Makefile
>index 87ed335..e8e8319 100644
>--- security/hamachi/Makefile
>+++ 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 security/ipsec-tools/Makefile security/ipsec-tools/Makefile
>index 781eb36..8d59a62 100644
>--- security/ipsec-tools/Makefile
>+++ 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 security/libgcrypt/Makefile security/libgcrypt/Makefile
>index 63dd6d0..878480e 100644
>--- security/libgcrypt/Makefile
>+++ 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 security/libressl-devel/Makefile security/libressl-devel/Makefile
>index 0fbc68e..2cde312 100644
>--- security/libressl-devel/Makefile
>+++ 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 security/libressl/Makefile security/libressl/Makefile
>index 8447257..15c68ca 100644
>--- security/libressl/Makefile
>+++ 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 security/nacl/Makefile security/nacl/Makefile
>index 2efca4b..a3897b9 100644
>--- security/nacl/Makefile
>+++ 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 security/nmap/Makefile security/nmap/Makefile
>index e509561..9627460 100644
>--- security/nmap/Makefile
>+++ 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 security/openssl/Makefile security/openssl/Makefile
>index 9df343a..1d688fd 100644
>--- security/openssl/Makefile
>+++ 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 security/openvpn-auth-ldap/Makefile security/openvpn-auth-ldap/Makefile
>index 70bef88..1715350 100644
>--- security/openvpn-auth-ldap/Makefile
>+++ 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 security/p5-Authen-TypeKey/Makefile security/p5-Authen-TypeKey/Makefile
>index ed3ac97..759f4b5 100644
>--- security/p5-Authen-TypeKey/Makefile
>+++ 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 security/p5-Crypt-OpenPGP/Makefile security/p5-Crypt-OpenPGP/Makefile
>index f47f638..3a21ef0 100644
>--- security/p5-Crypt-OpenPGP/Makefile
>+++ 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 security/p5-openxpki/Makefile security/p5-openxpki/Makefile
>index fadef75..af9d078 100644
>--- security/p5-openxpki/Makefile
>+++ 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 security/pgp/Makefile security/pgp/Makefile
>index 42892c0..3d2e654 100644
>--- security/pgp/Makefile
>+++ 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 security/shishi/Makefile security/shishi/Makefile
>index b32fcf7..b9cf141 100644
>--- security/shishi/Makefile
>+++ 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 security/sks/Makefile security/sks/Makefile
>index b66f0a4..120a682 100644
>--- security/sks/Makefile
>+++ 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 security/spike-proxy/Makefile security/spike-proxy/Makefile
>index 95a9e1d..c7a83ce 100644
>--- security/spike-proxy/Makefile
>+++ 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 security/vuxml/Makefile security/vuxml/Makefile
>index d8a73fa..1f07767 100644
>--- security/vuxml/Makefile
>+++ 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 sysutils/amrstat/Makefile sysutils/amrstat/Makefile
>index b4b072d..0e74e25 100644
>--- sysutils/amrstat/Makefile
>+++ 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 sysutils/bsdadminscripts/Makefile sysutils/bsdadminscripts/Makefile
>index 8a38239..c39f309 100644
>--- sysutils/bsdadminscripts/Makefile
>+++ 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 sysutils/duplicity/Makefile sysutils/duplicity/Makefile
>index 344a9ce..d1ca2f0 100644
>--- sysutils/duplicity/Makefile
>+++ 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 sysutils/e2fsprogs/Makefile sysutils/e2fsprogs/Makefile
>index dbdeaa9..4bbcbe2 100644
>--- sysutils/e2fsprogs/Makefile
>+++ 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 sysutils/freesbie/Makefile sysutils/freesbie/Makefile
>index d27a703..7240dfee 100644
>--- sysutils/freesbie/Makefile
>+++ 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 sysutils/gosa/Makefile sysutils/gosa/Makefile
>index 3c67f1d..ed420a4 100644
>--- sysutils/gosa/Makefile
>+++ 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 sysutils/grub2-pcbsd/Makefile sysutils/grub2-pcbsd/Makefile
>index a5c9b87..5600c8b 100644
>--- sysutils/grub2-pcbsd/Makefile
>+++ 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 sysutils/ldap-account-manager/Makefile sysutils/ldap-account-manager/Makefile
>index 83fa328..a627a2e 100644
>--- sysutils/ldap-account-manager/Makefile
>+++ 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 sysutils/radmind/Makefile sysutils/radmind/Makefile
>index 2817f74..bf5bde5 100644
>--- sysutils/radmind/Makefile
>+++ 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 sysutils/scprotect/Makefile sysutils/scprotect/Makefile
>index 80061f1..226c279 100644
>--- sysutils/scprotect/Makefile
>+++ 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 sysutils/u-boot-pine64/Makefile sysutils/u-boot-pine64/Makefile
>index 7b5bff0..bd0b302 100644
>--- sysutils/u-boot-pine64/Makefile
>+++ 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 sysutils/webmin/Makefile sysutils/webmin/Makefile
>index e51de61..bfe4bf6 100644
>--- sysutils/webmin/Makefile
>+++ 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 sysutils/xvidcap/Makefile sysutils/xvidcap/Makefile
>index 5dc3f6e..d3605bb 100644
>--- sysutils/xvidcap/Makefile
>+++ 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 textproc/ansifilter/Makefile textproc/ansifilter/Makefile
>index 68a4940..8e88250 100644
>--- textproc/ansifilter/Makefile
>+++ 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 textproc/asm-xml/Makefile textproc/asm-xml/Makefile
>index 0b6a90b..102c9d5 100644
>--- textproc/asm-xml/Makefile
>+++ 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 textproc/docbook-sgml/Makefile textproc/docbook-sgml/Makefile
>index 72fb16d..f1c4bec 100644
>--- textproc/docbook-sgml/Makefile
>+++ 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 textproc/docbook-utils/Makefile textproc/docbook-utils/Makefile
>index 8f3cd0d..03a81dc 100644
>--- textproc/docbook-utils/Makefile
>+++ 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 textproc/docbook-xml/Makefile textproc/docbook-xml/Makefile
>index 82fa0d5..db4d3f2 100644
>--- textproc/docbook-xml/Makefile
>+++ 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 textproc/docbook-xsl/Makefile textproc/docbook-xsl/Makefile
>index 85695af..43de76b 100644
>--- textproc/docbook-xsl/Makefile
>+++ 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 textproc/dsssl-docbook-modular/Makefile textproc/dsssl-docbook-modular/Makefile
>index f8f0952..3219b53 100644
>--- textproc/dsssl-docbook-modular/Makefile
>+++ 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 textproc/flex/Makefile textproc/flex/Makefile
>index d54c41d..6f14c8a 100644
>--- textproc/flex/Makefile
>+++ 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 textproc/hs-bytestring-csv/Makefile textproc/hs-bytestring-csv/Makefile
>index 79a46ae..924cf6c 100644
>--- textproc/hs-bytestring-csv/Makefile
>+++ 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 textproc/htmlc/Makefile textproc/htmlc/Makefile
>index b7e0dc5..114016f 100644
>--- textproc/htmlc/Makefile
>+++ 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 textproc/hyperestraier/Makefile textproc/hyperestraier/Makefile
>index 4f57c68..847c8fa 100644
>--- textproc/hyperestraier/Makefile
>+++ 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 textproc/jade/Makefile textproc/jade/Makefile
>index b1835e1..50cf701 100644
>--- textproc/jade/Makefile
>+++ 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 textproc/kibana41/Makefile textproc/kibana41/Makefile
>index 3820250..79cf1ba 100644
>--- textproc/kibana41/Makefile
>+++ 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 textproc/libtre/Makefile textproc/libtre/Makefile
>index 415594e..5457a0d 100644
>--- textproc/libtre/Makefile
>+++ 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 textproc/libwps03/Makefile textproc/libwps03/Makefile
>index a05b09b..42f9ce2 100644
>--- textproc/libwps03/Makefile
>+++ 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 textproc/libxml2/Makefile textproc/libxml2/Makefile
>index a7c953a..0d97749 100644
>--- textproc/libxml2/Makefile
>+++ 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 textproc/p5-HTML-Truncate/Makefile textproc/p5-HTML-Truncate/Makefile
>index 47a03d2..4fbed55 100644
>--- textproc/p5-HTML-Truncate/Makefile
>+++ 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 textproc/p5-IDNA-Punycode/Makefile textproc/p5-IDNA-Punycode/Makefile
>index 2fc2b52..d29d8ef 100644
>--- textproc/p5-IDNA-Punycode/Makefile
>+++ 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 textproc/p5-Lingua-EN-Sentence/Makefile textproc/p5-Lingua-EN-Sentence/Makefile
>index 36ba282..fa0e3d7 100644
>--- textproc/p5-Lingua-EN-Sentence/Makefile
>+++ 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 textproc/sdcv/Makefile textproc/sdcv/Makefile
>index f579b3c7..e9da662 100644
>--- textproc/sdcv/Makefile
>+++ 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 textproc/srilm/Makefile textproc/srilm/Makefile
>index ab0926f..4c0f062 100644
>--- textproc/srilm/Makefile
>+++ 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 textproc/tclExpat/Makefile textproc/tclExpat/Makefile
>index 820244e..23ad3d7 100644
>--- textproc/tclExpat/Makefile
>+++ 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 textproc/templates_parser/Makefile textproc/templates_parser/Makefile
>index 1c9a45b..7eee4a4 100644
>--- textproc/templates_parser/Makefile
>+++ 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 vietnamese/vnroff/Makefile vietnamese/vnroff/Makefile
>index 8620339..2b8eca5 100644
>--- vietnamese/vnroff/Makefile
>+++ 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 www/apache24/Makefile www/apache24/Makefile
>index 98f17ef..e02fc4f 100644
>--- www/apache24/Makefile
>+++ 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 www/calendarserver/Makefile www/calendarserver/Makefile
>index 98e7990..280cfaf 100644
>--- www/calendarserver/Makefile
>+++ 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 www/cmsmadesimple/Makefile www/cmsmadesimple/Makefile
>index 3c2c5d1..f0af9d3 100644
>--- www/cmsmadesimple/Makefile
>+++ 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 www/fcgi/Makefile www/fcgi/Makefile
>index 42b068a..178747d 100644
>--- www/fcgi/Makefile
>+++ 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 www/firefox-esr-i18n/Makefile www/firefox-esr-i18n/Makefile
>index e8b3cd1..17f6127 100644
>--- www/firefox-esr-i18n/Makefile
>+++ 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 www/firefox-i18n/Makefile www/firefox-i18n/Makefile
>index df45fcf..823b5f1 100644
>--- www/firefox-i18n/Makefile
>+++ 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 www/foswiki/Makefile www/foswiki/Makefile
>index 7abc498..fbfc144 100644
>--- www/foswiki/Makefile
>+++ 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 www/geronimo/Makefile www/geronimo/Makefile
>index 600bb3d..4562127 100644
>--- www/geronimo/Makefile
>+++ 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 www/grafana2/Makefile www/grafana2/Makefile
>index 26f18c7..222e069 100644
>--- www/grafana2/Makefile
>+++ 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 www/grafana3/Makefile www/grafana3/Makefile
>index 39b5523..04301b5 100644
>--- www/grafana3/Makefile
>+++ 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 www/iwebcal/Makefile www/iwebcal/Makefile
>index 17cdce3..fac337e 100644
>--- www/iwebcal/Makefile
>+++ 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 www/jericho-html/Makefile www/jericho-html/Makefile
>index 799fe84..e79f3b5 100644
>--- www/jericho-html/Makefile
>+++ 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 www/linux-seamonkey/Makefile.common www/linux-seamonkey/Makefile.common
>index 6bb0576..33f1f0d 100644
>--- www/linux-seamonkey/Makefile.common
>+++ 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 www/magento/Makefile www/magento/Makefile
>index 9fe1e54..439ed33 100644
>--- www/magento/Makefile
>+++ 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 www/otrs/Makefile www/otrs/Makefile
>index f05279a..9583900 100644
>--- www/otrs/Makefile
>+++ 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 www/p5-HTTP-Recorder/Makefile www/p5-HTTP-Recorder/Makefile
>index ec4dd34..ffcf2e2 100644
>--- www/p5-HTTP-Recorder/Makefile
>+++ 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 www/p5-HTTP-Server-Simple-PSGI/Makefile www/p5-HTTP-Server-Simple-PSGI/Makefile
>index 384261f..f1db507 100644
>--- www/p5-HTTP-Server-Simple-PSGI/Makefile
>+++ 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 www/p5-libapreq2/Makefile www/p5-libapreq2/Makefile
>index 8a421b3..862f2ac 100644
>--- www/p5-libapreq2/Makefile
>+++ 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 www/phpwebapp/Makefile www/phpwebapp/Makefile
>index 3f1d8eb..838dfa3 100644
>--- www/phpwebapp/Makefile
>+++ 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 www/pivotx/Makefile www/pivotx/Makefile
>index c7fafa0..1bc33f8 100644
>--- www/pivotx/Makefile
>+++ 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 www/piwigo/Makefile www/piwigo/Makefile
>index 7603c75..eed1205 100644
>--- www/piwigo/Makefile
>+++ 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 www/planet/Makefile www/planet/Makefile
>index 0c2716f..a791b48 100644
>--- www/planet/Makefile
>+++ 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 www/py-flask-restplus/Makefile www/py-flask-restplus/Makefile
>index c11bfee..c526997 100644
>--- www/py-flask-restplus/Makefile
>+++ 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 www/py-flask-restplus08/Makefile www/py-flask-restplus08/Makefile
>index 3eac909..9267d9f 100644
>--- www/py-flask-restplus08/Makefile
>+++ 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 www/py-gandi.cli/Makefile www/py-gandi.cli/Makefile
>index d345976..3ca7da0b 100644
>--- www/py-gandi.cli/Makefile
>+++ 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 www/pydio/Makefile www/pydio/Makefile
>index ff0db53..f180ac9 100644
>--- www/pydio/Makefile
>+++ 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 www/rt40/Makefile www/rt40/Makefile
>index 6fdc483..0420049 100644
>--- www/rt40/Makefile
>+++ 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 www/rt42/Makefile www/rt42/Makefile
>index 0c6fc86..79f895d 100644
>--- www/rt42/Makefile
>+++ 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 www/rt44/Makefile www/rt44/Makefile
>index 751bd11..08d81bc 100644
>--- www/rt44/Makefile
>+++ 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 www/rubygem-scrapi/Makefile www/rubygem-scrapi/Makefile
>index 7254ee0..20d2df9 100644
>--- www/rubygem-scrapi/Makefile
>+++ 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 www/seamonkey-i18n/Makefile www/seamonkey-i18n/Makefile
>index 2d81820..add54d9 100644
>--- www/seamonkey-i18n/Makefile
>+++ 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 www/seamonkey/Makefile www/seamonkey/Makefile
>index 667ce0b..5e0f6c7 100644
>--- www/seamonkey/Makefile
>+++ 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 www/tclwebtest/Makefile www/tclwebtest/Makefile
>index 7694605..39e5913 100644
>--- www/tclwebtest/Makefile
>+++ 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 www/tdiary/Makefile www/tdiary/Makefile
>index ff476db..bffa54b 100644
>--- www/tdiary/Makefile
>+++ 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 www/tdom/Makefile www/tdom/Makefile
>index 9616dc6..ce5836b 100644
>--- www/tdom/Makefile
>+++ 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 www/testlink/Makefile www/testlink/Makefile
>index eb9e43c..e8869a8 100644
>--- www/testlink/Makefile
>+++ 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 www/thundersnarf/Makefile www/thundersnarf/Makefile
>index 14a2629..abd645b 100644
>--- www/thundersnarf/Makefile
>+++ 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 www/tidy-devel/Makefile www/tidy-devel/Makefile
>index b1bc53a..a5c811a 100644
>--- www/tidy-devel/Makefile
>+++ 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 www/tt-rss/Makefile www/tt-rss/Makefile
>index 404b034..0a5af6c 100644
>--- www/tt-rss/Makefile
>+++ 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 www/twiki/Makefile www/twiki/Makefile
>index 3c7301b..bbb19be 100644
>--- www/twiki/Makefile
>+++ 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 www/uzbl/Makefile www/uzbl/Makefile
>index c7f16c0..c8b9b43 100644
>--- www/uzbl/Makefile
>+++ 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 www/varnish4/Makefile www/varnish4/Makefile
>index 1816249..b15cead 100644
>--- www/varnish4/Makefile
>+++ 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 www/webstone-ssl/Makefile www/webstone-ssl/Makefile
>index 95a962f..8e018fe 100644
>--- www/webstone-ssl/Makefile
>+++ 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 www/wikicalc/Makefile www/wikicalc/Makefile
>index 69963d1..cf4a317 100644
>--- www/wikicalc/Makefile
>+++ 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 www/wt/Makefile www/wt/Makefile
>index 83bc406..a2eba0f 100644
>--- www/wt/Makefile
>+++ 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 www/xpi-adblock/Makefile www/xpi-adblock/Makefile
>index 9c795d4..4b0ddc0 100644
>--- www/xpi-adblock/Makefile
>+++ 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 www/xpi-adblock/Makefile.xpi www/xpi-adblock/Makefile.xpi
>index 8179090..866f3b2 100644
>--- www/xpi-adblock/Makefile.xpi
>+++ 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 www/xpi-clear_cache_button/Makefile www/xpi-clear_cache_button/Makefile
>index 62a1e2d..ba7c515 100644
>--- www/xpi-clear_cache_button/Makefile
>+++ 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 www/xpi-conkeror/Makefile www/xpi-conkeror/Makefile
>index 541f4d5..2aaeaf3 100644
>--- www/xpi-conkeror/Makefile
>+++ 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 www/xpi-flashblock/Makefile www/xpi-flashblock/Makefile
>index 9e346e2..d10c50e 100644
>--- www/xpi-flashblock/Makefile
>+++ 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 www/xpi-imagezoom/Makefile www/xpi-imagezoom/Makefile
>index 51b207e..afc4889 100644
>--- www/xpi-imagezoom/Makefile
>+++ 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 www/xpi-jslib/Makefile www/xpi-jslib/Makefile
>index 667ef88..979c5e0 100644
>--- www/xpi-jslib/Makefile
>+++ 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 www/xpi-jsview/Makefile www/xpi-jsview/Makefile
>index 123d52a..6ca1b0e 100644
>--- www/xpi-jsview/Makefile
>+++ 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 www/xpi-server_spy/Makefile www/xpi-server_spy/Makefile
>index dffaa93..6642d48 100644
>--- www/xpi-server_spy/Makefile
>+++ 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 www/xpi-showip/Makefile www/xpi-showip/Makefile
>index 590a0ae..244c380 100644
>--- www/xpi-showip/Makefile
>+++ 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 www/yabb/Makefile www/yabb/Makefile
>index 93c4760..6f32fdc 100644
>--- www/yabb/Makefile
>+++ 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 www/yanopaste/Makefile www/yanopaste/Makefile
>index 9a2bec4..6260b3c8 100644
>--- www/yanopaste/Makefile
>+++ 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 www/youtube_dl/Makefile www/youtube_dl/Makefile
>index 62ee21f..9b5ca3e 100644
>--- www/youtube_dl/Makefile
>+++ 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 www/zen-cart/Makefile www/zen-cart/Makefile
>index 2264221..2715e17 100644
>--- www/zen-cart/Makefile
>+++ 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 x11-clocks/asclock-gtk/Makefile x11-clocks/asclock-gtk/Makefile
>index 7c80541..f235bf0 100644
>--- x11-clocks/asclock-gtk/Makefile
>+++ 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 x11-clocks/asclock-xlib/Makefile x11-clocks/asclock-xlib/Makefile
>index 697988d..a942909 100644
>--- x11-clocks/asclock-xlib/Makefile
>+++ 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 x11-clocks/pclock/Makefile x11-clocks/pclock/Makefile
>index 879dbc1..ef50ce9 100644
>--- x11-clocks/pclock/Makefile
>+++ 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 x11-fm/doublecmd/Makefile x11-fm/doublecmd/Makefile
>index 73c4b0e..1496940 100644
>--- x11-fm/doublecmd/Makefile
>+++ 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 x11-fm/gentoo/Makefile x11-fm/gentoo/Makefile
>index 3a87992..91ef3fa 100644
>--- x11-fm/gentoo/Makefile
>+++ 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 x11-fm/gprename/Makefile x11-fm/gprename/Makefile
>index 77f3825..5d54c39 100644
>--- x11-fm/gprename/Makefile
>+++ 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 x11-themes/adwaita-icon-theme/Makefile x11-themes/adwaita-icon-theme/Makefile
>index b825dbe..b806aa6 100644
>--- x11-themes/adwaita-icon-theme/Makefile
>+++ 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 x11-themes/gtk-digital-harmony-theme/Makefile x11-themes/gtk-digital-harmony-theme/Makefile
>index 28c4e16..f84ea4d 100644
>--- x11-themes/gtk-digital-harmony-theme/Makefile
>+++ 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 x11-themes/gtk-equinox-engine/Makefile x11-themes/gtk-equinox-engine/Makefile
>index 66dd255..7dfd31b 100644
>--- x11-themes/gtk-equinox-engine/Makefile
>+++ 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 x11-themes/openbox-themes/Makefile x11-themes/openbox-themes/Makefile
>index bf1dc75..7cc681e 100644
>--- x11-themes/openbox-themes/Makefile
>+++ 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 x11-themes/sawfish-themes/Makefile x11-themes/sawfish-themes/Makefile
>index 1b5f3ec..6bcd9d5 100644
>--- x11-themes/sawfish-themes/Makefile
>+++ 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 x11-toolkits/gtk12/Makefile x11-toolkits/gtk12/Makefile
>index b8f7c9d..b56b987 100644
>--- x11-toolkits/gtk12/Makefile
>+++ 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 x11-toolkits/gtk30/Makefile x11-toolkits/gtk30/Makefile
>index dae4a80..7950327 100644
>--- x11-toolkits/gtk30/Makefile
>+++ 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 x11-toolkits/gtkada/Makefile x11-toolkits/gtkada/Makefile
>index 597891a..15ff6f3 100644
>--- x11-toolkits/gtkada/Makefile
>+++ 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 x11-toolkits/iwidgets/Makefile x11-toolkits/iwidgets/Makefile
>index 05997d5..2d3d4c6 100644
>--- x11-toolkits/iwidgets/Makefile
>+++ 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 x11-toolkits/linux-c6-qt47-x11/Makefile x11-toolkits/linux-c6-qt47-x11/Makefile
>index 2b3135b..b799330 100644
>--- x11-toolkits/linux-c6-qt47-x11/Makefile
>+++ 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 x11-toolkits/py-gui/Makefile x11-toolkits/py-gui/Makefile
>index 65eaf93..590b9c1 100644
>--- x11-toolkits/py-gui/Makefile
>+++ 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 x11-toolkits/py-wxPython28/Makefile x11-toolkits/py-wxPython28/Makefile
>index b0bd0bf..2467295 100644
>--- x11-toolkits/py-wxPython28/Makefile
>+++ 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 x11-toolkits/swt-devel/Makefile x11-toolkits/swt-devel/Makefile
>index 38f07b1..89afcf1 100644
>--- x11-toolkits/swt-devel/Makefile
>+++ 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 x11-toolkits/swt/Makefile x11-toolkits/swt/Makefile
>index 03be78a..3631b49 100644
>--- x11-toolkits/swt/Makefile
>+++ 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 x11-wm/fvwm-crystal/Makefile x11-wm/fvwm-crystal/Makefile
>index c81ef6c..c424c59 100644
>--- x11-wm/fvwm-crystal/Makefile
>+++ 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 x11-wm/gcompmgr/Makefile x11-wm/gcompmgr/Makefile
>index cc66d60..3b16a8f 100644
>--- x11-wm/gcompmgr/Makefile
>+++ 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 x11/bmpanel2/Makefile x11/bmpanel2/Makefile
>index 495c400..23f11ba 100644
>--- x11/bmpanel2/Makefile
>+++ 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 x11/cinnamon-screensaver/Makefile x11/cinnamon-screensaver/Makefile
>index 56d059d..8cce99c 100644
>--- x11/cinnamon-screensaver/Makefile
>+++ 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 x11/eaglemode/Makefile x11/eaglemode/Makefile
>index 0274161..e4072ae 100644
>--- x11/eaglemode/Makefile
>+++ 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 x11/tycoon/Makefile x11/tycoon/Makefile
>index 1c62f20..168f7ea 100644
>--- x11/tycoon/Makefile
>+++ 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 x11/wmappl/Makefile x11/wmappl/Makefile
>index 8934952..3277741 100644
>--- x11/wmappl/Makefile
>+++ 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 x11/wmxss/Makefile x11/wmxss/Makefile
>index 46fadcf..bc060eb 100644
>--- x11/wmxss/Makefile
>+++ 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 x11/xkbctrl/Makefile x11/xkbctrl/Makefile
>index c89407c..fc6a076 100644
>--- x11/xkbctrl/Makefile
>+++ 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 x11/xvattr/Makefile x11/xvattr/Makefile
>index e28d111..951f6b4 100644
>--- x11/xvattr/Makefile
>+++ 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} \

Actions: View | Diff

Attachments on bug 213570: 175869