${RM} already has -f.

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

21 files changed, 27 insertions, 27 deletions

diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index d6d3dbbe33a6..1bf0724e66d1 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -31,7 +31,7 @@ OPTIONS_SUB=	yes
 TESTS_DESC=	Install tests
 
 post-patch:
-	@cd ${WRKSRC}; ${RM} -f cute_icons_for_site/Thumbs.db
+	@cd ${WRKSRC}; ${RM} cute_icons_for_site/Thumbs.db
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/databases/cassandra2/Makefile b/databases/cassandra2/Makefile
index 104c54e76df5..a82b638954ca 100644
--- a/databases/cassandra2/Makefile
+++ b/databases/cassandra2/Makefile
@@ -75,7 +75,7 @@ post-patch:
 .endfor
 	${REINPLACE_CMD} -e 's|\`dirname \$$\0\`/..|${DATADIR}|' \
 		${WRKSRC}/bin/cassandra.in.sh
-	${RM} -f ${WRKSRC}/conf/*.orig
+	${RM} ${WRKSRC}/conf/*.orig
 .if ${PORT_OPTIONS:MCQL}
 	${REINPLACE_CMD} -e 's|os.path.dirname(__file__)|"${DATADIR}/bin"|' \
 		${WRKSRC}/bin/cqlsh
diff --git a/databases/db5/Makefile b/databases/db5/Makefile
index 276aaef9a889..1cd700569e22 100644
--- a/databases/db5/Makefile
+++ b/databases/db5/Makefile
@@ -93,13 +93,13 @@ post-install:
 		       ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBMAJ} ; done
 
 post-install-JAVA-off:
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/java
+	${RM} -r ${STAGEDIR}${DOCSDIR}/java
 .for i in gsg gsg_db_rep gsg_txn
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}/JAVA
+	${RM} -r ${STAGEDIR}${DOCSDIR}/${i}/JAVA
 .endfor
 
 post-install-SQL-off:
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql
+	${RM} -r ${STAGEDIR}${DOCSDIR}/bdb-sql
 
 post-install-TCL-on:
 	echo "package ifneeded Db_tcl ${BDBVER} \
@@ -108,7 +108,7 @@ post-install-TCL-on:
 
 post-install-TCL-off:
 .for i in api_reference/TCL
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}
+	${RM} -r ${STAGEDIR}${DOCSDIR}/${i}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/databases/db6/Makefile b/databases/db6/Makefile
index 9f0540054235..415d97289c9e 100644
--- a/databases/db6/Makefile
+++ b/databases/db6/Makefile
@@ -81,13 +81,13 @@ post-install:
 	for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; done
 
 post-install-JAVA-off:
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/java
+	${RM} -r ${STAGEDIR}${DOCSDIR}/java
 .for i in gsg gsg_db_rep gsg_txn
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}/JAVA
+	${RM} -r ${STAGEDIR}${DOCSDIR}/${i}/JAVA
 .endfor
 
 post-install-SQL-off:
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql
+	${RM} -r ${STAGEDIR}${DOCSDIR}/bdb-sql
 
 post-install-SQL-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/../lang/sql/upgrade61.sh \
@@ -100,7 +100,7 @@ post-install-TCL-on:
 
 post-install-TCL-off:
 .for i in api_reference/TCL
-	${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}
+	${RM} -r ${STAGEDIR}${DOCSDIR}/${i}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile
index b720bbe94ae9..96ee43d6c463 100644
--- a/databases/dbconnect/Makefile
+++ b/databases/dbconnect/Makefile
@@ -33,7 +33,7 @@ PGSQL_CONFIGURE_ON=	--enable-pgsql=yes \
 			--with-pgsql_lib=${LOCALBASE}/lib
 
 post-patch:
-	@${RM} -f ${WRKSRC}/include/dbconn/README
+	@${RM} ${WRKSRC}/include/dbconn/README
 	@${REINPLACE_CMD} 's|gcc|${CC}|' \
 		${WRKSRC}/src/dbconnect/Makefile.in \
 		${WRKSRC}/src/driver_*/Makefile.in
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index 7e20d88f79d2..b1c2c5b35330 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -28,7 +28,7 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	progref
 
 post-extract:
-	${RM} -f ${WRKSRC}/doc/progref/progref-stamp
+	${RM} ${WRKSRC}/doc/progref/progref-stamp
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ltermcap|-lncurses|' ${WRKSRC}/configure
diff --git a/databases/mariadb100-client/Makefile b/databases/mariadb100-client/Makefile
index f5098c445737..866c578ab633 100644
--- a/databases/mariadb100-client/Makefile
+++ b/databases/mariadb100-client/Makefile
@@ -21,6 +21,6 @@ CLIENT_ONLY=	yes
 
 post-stage:
 	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
-	${RM} -rf ${STAGEDIR}${PREFIX}/include/mysql/private
+	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile
index c21fae07e2e3..fc1f8a3a5d38 100644
--- a/databases/mariadb100-server/Makefile
+++ b/databases/mariadb100-server/Makefile
@@ -154,7 +154,7 @@ USE_GCC=	yes
 .endif
 
 post-extract-OQGRAPH-off:
-	@${RM} -rf ${WRKSRC}/storage/oqgraph
+	@${RM} -r ${WRKSRC}/storage/oqgraph
 
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile
index 606afc678bd8..06152a0ca0be 100644
--- a/databases/mariadb55-server/Makefile
+++ b/databases/mariadb55-server/Makefile
@@ -117,7 +117,7 @@ USE_GCC=	yes
 .endif
 
 post-extract-OQGRAPH-off:
-	@${RM} -rf ${WRKSRC}/storage/oqgraph
+	@${RM} -r ${WRKSRC}/storage/oqgraph
 
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index f418b2b7c55f..5ca6b464b47a 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -38,6 +38,6 @@ post-install:
 		${SED} -e "s|/usr/include/mysql|${LOCALBASE}/include/mysql|" | \
 		${SED} -e "s|-lmysqlpp|-L${PREFIX}/lib -L${LOCALBASE}/lib/mysql -lmysqlpp|" \
 		> ${STAGEDIR}${EXAMPLESDIR}/Makefile
-	@${RM} -f ${STAGEDIR}${EXAMPLESDIR}/Makefile.temp
+	@${RM} ${STAGEDIR}${EXAMPLESDIR}/Makefile.temp
 
 .include <bsd.port.mk>
diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index 16afa1d0f36e..5edfb371c1b8 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -31,7 +31,7 @@ CMAKE_ARGS+=-DCMAKE_ENABLE_C++11=ON
 .endif
 
 post-install:
-	@${RM} -f ${STAGEDIR}${DOCSDIR}/INSTALL \
+	@${RM} ${STAGEDIR}${DOCSDIR}/INSTALL \
 		${STAGEDIR}${DOCSDIR}/COPYING
 
 .if defined(MAINTAINER_MODE)
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 73d82ccf134c..22130fd04ea4 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -148,7 +148,7 @@ CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
 .endif
 
 post-extract:
-	@${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
+	@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
 
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
diff --git a/databases/p5-DBD-SQLite2/Makefile b/databases/p5-DBD-SQLite2/Makefile
index 3f9ead5be90e..40714f87dd78 100644
--- a/databases/p5-DBD-SQLite2/Makefile
+++ b/databases/p5-DBD-SQLite2/Makefile
@@ -20,7 +20,7 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
-	@${RM} -f ${WRKSRC}/getsqlite.pl
+	@${RM} ${WRKSRC}/getsqlite.pl
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/SQLite2/SQLite2.so
diff --git a/databases/pgfouine/Makefile b/databases/pgfouine/Makefile
index 7fd2a89260f0..d949eb09d386 100644
--- a/databases/pgfouine/Makefile
+++ b/databases/pgfouine/Makefile
@@ -19,7 +19,7 @@ pre-configure:
 	${REINPLACE_CMD} -e 's,/usr/bin/php,${LOCALBASE}/bin/php,g;' \
 		-e 's,!!PREFIX!!,${PREFIX},g' \
 		${WRKSRC}/pgfouine.php ${WRKSRC}/pgfouine_vacuum.php
-	${FIND} -d ${WRKSRC} -type d -name 'CVS' -exec ${RM} -rf {} \;
+	${FIND} -d ${WRKSRC} -type d -name 'CVS' -exec ${RM} -r {} \;
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pgfouine.php ${STAGEDIR}${PREFIX}/bin/pgfouine
diff --git a/databases/pgmodeler/Makefile b/databases/pgmodeler/Makefile
index f770a76c8d7b..65cf5f548223 100644
--- a/databases/pgmodeler/Makefile
+++ b/databases/pgmodeler/Makefile
@@ -30,6 +30,6 @@ pre-install:
 	@${MKDIR} ${STAGEDIR}/${LOCALBASE}/lib/${PORTNAME}/plugins
 
 post-install:
-	@${RM} -f ${STAGEDIR}${PREFIX}/bin/tests
+	@${RM} ${STAGEDIR}${PREFIX}/bin/tests
 
 .include <bsd.port.mk>
diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index 0cb76fe9a850..83cd5d0531d2 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -32,7 +32,7 @@ pre-everything::
 do-configure:
 	${REINPLACE_CMD} -e "s|/usr/bin/pg|${LOCALBASE}/bin/pg|" \
 		${WRKSRC}/conf/config.inc.php-dist
-	${RM} -f ${WRKSRC}/conf/config.inc.php \
+	${RM} ${WRKSRC}/conf/config.inc.php \
 		${WRKSRC}/conf/config.inc.php-dist.bak
 
 do-install:
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile
index fbbb26871a12..af8a90bd1393 100644
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@@ -22,7 +22,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	graphite-project
 
 post-stage:
-	${RM} -rf ${STAGEDIR}${PREFIX}/examples/init.d
+	${RM} -r ${STAGEDIR}${PREFIX}/examples/init.d
 	${RMDIR} ${STAGEDIR}${PREFIX}/examples
 
 .include <bsd.port.mk>
diff --git a/databases/py-pymssql/Makefile b/databases/py-pymssql/Makefile
index 04691c2a0bbc..9f3c0091d4bb 100644
--- a/databases/py-pymssql/Makefile
+++ b/databases/py-pymssql/Makefile
@@ -20,7 +20,7 @@ USES=		python
 USE_PYTHON=	autoplist distutils
 
 post-extract:
-	@${RM} -f ${WRKSRC}/_mssql.c
+	@${RM} ${WRKSRC}/_mssql.c
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_mssql.so \
diff --git a/databases/riak/Makefile b/databases/riak/Makefile
index 61cab647f488..c39153af2edb 100644
--- a/databases/riak/Makefile
+++ b/databases/riak/Makefile
@@ -52,7 +52,7 @@ post-patch:
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/rel/vars.config
 
 pre-install:
-	${RM} -f ${PLIST}
+	${RM} ${PLIST}
 	${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
 	(cd ${WRKSRC}/rel/${PORTNAME}; ${FIND} releases -type f \
 		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
diff --git a/databases/ruby-cdb/Makefile b/databases/ruby-cdb/Makefile
index 0bcd0418e36b..9e6cb4893e16 100644
--- a/databases/ruby-cdb/Makefile
+++ b/databases/ruby-cdb/Makefile
@@ -33,7 +33,7 @@ post-patch:
 		${WRKSRC}/cdb.c
 
 post-extract:
-	${RM} -f ${WRKSRC}/cdb
+	${RM} ${WRKSRC}/cdb
 	${LN} -s `cd ${CDB_PORTDIR}; ${MAKE} -V WRKSRC` ${WRKSRC}/cdb
 
 post-install:
diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile
index 9e292debf103..fe0aaa14aa6c 100644
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@@ -31,7 +31,7 @@ DESKTOP_ENTRIES="Squirrel-SQL Client" \
 		false
 
 post-extract:
-	cd "${WRKSRC}" && ${RM} -rf Uninstaller *.bat *.sh .installationinformation
+	cd "${WRKSRC}" && ${RM} -r Uninstaller *.bat *.sh .installationinformation
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}