diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2016-10-21 12:51:40 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-10-21 12:51:40 +0000 |
commit | eabbfd75e30148b8f686899a638b93547ca83485 (patch) | |
tree | 5b70e6802d6d9dfe8b4564fc4f09f2d0a5156343 /java | |
parent | devel/nspr: update to 4.13.1 (diff) |
${RM} already has -f.
PR: 213570
Submitted by: mat
Exp-run by: antoine
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=424411
Diffstat (limited to 'java')
-rw-r--r-- | java/eclipse-findbugs/Makefile | 2 | ||||
-rw-r--r-- | java/eclipse-shelled/Makefile | 2 | ||||
-rw-r--r-- | java/eclipse/Makefile | 4 | ||||
-rw-r--r-- | java/javahelp/Makefile | 2 | ||||
-rw-r--r-- | java/jdbcpool/Makefile | 2 | ||||
-rw-r--r-- | java/jgraph/Makefile | 2 | ||||
-rw-r--r-- | java/jlex/Makefile | 2 | ||||
-rw-r--r-- | java/openjdk6/Makefile | 4 | ||||
-rw-r--r-- | java/openjdk7/Makefile | 4 | ||||
-rw-r--r-- | java/openjdk8/Makefile | 2 | ||||
-rw-r--r-- | java/visualvm/Makefile | 4 | ||||
-rw-r--r-- | java/wildfly100/Makefile | 4 | ||||
-rw-r--r-- | java/wildfly90/Makefile | 4 |
13 files changed, 19 insertions, 19 deletions
diff --git a/java/eclipse-findbugs/Makefile b/java/eclipse-findbugs/Makefile index d5d030a033dd..740dd0d75edc 100644 --- a/java/eclipse-findbugs/Makefile +++ b/java/eclipse-findbugs/Makefile @@ -25,7 +25,7 @@ PLIST_SUB= \ DISTNAME="${DISTNAME}" post-extract: - @${RM} -Rf ${WRKSRC}/src + @${RM} -R ${WRKSRC}/src do-install: @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/eclipse/plugins/${DISTNAME}) diff --git a/java/eclipse-shelled/Makefile b/java/eclipse-shelled/Makefile index 615c935296a0..3eded7ba4199 100644 --- a/java/eclipse-shelled/Makefile +++ b/java/eclipse-shelled/Makefile @@ -35,6 +35,6 @@ do-install: | ${SED} -ne 's,^,@dir lib/,p' >> ${TMPPLIST} @${MV} ${WRKSRC}/eclipse/plugins ${WRKSRC}/plugins @${MV} ${WRKSRC}/eclipse/features ${WRKSRC}/features - @${RM} -rf ${WRKSRC}/eclipse + @${RM} -r ${WRKSRC}/eclipse .include <bsd.port.mk> diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index e4af9adfe0b2..62f7e087a411 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -110,7 +110,7 @@ do-build: -DbuildId=${ECLIPSE_BUILDID}) do-install: - @${RM} -rf ${STAGEDIR}${PORTDESTDIR} + @${RM} -r ${STAGEDIR}${PORTDESTDIR} @( cd ${STAGEDIR}${PREFIX}/lib; ${TAR} xfz ${PRODUCT_TARFILE} ) @${FIND} ${STAGEDIR}${PREFIX}/lib -type f -name \*.orig -delete @${SED} \ @@ -139,6 +139,6 @@ do-install: @${ECHO_CMD} "@dir share/eclipse/dropins" >> ${TMPPLIST} distclean: - ${RM} -rf ${DISTDIR}/eclipse + ${RM} -r ${DISTDIR}/eclipse .include <bsd.port.mk> diff --git a/java/javahelp/Makefile b/java/javahelp/Makefile index d7d8bdbdfd84..fcf130607401 100644 --- a/java/javahelp/Makefile +++ b/java/javahelp/Makefile @@ -23,7 +23,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES post-patch: ${REINPLACE_CMD} -e 's|$$JAVAHELP_HOME/javahelp/bin/|${JAVAJARDIR}/|' ${WRKSRC}/javahelp/bin/jhindexer ${REINPLACE_CMD} -e 's|$$JAVAHELP_HOME/javahelp/bin/|${JAVAJARDIR}/|' ${WRKSRC}/javahelp/bin/jhsearch - (cd ${WRKSRC} && ${RM} -rf `${FIND} . -type d -name .svn`) + (cd ${WRKSRC} && ${RM} -r `${FIND} . -type d -name .svn`) do-install: ${INSTALL_DATA} ${WRKSRC}/LICENSE.html ${STAGEDIR}${JAVAJARDIR}/LICENSE.${PORTNAME}.html diff --git a/java/jdbcpool/Makefile b/java/jdbcpool/Makefile index c0dfab23c191..38e0f5218f19 100644 --- a/java/jdbcpool/Makefile +++ b/java/jdbcpool/Makefile @@ -20,7 +20,7 @@ PORTDOCS+= javadoc OPTIONS_DEFINE= DOCS EXAMPLES post-extract: - @${FIND} ${WRKSRC} -name CVS -type dir | ${XARGS} ${RM} -rf + @${FIND} ${WRKSRC} -name CVS -type dir | ${XARGS} ${RM} -r do-install: ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar diff --git a/java/jgraph/Makefile b/java/jgraph/Makefile index 39c68c1648a4..cd1606b4b49f 100644 --- a/java/jgraph/Makefile +++ b/java/jgraph/Makefile @@ -45,7 +45,7 @@ do-build: .if ${PORT_OPTIONS:MCOMPILE} || ${PORT_OPTIONS:MDOCS} @cd ${WRKSRC} && ${ANT} ${ANT_TARGETS} @${MV} -f ${WRKSRC}/build/lib/${PORTNAME}.jar ${WRKSRC}/lib - @${RM} -fr ${WRKSRC}/doc && \ + @${RM} -r ${WRKSRC}/doc && \ ${MV} -f ${WRKSRC}/build/doc/api ${WRKSRC}/doc .endif diff --git a/java/jlex/Makefile b/java/jlex/Makefile index 70224319ac10..cbb18343fefa 100644 --- a/java/jlex/Makefile +++ b/java/jlex/Makefile @@ -21,7 +21,7 @@ SUB_FILES= jlex.sh pkg-message SUB_LIST= JAVAJARDIR=${JAVAJARDIR} do-extract: - @${RM} -rf ${WRKDIR} + @${RM} -r ${WRKDIR} @${MKDIR} ${WRKDIR} @${CP} ${DISTDIR}/Main.java ${WRKDIR} diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index 44c09331a29c..3478a5bfc45e 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -265,11 +265,11 @@ post-build: .if ${PORT_OPTIONS:MTZUPDATE} @# Update time zones .if defined(BUILD_JRE) - @${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi + @${RM} -r ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi @${LN} -s -f ${LOCALBASE}/share/java/zi \ ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib .else - @${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib/zi + @${RM} -r ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib/zi @${LN} -s -f ${LOCALBASE}/share/java/zi \ ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib .endif diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index 2bed337a74e6..7343d924c57b 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -170,11 +170,11 @@ post-patch: pre-install: @# Update time zones .if !defined(BUILD_JRE) - @${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib/zi + @${RM} -r ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib/zi @${LN} -s -f ${LOCALBASE}/share/java/zi \ ${WRKSRC}/build/${OPENJDK_OSARCH}/j2sdk-image/jre/lib .else - @${RM} -rf ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi + @${RM} -r ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib/zi @${LN} -s -f ${LOCALBASE}/share/java/zi \ ${WRKSRC}/build/${OPENJDK_OSARCH}/j2re-image/lib .endif diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 5a145a3888ba..bfb0a3272c19 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -418,7 +418,7 @@ post-build: post-build-TZUPDATE-on: @# Update time zones - @${RM} -rf ${JRE_IMAGEDIR}/lib/zi + @${RM} -r ${JRE_IMAGEDIR}/lib/zi @${LN} -sf ${LOCALBASE}/share/java/zi ${JRE_IMAGEDIR}/lib do-install: diff --git a/java/visualvm/Makefile b/java/visualvm/Makefile index 3dc56f712e5a..67f87efd933f 100644 --- a/java/visualvm/Makefile +++ b/java/visualvm/Makefile @@ -24,8 +24,8 @@ SUB_FILES= visualvm.desktop post-extract: @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.dll' -or -name '*.exe' \) -delete - @${RM} -rf ${WRKSRC}/profiler/lib/deployed - @${RM} -rf ${WRKSRC}/profiler/lib/jfluid-server-15.jar + @${RM} -r ${WRKSRC}/profiler/lib/deployed + @${RM} -r ${WRKSRC}/profiler/lib/jfluid-server-15.jar post-patch: @${REINPLACE_CMD} 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/bin/visualvm diff --git a/java/wildfly100/Makefile b/java/wildfly100/Makefile index 478e4a28cfed..2020c7e8a9b8 100644 --- a/java/wildfly100/Makefile +++ b/java/wildfly100/Makefile @@ -60,8 +60,8 @@ post-patch: do-build: ${RM} ${WRKSRC}/bin/*.bat ${RM} ${WRKSRC}/bin/*.ps1 - ${RM} -rf ${WRKSRC}/bin/service - ${RM} -rf ${WRKSRC}/bin/init.d + ${RM} -r ${WRKSRC}/bin/service + ${RM} -r ${WRKSRC}/bin/init.d do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/wildfly-${PORTVERSION} diff --git a/java/wildfly90/Makefile b/java/wildfly90/Makefile index 3e2e73f563aa..89371818925d 100644 --- a/java/wildfly90/Makefile +++ b/java/wildfly90/Makefile @@ -59,8 +59,8 @@ post-patch: do-build: ${RM} ${WRKSRC}/bin/*.bat ${RM} ${WRKSRC}/bin/*.ps1 - ${RM} -rf ${WRKSRC}/bin/service - ${RM} -rf ${WRKSRC}/bin/init.d + ${RM} -r ${WRKSRC}/bin/service + ${RM} -r ${WRKSRC}/bin/init.d do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/wildfly-${PORTVERSION} |