Update to DEV300_m67.

Funded by: OpenOffice.org community.

4 files changed, 149 insertions, 30 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index d4e0654f8a71..17d9a668223c 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -72,11 +72,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		66
+MILESTONE?=		67
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20091205
+SNAPDATE=		20091213
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org3
@@ -145,7 +145,8 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--enable-presenter-console			\
 			--enable-pdfimport				\
 			--enable-wiki-publisher				\
-			--enable-report-builder
+			--enable-report-builder				\
+			--with-vendor="FreeBSD ports system"
 
 OOOEXTENSIONS+=		minimizer/sun-presentation-minimizer.oxt
 OOOEXTENSIONS+=		presenter/presenter-screen.oxt
@@ -195,6 +196,13 @@ pre-configure:
 #Workaround for gperf. #i85469#
 	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
 
+pre-build:
+#i107644#
+	cd ${WRKSRC}; ${CP} -R sdext/source/presenter/help/en-US/com.sun.PresenterScreen-linux_x86 sdext/source/presenter/help/en-US/com.sun.PresenterScreen-freebsd_x86
+	cd ${WRKSRC}; ${CP} -R sdext/source/presenter/help/en-US/com.sun.PresenterScreen-linux_x86_64 sdext/source/presenter/help/en-US/com.sun.PresenterScreen-freebsd_x86_64
+	cd ${WRKSRC}; ${REINPLACE_CMD} -e 's/linux/freebsd/g' sdext/source/presenter/help/en-US/com.sun.PresenterScreen-freebsd_x86/presenter.xhp
+	cd ${WRKSRC}; ${REINPLACE_CMD} -e 's/linux/freebsd/g' sdext/source/presenter/help/en-US/com.sun.PresenterScreen-freebsd_x86_64/presenter.xhp
+
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMPDIR ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAKE_JOBS_NUMBER} --all --html --dontgraboutput"
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 650abe7f3c73..1080cb26ed34 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m66_source.tar.bz2) = 7ed92d0b3d5114e5a320861439b85ed6
-SHA256 (openoffice.org3/OOo_DEV300_m66_source.tar.bz2) = 5e6fa1af212ffe51d639c67e0e9210d4b1f28b3137e02d758994afc773c01708
-SIZE (openoffice.org3/OOo_DEV300_m66_source.tar.bz2) = 452241841
+MD5 (openoffice.org3/OOo_DEV300_m67_source.tar.bz2) = 83e174031ed6b819aee46fc37a354912
+SHA256 (openoffice.org3/OOo_DEV300_m67_source.tar.bz2) = 4830691227c45c9f7e7bc124addbc86402f72c8d08aed0db53cc7bcf9a019f63
+SIZE (openoffice.org3/OOo_DEV300_m67_source.tar.bz2) = 447480713
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-i102181 b/editors/openoffice-3-devel/files/patch-i102181
index a074079aa43b..53ccde029f35 100644
--- a/editors/openoffice-3-devel/files/patch-i102181
+++ b/editors/openoffice-3-devel/files/patch-i102181
@@ -1,18 +1,29 @@
---- openssl/makefile.mk.orig	2009-06-11 09:05:38.000000000 +0900
-+++ openssl/makefile.mk	2009-06-11 20:30:14.000000000 +0900
-@@ -105,6 +105,20 @@
- .ENDIF
+--- openssl/makefile.mk.orig	2009-12-06 12:25:44.000000000 +0900
++++ openssl/makefile.mk	2009-12-12 17:14:17.000000000 +0900
+@@ -65,7 +65,7 @@
+ OUT2LIB += libcrypto.*
+ OUT2INC += include/openssl/*
+ 
+-.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
++.IF "$(OS)" == "LINUX"
+ 	PATCH_FILES=openssllnx.patch
+ 	ADDITIONAL_FILES:= \
+ 		libcrypto_OOo_0_9_8l.map \
+@@ -103,6 +103,22 @@
+ 	.ENDIF
  .ENDIF
  
 +.IF "$(OS)" == "FREEBSD"
 +	PATCH_FILES=openssllnx.patch
 +	ADDITIONAL_FILES:= \
-+		libcrypto_OOo_0_9_8k.map \
-+		libssl_OOo_0_9_8k.map
-+	.IF "$(CPU)" == "X"
++		libcrypto_OOo_0_9_8l.map \
++		libssl_OOo_0_9_8l.map
++	.IF "$(CPU)" == "I"
++		CONFIGURE_ACTION=Configure BSD-x86-elf
++	.ELIF "$(BUILD64)" == "1"
 +		CONFIGURE_ACTION=Configure BSD-x86_64
 +	.ELSE
-+		CONFIGURE_ACTION=Configure BSD-x86-elf
++		CONFIGURE_ACTION=Configure BSD-generic32
 +	.ENDIF
 +	# if you build openssl as shared library you have to patch the Makefile.Shared "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH \"
 +	#BUILD_ACTION=make 'SHARED_LDFLAGS=-Wl,--version-script=./lib$$(SHLIBDIRS)_OOo_0_9_8e.map'
diff --git a/editors/openoffice-3-devel/files/patch-i104014 b/editors/openoffice-3-devel/files/patch-i104014
index 1be02468c84b..16460e43a476 100644
--- a/editors/openoffice-3-devel/files/patch-i104014
+++ b/editors/openoffice-3-devel/files/patch-i104014
@@ -1,14 +1,15 @@
---- 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 @@
+--- solenv/inc/unxfbsd.mk.orig	2009-12-12 18:29:11.000000000 +0900
++++ solenv/inc/unxfbsd.mk	2009-12-13 12:17:38.000000000 +0900
+@@ -30,27 +30,24 @@
+ #*************************************************************************
  
  # Makefile for FreeBSD.
- 
+-
 -ASM=
 -AFLAGS=
+-
 +ASM*=
 +AFLAGS*=
- 
  SOLAR_JAVA*=
 +# default optimization level for product code
 +CDEFAULTOPT*=-O2
@@ -19,8 +20,16 @@
 +PICSWITCH*:=-fpic
  JAVAFLAGSDEBUG=-g
  
- # Include arch specific makefile.
-@@ -50,7 +57,7 @@
+-# Include arch specific makefile.
+-.IF "$(CPUNAME)" == "INTEL"
+-.INCLUDE : unxfbsdi.mk
+-.ENDIF
+-.IF "$(CPUNAME)" == "X86_64"
+-.INCLUDE : unxfbsdx.mk
+-.ENDIF
+-
+ # filter for supressing verbose messages from linker
+ #not needed at the moment
  #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
  
  # _PTHREADS is needed for the stl
@@ -29,7 +38,7 @@
  
  # enable visibility define in "sal/types.h"
  .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-@@ -72,7 +79,7 @@
+@@ -72,7 +69,7 @@
  # name of C Compiler
  CC*=gcc
  .IF "$(SYSBASE)"!=""
@@ -38,7 +47,7 @@
  CXX+:=$(CFLAGS_SYSBASE)
  CC+:=$(CFLAGS_SYSBASE)
  .ENDIF          # "$(SYSBASE)"!=""
-@@ -95,11 +102,14 @@
+@@ -95,11 +92,14 @@
  
  # -fpermissive should be removed as soon as possible
  CFLAGSCXX= -pipe $(ARCH_FLAGS)
@@ -54,7 +63,7 @@
  # 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 @@
+@@ -113,6 +113,12 @@
  # Compiler flags for debugging
  CFLAGSDEBUG=-g
  CFLAGSDBGUTIL=
@@ -67,7 +76,7 @@
  # Compiler flags for disabling optimizations
  CFLAGSNOOPT=-O0
  # Compiler flags for describing the output path
-@@ -141,19 +157,25 @@
+@@ -141,19 +147,25 @@
  
  # default linker flags
  LINKFLAGSDEFS*=#-Wl,-z,defs
@@ -101,7 +110,7 @@
  
  # linker flags for linking shared libraries
  LINKFLAGSSHLGUI= -shared
-@@ -176,12 +198,24 @@
+@@ -176,18 +188,30 @@
  STDLIBCPP=-lstdc++
  
  # default objectfilenames to link
@@ -125,9 +134,19 @@
 +.ENDIF
 +
  # libraries for linking applications
- STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
- STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-@@ -212,7 +246,7 @@
+-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
+-STDLIBCUIMT=$(PTHREAD_LIBS) -lm
++STDLIBGUIMT+=-Wl,--as-needed -lX11 $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
++STDLIBCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+ # libraries for linking shared libraries
+-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
+-STDSHLCUIMT=$(PTHREAD_LIBS) -lm
++STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
++STDSHLCUIMT+=-Wl,--as-needed $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
+ 
+ LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+ 
+@@ -212,7 +236,7 @@
  #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
  
  # name of library manager
@@ -136,8 +155,89 @@
  LIBFLAGS=-r
  
  # tool for generating import libraries
-@@ -231,3 +265,4 @@
+@@ -231,3 +255,4 @@
  # platform specific identifier for shared libs
  DLLPRE=lib
  DLLPOST=.so
 +PCHPOST=.gch
+
+
+--- solenv/inc/unxfbsdi.mk.org	2009-12-13 12:11:43.000000000 +0900
++++ solenv/inc/unxfbsdi.mk	2009-12-13 12:13:15.000000000 +0900
+@@ -29,22 +29,13 @@
+ #
+ #*************************************************************************
+ 
+-#
+ # FreBSD/i386 specific defines
+-#
+  
+-CDEFS+=-DX86
+-
+ # 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
++CDEFAULTOPT=-Os
+ ARCH_FLAGS*=-mtune=pentiumpro
+-
+-# Compiler flags for enabling optimizations
+-.IF "$(PRODUCT)"!=""
+-CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
+-.ELSE 	# "$(PRODUCT)"!=""
+-CFLAGSOPT= 					# no optimizing for non products
+-.ENDIF	# "$(PRODUCT)"!=""
+-
+-# platform specific identifier for shared libs
++.INCLUDE : unxfbsd.mk
++CDEFS+=-DX86
++DLLPOST=.so
+ DLLPOSTFIX=fi
+
+--- solenv/inc/unxfbsdx.mk	2009-12-13 12:16:16.000000000 +0900
++++ solenv/inc/unxfbsdx.mk	2009-12-13 12:54:57.000000000 +0900
+@@ -29,25 +29,10 @@
+ #
+ #*************************************************************************
+ 
+-#
+ # FreBSD/amd64 specific defines
+-#
+-
++.INCLUDE : unxfbsd.mk
+ CDEFS+=-DX86_64
+-
+-# 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
+-.IF "$(CPUNAME)" == "X86_64"
+-ARCH_FLAGS*=
+-.ENDIF
+-
+-# Compiler flags for enabling optimizations
+-.IF "$(PRODUCT)"!=""
+-CFLAGSOPT=-O2 -fno-strict-aliasing		# optimizing for products
+-.ELSE 	# "$(PRODUCT)"!=""
+-CFLAGSOPT=   					# no optimizing for non products
+-.ENDIF	# "$(PRODUCT)"!=""
+-
+-# platform specific identifier for shared libs
++#MODULES_WITH_WARNINGS+=\
++#    svx
+ DLLPOSTFIX=fx
+ BUILD64=1
+
+--- solenv/inc/unx.mk	2009-12-12 18:44:35.000000000 +0900
++++ solenv/inc/unx.mk	2009-12-13 17:15:50.000000000 +0900
+@@ -147,8 +147,12 @@
+ .INCLUDE : unxbsds.mk
+ .ENDIF
+ 
+-.IF "$(COM)$(OS)" == "GCCFREEBSD"
+-.INCLUDE : unxfbsd.mk
++.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
++.INCLUDE : unxfbsdi.mk
++.ENDIF
++
++.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDX"
++.INCLUDE : unxfbsdx.mk
+ .ENDIF
+ 
+ .IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"