-CURRENT fixes (was: Re: openoffice-1.1 build more broken thanusual on 5.2-CURRENT)

[Bartosz Fabianowski]

The following patch two patches make openoffice-1.1 at least start 
compiling on -CURRENT for me again. I don't know yet if the build will 
finish successfully, as it will take the whole night on my machine.

One of the patches simply removes the "BROKEN" keyword, of course. The 
other patch prevents the main port's makefile from passing CFLAGS on the 
command line to the mozilla sub port's make. This is necessary, because 
once passed on the command line, the CFLAGS become pretty much 
read-only, while the mozilla sub port expects to be able to change them 
at will. This patch shouldn't cause any loss in functionality for the 
fragile build system, because the main port didn't actually modify the 
CFLAGS in any way as far as I can tell, so the passing was unnecessary 
to begin with.

Now, if my approach is totally wrong, feel free to correct me. I have 
never hacked on makefiles and I am not even pretending to understand 
what I'm doing here :).

- Bartosz
-------------- next part --------------
--- Makefile.orig	Thu Aug 12 05:31:32 2004
+++ Makefile	Thu Aug 12 05:31:43 2004
@@ -53,10 +53,6 @@
 		helpcontent_90_unix.tgz
 .endif
 
-.if ${OSVERSION} > 502010
-BROKEN=		"Does not compile on 5-current"
-.endif
-
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 
 BUILD_NR=		645
-------------- next part --------------
--- Makefile.mozilla.orig	Thu Aug 12 05:33:02 2004
+++ Makefile.mozilla	Thu Aug 12 05:33:13 2004
@@ -21,9 +21,9 @@
 		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
 .endif
 .if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla ; ${MAKE} CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
+	@cd ${WRKDIR}/mozilla ; ${MAKE} CXX="${CXX}" CC="${CC}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
 .else
-	@cd ${WRKDIR}/mozilla ; ${MAKE} CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
+	@cd ${WRKDIR}/mozilla ; ${MAKE} CXX="${CXX}" CC="${CC}" build WRKDIRPREFIX=""
 .endif
 	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
 	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh