Update to OOD680_m2

4 files changed, 65 insertions, 62 deletions

diff --git a/editors/ooo-build/Makefile b/editors/ooo-build/Makefile
index 24899b12fb34..031d97eda064 100644
--- a/editors/ooo-build/Makefile
+++ b/editors/ooo-build/Makefile
@@ -5,8 +5,7 @@
 
 PORTNAME=	ooo-build
 PORTVERSION=	${OOOBUILD_VERSION}
-PORTREVISION=	1
-MASTER_SITES+=	http://www.go-ooo.org/packages/OOC680/ \
+MASTER_SITES+=	http://www.go-ooo.org/packages/OOD680/ \
 		http://www.go-ooo.org/packages/SRC680/ \
 		http://www.openclipart.org/downloads/0.18/:openclipart
 DISTFILES+=	${OOOBUILD_SOURCE} \
@@ -31,9 +30,10 @@ 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.3.0
-OOOBUILD_TAG=ooc680-m7
-OOOBUILD=	ooo-build-${OOOBUILD_VERSION}
+OOOBUILD_VERSION=2.0.4.m2
+OOOBUILD_TAG=ood680-m2
+#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
@@ -44,8 +44,15 @@ OOO_PATCHDIR=src680
 MD5_FILE=      ${.CURDIR}/distinfo
 USE_AUTOTOOLS=  autoconf:259
 
-CONFIGURE_ARGS+=	--with-system-cairo --disable-access #--with-system-mdbtools
+CONFIGURE_ARGS+=	--enable-cairo --with-system-cairo --with-system-xrender-headers=yes #i62713#
+CONFIGURE_ARGS+=	--disable-access #--with-system-mdbtools
+#for lpsolve...
+CONFIGURE_ARGS+=	--with-system-lpsolve
+CONFIGURE_ENV+=		CXXFLAGS="${CXXFLAGS} -L${PREFIX}/lib"
+CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -L${PREFIX}/lib"
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS} -I${PREFIX}/include"
 LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=	lpsolve55.1:${PORTSDIR}/math/lp_solve
 #LIB_DEPENDS+=	mdb:${PORTSDIR}/databases/mdbtools
 
 INSTALLATION_BASEDIR=	ooo-build-${PORTVERSION}
@@ -54,6 +61,10 @@ DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
 PACKAGE_BASENAME=	ooo-build-${PORTVERSION}-${OPSYS}${SIMPLEOSVER}Intel
 
+post-patch:
+	#just for lpsolve...
+	@cd ${WRKSRC}             ; ${PATCH} < ${.CURDIR}/files/set_soenv-patch
+
 pre-configure:
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${OOOBUILD_SOURCE} | ${TAR} xfz -
 .if !defined(DEVELOPER_VER)
diff --git a/editors/ooo-build/distinfo b/editors/ooo-build/distinfo
index 955977d8dd89..d141cc67a1ca 100644
--- a/editors/ooo-build/distinfo
+++ b/editors/ooo-build/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/ooo-build-2.0.3.0.tar.gz) = 4ed1e5b603a8f36a11b06ab98debfc16
-SHA256 (openoffice.org2.0/ooo-build-2.0.3.0.tar.gz) = b425013aa40d1fd4e3d596a38b2add86ae9c4d7e84cc23e1b2b5e924553efd7c
-SIZE (openoffice.org2.0/ooo-build-2.0.3.0.tar.gz) = 5158406
+MD5 (openoffice.org2.0/ooo-build-ood680-m2.tar.gz) = b107dceb6f5a11a819531f21fdc8b90f
+SHA256 (openoffice.org2.0/ooo-build-ood680-m2.tar.gz) = 73598930e7e8b94446a5cc9e49ae8d60fff3605396e6f4c0be2d86b27223e3cd
+SIZE (openoffice.org2.0/ooo-build-ood680-m2.tar.gz) = 4314684
 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,12 @@ 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.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/OOo_OOD680_m2_source.tar.bz2) = 2a9672f7a2f6138db5a8e57034d07163
+SHA256 (openoffice.org2.0/OOo_OOD680_m2_source.tar.bz2) = 9b5329d62c7419a4098543a3072d5cb5a55488a94b8c115cca1d7897dcf0eaaf
+SIZE (openoffice.org2.0/OOo_OOD680_m2_source.tar.bz2) = 264280263
+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
diff --git a/editors/ooo-build/files/ooo-build-patch b/editors/ooo-build/files/ooo-build-patch
index 8dd523ba7e86..9f5138f9dc8b 100644
--- a/editors/ooo-build/files/ooo-build-patch
+++ b/editors/ooo-build/files/ooo-build-patch
@@ -20,19 +20,19 @@ gnu patch is gpatch for FreeBSD.
  	$base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd;
      }
 
---- 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
+--- patches/src680/apply.orig	Thu Aug 31 02:44:39 2006
++++ patches/src680/apply	Sat Sep  2 14:50:24 2006
+@@ -80,6 +80,8 @@
  # Novell
  NovellWin32: Win32, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver
+ NovellWin32ISO: Win32, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver
 +# FreeBSD
-+FreeBSD : LinuxCommon, NotDebian
- 
++FreeBSD : LinuxCommon, NotDebian, Lockdown, CalcSolver
  # -------- [ Tag [ >= <tag> etc. ], ] patch sets --------
  
-@@ -748,7 +750,7 @@
- autodoc-add-missing-stdio-h.diff
+ 
+@@ -727,7 +729,7 @@
+ autodoc-add-missing-stdio-h.diff, rengelha
  
  # do not pack any potential .orig files with ppds
 -psprint_config-no-orig.diff, jholesov
@@ -40,7 +40,7 @@ gnu patch is gpatch for FreeBSD.
  
  # 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
-@@ -844,15 +846,15 @@
+@@ -821,7 +823,7 @@
  buildfix-gcc41-pointers-icu.diff, pmladek
  
  # Don't re-define NULL
@@ -48,48 +48,16 @@ gnu patch is gpatch for FreeBSD.
 +# 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>
+--- patches/gstreamer/gstreamer-avmedia-source-gstreamer.diff~	Fri Sep  1 03:11:26 2006
++++ patches/gstreamer/gstreamer-avmedia-source-gstreamer.diff	Sun Sep  3 20:57:30 2006
+@@ -1162,7 +1162,7 @@
+ +void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) 
+ +    throw (uno::RuntimeException)
+ +{
+-+    mnUnmutedVolume = pow10 ( nVolumeDB / 20.0 );
+++    mnUnmutedVolume = pow ( 10.0, nVolumeDB / 20.0 );
  +
--+#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;
+ +    OSL_TRACE( "set volume: %d gst volume: %lf", nVolumeDB, mnUnmutedVolume );
  +
--+		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 );
diff --git a/editors/ooo-build/files/set_soenv-patch b/editors/ooo-build/files/set_soenv-patch
new file mode 100644
index 000000000000..0f1e3886a06e
--- /dev/null
+++ b/editors/ooo-build/files/set_soenv-patch
@@ -0,0 +1,21 @@
+--- config_office/set_soenv.in~	Sat Sep  2 15:17:15 2006
++++ config_office/set_soenv.in	Sat Sep  2 21:22:09 2006
+@@ -1258,7 +1258,8 @@
+                         $L.$JRETOOLKITDIR.
+                         $L.$JRETHREADDIR.
+                         $L_STLPORT_LIB.
+-                        $L.$XLIB;
++                        $L.$XLIB.
++                        $L.$USR_LOCAL.$LIB;
+ }
+ elsif ($platform =~ m/cygwin/)
+ {  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
+@@ -1347,7 +1348,7 @@
+ 	}
+     #The tail, if needed
+     if ($platform =~ m/linux-gnu|freebsd|netbsd/)
+-    {  $SOLARINC  .= $I.$XINC;
++    {  $SOLARINC  .= $I.$XINC.$I.$USR_LOCAL.$INCLUDE;
+     }
+     elsif ($platform =~ m/osf1/)
+     {  $SOLARINC  .= $I.$XINC.