4 files changed, 136 insertions, 24 deletions

diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 14fca1c93f23..37a5da1e5491 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -70,11 +70,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		64
+MILESTONE?=		65
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20091114
+SNAPDATE=		20091129
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 778946e6048b..b25abd6d0ddc 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m64_source.tar.bz2) = 216b5a4bae452780cee5f9fb98865419
-SHA256 (openoffice.org3/OOo_DEV300_m64_source.tar.bz2) = cec3f4f64b549f11b049668ca9d863445136d94690899cc8a7a4e43bb9699525
-SIZE (openoffice.org3/OOo_DEV300_m64_source.tar.bz2) = 451612866
+MD5 (openoffice.org3/OOo_DEV300_m65_source.tar.bz2) = 8fc8f28c92a0acdd06f3884bcee2dbc2
+SHA256 (openoffice.org3/OOo_DEV300_m65_source.tar.bz2) = 3b5c0b1f4edddae4b0ea70c0b9f330ade83e554840f8f0ce59e63e5c8bf9aa12
+SIZE (openoffice.org3/OOo_DEV300_m65_source.tar.bz2) = 451566814
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-devel/files/patch-i104014 b/editors/openoffice.org-3-devel/files/patch-i104014
index 424b7b18ffc9..1be02468c84b 100644
--- a/editors/openoffice.org-3-devel/files/patch-i104014
+++ b/editors/openoffice.org-3-devel/files/patch-i104014
@@ -1,6 +1,73 @@
---- solenv/inc/unxfbsd.mk	2009-08-05 06:24:36.000000000 +0900
-+++ solenv/inc/unxfbsd.mk	2009-08-05 09:20:06.000000000 +0900
-@@ -141,12 +141,12 @@
+--- solenv/inc/unxfbsd.mk.orig	2009-11-18 13:56:59.000000000 +0900
++++ solenv/inc/unxfbsd.mk	2009-11-29 19:32:56.000000000 +0900
+@@ -31,10 +31,17 @@
+ 
+ # Makefile for FreeBSD.
+ 
+-ASM=
+-AFLAGS=
++ASM*=
++AFLAGS*=
+ 
+ SOLAR_JAVA*=
++# default optimization level for product code
++CDEFAULTOPT*=-O2
++# architecture dependent flags for the C and C++ compiler that can be changed by
++# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++ARCH_FLAGS*=
++# position independent code switch
++PICSWITCH*:=-fpic
+ JAVAFLAGSDEBUG=-g
+ 
+ # Include arch specific makefile.
+@@ -50,7 +57,7 @@
+ #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
+ 
+ # _PTHREADS is needed for the stl
+-CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
+ 
+ # enable visibility define in "sal/types.h"
+ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+@@ -72,7 +79,7 @@
+ # name of C Compiler
+ CC*=gcc
+ .IF "$(SYSBASE)"!=""
+-CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include
++CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+ CXX+:=$(CFLAGS_SYSBASE)
+ CC+:=$(CFLAGS_SYSBASE)
+ .ENDIF          # "$(SYSBASE)"!=""
+@@ -95,11 +102,14 @@
+ 
+ # -fpermissive should be removed as soon as possible
+ CFLAGSCXX= -pipe $(ARCH_FLAGS)
+-PICSWITCH:=-fpic
+ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+ CFLAGSCXX += -fvisibility-inlines-hidden
+ .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+ 
++CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
++CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
++CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
++
+ # Compiler flags for compiling static object in multi threaded environment with graphical user interface
+ CFLAGSOBJGUIMT=
+ # Compiler flags for compiling static object in multi threaded environment with character user interface
+@@ -113,6 +123,12 @@
+ # Compiler flags for debugging
+ CFLAGSDEBUG=-g
+ CFLAGSDBGUTIL=
++# Compiler flags for enabling optimizations
++.IF "$(PRODUCT)"!=""
++CFLAGSOPT=$(CDEFAULTOPT) -fno-strict-aliasing		# optimizing for products
++.ELSE 	# "$(PRODUCT)"!=""
++CFLAGSOPT=   							# no optimizing for non products
++.ENDIF	# "$(PRODUCT)"!=""
+ # Compiler flags for disabling optimizations
+ CFLAGSNOOPT=-O0
+ # Compiler flags for describing the output path
+@@ -141,19 +157,25 @@
  
  # default linker flags
  LINKFLAGSDEFS*=#-Wl,-z,defs
@@ -17,4 +84,60 @@
 +LINKFLAGSRUNPATH_BRAND=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
  LINKFLAGSRUNPATH_OXT=
  LINKFLAGSRUNPATH_NONE=
- LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
+-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
++# flag -Wl,-z,noexecstack sets the NX bit on the stack
++LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
++.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
++LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
++.ENDIF
+ 
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
++    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \
++    -Wl,-rpath-link,$(LB):$(SOLARLIBDIR)
+ 
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
+@@ -176,12 +198,24 @@
+ STDLIBCPP=-lstdc++
+ 
+ # default objectfilenames to link
+-STDOBJVCL=$(L)/salmain.o
++STDOBJVCL=$(L)$/salmain.o
+ STDOBJGUI=
+ STDSLOGUI=
+ STDOBJCUI=
+ STDSLOCUI=
+ 
++.IF "$(ALLOC)" == "TCMALLOC"
++STDLIBGUIMT+=-ltcmalloc
++STDLIBCUIMT+=-ltcmalloc
++STDSHLGUIMT+=-ltcmalloc
++STDSHLCUIMT+=-ltcmalloc
++.ENDIF
++.IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
++LINKFLAGS += -Wl,--hash-style=both
++.ELSE
++LINKFLAGS += -Wl,-zdynsort
++.ENDIF
++
+ # libraries for linking applications
+ STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
+ STDLIBCUIMT=$(PTHREAD_LIBS) -lm
+@@ -212,7 +246,7 @@
+ #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+ 
+ # name of library manager
+-LIBMGR=ar
++LIBMGR*=ar
+ LIBFLAGS=-r
+ 
+ # tool for generating import libraries
+@@ -231,3 +265,4 @@
+ # platform specific identifier for shared libs
+ DLLPRE=lib
+ DLLPOST=.so
++PCHPOST=.gch
diff --git a/editors/openoffice.org-3-devel/files/patch-i91861 b/editors/openoffice.org-3-devel/files/patch-i91861
index 93c8021d3385..85dfde19f963 100644
--- a/editors/openoffice.org-3-devel/files/patch-i91861
+++ b/editors/openoffice.org-3-devel/files/patch-i91861
@@ -1,11 +1,6 @@
-Index: vcl/source/glyphs/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/makefile.mk,v
-retrieving revision 1.13.106.1
-diff -u -r1.13.106.1 makefile.mk
---- vcl/source/glyphs/makefile.mk	31 Jul 2008 20:14:59 -0000	1.13.106.1
-+++ vcl/source/glyphs/makefile.mk	10 Aug 2008 01:06:59 -0000
-@@ -41,9 +41,17 @@
+--- vcl/source/glyphs/makefile.mk~	2009-11-18 13:58:31.000000000 +0900
++++ vcl/source/glyphs/makefile.mk	2009-11-29 20:13:21.000000000 +0900
+@@ -41,7 +41,11 @@
  .INCLUDE :  settings.mk
  .INCLUDE :  $(PRJ)$/util$/makefile2.pmk
  
@@ -14,12 +9,6 @@ diff -u -r1.13.106.1 makefile.mk
 +.ELSE
 +ADDCDEFS+= $(FREETYPE_CFLAGS)
 +.ENDIF
- .IF "$(USE_FT_EMBOLDEN)" == "YES"
-+.IF "$(OS)" != "FREEBSD"
- CFLAGS+=-DUSE_FT_EMBOLDEN
-+.ELSE
-+ADDCDEFS+=-DUSE_FT_EMBOLDEN
-+.ENDIF
- .ENDIF
  
  # --- Files --------------------------------------------------------
+