Build fix on i386.

Funded by: OpenOffice.org community.

6 files changed, 42 insertions, 14 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 831d754f7b5..86a118742ff 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -67,9 +67,9 @@ JAVA_VERSION=	1.4 1.5 1.6
 ONLY_FOR_ARCHS=	i386 amd64
 
 .if ${ARCH} == amd64
-FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
+FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 .else
-FREEBSD_ENV_SET=	FreeBSDX86Env.Set
+FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
 MILESTONE?=		68
@@ -126,8 +126,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 
 USE_BISON=	build
 GNU_CONFIGURE=	yes
-WRKSRC?=		${WRKDIR}/${OOOTAG}
-TCSH?=		/bin/tcsh
+WRKSRC?=	${WRKDIR}/${OOOTAG}
+BASH?=		${PREFIX}/bin/bash
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .if defined(DISABLE_MAKE_JOBS)
@@ -146,6 +146,7 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--enable-pdfimport				\
 			--enable-wiki-publisher				\
 			--enable-report-builder				\
+			--with-use-shell=bash				\
 			--with-vendor="FreeBSD ports system"
 
 OOOEXTENSIONS+=		minimizer/sun-presentation-minimizer.oxt
@@ -205,7 +206,7 @@ pre-build:
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMPDIR ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput"
 
 .if ${LOCALIZED_LANG} == "alllangs"
 	@${MAKE} languagepack
diff --git a/editors/openoffice-3-devel/files/Makefile.others b/editors/openoffice-3-devel/files/Makefile.others
index b5fc51fb8bd..8c7fd8f348e 100644
--- a/editors/openoffice-3-devel/files/Makefile.others
+++ b/editors/openoffice-3-devel/files/Makefile.others
@@ -48,9 +48,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
diff --git a/editors/openoffice-3-devel/files/patch-i108197 b/editors/openoffice-3-devel/files/patch-i108197
new file mode 100644
index 00000000000..92b45553281
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i108197
@@ -0,0 +1,13 @@
+--- testtools/source/bridgetest/makefile.mk	2010-01-10 19:40:41.000000000 +0900
++++ testtools/source/bridgetest/makefile.mk	2010-01-10 19:49:30.000000000 +0900
+@@ -143,8 +143,8 @@
+ #################################################################
+ 
+ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk
+-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
+-	@echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me."
++.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
++	@echo "Mac OSX PPC GCC ad FreeBDS/i386 fails this test! likely broken UNO bridge. Fix me."
+ .ELSE
+         cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \
+ 		-ro uno_services.rdb -ro uno_types.rdb \
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 831d754f7b5..86a118742ff 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -67,9 +67,9 @@ JAVA_VERSION=	1.4 1.5 1.6
 ONLY_FOR_ARCHS=	i386 amd64
 
 .if ${ARCH} == amd64
-FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
+FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set.sh
 .else
-FREEBSD_ENV_SET=	FreeBSDX86Env.Set
+FREEBSD_ENV_SET=	FreeBSDX86Env.Set.sh
 .endif
 
 MILESTONE?=		68
@@ -126,8 +126,8 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 
 USE_BISON=	build
 GNU_CONFIGURE=	yes
-WRKSRC?=		${WRKDIR}/${OOOTAG}
-TCSH?=		/bin/tcsh
+WRKSRC?=	${WRKDIR}/${OOOTAG}
+BASH?=		${PREFIX}/bin/bash
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .if defined(DISABLE_MAKE_JOBS)
@@ -146,6 +146,7 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--enable-pdfimport				\
 			--enable-wiki-publisher				\
 			--enable-report-builder				\
+			--with-use-shell=bash				\
 			--with-vendor="FreeBSD ports system"
 
 OOOEXTENSIONS+=		minimizer/sun-presentation-minimizer.oxt
@@ -205,7 +206,7 @@ pre-build:
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMPDIR ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput"
 
 .if ${LOCALIZED_LANG} == "alllangs"
 	@${MAKE} languagepack
diff --git a/editors/openoffice.org-3-devel/files/Makefile.others b/editors/openoffice.org-3-devel/files/Makefile.others
index b5fc51fb8bd..8c7fd8f348e 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.others
+++ b/editors/openoffice.org-3-devel/files/Makefile.others
@@ -48,9 +48,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
diff --git a/editors/openoffice.org-3-devel/files/patch-i108197 b/editors/openoffice.org-3-devel/files/patch-i108197
new file mode 100644
index 00000000000..92b45553281
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i108197
@@ -0,0 +1,13 @@
+--- testtools/source/bridgetest/makefile.mk	2010-01-10 19:40:41.000000000 +0900
++++ testtools/source/bridgetest/makefile.mk	2010-01-10 19:49:30.000000000 +0900
+@@ -143,8 +143,8 @@
+ #################################################################
+ 
+ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk
+-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
+-	@echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me."
++.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" || "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
++	@echo "Mac OSX PPC GCC ad FreeBDS/i386 fails this test! likely broken UNO bridge. Fix me."
+ .ELSE
+         cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \
+ 		-ro uno_services.rdb -ro uno_types.rdb \