4 files changed, 16 insertions, 16 deletions
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index 8af8b9a9aebf..986aa29dc1f6 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -126,11 +126,11 @@ pre-install:
 
 do-install:
 	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}
-	(cd ${JDKIMAGEDIR} && ${BSD_TAR} -c -f - .) \
-		| (cd ${PREFIX}/jdk${JDK_VERSION} && ${BSD_TAR} --unlink -x -f -)
+	cd ${JDKIMAGEDIR} && /usr/bin/find . \
+	  | /usr/bin/cpio -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 .if !defined(NODEBUG)
-	(cd ${JDKIMAGEDIR_G} && ${BSD_TAR} -c -f - .) \
-		| (cd ${PREFIX}/jdk${JDK_VERSION} && ${BSD_TAR} --unlink -x -f -)
+	cd ${JDKIMAGEDIR_G} && /usr/bin/find . \
+	  | /usr/bin/cpio -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 .endif
 	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}/jre/lib/ext
 
diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile
index 8af8b9a9aebf..986aa29dc1f6 100644
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@@ -126,11 +126,11 @@ pre-install:
 
 do-install:
 	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}
-	(cd ${JDKIMAGEDIR} && ${BSD_TAR} -c -f - .) \
-		| (cd ${PREFIX}/jdk${JDK_VERSION} && ${BSD_TAR} --unlink -x -f -)
+	cd ${JDKIMAGEDIR} && /usr/bin/find . \
+	  | /usr/bin/cpio -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 .if !defined(NODEBUG)
-	(cd ${JDKIMAGEDIR_G} && ${BSD_TAR} -c -f - .) \
-		| (cd ${PREFIX}/jdk${JDK_VERSION} && ${BSD_TAR} --unlink -x -f -)
+	cd ${JDKIMAGEDIR_G} && /usr/bin/find . \
+	  | /usr/bin/cpio -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 .endif
 	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}/jre/lib/ext
 
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 8af8b9a9aebf..986aa29dc1f6 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -126,11 +126,11 @@ pre-install:
 
 do-install:
 	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}
-	(cd ${JDKIMAGEDIR} && ${BSD_TAR} -c -f - .) \
-		| (cd ${PREFIX}/jdk${JDK_VERSION} && ${BSD_TAR} --unlink -x -f -)
+	cd ${JDKIMAGEDIR} && /usr/bin/find . \
+	  | /usr/bin/cpio -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 .if !defined(NODEBUG)
-	(cd ${JDKIMAGEDIR_G} && ${BSD_TAR} -c -f - .) \
-		| (cd ${PREFIX}/jdk${JDK_VERSION} && ${BSD_TAR} --unlink -x -f -)
+	cd ${JDKIMAGEDIR_G} && /usr/bin/find . \
+	  | /usr/bin/cpio -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 .endif
 	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}/jre/lib/ext
 
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 8af8b9a9aebf..986aa29dc1f6 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -126,11 +126,11 @@ pre-install:
 
 do-install:
 	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}
-	(cd ${JDKIMAGEDIR} && ${BSD_TAR} -c -f - .) \
-		| (cd ${PREFIX}/jdk${JDK_VERSION} && ${BSD_TAR} --unlink -x -f -)
+	cd ${JDKIMAGEDIR} && /usr/bin/find . \
+	  | /usr/bin/cpio -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 .if !defined(NODEBUG)
-	(cd ${JDKIMAGEDIR_G} && ${BSD_TAR} -c -f - .) \
-		| (cd ${PREFIX}/jdk${JDK_VERSION} && ${BSD_TAR} --unlink -x -f -)
+	cd ${JDKIMAGEDIR_G} && /usr/bin/find . \
+	  | /usr/bin/cpio -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
 .endif
 	${MKDIR} ${PREFIX}/jdk${JDK_VERSION}/jre/lib/ext