Update to 2.0.2 (and make fetchable)

3 files changed, 48 insertions, 24 deletions

diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile
index 968ea8110aa6..d04ad18fd6a2 100644
--- a/editors/ooo-build/Makefile
+++ b/editors/ooo-build/Makefile
@@ -14,8 +14,6 @@ DISTFILES+=	${OOOBUILD_SOURCE} ${OOO_CAIRO} \
 
 MAINTAINER=	maho@FreeBSD.org
 
-BROKEN=		Unfetchable
-
 #DEVELOPER_VER=	yes #you must be an expert or guru to activate this
 .if defined(DEVELOPER_VER)
 OOOBUILD_VERSION=2.0.2.${MILESTONE}
@@ -30,9 +28,9 @@ OOO_CRYSTAL_IMAGES=	ooo_crystal_images-1.tar.gz
 OOO_OPENCLIPART=	openclipart-0.18-full.tar.gz
 OOO_PATCHDIR=src680
 .else
-OOOBUILD_VERSION=2.0.2rc1.1
-OOOBUILD_TAG=oob680-m1
-OOOBUILD=	ooo-build-oob680.1.1
+OOOBUILD_VERSION=2.0.2
+OOOBUILD_TAG=oob680-m5
+OOOBUILD=	ooo-build-${OOOBUILD_VERSION}
 OOOBUILD_SOURCE=${OOOBUILD}.tar.gz
 OOO_CAIRO=	cairo-1.0.2.tar.gz
 OOO_MDBTOOLS=	mdbtools-0.6pre1.tar.gz
@@ -62,15 +60,19 @@ pre-configure:
 	@cd ${WRKDIR}/${OOOBUILD} ; ${PATCH} < ${.CURDIR}/files/ooo-build-patch-devel
 .endif
 	@cd ${WRKDIR}/${OOOBUILD}/patches ; ${PERL} apply.pl ${WRKDIR}/${OOOBUILD}/patches/${OOO_PATCHDIR} ${WRKSRC} --distro=FreeBSD --distro=Binfilter --tag=${OOOBUILD_TAG}
-	@${MKDIR} ${WRKSRC}/cairo/download ; ${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_CAIRO} ${WRKSRC}/cairo/download
+	${MKDIR} ${WRKSRC}/cairo/download ; ${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_CAIRO} ${WRKSRC}/cairo/download
 	@${MKDIR} ${WRKSRC}/mdbtools/download ; ${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_MDBTOOLS} ${WRKSRC}/mdbtools/download
 	@${CP} ${WRKDIR}/${OOOBUILD}/src/evolocal.odb ${WRKSRC}/extras/source/database/
+.if !defined(DEVELOPER_VER)
+	@${CP} ${WRKDIR}/${OOOBUILD}/src/go-oo-team.png ${WRKSRC}/default_images/sw/res
+.endif
 #extract some goodies
 	cd ${WRKSRC} ; ${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_EXTRA_ARTWORK}
 	#cd ${WRKDIR} ; ${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_OPENCLIPART}
 .if defined(DEVELOPER_VER)
 	@${MKDIR} ${WRKSRC}/external_images
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_CRYSTAL_IMAGES} ${WRKSRC}/external_images
+
 .endif
 #apply FreeBSD specifc (?) patches for ooo-build :(
 #	@cd ${WRKSRC} ; ${PATCH} < ${.CURDIR}/files/cairo-patch
diff --git a/editors/ooo-build/distinfo b/editors/ooo-build/distinfo
index 43e270e34d3b..f1f81f245a8b 100644
--- a/editors/ooo-build/distinfo
+++ b/editors/ooo-build/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/ooo-build-oob680.1.1.tar.gz) = 0c23a985a5f17757c6e05a21ef955270
-SHA256 (openoffice.org2.0/ooo-build-oob680.1.1.tar.gz) = 7163640de8b1aa7d1ef44b2ddca94786a91085886124ade8a856077f7703b956
-SIZE (openoffice.org2.0/ooo-build-oob680.1.1.tar.gz) = 5151627
+MD5 (openoffice.org2.0/ooo-build-2.0.2.tar.gz) = a745d2aedde615ee98b591901161c228
+SHA256 (openoffice.org2.0/ooo-build-2.0.2.tar.gz) = deec58383939fed182d670a77e2ff09eb79e28e00f5c71728e319e364e011e1e
+SIZE (openoffice.org2.0/ooo-build-2.0.2.tar.gz) = 5097547
 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
@@ -13,9 +13,9 @@ SIZE (openoffice.org2.0/ooo_crystal_images-1.tar.gz) = 1068060
 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.2rc1_src.tar.gz) = 769fdc1d2e37a36c0d5e21c934dccb53
-SHA256 (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 96bee35fe561c787bdf52d69d86ed5018971d5c7fa218e88f8339ac30d5e38c6
-SIZE (openoffice.org2.0/OOo_2.0.2rc1_src.tar.gz) = 293056983
+MD5 (openoffice.org2.0/OOo_2.0.2_src.tar.gz) = 1b50c8c4c1002edbc4993060ca05ca8f
+SHA256 (openoffice.org2.0/OOo_2.0.2_src.tar.gz) = 82fc0e7d6aee6b55fce5c5b1c7e94394f7f60164f7c9ec1b2d7c6b562257ebad
+SIZE (openoffice.org2.0/OOo_2.0.2_src.tar.gz) = 293176001
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/ooo-build/files/ooo-build-patch b/editors/ooo-build/files/ooo-build-patch
index 8f38695f303c..e7e5e4b83487 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/src680/apply.orig	Fri Feb 17 03:20:55 2006
-+++ patches/src680/apply	Sat Feb 18 08:52:04 2006
-@@ -67,6 +67,8 @@
+--- patches/src680/apply.orig	Fri Mar 10 01:33:16 2006
++++ patches/src680/apply	Fri Mar 17 08:49:29 2006
+@@ -70,6 +70,8 @@
  Gentoo64: GentooBase, 64bit
  # Win32
  Win32 : Win32Common, NovellOnly, NovellOnlyWin32, NovellSplash
@@ -31,7 +31,7 @@ gnu patch is gpatch for FreeBSD.
  # translate.org.za
  translate-org-za-linux: translate-org-za-common, translate-org-za-splash, LinuxCommon, Common, Lockdown
  translate-org-za-win32: translate-org-za-common, translate-org-za-splash, Win32Common, Common
-@@ -314,7 +316,7 @@
+@@ -328,7 +330,7 @@
  
  [ Shrink ]
  # strip 450k of .comment sections - i#57063
@@ -40,17 +40,39 @@ gnu patch is gpatch for FreeBSD.
  
  
  [ QuickStarter ]
-@@ -635,11 +637,11 @@
+@@ -341,7 +343,7 @@
+ # Show more steps during startup
+ speed-ooqstart-more-steps.diff
+ # Make it X11+glib-only
+-speed-ooqstart-x11-only.diff
++# speed-ooqstart-x11-only.diff
  
- [ BuildBits <= src680-m156 < oob680-m1 ]
- # do not pack any potential .orig files with ppds
--psprint_config-no-orig-m156.diff
-+# psprint_config-no-orig-m156.diff
  
- [ BuildBits > src680-m156 >= oob680-m1 ]
+ # make the office socket name more predictable for external re-use
+@@ -657,11 +659,11 @@
+ buildfix-connectivity-kab-stdio.diff
+ 
  # do not pack any potential .orig files with ppds
 -psprint_config-no-orig.diff
 +# psprint_config-no-orig.diff
  
- [ BuildBits < oob680-m1 ]
- # add possibility to set ARCH_FLAGS when building portaudio, i#53387
+ [ BuildBits == oob680-m5 != OOO_2_0_2 ]
+ # install ppd and afm again by default, added as master fix to oob680-m5, i#62068
+-buildfix-ppd-afm-check-62068.diff
++# buildfix-ppd-afm-check-62068.diff
+ 
+ [ MandrivaOnly ]
+ mozilla-firefox.diff
+@@ -756,10 +758,10 @@
+ parallel-sysui-makefiles.diff
+ 
+ # Fix/workaround race condition with .REMOVE rule #16752
+-#parallel-dmake-dont-remove.diff
++# parallel-dmake-dont-remove.diff
+ 
+ # Fixes from CWS dmake43p01
+-cws-dmake43p01-20060131.diff
++# cws-dmake43p01-20060131.diff
+ 
+ 
+ [ VCL ]