* Update to 2.2.1.

* Remove DEVELOPER_VER.

4 files changed, 77 insertions, 148 deletions

diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile
index 839ea02db4c..6645b111b7e 100644
--- a/editors/ooo-build/Makefile
+++ b/editors/ooo-build/Makefile
@@ -5,57 +5,46 @@
 
 PORTNAME=	ooo-build
 PORTVERSION=	${OOOBUILD_VERSION}
-PORTREVISION=	1
-MASTER_SITES+=	http://www.go-ooo.org/packages/OOE680/ \
+MASTER_SITES+=	http://www.go-ooo.org/packages/OOF680/ \
 		http://www.go-ooo.org/packages/SRC680/ \
 		http://www.openclipart.org/downloads/0.18/:openclipart \
 		${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/libwpd/g}:libwpd \
-		http://go-oo.org/packages/SRC680/:libwps
+		http://go-oo.org/packages/SRC680/:libwps \
+		http://go-oo.org/packages/SRC680/:libwpg
 DISTFILES+=	${OOOBUILD_SOURCE} \
 	${OOO_EXTRA_ARTWORK} ${OOO_CRYSTAL_IMAGES} \
 	${OOO_OPENCLIPART}:openclipart \
 	${OOO_LIBWPD}:libwpd \
-	${OOO_LIBWPS}:libwps
+	${OOO_LIBWPS}:libwps \
+	${OOO_LIBWPG}:libwpg
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Community enhanced/bug fixed version of OpenOffice.org
 
-BROKEN=		new version of ooo-build is not yet available
-
 DESCR=		${.CURDIR}/pkg-descr
 
-#DEVELOPER_VER=	yes #you must be an expert or guru to activate this
-.if defined(DEVELOPER_VER)
-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_EXTRA_ARTWORK=extras-2.tar.bz2
-OOO_CRYSTAL_IMAGES=	ooo_crystal_images-1.tar.gz
-OOO_OPENCLIPART=	openclipart-0.18-full.tar.gz
-OOO_PATCHDIR=src680
-.else
-OOOBUILD_VERSION=2.1.7
-OOOBUILD_TAG=ooe680-m6
-OOOSRC=		OOo_OOE680_m6_source.tar.bz2
-OOOTAG=		OOE680_m6
+OOOBUILD_VERSION=2.2.1
+OOOBUILD_TAG=oof680-m18
+OOOSRC=		OOo_OOF680_m18_source.tar.bz2
+OOOTAG=		OOF680_m18
 OOOBUILD=	ooo-build-${OOOBUILD_VERSION}
 #OOOBUILD=	ooo-build-${OOOBUILD_TAG}
 OOOBUILD_SOURCE=${OOOBUILD}.tar.gz
 OOO_EXTRA_ARTWORK=extras-2.tar.bz2
 OOO_CRYSTAL_IMAGES=	ooo_crystal_images-1.tar.gz
 OOO_OPENCLIPART=	openclipart-0.18-full.tar.gz
-OOO_LIBWPD=		libwpd-0.8.8.tar.gz
+OOO_LIBWPD=		libwpd-0.8.10.tar.gz
 OOO_LIBWPS=		libwps-0.1.0~svn20070129.tar.gz
+OOO_LIBWPG=		libwpg-0.1.0~cvs20070608.tar.gz
 OOO_PATCHDIR=src680
-.endif
 
 MD5_FILE=      ${.CURDIR}/distinfo
 USE_AUTOTOOLS=  autoconf:259
 
-CONFIGURE_ARGS+=	--enable-cairo --with-system-cairo
+CONFIGURE_ARGS+=	--enable-cairo
+CONFIGURE_ARGS+=	--with-system-xrender-headers
 CONFIGURE_ARGS+=	--disable-access #--with-system-mdbtools
+CONFIGURE_ARGS+=	--enable-vba --with-vba-package-format="builtin"
 #for lpsolve...
 CONFIGURE_ARGS+=	--with-system-lpsolve
 CONFIGURE_ENV+=		CXXFLAGS="${CXXFLAGS} -L${PREFIX}/lib"
@@ -78,25 +67,17 @@ post-patch:
 
 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
-.else
-	@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}
 	@${CP} ${WRKDIR}/${OOOBUILD}/src/evolocal.odb ${WRKSRC}/extras/source/database/
+	@${CP} ${WRKDIR}/${OOOBUILD}/src/go-oo-team.png ${WRKSRC}/default_images/sw/res/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_LIBWPD} ${WRKSRC}/libwpd/download/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_LIBWPS} ${WRKSRC}/libwps/download/
-.if !defined(DEVELOPER_VER)
-	@${CP} ${WRKDIR}/${OOOBUILD}/src/go-oo-team.png ${WRKSRC}/default_images/sw/res
-.endif
+	@${MKDIR} ${WRKSRC}/libwpg/download/
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_LIBWPG} ${WRKSRC}/libwpg/download/
 #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)
-MASTERDIR=	${.CURDIR}/../openoffice.org-2-devel
-.else
 MASTERDIR=	${.CURDIR}/../openoffice.org-2
-.endif
 
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/ooo-build/distinfo b/editors/ooo-build/distinfo
index 2a1448aa077..61324b7a464 100644
--- a/editors/ooo-build/distinfo
+++ b/editors/ooo-build/distinfo
@@ -1,30 +1,33 @@
-MD5 (openoffice.org2.0/ooo-build-2.1.7.tar.gz) = 82bb16b6595200216155736e3a04a791
-SHA256 (openoffice.org2.0/ooo-build-2.1.7.tar.gz) = 8ef5f8f65619f32dfe0ced5b53901a28696b524f9584658e36c76fae632e724e
-SIZE (openoffice.org2.0/ooo-build-2.1.7.tar.gz) = 4250358
-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.gz) = 9c57c933e793f791f2c8817ccd28911c
-SHA256 (openoffice.org2.0/ooo_crystal_images-1.tar.gz) = 863a5d28a91c41d7d69de474895d7d67dbc4b50310c3f26f33641648b16ac817
-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/libwpd-0.8.8.tar.gz) = cd5997284f4ba1e8dde5d1e5869fc342
-SHA256 (openoffice.org2.0/libwpd-0.8.8.tar.gz) = 3ded0ca9a24b55c844c2e82b84e6e55db4c46acbed4137c7be1f44b2cd68232b
-SIZE (openoffice.org2.0/libwpd-0.8.8.tar.gz) = 563088
-MD5 (openoffice.org2.0/libwps-0.1.0~svn20070129.tar.gz) = 2e442485100f7e00685737513f853546
-SHA256 (openoffice.org2.0/libwps-0.1.0~svn20070129.tar.gz) = 586d0e527f065bc462a2df16cc5842203377bb8b835faa4ce545f26e7e3956ec
-SIZE (openoffice.org2.0/libwps-0.1.0~svn20070129.tar.gz) = 426668
-MD5 (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = baa88794cb08d1a11169ae90ec25c0c4
-SHA256 (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = 492e702455a43c9c1b97266e74d3adc03815178e272c6f79b8e29c1089977e19
-SIZE (openoffice.org2.0/OOo_OOE680_m6_source.tar.bz2) = 272194113
-MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
-SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-SIZE (openoffice.org2.0/unowinreg.dll) = 6144
-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/ooo-build-2.2.1.tar.gz) = 06c4210179b51035ce6a38690a26d909
+SHA256 (openoffice.org2/ooo-build-2.2.1.tar.gz) = e642aa70c6b5fdfcb5614f9be787538a9e0f7f4f1c67b74f8c43e4bd5f4dcc3d
+SIZE (openoffice.org2/ooo-build-2.2.1.tar.gz) = 4845814
+MD5 (openoffice.org2/extras-2.tar.bz2) = 733051ebeffae5232a2eb760162da020
+SHA256 (openoffice.org2/extras-2.tar.bz2) = 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863
+SIZE (openoffice.org2/extras-2.tar.bz2) = 94740
+MD5 (openoffice.org2/ooo_crystal_images-1.tar.gz) = 9c57c933e793f791f2c8817ccd28911c
+SHA256 (openoffice.org2/ooo_crystal_images-1.tar.gz) = 863a5d28a91c41d7d69de474895d7d67dbc4b50310c3f26f33641648b16ac817
+SIZE (openoffice.org2/ooo_crystal_images-1.tar.gz) = 1068060
+MD5 (openoffice.org2/openclipart-0.18-full.tar.gz) = bf32bda3914b27d3bcd0ef8f8e363619
+SHA256 (openoffice.org2/openclipart-0.18-full.tar.gz) = e57cceacd62e51da8e13b0d8e6700306fe3e04ed33b9cf686644e58446f4232a
+SIZE (openoffice.org2/openclipart-0.18-full.tar.gz) = 126709000
+MD5 (openoffice.org2/libwpd-0.8.10.tar.gz) = 821cdae9624920a4eb66e4d6d3c97b09
+SHA256 (openoffice.org2/libwpd-0.8.10.tar.gz) = 17888c416f58c741dcfd42b93ee47e16fd8dd08bd18995be56d904f0dfa764fb
+SIZE (openoffice.org2/libwpd-0.8.10.tar.gz) = 591780
+MD5 (openoffice.org2/libwps-0.1.0~svn20070129.tar.gz) = 2e442485100f7e00685737513f853546
+SHA256 (openoffice.org2/libwps-0.1.0~svn20070129.tar.gz) = 586d0e527f065bc462a2df16cc5842203377bb8b835faa4ce545f26e7e3956ec
+SIZE (openoffice.org2/libwps-0.1.0~svn20070129.tar.gz) = 426668
+MD5 (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = b078b19bdb92394b4f449e6ea0c6d0ff
+SHA256 (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = 16e5e5df57ad95ee7185141d45f8ebade2b31b6b569416bb0cfd6a032f6c9684
+SIZE (openoffice.org2/OOo_OOF680_m18_source.tar.bz2) = 268962943
+MD5 (openoffice.org2/libwpg-0.1.0~cvs20070608.tar.gz) = cfdc5e1fe2a559d458cf2a3fd3a52d8f
+SHA256 (openoffice.org2/libwpg-0.1.0~cvs20070608.tar.gz) = 9d7c85a2c494260fe12fb0ec4e64c2670c5bb0e4abe167f032b72ea586f52903
+SIZE (openoffice.org2/libwpg-0.1.0~cvs20070608.tar.gz) = 396554
+MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
+SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
+SIZE (openoffice.org2/unowinreg.dll) = 6144
+MD5 (openoffice.org2/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+SHA256 (openoffice.org2/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
+SIZE (openoffice.org2/gpc231.tar.Z) = 27917
+MD5 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
+SHA256 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
+SIZE (openoffice.org2/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 a831c96ca71..5bea8c5c907 100644
--- a/editors/ooo-build/files/ooo-build-patch
+++ b/editors/ooo-build/files/ooo-build-patch
@@ -19,9 +19,9 @@
  	$base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd;
      }
 
---- patches/src680/apply.orig	Fri Jan 12 06:43:19 2007
-+++ patches/src680/apply	Sun Jan 14 06:43:42 2007
-@@ -96,6 +96,8 @@
+--- patches/src680/apply.orig	Thu May 10 00:43:32 2007
++++ patches/src680/apply	Tue May 15 05:33:14 2007
+@@ -97,6 +97,8 @@
  NovellWin32ISO: Win32, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas
  # Mac OS X
  MacOSX : MacOSXCommon, SystemJavaBits, CalcSolver, MacOSXOnly
@@ -30,7 +30,7 @@
  # -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
  
  
-@@ -781,7 +783,7 @@
+@@ -842,7 +844,7 @@
  autodoc-add-missing-stdio-h.diff, rengelha
  
  # do not pack any potential .orig files with ppds
@@ -39,30 +39,26 @@
  
  # changes the SDK gid module name to gid_Module_Root_SDK, so the generated list
  # of files does not conflict with the main package, i#64802
-@@ -873,7 +875,7 @@
- warning-uninitialized-variables-tools-2.diff, i#58984, pmladek
- 
- # Don't re-define NULL
--solar-dont-define-NULL.diff, i#66666, jholesov
-+# solar-dont-define-NULL.diff, i#66666, jholesov
- 
- # Fix warnings that appear on x86-64 & are considered dangerous
- sixtyfour-warnings-svx.diff, i#70594, jholesov
-@@ -887,7 +889,7 @@
- buildfix-gcc41-pointers-icu.diff, pmladek
- 
- # fix build with newer gccs
--buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684
-+# buildfix-gcc-4.1.2-NULL.diff, rengelha, i#70684
- 
- [ BFBuildBits ]
- SectionOwner => pmladek
-@@ -903,7 +905,7 @@
- sixtyfour-warnings-binfilter.diff, i#70594, jholesov
- 
- # fix build with newer gccs
--buildfix-binfilter-gcc-4.1.2-NULL.diff, rengelha, i#70684
-+# buildfix-binfilter-gcc-4.1.2-NULL.diff, rengelha, i#70684
- 
- 
- [ VCL ]
+
+
+--- patches/vba/sc-source-ui-vba-vbaaxis-cxx.diff~	Thu Jun 14 01:52:48 2007
++++ patches/vba/sc-source-ui-vba-vbaaxis-cxx.diff	Sat Jun 23 13:45:05 2007
+@@ -1,6 +1,6 @@
+ --- /dev/null	
+ +++ sc/source/ui/vba//vbaaxis.cxx
+-@@ -0,0 +1,678 @@
++@@ -0,0 +1,682 @@
+ +/*************************************************************************
+ + *
+ + *  OpenOffice.org - a multi-platform office productivity suite
+@@ -42,6 +42,10 @@
+ +#include <org/openoffice/excel/XlScaleType.hpp>
+ +#include "vbaaxistitle.hxx"
+ +#include "vbachart.hxx"
+++#if defined (FREEBSD)
+++#undef MIN
+++#undef MAX
+++#endif
+ +using namespace ::com::sun::star;
+ +using namespace ::org::openoffice;
+ +using namespace ::org::openoffice::excel::XlAxisCrosses;
diff --git a/editors/ooo-build/files/ooo-build-patch-devel b/editors/ooo-build/files/ooo-build-patch-devel
deleted file mode 100644
index 8709f1beeae..00000000000
--- a/editors/ooo-build/files/ooo-build-patch-devel
+++ /dev/null
@@ -1,51 +0,0 @@
-gnu patch is gpatch for FreeBSD.
---- patches/apply.pl	Tue Nov  1 00:07:02 2005
-+++ patches/apply.pl	Tue Nov  1 00:07:32 2005
-@@ -473,7 +473,7 @@
-     my $ver_line;
-     my $is_old = 1;
- 
--    open ($Patch, "patch --version|") || die "Can't run patch: $!";
-+    open ($Patch, "gpatch --version|") || die "Can't run patch: $!";
-     $ver_line = <$Patch>;
-     $ver_line =~ m/\s+(\d+)\.(\d+)\.(\d+)/ || die "Can't get patch version\n";
-     if ($1 >= 2 && $2 >= 5 && $3 >= 9) {
-@@ -597,7 +597,7 @@
-     $applied_patches = $dest_dir.'/applied_patches';
- 
-     $opts = join ' ', @arguments;
--    $base_cmd = "patch -l -p0 $opts -d $dest_dir";
-+    $base_cmd = "gpatch -l -p0 $opts -d $dest_dir";
-     if (is_old_patch_version()) {
- 	$base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd;
-     }
-
---- 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, NovellSplash
-+# FreeBSD
-+FreeBSD : LinuxCommon, NotDebian
- # 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
- 
- # 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)
- # Fix ODK Java bits
- odk-java-wizpanel.diff
- # add possibility to set ARCH_FLAGS when building libnas