4 files changed, 47 insertions, 6 deletions

diff --git a/java/linux-blackdown-jre11/Makefile b/java/linux-blackdown-jre11/Makefile
index c28be1427d52..8d452cd140be 100644
--- a/java/linux-blackdown-jre11/Makefile
+++ b/java/linux-blackdown-jre11/Makefile
@@ -38,8 +38,9 @@ PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///}
 CPIO?=		/usr/bin/cpio
 
 post-patch:
-	${FIND} ${WRKSRC} \( -name '*.orig' -o -name '.*.orig' \) -print \
-	  | xargs ${RM} -f && \
+	${FIND} ${WRKSRC} \( -name '*.orig' -o -name '.*.orig' \) -delete
+	${CP} ${FILESDIR}/arch ${WRKSRC}/bin/
+	${CHMOD} a+rx ${WRKSRC}/bin/arch
 	${CHMOD} a+r ${WRKSRC}/README.linux
 
 do-install:
diff --git a/java/linux-blackdown-jre11/files/arch b/java/linux-blackdown-jre11/files/arch
new file mode 100644
index 000000000000..ee7c5c609f47
--- /dev/null
+++ b/java/linux-blackdown-jre11/files/arch
@@ -0,0 +1,2 @@
+#!/bin/sh
+uname -m
diff --git a/java/linux-blackdown-jre11/files/patch-aa b/java/linux-blackdown-jre11/files/patch-aa
index 95e954306a93..810c51eacfb0 100644
--- a/java/linux-blackdown-jre11/files/patch-aa
+++ b/java/linux-blackdown-jre11/files/patch-aa
@@ -1,5 +1,7 @@
---- bin/.java_wrapper.orig	Fri Sep 12 19:54:03 2003
-+++ bin/.java_wrapper	Fri Sep 12 19:54:43 2003
+$FreeBSD$
+
+--- bin/.java_wrapper.orig	Mon Sep 18 18:08:12 2000
++++ bin/.java_wrapper	Mon Sep 29 11:21:39 2003
 @@ -7,19 +7,19 @@
  
  # Set up default variable values if not supplied by the user.
@@ -24,3 +26,20 @@
  
  # The default THREADS_TYPE is "green_threads".  To change the default change
  # the setting of the DEFAULT_THREADS_FLAG variable.  The only valid values 
+@@ -87,8 +87,15 @@
+ 
+ export CLASSPATH
+ 
+-LD_LIBRARY_PATH="$JAVA_HOME/lib/${ARCH}/$THREADS_TYPE:$LD_LIBRARY_PATH"
++if [ "x${LD_LIBRARY_PATH}" != "x" ]; then
++    LD_LIBRARY_PATH="$JAVA_HOME/lib/${ARCH}/$THREADS_TYPE:$LD_LIBRARY_PATH"
++else
++    LD_LIBRARY_PATH="$JAVA_HOME/lib/${ARCH}/$THREADS_TYPE"
++fi
+ export LD_LIBRARY_PATH
++
++PATH="$JAVA_HOME/bin:$PATH"
++export PATH
+ 
+ XFILESEARCHPATH="$JAVA_HOME/lib/locale/%L/%T/%N%C%S:$JAVA_HOME/lib/locale/%l/%T/%N%C%S:$JAVA_HOME/lib/locale/%T/%N%C%S:$JAVA_HOME/lib/locale/%L/%T/%N%S:$JAVA_HOME/lib/locale/%l/%T/%N%S:$JAVA_HOME/lib/locale/%T/%N%S:$XFILESEARCHPATH:%D"
+ export XFILESEARCHPATH
diff --git a/java/linux-blackdown-jre11/files/patch-ab b/java/linux-blackdown-jre11/files/patch-ab
index c93274cd281e..2ccb69ee057d 100644
--- a/java/linux-blackdown-jre11/files/patch-ab
+++ b/java/linux-blackdown-jre11/files/patch-ab
@@ -1,5 +1,7 @@
---- bin/jre.orig	Tue Sep 19 02:08:12 2000
-+++ bin/jre	Fri Sep 12 20:00:46 2003
+$FreeBSD$
+
+--- bin/jre.orig	Mon Sep 18 18:08:12 2000
++++ bin/jre	Mon Sep 29 11:16:16 2003
 @@ -6,7 +6,7 @@
  export THREADS_TYPE
  
@@ -26,3 +28,20 @@
  	PRG="$newprg"
      done
  
+@@ -58,8 +58,15 @@
+ fi
+ export CLASSPATH
+ 
+-LD_LIBRARY_PATH="$JAVA_HOME/lib/${ARCH}/$THREADS_TYPE:$LD_LIBRARY_PATH"
++if [ "x${LD_LIBRARY_PATH}" != "x" ]; then
++    LD_LIBRARY_PATH="$JAVA_HOME/lib/${ARCH}/$THREADS_TYPE:$LD_LIBRARY_PATH"
++else
++    LD_LIBRARY_PATH="$JAVA_HOME/lib/${ARCH}/$THREADS_TYPE"
++fi
+ export LD_LIBRARY_PATH
++
++PATH="$JAVA_HOME/bin:$PATH"
++export PATH
+ 
+ XFILESEARCHPATH="$JAVA_HOME/lib/locale/%L/%T/%N%C%S:$JAVA_HOME/lib/locale/%l/%T/%N%C%S:$JAVA_HOME/lib/locale/%T/%N%C%S:$JAVA_HOME/lib/locale/%L/%T/%N%S:$JAVA_HOME/lib/locale/%l/%T/%N%S:$JAVA_HOME/lib/locale/%T/%N%S:$XFILESEARCHPATH:%D"
+ export XFILESEARCHPATH