Update to DEV300_m45.

6 files changed, 10 insertions, 52 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 060d966e4c97..b88edea8a6af 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?=		44
+MILESTONE?=		45
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090321
+SNAPDATE=		20090328
 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 a4d79b93c068..708b6bf244bb 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m44_source.tar.bz2) = 117af32dd73fe38e711490ff670c7ecc
-SHA256 (openoffice.org3/OOo_DEV300_m44_source.tar.bz2) = 895f450c8eb42371ac4787820e2077037fee1a7b03fc72f9189f731017e4d9b1
-SIZE (openoffice.org3/OOo_DEV300_m44_source.tar.bz2) = 403092581
+MD5 (openoffice.org3/OOo_DEV300_m45_source.tar.bz2) = ac53453a5c451e3ac25e07cd3ae06c24
+SHA256 (openoffice.org3/OOo_DEV300_m45_source.tar.bz2) = 77b3a3d51d68016405445560e04fd6ee63f88c04a7047292571272fd96d67306
+SIZE (openoffice.org3/OOo_DEV300_m45_source.tar.bz2) = 403029123
 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
deleted file mode 100644
index 240410b3a706..000000000000
--- a/editors/openoffice-3-devel/files/patch-i100394
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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-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)"!=""
--	@$(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/Makefile b/editors/openoffice.org-3-devel/Makefile
index 060d966e4c97..b88edea8a6af 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?=		44
+MILESTONE?=		45
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20090321
+SNAPDATE=		20090328
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index a4d79b93c068..708b6bf244bb 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m44_source.tar.bz2) = 117af32dd73fe38e711490ff670c7ecc
-SHA256 (openoffice.org3/OOo_DEV300_m44_source.tar.bz2) = 895f450c8eb42371ac4787820e2077037fee1a7b03fc72f9189f731017e4d9b1
-SIZE (openoffice.org3/OOo_DEV300_m44_source.tar.bz2) = 403092581
+MD5 (openoffice.org3/OOo_DEV300_m45_source.tar.bz2) = ac53453a5c451e3ac25e07cd3ae06c24
+SHA256 (openoffice.org3/OOo_DEV300_m45_source.tar.bz2) = 77b3a3d51d68016405445560e04fd6ee63f88c04a7047292571272fd96d67306
+SIZE (openoffice.org3/OOo_DEV300_m45_source.tar.bz2) = 403029123
 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
deleted file mode 100644
index 240410b3a706..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i100394
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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-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)"!=""
--	@$(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...