6 files changed, 10 insertions, 42 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 2d96154af0ad..37fc6f36f30e 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -75,11 +75,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		23
+MILESTONE?=		24
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20080706
+SNAPDATE=		20080711
 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 4a521c7e104d..22764c3cb663 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m23_source.tar.bz2) = df7c726ae8a6cbeda1541932cf0ca24d
-SHA256 (openoffice.org3/OOo_DEV300_m23_source.tar.bz2) = 14394a3dbf82c7af1c123558b6f5ab311b38036a542280f99646645656113005
-SIZE (openoffice.org3/OOo_DEV300_m23_source.tar.bz2) = 316589381
+MD5 (openoffice.org3/OOo_DEV300_m24_source.tar.bz2) = b32754c9ce8c1bed5712b08ba977b10f
+SHA256 (openoffice.org3/OOo_DEV300_m24_source.tar.bz2) = 65cf876efc8da014eff4117fcf61ad19a8833ef6566cca8a9f366e8cbc3b1213
+SIZE (openoffice.org3/OOo_DEV300_m24_source.tar.bz2) = 315520489
 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-i91393 b/editors/openoffice-3-devel/files/patch-i91393
deleted file mode 100644
index a934ba8cb508..000000000000
--- a/editors/openoffice-3-devel/files/patch-i91393
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: solenv/bin/modules/installer/parameter.pm
-===================================================================
-RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
-retrieving revision 1.53
-diff -u -r1.53 parameter.pm
---- solenv/bin/modules/installer/parameter.pm	1 Jul 2008 15:41:50 -0000	1.53
-+++ solenv/bin/modules/installer/parameter.pm	6 Jul 2008 22:58:42 -0000
-@@ -305,7 +305,7 @@
- 	
- 	if ( $installer::globals::compiler =~ /unxso[lg]i/ ) { $installer::globals::issolarisx86build = 1; }
- 
--	if ($ENV{OS} == 'LINUX')
-+	if ($ENV{OS} eq 'LINUX')
- 	{
- 		$installer::globals::islinuxbuild = 1;
- 		if ( $installer::globals::packageformat eq "rpm" )
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 2d96154af0ad..37fc6f36f30e 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -75,11 +75,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		23
+MILESTONE?=		24
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20080706
+SNAPDATE=		20080711
 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 4a521c7e104d..22764c3cb663 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m23_source.tar.bz2) = df7c726ae8a6cbeda1541932cf0ca24d
-SHA256 (openoffice.org3/OOo_DEV300_m23_source.tar.bz2) = 14394a3dbf82c7af1c123558b6f5ab311b38036a542280f99646645656113005
-SIZE (openoffice.org3/OOo_DEV300_m23_source.tar.bz2) = 316589381
+MD5 (openoffice.org3/OOo_DEV300_m24_source.tar.bz2) = b32754c9ce8c1bed5712b08ba977b10f
+SHA256 (openoffice.org3/OOo_DEV300_m24_source.tar.bz2) = 65cf876efc8da014eff4117fcf61ad19a8833ef6566cca8a9f366e8cbc3b1213
+SIZE (openoffice.org3/OOo_DEV300_m24_source.tar.bz2) = 315520489
 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-i91393 b/editors/openoffice.org-3-devel/files/patch-i91393
deleted file mode 100644
index a934ba8cb508..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i91393
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: solenv/bin/modules/installer/parameter.pm
-===================================================================
-RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
-retrieving revision 1.53
-diff -u -r1.53 parameter.pm
---- solenv/bin/modules/installer/parameter.pm	1 Jul 2008 15:41:50 -0000	1.53
-+++ solenv/bin/modules/installer/parameter.pm	6 Jul 2008 22:58:42 -0000
-@@ -305,7 +305,7 @@
- 	
- 	if ( $installer::globals::compiler =~ /unxso[lg]i/ ) { $installer::globals::issolarisx86build = 1; }
- 
--	if ($ENV{OS} == 'LINUX')
-+	if ($ENV{OS} eq 'LINUX')
- 	{
- 		$installer::globals::islinuxbuild = 1;
- 		if ( $installer::globals::packageformat eq "rpm" )