21 files changed, 25 insertions, 25 deletions

diff --git a/audio/autozen/Makefile b/audio/autozen/Makefile
index f1f81efbc7fe..5a5c60a5cb90 100644
--- a/audio/autozen/Makefile
+++ b/audio/autozen/Makefile
@@ -33,7 +33,7 @@ USE_GNOME=	gtk20
 MAKE_ENV=	GTK_CONFIG="pkg-config gtk+-2.0"
 
 post-extract:
-	@cd ${WRKSRC} && ${RM} -f autozen seq2wav
+	@cd ${WRKSRC} && ${RM} autozen seq2wav
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/audio/eawplus/Makefile b/audio/eawplus/Makefile
index b9ac04f7ca44..da96c66a6fa4 100644
--- a/audio/eawplus/Makefile
+++ b/audio/eawplus/Makefile
@@ -24,8 +24,8 @@ PLIST_SUB=	TIMIDITY_DATADIR=${TIMIDITY_DATADIR}
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	@${RM} -f ${WRKSRC}/timidity/inst/GUS/power/h-hihatp.pat.orig
-	@${RM} -f ${WRKSRC}/timidity/inst/GUS/power/h-snare.pat.orig
+	@${RM} ${WRKSRC}/timidity/inst/GUS/power/h-hihatp.pat.orig
+	@${RM} ${WRKSRC}/timidity/inst/GUS/power/h-snare.pat.orig
 
 do-build:
 	${SED}	-e "s|%%PREFIX%%|${PREFIX}|g" \
diff --git a/audio/festdoc/Makefile b/audio/festdoc/Makefile
index 5f86c4179c01..07542cb780c3 100644
--- a/audio/festdoc/Makefile
+++ b/audio/festdoc/Makefile
@@ -30,7 +30,7 @@ do-install:
 	  ${CP} $$info ${STAGEDIR}${PREFIX}/info && \
 	  ${CP} -r ${WRKSRC}/* ${STAGEDIR}${FDOC} && \
 	  cd ${STAGEDIR}${FDOC} && \
-	  ${RM} -f $$info && \
+	  ${RM} $$info && \
 	  ${RMDIR} festival/info
 
 .include <bsd.port.mk>
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 27faf2aacb9f..2494d0430a0c 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -100,7 +100,7 @@ do-install:
 	${FIND} ${FESTIVAL}/lib -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 	${FIND} ${FESTIVAL} -type f -name *.orig -delete
 	${CP} -pPR ${FESTIVAL}/lib ${FESTIVAL}/examples ${STAGEDIR}${DATADIR}
-	${RM} -rf ${STAGEDIR}${DATADIR}/lib/etc/Makefile ${STAGEDIR}${DATADIR}/lib/etc/*FreeBSD* \
+	${RM} -r ${STAGEDIR}${DATADIR}/lib/etc/Makefile ${STAGEDIR}${DATADIR}/lib/etc/*FreeBSD* \
 	    ${STAGEDIR}${DATADIR}/lib/etc/*unknown
 	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/*/audsp ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival ${STAGEDIR}${PREFIX}/libexec/festival.naked
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index 2ba5af39ed72..b34efb466344 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -29,6 +29,6 @@ post-extract:
 do-install:
 	@${MKDIR} ${STAGEDIR}${FHOME}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${FHOME}
-	${RM} -f ${STAGEDIR}${PREFIX}/share/festival/lib/voices/spanish/el_diphone/COPYING
+	${RM} ${STAGEDIR}${PREFIX}/share/festival/lib/voices/spanish/el_diphone/COPYING
 
 .include <bsd.port.mk>
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index cf509ee016e1..24672fcc76d1 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -30,7 +30,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lltdl
 
 post-extract:
-	@cd ${WRKSRC}/doc && ${RM} -f *.info*
+	@cd ${WRKSRC}/doc && ${RM} *.info*
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| libltdl|| ; s|,$$LIBLTDL,|,,| ; \
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index ce4c3825ff78..44c2595452d9 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -18,7 +18,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/zlib
+	@${RM} -r ${WRKSRC}/zlib
 
 post-patch:
 	@${REINPLACE_CMD} '/main/s/unsigned int/int/' \
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 24c434f89497..3c2ca847b3dd 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -61,9 +61,9 @@ post-patch:
 		${WRKSRC}/example-clients/Makefile.in
 	@${REINPLACE_CMD} -e 's|md5sum|md5 -q|g' \
 		${WRKSRC}/jackd/Makefile.in
-	@${RM} -f ${WRKSRC}/doc/reference/html/*
+	@${RM} ${WRKSRC}/doc/reference/html/*
 
 post-build:
-	@${RM} -f ${WRKSRC}/doc/reference/html/dir__2F*
+	@${RM} ${WRKSRC}/doc/reference/html/dir__2F*
 
 .include <bsd.port.mk>
diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
index 3003c8d9e7ad..789f901d3e21 100644
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -26,6 +26,6 @@ post-patch:
 		 ${WRKSRC}/src/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		 ${WRKSRC}/cmake/modules/*.cmake
-	${RM} -f ${WRKSRC}/cmake/modules/FindLibXml2.cmake
+	${RM} ${WRKSRC}/cmake/modules/FindLibXml2.cmake
 
 .include <bsd.port.mk>
diff --git a/audio/libnoise/Makefile b/audio/libnoise/Makefile
index 312e876decb7..6042c207d63e 100644
--- a/audio/libnoise/Makefile
+++ b/audio/libnoise/Makefile
@@ -36,6 +36,6 @@ do-install:
 		${INSTALL_LIB} libnoise.la ${STAGEDIR}${PREFIX}/lib)
 	(cd ${WRKSRC}/include && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/noise)
-	${RM} -f ${STAGEDIR}${PREFIX}/include/noise/Makefile
+	${RM} ${STAGEDIR}${PREFIX}/include/noise/Makefile
 
 .include <bsd.port.mk>
diff --git a/audio/nosefart/Makefile b/audio/nosefart/Makefile
index 936cb66b4e62..421bee8b9eda 100644
--- a/audio/nosefart/Makefile
+++ b/audio/nosefart/Makefile
@@ -20,7 +20,7 @@ MAKE_ENV=	INSTALL="${INSTALL}" COPY="${COPY}" STRIP="${STRIP}" \
 PLIST_FILES=	bin/nosefart
 
 pre-build:
-	@${RM} -rf ${BUILD_WRKSRC}/nsfobj
+	@${RM} -r ${BUILD_WRKSRC}/nsfobj
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nsfobj/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile
index d2f3661c9c19..e8efa65bda50 100644
--- a/audio/opusfile/Makefile
+++ b/audio/opusfile/Makefile
@@ -50,7 +50,7 @@ post-patch:
 	@${CP} ${FILESDIR}/ftime.c ${WRKSRC}/src/
 
 post-install-DOXYGEN-on:
-	@${RM} -f ${WRKDIR}/PLIST.doc ; \
+	@${RM} ${WRKDIR}/PLIST.doc ; \
 	${FIND} ${STAGEDIR}${DOCSDIR}/html -type f | \
 		${SED} 's|${STAGEDIR}${PREFIX}/||' \
 		>> ${WRKDIR}/PLIST.doc ; \
diff --git a/audio/p5-libvorbis/Makefile b/audio/p5-libvorbis/Makefile
index 4166b7a06880..d9d4c961f48d 100644
--- a/audio/p5-libvorbis/Makefile
+++ b/audio/p5-libvorbis/Makefile
@@ -19,7 +19,7 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/blib ${WRKSRC}/pm_to_blib
+	@${RM} -r ${WRKSRC}/blib ${WRKSRC}/pm_to_blib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/Makefile.PL
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 94a1f49f8f36..d2fa282cac2e 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -92,6 +92,6 @@ post-install:
 .endfor
 
 post-install-BASH-off:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/share/bash-completion
+	@${RM} -r ${STAGEDIR}${PREFIX}/share/bash-completion
 
 .include <bsd.port.mk>
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 396f6ff051bf..a6b7faf98df2 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -92,6 +92,6 @@ post-patch:
 
 # rbzeitgeist plugin needs py3-zeitgeist
 post-install:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/rhythmbox/plugins/rbzeitgeist
+	@${RM} -r ${STAGEDIR}${PREFIX}/lib/rhythmbox/plugins/rbzeitgeist
 
 .include <bsd.port.post.mk>
diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index 95669d7df1a7..a65eff9432e9 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -19,6 +19,6 @@ USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 post-extract:
-	@${RM} -f ${WRKSRC}/src/getopt*
+	@${RM} ${WRKSRC}/src/getopt*
 
 .include <bsd.port.mk>
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 7c5aab909d09..7d7bf4fdabb9 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -63,8 +63,8 @@ CONFLICTS_INSTALL=	timidity-[0-9]*
 DOCFILES=	README.alsaseq README.dl README.m2m README.mts README.sf
 
 pre-patch:
-	@${RM} -f ${WRKSRC}/libarc/*.h
-	@${RM} -f ${WRKSRC}/utils/mblock.h
+	@${RM} ${WRKSRC}/libarc/*.h
+	@${RM} ${WRKSRC}/utils/mblock.h
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${TIMID_LIBDIR}
diff --git a/audio/timidity++/Makefile.interface b/audio/timidity++/Makefile.interface
index d441058ae03a..2f0bfa188666 100644
--- a/audio/timidity++/Makefile.interface
+++ b/audio/timidity++/Makefile.interface
@@ -121,8 +121,8 @@ DESKTOP_ENTRIES="XSkinMidi" "" "" "${LINK}" "AudioVideo;Audio;Midi;" ""
 .endif
 
 post-extract:
-	@${RM} -f ${WRKSRC}/libarc/*.h
-	@${RM} -f ${WRKSRC}/utils/mblock.h
+	@${RM} ${WRKSRC}/libarc/*.h
+	@${RM} ${WRKSRC}/utils/mblock.h
 
 post-patch:
 .if ${INTERFACE} == "slang"
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index bf02cbd6e722..726fc5096abb 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -49,7 +49,7 @@ XMMS_LIB_DEPENDS=	libxmms.so:multimedia/xmms
 XMMS_CONFIGURE_WITH=	xmms
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/players/S
+	@${RM} -r ${WRKSRC}/players/S
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,lib/pkgconfig,libdata/pkgconfig,' \
diff --git a/audio/wildmidi/Makefile b/audio/wildmidi/Makefile
index 525d95d38d20..9b388c38bef7 100644
--- a/audio/wildmidi/Makefile
+++ b/audio/wildmidi/Makefile
@@ -68,7 +68,7 @@ post-patch:
 		${REINPLACE_CMD} '/INSTALL/s@share/man@man@'
 
 pre-install:
-	@${RM} -f ${WRKSRC}/docs/man/man1/wildmidi.1${REINPLACE_ARGS:S/-i//} \
+	@${RM} ${WRKSRC}/docs/man/man1/wildmidi.1${REINPLACE_ARGS:S/-i//} \
 		${WRKSRC}/docs/man/man5/wildmidi.cfg.5${REINPLACE_ARGS:S/-i//}
 	${MKDIR} ${STAGEDIR}${DATADIR} ; \
 	${CP} ${WRKSRC}/cfg/wildmidi.cfg ${STAGEDIR}${DATADIR}/wildmidi.cfg.sample
diff --git a/audio/xmms-gbsplay/Makefile b/audio/xmms-gbsplay/Makefile
index 3389a121e882..adde84452817 100644
--- a/audio/xmms-gbsplay/Makefile
+++ b/audio/xmms-gbsplay/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS=	--disable-nas --prefix=${PREFIX}
 PLIST_FILES=	lib/xmms/Input/gbsxmms.so
 
 post-extract:
-	@${RM} -f ${WRKSRC}/po/subdir.mk
+	@${RM} ${WRKSRC}/po/subdir.mk
 
 post-patch:
 	@${REINPLACE_CMD} -e \