4 files changed, 26 insertions, 67 deletions

diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile
index 2de7c7f3f84e..7ecfa782d4e4 100644
--- a/editors/ooo-build/Makefile
+++ b/editors/ooo-build/Makefile
@@ -8,7 +8,7 @@ PORTVERSION=	${OOOBUILD_VERSION}
 MASTER_SITES+=	http://ooo.ximian.com/packages/OOB680/ \
 		http://ooo.ximian.com/packages/SRC680/ \
 		http://www.openclipart.org/downloads/0.18/:openclipart
-DISTFILES+=	${OOOBUILD_SOURCE} ${OOO_CAIRO} \
+DISTFILES+=	${OOOBUILD_SOURCE} \
 	${OOO_EXTRA_ARTWORK} ${OOO_CRYSTAL_IMAGES} \
 	${OOO_OPENCLIPART}:openclipart
 
@@ -25,17 +25,15 @@ 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_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.0.2.7
+OOOBUILD_VERSION=2.0.2.9
 OOOBUILD_TAG=oob680-m5
 OOOBUILD=	ooo-build-${OOOBUILD_VERSION}
 OOOBUILD_SOURCE=${OOOBUILD}.tar.gz
-OOO_CAIRO=	cairo-1.0.2.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
@@ -44,8 +42,10 @@ OOO_PATCHDIR=src680
 
 MD5_FILE=      ${.CURDIR}/distinfo
 USE_AUTOTOOLS=  autoconf:259
-#workarounds
-CONFIGURE_ARGS+= --disable-access --disable-binfilter --disable-cairo
+
+CONFIGURE_ARGS+=	--with-system-cairo --disable-access #--with-system-mdbtools
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+#LIB_DEPENDS+=	mdb:${PORTSDIR}/databases/mdbtools
 
 INSTALLATION_BASEDIR=	ooo-build-${PORTVERSION}
 EXECBASE=		ooo-build-${PORTVERSION}
@@ -54,15 +54,18 @@ SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	ooo-build-${PORTVERSION}-${OPSYS}${SIMPLEOSVER}Intel
 
 pre-configure:
-#see ooo-build*/bin/unpack and others for details
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${OOOBUILD_SOURCE} | ${TAR} xfz -
 .if !defined(DEVELOPER_VER)
 	@cd ${WRKDIR}/${OOOBUILD} ; ${PATCH} < ${.CURDIR}/files/ooo-build-patch
+	#@${REINPLACE_CMD} -e 's|== "|= "|g'	${WRKDIR}/${OOOBUILD}/patches/src680/disable-access.diff
 .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}
+<<<<<<< Makefile
+=======
 	${MKDIR} ${WRKSRC}/cairo/download ; ${CP} ${DISTDIR}/${DIST_SUBDIR}/${OOO_CAIRO} ${WRKSRC}/cairo/download
+>>>>>>> 1.9
 	@${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
@@ -73,11 +76,8 @@ pre-configure:
 .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
-#	@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 fe35e23f48e5..d5d9ba77db32 100644
--- a/editors/ooo-build/distinfo
+++ b/editors/ooo-build/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/ooo-build-2.0.2.7.tar.gz) = 67b73c718a6712289aa30a4d56f006da
-SHA256 (openoffice.org2.0/ooo-build-2.0.2.7.tar.gz) = f1eecaab8085693156415db08058f0c3da9aef223e935c96f1b699aaebf11683
-SIZE (openoffice.org2.0/ooo-build-2.0.2.7.tar.gz) = 5234766
+MD5 (openoffice.org2.0/ooo-build-2.0.2.9.tar.gz) = 1e2a57fc285e5b58473d68045eaa89b9
+SHA256 (openoffice.org2.0/ooo-build-2.0.2.9.tar.gz) = b2554e8ae2593079caa193e022e774fe34cee2be7630b0321b35348a65f16649
+SIZE (openoffice.org2.0/ooo-build-2.0.2.9.tar.gz) = 5264791
 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
diff --git a/editors/ooo-build/files/cairo-patch b/editors/ooo-build/files/cairo-patch
deleted file mode 100644
index 00085a0cd537..000000000000
--- a/editors/ooo-build/files/cairo-patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- cairo/makefile.mk	Wed Nov  2 14:03:55 2005
-+++ cairo/makefile.mk	Wed Nov  2 14:00:02 2005
-@@ -81,6 +81,7 @@
- 
- TARFILE_NAME=cairo-1.0.2
- 
-+PATCH_FILE_NAME=$(TARFILE_NAME).patch
- CONFIGURE_DIR=
- 
- CONFIGURE_ACTION=./configure
-
---- /dev/null	Wed Nov  2 14:36:58 2005
-+++ cairo/cairo-1.0.2.patch	Wed Nov  2 14:01:33 2005
-@@ -0,0 +1,31 @@
-+*** misc/cairo-1.0.2/ltmain.sh	2004-08-26 08:00:15.000000000 +0200
-+--- misc/build/cairo-1.0.2/ltmain.sh	2005-05-09 19:55:51.745319024 +0200
-+***************
-+*** 2994,3006 ****
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=".$current"
-+! 	  versuffix=".$current.$revision";
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2994,3006 ----
-+  	  ;;
-+  
-+  	freebsd-aout)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
diff --git a/editors/ooo-build/files/ooo-build-patch b/editors/ooo-build/files/ooo-build-patch
index 01ea2a8ac4bd..b6a72902221e 100644
--- a/editors/ooo-build/files/ooo-build-patch
+++ b/editors/ooo-build/files/ooo-build-patch
@@ -20,8 +20,8 @@ gnu patch is gpatch for FreeBSD.
  	$base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd;
      }
 
---- patches/src680/apply.orig	Fri Apr 14 03:52:06 2006
-+++ patches/src680/apply	Fri Apr 21 07:11:03 2006
+--- patches/src680/apply.orig	Thu May  4 21:48:36 2006
++++ patches/src680/apply	Sun May 14 09:40:19 2006
 @@ -71,6 +71,8 @@
  Gentoo64: GentooBase, 64bit
  # Win32
@@ -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
-@@ -356,7 +358,7 @@
+@@ -367,7 +369,7 @@
  
  [ Shrink ]
  # strip 450k of .comment sections - i#57063
@@ -40,7 +40,7 @@ gnu patch is gpatch for FreeBSD.
  
  
  [ QuickStarter ]
-@@ -376,7 +378,7 @@
+@@ -389,7 +391,7 @@
  # Show more steps during startup
  speed-ooqstart-more-steps.diff
  # Make it X11+glib-only
@@ -49,7 +49,7 @@ gnu patch is gpatch for FreeBSD.
  # Fix -display and other options, n#160296
  speed-ooqstart-options.diff
  
-@@ -678,7 +680,7 @@
+@@ -696,7 +698,7 @@
  buildfix-qadevOOo-java-encoding.diff
  
  # fix error on jdk 1.5 from enum reserved word
@@ -58,13 +58,17 @@ gnu patch is gpatch for FreeBSD.
  
  # detect the right CFLAGS in configure rather than in makafile.mk
  buildfix-system-moz-plugin.diff
-@@ -696,11 +698,11 @@
+@@ -714,7 +716,7 @@
  buildfix-connectivity-kab-stdio.diff
  
  # do not pack any potential .orig files with ppds
 -psprint_config-no-orig.diff
 +# psprint_config-no-orig.diff
  
+ # 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
+@@ -724,7 +726,7 @@
+ 
  [ 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
@@ -72,7 +76,7 @@ gnu patch is gpatch for FreeBSD.
  
  [ MandrivaOnly ]
  mozilla-firefox.diff
-@@ -734,7 +736,7 @@
+@@ -758,7 +760,7 @@
  
  [ GCJ ]
  # Use jaxp api for helpcontent building utilities #58308 CWS jaxpapi
@@ -81,7 +85,7 @@ gnu patch is gpatch for FreeBSD.
  
  [ GCJExperimental ]
  # Another fix for --without-java i#56619
-@@ -795,10 +797,10 @@
+@@ -819,10 +821,10 @@
  parallel-sysui-makefiles.diff
  
  # Fix/workaround race condition with .REMOVE rule #16752