diff options
author | Trevor Johnson <trevor@FreeBSD.org> | 2003-11-13 14:45:08 +0000 |
---|---|---|
committer | Trevor Johnson <trevor@FreeBSD.org> | 2003-11-13 14:45:08 +0000 |
commit | e99ceadaf6c77b80c19e16d91306e944305b1c88 (patch) | |
tree | e8a8f4dac51e148717ae07e2de0c635ec5d58833 /java | |
parent | Update to 1.0.47. (diff) |
Use the FIND and XARGS macros introduced in bsd.port.mk 1.391.
Notes
Notes:
svn path=/head/; revision=93890
Diffstat (limited to '')
-rw-r--r-- | java/jdk12/Makefile | 5 | ||||
-rw-r--r-- | java/linux-blackdown-jdk12/Makefile | 2 | ||||
-rw-r--r-- | java/linux-sun-jdk12/Makefile | 2 | ||||
-rw-r--r-- | java/linux-sun-jdk13/Makefile | 2 | ||||
-rw-r--r-- | java/linux-sun-jdk14/Makefile | 2 | ||||
-rw-r--r-- | java/sablevm/Makefile | 4 |
6 files changed, 9 insertions, 8 deletions
diff --git a/java/jdk12/Makefile b/java/jdk12/Makefile index 9bda99e92da2..168fe82f5c25 100644 --- a/java/jdk12/Makefile +++ b/java/jdk12/Makefile @@ -146,8 +146,9 @@ post-build: done; \ done for dir in ${JDKIMAGEDIR} ${JREIMAGEDIR}; do \ - find $${dir} -type f | xargs file | ${GREP} 'not stripped$$' | \ - ${SED} 's|:.*$$||' | xargs strip; \ + ${FIND} $${dir} -type f | ${XARGS} file | \ + ${GREP} 'not stripped$$' | \ + ${SED} 's|:.*$$||' | ${XARGS} strip; \ done .if !defined(NODEBUG) diff --git a/java/linux-blackdown-jdk12/Makefile b/java/linux-blackdown-jdk12/Makefile index 6f15c83af34a..5abcc0393cb3 100644 --- a/java/linux-blackdown-jdk12/Makefile +++ b/java/linux-blackdown-jdk12/Makefile @@ -37,7 +37,7 @@ CPIO?= /usr/bin/cpio post-patch: ${FIND} ${WRKSRC} \( -name '*.orig' -o -name '.*.orig' \) -print \ - | xargs ${RM} -f + | ${XARGS} ${RM} -f do-install: ${MKDIR} ${APP_HOME} diff --git a/java/linux-sun-jdk12/Makefile b/java/linux-sun-jdk12/Makefile index 634c198be573..9ece974bfbb0 100644 --- a/java/linux-sun-jdk12/Makefile +++ b/java/linux-sun-jdk12/Makefile @@ -41,7 +41,7 @@ IGNORE=You must manually fetch the Sun Java 2 Standard Edition SDK ${JDK_VERSION .endif post-patch: - @${FIND} ${WRKSRC} -name '*.orig' -print | xargs ${RM} -f + @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f do-install: @${ECHO_CMD} -n ">> Creating destination directory ${APP_HOME}..." diff --git a/java/linux-sun-jdk13/Makefile b/java/linux-sun-jdk13/Makefile index 8f659b67cf65..a3a622158535 100644 --- a/java/linux-sun-jdk13/Makefile +++ b/java/linux-sun-jdk13/Makefile @@ -67,7 +67,7 @@ do-extract: && ${WRKDIR}/install.sfx > /dev/null post-patch: - @${FIND} ${WRKSRC} -name '*.orig' -print | xargs ${RM} -f + @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f do-install: ${MKDIR} ${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION} diff --git a/java/linux-sun-jdk14/Makefile b/java/linux-sun-jdk14/Makefile index 4c710f7c18ab..117ad82d5d88 100644 --- a/java/linux-sun-jdk14/Makefile +++ b/java/linux-sun-jdk14/Makefile @@ -59,7 +59,7 @@ do-extract: && ${WRKDIR}/install.sfx > /dev/null post-patch: - @${FIND} ${WRKSRC} -name '*.orig' -print | xargs ${RM} -f + @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f do-install: ${MKDIR} ${APP_HOME} diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile index 1d40c7fc2a6b..7a2d22fa511a 100644 --- a/java/sablevm/Makefile +++ b/java/sablevm/Makefile @@ -86,11 +86,11 @@ pre-build: @echo "===> ${CLASSESDIR}" @cd ${WRKDIR}/${CLASSESDIR}; \ ${MKDIR} classes; \ - find . | ${GREP} '\.java$$' | xargs jikes -g \ + ${FIND} . | ${GREP} '\.java$$' | ${XARGS} jikes -g \ -target 1.1 -d classes \ -bootclasspath src:classes -classpath src:classes \ -sourcepath src || exit 1; \ - find resource -type f | cut -d\/ -f2- \ + ${FIND} resource -type f | cut -d\/ -f2- \ | ${AWK} '{print "cp resource/" $$0 " classes/" $$0 }' \ | ${SH}; \ ${CHMOD} -R a+rX classes |