Update to DEV300_m7.

6 files changed, 68 insertions, 10 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index acc8fbd9d7b2..fcc28d431083 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?=		6
+MILESTONE?=		7
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3.0
-SNAPDATE=		20080412
+SNAPDATE=		20080416
 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 a333f290075c..67170c4ec860 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m6_source.tar.bz2) = e9e6d506e5e8fd5ebf6120f2c3201a66
-SHA256 (openoffice.org3/OOo_DEV300_m6_source.tar.bz2) = ef589b592c20c0ac4f3e9f8eafff08a935ddcd76cc2969430c3eed472d2acaab
-SIZE (openoffice.org3/OOo_DEV300_m6_source.tar.bz2) = 297520567
+MD5 (openoffice.org3/OOo_DEV300_m7_source.tar.bz2) = eea623ab0d3a951e695ace583ca42855
+SHA256 (openoffice.org3/OOo_DEV300_m7_source.tar.bz2) = 77819426252f8f8a17939519ba3709a1b942972f5ea2b5498cd4464a5082703f
+SIZE (openoffice.org3/OOo_DEV300_m7_source.tar.bz2) = 297339392
 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-i88326 b/editors/openoffice-3-devel/files/patch-i88326
new file mode 100644
index 000000000000..93f247b90f6a
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i88326
@@ -0,0 +1,29 @@
+Index: setup_native/source/packinfo/packinfo_office.txt
+===================================================================
+RCS file: /cvs/installation/setup_native/source/packinfo/packinfo_office.txt,v
+retrieving revision 1.5
+retrieving revision 1.7
+diff -u -r1.5 -r1.7
+--- setup_native/source/packinfo/packinfo_office.txt	18 Mar 2008 12:51:12 -0000	1.5
++++ setup_native/source/packinfo/packinfo_office.txt	31 Mar 2008 14:39:50 -0000	1.7
+@@ -321,6 +321,20 @@
+ End
+ 
+ Start
++module = "gid_Module_Oo_Linguistic"
++solarispackagename = "openofficeorg-ooolinguistic"
++solarisrequires = "openofficeorg-core01"
++packagename = "openoffice.org-ooolinguistic"
++freebsdrequires = "openoffice.org-core01"
++requires = "openoffice.org-core01"
++copyright = "1999-2007 by OpenOffice.org"
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "Linguistic module for OpenOffice.org %OOOBASEVERSION"
++destpath = "/opt"
++End
++
++Start
+ module = "gid_Module_Root_Files_2"
+ script = "shellscripts_module.txt"
+ solarispackagename = "openofficeorg-core02"
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index acc8fbd9d7b2..fcc28d431083 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?=		6
+MILESTONE?=		7
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3.0
-SNAPDATE=		20080412
+SNAPDATE=		20080416
 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 a333f290075c..67170c4ec860 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m6_source.tar.bz2) = e9e6d506e5e8fd5ebf6120f2c3201a66
-SHA256 (openoffice.org3/OOo_DEV300_m6_source.tar.bz2) = ef589b592c20c0ac4f3e9f8eafff08a935ddcd76cc2969430c3eed472d2acaab
-SIZE (openoffice.org3/OOo_DEV300_m6_source.tar.bz2) = 297520567
+MD5 (openoffice.org3/OOo_DEV300_m7_source.tar.bz2) = eea623ab0d3a951e695ace583ca42855
+SHA256 (openoffice.org3/OOo_DEV300_m7_source.tar.bz2) = 77819426252f8f8a17939519ba3709a1b942972f5ea2b5498cd4464a5082703f
+SIZE (openoffice.org3/OOo_DEV300_m7_source.tar.bz2) = 297339392
 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-i88326 b/editors/openoffice.org-3-devel/files/patch-i88326
new file mode 100644
index 000000000000..93f247b90f6a
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i88326
@@ -0,0 +1,29 @@
+Index: setup_native/source/packinfo/packinfo_office.txt
+===================================================================
+RCS file: /cvs/installation/setup_native/source/packinfo/packinfo_office.txt,v
+retrieving revision 1.5
+retrieving revision 1.7
+diff -u -r1.5 -r1.7
+--- setup_native/source/packinfo/packinfo_office.txt	18 Mar 2008 12:51:12 -0000	1.5
++++ setup_native/source/packinfo/packinfo_office.txt	31 Mar 2008 14:39:50 -0000	1.7
+@@ -321,6 +321,20 @@
+ End
+ 
+ Start
++module = "gid_Module_Oo_Linguistic"
++solarispackagename = "openofficeorg-ooolinguistic"
++solarisrequires = "openofficeorg-core01"
++packagename = "openoffice.org-ooolinguistic"
++freebsdrequires = "openoffice.org-core01"
++requires = "openoffice.org-core01"
++copyright = "1999-2007 by OpenOffice.org"
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "Linguistic module for OpenOffice.org %OOOBASEVERSION"
++destpath = "/opt"
++End
++
++Start
+ module = "gid_Module_Root_Files_2"
+ script = "shellscripts_module.txt"
+ solarispackagename = "openofficeorg-core02"