update to 2.0.1

3 files changed, 30 insertions, 22 deletions

diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile
index ab3008fbf825..d33d31f57414 100644
--- a/editors/ooo-build/Makefile
+++ b/editors/ooo-build/Makefile
@@ -7,6 +7,7 @@ PORTNAME=	ooo-build
 PORTVERSION=	${OOO-BUILDVERSION}
 MASTER_SITES+=	http://ooo.ximian.com/packages/OOO680/ \
 		http://ooo.ximian.com/packages/SRC680/ \
+		http://ooo.ximian.com/packages/OOA680/ \
 		${MASTER_SITE_SOURCEFORGE:S/$/:wpd/}:wpd \
 		http://www.openclipart.org/downloads/0.18/:openclipart
 MASTER_SITE_SUBDIR+= libwpd/:wpd
@@ -20,8 +21,8 @@ MAINTAINER=	maho@FreeBSD.org
 #DEVELOPER_VER=	yes #you must be an expert or guru to activate this 
 .if defined(DEVELOPER_VER)
 OOO-BUILDVERSION=2.0.0.${MILESTONE}
-MILESTONE=	140
-OOOBUILD=	ooo-build-src680.140.1
+MILESTONE=	143
+OOOBUILD=	ooo-build-src680.${MILESTONE}.0
 OOOBUILD_SOURCE=${OOOBUILD}.tar.gz
 OOO_CAIRO=	cairo-1.0.2.tar.gz
 OOO_MDBTOOLS=	mdbtools-0.6pre1.tar.gz
@@ -31,7 +32,7 @@ OOO_CRYSTAL_IMAGES=	ooo_crystal_images-6.tar.bz2
 OOO_OPENCLIPART=	openclipart-0.18-full.tar.gz
 OOO_PATCHDIR=src680
 .else
-OOO-BUILDVERSION=2.0.0.2
+OOO-BUILDVERSION=2.0.1
 OOOBUILD=	ooo-build-${OOO-BUILDVERSION}
 OOOBUILD_SOURCE=${OOOBUILD}.tar.gz
 OOO_CAIRO=	cairo-1.0.2.tar.gz
@@ -40,7 +41,7 @@ OOO_LIBWPD=	libwpd-0.8.3.tar.gz
 OOO_EXTRA_ARTWORK=extras-2.tar.bz2
 OOO_CRYSTAL_IMAGES=	ooo_crystal_images-6.tar.bz2
 OOO_OPENCLIPART=	openclipart-0.18-full.tar.gz
-OOO_PATCHDIR=OOO_2_0
+OOO_PATCHDIR=src680
 .endif
 
 MD5_FILE=      ${.CURDIR}/distinfo
diff --git a/editors/ooo-build/distinfo b/editors/ooo-build/distinfo
index cb47e484f59d..9bd1518ac909 100644
--- a/editors/ooo-build/distinfo
+++ b/editors/ooo-build/distinfo
@@ -1,6 +1,12 @@
-MD5 (openoffice.org2.0/ooo-build-2.0.0.2.tar.gz) = ecbbc059d9913d54be592fdab9e91785
-SHA256 (openoffice.org2.0/ooo-build-2.0.0.2.tar.gz) = 674ac9b0d333f801453d6229d16364026f700accc59563a8f20c885a8074ff34
-SIZE (openoffice.org2.0/ooo-build-2.0.0.2.tar.gz) = 4350834
+MD5 (openoffice.org2.0/ooo-build-src680.143.0.tar.gz) = 803f31f76ed6c3c4ec5a84b6c2516f6c
+SHA256 (openoffice.org2.0/ooo-build-src680.143.0.tar.gz) = 9ac31b645593fa407604734c2f1f74bf8ab1a3a7f1c582c45d0bcbb8a7a31f19
+SIZE (openoffice.org2.0/ooo-build-src680.143.0.tar.gz) = 4610430
+MD5 (openoffice.org2.0/OOo_SRC680_m143_source.tar.bz2) = d8094179e1705ea20d1d1c60aaa8fa6f
+SHA256 (openoffice.org2.0/OOo_SRC680_m143_source.tar.bz2) = df2c3e58c2883fbd4dba6f1bf3249ebcac9759324098460a30d7a6464528d1c6
+SIZE (openoffice.org2.0/OOo_SRC680_m143_source.tar.bz2) = 235394897
+MD5 (openoffice.org2.0/ooo-build-2.0.1.tar.gz) = efa2962487704143767bab8fa08b9477
+SHA256 (openoffice.org2.0/ooo-build-2.0.1.tar.gz) = 09da4cfd3229bc6414e5ced013429fce8d4254971fd5ab1e30fbd47784b4760b
+SIZE (openoffice.org2.0/ooo-build-2.0.1.tar.gz) = 4327625
 MD5 (openoffice.org2.0/cairo-1.0.2.tar.gz) = d0b7111a14f90ec3afa777ec40c44984
 SHA256 (openoffice.org2.0/cairo-1.0.2.tar.gz) = d6fba4b522decbda4aed8c9ad7243f6e923740761d677567758aebb01cdd1f5e
 SIZE (openoffice.org2.0/cairo-1.0.2.tar.gz) = 1458903
@@ -19,18 +25,12 @@ SIZE (openoffice.org2.0/ooo_crystal_images-6.tar.bz2) = 1308872
 MD5 (openoffice.org2.0/openclipart-0.18-full.tar.gz) = bf32bda3914b27d3bcd0ef8f8e363619
 SHA256 (openoffice.org2.0/openclipart-0.18-full.tar.gz) = e57cceacd62e51da8e13b0d8e6700306fe3e04ed33b9cf686644e58446f4232a
 SIZE (openoffice.org2.0/openclipart-0.18-full.tar.gz) = 126709000
-MD5 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = a68933afc2bf432d11b2043ac99ba0aa
-SHA256 (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 276498822e69830fd5b5404a98f234a49e7aaadd708e727745e10559798d9b8b
-SIZE (openoffice.org2.0/OOo_2.0.0_src.tar.gz) = 275666325
+MD5 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 3e70ee68abc95fb7299cb9a05e8c2f4f
+SHA256 (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 3ad604d70fc9b53f68615b46c970b5ad387255bee1adb8fcfeae12ef539f39ea
+SIZE (openoffice.org2.0/OOo_2.0.1_src.tar.gz) = 286685853
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SHA256 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366
-MD5 (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 851e7428d756a5e0c8b55e72ab386bfd
-SHA256 (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 6e833a8b5fc8c8b99be61d1c50ab0f5ec9fb731e6115d4b2bc927bcfea37a303
-SIZE (openoffice.org2.0/OOo_2.0m140_source.tar.bz2) = 232687335
-MD5 (openoffice.org2.0/ooo-build-src680.140.1.tar.gz) = 885ab7d1cd41e8af6ba95b18d1adca04
-SHA256 (openoffice.org2.0/ooo-build-src680.140.1.tar.gz) = 3dca8c41c5f80963f3ea605c428d15c3a072c65ec5c75971cef2c3103c4042fa
-SIZE (openoffice.org2.0/ooo-build-src680.140.1.tar.gz) = 4518998
diff --git a/editors/ooo-build/files/ooo-build-patch b/editors/ooo-build/files/ooo-build-patch
index ed9a2dc3c6e8..6c1632f2beb0 100644
--- a/editors/ooo-build/files/ooo-build-patch
+++ b/editors/ooo-build/files/ooo-build-patch
@@ -20,9 +20,9 @@ gnu patch is gpatch for FreeBSD.
  	$base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd;
      }
 
---- patches/OOO_2_0/apply.orig	Wed Nov 30 01:16:48 2005
-+++ patches/OOO_2_0/apply	Sun Dec  4 11:54:05 2005
-@@ -57,6 +57,8 @@
+--- patches/src680/apply.orig	Thu Dec 22 18:47:08 2005
++++ patches/src680/apply	Sat Dec 24 01:46:07 2005
+@@ -64,6 +64,8 @@
  Gentoo64: GentooBase, 64bit
  # Win32
  Win32 : Win32Common, NovellOnly, NovellOnlyWin32
@@ -31,7 +31,16 @@ gnu patch is gpatch for FreeBSD.
  
  # -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
  
-@@ -495,7 +497,7 @@
+@@ -306,7 +308,7 @@
+ 
+ [ Shrink ]
+ # strip 450k of .comment sections - i#57063
+-size-strip.diff
++# size-strip.diff
+ # save 1.7Mb of (shared) memory for non-asian locales
+ cws-i18nshrink.diff
+ 
+@@ -557,7 +559,7 @@
  # Fix missing __cxa_guard_acquire/__cxa_guard_release - #34676 (for FC3)
  sal-cxa-guard.diff
  # do not pack any potential .orig files with ppds
@@ -40,5 +49,3 @@ gnu patch is gpatch for FreeBSD.
  # Fix ODK Java bits
  odk-java-wizpanel.diff
  # add possibility to set ARCH_FLAGS when building libnas
-
-