summaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authormbr <mbr@FreeBSD.org>2003-02-20 00:25:50 +0000
committermbr <mbr@FreeBSD.org>2003-02-20 00:25:50 +0000
commit886a4d947a08a6bc68a949150db9a007b2fe834b (patch)
tree39f5570e4821c8d31166a14e34d3237740c05ace /editors
parent18a2a76eecf6eab30a16a917769b1f43cd385157 (diff)
downloadFreeBSD-ports-886a4d947a08a6bc68a949150db9a007b2fe834b.zip
FreeBSD-ports-886a4d947a08a6bc68a949150db9a007b2fe834b.tar.gz
Make some installation notes more clear. Inspired by
PR 42978.
Diffstat (limited to 'editors')
-rw-r--r--editors/staroffice60/Makefile29
-rw-r--r--editors/staroffice60/pkg-message2
-rw-r--r--editors/staroffice70/Makefile29
-rw-r--r--editors/staroffice70/pkg-message2
4 files changed, 48 insertions, 14 deletions
diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index 9589c61..29297a3 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -49,12 +49,15 @@ pre-fetch:
@${ECHO}
@${ECHO} Check if linprocfs is running: YES
.else
+ @${ECHO} Check if linprocfs is running: NO
@${ECHO}
@${ECHO} ERROR:
@${ECHO}
- @${ECHO} Staroffice setup needs a running linprocfs, which is not
- @${ECHO} activated on your system. Please read the linprocfs\(5\)
- @${ECHO} manpage and add the following line to /etc/fstab:
+ @${ECHO} Staroffice setup needs a running linprocfs. it seems
+ @${ECHO} that procfs is not mounted on your system. Please
+ @${ECHO} read the linprocfs\(5\) manpage and ensure the
+ @${ECHO} the following line is in /etc/fstab, and that the
+ @${ECHO} linprocfs file system is mounted:
@${ECHO}
@${ECHO} linproc /compat/linux/proc linprocfs rw 0 0
@${ECHO}
@@ -82,9 +85,8 @@ pre-fetch:
@${ECHO}
@${ECHO} Staroffice depends on a scripting fix for
@${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
@${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.5
+ @${ECHO} Please upgrade to FreeBSD 4.5 or later.
@${ECHO}
@${FALSE}
.endif
@@ -107,6 +109,18 @@ pre-fetch:
.if defined(USE_CDROM)
DLTEST=112887-03.tar
.else
+.if exists(/cdrom/linux/office60/setup)
+ @${ECHO}
+ @${ECHO} It seems that you have a Sun StarOffice 6.0 CDROM
+ @${ECHO} mounted on ${CD_MOUNTPT}. If you wish to install from
+ @${ECHO} this CD-ROM, please run
+ @${ECHO}
+ @${ECHO} make -USE_CDROM
+ @${ECHO}
+ @${ECHO} Otherwise please unmount the CD-ROM.
+ @${ECHO}
+ @${FALSE}
+.endif
DLTEST=${DISTNAME}
.endif
.if !exists(${DISTDIR}/${DLTEST})
@@ -165,7 +179,7 @@ do-install:
TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net'
@if [ -f ${PREFIX}/${SOVERSION}/program/setup ]; then \
${ECHO} ; \
- ${ECHO} Ignore the error-message. StarOffice6.0 has been installed ; \
+ ${ECHO} Ignore the error message. StarOffice6.0 has been installed ; \
${ECHO} successfully on your system. ; \
${ECHO} ; \
else \
@@ -210,6 +224,9 @@ post-install:
@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-spadmin
@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sweb
@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-swriter
+ @${ECHO} StarOffice6.0 has been installed successfully. In order to use
+ @${ECHO} it, execute ${PREFIX}/bin/staroffice6.
+ @${ECHO}
install-patch:
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
diff --git a/editors/staroffice60/pkg-message b/editors/staroffice60/pkg-message
index d17004b..4607a37 100644
--- a/editors/staroffice60/pkg-message
+++ b/editors/staroffice60/pkg-message
@@ -19,7 +19,7 @@ the user that you usually use. There are some wrappers
installed in $PREFIX. Run "staroffice6" and begin a standard
workstation install.
-It will now be ready to use.
+It will then be ready to use.
Good Luck
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index 9589c61..29297a3 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -49,12 +49,15 @@ pre-fetch:
@${ECHO}
@${ECHO} Check if linprocfs is running: YES
.else
+ @${ECHO} Check if linprocfs is running: NO
@${ECHO}
@${ECHO} ERROR:
@${ECHO}
- @${ECHO} Staroffice setup needs a running linprocfs, which is not
- @${ECHO} activated on your system. Please read the linprocfs\(5\)
- @${ECHO} manpage and add the following line to /etc/fstab:
+ @${ECHO} Staroffice setup needs a running linprocfs. it seems
+ @${ECHO} that procfs is not mounted on your system. Please
+ @${ECHO} read the linprocfs\(5\) manpage and ensure the
+ @${ECHO} the following line is in /etc/fstab, and that the
+ @${ECHO} linprocfs file system is mounted:
@${ECHO}
@${ECHO} linproc /compat/linux/proc linprocfs rw 0 0
@${ECHO}
@@ -82,9 +85,8 @@ pre-fetch:
@${ECHO}
@${ECHO} Staroffice depends on a scripting fix for
@${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
@${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.5
+ @${ECHO} Please upgrade to FreeBSD 4.5 or later.
@${ECHO}
@${FALSE}
.endif
@@ -107,6 +109,18 @@ pre-fetch:
.if defined(USE_CDROM)
DLTEST=112887-03.tar
.else
+.if exists(/cdrom/linux/office60/setup)
+ @${ECHO}
+ @${ECHO} It seems that you have a Sun StarOffice 6.0 CDROM
+ @${ECHO} mounted on ${CD_MOUNTPT}. If you wish to install from
+ @${ECHO} this CD-ROM, please run
+ @${ECHO}
+ @${ECHO} make -USE_CDROM
+ @${ECHO}
+ @${ECHO} Otherwise please unmount the CD-ROM.
+ @${ECHO}
+ @${FALSE}
+.endif
DLTEST=${DISTNAME}
.endif
.if !exists(${DISTDIR}/${DLTEST})
@@ -165,7 +179,7 @@ do-install:
TEMP=${TMPDIR} ${LINUXBASE}/bin/sh -c '${WRKSRC}/setup /net'
@if [ -f ${PREFIX}/${SOVERSION}/program/setup ]; then \
${ECHO} ; \
- ${ECHO} Ignore the error-message. StarOffice6.0 has been installed ; \
+ ${ECHO} Ignore the error message. StarOffice6.0 has been installed ; \
${ECHO} successfully on your system. ; \
${ECHO} ; \
else \
@@ -210,6 +224,9 @@ post-install:
@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-spadmin
@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-sweb
@${LN} -fs ${PREFIX}/bin/staroffice6 ${PREFIX}/bin/staroffice-swriter
+ @${ECHO} StarOffice6.0 has been installed successfully. In order to use
+ @${ECHO} it, execute ${PREFIX}/bin/staroffice6.
+ @${ECHO}
install-patch:
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \
diff --git a/editors/staroffice70/pkg-message b/editors/staroffice70/pkg-message
index d17004b..4607a37 100644
--- a/editors/staroffice70/pkg-message
+++ b/editors/staroffice70/pkg-message
@@ -19,7 +19,7 @@ the user that you usually use. There are some wrappers
installed in $PREFIX. Run "staroffice6" and begin a standard
workstation install.
-It will now be ready to use.
+It will then be ready to use.
Good Luck
OpenPOWER on IntegriCloud