Update to m58, this commit is just for record.

Source code and port are equivalent to 1.1.5
and openoffice.org-1.1.5, respectively.

13 files changed, 523 insertions, 43 deletions

diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index a4ce26e884a6..ebaca6dc17f5 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -11,8 +11,8 @@ CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		${MASTER_SITE_LOCAL:S/$/:moz/} \
-		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
+		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		http://openoffice.lunarshells.com/sources/helpcontent/:help \
 		${MASTER_SITE_RINGSERVER:S/$/:help/} \
 		${MASTER_SITE_RINGSERVER:S/$/:help3/} \
@@ -23,10 +23,12 @@ MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 MASTER_SITE_SUBDIR=	maho/openoffice.org/:moz \
 		mozilla/releases/mozilla${MOZILLA_VERSION}/src/:mozsrc \
 		misc/openoffice/contrib/helpcontent/:help \
-		misc/openoffice/contrib/helpcontent-1.0/:help3 \
-
-DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}.${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}.${SNAPDATE}_source.tar.bz2
+		misc/openoffice/contrib/helpcontent-1.0/:help3
+DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
+.if defined(WITH_GPC)
+DISTFILES+=	gpc231.tar.Z:gpc
+.endif
+EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
@@ -61,10 +63,6 @@ JAVA_VENDOR=	bsdjava
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
-.if (${OSVERSION} < 503001 && ${OSVERSION} >= 500000) || (${OSVERSION} <= 492000)
-BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgrade your rtld"
-.endif
-
 LANG_EXT?=	01
 LANG_CONFIGURE_ARG?=	ENUS
 L10NHELP?=     helpcontent_01_unix.tgz
@@ -93,8 +91,8 @@ L10NHELPS=	helpcontent_01_unix.tgz helpcontent_07_unix.tgz \
 
 CODELINE=		645
 RELEASE_NR=		1.1.5
-MILESTONE=		57
-SNAPDATE=		20050816
+MILESTONE=		58
+SNAPDATE=		20050914
 INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org1.1
@@ -109,15 +107,15 @@ PKGNAMEPREFIX=          ${LANG_PKGNAME}-
 PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
-BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
+BUILD_DEPENDS+=	gcc33:${PORTSDIR}/lang/gcc33
 # FIXME (correctly add ccache before gcc and g++)
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
-CC=	ccache gcc32
-CXX=	ccache g++32
+CC=	ccache gcc33
+CXX=	ccache g++33
 .else
-CC=	gcc32
-CXX=	g++32
+CC=	gcc33
+CXX=	g++33
 .endif
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
@@ -126,6 +124,9 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 .if defined(WITHOUT_JAVA)
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .endif
+.if !defined(WITH_GPC)
+LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl2
+.endif
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
@@ -133,7 +134,7 @@ TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf --enable-crashdump --enable-symbols=SMALL
 
 .include <${FILESDIR}/Makefile.knobs>
 
@@ -158,9 +159,11 @@ post-extract:
 .if defined(WITH_TTF_BYTECODE_ENABLED)
 	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/optpatch-freetype
 .endif
+.if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
+.endif
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP ; \
 		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
@@ -171,7 +174,7 @@ post-extract:
 	done
 .endif
 .if !defined(WITHOUT_MOZILLA)
-	@cd ${WRKSRC} ; ${MV} moz moz.old ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT} ; ${PATCH} < ${FILESDIR}/moz-patch
+	@(cd ${WRKSRC} ; ${MV} moz moz.old ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT} ; ${PATCH} < ${FILESDIR}/moz-patch)
 	@${MKDIR} ${WRKSRC}/moz/download
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 	@cd ${WRKSRC} ; ${MV} moz moz.runtime ; ${MV} moz.old moz
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
index db07b01e53d1..28e7fc08866c 100644
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ b/editors/openoffice.org-1.1-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org1.1/OOo_1.1.5m57.20050816_source.tar.bz2) = 7a53ddcb6f4826a86992a0d23f1bb31b
-SIZE (openoffice.org1.1/OOo_1.1.5m57.20050816_source.tar.bz2) = 200486546
+MD5 (openoffice.org1.1/OOo_1.1.5m58_source.tar.bz2) = 3d999e1b49f2af6d332c63e2dbd449af
+SIZE (openoffice.org1.1/OOo_1.1.5m58_source.tar.bz2) = 200498011
 MD5 (openoffice.org1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org1.1/gpc231.tar.Z) = 27917
 MD5 (openoffice.org1.1/cws_srx645_mozooo.20040203.tar.gz) = 1239aad43c65d6808b6261ea9d60fb67
diff --git a/editors/openoffice.org-1.1-devel/files/Makefile.knobs b/editors/openoffice.org-1.1-devel/files/Makefile.knobs
index 394e5c6227d0..34c486abf747 100644
--- a/editors/openoffice.org-1.1-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-1.1-devel/files/Makefile.knobs
@@ -1,6 +1,6 @@
 # Makefile for knobs
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/Makefile.knobs,v 1.3 2005-08-02 05:36:15 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-1.1-devel/files/Attic/Makefile.knobs,v 1.4 2005-10-31 07:34:44 maho Exp $
 
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--disable-java
@@ -8,6 +8,10 @@ CONFIGURE_ARGS+=	--disable-java
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}"
 .endif
 
+.if !defined(WITH_GPC)
+CONFIGURE_ARGS+=	--enable-libart
+.endif
+
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .endif
@@ -78,6 +82,11 @@ pre-fetch:
 	@${ECHO} "You can compile OOo without Java support by"
 	@${ECHO} "make -DWITHOUT_JAVA"
 .endif
+.if !defined(WITH_GPC)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with gpc instead of libart by"
+	@${ECHO} "make -DWITH_GPC"
+.endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
diff --git a/editors/openoffice.org-1.1-devel/files/moz-patch b/editors/openoffice.org-1.1-devel/files/moz-patch
index 5da4ae43ef25..40445f27f3ca 100644
--- a/editors/openoffice.org-1.1-devel/files/moz-patch
+++ b/editors/openoffice.org-1.1-devel/files/moz-patch
@@ -23,7 +23,7 @@ this functionality is not used at all.
 
 --- moz/mozilla-source-1.0.patch.org	Tue Feb 10 19:44:34 2004
 +++ moz/mozilla-source-1.0.patch	Sat Mar 19 12:51:35 2005
-@@ -4471,14 +4471,16 @@
+@@ -4471,14 +4471,17 @@
       return NS_OK;
   }
  
@@ -31,7 +31,7 @@ this functionality is not used at all.
 +--- misc/build/mozilla/.mozconfig	Tue Jul 22 21:52:27 2003
  +++ misc/build/mozilla/.mozconfig	Mon Jul 28 15:07:20 2003
 -@@ -0,0 +1,8 @@
-+@@ -0,0 +1,10 @@
++@@ -0,0 +1,11 @@
  +ac_add_options --disable-tests
  +ac_add_options --disable-xprint
  +ac_add_options --without-system-zlib
@@ -39,6 +39,27 @@ this functionality is not used at all.
  +ac_add_options --disable-debug
 ++ac_add_options --disable-freetype2
 ++ac_add_options --enable-default-toolkit=xlib
+++ac_add_options --disable-pedantic
  +ac_add_options --enable-optimize
  +ac_add_options --enable-crypto
  +ac_add_options --enable-strip
+@@ -4497,3 +4500,19 @@
+  endif
+  
+  # Windows equivalents
++
++--- misc/build/mozilla/xpcom/typelib/xpidl/xpidl.h	Wed Apr 10 12:38:31 2002
+++++ misc/build/mozilla/xpcom/typelib/xpidl/xpidl.h	Sat Oct 29 12:34:19 2005
++@@ -71,10 +71,10 @@
++  * parens, e.g. XPIDL_WARNING((foo, bar, "sil"))
++  *
++  * Probably best removed when we leave 6.5.  */
++-#define XPIDL_WARNING(x) IDL_tree_warning##x
+++#define XPIDL_WARNING(x) IDL_tree_warning x
++ #else
++ extern void xpidl_tree_warning(IDL_tree p, int level, const char *fmt, ...);
++-#define XPIDL_WARNING(x) xpidl_tree_warning##x
+++#define XPIDL_WARNING(x) xpidl_tree_warning x
++ #endif
++ 
++ /*
diff --git a/editors/openoffice.org-1.1-devel/files/patch-backtrace b/editors/openoffice.org-1.1-devel/files/patch-backtrace
new file mode 100644
index 000000000000..41daab73dede
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-backtrace
@@ -0,0 +1,96 @@
+Issuetracker : #iXXXXX#
+CWS          : N/A
+Author       : <maho@openoffice.org> (JCA)
+Description  : FreeBSD porting : An implementation of backtrace at sal/osl/unx
+To pass the compilation, we preparing dummy function at sal.
+We implemented this.
+
+--- sal/osl/unx/backtrace.c	Tue Jul  6 19:35:44 2004
++++ sal/osl/unx/backtrace.c	Sun Oct 23 12:07:07 2005
+@@ -155,6 +155,7 @@
+ #include <pthread.h>
+ #include <setjmp.h>
+ #include <stdio.h>
++#include <stddef.h>
+ #include "backtrace.h"
+ 
+ #define FRAME_PTR_OFFSET 1
+@@ -162,11 +163,55 @@
+ 
+ int backtrace( void **buffer, int max_frames )
+ {
+-	return 1;
++	struct frame *fp;
++	jmp_buf ctx;
++	int i;
++	/* get stack- and framepointer */
++	setjmp(ctx);
++	fp = (struct frame*)(((size_t*)(ctx))[FRAME_PTR_OFFSET]);
++	for ( i=0; (i<FRAME_OFFSET) && (fp!=0); i++)
++		fp = fp->fr_savfp;
++	/* iterate through backtrace */
++	for (i=0; fp && fp->fr_savpc && i<max_frames; i++)
++	{
++		/* store frame */
++		*(buffer++) = (void *)fp->fr_savpc;
++		/* next frame */
++		fp=fp->fr_savfp;
++	}
++	return i;
+ }
+ 
+ void backtrace_symbols_fd( void **buffer, int size, int fd )
+ {
++	FILE	*fp = fdopen( fd, "w" );
++
++	if ( fp )
++	{
++		void **pFramePtr;
++		for ( pFramePtr = buffer; size > 0 && pFramePtr && *pFramePtr; pFramePtr++, size-- )
++		{
++			Dl_info		dli;
++			ptrdiff_t	offset;
++
++			if ( 0 != dladdr( *pFramePtr, &dli ) )
++			{
++				if ( dli.dli_fname && dli.dli_fbase )
++				{
++					offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
++					fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
++				}
++				if ( dli.dli_sname && dli.dli_saddr )
++				{
++					offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
++					fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
++				}
++			}
++			fprintf( fp, "[0x%x]\n", *pFramePtr );
++		}
++		fflush( fp );
++		fclose( fp );
++	}
+ 
+ }
+ #endif /* defined FREEBSD */
+Only in sal/osl/unx: backtrace.c.orig
+diff -ur ../../src/OOo_1.1.5/sal/osl/unx/backtrace.h sal/osl/unx/backtrace.h
+--- sal/osl/unx/backtrace.h	Tue Jul  6 19:36:01 2004
++++ sal/osl/unx/backtrace.h	Sun Oct 23 12:07:07 2005
+@@ -72,6 +72,16 @@
+ 
+ void backtrace_symbols_fd( void **buffer, int size, int fd );
+ 
++/* no frame.h on FreeBSD */
++#if defined FREEBSD
++struct frame {
++	long	arg0[8];
++	long	arg1[6];
++	struct frame *fr_savfp;
++	long	fr_savpc;
++};
++#endif
++
+ #ifdef __cplusplus
+ } /* extern "C" */
+ #endif
+Only in sal/osl/unx: backtrace.h.orig
diff --git a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx
index 11088e05cd62..a69314657945 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx
+++ b/editors/openoffice.org-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx
@@ -1,7 +1,7 @@
-Issutracker : #i22253#
-CWS         : N/A
-Author      : <mrauch@openoffice.org> (JCA)
-Description :
+Issuetracker : #i22253#
+CWS          : N/A
+Author       : <mrauch@openoffice.org> (JCA)
+Description  :
 
 Index: bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
 ===================================================================
diff --git a/editors/openoffice.org-1.1-devel/files/patch-icu+icu-2.2.patch b/editors/openoffice.org-1.1-devel/files/patch-icu+icu-2.2.patch
new file mode 100644
index 000000000000..c0cda356c8f2
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-icu+icu-2.2.patch
@@ -0,0 +1,42 @@
+Issuetracker : #iXXXXX#
+CWS          : N/A
+Author       : <maho@openoffice.org> (JCA)
+Description  : FreeBSD porting : Passing $ORIGIN to linker at icu project
+We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
+
+--- icu/icu-2.2.patch	Tue Jul  6 19:40:19 2004
++++ icu/icu-2.2.patch	Mon Oct 24 18:36:11 2005
+@@ -1127,3 +1127,33 @@
+           return tempGlyphCount;
+       };
+   
++*** misc/icu/source/config/mh-bsd-gcc	Thu May  2 08:48:10 2002
++--- misc/build/icu/source/config/mh-bsd-gcc	Mon Oct 24 18:21:04 2005
++***************
++*** 10,15 ****
++--- 10,18 ----
++  GEN_DEPS.cc=	$(CXX) -E -MM $(DEFS) $(CPPFLAGS)
++  
++  ## Flags for position independent code
+++ STATICCFLAGS = -fPIC 
+++ STATICCXXFLAGS = -fPIC 
+++ STATICCPPFLAGS = -DPIC 
++  SHAREDLIBCFLAGS = -fPIC
++  SHAREDLIBCXXFLAGS = -fPIC
++  SHAREDLIBCPPFLAGS = -DPIC
++***************
++*** 17,22 ****
++--- 20,32 ----
++  ## Compiler switch to embed a runtime search path
++  LD_RPATH=	
++  LD_RPATH_PRE=	-Wl,-rpath,
+++ 
+++ ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
+++ ENABLE_RPATH=YES
+++ RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN'
+++ 
+++ #SH#	ENABLE_RPATH=YES
+++ #SH#	RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN'"
++  
++  ## Compiler switch to embed a library name
++  LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET)
diff --git a/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx b/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx
new file mode 100644
index 000000000000..b334fb1339a0
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-jvmaccess+source+sunversion.cxx
@@ -0,0 +1,61 @@
+Issuetracker : #iXXXXX#
+CWS          : N/A
+Author       : <maho@openoffice.org>
+Description  : FreeBSD porting : do not hardcode pXX of Java version and FreeBSD native Java is always superior to Linux's one.
+
+1. we had been hard coding Java's version by p1, p2 ... etc. but apparently
+it is not a good habit. in this patch we eleminate this.
+
+2. we'd better to use FreeBSD's native Java, and not GNU/Linux's ones if both are exist
+in the system. We add 100 as micro version number, so that we treat FreeBSD's version of
+java 1.4.1-p10 for example to 1.4.1_110.
+
+--- jvmaccess/source/sunversion.cxx	Thu Jun 16 21:45:26 2005
++++ jvmaccess/source/sunversion.cxx	Sat Oct 22 16:42:01 2005
+@@ -246,30 +247,22 @@
+             m_preRelease = Rel_RC2;
+ #if defined FREEBSD || defined NETBSD
+ 	// #i40617# and #i21615#: FreeBSD adds p1-p12 to their JDK port.
+-        else if (! strcmp(pCur, "p12"))
+-            m_preRelease = Rel_BETA;
+-        else if (! strcmp(pCur, "p11"))
+-            m_preRelease = Rel_BETA;
+-        else if (! strcmp(pCur, "p10"))
+-            m_preRelease = Rel_BETA;
+-        else if (! strcmp(pCur, "p9"))
+-            m_preRelease = Rel_BETA;
+-        else if (! strcmp(pCur, "p8"))
+-            m_preRelease = Rel_BETA;
+-        else if (! strcmp(pCur, "p7"))
+-            m_preRelease = Rel_BETA;
+-        else if (! strcmp(pCur, "p6"))
+-            m_preRelease = Rel_BETA;
+-        else if (! strcmp(pCur, "p5"))
+-            m_preRelease = Rel_BETA;
+-        else if (! strcmp(pCur, "p4"))
+-            m_preRelease = Rel_BETA;
+-        else if (! strcmp(pCur, "p3"))
+-            m_preRelease = Rel_BETA;
+-        else if (! strcmp(pCur, "p2"))
+-            m_preRelease = Rel_BETA;
+-        else if (! strcmp(pCur, "p1"))
+-            m_preRelease = Rel_BETA;
++        else if (!strncmp(pCur,"p",1)) //must be p[1-9]*
++	  {
++	    pCur++; //elemnate `p'
++            if (pCur < pEnd && isdigit(*pCur))
++            {
++                if (pCur < pEnd)
++                    pCur ++;
++            }
++                int len = pCur - pLast -1; //elemenate `p'
++                if (len >= 127) 
++                    return false;
++                strncpy(buf, (pLast+1), len); //elemenate `p'
++                buf[len] = 0;
++              //temporal hack we should use BSD's JDK...
++                m_arVersionParts[nPart] = atoi(buf)+100;
++	  }
+ #endif
+         else
+             return false;
diff --git a/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl b/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl
index eba758c6b281..31c4d23cd943 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl
+++ b/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl
@@ -1,7 +1,7 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : most pop name of installated GNU make is gmake, not make for FreeBSD
+Issuetracker : #iXXXXX#
+CWS          : N/A
+Author       : NAKATA Maho <maho@openoffice.org> (JCA)
+Description  : most pop name of installated GNU make is gmake, not make for FreeBSD
 
 Index: configure.pl
 ===================================================================
diff --git a/editors/openoffice.org-1.1-devel/files/patch-scp+source+office+unxbasic.scp b/editors/openoffice.org-1.1-devel/files/patch-scp+source+office+unxbasic.scp
index ecb51c46c8d6..9a058c27dd9a 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-scp+source+office+unxbasic.scp
+++ b/editors/openoffice.org-1.1-devel/files/patch-scp+source+office+unxbasic.scp
@@ -1,7 +1,7 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Do not make a link as /usr/bin/soffice
+Issuetracker : #iXXXXX#
+CWS          : N/A
+Author       : NAKATA Maho <maho@openoffice.org> (JCA)
+Description  : Do not make a link as /usr/bin/soffice
 
 Index: scp/source/office/unxbasic.scp
 ===================================================================
diff --git a/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx b/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
index 360312fc8001..08684375eb4a 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
+++ b/editors/openoffice.org-1.1-devel/files/patch-shell+source+unix+sysshell+recently_used_file_handler.cxx
@@ -1,7 +1,7 @@
-Issutracker : #iXXXXX#
-CWS         : N/A
-Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : 
+Issuetracker : #iXXXXX#
+CWS          : N/A
+Author       : NAKATA Maho <maho@openoffice.org> (JCA)
+Description  : 
 In solver/645/unxfbsd.pro/inc/rtl/string.hxx,
 even though there is a descrioptin like
 static OString valueOf( sal_Int32 i, sal_Int16 radix = 10 ) SAL_THROW(())
diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
new file mode 100644
index 000000000000..275882d765bb
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -0,0 +1,248 @@
+Issuetracker : #iXXXXX#
+CWS          : N/A
+Author       : <maho@openoffice.org> (JCA)
+Description  : FreeBSD porting : catch up recent version of solenv/inc/unxlngi5.mk
+catch up recent version of solenv/inc/unxlngi5.mk
+
+--- solenv/inc/unxfbsdi.mk.orig	Tue May  4 01:27:08 2004
++++ solenv/inc/unxfbsdi.mk	Mon Oct 24 11:39:05 2005
+@@ -60,16 +60,21 @@
+ #
+ #*************************************************************************
+ 
+-# mak file for unxfbsdi
+-ASM=$(CC)
+-AFLAGS=-x assembler-with-cpp -c $(CDEFS)
++# ma file for unxfbsdi
++ASM=
++AFLAGS=
++
++SOLAR_JAVA*=TRUE
++JAVAFLAGSDEBUG=-g
+ 
+ # filter for supressing verbose messages from linker
+ #not needed at the moment
+ #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+ 
++# _PTHREADS is needed for the stl
++CDEFS+= -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION) $(PTHREAD_CFLAGS)
++
+ # this is a platform with JAVA support
+-SOLAR_JAVA*=TRUE
+ .IF "$(SOLAR_JAVA)"!=""
+ JAVADEF=-DSOLAR_JAVA
+ .IF "$(debug)"==""
+@@ -83,89 +88,81 @@
+ CXX*=g++
+ # name of C Compiler
+ CC*=gcc
++.IF "$(SYSBASE)"!=""
++CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
++CXX+:=$(CFLAGS_SYSBASE)
++CC+:=$(CFLAGS_SYSBASE)
++.ENDIF          # "$(SYSBASE)"!=""
++# flags for C and C++ Compiler
++# do not use standard header search paths
++# if installed elsewhere
++.IF "$(BUILD_SOSL)"!=""
++CFLAGS=
++.ENDIF
++CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
+ 
+-# filter for supressing verbose messages from linker
+-# not needed at the moment
+-LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+-
+-# options for C and C++ Compiler
+-CDEFS+=	-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
+-CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
+-
+-# flags for C and C++ Compile
+-CFLAGS+= -w -c $(INCLUDE)
+-CFLAGS+= -I/usr/X11R6/include
++# flags to enable build with symbols; required for crashdump feature
++.IF "$(ENABLE_SYMBOLS)"=="SMALL"
++CFLAGSENABLESYMBOLS=-g1
++.ELSE
++CFLAGSENABLESYMBOLS=-g
++.ENDIF
+ 
+ # flags for the C++ Compiler
+-CFLAGSCC= -pipe -fno-rtti
+-CFLAGSCXX= -pipe -fno-for-scope -fpermissive -fno-rtti
+-
++CFLAGSCC= -pipe -mcpu=pentiumpro
+ # Flags for enabling exception handling
+-CFLAGSEXCEPTIONS= -fexceptions
+-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
+-
+-# Compiler flags for compiling static object in single threaded
+-# environment with graphical user interface
+-CFLAGSOBJGUIST= -fPIC
+-
+-# Compiler flags for compiling static object in single threaded
+-# environment with character user interface
+-CFLAGSOBJCUIST= -fPIC
+-
+-# Compiler flags for compiling static object in multi threaded
+-# environment with graphical user interface
+-CFLAGSOBJGUIMT= -fPIC
+-
+-# Compiler flags for compiling static object in multi threaded
+-# environment with character user interface
+-CFLAGSOBJCUIMT= -fPIC
+-
+-# Compiler flags for compiling shared object in multi threaded
+-# environment with graphical user interface
+-CFLAGSSLOGUIMT=	-fPIC
+-
+-# Compiler flags for compiling shared object in multi threaded
+-# environment with character user interface
+-CFLAGSSLOCUIMT=	-fPIC
+-
+-# Compiler flags for profilin
+-CFLAGSPROF=     -pg
+-
++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
++# Flags for disabling exception handling
++CFLAGS_NO_EXCEPTIONS=-fno-exceptions
++
++# -fpermissive should be removed as soon as possible
++CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-for-scope -fpermissive -fno-rtti
++
++# Compiler flags for compiling static object in single threaded environment with graphical user interface
++CFLAGSOBJGUIST=
++# Compiler flags for compiling static object in single threaded environment with character user interface
++CFLAGSOBJCUIST=
++# 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
++CFLAGSOBJCUIMT=
++# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
++CFLAGSSLOGUIMT=-fpic
++# Compiler flags for compiling shared object in multi threaded environment with character user interface
++CFLAGSSLOCUIMT=-fpic
++# Compiler flags for profiling
++CFLAGSPROF=
+ # Compiler flags for debugging
+-CFLAGSDEBUG=	-g
++CFLAGSDEBUG=-g
+ CFLAGSDBGUTIL=
+-
+-# Compiler flags to enable optimizations
+-# -02 is broken for FreeBSD
+-CFLAGSOPT= -O
+-
+-# Compiler flags to disable optimizations
+-# -0 is broken for STLport for FreeBSD
+-CFLAGSNOOPT= -O0
+-
+-# Compiler flags for the output path
+-CFLAGSOUTOBJ= -o
+-
++# Compiler flags for enabling optimazations
++# CFLAGSOPT=-O2
++# reduce to -O1 to avoid optimisation problems
++CFLAGSOPT=-O1
++# Compiler flags for disabling optimazations
++CFLAGSNOOPT=-O0
++# Compiler flags for discibing the output path
++CFLAGSOUTOBJ=-o
+ # Enable all warnings
+ CFLAGSWALL=-Wall
+-
+ # Set default warn level
+ CFLAGSDFLTWARN=-w
+ 
+ # switches for dynamic and static linking
+-STATIC=	-Wl,-Bstatic
+-DYNAMIC= -Wl,-Bdynamic
++STATIC		= -Wl,-Bstatic
++DYNAMIC		= -Wl,-Bdynamic
+ 
+ # name of linker
+-LINK=$(CC)
++LINK*=$(CC)
+ 
+ # default linker flags
+-# LINKFLAGSRUNPATH*=-Wl,-rpath\''$$ORIGIN'\'
+-LINKFLAGS=$(LINKFLAGSRUNPATH)
++LINKFLAGSDEFS*=-z defs
++LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
++LINKFLAGS=-z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+ 
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
+@@ -176,21 +173,16 @@
+ LINKFLAGSDEBUG=-g
+ LINKFLAGSOPT=
+ 
+-.IF "$(NO_BSYMBOLIC)"==""
+-.IF "$(PRJNAME)" != "envtest"
+-LINKFLAGSSHLGUI+= -Wl,-Bsymbolic
+-LINKFLAGSSHLCUI+= -Wl,-Bsymbolic
+-.ENDIF
+-.ENDIF
++# linker flags for optimization (symbol hashtable)
++# for now, applied to symbol scoped libraries, only
++LINKFLAGSOPTIMIZE*=-Wl,-O1
++LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
+ 
+-LINKVERSIONMAPFLAG=-Wl,--version-script
++SONAME_SWITCH=-Wl,-h
+ 
+ # Sequence of libs does matter !
+-STDLIBCPP=-lstdc++
+ 
+-# _SYSLIBS= -L/usr/lib -lm
+-# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11
+-# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib
++STDLIBCPP=-lstdc++
+ 
+ # default objectfilenames to link
+ STDOBJGUI=
+@@ -200,24 +192,26 @@
+ 
+ # libraries for linking applications
+ STDLIBCUIST=-lm
+-STDLIBGUIST=-lXaw -lXt -lX11 -lm
+-STDLIBGUIMT=-lXaw -lXt -lX11 $(PTHREAD_LIBS) -lm
++STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
+ STDLIBCUIMT=$(PTHREAD_LIBS) -lm
++STDLIBGUIST=-lX11 -lm
+ 
+ # libraries for linking shared libraries
+-STDSHLGUIMT=-lXaw -lXt -lX11 -lXext $(PTHREAD_LIBS) -lm
++STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
+ STDSHLCUIMT=$(PTHREAD_LIBS) -lm
++STDSHLGUIST=-lX11 -lXext -lm
++STDSHLCUIST=-lm
+ 
+ LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+ 
+-# STLport always needs pthread.
+-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) $(PTHREAD_LIBS)
+-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
++
++#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+ 
+ # name of library manager
+ LIBMGR=ar
+ LIBFLAGS=-r
+-LIBEXT=			.a
+ 
+ # tool for generating import libraries
+ IMPLIB=
+@@ -236,3 +230,4 @@
+ DLLPOSTFIX=fi
+ DLLPRE=lib
+ DLLPOST=.so
++
diff --git a/editors/openoffice.org-1.1-devel/files/patch-translation_limit_64k b/editors/openoffice.org-1.1-devel/files/patch-translation_limit_64k
index 4eea8acadbb5..612b19dfc575 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-translation_limit_64k
+++ b/editors/openoffice.org-1.1-devel/files/patch-translation_limit_64k
@@ -1,7 +1,7 @@
-Issutracker : #i33228#, #i34210#
-CWS         : N/A
-Author      :
-Description : Kannada doesn't build since some resources are
+Issuetracker : #i33228#, #i34210#
+CWS          : N/A
+Author       :
+Description  : Kannada doesn't build since some resources are
 limited to 64k. it won't fix for 1.1.x officially
 
 Index: inc/sc.hrc