Remove dependency on java.

3 files changed, 10 insertions, 12 deletions

diff --git a/misc/openoffice-linux/MESSAGE b/misc/openoffice-linux/MESSAGE
index f6964d2a1a0..404b1c9f7a5 100644
--- a/misc/openoffice-linux/MESSAGE
+++ b/misc/openoffice-linux/MESSAGE
@@ -1,10 +1,13 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2004/01/25 16:57:57 mrauch Exp $
+$NetBSD: MESSAGE,v 1.6 2004/02/15 10:48:56 mrauch Exp $
 
   OpenOffice has now been installed in ${PREFIX}/OpenOffice.org1.1.0.
 
   Before using this package for the first time, each user has to run
-  a setup program, which is automatically invoked at the first start. 
-  Thereafter, OpenOffice can be started using the
-  ${PREFIX}/bin/soffice command.
+  a setup program, which is automatically invoked at the first start of 
+  ${PREFIX}/bin/soffice.
+
+  For (optional) Java support, please run 
+  ${PREFIX}/OpenOffice.org1.1.0/program/jvmsetup
+  after having run the user setup program.
 ===========================================================================
diff --git a/misc/openoffice-linux/Makefile b/misc/openoffice-linux/Makefile
index e0fbdaf3dc6..5dfd08e6b44 100644
--- a/misc/openoffice-linux/Makefile
+++ b/misc/openoffice-linux/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/02/14 17:35:00 mrauch Exp $
+# $NetBSD: Makefile,v 1.20 2004/02/15 10:48:56 mrauch Exp $
 
 DISTNAME=		OOo_1.1.0_LinuxIntel_install
 PKGNAME=		openoffice-linux-1.1.0
+PKGREVISION=		1
 CATEGORIES=		misc
 MASTER_SITES=		http://mirrors.isc.org/pub/openoffice/stable/1.1.0/ \
 			http://www.fs.tum.de/~mrauch/OpenOffice/download/
@@ -25,9 +26,6 @@ CHECK_SHLIBS=		no
 
 .include "../../mk/bsd.prefs.mk"
 
-PKG_JVM?=	sun-jdk
-PLIST_SUBST+=	JAVA_HOME="${PKG_JAVA_HOME:C/^${PREFIX}\///}"
-
 do-build:
 
 .if ${OPSYS} == "NetBSD"
@@ -56,7 +54,6 @@ do-install:
 .for i in scalc sdraw simpress swriter
 	${LN} -sf ${PREFIX}/OpenOffice.org1.1.0/program/$i ${PREFIX}/bin/$i
 .endfor
-	${LN} -sf ${PKG_JAVA_HOME} ${PKG_JAVA_HOME}/jre
 
 # everything specific to your OS/Arch goes into its own Makefile
 # group together i386, i486, i586 and i686 (for Linux)
@@ -67,5 +64,4 @@ ARCH=	${MACHINE_ARCH:C/i[3-6]86/i386/g}
 .  include "Makefile.${OPSYS}.${ARCH}"
 .endif
 
-.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/openoffice-linux/PLIST b/misc/openoffice-linux/PLIST
index 2e04e89b521..6fb2ce8af88 100644
--- a/misc/openoffice-linux/PLIST
+++ b/misc/openoffice-linux/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/02/14 17:35:00 mrauch Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/02/15 10:48:56 mrauch Exp $
 OpenOffice.org1.1.0/LICENSE
 OpenOffice.org1.1.0/LICENSE.html
 OpenOffice.org1.1.0/README
@@ -3942,7 +3942,6 @@ bin/scalc
 bin/sdraw
 bin/simpress
 bin/swriter
-${JAVA_HOME}/jre
 @dirrm OpenOffice.org1.1.0/user/wordbook
 @dirrm OpenOffice.org1.1.0/user/uno_packages
 @dirrm OpenOffice.org1.1.0/user/template