Update to DEV300_m43.

Funded by: OpenOffice.org community.

12 files changed, 62 insertions, 156 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 42295ad5fc1a..a469bd545958 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?=		42
+MILESTONE?=		43
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090314
+SNAPDATE=		20090320
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
@@ -201,13 +201,13 @@ do-build:
 
 do-install:
 .if ${LOCALIZED_LANG} == "alllangs"
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${ECHO_CMD} "extracting $$i" ; \
-		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/$$i ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd/$$i ; \
 	done
 	@for i in `${CAT} ${WRKDIR}/LANGPACKFILES`; do \
 		${ECHO_CMD} "extracting $$i" ; \
@@ -216,12 +216,12 @@ do-install:
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 .else
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${ECHO_CMD} "extracting $$i" ; \
-		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 56ebe56b678a..22804d5c84b4 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-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/OOo_DEV300_m43_source.tar.bz2) = 86bdfd891706fcb1da75cddbd105a570
+SHA256 (openoffice.org3/OOo_DEV300_m43_source.tar.bz2) = 621bbf652a047ba2e419e6ed2f48089ff8ab7c1bb527f2d57078f6c81314a563
+SIZE (openoffice.org3/OOo_DEV300_m43_source.tar.bz2) = 392574244
 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
index 1d3ca58377fc..240410b3a706 100644
--- a/editors/openoffice-3-devel/files/patch-i100394
+++ b/editors/openoffice-3-devel/files/patch-i100394
@@ -8,14 +8,14 @@
  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
+--- helpcontent2/makefile.pmk~	2009-03-20 21:22:43.000000000 +0900
++++ helpcontent2/makefile.pmk	2009-03-20 21:26:12.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) $@
+-	@$(AUGMENT_LIBRARY_PATH) $(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) $@
++	@$(AUGMENT_LIBRARY_PATH) $(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-i100403 b/editors/openoffice-3-devel/files/patch-i100403
deleted file mode 100644
index 5a826e52ab8c..000000000000
--- a/editors/openoffice-3-devel/files/patch-i100403
+++ /dev/null
@@ -1,52 +0,0 @@
---- 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-i100443 b/editors/openoffice-3-devel/files/patch-i100443
new file mode 100644
index 000000000000..5ac3d28f3210
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i100443
@@ -0,0 +1,10 @@
+--- solenv.org/bin/modules/installer/parameter.pm	2009-03-21 12:59:38.000000000 +0900
++++ solenv/bin/modules/installer/parameter.pm	2009-03-21 14:32:31.000000000 +0900
+@@ -297,6 +297,7 @@
+ 	{
+ 		if ( $installer::globals::packageformat eq "bsd" )
+ 		{
++			$installer::globals::epmoutpath = "freebsd";
+ 			$installer::globals::isfreebsdpkgbuild = 1;
+ 		}
+ 	}
diff --git a/editors/openoffice-3-devel/files/patch-i91318 b/editors/openoffice-3-devel/files/patch-i91318
index d04fef781b9c..a87ec93e2460 100644
--- a/editors/openoffice-3-devel/files/patch-i91318
+++ b/editors/openoffice-3-devel/files/patch-i91318
@@ -1,16 +1,11 @@
-Index: hunspell/hunspell-1.1.12.patch
-===================================================================
-RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v
-retrieving revision 1.12
-diff -u -r1.12 hunspell-1.1.12.patch
---- hunspell/hunspell-1.1.12.patch	2 Jul 2008 09:46:59 -0000	1.12
-+++ hunspell/hunspell-1.1.12.patch	10 Aug 2008 01:02:29 -0000
-@@ -487,3 +487,11 @@
-  i68568utf.test \
-  1706659.test \
-  digits_in_words.test \
-+--- misc/hunspell-1.1.12/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
-++++ misc/build/hunspell-1.1.12/tests/test.sh	2008-08-10 10:00:33.000000000 +0900
+--- hunspell/hunspell-1.2.8.patch~	2009-03-11 22:17:54.000000000 +0900
++++ hunspell/hunspell-1.2.8.patch	2009-03-20 21:37:49.000000000 +0900
+@@ -619,3 +619,11 @@
+              p++;
+          }
+          if (i > 0 && buf[i - 1] == '\n') {
++--- misc/hunspell-1.2.8/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
+++++ misc/build/hunspell-1.2.8/tests/test.sh	2008-08-10 10:00:33.000000000 +0900
 +@@ -1,4 +1,4 @@
 +-#!/bin/bash
 ++#!/usr/bin/env bash
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 42295ad5fc1a..a469bd545958 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -70,11 +70,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		42
+MILESTONE?=		43
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090314
+SNAPDATE=		20090320
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
@@ -201,13 +201,13 @@ do-build:
 
 do-install:
 .if ${LOCALIZED_LANG} == "alllangs"
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/ ; ${LS} */freebsd*/*.t?z > ${WRKDIR}/LANGPACKFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${ECHO_CMD} "extracting $$i" ; \
-		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd-*/$$i ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/en-US/freebsd/$$i ; \
 	done
 	@for i in `${CAT} ${WRKDIR}/LANGPACKFILES`; do \
 		${ECHO_CMD} "extracting $$i" ; \
@@ -216,12 +216,12 @@ do-install:
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 .else
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
 		${ECHO_CMD} "extracting $$i" ; \
-		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \
+		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
 	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 56ebe56b678a..22804d5c84b4 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-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/OOo_DEV300_m43_source.tar.bz2) = 86bdfd891706fcb1da75cddbd105a570
+SHA256 (openoffice.org3/OOo_DEV300_m43_source.tar.bz2) = 621bbf652a047ba2e419e6ed2f48089ff8ab7c1bb527f2d57078f6c81314a563
+SIZE (openoffice.org3/OOo_DEV300_m43_source.tar.bz2) = 392574244
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-devel/files/patch-i100394 b/editors/openoffice.org-3-devel/files/patch-i100394
index 1d3ca58377fc..240410b3a706 100644
--- a/editors/openoffice.org-3-devel/files/patch-i100394
+++ b/editors/openoffice.org-3-devel/files/patch-i100394
@@ -8,14 +8,14 @@
  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
+--- helpcontent2/makefile.pmk~	2009-03-20 21:22:43.000000000 +0900
++++ helpcontent2/makefile.pmk	2009-03-20 21:26:12.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) $@
+-	@$(AUGMENT_LIBRARY_PATH) $(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) $@
++	@$(AUGMENT_LIBRARY_PATH) $(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.org-3-devel/files/patch-i100403 b/editors/openoffice.org-3-devel/files/patch-i100403
deleted file mode 100644
index 5a826e52ab8c..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i100403
+++ /dev/null
@@ -1,52 +0,0 @@
---- 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.org-3-devel/files/patch-i100443 b/editors/openoffice.org-3-devel/files/patch-i100443
new file mode 100644
index 000000000000..5ac3d28f3210
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i100443
@@ -0,0 +1,10 @@
+--- solenv.org/bin/modules/installer/parameter.pm	2009-03-21 12:59:38.000000000 +0900
++++ solenv/bin/modules/installer/parameter.pm	2009-03-21 14:32:31.000000000 +0900
+@@ -297,6 +297,7 @@
+ 	{
+ 		if ( $installer::globals::packageformat eq "bsd" )
+ 		{
++			$installer::globals::epmoutpath = "freebsd";
+ 			$installer::globals::isfreebsdpkgbuild = 1;
+ 		}
+ 	}
diff --git a/editors/openoffice.org-3-devel/files/patch-i91318 b/editors/openoffice.org-3-devel/files/patch-i91318
index d04fef781b9c..a87ec93e2460 100644
--- a/editors/openoffice.org-3-devel/files/patch-i91318
+++ b/editors/openoffice.org-3-devel/files/patch-i91318
@@ -1,16 +1,11 @@
-Index: hunspell/hunspell-1.1.12.patch
-===================================================================
-RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v
-retrieving revision 1.12
-diff -u -r1.12 hunspell-1.1.12.patch
---- hunspell/hunspell-1.1.12.patch	2 Jul 2008 09:46:59 -0000	1.12
-+++ hunspell/hunspell-1.1.12.patch	10 Aug 2008 01:02:29 -0000
-@@ -487,3 +487,11 @@
-  i68568utf.test \
-  1706659.test \
-  digits_in_words.test \
-+--- misc/hunspell-1.1.12/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
-++++ misc/build/hunspell-1.1.12/tests/test.sh	2008-08-10 10:00:33.000000000 +0900
+--- hunspell/hunspell-1.2.8.patch~	2009-03-11 22:17:54.000000000 +0900
++++ hunspell/hunspell-1.2.8.patch	2009-03-20 21:37:49.000000000 +0900
+@@ -619,3 +619,11 @@
+              p++;
+          }
+          if (i > 0 && buf[i - 1] == '\n') {
++--- misc/hunspell-1.2.8/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
+++++ misc/build/hunspell-1.2.8/tests/test.sh	2008-08-10 10:00:33.000000000 +0900
 +@@ -1,4 +1,4 @@
 +-#!/bin/bash
 ++#!/usr/bin/env bash