Update to 2.0.3 and unbreak

3 files changed, 74 insertions, 82 deletions

diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile
index 25ee8f4fc864..5c795fcbabe5 100644
--- a/editors/ooo-build/Makefile
+++ b/editors/ooo-build/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	ooo-build
 PORTVERSION=	${OOOBUILD_VERSION}
-MASTER_SITES+=	http://www.go-ooo.org/packages/OOB680/ \
+MASTER_SITES+=	http://www.go-ooo.org/packages/OOC680/ \
 		http://www.go-ooo.org/packages/SRC680/ \
 		http://www.openclipart.org/downloads/0.18/:openclipart
 DISTFILES+=	${OOOBUILD_SOURCE} \
@@ -30,9 +30,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.2.15
-OOOBUILD_TAG=oob680-m5
-OOOBUILD=	ooo-build-${OOOBUILD_VERSION}
+OOOBUILD_VERSION=2.0.3
+OOOBUILD_TAG=ooc680-m7
+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
@@ -40,8 +40,6 @@ OOO_OPENCLIPART=	openclipart-0.18-full.tar.gz
 OOO_PATCHDIR=src680
 .endif
 
-BROKEN=		"Incompatible with master port(2.0.3) and ooo-build(2.0.2)"
-
 MD5_FILE=      ${.CURDIR}/distinfo
 USE_AUTOTOOLS=  autoconf:259
 
@@ -59,7 +57,6 @@ 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
-	#@${REINPLACE_CMD} -e 's|== "|= "|g'	${WRKDIR}/${OOOBUILD}/patches/src680/disable-access.diff
 .else
 	@cd ${WRKDIR}/${OOOBUILD} ; ${PATCH} < ${.CURDIR}/files/ooo-build-patch-devel
 .endif
diff --git a/editors/ooo-build/distinfo b/editors/ooo-build/distinfo
index ba7f1614a7ee..308b3e4e6225 100644
--- a/editors/ooo-build/distinfo
+++ b/editors/ooo-build/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/ooo-build-2.0.2.15.tar.gz) = ae0d3be6e14361743b07b24397109608
-SHA256 (openoffice.org2.0/ooo-build-2.0.2.15.tar.gz) = 276fa00a59bc1fd9a6fdb81945614fae939714f59b56d1cec3e94696235bbbd2
-SIZE (openoffice.org2.0/ooo-build-2.0.2.15.tar.gz) = 5329379
+MD5 (openoffice.org2.0/ooo-build-ooc680-m7.tar.gz) = 97045632ac7291ef80681351634626f5
+SHA256 (openoffice.org2.0/ooo-build-ooc680-m7.tar.gz) = 4aa6efab57a755e392d8a41f6c6498294e506c517b18484a059d937edcca7286
+SIZE (openoffice.org2.0/ooo-build-ooc680-m7.tar.gz) = 5122509
 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
@@ -10,9 +10,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.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/OOo_2.0.3_src.tar.gz) = f68832ff3458664ae2b741ec67d30104
+SHA256 (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = 31c82e971763827c5f55d036bbb4d6e7c7a732ca73e37ce56312b276d1a0a7b5
+SIZE (openoffice.org2.0/OOo_2.0.3_src.tar.gz) = 307317482
 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 b6a72902221e..8dd523ba7e86 100644
--- a/editors/ooo-build/files/ooo-build-patch
+++ b/editors/ooo-build/files/ooo-build-patch
@@ -20,81 +20,76 @@ gnu patch is gpatch for FreeBSD.
  	$base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd;
      }
 
---- 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
- Win32 : Win32Common, NovellOnly, NovellOnlyWin32, NovellSplash
+--- patches/src680/apply.orig	Wed Jun 28 02:03:56 2006
++++ patches/src680/apply	Sun Jul  2 21:46:56 2006
+@@ -73,6 +73,8 @@
+ translate-org-za-win32: translate-org-za-common, translate-org-za-splash, Win32Common, Common
+ # Novell
+ NovellWin32: Win32, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver
 +# 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
-@@ -367,7 +369,7 @@
- 
- [ Shrink ]
- # strip 450k of .comment sections - i#57063
--size-strip.diff
-+# size-strip.diff
- 
  
- [ QuickStarter ]
-@@ -389,7 +391,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
- # Fix -display and other options, n#160296
- speed-ooqstart-options.diff
+ # -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
  
-@@ -696,7 +698,7 @@
- buildfix-qadevOOo-java-encoding.diff
- 
- # fix error on jdk 1.5 from enum reserved word
--java-1_5-enum-reserved-word.diff
-+# java-1_5-enum-reserved-word.diff
- 
- # detect the right CFLAGS in configure rather than in makafile.mk
- buildfix-system-moz-plugin.diff
-@@ -714,7 +716,7 @@
- buildfix-connectivity-kab-stdio.diff
+@@ -748,7 +750,7 @@
+ autodoc-add-missing-stdio-h.diff
  
  # do not pack any potential .orig files with ppds
--psprint_config-no-orig.diff
-+# psprint_config-no-orig.diff
+-psprint_config-no-orig.diff, jholesov
++# psprint_config-no-orig.diff, jholesov
  
  # 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
-+# buildfix-ppd-afm-check-62068.diff
- 
- [ MandrivaOnly ]
- mozilla-firefox.diff
-@@ -758,7 +760,7 @@
- 
- [ GCJ ]
- # Use jaxp api for helpcontent building utilities #58308 CWS jaxpapi
--cws-jaxpapi.diff
-+# cws-jaxpapi.diff
- 
- [ GCJExperimental ]
- # Another fix for --without-java i#56619
-@@ -819,10 +821,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 ]
+@@ -844,15 +846,15 @@
+ buildfix-gcc41-pointers-icu.diff, 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
+ # (is in m173)
+-sixtyfour-warnings-basic.diff, i#66686, jholesov
++# sixtyfour-warnings-basic.diff, i#66686, jholesov
+ 
+ # Fix missing sentinel
+-sixtyfour-warnings-fpicker.diff, i#66686, jholesov
+-sixtyfour-warnings-vcl.diff, i#66686, jholesov
++# sixtyfour-warnings-fpicker.diff, i#66686, jholesov
++# sixtyfour-warnings-vcl.diff, i#66686, jholesov
+ 
+ # Fix warnings that appear on x86-64 & are considered dangerous
+ # FIXME file up-stream
+@@ -869,7 +871,7 @@
+ warning-uninitialized-variables-binfilter.diff
+ 
+ # 64bit clean binfilter
+-cws-bfsixtyfour.diff, i#64815, jholesov
++# cws-bfsixtyfour.diff, i#64815, jholesov
+ 
+ # Fix warnings that appear on x86-64 & are considered dangerous
+ # FIXME file up-stream
+
+--- patches/src680/speed-ooqstart-x11-only.diff.orig	Fri Mar 10 01:56:53 2006
++++ patches/src680/speed-ooqstart-x11-only.diff	Mon Jul  3 22:30:09 2006
+@@ -67,7 +67,7 @@
+ +#include <X11/Xatom.h>
+ +#include <X11/Xutil.h>
+ +
+-+#include <endian.h>
+++#include "osl/endian.h"
+ +#include <fcntl.h>
+ +#include <stdint.h>
+ +#include <stdio.h>
+@@ -235,9 +235,9 @@
+ +		int bytes_per_line = image->bytes_per_line;
+ +		int bpp = image->bits_per_pixel;
+ +		int byte_order = image->byte_order; 
+-+		int machine_byte_order = ( __BYTE_ORDER == __LITTLE_ENDIAN )? LSBFirst: MSBFirst;
+++		int machine_byte_order = ( _BYTE_ORDER == _LITTLE_ENDIAN )? LSBFirst: MSBFirst;
+ +
+-+		if ( __BYTE_ORDER != __LITTLE_ENDIAN && __BYTE_ORDER != __BIG_ENDIAN )
+++		if ( _BYTE_ORDER != _LITTLE_ENDIAN && _BYTE_ORDER != _BIG_ENDIAN )
+ +		{
+ +			fprintf( stderr, "Unsupported machine endianity.\n" );
+ +			XFreeGC( display, pixmap_gc );