From eabbfd75e30148b8f686899a638b93547ca83485 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold 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 --- net/avahi-app/Makefile | 2 +- net/binkd/Makefile | 2 +- net/dshell/Makefile | 2 +- net/freeradius3/Makefile | 2 +- net/ldapdiff/Makefile | 2 +- net/libp0f/Makefile | 4 ++-- net/linux-c6-openldap/Makefile | 2 +- net/linux-f10-nss_ldap/Makefile | 6 +++--- net/linux-f10-openldap/Makefile | 2 +- net/netatalk/Makefile | 2 +- net/neubot/Makefile | 2 +- net/nph/Makefile | 2 +- net/ntlmaps/Makefile | 2 +- net/p5-PlRPC/Makefile | 2 +- net/py-pystun/Makefile | 2 +- net/samba36/Makefile | 6 +++--- net/samba42/Makefile | 2 +- net/samba43/Makefile | 2 +- net/samba44/Makefile | 2 +- net/stf-6rd-kmod/Makefile | 6 +++--- net/vnc/Makefile | 2 +- net/zebra/Makefile | 2 +- 22 files changed, 29 insertions(+), 29 deletions(-) (limited to 'net') diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile index 7ffff2748aaa..a675892cc1aa 100644 --- a/net/avahi-app/Makefile +++ b/net/avahi-app/Makefile @@ -93,7 +93,7 @@ post-patch: avahi-post-patch avahi-post-patch: @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \ ${WRKSRC}/man/*.* - @${RM} -f ${WRKSRC}/man/*.bak + @${RM} ${WRKSRC}/man/*.bak @${REINPLACE_CMD} -e 's|-ldl||g ; s|netdev|network|g' \ ${WRKSRC}/configure \ ${WRKSRC}/avahi-client/Makefile.in \ diff --git a/net/binkd/Makefile b/net/binkd/Makefile index d54d2f068675..590e1b21ec35 100644 --- a/net/binkd/Makefile +++ b/net/binkd/Makefile @@ -22,7 +22,7 @@ AMIGA4D_CONFIGUTE_WITH= aso HTTPS_CONFIGURE_WITH= https pre-configure: - @${RM} -rf ${WRKSRC}/mkfls/unix/CVS + @${RM} -r ${WRKSRC}/mkfls/unix/CVS @${CP} ${WRKSRC}/mkfls/unix/* ${WRKSRC}/ @${CHMOD} a+x ${WRKSRC}/configure diff --git a/net/dshell/Makefile b/net/dshell/Makefile index e5ed66a55d94..38d445221e8f 100644 --- a/net/dshell/Makefile +++ b/net/dshell/Makefile @@ -38,7 +38,7 @@ post-patch: .endfor post-build: - ${RM} -rf ${WRKSRC}/lib/${PYTHON_VERSION} + ${RM} -r ${WRKSRC}/lib/${PYTHON_VERSION} ${REINPLACE_CMD} -e 's|${WRKSRC}|${ETCDIR}|' ${WRKSRC}/dshell ${WRKSRC}/dshell-decode ${REINPLACE_CMD} -e 's|BINPATH=${WRKSRC}/bin|BINPATH=${PREFIX}/libexec/dshell|' \ -e 's|DSHELL=${WRKSRC}|DSHELL=${PYTHON_SITELIBDIR}|' \ diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index 9ed2c5b4f816..e8c0d2d88f3e 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -361,7 +361,7 @@ post-patch: ${WRKSRC}/src/modules/rlm_krb5/configure .endif .if empty(PORT_OPTIONS:MRUBY) - @${RM} -fr ${WRKSRC}/src/modules/rlm_ruby/ + @${RM} -r ${WRKSRC}/src/modules/rlm_ruby/ .endif post-build: diff --git a/net/ldapdiff/Makefile b/net/ldapdiff/Makefile index 4184ce4ac61f..c823a0a84c4d 100644 --- a/net/ldapdiff/Makefile +++ b/net/ldapdiff/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ARGS+=--with-iconv-dir=${LOCALBASE} .endif post-extract: - @cd ${WRKSRC} && ${RM} -f *.o ldapdiff Makefile config.h + @cd ${WRKSRC} && ${RM} *.o ldapdiff Makefile config.h do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ldapdiff ${STAGEDIR}${PREFIX}/bin diff --git a/net/libp0f/Makefile b/net/libp0f/Makefile index d4a64d09775e..1b319f6e2864 100644 --- a/net/libp0f/Makefile +++ b/net/libp0f/Makefile @@ -20,8 +20,8 @@ USES= gmake libtool pathfix pkgconfig tar:tgz USE_LDCONFIG= yes post-stage: - ${RM} -f ${STAGEDIR}${LOCALBASE}/bin/p0f + ${RM} ${STAGEDIR}${LOCALBASE}/bin/p0f ${MV} ${STAGEDIR}/etc/p0f ${STAGEDIR}${LOCALBASE}/etc/libp0f - ${RM} -rf ${STAGEDIR}/etc + ${RM} -r ${STAGEDIR}/etc .include diff --git a/net/linux-c6-openldap/Makefile b/net/linux-c6-openldap/Makefile index 5861defb7221..d89bec14425b 100644 --- a/net/linux-c6-openldap/Makefile +++ b/net/linux-c6-openldap/Makefile @@ -22,7 +22,7 @@ PORTDOCS= ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README # do not install any openldap configuration directories/files post-extract: - ${RM} -rf ${WRKSRC}/etc + ${RM} -r ${WRKSRC}/etc # use a native openldap configuration directories/files post-install: diff --git a/net/linux-f10-nss_ldap/Makefile b/net/linux-f10-nss_ldap/Makefile index 0b2e1ead6273..e601f905c485 100644 --- a/net/linux-f10-nss_ldap/Makefile +++ b/net/linux-f10-nss_ldap/Makefile @@ -48,11 +48,11 @@ post-patch: fi .if !${PORT_OPTIONS:MPAM} @if [ -f ${WRKSRC}/lib/security/pam_ldap.so ]; then \ - ${RM} -rf ${WRKSRC}/lib/; \ + ${RM} -r ${WRKSRC}/lib/; \ fi @if [ -f ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/COPYING.pam_ldap ]; then \ ${RM} ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/*.pam*; \ - ${RM} -rf ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/pam.d; \ + ${RM} -r ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/pam.d; \ fi @if [ -f ${WRKSRC}/usr/share/man/man5/pam_ldap.5.gz ]; then \ ${RM} ${WRKSRC}/usr/share/man/man5/pam_ldap.5.gz; \ @@ -60,7 +60,7 @@ post-patch: .else .if !${PORT_OPTIONS:MDOCS} @if [ -d ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/pam.d ]; then \ - ${RM} -rf ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/pam.d/; \ + ${RM} -r ${WRKSRC}/usr/share/doc/${PORTNAME}-${PORTVERSION}/pam.d/; \ fi .endif .endif diff --git a/net/linux-f10-openldap/Makefile b/net/linux-f10-openldap/Makefile index 9ca426478bd3..6c6d9fa9ffef 100644 --- a/net/linux-f10-openldap/Makefile +++ b/net/linux-f10-openldap/Makefile @@ -21,7 +21,7 @@ PORTDOCS= ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README # do not install any openldap configuration directories/files post-extract: - ${RM} -rf ${WRKSRC}/etc + ${RM} -r ${WRKSRC}/etc # use a native openldap configuration directories/files post-install: diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index 883e03b60cd4..5c0525f094d5 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -118,7 +118,7 @@ post-patch: ${WRKSRC}/configure post-install: - @${RM} -f ${STAGEDIR}${PREFIX}/bin/nu ${STAGEDIR}${PREFIX}/bin/lp2pap.sh \ + @${RM} ${STAGEDIR}${PREFIX}/bin/nu ${STAGEDIR}${PREFIX}/bin/lp2pap.sh \ ${STAGEDIR}${PREFIX}/bin/test_parse_mtab \ ${STAGEDIR}${PREFIX}/bin/afpd-mtab.pl ${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \ diff --git a/net/neubot/Makefile b/net/neubot/Makefile index 1a93b4944e97..266a2dae9bad 100644 --- a/net/neubot/Makefile +++ b/net/neubot/Makefile @@ -35,7 +35,7 @@ PKGMESSAGE= ${WRKDIR}/pkg_message OPTIONS_DEFINE= DOCS post-install: - ${RM} -rf ${STAGEDIR}${LSTATEDIR} + ${RM} -r ${STAGEDIR}${LSTATEDIR} (cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PREFIX} -f ${DATADIR:S;${PREFIX}/;;}) diff --git a/net/nph/Makefile b/net/nph/Makefile index 6a1497fdae9c..0fe586a18712 100644 --- a/net/nph/Makefile +++ b/net/nph/Makefile @@ -21,6 +21,6 @@ do-install: PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL post-clean: - @${RM} -f ${STAGEDIR}${PREFIX}/etc/ph_server + @${RM} ${STAGEDIR}${PREFIX}/etc/ph_server .include diff --git a/net/ntlmaps/Makefile b/net/ntlmaps/Makefile index 7ae4edc34356..e22698450d1d 100644 --- a/net/ntlmaps/Makefile +++ b/net/ntlmaps/Makefile @@ -19,7 +19,7 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e \ 's,^#! /usr/bin/python,#!${PYTHON_CMD},' ${WRKSRC}/main.py - @${RM} -rf ${WRKSRC}/main.py.bak + @${RM} -r ${WRKSRC}/main.py.bak do-build: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile index 7394e9f1d1a6..d3bf4a19a186 100644 --- a/net/p5-PlRPC/Makefile +++ b/net/p5-PlRPC/Makefile @@ -19,7 +19,7 @@ USE_PERL5= configure WRKSRC= ${WRKDIR}/${PORTNAME} post-patch: - @${FIND} ${WRKSRC} -name ".svn" | ${XARGS} ${RM} -rf + @${FIND} ${WRKSRC} -name ".svn" | ${XARGS} ${RM} -r @${REINPLACE_CMD} -i '' -e 's/perldoc -t/echo perldoc -t/' \ ${WRKSRC}/Makefile.PL diff --git a/net/py-pystun/Makefile b/net/py-pystun/Makefile index 9a6ed8509380..2c382e652fa2 100644 --- a/net/py-pystun/Makefile +++ b/net/py-pystun/Makefile @@ -18,6 +18,6 @@ USE_PYTHON= autoplist distutils NO_ARCH= yes post-extract: - @${RM} -rf ${WRKSRC}/tests + @${RM} -r ${WRKSRC}/tests .include diff --git a/net/samba36/Makefile b/net/samba36/Makefile index 6b3862e927c0..ec185e558501 100644 --- a/net/samba36/Makefile +++ b/net/samba36/Makefile @@ -483,8 +483,8 @@ pre-configure: post-configure: # It's in another port - @${RM} -f ${WRKDIR}/${DISTNAME}/docs/htmldocs/manpages/libsmbclient.7.html - @${RM} -rf ${WRKDIR}/${DISTNAME}/examples/libsmbclient + @${RM} ${WRKDIR}/${DISTNAME}/docs/htmldocs/manpages/libsmbclient.7.html + @${RM} -r ${WRKDIR}/${DISTNAME}/examples/libsmbclient pre-install: -@${FIND} "${STAGEDIR}${SAMBA_MODULEDIR}" -type f -o -type l 2>/dev/null | ${SORT} | ${SED} -E 's|^${STAGEDIR}${PREFIX}/?||;' > ${WRKDIR}/.PLIST.exclude @@ -494,7 +494,7 @@ pre-install: .endif post-install: - @${RM} -f ${STAGEDIR}/${PREFIX}/bin/findsmb + @${RM} ${STAGEDIR}/${PREFIX}/bin/findsmb .for sect in 1 3 5 7 8 @${MKDIR} ${STAGEDIR}${MAN${sect}PREFIX}/man/man${sect} . for man in ${SAMBA_MAN${sect}} diff --git a/net/samba42/Makefile b/net/samba42/Makefile index 18392f2bc8e6..55971f6cda81 100644 --- a/net/samba42/Makefile +++ b/net/samba42/Makefile @@ -453,7 +453,7 @@ PORTDOCS= README.FreeBSD IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-extract: - @${RM} -rf ${WRKSRC}/pidl + @${RM} -r ${WRKSRC}/pidl post-patch: @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ diff --git a/net/samba43/Makefile b/net/samba43/Makefile index 99fadc28619e..fd31fa878bb6 100644 --- a/net/samba43/Makefile +++ b/net/samba43/Makefile @@ -453,7 +453,7 @@ PORTDOCS= README.FreeBSD IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-extract: - @${RM} -rf ${WRKSRC}/pidl + @${RM} -r ${WRKSRC}/pidl post-patch: @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ diff --git a/net/samba44/Makefile b/net/samba44/Makefile index 0b50f31c7b31..d1a041bd5245 100644 --- a/net/samba44/Makefile +++ b/net/samba44/Makefile @@ -439,7 +439,7 @@ PORTDOCS= README.FreeBSD IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-extract: - @${RM} -rf ${WRKSRC}/pidl + @${RM} -r ${WRKSRC}/pidl post-patch: @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ diff --git a/net/stf-6rd-kmod/Makefile b/net/stf-6rd-kmod/Makefile index e70649ddc953..8a02d04e6466 100644 --- a/net/stf-6rd-kmod/Makefile +++ b/net/stf-6rd-kmod/Makefile @@ -64,7 +64,7 @@ maintainer-diff: ${FETCH_CMD} -o ${MASTERDIR}/files-9.1/patch-aa https://github.com/kuriyama/freebsd/compare/freebsd:releng/9.1...6rd-releng-9.1.diff maintainer-tar: - -${RM} -rf ${EXPDIR} + -${RM} -r ${EXPDIR} ${MKDIR} ${EXPDIR} cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/releng/${OSREL}/sys/net net cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/releng/${OSREL}/sys/modules/if_stf modules/if_stf @@ -77,11 +77,11 @@ maintainer-check: if [ "$${new}" != "$${old}" ]; then ${ECHO_MSG} "New stf rev: $${new}"; fi make-distinfo: - ${RM} -f distinfo.tmp.* + ${RM} distinfo.tmp.* .for r in 8.4 9.1 9.3 10.1 ${MAKE} OSREL=${r} OSVERSION=${r:C/\.//}0000 UNAMER=${r}-RELEASE DISTINFO_FILE=${MASTERDIR}/distinfo.tmp.${r} makesum .endfor ${CAT} ${MASTERDIR}/distinfo.tmp.* > ${MASTERDIR}/distinfo - ${RM} -f distinfo.tmp.* + ${RM} distinfo.tmp.* .include diff --git a/net/vnc/Makefile b/net/vnc/Makefile index 596fc244e928..2997435cb8bd 100644 --- a/net/vnc/Makefile +++ b/net/vnc/Makefile @@ -74,7 +74,7 @@ PLIST_SUB+= SERVER="@comment " post-extract: .if ${PORT_OPTIONS:MSERVER} @cd ${WRKSRC} && ${TAR} -cf - -C ${WRKDIR} xc | ${TAR} -xf - && \ - ${RM} -rf ${WRKDIR}/xc + ${RM} -r ${WRKDIR}/xc .endif post-patch: diff --git a/net/zebra/Makefile b/net/zebra/Makefile index 0917dbba4573..fc5ddcb295cd 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -82,7 +82,7 @@ IGNORE= RIPNGD requires IPV6 option .endif post-install: - @( cd ${WRKSRC}/doc; ${RM} -f zebra*info*; \ + @( cd ${WRKSRC}/doc; ${RM} zebra*info*; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} zebra.info install ) @${ECHO_MSG} "===> installing zebra startup file..." ${INSTALL_SCRIPT} ${WRKDIR}/zebractl ${STAGEDIR}${PREFIX}/sbin/zebractl -- cgit v1.2.3