7 files changed, 112 insertions, 201 deletions

diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 9bd326741831..d96858a4c177 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -45,17 +45,11 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 WITHOUT_CPU_CFLAGS=	true
 
-ONLY_FOR_ARCHS=	amd64 i386
-
-.if ${MACHINE_ARCH} == amd64
-BROKEN=	"Work in progress"
-.endif
-
 .if !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
-.if ${MACHINE_ARCH} == amd64
+.if ${MACHINE_ARCH} == amd64 # cannot use ARCH
 JAVA_VENDOR=	bsdjava
 .else
 JAVA_VENDOR=	freebsd bsdjava
@@ -65,11 +59,17 @@ JAVA_VENDOR=	freebsd bsdjava
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if ${MACHINE_ARCH} == amd64
+ONLY_FOR_ARCHS=	amd64 i386
+
+.if ${ARCH} == amd64
+BROKEN=		"Work in progress"
+.endif
+
+.if ${ARCH} == amd64
 GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 .else
-GCC_TARGET=		${MACHINE_ARCH}-portbld-freebsd${OSREL}
+GCC_TARGET=		${ARCH}-portbld-freebsd${OSREL}
 FREEBSD_ENV_SET=	FreeBSDIntelEnv.Set
 .endif
 
@@ -84,7 +84,7 @@ INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
 EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
-.if ${MACHINE_ARCH} == amd64
+.if ${ARCH} == amd64
 PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86_64
 .else
 PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
@@ -101,34 +101,36 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 
 .if defined(WITH_GNUGCJ)
 #this wired part must be rewritten
-GCCVER=4.1.1
-BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
-BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+GCCVER=4.1.2
+BUILD_DEPENDS+= ${PREFIX}/lib/gcc/${GCC_TARGET}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+= gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=   ${PREFIX}/lib/gcc/${GCC_TARGET}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+.else
+.if ${ARCH} == amd64
+GCCVER=4.1.2
+BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41
 .else
-BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+GCCVER=3.4.1
+BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo
+.endif
 .endif
 
-# FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
-.if defined(WITH_GNUGCJ)
-CC=	ccache gcc41
-CXX=	ccache g++41
-.else
-CC=	ccache gcc-ooo
-CXX=	ccache g++-ooo
-.endif #WITH_GNUGCJ
-.endif #WITH_CCACHE
-.if !defined(WITH_CCACHE)
-.if defined(WITH_GNUGCJ)
-CC=	gcc41
-CXX=	g++41
+CCACHE_PREFIX=	ccache
 .else
-CC=	gcc-ooo
-CXX=	g++-ooo
-.endif #WITH_GNUGCJ
-.endif #!WITH_CCACHE
+CCACHE_PREFIX=
+.endif
+.if (${GCCVER} == 4.1.2)
+CC=     gcc41
+CXX=    g++41
+.endif
+.if (${GCCVER} == 3.4.1)
+CC=     gcc-ooo
+CXX=    g++-ooo
+.endif
+CC:=	${CCACHE_PREFIX} ${CC}
+CXX:=	${CCACHE_PREFIX} ${CXX}
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
@@ -137,15 +139,13 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bison2:${PORTSDIR}/devel/bison2 \
 		imake:${X_IMAKE_PORT}
-.if !defined(WITH_GNUGCJ)
-BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-.else
+.if defined(WITH_GNUGCJ)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
-.endif
-.if defined(WITH_GNUGCJ)
 ANT_DISTFILE=   apache-ant-${ANT_VERSION}-bin.tar.bz2
 ANT_VERSION=	1.6.5
+.else
+BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .endif
 .if !defined(WITH_GPC)
 LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
@@ -165,6 +165,10 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
 CONFIGURE_ARGS+=	--with-system-freetype #link error with internal one
+.if (${GCCVER} == 4.1.1)
+LIB_DEPENDS=   boost_regex:${PORTSDIR}/devel/boost
+CONFIGURE_ARGS+=       --with-system-boost=yes #i58343#
+.endif
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
diff --git a/editors/openoffice.org-3/files/moz-patch_i59729 b/editors/openoffice.org-3/files/moz-patch_i59729
deleted file mode 100644
index aa8178d0d4f3..000000000000
--- a/editors/openoffice.org-3/files/moz-patch_i59729
+++ /dev/null
@@ -1,151 +0,0 @@
-Index: extensions/source/plugin/base/makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/base/makefile.mk,v
-retrieving revision 1.8
-diff -u -p -r1.8 makefile.mk
---- extensions/source/plugin/base/makefile.mk	8 Sep 2005 19:50:31 -0000	1.8
-+++ extensions/source/plugin/base/makefile.mk	25 Jan 2006 14:30:56 -0000
-@@ -41,6 +41,8 @@ ENABLE_EXCEPTIONS=TRUE
- 
- .INCLUDE :  ..$/util$/makefile.pmk
- 
-+.IF "$(WITH_MOZILLA)" != "NO"
-+
- SLOFILES=		\
- 				$(SLO)$/plctrl.obj		\
- 				$(SLO)$/service.obj		\
-@@ -53,6 +55,8 @@ SLOFILES=		\
- 				$(SLO)$/multiplx.obj    \
- 				$(SLO)$/plmodel.obj
- 
-+.ENDIF # $(WITH_MOZILLA) != "NO"
-+
- # --- Targets ------------------------------------------------------
- 
- .INCLUDE :  target.mk
-Index: extensions/source/plugin/unx/makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/unx/makefile.mk,v
-retrieving revision 1.8
-diff -u -p -r1.8 makefile.mk
---- extensions/source/plugin/unx/makefile.mk	8 Sep 2005 19:55:36 -0000	1.8
-+++ extensions/source/plugin/unx/makefile.mk	25 Jan 2006 14:30:56 -0000
-@@ -42,6 +42,8 @@ TARGETTYPE=CUI
- 
- # --- Files --------------------------------------------------------
- 
-+.IF "$(WITH_MOZILLA)" != "NO"
-+
- SLOFILES=\
- 	$(SLO)$/nppapi.obj		\
- 	$(SLO)$/sysplug.obj		\
-@@ -73,6 +75,7 @@ APP1STDLIBS+=-lXaw -lXt -lXext -lX11 -ld
- 
- APP1DEF=	$(MISC)$/$(TARGET).def
- 
-+.ENDIF # $(WITH_MOZILLA) != "NO"
- 
- # --- Targets ------------------------------------------------------
- 
-Index: extensions/source/plugin/util/makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/util/makefile.mk,v
-retrieving revision 1.12
-diff -u -p -r1.12 makefile.mk
---- extensions/source/plugin/util/makefile.mk	8 Sep 2005 19:57:10 -0000	1.12
-+++ extensions/source/plugin/util/makefile.mk	25 Jan 2006 14:30:56 -0000
-@@ -43,6 +43,9 @@ TARGETTYPE=GUI
- .INCLUDE :  settings.mk
- 
- # --- Files --------------------------------------------------------
-+
-+.IF "$(WITH_MOZILLA)" != "NO"
-+
- LIB1TARGET = $(SLB)$/plall.lib
- LIB1FILES  = \
- 	$(SLB)$/plbase.lib	\
-@@ -97,6 +100,8 @@ SHL1STDLIBS+= -lX11
- 
- SHL1STDLIBS+=$(SHL1OWNLIBS)
- 
-+.ENDIF # $(WITH_MOZILLA) != "NO"
-+
- # --- Targets ------------------------------------------------------
- 
- .INCLUDE :  target.mk
-Index: extensions/source/plugin/win/makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/win/makefile.mk,v
-retrieving revision 1.4
-diff -u -p -r1.4 makefile.mk
---- extensions/source/plugin/win/makefile.mk	8 Sep 2005 19:58:00 -0000	1.4
-+++ extensions/source/plugin/win/makefile.mk	25 Jan 2006 14:30:56 -0000
-@@ -46,6 +46,8 @@ ENABLE_EXCEPTIONS=TRUE
- 
- # --- Types -------------------------------------
- 
-+.IF "$(WITH_MOZILLA)" != "NO"
-+
- #UNOUCROUT=$(OUT)$/inc$/$(PRJNAME)
- #INCPRE+=$(UNOUCROUT)
- 
-@@ -54,7 +56,9 @@ ENABLE_EXCEPTIONS=TRUE
- SLOFILES =	$(SLO)$/winmgr.obj	\
- 			$(SLO)$/sysplug.obj
- 
-+.ENDIF # $(WITH_MOZILLA) != "NO"
- .ENDIF
-+
- # ------------------------------------------------------------------
- 
- 
-Index: extensions/source/ooo/file_library_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
-retrieving revision 1.177
-diff -u -p -r1.177 file_library_ooo.scp
---- scp2/source/ooo/file_library_ooo.scp	16 Jan 2006 15:32:35 -0000	1.177
-+++ scp2/source/ooo/file_library_ooo.scp	25 Jan 2006 14:43:34 -0000
-@@ -1434,7 +1434,9 @@ File gid_File_Lib_DeploymentGui
-     PACKED_UNO_LIB_FILE_BODY_PATCH;
- End
- 
-+#ifndef WITHOUT_MOZILLA
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Pl , pl)
-+#endif
- 
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Preload, preload)
- 
-Index: scp2/source/ooo/file_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v
-retrieving revision 1.134
-diff -u -p -r1.134 file_ooo.scp
---- scp2/source/ooo/file_ooo.scp	5 Jan 2006 14:55:20 -0000	1.134
-+++ scp2/source/ooo/file_ooo.scp	25 Jan 2006 14:43:38 -0000
-@@ -163,6 +163,8 @@ File gid_File_Bin_MsiPkgchk
- End
- #endif
- 
-+#ifndef WITHOUT_MOZILLA
-+
- #if !defined(UNX) || defined(ENABLE_GTK)
- File gid_File_Lib_Npsoplugin
-         BIN_FILE_BODY;
-@@ -184,6 +186,7 @@ File gid_File_Exe_Nsplugin
-   #endif
- End
- #endif
-+#endif
- 
- File gid_File_Bin_Uno
-     BIN_FILE_BODY;
-@@ -291,7 +294,7 @@ File gid_File_Rdb_Gengal
-     Name = "gengal.rdb";
- End
- 
--#ifdef UNX
-+#if !defined(WITHOUT_MOZILLA) && defined(UNX)
- 
- File gid_File_Bin_Pluginapp
-     BIN_FILE_BODY;
diff --git a/editors/openoffice.org-3/files/patch-i65511 b/editors/openoffice.org-3/files/patch-i65511
index 300a95c71487..a0a220962ba1 100644
--- a/editors/openoffice.org-3/files/patch-i65511
+++ b/editors/openoffice.org-3/files/patch-i65511
@@ -1,10 +1,5 @@
-Index: jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
-===================================================================
-RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx,v
-retrieving revision 1.4
-diff -u -r1.4 sunjre.cxx
---- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	7 Sep 2005 19:31:11 -0000	1.4
-+++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	11 May 2006 23:00:16 -0000
+--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx.orig	Wed Sep  7 15:31:11 2005
++++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	Thu May 25 14:20:37 2006
 @@ -76,6 +76,7 @@
          "/bin/classic/jvm.dll"
  #elif UNX
@@ -13,3 +8,11 @@ diff -u -r1.4 sunjre.cxx
          "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
  #endif
  
+@@ -90,6 +91,7 @@
+     static char const * ar[] = {
+ 
+         "/lib/" JFW_PLUGIN_ARCH "/client",
++        "/lib/" JFW_PLUGIN_ARCH "/server",
+         "/lib/" JFW_PLUGIN_ARCH "/native_threads", 
+         "/lib/" JFW_PLUGIN_ARCH
+ 
diff --git a/editors/openoffice.org-3/files/patch-i65512 b/editors/openoffice.org-3/files/patch-i65512
index 1f5005a87f78..9f7b63af1ca1 100644
--- a/editors/openoffice.org-3/files/patch-i65512
+++ b/editors/openoffice.org-3/files/patch-i65512
@@ -28,9 +28,9 @@
  
  #if defined(MACOSX)
  /*
---- sal/osl/unx/system.h.orig	Fri Apr  7 04:06:48 2006
-+++ sal/osl/unx/system.h	Fri May  5 18:57:50 2006
-@@ -540,8 +540,10 @@
+--- sal/osl/unx/system.h.orig	Thu May  4 04:48:25 2006
++++ sal/osl/unx/system.h	Wed May 24 16:06:13 2006
+@@ -543,8 +543,10 @@
  struct tm *localtime_r(const time_t *timep, struct tm *buffer);
  struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
  #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
diff --git a/editors/openoffice.org-3/files/patch-i65513 b/editors/openoffice.org-3/files/patch-i65513
index 146731b44885..eb21cec60d0c 100644
--- a/editors/openoffice.org-3/files/patch-i65513
+++ b/editors/openoffice.org-3/files/patch-i65513
@@ -1,5 +1,5 @@
---- config_office/set_soenv.in.orig	Mon May  8 11:55:43 2006
-+++ config_office/set_soenv.in	Mon May 22 17:39:23 2006
+--- config_office/set_soenv.in	Mon May  8 11:55:43 2006
++++ config_office/set_soenv.in	Tue May 23 14:31:50 2006
 @@ -320,32 +320,60 @@
        $XPVERSION      = "3"; 
  }
@@ -72,7 +72,17 @@
  } 
  elsif ( $platform =~ m/linux-gnu/ ) 
  {
-@@ -1294,6 +1322,7 @@
+@@ -963,8 +991,7 @@
+                         $D.$OS.
+                         $D.$CPUNAME;
+     if  ($platform =~ m/freebsd/)
+-    {  $SOLARDEF     .= $D."X86".
+-                        $D."OSVERSION=$OSVERSION".
++    {  $SOLARDEF     .= $D."OSVERSION=$OSVERSION".
+                         " @PTHREAD_CFLAGS@";
+     }
+     $SOLARDEF        .= $D."_REENTRANT".
+@@ -1294,6 +1321,7 @@
     		{
        		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
        		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
diff --git a/editors/openoffice.org-3/files/patch-i66064 b/editors/openoffice.org-3/files/patch-i66064
new file mode 100644
index 000000000000..10607d33c6df
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i66064
@@ -0,0 +1,16 @@
+Index: unx/source/gdi/salprnpsp.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/source/gdi/salprnpsp.cxx,v
+retrieving revision 1.40
+diff -u -r1.40 salprnpsp.cxx
+--- vcl/unx/source/gdi/salprnpsp.cxx	22 Mar 2006 09:46:43 -0000	1.40
++++ vcl/unx/source/gdi/salprnpsp.cxx	27 May 2006 00:31:26 -0000
+@@ -101,6 +101,8 @@
+ // NETBSD has no RTLD_GLOBAL
+ #ifndef RTLD_GLOBAL
+ #define DLOPEN_MODE (RTLD_LAZY)
++#elif defined(FREEBSD)
++#define DLOPEN_MODE (RTLD_NOW | RTLD_GLOBAL)
+ #else
+ #define DLOPEN_MODE (RTLD_GLOBAL | RTLD_LAZY)
+ #endif
diff --git a/editors/openoffice.org-3/files/patch-i66065 b/editors/openoffice.org-3/files/patch-i66065
new file mode 100644
index 000000000000..9d97beea1ca3
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i66065
@@ -0,0 +1,29 @@
+--- tools/inc/inetdef.hxx.orig	Fri Sep  9 09:42:51 2005
++++ tools/inc/inetdef.hxx	Thu May 25 18:31:02 2006
+@@ -65,7 +65,9 @@
+ #elif defined LINUX && defined X86
+ #define TOOLS_INETDEF_OS "Linux"
+ #elif defined FREEBSD && defined X86
+-#define TOOLS_INETDEF_OS "FreeBSD"
++#define TOOLS_INETDEF_OS "FreeBSD/i386"
++#elif defined FREEBSD && defined X86_64
++#define TOOLS_INETDEF_OS "FreeBSD/amd64"
+ #elif defined SINIX
+ #define TOOLS_INETDEF_OS "SINIX"
+ #elif defined IRIX
+--- tools/inc/solar.h.orig	Wed Apr 26 16:42:59 2006
++++ tools/inc/solar.h	Thu May 25 18:37:19 2006
+@@ -397,9 +397,12 @@
+ #elif defined LINUX && defined __x86_64__
+   #define __DLLEXTENSION "lx.so"
+   #define SYSTEM_ID 		SYSTEM_UNXLNXX
+-#elif defined FREEBSD
++#elif defined FREEBSD && defined X86
+   #define __DLLEXTENSION "fi.so"
+   #define SYSTEM_ID 		SYSTEM_UNXFBSDI
++#elif defined FREEBSD && defined X86_64
++  #define __DLLEXTENSION "fx.so"
++  #define SYSTEM_ID 		SYSTEM_UNXFBSDX
+ #elif defined IRIX
+   #define __DLLEXTENSION "im.so"
+   #define SYSTEM_ID 		SYSTEM_UNXIRXM