aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/jre/Makefile2
-rw-r--r--java/jre/pkg-plist8
2 files changed, 7 insertions, 3 deletions
diff --git a/java/jre/Makefile b/java/jre/Makefile
index 6d39c8958e5d..5ea863c67ee6 100644
--- a/java/jre/Makefile
+++ b/java/jre/Makefile
@@ -78,5 +78,7 @@ do-install:
post-install:
${LOCALBASE}/bin/registervm "${PREFIX}/jre${JRE_VERSION}/bin/java # JRE${JRE_VERSION}"
+ ${LN} -sf ${LOCALBASE}/lib/shujit/libshujit.so ${PREFIX}/jre${JRE_VERSION}/lib/i386/green_threads/libshujit.so
+ ${LN} -sf ${LOCALBASE}/lib/tya/libtya.so ${PREFIX}/jre${JRE_VERSION}/lib/i386/green_threads/libtya.so
.include <bsd.port.post.mk>
diff --git a/java/jre/pkg-plist b/java/jre/pkg-plist
index d3d2b702df0b..106d2f3006b7 100644
--- a/java/jre/pkg-plist
+++ b/java/jre/pkg-plist
@@ -41,7 +41,9 @@ jre%%JRE_VERSION%%/lib/i386/green_threads/libjpeg.so
jre%%JRE_VERSION%%/lib/i386/green_threads/libmath.so
jre%%JRE_VERSION%%/lib/i386/green_threads/libmmedia.so
jre%%JRE_VERSION%%/lib/i386/green_threads/libnet.so
+jre%%JRE_VERSION%%/lib/i386/green_threads/libshujit.so
jre%%JRE_VERSION%%/lib/i386/green_threads/libsysresource.so
+jre%%JRE_VERSION%%/lib/i386/green_threads/libtya.so
jre%%JRE_VERSION%%/lib/i386/green_threads/libzip.so
jre%%JRE_VERSION%%/lib/psfont.properties.ja
jre%%JRE_VERSION%%/lib/rt.jar
@@ -49,9 +51,9 @@ jre%%JRE_VERSION%%/lib/security/java.security
jre%%JRE_VERSION%%/lib/serialver.properties
@exec mkdir -p %D/share/java/classes
@exec mkdir -p %D/share/doc/java
-@unexec rmdir %D/share/java/classes
-@unexec rmdir %D/share/java
-@unexec rmdir %D/share/doc/java
+@unexec rmdir %D/share/java/classes 2>/dev/null || true
+@unexec rmdir %D/share/java 2>/dev/null || true
+@unexec rmdir %D/share/doc/java 2>/dev/null || true
@exec %D/bin/registervm "%D/jre%%JRE_VERSION%%/bin/java # JRE%%JRE_VERSION%%"
@unexec %D/bin/unregistervm JRE%%JRE_VERSION%%
@dirrm jre%%JRE_VERSION%%/lib/security