Fix the CDROM install of StarOffice.

PR:		30983
Submitted by:	Maintainer

3 files changed, 48 insertions, 21 deletions

diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile
index b37f629119bd..1a04a1cb4411 100644
--- a/editors/staroffice52/Makefile
+++ b/editors/staroffice52/Makefile
@@ -18,10 +18,14 @@ MASTER_SITES=	ftp://ftp.csua.berkeley.edu/pub/.1/ports/distfiles/staroffice52/ \
 		ftp://ftp.hu-berlin.de/pub/mirrors/sunsolve.sun.com/pub/patches/ \
 		ftp://ftp.sunet.se/pub7/security/vendor/sun/patches/
 DISTNAME=	so-5_2-ga-bin-linux-en.bin
+.if defined(WITH_CDROM)
+DISTFILES=	109939-02.tar.Z
+.else
 DISTFILES=	so-5_2-ga-bin-linux-en.bin 109939-02.tar.Z
 .if defined(WITH_ADABAS)
 DISTFILES+=	soa-5_2-ga-bin-linux-en.bin
 .endif
+.endif
 EXTRACT_ONLY=	109939-02.tar.Z
 
 MAINTAINER=	mb@imp.ch
@@ -96,13 +100,6 @@ pre-fetch:
 .endif
 .endif
 
-.if defined(WITH_CDROM)
-do-extract: do-extract-cdrom
-do-extract-cdrom:
-	@${MKDIR} ${WRKSRC}
-	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
 do-extract:
 .if !defined(DISPLAY) || ${DISPLAY} == ""
 	@ ${ECHO}
@@ -113,6 +110,17 @@ do-extract:
 .else
 	@${MKDIR} ${WRKSRC}
 	@${MKDIR} ${TMPDIR}
+.if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
+.if defined(WITH_ADABAS)
+	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/adabas/adabas .
+	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/adabas/f_0000 .
+	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/adabas/f_0001 .
+.endif
+	@${MKDIR} ${WRKSRC}
+	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
+.endif
+.else
 	@${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
 	@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
 .if defined(WITH_ADABAS)
@@ -122,6 +130,7 @@ do-extract:
 	@cd ${WRKSRC}
 	@SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
 	@${RM} ${WRKSRC}/${DISTNAME}
+.endif
 	@cd ../../
 	@for file in ${EXTRACT_ONLY}; do \
 		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index b37f629119bd..1a04a1cb4411 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -18,10 +18,14 @@ MASTER_SITES=	ftp://ftp.csua.berkeley.edu/pub/.1/ports/distfiles/staroffice52/ \
 		ftp://ftp.hu-berlin.de/pub/mirrors/sunsolve.sun.com/pub/patches/ \
 		ftp://ftp.sunet.se/pub7/security/vendor/sun/patches/
 DISTNAME=	so-5_2-ga-bin-linux-en.bin
+.if defined(WITH_CDROM)
+DISTFILES=	109939-02.tar.Z
+.else
 DISTFILES=	so-5_2-ga-bin-linux-en.bin 109939-02.tar.Z
 .if defined(WITH_ADABAS)
 DISTFILES+=	soa-5_2-ga-bin-linux-en.bin
 .endif
+.endif
 EXTRACT_ONLY=	109939-02.tar.Z
 
 MAINTAINER=	mb@imp.ch
@@ -96,13 +100,6 @@ pre-fetch:
 .endif
 .endif
 
-.if defined(WITH_CDROM)
-do-extract: do-extract-cdrom
-do-extract-cdrom:
-	@${MKDIR} ${WRKSRC}
-	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
 do-extract:
 .if !defined(DISPLAY) || ${DISPLAY} == ""
 	@ ${ECHO}
@@ -113,6 +110,17 @@ do-extract:
 .else
 	@${MKDIR} ${WRKSRC}
 	@${MKDIR} ${TMPDIR}
+.if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
+.if defined(WITH_ADABAS)
+	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/adabas/adabas .
+	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/adabas/f_0000 .
+	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/adabas/f_0001 .
+.endif
+	@${MKDIR} ${WRKSRC}
+	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
+.endif
+.else
 	@${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
 	@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
 .if defined(WITH_ADABAS)
@@ -122,6 +130,7 @@ do-extract:
 	@cd ${WRKSRC}
 	@SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
 	@${RM} ${WRKSRC}/${DISTNAME}
+.endif
 	@cd ../../
 	@for file in ${EXTRACT_ONLY}; do \
 		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index b37f629119bd..1a04a1cb4411 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -18,10 +18,14 @@ MASTER_SITES=	ftp://ftp.csua.berkeley.edu/pub/.1/ports/distfiles/staroffice52/ \
 		ftp://ftp.hu-berlin.de/pub/mirrors/sunsolve.sun.com/pub/patches/ \
 		ftp://ftp.sunet.se/pub7/security/vendor/sun/patches/
 DISTNAME=	so-5_2-ga-bin-linux-en.bin
+.if defined(WITH_CDROM)
+DISTFILES=	109939-02.tar.Z
+.else
 DISTFILES=	so-5_2-ga-bin-linux-en.bin 109939-02.tar.Z
 .if defined(WITH_ADABAS)
 DISTFILES+=	soa-5_2-ga-bin-linux-en.bin
 .endif
+.endif
 EXTRACT_ONLY=	109939-02.tar.Z
 
 MAINTAINER=	mb@imp.ch
@@ -96,13 +100,6 @@ pre-fetch:
 .endif
 .endif
 
-.if defined(WITH_CDROM)
-do-extract: do-extract-cdrom
-do-extract-cdrom:
-	@${MKDIR} ${WRKSRC}
-	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
 do-extract:
 .if !defined(DISPLAY) || ${DISPLAY} == ""
 	@ ${ECHO}
@@ -113,6 +110,17 @@ do-extract:
 .else
 	@${MKDIR} ${WRKSRC}
 	@${MKDIR} ${TMPDIR}
+.if defined(WITH_CDROM)
+.if !exists(${CD_MOUNTPT}/linux/office52/setup)
+.if defined(WITH_ADABAS)
+	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/adabas/adabas .
+	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/adabas/f_0000 .
+	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/adabas/f_0001 .
+.endif
+	@${MKDIR} ${WRKSRC}
+	@cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
+.endif
+.else
 	@${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
 	@${CHMOD} 755 ${WRKSRC}/${DISTNAME}
 .if defined(WITH_ADABAS)
@@ -122,6 +130,7 @@ do-extract:
 	@cd ${WRKSRC}
 	@SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
 	@${RM} ${WRKSRC}/${DISTNAME}
+.endif
 	@cd ../../
 	@for file in ${EXTRACT_ONLY}; do \
 		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \