mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-11 02:50:24 +00:00
Code Issues Releases Activity

Update to DEV300_m42.

Browse Source 
Funded by: OpenOffice.org community.
This commit is contained in:
Maho Nakata 2009-03-20 11:59:18 +00:00
parent 4ea95aa2c9
commit 34ff724ddb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=230474
20 changed files with 234 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editors/openoffice-3-devel/Makefile
View File

@ -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)

6
editors/openoffice-3-devel/distinfo
View File

@ -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

21
editors/openoffice-3-devel/files/patch-i100394 Normal file
View File

@ -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...

15
editors/openoffice-3-devel/files/patch-i100395 Normal file
View File

@ -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

52
editors/openoffice-3-devel/files/patch-i100403 Normal file
View File

@ -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):

11
editors/openoffice-3-devel/files/patch-i100407 Normal file
View File

@ -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) && \

18
editors/openoffice-3-devel/files/patch-i84549
View File

@ -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
+

43
editors/openoffice-3-devel/files/patch-i84586
View File

@ -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

9
editors/openoffice-3-devel/files/patch-i85972
View File

@ -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

23
editors/openoffice-3-devel/files/patch-i98550
View File

@ -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= \

4
editors/openoffice.org-3-devel/Makefile
View File

@ -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)

6
editors/openoffice.org-3-devel/distinfo
View File

@ -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

21
editors/openoffice.org-3-devel/files/patch-i100394 Normal file
View File

@ -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...

15
editors/openoffice.org-3-devel/files/patch-i100395 Normal file
View File

@ -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

52
editors/openoffice.org-3-devel/files/patch-i100403 Normal file
View File

@ -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):

11
editors/openoffice.org-3-devel/files/patch-i100407 Normal file
View File

@ -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) && \

18
editors/openoffice.org-3-devel/files/patch-i84549
View File

@ -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
+

43
editors/openoffice.org-3-devel/files/patch-i84586
View File

@ -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

9
editors/openoffice.org-3-devel/files/patch-i85972
View File

@ -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

23
editors/openoffice.org-3-devel/files/patch-i98550
View File

@ -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= \