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 --- x11-toolkits/gtk12/Makefile | 2 +- x11-toolkits/gtk30/Makefile | 2 +- x11-toolkits/gtkada/Makefile | 2 +- x11-toolkits/iwidgets/Makefile | 2 +- x11-toolkits/linux-c6-qt47-x11/Makefile | 2 +- x11-toolkits/py-gui/Makefile | 2 +- x11-toolkits/py-wxPython28/Makefile | 8 ++++---- x11-toolkits/swt-devel/Makefile | 2 +- x11-toolkits/swt/Makefile | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'x11-toolkits') diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile index b8f7c9d47107..b56b9872ee56 100644 --- a/x11-toolkits/gtk12/Makefile +++ b/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 a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index dae4a8092ae2..795032716c6b 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/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 a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile index 597891ae8227..15ff6f36ba96 100644 --- a/x11-toolkits/gtkada/Makefile +++ b/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 diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile index 05997d5534a3..2d3d4c6e5710 100644 --- a/x11-toolkits/iwidgets/Makefile +++ b/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 a/x11-toolkits/linux-c6-qt47-x11/Makefile b/x11-toolkits/linux-c6-qt47-x11/Makefile index 2b3135b7d12c..b79933036dd1 100644 --- a/x11-toolkits/linux-c6-qt47-x11/Makefile +++ b/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 diff --git a/x11-toolkits/py-gui/Makefile b/x11-toolkits/py-gui/Makefile index 65eaf933cf6f..590b9c1b48e1 100644 --- a/x11-toolkits/py-gui/Makefile +++ b/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 a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile index b0bd0bfa94d0..246729550435 100644 --- a/x11-toolkits/py-wxPython28/Makefile +++ b/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 diff --git a/x11-toolkits/swt-devel/Makefile b/x11-toolkits/swt-devel/Makefile index 38f07b140447..89afcf129401 100644 --- a/x11-toolkits/swt-devel/Makefile +++ b/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 a/x11-toolkits/swt/Makefile b/x11-toolkits/swt/Makefile index 03be78a04a97..3631b4902966 100644 --- a/x11-toolkits/swt/Makefile +++ b/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 \ -- cgit