From 316cf6317eb621c4567d3b8e337fa9ba3097ea56 Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 21 Oct 2016 12:51:40 +0000 Subject: ${RM} already has -f. PR: 213570 Submitted by: mat Exp-run by: antoine Sponsored by: Absolight --- games/7kaa/Makefile | 2 +- games/atris/Makefile | 2 +- games/barbie_seahorse_adventures/Makefile | 2 +- games/battalion/Makefile | 2 +- games/biniax2/Makefile | 2 +- games/block/Makefile | 4 ++-- games/bomberclone/Makefile | 2 +- games/bubbros/Makefile | 4 ++-- games/bugsquish/Makefile | 4 ++-- games/enigma/Makefile | 2 +- games/evq3/Makefile | 2 +- games/flightgear-aircraft/Makefile | 2 +- games/flightgear-data/Makefile | 4 ++-- games/flightgear-mb339-pan/Makefile | 2 +- games/freera/Makefile | 2 +- games/gemdropx/Makefile | 2 +- games/gnugo/Makefile | 2 +- games/gondola/Makefile | 2 +- games/gretools/Makefile | 4 ++-- games/grubik/Makefile | 2 +- games/heroes/Makefile | 4 ++-- games/jigzo/Makefile | 2 +- games/jools/Makefile | 2 +- games/kobodeluxe/Makefile | 2 +- games/ldmud/Makefile | 2 +- games/linux-unrealgold/Makefile | 2 +- games/linux-ut2003-demo/Makefile | 2 +- games/marsnomercy/Makefile | 2 +- games/njam/Makefile | 2 +- games/numptyphysics-npcomplete/Makefile | 2 +- games/optimax/Makefile | 2 +- games/pysolfc/Makefile | 4 ++-- games/pythonchess/Makefile | 2 +- games/q2pro/Makefile | 2 +- games/quadra/Makefile | 2 +- games/quake-dpmod/Makefile | 2 +- games/quake3-data/Makefile | 2 +- games/rnd_jue/Makefile | 8 ++++---- games/rockdodger/Makefile | 2 +- games/rocksndiamonds-data/Makefile | 2 +- games/rocksndiamonds/Makefile | 4 ++-- games/scorched3d/Makefile | 2 +- games/sdb/Makefile | 2 +- games/sdl_jewels/Makefile | 2 +- games/stransball2/Makefile | 2 +- games/trigger-data/Makefile | 2 +- games/tuxpaint/Makefile | 2 +- games/ufoai-data/Makefile | 2 +- games/ultimatestunts/Makefile | 2 +- games/vectoroids/Makefile | 2 +- games/worldofpadman/Makefile | 2 +- games/xmoto/Makefile | 2 +- games/znibbles/Makefile | 2 +- 53 files changed, 64 insertions(+), 64 deletions(-) (limited to 'games') diff --git a/games/7kaa/Makefile b/games/7kaa/Makefile index cb3ecfadb82a..66a881a35a06 100644 --- a/games/7kaa/Makefile +++ b/games/7kaa/Makefile @@ -27,6 +27,6 @@ PORTDATA= * OPTIONS_DEFINE= DOCS post-install: - @${RM} -f ${STAGEDIR}${DOCSDIR}/COPYING + @${RM} ${STAGEDIR}${DOCSDIR}/COPYING .include diff --git a/games/atris/Makefile b/games/atris/Makefile index 6694fbde67aa..c5a8e14ff38a 100644 --- a/games/atris/Makefile +++ b/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 diff --git a/games/barbie_seahorse_adventures/Makefile b/games/barbie_seahorse_adventures/Makefile index bfbad91476ae..1614ac24a4a7 100644 --- a/games/barbie_seahorse_adventures/Makefile +++ b/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 a/games/battalion/Makefile b/games/battalion/Makefile index 15306a243321..04d5dc84d196 100644 --- a/games/battalion/Makefile +++ b/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 a/games/biniax2/Makefile b/games/biniax2/Makefile index 680fd0dc9f2f..a505a0d9a79c 100644 --- a/games/biniax2/Makefile +++ b/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 a/games/block/Makefile b/games/block/Makefile index e8760453346a..10d3cf4fc85f 100644 --- a/games/block/Makefile +++ b/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 a/games/bomberclone/Makefile b/games/bomberclone/Makefile index 7e25a2cc52bd..c80a5bc81f77 100644 --- a/games/bomberclone/Makefile +++ b/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 a/games/bubbros/Makefile b/games/bubbros/Makefile index 60c84065cb3d..fa391c9e0118 100644 --- a/games/bubbros/Makefile +++ b/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 a/games/bugsquish/Makefile b/games/bugsquish/Makefile index 30aa6c5f1cf8..365ce964efc0 100644 --- a/games/bugsquish/Makefile +++ b/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 a/games/enigma/Makefile b/games/enigma/Makefile index 1b96c14d223e..b1aebd24c123 100644 --- a/games/enigma/Makefile +++ b/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 diff --git a/games/evq3/Makefile b/games/evq3/Makefile index cc107ebebff3..d607f514fbae 100644 --- a/games/evq3/Makefile +++ b/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 diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile index 8a88333a9b8c..cd121507f683 100644 --- a/games/flightgear-aircraft/Makefile +++ b/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 a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile index 0ec7b13c62f9..5ed4ffebf0eb 100644 --- a/games/flightgear-data/Makefile +++ b/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 a/games/flightgear-mb339-pan/Makefile b/games/flightgear-mb339-pan/Makefile index de3741d9715f..e698097918f8 100644 --- a/games/flightgear-mb339-pan/Makefile +++ b/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 a/games/freera/Makefile b/games/freera/Makefile index 2cbc897f0cb5..fd4a88f6b6f6 100644 --- a/games/freera/Makefile +++ b/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 a/games/gemdropx/Makefile b/games/gemdropx/Makefile index a11146a7394c..2b899658b4a3 100644 --- a/games/gemdropx/Makefile +++ b/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 a/games/gnugo/Makefile b/games/gnugo/Makefile index 53ab9b3523bf..e32bc9433722 100644 --- a/games/gnugo/Makefile +++ b/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 diff --git a/games/gondola/Makefile b/games/gondola/Makefile index 03ce7d2b5a01..f4295a63f9b0 100644 --- a/games/gondola/Makefile +++ b/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 a/games/gretools/Makefile b/games/gretools/Makefile index 8592be370040..debaeae4d058 100644 --- a/games/gretools/Makefile +++ b/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 a/games/grubik/Makefile b/games/grubik/Makefile index 93af7ef6e7a8..7304e97ae140 100644 --- a/games/grubik/Makefile +++ b/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 a/games/heroes/Makefile b/games/heroes/Makefile index 1e2fc613e6d7..2396e1b71224 100644 --- a/games/heroes/Makefile +++ b/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 a/games/jigzo/Makefile b/games/jigzo/Makefile index 09abb2bdee3b..63134635896d 100644 --- a/games/jigzo/Makefile +++ b/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 a/games/jools/Makefile b/games/jools/Makefile index 239be8eea76d..2ec7e0b2b6f2 100644 --- a/games/jools/Makefile +++ b/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 a/games/kobodeluxe/Makefile b/games/kobodeluxe/Makefile index dce333f8007a..33358fdbcef0 100644 --- a/games/kobodeluxe/Makefile +++ b/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 a/games/ldmud/Makefile b/games/ldmud/Makefile index 92d78e01f067..e802ffaa7739 100644 --- a/games/ldmud/Makefile +++ b/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 diff --git a/games/linux-unrealgold/Makefile b/games/linux-unrealgold/Makefile index c5ee895b149a..6e5c17d1d524 100644 --- a/games/linux-unrealgold/Makefile +++ b/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 a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile index 94b385db0573..195ec22ce831 100644 --- a/games/linux-ut2003-demo/Makefile +++ b/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 a/games/marsnomercy/Makefile b/games/marsnomercy/Makefile index a94e86d5aa4f..f1af4bad6c7b 100644 --- a/games/marsnomercy/Makefile +++ b/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 diff --git a/games/njam/Makefile b/games/njam/Makefile index f62bbcd1bd93..afc449540124 100644 --- a/games/njam/Makefile +++ b/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 a/games/numptyphysics-npcomplete/Makefile b/games/numptyphysics-npcomplete/Makefile index 2998715b8d49..ed2898fbbc22 100644 --- a/games/numptyphysics-npcomplete/Makefile +++ b/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 a/games/optimax/Makefile b/games/optimax/Makefile index d4dea428f2f1..06f245850e15 100644 --- a/games/optimax/Makefile +++ b/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 a/games/pysolfc/Makefile b/games/pysolfc/Makefile index fbdf1be55455..cab806b35f88 100644 --- a/games/pysolfc/Makefile +++ b/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 a/games/pythonchess/Makefile b/games/pythonchess/Makefile index 855b5e119d64..4e7986baf1ef 100644 --- a/games/pythonchess/Makefile +++ b/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 a/games/q2pro/Makefile b/games/q2pro/Makefile index ec145d6836bd..85a250ad2bb2 100644 --- a/games/q2pro/Makefile +++ b/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 diff --git a/games/quadra/Makefile b/games/quadra/Makefile index cd5af5a06620..e09952fb04ac 100644 --- a/games/quadra/Makefile +++ b/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 diff --git a/games/quake-dpmod/Makefile b/games/quake-dpmod/Makefile index a8ad8a8c1493..2bae302b2f86 100644 --- a/games/quake-dpmod/Makefile +++ b/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 a/games/quake3-data/Makefile b/games/quake3-data/Makefile index bb3bb05dc5cd..80ecbfeea958 100644 --- a/games/quake3-data/Makefile +++ b/games/quake3-data/Makefile @@ -30,7 +30,7 @@ TEAMARENA_DESC= Install Quake III Team Arena data files .include do-extract: - @${RM} -rf ${WRKSRC} + @${RM} -r ${WRKSRC} @${MKDIR} ${WRKSRC} @${TAIL} +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ ${TAR} xzf - -C ${WRKSRC} diff --git a/games/rnd_jue/Makefile b/games/rnd_jue/Makefile index 0ed7ede6e81b..42f04199202f 100644 --- a/games/rnd_jue/Makefile +++ b/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 a/games/rockdodger/Makefile b/games/rockdodger/Makefile index e6e36de81e3d..02cb6a9b3e84 100644 --- a/games/rockdodger/Makefile +++ b/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 a/games/rocksndiamonds-data/Makefile b/games/rocksndiamonds-data/Makefile index 9adb5791bf25..5035ed8c8dbc 100644 --- a/games/rocksndiamonds-data/Makefile +++ b/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 a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index 6f0115408110..3df86ff4d1db 100644 --- a/games/rocksndiamonds/Makefile +++ b/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 a/games/scorched3d/Makefile b/games/scorched3d/Makefile index 3a7fa520e580..f8f45710cc47 100644 --- a/games/scorched3d/Makefile +++ b/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 a/games/sdb/Makefile b/games/sdb/Makefile index 3b97a33d0bf8..475203762957 100644 --- a/games/sdb/Makefile +++ b/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 a/games/sdl_jewels/Makefile b/games/sdl_jewels/Makefile index af07b0bef9fa..17b41d35d3b5 100644 --- a/games/sdl_jewels/Makefile +++ b/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 a/games/stransball2/Makefile b/games/stransball2/Makefile index 72f5f983afcf..b9898c9b427a 100644 --- a/games/stransball2/Makefile +++ b/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 a/games/trigger-data/Makefile b/games/trigger-data/Makefile index 417723c7ffa5..1db1f7e988ab 100644 --- a/games/trigger-data/Makefile +++ b/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 diff --git a/games/tuxpaint/Makefile b/games/tuxpaint/Makefile index 8bead808b02c..b402e45816fa 100644 --- a/games/tuxpaint/Makefile +++ b/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 a/games/ufoai-data/Makefile b/games/ufoai-data/Makefile index 96403a3707fa..d3774e3099f0 100644 --- a/games/ufoai-data/Makefile +++ b/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 a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile index 731e37e55abd..27e998176005 100644 --- a/games/ultimatestunts/Makefile +++ b/games/ultimatestunts/Makefile @@ -43,7 +43,7 @@ DESKTOP_ENTRIES="Ultimate Stunts" "" "${PORTNAME}" \ .include 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 a/games/vectoroids/Makefile b/games/vectoroids/Makefile index c7cd76125ed9..a9227bb5f52a 100644 --- a/games/vectoroids/Makefile +++ b/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 a/games/worldofpadman/Makefile b/games/worldofpadman/Makefile index c9acc8071e25..1e9a434188a5 100644 --- a/games/worldofpadman/Makefile +++ b/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 diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile index 7efa7842d5f0..6488ee84dae8 100644 --- a/games/xmoto/Makefile +++ b/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 a/games/znibbles/Makefile b/games/znibbles/Makefile index 9915290a2d14..b9baf208c2fd 100644 --- a/games/znibbles/Makefile +++ b/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 \ -- cgit