12 files changed, 6 insertions, 12 deletions

diff --git a/java/diablo-jdk13/Makefile b/java/diablo-jdk13/Makefile
index 95305e388371..658a0fd79474 100644
--- a/java/diablo-jdk13/Makefile
+++ b/java/diablo-jdk13/Makefile
@@ -47,7 +47,6 @@ WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}jdk${JDK_VERSION}
 NO_BUILD=	yes
 
 CPIO?=		/usr/bin/cpio
-SORT?=		/usr/bin/sort
 INSTALL_DIR=	${PREFIX}/${PKGNAMEPREFIX}jdk${JDK_VERSION}
 
 .if defined(WITHOUT_PLUGIN)
diff --git a/java/diablo-jre13/Makefile b/java/diablo-jre13/Makefile
index bc596faeeb94..ed075b994fe7 100644
--- a/java/diablo-jre13/Makefile
+++ b/java/diablo-jre13/Makefile
@@ -47,7 +47,6 @@ WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}jre${JRE_VERSION}
 NO_BUILD=	yes
 
 CPIO?=		/usr/bin/cpio
-SORT?=		/usr/bin/sort
 INSTALL_DIR=	${PREFIX}/${PKGNAMEPREFIX}jre${JRE_VERSION}
 
 .if defined(WITHOUT_PLUGIN)
diff --git a/java/jakarta-oro/Makefile b/java/jakarta-oro/Makefile
index 7362fdd326d0..319235ad97c2 100644
--- a/java/jakarta-oro/Makefile
+++ b/java/jakarta-oro/Makefile
@@ -49,7 +49,7 @@ do-install-apidocs:
 	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${APIDOCSDIR}
 	@${FIND} ${APIDOCSDIR} -type f -print | \
 		${SED} "s,${PREFIX}/*,," >> ${PLIST}
-	@${FIND} ${APIDOCSDIR} -type d -print | sort -r | \
+	@${FIND} ${APIDOCSDIR} -type d -print | ${SORT} -r | \
 		${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST}
 .endif
 
diff --git a/java/jakarta-regexp/Makefile b/java/jakarta-regexp/Makefile
index f269e2cb598d..7da09b534c28 100644
--- a/java/jakarta-regexp/Makefile
+++ b/java/jakarta-regexp/Makefile
@@ -49,7 +49,7 @@ do-install-apidocs:
 	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${APIDOCSDIR}
 	@${FIND} ${APIDOCSDIR} -type f -print | \
 		${SED} "s,${PREFIX}/*,," >> ${PLIST}
-	@${FIND} ${APIDOCSDIR} -type d -print | sort -r | \
+	@${FIND} ${APIDOCSDIR} -type d -print | ${SORT} -r | \
 		${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST}
 .endif
 
diff --git a/java/jdk11-doc/Makefile b/java/jdk11-doc/Makefile
index 34dd02daf121..ce0dc6499490 100644
--- a/java/jdk11-doc/Makefile
+++ b/java/jdk11-doc/Makefile
@@ -46,7 +46,7 @@ do-install:
 	@${ECHO_CMD} -n ">> Creating packing list..."
 	@${FIND} ${TARGET_DIR} -type f -print | \
 		${SED} "s,${PREFIX}/*,," >> ${PLIST}
-	@${FIND} ${TARGET_DIR} -type d -print | sort -r | \
+	@${FIND} ${TARGET_DIR} -type d -print | ${SORT} -r | \
 		${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST}
 	@${ECHO_CMD} " [ DONE ]"
 
diff --git a/java/jdk12-doc/Makefile b/java/jdk12-doc/Makefile
index 5991c5ad4dca..e6c5c16d8638 100644
--- a/java/jdk12-doc/Makefile
+++ b/java/jdk12-doc/Makefile
@@ -48,7 +48,7 @@ do-install:
 	@${ECHO_CMD} -n ">> Creating packing list..."
 	@${FIND} ${TARGET_DIR} -type f -print | \
 		${SED} "s,${PREFIX}/*,," >> ${PLIST}
-	@${FIND} ${TARGET_DIR} -type d -print | sort -r | \
+	@${FIND} ${TARGET_DIR} -type d -print | ${SORT} -r | \
 		${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST}
 	@${ECHO_CMD} " [ DONE ]"
 
diff --git a/java/jdk13-doc/Makefile b/java/jdk13-doc/Makefile
index 8f1edecc3411..2eb099dea8da 100644
--- a/java/jdk13-doc/Makefile
+++ b/java/jdk13-doc/Makefile
@@ -52,7 +52,7 @@ do-install:
 	@${ECHO_CMD} -n ">> Creating packing list..."
 	@${FIND} ${TARGET_DIR} -type f -print | \
 		${SED} "s,${PREFIX}/*,," >> ${PLIST}
-	@${FIND} ${TARGET_DIR} -type d -print | sort -r | \
+	@${FIND} ${TARGET_DIR} -type d -print | ${SORT} -r | \
 		${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST}
 	@${ECHO_CMD} " [ DONE ]"
 
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index da90f72b4c1d..765afd235595 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -74,7 +74,6 @@ PLIST_SUB+=	JDK_VERSION=${JDK_VERSION}
 JDKIMAGEDIR=	${WRKSRC}/../build/bsd-i386/jdk-image-i386
 JDKIMAGEDIR_G=	${WRKSRC}/../build/bsd-i386/jdk-debug-image-i386
 
-SORT?=		/usr/bin/sort
 CPIO?=		/usr/bin/cpio
 
 .if defined(NODEBUG)
diff --git a/java/jdk14-doc/Makefile b/java/jdk14-doc/Makefile
index 8614ce9dd257..415fe840dfc2 100644
--- a/java/jdk14-doc/Makefile
+++ b/java/jdk14-doc/Makefile
@@ -53,7 +53,7 @@ do-install:
 	@${ECHO_CMD} -n ">> Creating packing list..."
 	@${FIND} ${TARGET_DIR} -type f -print | \
 		${SED} "s,${PREFIX}/*,," >> ${PLIST}
-	@${FIND} ${TARGET_DIR} -type d -print | sort -r | \
+	@${FIND} ${TARGET_DIR} -type d -print | ${SORT} -r | \
 		${SED} -e "s,${PREFIX}/*,," -e "s,^,@dirrm ,g" >> ${PLIST}
 	@${ECHO_CMD} " [ DONE ]"
 
diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile
index 6c90be937a12..4ac3e9d011a7 100644
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@@ -100,7 +100,6 @@ PKGINSTALL=	${WRKDIR}/pkg-install
 JDKIMAGEDIR=	${WRKSRC}/../build/bsd-i586/j2sdk-image
 JDKIMAGEDIR_G=	${WRKSRC}/../build/bsd-i586/j2sdk-debug-image
 
-SORT?=		/usr/bin/sort
 CPIO?=		/usr/bin/cpio
 
 .if defined(WITH_DEBUG)
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 6c90be937a12..4ac3e9d011a7 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -100,7 +100,6 @@ PKGINSTALL=	${WRKDIR}/pkg-install
 JDKIMAGEDIR=	${WRKSRC}/../build/bsd-i586/j2sdk-image
 JDKIMAGEDIR_G=	${WRKSRC}/../build/bsd-i586/j2sdk-debug-image
 
-SORT?=		/usr/bin/sort
 CPIO?=		/usr/bin/cpio
 
 .if defined(WITH_DEBUG)
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 6c90be937a12..4ac3e9d011a7 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -100,7 +100,6 @@ PKGINSTALL=	${WRKDIR}/pkg-install
 JDKIMAGEDIR=	${WRKSRC}/../build/bsd-i586/j2sdk-image
 JDKIMAGEDIR_G=	${WRKSRC}/../build/bsd-i586/j2sdk-debug-image
 
-SORT?=		/usr/bin/sort
 CPIO?=		/usr/bin/cpio
 
 .if defined(WITH_DEBUG)