diff options
| author | Chris D. Faulhaber <jedgar@FreeBSD.org> | 2001-10-03 13:01:56 +0000 |
|---|---|---|
| committer | Chris D. Faulhaber <jedgar@FreeBSD.org> | 2001-10-03 13:01:56 +0000 |
| commit | 5b2c639251a2e6652c6a4afe1984f31c156a3f16 (patch) | |
| tree | 73f62da933dc33fbff452d06164f3537d063ad3f /german | |
| parent | 46e10b77bdf73be9412c127a635769ac50d1e77b (diff) | |
| download | ports-5b2c639251a2e6652c6a4afe1984f31c156a3f16.tar.gz ports-5b2c639251a2e6652c6a4afe1984f31c156a3f16.zip | |
Fix the CDROM install of StarOffice.
PR: 30983
Submitted by: Maintainer
Notes
Notes:
svn path=/head/; revision=48391
Diffstat (limited to 'german')
| -rw-r--r-- | german/staroffice52/Makefile | 23 | ||||
| -rw-r--r-- | german/staroffice70/Makefile | 23 |
2 files changed, 32 insertions, 14 deletions
diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile index 649f299fdda4..0f063fd0ca2e 100644 --- a/german/staroffice52/Makefile +++ b/german/staroffice52/Makefile @@ -16,10 +16,14 @@ MASTER_SITES= ftp://ftp.hu-berlin.de/pub/linux/staroffice/german/ \ ftp://sunsite.uio.no/pub/sun/sun-patches/ \ ftp://ftp.sunet.se/pub7/security/vendor/sun/patches/ DISTNAME= so-5_2-ga-bin-linux-de.bin +.if defined(WITH_CDROM) +DISTFILES= 109939-02.tar.Z +.else DISTFILES= so-5_2-ga-bin-linux-de.bin 109939-02.tar.Z .if defined(WITH_ADABAS) DISTFILES+= soa-5_2-ga-bin-linux-de.bin .endif +.endif EXTRACT_ONLY= 109939-02.tar.Z MAINTAINER= mb@imp.ch @@ -94,13 +98,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} @@ -112,6 +109,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) @@ -121,6 +129,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/german/staroffice70/Makefile b/german/staroffice70/Makefile index b37f629119bd..1a04a1cb4411 100644 --- a/german/staroffice70/Makefile +++ b/german/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} \ |