summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrauch <mrauch@pkgsrc.org>2003-01-24 11:15:02 +0000
committermrauch <mrauch@pkgsrc.org>2003-01-24 11:15:02 +0000
commitc24e354853a9babe003dd00b1ecfa7203c088531 (patch)
tree84ec8ce6d33fb417b06518387e78d0b48f616725
parent53eada130b2815feab73e9f6fe094def2ca8db7f (diff)
downloadpkgsrc-c24e354853a9babe003dd00b1ecfa7203c088531.tar.gz
The file /emul/linux/etc/mtab has to exist already during installation.
-rw-r--r--misc/openoffice-linux/MESSAGE13
-rw-r--r--misc/openoffice-linux/Makefile11
2 files changed, 15 insertions, 9 deletions
diff --git a/misc/openoffice-linux/MESSAGE b/misc/openoffice-linux/MESSAGE
index 27e901a61df..a41aa97bd0f 100644
--- a/misc/openoffice-linux/MESSAGE
+++ b/misc/openoffice-linux/MESSAGE
@@ -1,13 +1,10 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/01/22 21:57:25 mrauch Exp $
+$NetBSD: MESSAGE,v 1.2 2003/01/24 11:15:02 mrauch Exp $
OpenOffice has now been installed in ${PREFIX}/OpenOffice.org1.0.2.
- Before you are able to use this package, on NetBSD the file
- /emul/linux/etc/mtab must exist, i.e. run
- "touch /emul/linux/etc/mtab" as root.
-
- Additionally, each user has to run a setup program first, which is
- automatically invoked at the first start. Thereafter, OpenOffice can be
- started using the ${PREFIX}/bin/soffice command.
+ 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.
===========================================================================
diff --git a/misc/openoffice-linux/Makefile b/misc/openoffice-linux/Makefile
index 59b0d86f88e..b47d25e4c35 100644
--- a/misc/openoffice-linux/Makefile
+++ b/misc/openoffice-linux/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/01/22 22:46:33 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/24 11:15:02 mrauch Exp $
DISTNAME= OOo_1.0.2_LinuxIntel_install
PKGNAME= openoffice-linux-1.0.2
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://sf1.mirror.openoffice.org/stable/1.0.2/ \
http://www.fs.tum.de/~mrauch/OpenOffice/download/
@@ -12,6 +13,7 @@ COMMENT= Integrated office productivity suite (binary pkg)
NO_CONFIGURE= # defined
WRKSRC= ${WRKDIR}/install/
+INTERACTIVE_STAGE= install
CONFLICTS+= staroffice-[0-9]*
CONFLICTS+= openoffice-[0-9]*
@@ -42,6 +44,13 @@ pre-install: checkforx
${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
<${FILESDIR}/oo_setup.resp \
>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}; \