Date: Tue, 2 Oct 2001 11:51:53 +0200 (CEST) From: mb@imp.ch To: FreeBSD-gnats-submit@freebsd.org Cc: jedgar@freebsd.org Subject: ports/30983: [PATCH] Some staroffice cdrom fixes Message-ID: <200110020951.f929prk69460@fuchur.lan.attic.ch>
next in thread | raw e-mail | index | archive | help
>Number: 30983 >Category: ports >Synopsis: [PATCH] Some staroffice cdrom fixes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Oct 02 02:50:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Martin Blapp >Release: FreeBSD 5.0-CURRENT i386 >Organization: Improware AG >Environment: System: FreeBSD fuchur.lan.attic.ch 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Sun Sep 30 17:11:52 CEST 2001 root@fuchur.lan.attic.ch:/usr/obj/usr/src/sys/FUCHUR i386 >Description: Really fix the CDROM install of Staroffice. CD_MOUNTPT was defined to late in bsd.port.mk. This caused the staroffice installation to fail. Also do not download the distfiles if we do a CDROm install. Since I have got now a "old" SO-cdrom, I could test the install and it works now. >How-To-Repeat: >Fix: http://home.teleport.ch/freebsd/staroffice-011202.patch --- Mk/bsd.port.mk Fri Sep 28 18:45:15 2001 +++ Mk/bsd.port.mk.new Tue Oct 2 00:40:10 2001 @@ -723,6 +723,9 @@ # defaults to 3.3.6; will be changed to 4.0 when it is ready XFREE86_VERSION?= 3 +# Define CD_MOUNTPT here, else some ports will fail +CD_MOUNTPT?= /cdrom + .endif # End of pre-makefile section. @@ -1158,7 +1163,6 @@ # Search CDROM first if mounted, symlink instead of copy if # FETCH_SYMLINK_DISTFILES is set -CD_MOUNTPT?= /cdrom .if exists(${CD_MOUNTPT}/ports/distfiles) _MASTER_SITE_OVERRIDE:= file:${CD_MOUNTPT}/ports/distfiles/${DIST_SUBDIR}/ ${_MASTER_SITE_OVERRIDE} .if defined(FETCH_SYMLINK_DISTFILES) --- german/staroffice52/Makefile.orig Tue Oct 2 10:59:34 2001 +++ german/staroffice52/Makefile Tue Oct 2 11:31:04 2001 @@ -16,10 +16,14 @@ 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 @@ .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 @@ .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 @@ @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} \ --- editors/staroffice52/Makefile.orig Tue Oct 2 01:08:06 2001 +++ editors/staroffice52/Makefile Tue Oct 2 11:22:57 2001 @@ -18,10 +18,14 @@ 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 @@ -97,13 +101,6 @@ .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} @@ -114,6 +111,17 @@ .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) @@ -123,6 +131,7 @@ @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} \ --- french/staroffice52/Makefile.orig Tue Oct 2 11:07:49 2001 +++ french/staroffice52/Makefile Tue Oct 2 11:26:30 2001 @@ -18,10 +18,14 @@ ftp://ftp.gtn.com/os/Sun/patches/ DISTNAME= so-5_2-ga-bin-linux-fr.bin +.if defined(WITH_CDROM) +DISTFILES= 109939-02.tar.Z +.else DISTFILES= so-5_2-ga-bin-linux-fr.bin 109939-02.tar.Z .if defined(WITH_ADABAS) DISTFILES+= soa-5_2-ga-bin-linux-fr.bin so-5_2-ga-bin-linux-fr.bin .endif +.endif EXTRACT_ONLY= 109939-02.tar.Z MAINTAINER= mb@imp.ch @@ -97,13 +101,6 @@ .endif .endif -.if defined(WITH_CDROM) -do-extract: do-extract-cdrom -do-extract-cdrom: - @${MKDIR} ${WRKSRC} - @cd ${WRKSRC} && ${LN} -s ${CD_MOUNTPT}/linux/office52/* . -.else - do-extract: .if !defined(DISPLAY) || ${DISPLAY} == "" @ ${ECHO} @@ -114,6 +111,17 @@ .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) @@ -123,6 +131,7 @@ @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} \ @@ -131,7 +140,6 @@ exit 1; \ fi \ done -.endif .endif post-configure: >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200110020951.f929prk69460>