Update to DEV300_m42.

Funded by: OpenOffice.org community.

10 files changed, 117 insertions, 85 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index a3a83a43504d..42295ad5fc1a 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -70,11 +70,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		41
+MILESTONE?=		42
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090131
+SNAPDATE=		20090314
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 48f926e9d022..56ebe56b678a 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m41_source.tar.bz2) = ccc26541f4e9a98e546e4c1a8f8f9818
-SHA256 (openoffice.org3/OOo_DEV300_m41_source.tar.bz2) = 7d54931b6fb467503bcc821a67e5b32dbf199077adc8566560825ae0ccb68adc
-SIZE (openoffice.org3/OOo_DEV300_m41_source.tar.bz2) = 390008199
+MD5 (openoffice.org3/OOo_DEV300_m42_source.tar.bz2) = e54e9618dc8aa31bd659bc795140e078
+SHA256 (openoffice.org3/OOo_DEV300_m42_source.tar.bz2) = 8e08df65a2fe39659508e21d28b453ea7a6f9be2da4ecce20af7f444b812bbf5
+SIZE (openoffice.org3/OOo_DEV300_m42_source.tar.bz2) = 392787201
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-i100394 b/editors/openoffice-3-devel/files/patch-i100394
new file mode 100644
index 000000000000..1d3ca58377fc
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i100394
@@ -0,0 +1,21 @@
+--- solenv/inc/settings.mk~	2009-02-25 02:58:24.000000000 +0900
++++ solenv/inc/settings.mk	2009-03-20 16:43:08.000000000 +0900
+@@ -1023,6 +1023,7 @@
+ # allow seperate handling
+ EXTMAXPROCESS*=$(MAXPROCESS)
+ 
++HELPEX*=$(AUGMENT_LIBRARY_PATH) helpex
+ IDLC*=$(AUGMENT_LIBRARY_PATH) idlc
+ REGMERGE*=$(AUGMENT_LIBRARY_PATH) regmerge
+ REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) regcompare
+--- helpcontent2/makefile.pmk~	2009-02-25 02:50:11.000000000 +0900
++++ helpcontent2/makefile.pmk	2009-03-20 16:42:39.000000000 +0900
+@@ -44,7 +44,7 @@
+ 
+ $(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
+ .IF "$(WITH_LANG)"!=""
+-	@$(WRAPCMD) helpex -QQ -p helpcontent2 -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@
++	@$(WRAPCMD) $(HELPEX) -QQ -p helpcontent2 -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m localize.sdf && $(TOUCH) $@
+ .ELSE			# "$(WITH_LANG)"!=""
+ .IF "$(USE_SHELL)"=="4nt"
+ # it's getting real ugly...
diff --git a/editors/openoffice-3-devel/files/patch-i100395 b/editors/openoffice-3-devel/files/patch-i100395
new file mode 100644
index 000000000000..afd73b787e8f
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i100395
@@ -0,0 +1,15 @@
+--- solenv/inc/unx.mk~	2009-02-25 02:58:24.000000000 +0900
++++ solenv/inc/unx.mk	2009-03-20 16:52:22.000000000 +0900
+@@ -242,9 +242,9 @@
+ # potentially affects multiple commands following on the recipe line:
+ .IF "$(USE_SHELL)" == "bash"
+ AUGMENT_LIBRARY_PATH *= : && \
+-    LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR)
++    LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR):.
+ .ELSE
+ AUGMENT_LIBRARY_PATH *= if ($$?LD_LIBRARY_PATH == 1) \
+-    eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:$(SOLARLIBDIR)"' && \
+-    if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH "$(SOLARLIBDIR)" &&
++    eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:$(SOLARLIBDIR):."' && \
++    if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH "$(SOLARLIBDIR):." &&
+ .ENDIF
diff --git a/editors/openoffice-3-devel/files/patch-i100403 b/editors/openoffice-3-devel/files/patch-i100403
new file mode 100644
index 000000000000..5a826e52ab8c
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i100403
@@ -0,0 +1,52 @@
+--- writerfilter/source/resourcemodel/makefile.mk~	2009-03-20 18:00:57.000000000 +0900
++++ writerfilter/source/resourcemodel/makefile.mk	2009-03-20 18:02:38.000000000 +0900
+@@ -129,9 +129,9 @@
+ OOXMLRESOURCEIDSHXX=$(OOXMLHXXOUTDIR)$/resourceids.hxx
+ 
+ .IF "$(SYSTEM_LIBXSLT)"=="NO"
+-XSLTPROC=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/xsltproc
++XSLTPROC_EXE=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/xsltproc
+ .ELSE
+-XSLTPROC=xsltproc
++XSLTPROC_EXE=xsltproc
+ .ENDIF
+ 
+ GENERATEDHEADERS=$(DOCTOKRESOURCEIDSHXX) $(OOXMLRESOURCEIDSHXX) $(SPRMIDSHXX)
+--- solenv/inc/settings.mk~	2009-03-20 18:04:15.000000000 +0900
++++ solenv/inc/settings.mk	2009-03-20 18:00:29.000000000 +0900
+@@ -1023,6 +1023,7 @@
+ # allow seperate handling
+ EXTMAXPROCESS*=$(MAXPROCESS)
+ 
++XSLTPROC*=$(AUGMENT_LIBRARY_PATH) $(XSLTPROC_EXE)
+ HELPEX*=$(AUGMENT_LIBRARY_PATH) helpex
+ IDLC*=$(AUGMENT_LIBRARY_PATH) idlc
+ REGMERGE*=$(AUGMENT_LIBRARY_PATH) regmerge
+--- writerfilter/source/ooxml/makefile.mk~	2009-02-25 03:05:51.000000000 +0900
++++ writerfilter/source/ooxml/makefile.mk	2009-03-20 18:15:12.000000000 +0900
+@@ -181,9 +181,9 @@
+ 	$(TOKENXML)
+ 
+ .IF "$(SYSTEM_LIBXSLT)"=="NO"
+-XSLTPROC=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/xsltproc
++XSLTPROC_EXE=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/xsltproc
+ .ELSE
+-XSLTPROC=xsltproc
++XSLTPROC_EXE=xsltproc
+ .ENDIF
+ 
+ $(TOKENXMLTMP): $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt
+--- writerfilter/source/doctok/makefile.mk~	2009-02-25 03:05:47.000000000 +0900
++++ writerfilter/source/doctok/makefile.mk	2009-03-20 18:19:10.000000000 +0900
+@@ -127,9 +127,9 @@
+ DOCTOKGENFILES=$(DOCTOKGENHEADERS) $(RESOURCESCXX)
+ 
+ .IF "$(SYSTEM_LIBXSLT)"=="NO"
+-XSLTPROC=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/xsltproc
++XSLTPROC_EXE=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/xsltproc
+ .ELSE
+-XSLTPROC=xsltproc
++XSLTPROC_EXE=xsltproc
+ .ENDIF
+ 
+ $(DOCTOKHXXOUTDIRCREATED):
diff --git a/editors/openoffice-3-devel/files/patch-i100407 b/editors/openoffice-3-devel/files/patch-i100407
new file mode 100644
index 000000000000..1e26d6d900e1
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i100407
@@ -0,0 +1,11 @@
+--- moz/extractfiles.mk~	2009-02-25 02:58:20.000000000 +0900
++++ moz/extractfiles.mk	2009-03-20 18:39:47.000000000 +0900
+@@ -266,7 +266,7 @@
+ .ENDIF
+ 
+ # zip runtime files to mozruntime.zip
+-.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS"
++.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
+ # regxpcom needs to find libxpcom.so next to itself:
+ .IF "$(USE_SHELL)"=="bash"
+     cd $(RUNTIME_DIR) && \
diff --git a/editors/openoffice-3-devel/files/patch-i84549 b/editors/openoffice-3-devel/files/patch-i84549
index 79ebc6897b7e..95ec361dcdb1 100644
--- a/editors/openoffice-3-devel/files/patch-i84549
+++ b/editors/openoffice-3-devel/files/patch-i84549
@@ -4,13 +4,13 @@ RCS file: /cvs/external/neon/neon.patch,v
 retrieving revision 1.25
 diff -u -r1.25 neon.patch
 --- neon/neon.patch	22 Jul 2008 17:17:06 -0000	1.25
-+++ neon/neon.patch	24 Jul 2008 21:32:52 -0000
++++ neon/neon.patch	10 Aug 2008 04:20:27 -0000
 @@ -266,7 +266,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
- +
+ +#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
deleted file mode 100644
index 7b624c3f77f1..000000000000
--- a/editors/openoffice-3-devel/files/patch-i84586
+++ /dev/null
@@ -1,43 +0,0 @@
-? 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-3-devel/files/patch-i85972 b/editors/openoffice-3-devel/files/patch-i85972
index 9a87976fcbb1..78860836b84e 100644
--- a/editors/openoffice-3-devel/files/patch-i85972
+++ b/editors/openoffice-3-devel/files/patch-i85972
@@ -34,16 +34,16 @@ diff -u -r1.4 lp_solve_5.5.patch
 
 --- lpsolve/makefile.mk.orig	2008-12-24 09:40:11.000000000 +0900
 +++ lpsolve/makefile.mk	2008-12-24 12:09:06.000000000 +0900
-@@ -46,7 +46,7 @@
- PATCH_FILE_NAME=lp_solve_5.5-windows.patch
+@@ -46,7 +47,7 @@
+ PATCH_FILES=lp_solve_5.5-windows.patch
  .ELSE
- PATCH_FILE_NAME=lp_solve_5.5.patch
+ PATCH_FILES=lp_solve_5.5.patch
 -ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2
 +ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd
  .ENDIF
  
  CONFIGURE_DIR=
-@@ -73,11 +73,16 @@
+@@ -73,11 +74,16 @@
  .IF "$(COMNAME)"=="sunpro5"
  BUILD_ACTION=sh ccc.solaris
  .ELSE
@@ -59,4 +59,3 @@ diff -u -r1.4 lp_solve_5.5.patch
 +.ENDIF
  
  OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h
- 
diff --git a/editors/openoffice-3-devel/files/patch-i98550 b/editors/openoffice-3-devel/files/patch-i98550
deleted file mode 100644
index 796fc9be02d1..000000000000
--- a/editors/openoffice-3-devel/files/patch-i98550
+++ /dev/null
@@ -1,23 +0,0 @@
---- dictionaries/hu_HU/makefile.mk.orig	2009-01-27 07:57:31.000000000 +0900
-+++ dictionaries/hu_HU/makefile.mk	2009-01-31 18:43:47.000000000 +0900
-@@ -57,17 +57,16 @@
-     $(EXTENSIONDIR)$/hu_HU.dic \
-     $(EXTENSIONDIR)$/hyph_hu_HU.dic \
-     $(EXTENSIONDIR)$/README_hu_HU.txt \
--    $(EXTENSIONDIR)$/README_hyph_hu_HU.txt \
-- 	$(EXTENSIONDIR)$/LICENSES-en.txt \
-+    $(EXTENSIONDIR)$/README_hyph_hu_HU.txt
- 
- COMPONENT_CONFIGDEST=.
- COMPONENT_XCU= \
-     $(EXTENSIONDIR)$/dictionaries.xcu
- 
- # disable fetching default OOo license text
--#CUSTOM_LICENSE=COPYING_OASIS
-+CUSTOM_LICENSE=LICENSES-en.txt
- # override default license destination
--#PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
-+PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
- 
- COMPONENT_ZIP:=$(PWD)$/thes_hu_HU_v2.zip
- COMPONENT_UNZIP_FILES= \