Update to DEV300_m4.

8 files changed, 70 insertions, 82 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 8f4bd6bf2437..6f794fb00bb1 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -70,10 +70,10 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		3
+MILESTONE?=		4
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20080315
+SNAPDATE=		20080321
 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 0cd433c4fbb7..0886c8cc8d50 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m3_source.tar.bz2) = 8eed1f7fa29c9d2ea72349dc4bdec9c4
-SHA256 (openoffice.org3/OOo_DEV300_m3_source.tar.bz2) = 8e2ffee4832eddd582060d709a8053a1561da9833fea9f4680c10d08bc6620ac
-SIZE (openoffice.org3/OOo_DEV300_m3_source.tar.bz2) = 288412202
+MD5 (openoffice.org3/OOo_DEV300_m4_source.tar.bz2) = b31ccaef3bbdc1fc053c8fd56e8f3095
+SHA256 (openoffice.org3/OOo_DEV300_m4_source.tar.bz2) = d3abd928d3c0c124fadd0ccea1e232fb5a5b5ac369413a6e297689906c7acb41
+SIZE (openoffice.org3/OOo_DEV300_m4_source.tar.bz2) = 289023906
 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-i80129 b/editors/openoffice-3-devel/files/patch-i80129
index 90fd4ceb9dc5..24cc48f48ccd 100644
--- a/editors/openoffice-3-devel/files/patch-i80129
+++ b/editors/openoffice-3-devel/files/patch-i80129
@@ -1,18 +1,18 @@
 Merely a workaround
 
-Index: scp2/source/ure/ure.scp
+Index: scp2/source/ooo/ure.scp
 ===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.14
-diff -u -r1.14 ure.scp
---- scp2/source/ure/ure.scp	18 Jul 2007 08:07:32 -0000	1.14
-+++ scp2/source/ure/ure.scp	27 Jul 2007 22:07:16 -0000
-@@ -610,6 +610,8 @@
+RCS file: /cvs/installation/scp2/source/ooo/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ooo/ure.scp	18 Mar 2008 13:35:26 -0000	1.2
++++ scp2/source/ooo/ure.scp	21 Mar 2008 07:30:43 -0000
+@@ -684,6 +684,8 @@
  #endif
  #elif defined MACOSX
-     Name = SCP2_URE_DL_NORMAL(xml2.2);
+     Name = SCP2_URE_DL_NORMAL("xml2.2");
 +#elif defined FREEBSD
 +    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
  #else
-     Name = SCP2_URE_DL_VER(xml2, 2);
+     Name = SCP2_URE_DL_VER("xml2", "2");
  #endif
diff --git a/editors/openoffice-3-devel/files/patch-i85027 b/editors/openoffice-3-devel/files/patch-i85027
index 7afbd7d17349..e6fe720647bc 100644
--- a/editors/openoffice-3-devel/files/patch-i85027
+++ b/editors/openoffice-3-devel/files/patch-i85027
@@ -1,30 +1,3 @@
-Index: scp2/source/ooo/file_library_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
-retrieving revision 1.269
-diff -u -r1.269 file_library_ooo.scp
---- scp2/source/ooo/file_library_ooo.scp	12 Dec 2007 13:29:11 -0000	1.269
-+++ scp2/source/ooo/file_library_ooo.scp	6 Jan 2008 04:19:50 -0000
-@@ -979,7 +979,7 @@
- 
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwm , fwm)
- 
--#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
-+#if ! (defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
- #if defined( _gcc3 )
- 
- File gid_File_Lib_Gcc
-@@ -993,7 +993,7 @@
- 
- #endif
- 
--#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
-+#if ! (defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
- #if defined( _gcc3 )
- 
- File gid_File_Lib_Stdc
-
-
 -----------------
 Strange behaviour of stock gcc of FreeBSD 7.
 
@@ -67,3 +40,24 @@ diff -u -r1.5 makefile.mk
  .ENDIF 
  .ENDIF 
  
+--- scp2/source/ooo/ure.scp	18 Mar 2008 13:35:26 -0000	1.2
++++ scp2/source/ooo/ure.scp	21 Mar 2008 09:26:48 -0000
+@@ -728,7 +730,7 @@
+ End
+ #endif
+ 
+-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
++#if defined _gcc3 && !(defined NETBSD \
+ 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+ File gid_File_Dl_GccS
+     TXT_FILE_BODY;
+@@ -739,7 +741,7 @@
+ End
+ #endif
+ 
+-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
++#if defined _gcc3 && !(defined NETBSD \
+ 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+ File gid_File_Dl_Stdcpp
+     Dir = SCP2_URE_DL_DIR;
+
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 8f4bd6bf2437..6f794fb00bb1 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -70,10 +70,10 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		3
+MILESTONE?=		4
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20080315
+SNAPDATE=		20080321
 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 0cd433c4fbb7..0886c8cc8d50 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m3_source.tar.bz2) = 8eed1f7fa29c9d2ea72349dc4bdec9c4
-SHA256 (openoffice.org3/OOo_DEV300_m3_source.tar.bz2) = 8e2ffee4832eddd582060d709a8053a1561da9833fea9f4680c10d08bc6620ac
-SIZE (openoffice.org3/OOo_DEV300_m3_source.tar.bz2) = 288412202
+MD5 (openoffice.org3/OOo_DEV300_m4_source.tar.bz2) = b31ccaef3bbdc1fc053c8fd56e8f3095
+SHA256 (openoffice.org3/OOo_DEV300_m4_source.tar.bz2) = d3abd928d3c0c124fadd0ccea1e232fb5a5b5ac369413a6e297689906c7acb41
+SIZE (openoffice.org3/OOo_DEV300_m4_source.tar.bz2) = 289023906
 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-i80129 b/editors/openoffice.org-3-devel/files/patch-i80129
index 90fd4ceb9dc5..24cc48f48ccd 100644
--- a/editors/openoffice.org-3-devel/files/patch-i80129
+++ b/editors/openoffice.org-3-devel/files/patch-i80129
@@ -1,18 +1,18 @@
 Merely a workaround
 
-Index: scp2/source/ure/ure.scp
+Index: scp2/source/ooo/ure.scp
 ===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.14
-diff -u -r1.14 ure.scp
---- scp2/source/ure/ure.scp	18 Jul 2007 08:07:32 -0000	1.14
-+++ scp2/source/ure/ure.scp	27 Jul 2007 22:07:16 -0000
-@@ -610,6 +610,8 @@
+RCS file: /cvs/installation/scp2/source/ooo/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ooo/ure.scp	18 Mar 2008 13:35:26 -0000	1.2
++++ scp2/source/ooo/ure.scp	21 Mar 2008 07:30:43 -0000
+@@ -684,6 +684,8 @@
  #endif
  #elif defined MACOSX
-     Name = SCP2_URE_DL_NORMAL(xml2.2);
+     Name = SCP2_URE_DL_NORMAL("xml2.2");
 +#elif defined FREEBSD
 +    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
  #else
-     Name = SCP2_URE_DL_VER(xml2, 2);
+     Name = SCP2_URE_DL_VER("xml2", "2");
  #endif
diff --git a/editors/openoffice.org-3-devel/files/patch-i85027 b/editors/openoffice.org-3-devel/files/patch-i85027
index 7afbd7d17349..e6fe720647bc 100644
--- a/editors/openoffice.org-3-devel/files/patch-i85027
+++ b/editors/openoffice.org-3-devel/files/patch-i85027
@@ -1,30 +1,3 @@
-Index: scp2/source/ooo/file_library_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
-retrieving revision 1.269
-diff -u -r1.269 file_library_ooo.scp
---- scp2/source/ooo/file_library_ooo.scp	12 Dec 2007 13:29:11 -0000	1.269
-+++ scp2/source/ooo/file_library_ooo.scp	6 Jan 2008 04:19:50 -0000
-@@ -979,7 +979,7 @@
- 
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwm , fwm)
- 
--#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
-+#if ! (defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
- #if defined( _gcc3 )
- 
- File gid_File_Lib_Gcc
-@@ -993,7 +993,7 @@
- 
- #endif
- 
--#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
-+#if ! (defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
- #if defined( _gcc3 )
- 
- File gid_File_Lib_Stdc
-
-
 -----------------
 Strange behaviour of stock gcc of FreeBSD 7.
 
@@ -67,3 +40,24 @@ diff -u -r1.5 makefile.mk
  .ENDIF 
  .ENDIF 
  
+--- scp2/source/ooo/ure.scp	18 Mar 2008 13:35:26 -0000	1.2
++++ scp2/source/ooo/ure.scp	21 Mar 2008 09:26:48 -0000
+@@ -728,7 +730,7 @@
+ End
+ #endif
+ 
+-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
++#if defined _gcc3 && !(defined NETBSD \
+ 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+ File gid_File_Dl_GccS
+     TXT_FILE_BODY;
+@@ -739,7 +741,7 @@
+ End
+ #endif
+ 
+-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
++#if defined _gcc3 && !(defined NETBSD \
+ 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+ File gid_File_Dl_Stdcpp
+     Dir = SCP2_URE_DL_DIR;
+