4 files changed, 62 insertions, 7 deletions

diff --git a/java/java3d/Makefile b/java/java3d/Makefile
index fa88b04af024..44b29ef82e35 100644
--- a/java/java3d/Makefile
+++ b/java/java3d/Makefile
@@ -31,10 +31,12 @@ NO_PACKAGE=	"License doesn\'t allow binary distributions"
 
 TARGET_DIR=	${JAVASHAREDIR}/${PORTNAME}
 PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///} JAVA_HOME=${JAVA_HOME:S/^${PREFIX}\///}
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .include <bsd.port.pre.mk>
 
 .if ${JAVA_OS} == "FreeBSD"
+WITH_PLUGINWRAPPER=	yes
 RUN_DEPENDS+=	${LOCALBASE}/lib/pluginwrapper/java3d.so:${PORTSDIR}/www/linuxpluginwrapper
 .endif
 
@@ -44,6 +46,19 @@ PLIST_SUB+=	INSTALL_IN_JRE="@comment "
 PLIST_SUB+=	INSTALL_IN_JRE=""
 .endif
 
+pre-install:
+.if defined(NOINSTALL_IN_JRE)
+		@${SED} -e "s:%%TARGET_DIR%%:${TARGET_DIR}:g" ${MASTERDIR}/pkg-message-jre > ${PKGMESSAGE}
+.endif
+.if defined(WITH_PLUGINWRAPPER)
+.if defined(NOINSTALL_IN_JRE)
+		@${ECHO_CMD} >> ${PKGMESSAGE}
+		@${SED} -e "s:%%LIBDIR%%:${TARGET_DIR}/lib:g" ${MASTERDIR}/pkg-message-libmap >> ${PKGMESSAGE}
+.else
+		@${SED} -e "s:%%LIBDIR%%:${JAVA_HOME}/jre/lib/i386:g" ${MASTERDIR}/pkg-message-libmap > ${PKGMESSAGE}
+.endif
+.endif
+
 do-install:
 		@${ECHO_CMD} -n ">> Creating destination directory..."
 		@${MKDIR} ${TARGET_DIR}
@@ -68,4 +83,9 @@ do-install:
 		@${ECHO_CMD} " [DONE]"
 .endif
 
+post-install:
+.if defined(NOINSTALL_IN_JRE) || defined(WITH_PLUGINWRAPPER)
+		@${CAT} ${PKGMESSAGE}
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/java/java3d/pkg-message-jre b/java/java3d/pkg-message-jre
new file mode 100644
index 000000000000..7de33924f4cf
--- /dev/null
+++ b/java/java3d/pkg-message-jre
@@ -0,0 +1,8 @@
+The Java3D libraries are not installed in JRE, so you have to add
+  %%TARGET_DIR%%/jar/j3daudio.jar
+  %%TARGET_DIR%%/jar/j3dcore.jar
+  %%TARGET_DIR%%/jar/j3dutils.jar
+  %%TARGET_DIR%%/jar/vecmath.jar
+to the CLASSPATH environment variable, and add
+  %%TARGET_DIR%%/lib
+to the LD_LIBRARY_PATH environment variable.
diff --git a/java/java3d/pkg-message-libmap b/java/java3d/pkg-message-libmap
new file mode 100644
index 000000000000..f4b954bb4b73
--- /dev/null
+++ b/java/java3d/pkg-message-libmap
@@ -0,0 +1,20 @@
+In order to use the Java3D on FreeBSD native JavaVM,
+describe as follows to your /etc/libmap.conf.
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+[%%LIBDIR%%/libJ3D.so]
+libdl.so.2	pluginwrapper/java3d.so
+libm.so.6	libm.so.2
+libnsl.so.1	pluginwrapper/java3d.so
+libpthread.so.0	pluginwrapper/java3d.so
+libc.so.6	pluginwrapper/java3d.so
+
+[%%LIBDIR%%/libJ3DUtils.so]
+libpthread.so.0	pluginwrapper/java3d.so
+libc.so.6	pluginwrapper/java3d.so
+
+[%%LIBDIR%%/libj3daudio.so]
+libm.so.6	libm.so.2
+libnsl.so.1	pluginwrapper/java3d_snd.so
+libpthread.so.0	pluginwrapper/java3d_snd.so
+libc.so.6	pluginwrapper/java3d_snd.so
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/java/java3d/pkg-plist b/java/java3d/pkg-plist
index 73f448aae8b7..034501dbb6da 100644
--- a/java/java3d/pkg-plist
+++ b/java/java3d/pkg-plist
@@ -432,13 +432,20 @@
 %%PORTDOCS%%%%T%%/demo/images/stone.jpg
 %%PORTDOCS%%%%T%%/demo/images/ttimage.jpg
 %%PORTDOCS%%%%T%%/demo/index.html
-%%INSTALL_IN_JRE%%%%JAVA_HOME%%/jre/lib/ext/j3daudio.jar
-%%INSTALL_IN_JRE%%%%JAVA_HOME%%/jre/lib/ext/j3dcore.jar
-%%INSTALL_IN_JRE%%%%JAVA_HOME%%/jre/lib/ext/j3dutils.jar
-%%INSTALL_IN_JRE%%%%JAVA_HOME%%/jre/lib/ext/vecmath.jar
-%%INSTALL_IN_JRE%%%%JAVA_HOME%%/jre/lib/i386/libJ3D.so
-%%INSTALL_IN_JRE%%%%JAVA_HOME%%/jre/lib/i386/libJ3DUtils.so
-%%INSTALL_IN_JRE%%%%JAVA_HOME%%/jre/lib/i386/libj3daudio.so
+%%INSTALL_IN_JRE%%@exec /bin/ln -sf %D/%%T%%/jar/j3daudio.jar %D/%%JAVA_HOME%%/jre/lib/ext
+%%INSTALL_IN_JRE%%@exec /bin/ln -sf %D/%%T%%/jar/j3dcore.jar %D/%%JAVA_HOME%%/jre/lib/ext
+%%INSTALL_IN_JRE%%@exec /bin/ln -sf %D/%%T%%/jar/j3dutils.jar %D/%%JAVA_HOME%%/jre/lib/ext
+%%INSTALL_IN_JRE%%@exec /bin/ln -sf %D/%%T%%/jar/vecmath.jar %D/%%JAVA_HOME%%/jre/lib/ext
+%%INSTALL_IN_JRE%%@exec /bin/ln -sf %D/%%T%%/lib/libJ3D.so %D/%%JAVA_HOME%%/jre/lib/i386
+%%INSTALL_IN_JRE%%@exec /bin/ln -sf %D/%%T%%/lib/libJ3DUtils.so %D/%%JAVA_HOME%%/jre/lib/i386
+%%INSTALL_IN_JRE%%@exec /bin/ln -sf %D/%%T%%/lib/libj3daudio.so %D/%%JAVA_HOME%%/jre/lib/i386
+%%INSTALL_IN_JRE%%@unexec /bin/rm -f %D/%%JAVA_HOME%%/jre/lib/ext/j3daudio.jar
+%%INSTALL_IN_JRE%%@unexec /bin/rm -f %D/%%JAVA_HOME%%/jre/lib/ext/j3dcore.jar
+%%INSTALL_IN_JRE%%@unexec /bin/rm -f %D/%%JAVA_HOME%%/jre/lib/ext/j3dutils.jar
+%%INSTALL_IN_JRE%%@unexec /bin/rm -f %D/%%JAVA_HOME%%/jre/lib/ext/vecmath.jar
+%%INSTALL_IN_JRE%%@unexec /bin/rm -f %D/%%JAVA_HOME%%/jre/lib/i386/libJ3D.so
+%%INSTALL_IN_JRE%%@unexec /bin/rm -f %D/%%JAVA_HOME%%/jre/lib/i386/libJ3DUtils.so
+%%INSTALL_IN_JRE%%@unexec /bin/rm -f %D/%%JAVA_HOME%%/jre/lib/i386/libj3daudio.so
 %%PORTDOCS%%@dirrm %%T%%/demo/images
 %%PORTDOCS%%@dirrm %%T%%/demo/geometry
 %%PORTDOCS%%@dirrm %%T%%/demo/VirtualInputDevice