From c53a61862026f8fc2386290bb1f05c5bb13aea83 Mon Sep 17 00:00:00 2001
From: Maho Nakata <maho@FreeBSD.org>
Date: Sat, 15 Dec 2007 10:11:14 +0000
Subject: Update to SRC680_m239.

---
 editors/openoffice-3-devel/Makefile                |  8 ++--
 editors/openoffice-3-devel/distinfo                |  6 +--
 editors/openoffice-3-devel/files/Makefile.knobs    |  9 +----
 editors/openoffice-3-devel/files/patch-i65514      | 15 ++++----
 editors/openoffice-3-devel/files/patch-i84549      | 17 +++++++++
 editors/openoffice-3-devel/files/patch-i84586      | 43 ++++++++++++++++++++++
 editors/openoffice.org-2-devel/Makefile            |  8 ++--
 editors/openoffice.org-2-devel/distinfo            |  6 +--
 .../openoffice.org-2-devel/files/Makefile.knobs    |  9 +----
 editors/openoffice.org-2-devel/files/patch-i65514  | 15 ++++----
 editors/openoffice.org-2-devel/files/patch-i84549  | 17 +++++++++
 editors/openoffice.org-2-devel/files/patch-i84586  | 43 ++++++++++++++++++++++
 editors/openoffice.org-3-devel/Makefile            |  8 ++--
 editors/openoffice.org-3-devel/distinfo            |  6 +--
 .../openoffice.org-3-devel/files/Makefile.knobs    |  9 +----
 editors/openoffice.org-3-devel/files/patch-i65514  | 15 ++++----
 editors/openoffice.org-3-devel/files/patch-i84549  | 17 +++++++++
 editors/openoffice.org-3-devel/files/patch-i84586  | 43 ++++++++++++++++++++++
 editors/openoffice.org-vcltesttool/Makefile        |  8 ++--
 editors/openoffice.org-vcltesttool/distinfo        |  6 +--
 .../files/Makefile.knobs                           |  9 +----
 .../openoffice.org-vcltesttool/files/patch-i65514  | 15 ++++----
 .../openoffice.org-vcltesttool/files/patch-i84549  | 17 +++++++++
 .../openoffice.org-vcltesttool/files/patch-i84586  | 43 ++++++++++++++++++++++
 24 files changed, 304 insertions(+), 88 deletions(-)
 create mode 100644 editors/openoffice-3-devel/files/patch-i84549
 create mode 100644 editors/openoffice-3-devel/files/patch-i84586
 create mode 100644 editors/openoffice.org-2-devel/files/patch-i84549
 create mode 100644 editors/openoffice.org-2-devel/files/patch-i84586
 create mode 100644 editors/openoffice.org-3-devel/files/patch-i84549
 create mode 100644 editors/openoffice.org-3-devel/files/patch-i84586
 create mode 100644 editors/openoffice.org-vcltesttool/files/patch-i84549
 create mode 100644 editors/openoffice.org-vcltesttool/files/patch-i84586

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index ec20c61bbe81..2c29249e2445 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -71,10 +71,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		234
+MILESTONE?=		239
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20071018
+SNAPDATE=		20071213
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
@@ -190,9 +190,9 @@ do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake"
 .endif
 .if ${LOCALIZED_LANG} == "all"
 	@${MAKE} languagepack
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 7b9906ae5b40..3dd5d47cba08 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m234_source.tar.bz2) = 631e4fd641511cf000f3357c90def423
-SHA256 (openoffice.org2/OOo_SRC680_m234_source.tar.bz2) = b0826021a6bcaf5c9dc8bbfd0964ba3b9d3b26b64f8bfa9bd8d0188314d39009
-SIZE (openoffice.org2/OOo_SRC680_m234_source.tar.bz2) = 292859998
+MD5 (openoffice.org2/OOo_SRC680_m239_source.tar.bz2) = b1f2148493ee53a6c9ec9b7dadd2a704
+SHA256 (openoffice.org2/OOo_SRC680_m239_source.tar.bz2) = 612733ca5f6f6a7187abccdac655c71a41cf988f3799743e3d666249fe2e3fef
+SIZE (openoffice.org2/OOo_SRC680_m239_source.tar.bz2) = 298104031
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index a4d76e99c1aa..a24d1fdea61f 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/files/Makefile.knobs
@@ -4,9 +4,7 @@
 
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
 
-.if defined(WITH_VBA)
-CONFIGURE_ARGS+=        --enable-vba --with-vba-package-format="builtin"
-.endif
+CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
@@ -92,11 +90,6 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .endif
-.if !defined(WITH_VBA)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with VBA support with"
-	@${ECHO} "make -DWITH_VBA"
-.endif
 .if !defined(WITH_SYSTEM_FREETYPE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with freetype2 from ports with"
diff --git a/editors/openoffice-3-devel/files/patch-i65514 b/editors/openoffice-3-devel/files/patch-i65514
index cc8221264c59..3a7cabaad912 100644
--- a/editors/openoffice-3-devel/files/patch-i65514
+++ b/editors/openoffice-3-devel/files/patch-i65514
@@ -1,12 +1,13 @@
 --- berkeleydb/makefile.mk	25 May 2007 10:48:51 -0000	1.40
 +++ berkeleydb/makefile.mk	2 Jul 2007 20:15:24 -0000
-@@ -107,6 +107,9 @@
- .IF "$(SOLAR_JAVA)"!=""
- CONFIGURE_FLAGS+=--enable-java
- .ENDIF
+@@ -105,6 +105,10 @@
+ 	..$/dist$/configure
+ CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+ 
 +.IF "$(COM)$(CPU)"=="GCCX"
 +CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
 +.ENDIF
- 
- BUILD_DIR=$(CONFIGURE_DIR)
- BUILD_DIR_OUT=$(CONFIGURE_DIR)
++
+ # just pass ARCH_FLAGS to native build
+ CFLAGS+:=$(ARCH_FLAGS)
+ CXXFLAGS+:=$(ARCH_FLAGS)
diff --git a/editors/openoffice-3-devel/files/patch-i84549 b/editors/openoffice-3-devel/files/patch-i84549
new file mode 100644
index 000000000000..3f1808c45b5a
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i84549
@@ -0,0 +1,17 @@
+? neon/unxfbsdi.pro
+Index: neon/neon.patch
+===================================================================
+RCS file: /cvs/external/neon/neon.patch,v
+retrieving revision 1.20
+diff -u -r1.20 neon.patch
+--- neon/neon.patch	14 Nov 2007 09:49:43 -0000	1.20
++++ neon/neon.patch	13 Dec 2007 17:16:29 -0000
+@@ -268,7 +268,7 @@
+ ! #define HAVE_SYS_TYPES_H 1
+ ! 
+ ! /* Define if the timezone global is available */
+-! #ifndef MACOSX
++! #if !defined (MACOSX) && !defined (FREEBSD)
+ ! #define HAVE_TIMEZONE 1
+ ! #endif
+ ! 
diff --git a/editors/openoffice-3-devel/files/patch-i84586 b/editors/openoffice-3-devel/files/patch-i84586
new file mode 100644
index 000000000000..7b624c3f77f1
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i84586
@@ -0,0 +1,43 @@
+? sc/unxfbsdi.pro
+Index: sc/source/ui/vba/vbaaxis.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 vbaaxis.cxx
+--- sc/source/ui/vba/vbaaxis.cxx	7 Dec 2007 10:43:48 -0000	1.2
++++ sc/source/ui/vba/vbaaxis.cxx	14 Dec 2007 23:40:31 -0000
+@@ -47,8 +47,8 @@
+ 
+ const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") );
+ const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+-const rtl::OUString MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+-const rtl::OUString MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
++const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
++const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+ ScVbaChart* 
+ ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
+ {
+@@ -142,12 +142,12 @@
+ 				bCrossesAreCustomized = sal_False;
+ 				return;
+ 			case xlAxisCrossesMinimum:                     // The axis crosses at the minimum value. 
+-				mxPropertySet->getPropertyValue(MIN) >>= fNum;
++				mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum;
+ 				setCrossesAt( fNum );
+ 				bCrossesAreCustomized = sal_False;
+ 				break;
+ 			case xlAxisCrossesMaximum:                     // The axis crosses at the maximum value. 
+-				mxPropertySet->getPropertyValue(MAX) >>= fNum;
++				mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum;
+ 				setCrossesAt(fNum);
+ 				bCrossesAreCustomized = sal_False;
+ 				break;
+@@ -182,7 +182,7 @@
+ 				mxPropertySet->getPropertyValue(ORIGIN) >>= forigin;
+ //obsolete      double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max"));
+ 				double fmin = 0.0;
+-				mxPropertySet->getPropertyValue(MIN) >>= fmin;
++				mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin;
+ 				if (forigin == fmin)
+ 					nCrosses = xlAxisCrossesMinimum;
+ 				else
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index ec20c61bbe81..2c29249e2445 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -71,10 +71,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		234
+MILESTONE?=		239
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20071018
+SNAPDATE=		20071213
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
@@ -190,9 +190,9 @@ do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake"
 .endif
 .if ${LOCALIZED_LANG} == "all"
 	@${MAKE} languagepack
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 7b9906ae5b40..3dd5d47cba08 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m234_source.tar.bz2) = 631e4fd641511cf000f3357c90def423
-SHA256 (openoffice.org2/OOo_SRC680_m234_source.tar.bz2) = b0826021a6bcaf5c9dc8bbfd0964ba3b9d3b26b64f8bfa9bd8d0188314d39009
-SIZE (openoffice.org2/OOo_SRC680_m234_source.tar.bz2) = 292859998
+MD5 (openoffice.org2/OOo_SRC680_m239_source.tar.bz2) = b1f2148493ee53a6c9ec9b7dadd2a704
+SHA256 (openoffice.org2/OOo_SRC680_m239_source.tar.bz2) = 612733ca5f6f6a7187abccdac655c71a41cf988f3799743e3d666249fe2e3fef
+SIZE (openoffice.org2/OOo_SRC680_m239_source.tar.bz2) = 298104031
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-2-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs
index a4d76e99c1aa..a24d1fdea61f 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2-devel/files/Makefile.knobs
@@ -4,9 +4,7 @@
 
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
 
-.if defined(WITH_VBA)
-CONFIGURE_ARGS+=        --enable-vba --with-vba-package-format="builtin"
-.endif
+CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
@@ -92,11 +90,6 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .endif
-.if !defined(WITH_VBA)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with VBA support with"
-	@${ECHO} "make -DWITH_VBA"
-.endif
 .if !defined(WITH_SYSTEM_FREETYPE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with freetype2 from ports with"
diff --git a/editors/openoffice.org-2-devel/files/patch-i65514 b/editors/openoffice.org-2-devel/files/patch-i65514
index cc8221264c59..3a7cabaad912 100644
--- a/editors/openoffice.org-2-devel/files/patch-i65514
+++ b/editors/openoffice.org-2-devel/files/patch-i65514
@@ -1,12 +1,13 @@
 --- berkeleydb/makefile.mk	25 May 2007 10:48:51 -0000	1.40
 +++ berkeleydb/makefile.mk	2 Jul 2007 20:15:24 -0000
-@@ -107,6 +107,9 @@
- .IF "$(SOLAR_JAVA)"!=""
- CONFIGURE_FLAGS+=--enable-java
- .ENDIF
+@@ -105,6 +105,10 @@
+ 	..$/dist$/configure
+ CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+ 
 +.IF "$(COM)$(CPU)"=="GCCX"
 +CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
 +.ENDIF
- 
- BUILD_DIR=$(CONFIGURE_DIR)
- BUILD_DIR_OUT=$(CONFIGURE_DIR)
++
+ # just pass ARCH_FLAGS to native build
+ CFLAGS+:=$(ARCH_FLAGS)
+ CXXFLAGS+:=$(ARCH_FLAGS)
diff --git a/editors/openoffice.org-2-devel/files/patch-i84549 b/editors/openoffice.org-2-devel/files/patch-i84549
new file mode 100644
index 000000000000..3f1808c45b5a
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i84549
@@ -0,0 +1,17 @@
+? neon/unxfbsdi.pro
+Index: neon/neon.patch
+===================================================================
+RCS file: /cvs/external/neon/neon.patch,v
+retrieving revision 1.20
+diff -u -r1.20 neon.patch
+--- neon/neon.patch	14 Nov 2007 09:49:43 -0000	1.20
++++ neon/neon.patch	13 Dec 2007 17:16:29 -0000
+@@ -268,7 +268,7 @@
+ ! #define HAVE_SYS_TYPES_H 1
+ ! 
+ ! /* Define if the timezone global is available */
+-! #ifndef MACOSX
++! #if !defined (MACOSX) && !defined (FREEBSD)
+ ! #define HAVE_TIMEZONE 1
+ ! #endif
+ ! 
diff --git a/editors/openoffice.org-2-devel/files/patch-i84586 b/editors/openoffice.org-2-devel/files/patch-i84586
new file mode 100644
index 000000000000..7b624c3f77f1
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i84586
@@ -0,0 +1,43 @@
+? sc/unxfbsdi.pro
+Index: sc/source/ui/vba/vbaaxis.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 vbaaxis.cxx
+--- sc/source/ui/vba/vbaaxis.cxx	7 Dec 2007 10:43:48 -0000	1.2
++++ sc/source/ui/vba/vbaaxis.cxx	14 Dec 2007 23:40:31 -0000
+@@ -47,8 +47,8 @@
+ 
+ const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") );
+ const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+-const rtl::OUString MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+-const rtl::OUString MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
++const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
++const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+ ScVbaChart* 
+ ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
+ {
+@@ -142,12 +142,12 @@
+ 				bCrossesAreCustomized = sal_False;
+ 				return;
+ 			case xlAxisCrossesMinimum:                     // The axis crosses at the minimum value. 
+-				mxPropertySet->getPropertyValue(MIN) >>= fNum;
++				mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum;
+ 				setCrossesAt( fNum );
+ 				bCrossesAreCustomized = sal_False;
+ 				break;
+ 			case xlAxisCrossesMaximum:                     // The axis crosses at the maximum value. 
+-				mxPropertySet->getPropertyValue(MAX) >>= fNum;
++				mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum;
+ 				setCrossesAt(fNum);
+ 				bCrossesAreCustomized = sal_False;
+ 				break;
+@@ -182,7 +182,7 @@
+ 				mxPropertySet->getPropertyValue(ORIGIN) >>= forigin;
+ //obsolete      double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max"));
+ 				double fmin = 0.0;
+-				mxPropertySet->getPropertyValue(MIN) >>= fmin;
++				mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin;
+ 				if (forigin == fmin)
+ 					nCrosses = xlAxisCrossesMinimum;
+ 				else
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index ec20c61bbe81..2c29249e2445 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -71,10 +71,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		234
+MILESTONE?=		239
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20071018
+SNAPDATE=		20071213
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
@@ -190,9 +190,9 @@ do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake"
 .endif
 .if ${LOCALIZED_LANG} == "all"
 	@${MAKE} languagepack
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 7b9906ae5b40..3dd5d47cba08 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m234_source.tar.bz2) = 631e4fd641511cf000f3357c90def423
-SHA256 (openoffice.org2/OOo_SRC680_m234_source.tar.bz2) = b0826021a6bcaf5c9dc8bbfd0964ba3b9d3b26b64f8bfa9bd8d0188314d39009
-SIZE (openoffice.org2/OOo_SRC680_m234_source.tar.bz2) = 292859998
+MD5 (openoffice.org2/OOo_SRC680_m239_source.tar.bz2) = b1f2148493ee53a6c9ec9b7dadd2a704
+SHA256 (openoffice.org2/OOo_SRC680_m239_source.tar.bz2) = 612733ca5f6f6a7187abccdac655c71a41cf988f3799743e3d666249fe2e3fef
+SIZE (openoffice.org2/OOo_SRC680_m239_source.tar.bz2) = 298104031
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs
index a4d76e99c1aa..a24d1fdea61f 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-3-devel/files/Makefile.knobs
@@ -4,9 +4,7 @@
 
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
 
-.if defined(WITH_VBA)
-CONFIGURE_ARGS+=        --enable-vba --with-vba-package-format="builtin"
-.endif
+CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
@@ -92,11 +90,6 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .endif
-.if !defined(WITH_VBA)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with VBA support with"
-	@${ECHO} "make -DWITH_VBA"
-.endif
 .if !defined(WITH_SYSTEM_FREETYPE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with freetype2 from ports with"
diff --git a/editors/openoffice.org-3-devel/files/patch-i65514 b/editors/openoffice.org-3-devel/files/patch-i65514
index cc8221264c59..3a7cabaad912 100644
--- a/editors/openoffice.org-3-devel/files/patch-i65514
+++ b/editors/openoffice.org-3-devel/files/patch-i65514
@@ -1,12 +1,13 @@
 --- berkeleydb/makefile.mk	25 May 2007 10:48:51 -0000	1.40
 +++ berkeleydb/makefile.mk	2 Jul 2007 20:15:24 -0000
-@@ -107,6 +107,9 @@
- .IF "$(SOLAR_JAVA)"!=""
- CONFIGURE_FLAGS+=--enable-java
- .ENDIF
+@@ -105,6 +105,10 @@
+ 	..$/dist$/configure
+ CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+ 
 +.IF "$(COM)$(CPU)"=="GCCX"
 +CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
 +.ENDIF
- 
- BUILD_DIR=$(CONFIGURE_DIR)
- BUILD_DIR_OUT=$(CONFIGURE_DIR)
++
+ # just pass ARCH_FLAGS to native build
+ CFLAGS+:=$(ARCH_FLAGS)
+ CXXFLAGS+:=$(ARCH_FLAGS)
diff --git a/editors/openoffice.org-3-devel/files/patch-i84549 b/editors/openoffice.org-3-devel/files/patch-i84549
new file mode 100644
index 000000000000..3f1808c45b5a
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i84549
@@ -0,0 +1,17 @@
+? neon/unxfbsdi.pro
+Index: neon/neon.patch
+===================================================================
+RCS file: /cvs/external/neon/neon.patch,v
+retrieving revision 1.20
+diff -u -r1.20 neon.patch
+--- neon/neon.patch	14 Nov 2007 09:49:43 -0000	1.20
++++ neon/neon.patch	13 Dec 2007 17:16:29 -0000
+@@ -268,7 +268,7 @@
+ ! #define HAVE_SYS_TYPES_H 1
+ ! 
+ ! /* Define if the timezone global is available */
+-! #ifndef MACOSX
++! #if !defined (MACOSX) && !defined (FREEBSD)
+ ! #define HAVE_TIMEZONE 1
+ ! #endif
+ ! 
diff --git a/editors/openoffice.org-3-devel/files/patch-i84586 b/editors/openoffice.org-3-devel/files/patch-i84586
new file mode 100644
index 000000000000..7b624c3f77f1
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i84586
@@ -0,0 +1,43 @@
+? sc/unxfbsdi.pro
+Index: sc/source/ui/vba/vbaaxis.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 vbaaxis.cxx
+--- sc/source/ui/vba/vbaaxis.cxx	7 Dec 2007 10:43:48 -0000	1.2
++++ sc/source/ui/vba/vbaaxis.cxx	14 Dec 2007 23:40:31 -0000
+@@ -47,8 +47,8 @@
+ 
+ const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") );
+ const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+-const rtl::OUString MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+-const rtl::OUString MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
++const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
++const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+ ScVbaChart* 
+ ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
+ {
+@@ -142,12 +142,12 @@
+ 				bCrossesAreCustomized = sal_False;
+ 				return;
+ 			case xlAxisCrossesMinimum:                     // The axis crosses at the minimum value. 
+-				mxPropertySet->getPropertyValue(MIN) >>= fNum;
++				mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum;
+ 				setCrossesAt( fNum );
+ 				bCrossesAreCustomized = sal_False;
+ 				break;
+ 			case xlAxisCrossesMaximum:                     // The axis crosses at the maximum value. 
+-				mxPropertySet->getPropertyValue(MAX) >>= fNum;
++				mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum;
+ 				setCrossesAt(fNum);
+ 				bCrossesAreCustomized = sal_False;
+ 				break;
+@@ -182,7 +182,7 @@
+ 				mxPropertySet->getPropertyValue(ORIGIN) >>= forigin;
+ //obsolete      double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max"));
+ 				double fmin = 0.0;
+-				mxPropertySet->getPropertyValue(MIN) >>= fmin;
++				mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin;
+ 				if (forigin == fmin)
+ 					nCrosses = xlAxisCrossesMinimum;
+ 				else
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index ec20c61bbe81..2c29249e2445 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -71,10 +71,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		234
+MILESTONE?=		239
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20071018
+SNAPDATE=		20071213
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
@@ -190,9 +190,9 @@ do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake"
 .endif
 .if ${LOCALIZED_LANG} == "all"
 	@${MAKE} languagepack
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 7b9906ae5b40..3dd5d47cba08 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m234_source.tar.bz2) = 631e4fd641511cf000f3357c90def423
-SHA256 (openoffice.org2/OOo_SRC680_m234_source.tar.bz2) = b0826021a6bcaf5c9dc8bbfd0964ba3b9d3b26b64f8bfa9bd8d0188314d39009
-SIZE (openoffice.org2/OOo_SRC680_m234_source.tar.bz2) = 292859998
+MD5 (openoffice.org2/OOo_SRC680_m239_source.tar.bz2) = b1f2148493ee53a6c9ec9b7dadd2a704
+SHA256 (openoffice.org2/OOo_SRC680_m239_source.tar.bz2) = 612733ca5f6f6a7187abccdac655c71a41cf988f3799743e3d666249fe2e3fef
+SIZE (openoffice.org2/OOo_SRC680_m239_source.tar.bz2) = 298104031
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
index a4d76e99c1aa..a24d1fdea61f 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
@@ -4,9 +4,7 @@
 
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
 
-.if defined(WITH_VBA)
-CONFIGURE_ARGS+=        --enable-vba --with-vba-package-format="builtin"
-.endif
+CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 
 .if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
@@ -92,11 +90,6 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without gnome VFS support with"
 	@${ECHO} "make -DWITHOUT_GNOMEVFS"
 .endif
-.if !defined(WITH_VBA)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with VBA support with"
-	@${ECHO} "make -DWITH_VBA"
-.endif
 .if !defined(WITH_SYSTEM_FREETYPE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with freetype2 from ports with"
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i65514 b/editors/openoffice.org-vcltesttool/files/patch-i65514
index cc8221264c59..3a7cabaad912 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-i65514
+++ b/editors/openoffice.org-vcltesttool/files/patch-i65514
@@ -1,12 +1,13 @@
 --- berkeleydb/makefile.mk	25 May 2007 10:48:51 -0000	1.40
 +++ berkeleydb/makefile.mk	2 Jul 2007 20:15:24 -0000
-@@ -107,6 +107,9 @@
- .IF "$(SOLAR_JAVA)"!=""
- CONFIGURE_FLAGS+=--enable-java
- .ENDIF
+@@ -105,6 +105,10 @@
+ 	..$/dist$/configure
+ CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+ 
 +.IF "$(COM)$(CPU)"=="GCCX"
 +CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly
 +.ENDIF
- 
- BUILD_DIR=$(CONFIGURE_DIR)
- BUILD_DIR_OUT=$(CONFIGURE_DIR)
++
+ # just pass ARCH_FLAGS to native build
+ CFLAGS+:=$(ARCH_FLAGS)
+ CXXFLAGS+:=$(ARCH_FLAGS)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i84549 b/editors/openoffice.org-vcltesttool/files/patch-i84549
new file mode 100644
index 000000000000..3f1808c45b5a
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i84549
@@ -0,0 +1,17 @@
+? neon/unxfbsdi.pro
+Index: neon/neon.patch
+===================================================================
+RCS file: /cvs/external/neon/neon.patch,v
+retrieving revision 1.20
+diff -u -r1.20 neon.patch
+--- neon/neon.patch	14 Nov 2007 09:49:43 -0000	1.20
++++ neon/neon.patch	13 Dec 2007 17:16:29 -0000
+@@ -268,7 +268,7 @@
+ ! #define HAVE_SYS_TYPES_H 1
+ ! 
+ ! /* Define if the timezone global is available */
+-! #ifndef MACOSX
++! #if !defined (MACOSX) && !defined (FREEBSD)
+ ! #define HAVE_TIMEZONE 1
+ ! #endif
+ ! 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i84586 b/editors/openoffice.org-vcltesttool/files/patch-i84586
new file mode 100644
index 000000000000..7b624c3f77f1
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i84586
@@ -0,0 +1,43 @@
+? sc/unxfbsdi.pro
+Index: sc/source/ui/vba/vbaaxis.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbaaxis.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 vbaaxis.cxx
+--- sc/source/ui/vba/vbaaxis.cxx	7 Dec 2007 10:43:48 -0000	1.2
++++ sc/source/ui/vba/vbaaxis.cxx	14 Dec 2007 23:40:31 -0000
+@@ -47,8 +47,8 @@
+ 
+ const rtl::OUString ORIGIN( RTL_CONSTASCII_USTRINGPARAM("Origin") );
+ const rtl::OUString AUTOORIGIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+-const rtl::OUString MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+-const rtl::OUString MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
++const rtl::OUString VBA_MIN( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
++const rtl::OUString VBA_MAX( RTL_CONSTASCII_USTRINGPARAM("AutoOrigin") );
+ ScVbaChart* 
+ ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
+ {
+@@ -142,12 +142,12 @@
+ 				bCrossesAreCustomized = sal_False;
+ 				return;
+ 			case xlAxisCrossesMinimum:                     // The axis crosses at the minimum value. 
+-				mxPropertySet->getPropertyValue(MIN) >>= fNum;
++				mxPropertySet->getPropertyValue(VBA_MIN) >>= fNum;
+ 				setCrossesAt( fNum );
+ 				bCrossesAreCustomized = sal_False;
+ 				break;
+ 			case xlAxisCrossesMaximum:                     // The axis crosses at the maximum value. 
+-				mxPropertySet->getPropertyValue(MAX) >>= fNum;
++				mxPropertySet->getPropertyValue(VBA_MAX) >>= fNum;
+ 				setCrossesAt(fNum);
+ 				bCrossesAreCustomized = sal_False;
+ 				break;
+@@ -182,7 +182,7 @@
+ 				mxPropertySet->getPropertyValue(ORIGIN) >>= forigin;
+ //obsolete      double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max"));
+ 				double fmin = 0.0;
+-				mxPropertySet->getPropertyValue(MIN) >>= fmin;
++				mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin;
+ 				if (forigin == fmin)
+ 					nCrosses = xlAxisCrossesMinimum;
+ 				else
-- 
cgit v1.2.3