5 files changed, 76 insertions, 108 deletions

diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile
index d33d31f57414..e4da0d307eff 100644
--- a/editors/ooo-build/Makefile
+++ b/editors/ooo-build/Makefile
@@ -4,15 +4,11 @@
 # $FreeBSD$
 
 PORTNAME=	ooo-build
-PORTVERSION=	${OOO-BUILDVERSION}
-MASTER_SITES+=	http://ooo.ximian.com/packages/OOO680/ \
+PORTVERSION=	${OOOBUILD_VERSION}
+MASTER_SITES+=	http://ooo.ximian.com/packages/OOB680/ \
 		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
 DISTFILES+=	${OOOBUILD_SOURCE} ${OOO_CAIRO} \
-	${OOO_MDBTOOLS} ${OOO_LIBWPD}:wpd \
 	${OOO_EXTRA_ARTWORK} ${OOO_CRYSTAL_IMAGES} \
 	${OOO_OPENCLIPART}:openclipart
 
@@ -20,36 +16,34 @@ 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=	143
+OOOBUILD_VERSION=2.0.2.${MILESTONE}
+MILESTONE=	156
+OOOBUILD_TAG=src680-m${MILESTONE}
 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
-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_CRYSTAL_IMAGES=	ooo_crystal_images-1.tar.bz2
 OOO_OPENCLIPART=	openclipart-0.18-full.tar.gz
 OOO_PATCHDIR=src680
 .else
-OOO-BUILDVERSION=2.0.1
-OOOBUILD=	ooo-build-${OOO-BUILDVERSION}
+OOOBUILD_VERSION=2.0.2rc1.1
+OOOBUILD_TAG=oob680-m1
+OOOBUILD=	ooo-build-oob680.1.1
 OOOBUILD_SOURCE=${OOOBUILD}.tar.gz
 OOO_CAIRO=	cairo-1.0.2.tar.gz
 OOO_MDBTOOLS=	mdbtools-0.6pre1.tar.gz
-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_CRYSTAL_IMAGES=	ooo_crystal_images-1.tar.bz2
 OOO_OPENCLIPART=	openclipart-0.18-full.tar.gz
 OOO_PATCHDIR=src680
 .endif
 
 MD5_FILE=      ${.CURDIR}/distinfo
 USE_AUTOTOOLS=  autoconf:259
-
-CONFIGURE_ARGS+= --with-icons="hicontrast industrial crystal"
 #workarounds
-CONFIGURE_ARGS+= --disable-access --disable-binfilter
+CONFIGURE_ARGS+= --disable-access --disable-binfilter --disable-cairo
 
 INSTALLATION_BASEDIR=	ooo-build-${PORTVERSION}
 EXECBASE=		ooo-build-${PORTVERSION}
@@ -62,27 +56,19 @@ pre-configure:
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${OOOBUILD_SOURCE} | ${TAR} xfz -
 .if !defined(DEVELOPER_VER)
 	@cd ${WRKDIR}/${OOOBUILD} ; ${PATCH} < ${.CURDIR}/files/ooo-build-patch
-	@cd ${WRKDIR}/${OOOBUILD}/patches ; ${PERL} apply.pl ${WRKDIR}/${OOOBUILD}/patches/${OOO_PATCHDIR} ${WRKSRC} --distro=FreeBSD --distro=Binfilter
 .else
 	@cd ${WRKDIR}/${OOOBUILD} ; ${PATCH} < ${.CURDIR}/files/ooo-build-patch-devel
-	@cd ${WRKDIR}/${OOOBUILD}/patches ; ${PERL} apply.pl ${WRKDIR}/${OOOBUILD}/patches/${OOO_PATCHDIR} ${WRKSRC} --distro=FreeBSD --distro=Binfilter --tag=src680-m${MILESTONE}
 .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}/mdbtools/download ; ${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_MDBTOOLS} ${WRKSRC}/mdbtools/download
-	@${MKDIR} ${WRKSRC}/libwpd/download ; ${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_LIBWPD} ${WRKSRC}/libwpd/download
 	@${CP} ${WRKDIR}/${OOOBUILD}/src/evolocal.odb ${WRKSRC}/extras/source/database/
 #extract some goodies
 	cd ${WRKSRC} ; ${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_EXTRA_ARTWORK}
 	#cd ${WRKDIR} ; ${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_OPENCLIPART}
-#industrial set
-	@cd ${WRKSRC}/ooo_custom_images/industrial/res/commandimagelist ; ${CP} -f lc_zoomplus.png lc_zoomin.png ; ${CP} -f sc_zoomplus.png sc_zoomin.png ; ${RM} -f ${WRKSRC}/extras/source/autotext/lang/en-US/acor_en-GB.*
-	@${RM} -f ${WRKSRC}/ooo_custom_images/industrial/vcl/source/src/check*
-	@${TAR} xjf ${DISTDIR}/${DIST_SUBDIR}/${OOO_CRYSTAL_IMAGES} -C ${WRKSRC}/ooo_custom_images
-
 #apply FreeBSD specifc (?) patches for ooo-build :(
-	@cd ${WRKSRC} ; ${PATCH} < ${.CURDIR}/files/cairo-patch
-	@cd ${WRKSRC} ; ${PATCH} < ${.CURDIR}/files/patch-i18npool
-
+#	@cd ${WRKSRC} ; ${PATCH} < ${.CURDIR}/files/cairo-patch
+#	@cd ${WRKSRC} ; ${PATCH} < ${.CURDIR}/files/patch-i18npool
 .if defined(DEVELOPER_VER)
 MASTERDIR=	${.CURDIR}/../openoffice.org-2.0-devel
 .else
diff --git a/editors/ooo-build/distinfo b/editors/ooo-build/distinfo
index 9bd1518ac909..c30381e4ec59 100644
--- a/editors/ooo-build/distinfo
+++ b/editors/ooo-build/distinfo
@@ -1,36 +1,45 @@
-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/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/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
-MD5 (openoffice.org2.0/mdbtools-0.6pre1.tar.gz) = 246e8f38b2a1af1bcff60ee0da59300b
-SHA256 (openoffice.org2.0/mdbtools-0.6pre1.tar.gz) = 7169dc50da857aae2b3f62cd5c6ace37fed56f3e39d07c9afa5aba882b1de3d3
-SIZE (openoffice.org2.0/mdbtools-0.6pre1.tar.gz) = 611756
-MD5 (openoffice.org2.0/libwpd-0.8.3.tar.gz) = f34404f8dc6123aca156d203c37e3e5d
-SHA256 (openoffice.org2.0/libwpd-0.8.3.tar.gz) = 2221aaa444d29f4a1eacea1a0a939012f02a8aa8e02c178788d68ccc0024170c
-SIZE (openoffice.org2.0/libwpd-0.8.3.tar.gz) = 482757
 MD5 (openoffice.org2.0/extras-2.tar.bz2) = 733051ebeffae5232a2eb760162da020
 SHA256 (openoffice.org2.0/extras-2.tar.bz2) = 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863
 SIZE (openoffice.org2.0/extras-2.tar.bz2) = 94740
-MD5 (openoffice.org2.0/ooo_crystal_images-6.tar.bz2) = 586d0f26b3f79d89bbb5b25b874e3df6
-SHA256 (openoffice.org2.0/ooo_crystal_images-6.tar.bz2) = 3752d54470ace722b11ef6613694f15603295b9b9945d6033dd8eaf3bab921b7
-SIZE (openoffice.org2.0/ooo_crystal_images-6.tar.bz2) = 1308872
+MD5 (openoffice.org2.0/ooo_crystal_images-1.tar.bz2) = 3558c3d27ab789db6ab7f598a96d66e4
+SHA256 (openoffice.org2.0/ooo_crystal_images-1.tar.bz2) = bd8345b962750e92f00ff9a57b9ea92de05034da482ed0663b2ddc1b4050b184
+SIZE (openoffice.org2.0/ooo_crystal_images-1.tar.bz2) = 3680307
 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.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/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/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-build-src680.156.0.tar.gz) = c61131dbbf63fead9477ad8445388dc4
+SHA256 (openoffice.org2.0/ooo-build-src680.156.0.tar.gz) = 0eacc02d33741189f849035a872c70c908aad01f799d28b9ef9c73aadea994ef
+SIZE (openoffice.org2.0/ooo-build-src680.156.0.tar.gz) = 5090024
+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
+MD5 (openoffice.org2.0/extras-2.tar.bz2) = 733051ebeffae5232a2eb760162da020
+SHA256 (openoffice.org2.0/extras-2.tar.bz2) = 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863
+SIZE (openoffice.org2.0/extras-2.tar.bz2) = 94740
+MD5 (openoffice.org2.0/ooo_crystal_images-1.tar.bz2) = 3558c3d27ab789db6ab7f598a96d66e4
+SHA256 (openoffice.org2.0/ooo_crystal_images-1.tar.bz2) = bd8345b962750e92f00ff9a57b9ea92de05034da482ed0663b2ddc1b4050b184
+SIZE (openoffice.org2.0/ooo_crystal_images-1.tar.bz2) = 3680307
+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.156_src.tar.gz) = d98f2e47e8ed73986cf2818edefa7ad6
+SHA256 (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 1a8b274464d7ecf603a7e7dc029167ade940ad09029e327a1703a9e2228444d4
+SIZE (openoffice.org2.0/OOo_2.0.156_src.tar.gz) = 288046106
+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
diff --git a/editors/ooo-build/files/ooo-build-patch b/editors/ooo-build/files/ooo-build-patch
index efa0372153a0..8f38695f303c 100644
--- a/editors/ooo-build/files/ooo-build-patch
+++ b/editors/ooo-build/files/ooo-build-patch
@@ -20,44 +20,37 @@ gnu patch is gpatch for FreeBSD.
  	$base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd;
      }
 
---- patches/src680/apply.orig	Thu Dec 22 18:47:08 2005
-+++ patches/src680/apply	Wed Jan 11 19:30:14 2006
-@@ -64,6 +64,8 @@
+--- 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 @@
  Gentoo64: GentooBase, 64bit
  # Win32
- Win32 : Win32Common, NovellOnly, NovellOnlyWin32
+ Win32 : Win32Common, NovellOnly, NovellOnlyWin32, NovellSplash
 +# FreeBSD
 +FreeBSD : LinuxCommon, NotDebian
- 
- # -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
- 
-@@ -306,9 +308,9 @@
+ # 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 @@
  
  [ 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
-+# cws-i18nshrink.diff
  
  
  [ QuickStarter ]
-@@ -557,7 +559,7 @@
- # Fix missing __cxa_guard_acquire/__cxa_guard_release - #34676 (for FC3)
- sal-cxa-guard.diff
+@@ -635,11 +637,11 @@
+ 
+ [ 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 ]
  # do not pack any potential .orig files with ppds
 -psprint_config-no-orig.diff
-+#psprint_config-no-orig.diff #don't apply for FBSD patch (workaround)
- # Fix ODK Java bits
- odk-java-wizpanel.diff
- # add possibility to set ARCH_FLAGS when building libnas
-@@ -665,7 +667,7 @@
- # declared, i#58972, CWS gcc41
- buildfix-gcc41-friend-decl-configmgr.diff
- buildfix-gcc41-friend-decl-desktop.diff
--buildfix-gcc41-friend-decl-i18npool.diff
-+# buildfix-gcc41-friend-decl-i18npool.diff
- buildfix-gcc41-friend-decl-svx.diff
- buildfix-gcc41-friend-decl-sw.diff
- # fixes usage of the String classes; I wonder how it could work in the past :-)
++# psprint_config-no-orig.diff
+ 
+ [ BuildBits < oob680-m1 ]
+ # add possibility to set ARCH_FLAGS when building portaudio, i#53387
diff --git a/editors/ooo-build/files/ooo-build-patch-devel b/editors/ooo-build/files/ooo-build-patch-devel
index a907276270cb..8709f1beeaef 100644
--- a/editors/ooo-build/files/ooo-build-patch-devel
+++ b/editors/ooo-build/files/ooo-build-patch-devel
@@ -20,44 +20,32 @@ gnu patch is gpatch for FreeBSD.
  	$base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd;
      }
 
---- patches/src680/apply.orig	Wed Nov 30 18:02:19 2005
-+++ patches/src680/apply	Sat Dec  3 20:05:50 2005
-@@ -64,6 +64,8 @@
+--- patches/src680/apply.orig	Fri Feb 10 01:10:27 2006
++++ patches/src680/apply	Sat Feb 18 19:34:34 2006
+@@ -65,6 +65,8 @@
  Gentoo64: GentooBase, 64bit
  # Win32
- Win32 : Win32Common, NovellOnly, NovellOnlyWin32
+ Win32 : Win32Common, NovellOnly, NovellOnlyWin32, NovellSplash
 +# FreeBSD
 +FreeBSD : LinuxCommon, NotDebian
- 
- # -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
- 
-@@ -80,7 +82,7 @@
- 
- [ TemporaryHacks == src680-m140 ]
- # silly snafu.
--buildfix-svtools-m140.diff
-+# buildfix-svtools-m140.diff # not compatible with my checkout(master fixed)
- 
- [ TemporaryHacks ]
- # adding glib-2.0 and ORBit-2.0 to pkgconfig modules; i#47923
-@@ -306,9 +308,9 @@
+ # 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
+@@ -346,7 +348,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
-+# cws-i18nshrink.diff
- 
  
- [ QuickStarter ]
-@@ -587,7 +589,7 @@
+ # FIXME Someone more familiar with the i18n pool code
+ # needs to check if cws-i18nshrink needs to be ported
+@@ -651,7 +653,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
 -psprint_config-no-orig.diff
-+#psprint_config-no-orig.diff #don't apply for FBSD patch (workaround)
++# psprint_config-no-orig.diff #don't apply for FBSD patch (workaround)
  # Fix ODK Java bits
  odk-java-wizpanel.diff
  # add possibility to set ARCH_FLAGS when building libnas
diff --git a/editors/ooo-build/files/patch-i18npool b/editors/ooo-build/files/patch-i18npool
deleted file mode 100644
index d411310e9ba3..000000000000
--- a/editors/ooo-build/files/patch-i18npool
+++ /dev/null
@@ -1,8 +0,0 @@
---- i18npool/prj/build.lst~	Wed Nov  2 10:54:24 2005
-+++ i18npool/prj/build.lst	Wed Nov  2 14:41:04 2005
-@@ -1,4 +1,4 @@
--inp  i18npool    :   bridges sax stoc comphelper tools ICU:icu i18nutil regexp NULL
-+inp  i18npool    :   bridges sax stoc comphelper tools icu i18nutil regexp NULL
- inp  i18npool                                   usr1    -   all inp_mkout NULL
- inp  i18npool\source\unotypes                   nmake   -   all inp_utypes NULL
- inp  i18npool\source\registerservices           nmake   -   all inp_rserv inp_utypes NULL