Update to DEV300_m38.

Funded by: OpenOffice.org community council
infrastructure budget. Not refunded yet, though :)

6 files changed, 22 insertions, 30 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 6000142bce55..c9f450413a1c 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?=		37
+MILESTONE?=		38
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20081204
+SNAPDATE=		20081224
 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 db06e69c3920..2a460027e29b 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m37_source.tar.bz2) = 90c5bb8d029ff98b01e8f8f4792d7375
-SHA256 (openoffice.org3/OOo_DEV300_m37_source.tar.bz2) = 6313033c7da4c16319236c60708f0b0469bf2ecb7522dbb176a5f2bf1ff764cb
-SIZE (openoffice.org3/OOo_DEV300_m37_source.tar.bz2) = 386979755
+MD5 (openoffice.org3/OOo_DEV300_m38_source.tar.bz2) = 83fd9bfa8d62a572411822648b64fe48
+SHA256 (openoffice.org3/OOo_DEV300_m38_source.tar.bz2) = 8e92c677e83849103232dcd3f17a23ef247799c87e4faa8641d6964ab7eae679
+SIZE (openoffice.org3/OOo_DEV300_m38_source.tar.bz2) = 389726639
 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-i85972 b/editors/openoffice-3-devel/files/patch-i85972
index 931cbb8c535d..9a87976fcbb1 100644
--- a/editors/openoffice-3-devel/files/patch-i85972
+++ b/editors/openoffice-3-devel/files/patch-i85972
@@ -31,23 +31,19 @@ diff -u -r1.4 lp_solve_5.5.patch
 ++fi
 ++
 ++rm *.o 2>/dev/null
-Index: lpsolve/makefile.mk
-===================================================================
-RCS file: /cvs/external/lpsolve/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- lpsolve/makefile.mk	11 Apr 2008 07:18:41 -0000	1.5
-+++ lpsolve/makefile.mk	3 Jul 2008 00:20:53 -0000
+
+--- lpsolve/makefile.mk.orig	2008-12-24 09:40:11.000000000 +0900
++++ lpsolve/makefile.mk	2008-12-24 12:09:06.000000000 +0900
 @@ -46,7 +46,7 @@
  PATCH_FILE_NAME=lp_solve_5.5-windows.patch
  .ELSE
  PATCH_FILE_NAME=lp_solve_5.5.patch
--ADDITIONAL_FILES=lpsolve55$/ccc.solaris
-+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd
+-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2
++ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd
  .ENDIF
  
  CONFIGURE_DIR=
-@@ -70,11 +70,16 @@
+@@ -73,11 +73,16 @@
  .IF "$(COMNAME)"=="sunpro5"
  BUILD_ACTION=sh ccc.solaris
  .ELSE
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 6000142bce55..c9f450413a1c 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?=		37
+MILESTONE?=		38
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20081204
+SNAPDATE=		20081224
 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 db06e69c3920..2a460027e29b 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m37_source.tar.bz2) = 90c5bb8d029ff98b01e8f8f4792d7375
-SHA256 (openoffice.org3/OOo_DEV300_m37_source.tar.bz2) = 6313033c7da4c16319236c60708f0b0469bf2ecb7522dbb176a5f2bf1ff764cb
-SIZE (openoffice.org3/OOo_DEV300_m37_source.tar.bz2) = 386979755
+MD5 (openoffice.org3/OOo_DEV300_m38_source.tar.bz2) = 83fd9bfa8d62a572411822648b64fe48
+SHA256 (openoffice.org3/OOo_DEV300_m38_source.tar.bz2) = 8e92c677e83849103232dcd3f17a23ef247799c87e4faa8641d6964ab7eae679
+SIZE (openoffice.org3/OOo_DEV300_m38_source.tar.bz2) = 389726639
 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-i85972 b/editors/openoffice.org-3-devel/files/patch-i85972
index 931cbb8c535d..9a87976fcbb1 100644
--- a/editors/openoffice.org-3-devel/files/patch-i85972
+++ b/editors/openoffice.org-3-devel/files/patch-i85972
@@ -31,23 +31,19 @@ diff -u -r1.4 lp_solve_5.5.patch
 ++fi
 ++
 ++rm *.o 2>/dev/null
-Index: lpsolve/makefile.mk
-===================================================================
-RCS file: /cvs/external/lpsolve/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- lpsolve/makefile.mk	11 Apr 2008 07:18:41 -0000	1.5
-+++ lpsolve/makefile.mk	3 Jul 2008 00:20:53 -0000
+
+--- lpsolve/makefile.mk.orig	2008-12-24 09:40:11.000000000 +0900
++++ lpsolve/makefile.mk	2008-12-24 12:09:06.000000000 +0900
 @@ -46,7 +46,7 @@
  PATCH_FILE_NAME=lp_solve_5.5-windows.patch
  .ELSE
  PATCH_FILE_NAME=lp_solve_5.5.patch
--ADDITIONAL_FILES=lpsolve55$/ccc.solaris
-+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd
+-ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2
++ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2 lpsolve55$/ccc.freebsd
  .ENDIF
  
  CONFIGURE_DIR=
-@@ -70,11 +70,16 @@
+@@ -73,11 +73,16 @@
  .IF "$(COMNAME)"=="sunpro5"
  BUILD_ACTION=sh ccc.solaris
  .ELSE