The change to automate the creation of /emul/linux/etc/mtab wasn't correct --

the creation comes too late. Back it out for the moment.

2 files changed, 42 insertions, 8 deletions

diff --git a/misc/openoffice-linux/Makefile b/misc/openoffice-linux/Makefile
index 16f550d838b..43cfa0818a1 100644
--- a/misc/openoffice-linux/Makefile
+++ b/misc/openoffice-linux/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/02/11 11:41:01 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/27 20:59:20 mrauch Exp $
 
 DISTNAME=		OOo_1.0.2_LinuxIntel_install
 PKGNAME=		openoffice-linux-1.0.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		misc
 MASTER_SITES=		http://sf1.mirror.openoffice.org/stable/1.0.2/	\
 			http://www.fs.tum.de/~mrauch/OpenOffice/download/
@@ -39,14 +39,16 @@ DISPLAY= ':2'
 
 do-build:
 
-.if ${OPSYS} == "NetBSD"
-USE_PKGINSTALL=		yes
-SUPPORT_FILES=		/dev/null /emul/linux/etc/mtab
-.endif
-
 pre-install: checkforx
 	${SED}	-e "s|@@PREFIX@@|${PREFIX}|g"				\
 		< ${FILESDIR}/oo_setup.resp > ${WRKSRC}/oo_setup.resp
+.     if ${OPSYS}=="NetBSD" && !exists(/emul/linux/etc/mtab)
+	@${ECHO} 'Error: Before you are able to install and use this package,'
+	@${ECHO} '       the file /emul/linux/etc/mtab must exist.'
+	@${ECHO} '       Please create this file, e.g. by running'
+	@${ECHO} '       "touch /emul/linux/etc/mtab".'
+	@${FALSE}
+.     endif
 
 do-install:
 	-${SH} -c "cd ${WRKSRC};					\
diff --git a/misc/openoffice-linux/PLIST b/misc/openoffice-linux/PLIST
index 9cd393d5af3..41264d00f6d 100644
--- a/misc/openoffice-linux/PLIST
+++ b/misc/openoffice-linux/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/11 11:36:11 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/02/27 20:59:20 mrauch Exp $
 OpenOffice.org1.0.2/LICENSE
 OpenOffice.org1.0.2/LICENSE.html
 OpenOffice.org1.0.2/README
@@ -386,6 +386,7 @@ OpenOffice.org1.0.2/program/resource/eur64101.res
 OpenOffice.org1.0.2/program/resource/frm64101.res
 OpenOffice.org1.0.2/program/resource/gal64101.res
 OpenOffice.org1.0.2/program/resource/imp64101.res
+OpenOffice.org1.0.2/program/resource/iso64101.res
 OpenOffice.org1.0.2/program/resource/jvm64101.res
 OpenOffice.org1.0.2/program/resource/lgd64101.res
 OpenOffice.org1.0.2/program/resource/ofa64101.res
@@ -1812,6 +1813,30 @@ OpenOffice.org1.0.2/share/cde/types/zh_TW.UTF-8/writer.dt
 OpenOffice.org1.0.2/share/cde/types/zh_TW.UTF-8/writer.fp
 OpenOffice.org1.0.2/share/config/psetup.xpm
 OpenOffice.org1.0.2/share/config/psetupl.xpm
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Inet.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/Calc.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/Chart.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/Common.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/DataAccess.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/Draw.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/Impress.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/Java.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/Jobs.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/Labels.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/Linguistic.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/Math.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/SFX.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/Security.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/TypeDetection.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/UI.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/Views.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/Writer.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office/WriterWeb.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Setup.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/UserProfile.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/ucb/Configuration.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/ucb/Hierarchy.dat
+OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/ucb/Store.dat
 OpenOffice.org1.0.2/share/config/registry/instance/org/openoffice/Inet.xml
 OpenOffice.org1.0.2/share/config/registry/instance/org/openoffice/Office/Calc.xml
 OpenOffice.org1.0.2/share/config/registry/instance/org/openoffice/Office/Chart.xml
@@ -2295,6 +2320,7 @@ OpenOffice.org1.0.2/share/dtd/officedocument/1_0/table.mod
 OpenOffice.org1.0.2/share/dtd/officedocument/1_0/text.mod
 OpenOffice.org1.0.2/share/dtd/officedocument/1_0/toolbar.dtd
 OpenOffice.org1.0.2/share/fonts/truetype/fonts.dir
+OpenOffice.org1.0.2/share/fonts/truetype/fonts_dir.global
 OpenOffice.org1.0.2/share/fonts/truetype/opens___.ttf
 OpenOffice.org1.0.2/share/gallery/bullets/blkpearl.gif
 OpenOffice.org1.0.2/share/gallery/bullets/bluarrow.gif
@@ -3163,6 +3189,12 @@ bin/soffice
 @dirrm OpenOffice.org1.0.2/share/config/registry/instance/org/openoffice
 @dirrm OpenOffice.org1.0.2/share/config/registry/instance/org
 @dirrm OpenOffice.org1.0.2/share/config/registry/instance
+@dirrm OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/ucb
+@dirrm OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice/Office
+@dirrm OpenOffice.org1.0.2/share/config/registry/cache/instance/org/openoffice
+@dirrm OpenOffice.org1.0.2/share/config/registry/cache/instance/org
+@dirrm OpenOffice.org1.0.2/share/config/registry/cache/instance
+@dirrm OpenOffice.org1.0.2/share/config/registry/cache
 @dirrm OpenOffice.org1.0.2/share/config/registry
 @dirrm OpenOffice.org1.0.2/share/config
 @dirrm OpenOffice.org1.0.2/share/cde/types/zh_TW.UTF-8