- Add check for installed and running linprocfs

- Sync french version with the english and german version

Submitted by:   Martin Blapp <mb@imp.ch> (MAINTAINER)

6 files changed, 118 insertions, 3 deletions

diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile
index 071cf24afa8..abf03b7e298 100644
--- a/editors/staroffice52/Makefile
+++ b/editors/staroffice52/Makefile
@@ -40,10 +40,26 @@ INSTDB.INS=	${PREFIX}/office52/program/instdb.ins
 SUNSOLVE=	${WRKDIR}/109939-02
 ADABAS_DIST=	soa-5_2-ga-bin-linux-en.bin
 SIZE!=		/bin/df -k . | /usr/bin/tail -n 1 | /usr/bin/awk '{print $$4}'
+LINPROCFS!=	mount | grep linprocfs | awk '{print $1}'
 
 .include <bsd.port.pre.mk>
 
 pre-fetch:
+.if ${LINPROCFS}
+	@${ECHO}
+	@${ECHO} Check if linprocfs is running: YES
+.else
+	@${ECHO} -----------------------------------------------------------
+	@${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}
+	@${ECHO} linproc /compat/linux/proc linprocfs rw 0 0
+	@${ECHO}
+	@${ECHO} -----------------------------------------------------------
+	@${FALSE}
+.endif
 .if ${OSVERSION} < 410000
 	@${ECHO}
 	@${ECHO} OS-VERSION ${OSVERSION}
diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index 071cf24afa8..abf03b7e298 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -40,10 +40,26 @@ INSTDB.INS=	${PREFIX}/office52/program/instdb.ins
 SUNSOLVE=	${WRKDIR}/109939-02
 ADABAS_DIST=	soa-5_2-ga-bin-linux-en.bin
 SIZE!=		/bin/df -k . | /usr/bin/tail -n 1 | /usr/bin/awk '{print $$4}'
+LINPROCFS!=	mount | grep linprocfs | awk '{print $1}'
 
 .include <bsd.port.pre.mk>
 
 pre-fetch:
+.if ${LINPROCFS}
+	@${ECHO}
+	@${ECHO} Check if linprocfs is running: YES
+.else
+	@${ECHO} -----------------------------------------------------------
+	@${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}
+	@${ECHO} linproc /compat/linux/proc linprocfs rw 0 0
+	@${ECHO}
+	@${ECHO} -----------------------------------------------------------
+	@${FALSE}
+.endif
 .if ${OSVERSION} < 410000
 	@${ECHO}
 	@${ECHO} OS-VERSION ${OSVERSION}
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index 071cf24afa8..abf03b7e298 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -40,10 +40,26 @@ INSTDB.INS=	${PREFIX}/office52/program/instdb.ins
 SUNSOLVE=	${WRKDIR}/109939-02
 ADABAS_DIST=	soa-5_2-ga-bin-linux-en.bin
 SIZE!=		/bin/df -k . | /usr/bin/tail -n 1 | /usr/bin/awk '{print $$4}'
+LINPROCFS!=	mount | grep linprocfs | awk '{print $1}'
 
 .include <bsd.port.pre.mk>
 
 pre-fetch:
+.if ${LINPROCFS}
+	@${ECHO}
+	@${ECHO} Check if linprocfs is running: YES
+.else
+	@${ECHO} -----------------------------------------------------------
+	@${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}
+	@${ECHO} linproc /compat/linux/proc linprocfs rw 0 0
+	@${ECHO}
+	@${ECHO} -----------------------------------------------------------
+	@${FALSE}
+.endif
 .if ${OSVERSION} < 410000
 	@${ECHO}
 	@${ECHO} OS-VERSION ${OSVERSION}
diff --git a/french/staroffice52/Makefile b/french/staroffice52/Makefile
index 505e3c0b6a7..7a6cd8da1b3 100644
--- a/french/staroffice52/Makefile
+++ b/french/staroffice52/Makefile
@@ -38,10 +38,28 @@ TMPDIR=		${WRKDIR}/tmp
 LD_PATH=	${TMPDIR}:${WRKSRC}:${LINUXBASE}/linux/lib:${LINUXBASE}/usr/lib
 INSTDB.INS=	${PREFIX}/office52/program/instdb.ins
 SUNSOLVE=	${WRKDIR}/109939-02
+ADABAS_DIST=	soa-5_2-ga-bin-linux-fr.bin
+SIZE!=		/bin/df -k . | /usr/bin/tail -n 1 | /usr/bin/awk '{print $$4}'
+LINPROCFS!=	mount | grep linprocfs | awk '{print $1}'
 
 .include <bsd.port.pre.mk>
 
 pre-fetch:
+.if ${LINPROCFS}
+	@${ECHO}
+	@${ECHO} Linprocfs est installeé: OUI
+.else
+	@${ECHO} -----------------------------------------------------------
+	@${ECHO}
+	@${ECHO} Staroffice dépend sur linprocfs qui n'est pas activée
+	@${ECHO} sur votre système. Veuiller lire le la page `man' de
+	@${ECHO} linprocfs(5) et ajouter la ligne suivante dans /etc/fstab:
+	@${ECHO}
+	@${ECHO} linproc /compat/linux/proc linprocfs rw 0 0
+	@${ECHO}
+	@${ECHO} -----------------------------------------------------------
+	@${FALSE}
+.endif
 .if ${OSVERSION} < 410000
 	@${ECHO}
 	@${ECHO} OS-VERSION ${OSVERSION}
@@ -54,6 +72,21 @@ pre-fetch:
 	@${ECHO}
 	@${FALSE}
 .endif
+.if ${SIZE} < 250000
+	@${ECHO}
+	@${ECHO} Le répertoire /usr/ports ne contient pas suffisament
+	@${ECHO} d'espace libre. Staroffice a besoin au moins 250M
+	@${ECHO} d'espace libre.
+	@${ECHO}
+	@${FALSE}
+.endif
+.if !defined(WITH_ADABAS)
+	@${ECHO}
+	@${ECHO} Si vous voulez installer Staroffice avec support pour le système
+	@${ECHO} de base de données ADABAS, terminez cette installation et
+	@${ECHO} recommencez la avec l'option WITH_ADABAS=YES
+	@${ECHO}
+.endif
 .if defined(WITH_CDROM)
 .if !exists(${CD_MOUNTPT}/linux/office52/setup)
 	@${ECHO}
@@ -84,11 +117,12 @@ do-extract:
 	@${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
 	@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
 .if defined(WITH_ADABAS)
-	@${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-fr.bin ${WRKSRC}
-	@${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-fr.bin
+	@${CP} ${_DISTDIR}/${ADABAS_DIST} ${WRKSRC}
+	@${CHMOD} 755 ${WRKSRC}/${ADABAS_DIST}
 .endif
 	@cd ${WRKSRC}
 	@SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
+	@${RM} ${WRKSRC}/${DISTNAME}
 	@cd ../../
 	@for file in ${EXTRACT_ONLY}; do \
 		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
@@ -140,7 +174,7 @@ post-install:
 	@${PATCH} -s ${PREFIX}/office52/program/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/office52/program/soffice ${FILESDIR}/soffice.patch
 	@${CP} ${INSTDB.INS} ${INSTDB.INS}.orig
-	@${SED} -e 's%DefaultDestPath = "/usr/local/office52%DefaultDestPath = "office52%' \
+	@${SED} -e 's%DefaultDestPath = "${PREFIX}/office52%DefaultDestPath = "office52%' \
 	    < ${INSTDB.INS}.orig > ${INSTDB.INS}
 
 install-user:
diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile
index 771c234177d..e60c6880ffc 100644
--- a/german/staroffice52/Makefile
+++ b/german/staroffice52/Makefile
@@ -38,10 +38,27 @@ INSTDB.INS=	${PREFIX}/office52/program/instdb.ins
 SUNSOLVE=	${WRKDIR}/109939-02
 ADABAS_DIST=	soa-5_2-ga-bin-linux-de.bin
 SIZE!=		/bin/df -k . | /usr/bin/tail -n 1 | /usr/bin/awk '{print $$4}'
+LINPROCFS!=	mount | grep linprocfs | awk '{print $1}'
 
 .include <bsd.port.pre.mk>
 
 pre-fetch:
+.if ${LINPROCFS}
+	@${ECHO}
+	@${ECHO} Ist linprocfs installiert und gemounted: JA
+.else
+	@${ECHO} -----------------------------------------------------------
+	@${ECHO}
+	@${ECHO} Staroffice benoetigt ein gemountetes linprocfs, das auf
+	@${ECHO} ihrem System nicht aktiviert ist. Bitte lesen Sie die
+	@${ECHO} linprocfs(5) manpage und fuegen Sie folgende Line zu der
+	@${ECHO} Datei /etc/fstab hinzu:
+	@${ECHO}
+	@${ECHO} linproc /compat/linux/proc linprocfs rw 0 0
+	@${ECHO}
+	@${ECHO} -----------------------------------------------------------
+	@${FALSE}
+.endif
 .if ${OSVERSION} < 410000
 	@${ECHO}
 	@${ECHO} OS-VERSION ${OSVERSION}
diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile
index 071cf24afa8..abf03b7e298 100644
--- a/german/staroffice70/Makefile
+++ b/german/staroffice70/Makefile
@@ -40,10 +40,26 @@ INSTDB.INS=	${PREFIX}/office52/program/instdb.ins
 SUNSOLVE=	${WRKDIR}/109939-02
 ADABAS_DIST=	soa-5_2-ga-bin-linux-en.bin
 SIZE!=		/bin/df -k . | /usr/bin/tail -n 1 | /usr/bin/awk '{print $$4}'
+LINPROCFS!=	mount | grep linprocfs | awk '{print $1}'
 
 .include <bsd.port.pre.mk>
 
 pre-fetch:
+.if ${LINPROCFS}
+	@${ECHO}
+	@${ECHO} Check if linprocfs is running: YES
+.else
+	@${ECHO} -----------------------------------------------------------
+	@${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}
+	@${ECHO} linproc /compat/linux/proc linprocfs rw 0 0
+	@${ECHO}
+	@${ECHO} -----------------------------------------------------------
+	@${FALSE}
+.endif
 .if ${OSVERSION} < 410000
 	@${ECHO}
 	@${ECHO} OS-VERSION ${OSVERSION}