22 files changed, 36 insertions, 36 deletions

diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 7d501433355f..afbc0cf78379 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -33,10 +33,10 @@ CONFIGURE_ARGS=	--with-x=no
 .endif
 
 post-extract:
-	@${RM} -f ${WRKSRC}/doc/aalib.info*
+	@${RM} ${WRKSRC}/doc/aalib.info*
 
 post-patch:
-	@${RM} -f ${WRKSRC}/config.cache
+	@${RM} ${WRKSRC}/config.cache
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
 		s|MAKEINFO=makeinfo|MAKEINFO="makeinfo --no-split"|g' \
 		${WRKSRC}/configure
diff --git a/graphics/acidwarp/Makefile b/graphics/acidwarp/Makefile
index 3ea7f7671417..b79db771d7b0 100644
--- a/graphics/acidwarp/Makefile
+++ b/graphics/acidwarp/Makefile
@@ -29,7 +29,7 @@ BINMODE=	4555
 .endif
 
 post-extract:
-	${RM} -f ${WRKSRC}/acidwarp
+	${RM} ${WRKSRC}/acidwarp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/acidwarp ${STAGEDIR}${PREFIX}/bin
diff --git a/graphics/blender-doc/Makefile b/graphics/blender-doc/Makefile
index 6bb747fe11e5..b4d15fe83f14 100644
--- a/graphics/blender-doc/Makefile
+++ b/graphics/blender-doc/Makefile
@@ -21,7 +21,7 @@ post-extract:
 	@${CHMOD} u+rwx ${WRKSRC}/* && ${CHMOD} u+rwx ${WRKSRC}/*/* && \
 		${CHMOD} u+rwx ${WRKSRC}/*/*/* && ${CHMOD} u+rwx ${WRKSRC}/*/*/*/*
 	@cd ${WRKSRC}/htmlI/PartAT/volumetrics/gfx/ && \
-		${RM} -rf  "Nuova cartella" "Nuova cartella (2)"
+		${RM} -r  "Nuova cartella" "Nuova cartella (2)"
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/graphics/compupic/Makefile b/graphics/compupic/Makefile
index 24c635e6c913..a55ed19067ef 100644
--- a/graphics/compupic/Makefile
+++ b/graphics/compupic/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 do-install:
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTNAME}.tar.gz \
 		${EXTRACT_AFTER_ARGS} -C ${STAGEDIR}${PREFIX}
-	${RM} -f ${STAGEDIR}${PREFIX}/bin/compupic
+	${RM} ${STAGEDIR}${PREFIX}/bin/compupic
 	${LN} -sf ${PREFIX}/compupic/compupic ${STAGEDIR}${PREFIX}/bin/compupic
 	${INSTALL_MAN} ${STAGEDIR}${PREFIX}/compupic/compupic.1 \
 		${STAGEDIR}${PREFIX}/man/man1
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 26617b3a30d4..1afb11b0af45 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -34,6 +34,6 @@ PKGHELP=	${.CURDIR}/pkg-help
 .include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
 
 post-install:
-	@${RM} -rf ${STAGEDIR}/etc/OpenCL
+	@${RM} -r ${STAGEDIR}/etc/OpenCL
 
 .include <bsd.port.mk>
diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile
index 66d337e20880..b2bda40383dd 100644
--- a/graphics/exact-image/Makefile
+++ b/graphics/exact-image/Makefile
@@ -38,7 +38,7 @@ PLIST_FILES=	${BINS:S|^|bin/|} \
 		%%PYTHON_SITELIBDIR%%/_ExactImage.so
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/agg-2.4/
+	@${RM} -r ${WRKSRC}/agg-2.4/
 
 post-patch:
 	@${REINPLACE_CMD} -e '1s|/.*|/bin/sh|;s|/usr/local|${LOCALBASE}|;\
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 22ad58378bc3..452d716e20ef 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -114,14 +114,14 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/GNUmakefile
 	@${REINPLACE_CMD} -e 's|-lminizip|-lkmlminizip|' ${WRKSRC}/configure
 # Cleanup bundled libraries
-	@${RM} -fr ${WRKSRC}/frmts/gif/giflib/
-	@${RM} -fr ${WRKSRC}/frmts/gtiff/libgeotiff/
-	@${RM} -fr ${WRKSRC}/frmts/gtiff/libtiff/
-	@${RM} -fr ${WRKSRC}/frmts/jpeg/libjpeg/
-	@${RM} -fr ${WRKSRC}/frmts/jpeg/libjpeg12/
-	@${RM} -fr ${WRKSRC}/frmts/png/libpng/
-	@${RM} -fr ${WRKSRC}/frmts/zlib/
-	@${RM} -fr ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/
+	@${RM} -r ${WRKSRC}/frmts/gif/giflib/
+	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/
+	@${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/
+	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg/
+	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg12/
+	@${RM} -r ${WRKSRC}/frmts/png/libpng/
+	@${RM} -r ${WRKSRC}/frmts/zlib/
+	@${RM} -r ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile
index f0be63c2d290..fa923f281cca 100644
--- a/graphics/ilmbase/Makefile
+++ b/graphics/ilmbase/Makefile
@@ -35,7 +35,7 @@ regression-test regression test check:	build
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libHalf.so.${VER}
-	${RM} -f ${STAGEDIR}${PREFIX}/lib/*.la
+	${RM} ${STAGEDIR}${PREFIX}/lib/*.la
 .for l in libIex libIexMath libImath libIlmThread
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${l}-${MAJORVER}.so.${VER}
 	${LN} -s ${l}-${MAJORVER}.so.${VER} ${STAGEDIR}${PREFIX}/lib/${l}.so
diff --git a/graphics/libboard/Makefile b/graphics/libboard/Makefile
index 6a2c5c8a9835..5f7cef89763a 100644
--- a/graphics/libboard/Makefile
+++ b/graphics/libboard/Makefile
@@ -43,13 +43,13 @@ post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
-	${RM} -rf ${STAGEDIR}${DOCSDIR}/.svn
+	${RM} -r ${STAGEDIR}${DOCSDIR}/.svn
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/
 	cd ${WRKSRC}/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${EXAMPLESDIR}/
-	${RM} -rf ${STAGEDIR}${EXAMPLESDIR}/.svn
+	${RM} -r ${STAGEDIR}${EXAMPLESDIR}/.svn
 .endif
 
 regression-test:
diff --git a/graphics/libglapi/Makefile b/graphics/libglapi/Makefile
index 57fc54a667d7..b3f98cea3430 100644
--- a/graphics/libglapi/Makefile
+++ b/graphics/libglapi/Makefile
@@ -27,8 +27,8 @@ MESA_INSTALL_WRKSRC=	src/mapi
 .include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
 
 post-install:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/include/GLES*
-	@${RM} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so*
-	@${RM} -f ${STAGEDIR}${PREFIX}/libdata/pkgconfig/glesv2.pc
+	@${RM} -r ${STAGEDIR}${PREFIX}/include/GLES*
+	@${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so*
+	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/glesv2.pc
 
 .include <bsd.port.mk>
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 9c2da2d1625e..0cec95467f38 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -37,7 +37,7 @@ X11_MAKE_ENV=	WITH_X11=yes
 MANPAGES_DISTFILES=	netpbm-manpages-2013-03-09${EXTRACT_SUFX}:man
 
 post-extract-X11-off:
-	@-${RM} -f ${WRKDIR}/doc/pamx.1 # only relevant for MANPAGES=on
+	@-${RM} ${WRKDIR}/doc/pamx.1 # only relevant for MANPAGES=on
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|doc/USERDOC|${DOCSDIR}/USERDOC|g' \
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 898e2d81001b..568ffc55010b 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -71,7 +71,7 @@ PLIST_SUB+=	UNAMEP=${ARCH}
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${RM} -f ${WRKSRC}/include/stamp-h.in
+	@${RM} ${WRKSRC}/include/stamp-h.in
 .for dir in doc help html man
 	@${FIND} ${WRKSRC}/${dir} -type f | ${XARGS} \
 		${REINPLACE_CMD} -e "s;/usr/lpp;${PREFIX};g"
diff --git a/graphics/p5-Image-IPTCInfo/Makefile b/graphics/p5-Image-IPTCInfo/Makefile
index 59b96b465636..618d2e95c02d 100644
--- a/graphics/p5-Image-IPTCInfo/Makefile
+++ b/graphics/p5-Image-IPTCInfo/Makefile
@@ -18,7 +18,7 @@ SHEBANG_FILES=	demo.pl
 OPTIONS_DEFINE=	EXAMPLES
 
 post-patch:
-	@${RM} -f ${WRKSRC}/._*
+	@${RM} ${WRKSRC}/._*
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/graphics/p5-SVG-Metadata/Makefile b/graphics/p5-SVG-Metadata/Makefile
index 9ab5f9f00dd2..698811608801 100644
--- a/graphics/p5-SVG-Metadata/Makefile
+++ b/graphics/p5-SVG-Metadata/Makefile
@@ -18,6 +18,6 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
-	${RM} -f ${WRKSRC}/lib/SVG/Metadata.pm.orig
+	${RM} ${WRKSRC}/lib/SVG/Metadata.pm.orig
 
 .include <bsd.port.mk>
diff --git a/graphics/processing/Makefile b/graphics/processing/Makefile
index 15aa06ad97a1..0e7473f97805 100644
--- a/graphics/processing/Makefile
+++ b/graphics/processing/Makefile
@@ -27,7 +27,7 @@ SUB_FILES=	processing
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 post-extract:
-	${RM} -rf ${WRKSRC}/java
+	${RM} -r ${WRKSRC}/java
 	${MV} ${WRKSRC}/processing ${WRKSRC}/start-processing
 	${LN} -s ${JAVA_HOME} ${WRKSRC}/java
 	${FIND} ${WRKSRC}/modes/java/reference/ -exec ${CHMOD} 555 {} \;
diff --git a/graphics/py-graphy/Makefile b/graphics/py-graphy/Makefile
index ad08dd14ee42..c2c0f4d85e21 100644
--- a/graphics/py-graphy/Makefile
+++ b/graphics/py-graphy/Makefile
@@ -30,7 +30,7 @@ post-patch:
 		${WRKSRC}/examples/*.py \
 		${WRKSRC}/${PORTNAME}/*.py
 	@${FIND} ${WRKSRC} -name '.svn' -or -name '*.bak' | \
-		${XARGS} ${RM} -rf
+		${XARGS} ${RM} -r
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}
diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile
index efb78c7ddaeb..fd789595dc7e 100644
--- a/graphics/qslim/Makefile
+++ b/graphics/qslim/Makefile
@@ -34,7 +34,7 @@ FLTK_CONFIG=	${LOCALBASE}/bin/fltk-config
 GUI_LIBS=	$$(${FLTK_CONFIG} --use-gl --ldflags)
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/libgfx/
+	@${RM} -r ${WRKSRC}/libgfx/
 
 post-patch:
 	@${REINPLACE_CMD} -e '/gfx-config/d' ${CONFIGURE_WRKSRC}/mix-config.in
diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile
index 91277314d173..c0b2229aed09 100644
--- a/graphics/raster3d/Makefile
+++ b/graphics/raster3d/Makefile
@@ -60,7 +60,7 @@ do-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-	${RM} -rf ${STAGEDIR}${EXAMPLESDIR}/msms/CVS
+	${RM} -r ${STAGEDIR}${EXAMPLESDIR}/msms/CVS
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/structuresynth/Makefile b/graphics/structuresynth/Makefile
index b23b4d068ace..9f029cf5d0ac 100644
--- a/graphics/structuresynth/Makefile
+++ b/graphics/structuresynth/Makefile
@@ -24,7 +24,7 @@ PORTDATA=	*
 
 post-extract:
 	@${MV} "${WRKDIR}/Structure Synth Source Code" ${WRKSRC}
-	@${RM} -rf ${WRKSRC}/Examples/DontDeploy
+	@${RM} -r ${WRKSRC}/Examples/DontDeploy
 
 post-patch:
 	@${REINPLACE_CMD} -e '/examplesDir/ s|"Examples"|"${DATADIR}/Examples"|; \
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 3ea593295ed4..62c35bbd6167 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -53,9 +53,9 @@ USES+=	gettext
 
 post-extract:
 	@cd ${WRKSRC}/Doc && ${FIND} . -type f -name "*.orig" -delete
-	@${RM} -f ${WRKSRC}/Doc/html/images/pspbrwse.jbf
-	@${RM} -f ${WRKSRC}/Libraries/Examples/xfig.exe.stackdump
-	@${RM} -f ${WRKSRC}/Libraries/Fasteners/Fasteners.tar
+	@${RM} ${WRKSRC}/Doc/html/images/pspbrwse.jbf
+	@${RM} ${WRKSRC}/Libraries/Examples/xfig.exe.stackdump
+	@${RM} ${WRKSRC}/Libraries/Fasteners/Fasteners.tar
 	@cd ${WRKSRC}/Doc && ${FIND} -s . -type d -print0 | ${XARGS} -0 ${CHMOD} a+rx
 	@cd ${WRKSRC}/Doc && ${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} a-x+r
 	@${CHMOD} a+rx ${WRKSRC}/Libraries
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 7f0e186c0953..42180c871b04 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -29,10 +29,10 @@ SHEBANG_FILES=	share/bin/imgmerge share/bin/xpaint_ocr
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
-MAKE_ENV+=	RM="${RM} -f"
+MAKE_ENV+=	RM="${RM}"
 
 post-patch:
-	@${RM} -f ${WRKSRC}/XPaint.ad
+	@${RM} ${WRKSRC}/XPaint.ad
 	@${REINPLACE_CMD} -e 's/-ldl //' \
 		${WRKSRC}/configure ${WRKSRC}/rw/configure
 	@${REINPLACE_CMD} -e '/^LIBTOOL =/s|=.*|= ${LOCALBASE}/bin/libtool|' \
diff --git a/graphics/zathura/Makefile b/graphics/zathura/Makefile
index 63968326d7db..3fde4bc43d98 100644
--- a/graphics/zathura/Makefile
+++ b/graphics/zathura/Makefile
@@ -52,7 +52,7 @@ post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's|/etc|${PREFIX}&|g' \
 		${WRKSRC}/zathura/config.h \
 		${WRKSRC}/doc/man/zathurarc.5.rst
-	(cd ${WRKSRC}; ${RM} -f zathura.1 zathurarc.5)
+	(cd ${WRKSRC}; ${RM} zathura.1 zathurarc.5)
 
 post-patch-NLS-off: .SILENT
 	${REINPLACE_CMD} -e '/-C po/d'\