1) update to mileston56

2) builds, but broken (bison1875d is required, setup fails, etc.)

16 files changed, 493 insertions, 271 deletions

diff --git a/editors/openoffice.org-2-devel/files/Makefile.mozilla b/editors/openoffice.org-2-devel/files/Makefile.mozilla
deleted file mode 100644
index eaa3d648037..00000000000
--- a/editors/openoffice.org-2-devel/files/Makefile.mozilla
+++ /dev/null
@@ -1,61 +0,0 @@
-extract-mozilla:
-.if ! exists(${WRKDIR}/mozilla/Makefile)
-	@${ECHO_MSG} "===>  Extracting mozilla sub project"
-	@cd ${WRKDIR} && tar -xzf ${DISTDIR}/${DIST_SUBDIR}/mozilla-vendor-1.0.2a.tgz
-.endif
-	@cd ${WRKDIR}/mozilla && ${MAKE} extract WRKDIRPREFIX=""
-
-patch-mozilla:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/patch-openoffice-mozilla101-2002-10-14 \
-		${WRKDIR}/mozilla/files/
-	@cd ${WRKDIR}/mozilla && ${MAKE} patch WRKDIRPREFIX=""
-
-build-mozilla:
-.if ! exists(${WRKDIR}/FREEBSDGCCIruntime.zip)
-	@${ECHO_MSG} "===>  Building mozilla sub project"
-.if defined(WITH_DEBUG)
-	@${CP} ${WRKDIR}/mozilla/Makefile ${WRKDIR}/mozilla/Makefile.new
-	@${SED} -e 's|--disable-debug||' \
-		-e 's|--disable-cpp-rtti||' \
-		-e 's|--enable-strip||' \
-		< ${WRKDIR}/mozilla/Makefile.new > ${WRKDIR}/mozilla/Makefile
-.endif
-.if defined(USE_GCC)
-	@cd ${WRKDIR}/mozilla && ${MAKE} CXX="${CXX}" CC="${CC}" CFLAGS="${CFLAGS}" USE_GCC=${USE_GCC} build WRKDIRPREFIX=""
-.else
-	@cd ${WRKDIR}/mozilla && ${MAKE} CFLAGS="${CFLAGS}" build WRKDIRPREFIX=""
-.endif
-	@${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR}
-	@${CHMOD} 755 ${WRKDIR}/zipmoz.sh
-	@${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR}
-.endif
-
-install-mozilla:
-	@${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/
-	@${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/
-
-register-mozilla:
-.if exists(${WRKDIR}/mozilla-runtime)
-	@${RM} -rf ${WRKDIR}/mozilla-runtime
-.endif
-	@${MKDIR} ${WRKDIR}/mozilla-runtime
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIruntime.zip
-	@cd ${WRKDIR}/mozilla-runtime && ${UNZIP} -o ${WRKDIR}/FREEBSDGCCIlib.zip
-	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
-	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
-	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
-	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
-		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
-	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
-	@cd ${WRKDIR}/mozilla-runtime && ${FIND} . -type f \
-		| ${ZIP} ${WRKDIR}/FREEBSDGCCIruntime.zip -@
-
-mozilla:
-	@${MAKE} extract-mozilla
-	@${MAKE} patch-mozilla
-	@${MAKE} build-mozilla
-	@${MAKE} register-mozilla
-	@${MAKE} install-mozilla
-
diff --git a/editors/openoffice.org-2-devel/files/moz-patch b/editors/openoffice.org-2-devel/files/moz-patch
new file mode 100644
index 00000000000..5461c45f953
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/moz-patch
@@ -0,0 +1,76 @@
+diff -u moz/mozilla-source-1.7b.patch moz.new/mozilla-source-1.7b.patch
+--- moz/mozilla-source-1.7b.patch	Wed Jul 14 13:22:36 2004
++++ moz.new/mozilla-source-1.7b.patch	Fri Oct 22 22:44:42 2004
+@@ -4447,7 +4447,6 @@
+ +#MKSHLIB += -R '$$ORIGIN'
+  endif
+  endif
+- endif
+ 
+ Index: mailnews/addrbook/src/nsAbMD5sum.cpp
+ ===================================================================
+@@ -5104,3 +5103,64 @@
+ +//#define HAVE_MMX_INTEL_MNEMONICS 
+ +//#define HAVE_SSE2_INTEL_MNEMONICS 
+  #endif
++
++
++
++
++--- misc/build/mozilla/configure.orig	Tue Mar 16 13:00:47 2004
+++++ misc/build/mozilla/configure	Sat Oct 16 15:59:50 2004
++@@ -12507,15 +12507,15 @@
++ 
++ 
++                     if test -z "$GSSAPI_LIBS" ; then
++-        LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
++-        echo $ac_n "checking for gss_init_sec_context in -lgssapi_krb5""... $ac_c" 1>&6
++-echo "configure:12513: checking for gss_init_sec_context in -lgssapi_krb5" >&5
++-ac_lib_var=`echo gssapi_krb5'_'gss_init_sec_context | sed 'y%./+-%__p_%'`
+++        LIBS="$LIBS -lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
+++        echo $ac_n "checking for gss_init_sec_context in -lgssapi""... $ac_c" 1>&6
+++echo "configure:12513: checking for gss_init_sec_context in -lgssapi" >&5
+++ac_lib_var=`echo gssapi'_'gss_init_sec_context | sed 'y%./+-%__p_%'`
++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++   echo $ac_n "(cached) $ac_c" 1>&6
++ else
++   ac_save_LIBS="$LIBS"
++-LIBS="-lgssapi_krb5  $LIBS"
+++LIBS="-lgssapi  $LIBS"
++ cat > conftest.$ac_ext <<EOF
++ #line 12521 "configure"
++ #include "confdefs.h"
++@@ -12543,7 +12543,7 @@
++ fi
++ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++   echo "$ac_t""yes" 1>&6
++-  GSSAPI_LIBS="-L$GSSAPI_DIR/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+++  GSSAPI_LIBS="-L$GSSAPI_DIR/lib -lgssapi -lkrb5 -lasn1 -lroken -lcrypto -lcom_err -lcrypt"
++ else
++   echo "$ac_t""no" 1>&6
++ fi
++@@ -12653,7 +12653,7 @@
++         cat > conftest.$ac_ext <<EOF
++ #line 12655 "configure"
++ #include "confdefs.h"
++- #include <gssapi/gssapi.h> 
+++ #include <gssapi.h> 
++ int main() {
++  gss_OID oid = GSS_C_NT_HOSTBASED_SERVICE; 
++ ; return 0; }
++
++ endif
++
++--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in.org	Fri Oct 22 22:43:46 2004
+++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in	Fri Oct 22 22:44:01 2004
++@@ -225,6 +225,10 @@
++ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe
++ endif
++ 
+++ifeq ($(OS_ARCH), FreeBSD)
+++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
+++endif
+++
++ ifeq ($(OS_ARCH), NetBSD)
++ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
++ endif
diff --git a/editors/openoffice.org-2-devel/files/optpatch-vcl+util+makefile.pmk b/editors/openoffice.org-2-devel/files/optpatch-vcl+util+makefile.pmk
deleted file mode 100644
index 41341ff0b4e..00000000000
--- a/editors/openoffice.org-2-devel/files/optpatch-vcl+util+makefile.pmk
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../vcl/util/makefile.pmk.orig	Mon Aug  5 01:39:41 2002
-+++ ../vcl/util/makefile.pmk	Mon Aug  5 01:40:03 2002
-@@ -64,7 +64,7 @@
- PROJECTPCHSOURCE=$(PRJ)$/util$/vclpch
- PDBTARGET=vcl
- 
--.IF "$(OS)" != "MACOSX"
-+.IF "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
- .IF "$(remote)" != ""
- USE_BUILTIN_RASTERIZER=true
- .ENDIF
diff --git a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
index 9cb8bdad0c2..356c23bd10f 100644
--- a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
@@ -6,8 +6,8 @@ Index: config_office/configure.in
 RCS file: /cvs/tools/config_office/configure.in,v
 retrieving revision 1.63
 diff -u -r1.63 configure.in
---- ../config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
-+++ ../config_office/configure.in	8 Jun 2004 20:53:16 -0000
+--- config_office/configure.in	17 Mar 2004 09:33:26 -0000	1.63
++++ config_office/configure.in	8 Jun 2004 20:53:16 -0000
 @@ -1830,10 +1831,12 @@
  
  if test "$enable_java" != "no"; then
diff --git a/editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in
index dbb4c3506e1..54f4b834c0d 100644
--- a/editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in
+++ b/editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in
@@ -1,8 +1,8 @@
 #i27028
 http://qa.openoffice.org/issues/show_bug.cgi?id=27028
 
---- ../config_office/set_soenv.in.old	Tue Mar  9 21:31:38 2004
-+++ ../config_office/set_soenv.in	Sun Mar 28 09:56:03 2004
+--- config_office/set_soenv.in.old	Tue Mar  9 21:31:38 2004
++++ config_office/set_soenv.in	Sun Mar 28 09:56:03 2004
 @@ -1419,6 +1419,7 @@
  ToFile( "XSLTPROC",          "@XSLTPROC@",       "e" );
  ToFile( "ANT_HOME",          "@ANT_HOME@",       "e" );
diff --git a/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map b/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map
index cdb61b141eb..aa65477decb 100644
--- a/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map
+++ b/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+gcc3_linux_intel.map
@@ -1,8 +1,9 @@
+#iz 23917
 Mysterious :)
 
 http://qa.openoffice.org/issues/show_bug.cgi?id=23917
---- ../cppuhelper/source/gcc3_linux_intel.map.orig	Sat Sep 13 22:15:22 2003
-+++ ../cppuhelper/source/gcc3_linux_intel.map	Sat Sep 13 22:16:01 2003
+--- cppuhelper/source/gcc3_linux_intel.map.orig	Sat Sep 13 22:15:22 2003
++++ cppuhelper/source/gcc3_linux_intel.map	Sat Sep 13 22:16:01 2003
 @@ -299,6 +299,7 @@
  _ZNK4cppu6UnoUrl11getProtocolEv;
  _ZNK4cppu6UnoUrl13getConnectionEv;
diff --git a/editors/openoffice.org-2-devel/files/patch-helpcontent+langren.pl b/editors/openoffice.org-2-devel/files/patch-helpcontent+langren.pl
deleted file mode 100644
index 7d2b7b71a32..00000000000
--- a/editors/openoffice.org-2-devel/files/patch-helpcontent+langren.pl
+++ /dev/null
@@ -1,20 +0,0 @@
-#iz 32769
-http://qa.openoffice.org/issues/show_bug.cgi?id=32769
-temporary fix.
-
-Index: langren.pl
-===================================================================
-RCS file: /cvs/installation/helpcontent/langren.pl,v
-retrieving revision 1.4
-diff -u -r1.4 langren.pl
---- ../helpcontent/langren.pl.org	12 Jul 2004 12:43:08 -0000	1.4
-+++ ../helpcontent/langren.pl	10 Aug 2004 07:58:54 -0000
-@@ -123,7 +123,7 @@
-         }
-     } else {
-         system("mkdir -p $dest_dir");
--        my $cpcmd = ( -x "$ENV{'BUILD_TOOLS'}/gnucp" ? "$ENV{BUILD_TOOLS}/gnucp" : "cp" );
-+        my $cpcmd = ( -x "$ENV{'GNUCOPY'}" ? "$ENV{'GNUCOPY'}" : "cp" );
-         if ( system("$cpcmd -r -u $src_dir/* $dest_dir")) {
-             print STDERR "error while copying\n";
-             unlink ".langren_working";
diff --git a/editors/openoffice.org-2-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-2-devel/files/patch-odk+setsdkenv_unix.in
index e5551f88323..1e5d4e58532 100644
--- a/editors/openoffice.org-2-devel/files/patch-odk+setsdkenv_unix.in
+++ b/editors/openoffice.org-2-devel/files/patch-odk+setsdkenv_unix.in
@@ -1,6 +1,8 @@
+#iz 24142
+
 http://qa.openoffice.org/issues/show_bug.cgi?id=24142
---- ../odk/setsdkenv_unix.in	Sun Jan 25 18:41:01 2004
-+++ ../odk/setsdkenv_unix.in	Sun Jan 25 18:42:00 2004
+--- odk/setsdkenv_unix.in	Sun Jan 25 18:41:01 2004
++++ odk/setsdkenv_unix.in	Sun Jan 25 18:42:00 2004
 @@ -2,7 +2,8 @@
  
  # This script starts a new shell and sets all enviroment variables, which
diff --git a/editors/openoffice.org-2-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-2-devel/files/patch-odk+settings+settings.mk
index 8c3942d12f1..f67e65c31c2 100644
--- a/editors/openoffice.org-2-devel/files/patch-odk+settings+settings.mk
+++ b/editors/openoffice.org-2-devel/files/patch-odk+settings+settings.mk
@@ -1,7 +1,7 @@
 http://qa.openoffice.org/issues/show_bug.cgi?id=24142
 
---- ../odk/settings/settings.mk	Sun Jan 25 18:41:02 2004
-+++ ../odk/settings/settings.mk	Sun Jan 25 18:45:09 2004
+--- odk/settings/settings.mk	Sun Jan 25 18:41:02 2004
++++ odk/settings/settings.mk	Sun Jan 25 18:45:09 2004
 @@ -368,3 +368,85 @@
  
  endif
diff --git a/editors/openoffice.org-2-devel/files/patch-project-extentions b/editors/openoffice.org-2-devel/files/patch-project-extentions
new file mode 100644
index 00000000000..ff52c1788dc
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-project-extentions
@@ -0,0 +1,75 @@
+#iZ XXXXX
+not yet raised
+
+RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
+retrieving revision 1.3
+diff -u -r1.3 makefile.mk
+--- extensions/source/nsplugin/source/makefile.mk	3 Sep 2004 11:41:22 -0000	1.3
++++ extensions/source/nsplugin/source/makefile.mk	4 Oct 2004 15:42:46 -0000
+@@ -77,6 +77,9 @@
+ .IF "$(GUI)"=="UNX"
+ .IF "$(OS)"=="LINUX"
+ INC+= -DNP_LINUX
++CFLAGS+=`pkg-config --cflags gtk+-2.0`
++.ELIF "$(OS)"=="FREEBSD"
++CFLAGS+=`pkg-config --cflags gtk+-2.0`
+ .ENDIF
+ .ENDIF
+ .IF "$(GUI)"=="WNT"
+@@ -93,8 +96,12 @@
+ .IF "$(GUI)"=="UNX"
+ SHL1OBJS+=$(SLO)$/npunix.obj
+ SLOFILES+=$(SLO)$/npunix.obj
++.IF "$(OS)"=="FREEBSD"
++#SHL1STDLIBS+=
++.ELSE
+ SHL1STDLIBS+= -ldl -lnsl
+-.ENDIF
++.ENDIF # FREEBSD
++.ENDIF # UNX
+ .IF "$(GUI)"=="WNT"
+ SHL1OBJS+=$(SLO)$/npwin.obj
+ SLOFILES+=$(SLO)$/npwin.obj
+@@ -123,6 +130,7 @@
+ .IF "$(GUI)"=="UNX"
+ #APP1STDLIBS+= -lgdk-x11-2.0 -lgtk-x11-2.0
+ .IF "$(OS)"=="LINUX"
++.ELIF "$(OS)"=="FREEBSD"
+ .ELSE
+ APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
+ .ENDIF
+Index: extensions/source/nsplugin/source/so_env.cxx
+===================================================================
+RCS file: /cvs/util/extensions/source/nsplugin/source/so_env.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 so_env.cxx
+--- extensions/source/nsplugin/source/so_env.cxx	20 Aug 2004 10:08:00 -0000	1.2
++++ extensions/source/nsplugin/source/so_env.cxx	4 Oct 2004 15:42:46 -0000
+@@ -62,7 +62,7 @@
+ #ifdef UNIX
+ #include <sys/types.h>
+ #include <strings.h>
+-#ifdef NP_LINUX
++#if defined(NP_LINUX) || defined (FREEBSD)
+ #include <stdarg.h>
+ #else
+ #include <sys/varargs.h>
+
+
+Index: extensions/source/config/ldap/makefile.mk
+===================================================================
+RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
+retrieving revision 1.2
+diff -u -r1.2 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	3 Aug 2004 14:39:30 -0000	1.2
++++ extensions/source/config/ldap/makefile.mk	24 Oct 2004 04:05:13 -0000
+@@ -97,6 +97,9 @@
+         $(CPPUHELPERLIB) \
+         $(CPPULIB) \
+         $(SALLIB)
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+=-lcompat
++.ENDIF
+ 
+ DEF1NAME=$(SHL1TARGET)
+ DEF1EXPORTFILE=exports.dxp    
diff --git a/editors/openoffice.org-2-devel/files/patch-project-xmlsecurity b/editors/openoffice.org-2-devel/files/patch-project-xmlsecurity
new file mode 100644
index 00000000000..ef61490dd14
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-project-xmlsecurity
@@ -0,0 +1,40 @@
+#iZ XXXX
+porting project xmlsec
+1) we should provide configure based one
+2) malloc.h is deprecated for FreeBSD
+
+Index: libxmlsec/xmlsec1-1.2.4.patch
+===================================================================
+RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v
+retrieving revision 1.7
+diff -u -r1.7 xmlsec1-1.2.4.patch
+--- libxmlsec/xmlsec1-1.2.4.patch	9 Sep 2004 08:31:29 -0000	1.7
++++ libxmlsec/xmlsec1-1.2.4.patch	3 Oct 2004 05:52:20 -0000
+@@ -83,7 +83,7 @@
+ ! #undef HAVE_MACH_O_DYLD_H
+ ! 
+ ! /* Define to 1 if you have the <malloc.h> header file. */
+-! #define HAVE_MALLOC_H 1
++! #define HAVE_MALLOC_H 0
+ ! 
+ ! /* Define to 1 if you have the `memcpy' function. */
+ ! #undef HAVE_MEMCPY
+
+
+Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+===================================================================
+RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx
+--- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	12 Jul 2004 13:15:21 -0000	1.1.1.1
++++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	4 Oct 2004 22:04:08 -0000
+@@ -68,7 +68,9 @@
+ #include <xmloff/attrlist.hxx>
+ #include "xmlelementwrapper_xmlsecimpl.hxx"
+ 
++#if !defined (FREEBSD)
+ #include <malloc.h>
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/editors/openoffice.org-2-devel/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-2-devel/files/patch-psprint+source+helper+strhelper.cxx
index 52530e403ac..186ff5e741b 100644
--- a/editors/openoffice.org-2-devel/files/patch-psprint+source+helper+strhelper.cxx
+++ b/editors/openoffice.org-2-devel/files/patch-psprint+source+helper+strhelper.cxx
@@ -6,8 +6,8 @@ Index: source/helper/strhelper.cxx
 RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v
 retrieving revision 1.6
 diff -u -r1.6 strhelper.cxx
---- ../psprint/source/helper/strhelper.cxx	30 Mar 2004 13:48:06 -0000	1.6
-+++ ../psprint/source/helper/strhelper.cxx	13 Apr 2004 22:26:11 -0000
+--- psprint/source/helper/strhelper.cxx	30 Mar 2004 13:48:06 -0000	1.6
++++ psprint/source/helper/strhelper.cxx	13 Apr 2004 22:26:11 -0000
 @@ -67,6 +67,10 @@
  #include <cmath> // for isnan
  #include <cstring>
diff --git a/editors/openoffice.org-2-devel/files/patch-sfx2+source+config+cfgmgr.cxx b/editors/openoffice.org-2-devel/files/patch-sfx2+source+config+cfgmgr.cxx
index be38de290a5..e4965fdf355 100644
--- a/editors/openoffice.org-2-devel/files/patch-sfx2+source+config+cfgmgr.cxx
+++ b/editors/openoffice.org-2-devel/files/patch-sfx2+source+config+cfgmgr.cxx
@@ -1,8 +1,9 @@
-Wired bug?
+#iz 22253
+
 http://qa.openoffice.org/issues/show_bug.cgi?id=22253
 
---- ../sfx2/source/config/cfgmgr.cxx.org	Fri Nov  7 19:11:25 2003
-+++ ../sfx2/source/config/cfgmgr.cxx	Fri Nov  7 19:30:26 2003
+--- sfx2/source/config/cfgmgr.cxx.org	Fri Nov  7 19:11:25 2003
++++ sfx2/source/config/cfgmgr.cxx	Fri Nov  7 19:30:26 2003
 @@ -118,6 +118,10 @@
  		catch(com::sun::star::ucb::InteractiveAugmentedIOException&)
  		{
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
new file mode 100644
index 00000000000..52364e091e2
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -0,0 +1,254 @@
+#iz XXXXX
+New unxfbsdi.mk, catching up linux's one.
+
+Index: solenv/inc/unxfbsdi.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
+retrieving revision 1.11
+diff -u -r1.11 unxfbsdi.mk
+--- solenv/inc/unxfbsdi.mk	20 Sep 2004 08:37:13 -0000	1.11
++++ solenv/inc/unxfbsdi.mk	3 Oct 2004 06:45:36 -0000
+@@ -61,15 +61,21 @@
+ #*************************************************************************
+ 
+ # mak file for unxfbsdi
+-ASM=$(CC)
+-AFLAGS=-x assembler-with-cpp -c $(CDEFS)
++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"
+ 
++# options for C and C++ Compiler
++CDEFS+=	-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
++CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
++
+ # this is a platform with JAVA support
+-SOLAR_JAVA*=TRUE
+ .IF "$(SOLAR_JAVA)"!=""
+ JAVADEF=-DSOLAR_JAVA
+ .IF "$(debug)"==""
+@@ -77,121 +83,101 @@
+ .ELSE
+ JAVA_RUNTIME=-ljava_g
+ .ENDIF
++.ENDIF 
++
++# define default arch flags when needed
++.IF "$(ARCH_FLAGS)"==""
++ARCH_FLAGS=-mcpu=pentiumpro
+ .ENDIF
+ 
+ # name of C++ Compiler
+ CXX*=g++
+ # name of C Compiler
+ CC*=gcc
++# flags for C and C++ Compiler
++CFLAGS+=-Wuninitialized -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-rtti
+-CFLAGSCXX+= -Wno-ctor-dtor-privacy
+-
++CFLAGSCC= -pipe $(ARCH_FLAGS)
+ # Flags for enabling exception handling
+-CFLAGSEXCEPTIONS= -fexceptions
+-CFLAGS_NO_EXCEPTIONS= -fno-exceptions
++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
++# Flags for disabling exception handling
++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
++CFLAGSCXX= -pipe $(ARCH_FLAGS)
++CFLAGSCXX+= -Wno-ctor-dtor-privacy
+ 
++# 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=	-pg
+ # 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
+-
++CFLAGSWALL=-Wall -Wfloat-equal -Weffc++ -Wold-style-cast -Woverloaded-virtual -Wshadow -Wpointer-arith -Wcast-align -Wsign-compare -Winline
+ # Set default warn level
+-CFLAGSDFLTWARN=-w
++CFLAGSDFLTWARN=
+ 
+ # 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
+ LINKFLAGSSHLCUI= -shared
+-
+ LINKFLAGSTACK=
+ LINKFLAGSPROF=
+ 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=
+@@ -201,24 +187,30 @@
+ 
+ # 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=-ldl
+ 
+ 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)
++.IF "$(USE_SYSTEM_STL)"=="YES"
++LIBSTLPORT=$(DYNAMIC) -lstdc++
++LIBSTLPORTST=$(STATIC) $(DYNAMIC)
++.ELSE
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
++.ENDIF
++
++#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+ 
+ # name of library manager
+ LIBMGR=ar
+ LIBFLAGS=-r
+-LIBEXT=			.a
+ 
+ # tool for generating import libraries
+ IMPLIB=
diff --git a/editors/openoffice.org-2-devel/files/patch-transex3+source+xmlparse.cxx b/editors/openoffice.org-2-devel/files/patch-transex3+source+xmlparse.cxx
new file mode 100644
index 00000000000..1e88b4c4dda
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-transex3+source+xmlparse.cxx
@@ -0,0 +1,29 @@
+#iZ XXXX
+
+FreeBSD doesn't have alloca.h, and
+builtin alloca is defined at stdlib.h.
+
+Index: transex3/source/xmlparse.cxx
+===================================================================
+RCS file: /cvs/l10n/transex3/source/xmlparse.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 xmlparse.cxx
+--- transex3/source/xmlparse.cxx	30 Aug 2004 17:31:58 -0000	1.2
++++ transex3/source/xmlparse.cxx	3 Oct 2004 08:41:45 -0000
+@@ -64,11 +64,12 @@
+ 
+ 
+ #include <stdio.h>
+-#ifdef WIN32
+-#include <malloc.h>
++
++#if defined(SOLARIS) || defined(IRIX)
++  #include <alloca.h>
+ #else
+-#ifndef MACOSX
+-#include <alloca.h>
++#if !(defined(MACOSX) || defined(FREEBSD))
++  #include <malloc.h>
+ #endif
+ #endif
+ 
diff --git a/editors/openoffice.org-2-devel/files/zipmoz.sh b/editors/openoffice.org-2-devel/files/zipmoz.sh
deleted file mode 100644
index 43a4591f343..00000000000
--- a/editors/openoffice.org-2-devel/files/zipmoz.sh
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/sh -f
-
-RUNTIME_FILES=" components/libabsyncsvc.so components/libaddrbook.so \
-		components/libmork.so components/libmozldap.so \
-		components/libnecko.so components/libprofile.so \
-		components/librdf.so components/libstrres.so \
-		components/libunicharutil.so components/libuconv.so \
-		components/libucvcn.so components/libucvibm.so \
-		components/libucvja.so components/libucvko.so \
-		components/libucvlatin.so components/libucvtw.so \
-		components/libucvtw2.so components/liburiloader.so \
-		components/libvcard.so components/libxpconnect.so \
-		components/libpref.so components/libchrome.so libmozjs.so \
-		libmsgbaseutil.so libldap50.so libnspr4.so libplc4.so \
-		libplds4.so libxpcom.so libmozz.so component.reg \
-		components/necko_dns.xpt components/xpcom_xpti.xpt \
-		components/xpcom_threads.xpt components/xpcom_io.xpt \
-		components/xpcom_ds.xpt components/xpcom_components.xpt \
-		components/xpcom_base.xpt components/xpti.dat \
-		defaults/pref/all.js defaults/pref/config.js \
-		defaults/pref/editor.js defaults/pref/initpref.js \
-		defaults/pref/inspector.js defaults/pref/mailnews.js \
-		defaults/pref/security-prefs.js defaults/pref/unix.js \
-		defaults/pref/xpinstall.js"
-
-LIB_FILES="	lib/libembed_base_s.a lib/libmozreg_s.a \
-		lib/libnspr4.so lib/libxpcom.so lib/libprldap50.so"
-
-INC_FILES="include/"
-INC_FILES2="public/"
-
-if [ $# -lt 2 -o $# -gt 3 ] ; then
-	echo 
-	echo usage: $0 mozilla_dist target [target_dir]
-	echo
-	echo where:
-	echo
-	echo "mozilla_dist points to the mozilla distribution"
-	echo "target concatenates  OS, compiler and CPU (e.g. FREEBSDGCCI etc)"
-	echo "target_dir is the directory to place the zips"
-	exit 1
-fi
-
-MOZ_DIST=$1
-TARGET=$2
-if [ "w$3" != "w" ]; then
-	TARGET_DIR=$3
-else
-	if [ "w$TARGET_DIR" == "w" ]; then
-		TARGET_DIR=
-	fi
-fi
-
-ZIP_TARGET=$TARGET_DIR
-if [ -z "$ZIP_TARGET" ] ; then
-	ZIP_TARGET=../
-fi
-
-# just to remember the current working directory
-STARTING_DIR=`pwd`
-
-echo
-echo --- creating zips for $TARGET, using mozilla distribution in $MOZ_DIST
-
-# Create the directories
-[ ! -d $TARGET_DIR/$TARGET/runtime ] && mkdir -p $TARGET_DIR/$TARGET/runtime
-[ ! -d $TARGET_DIR/$TARGET/runtime/components ] && mkdir -p $TARGET_DIR/$TARGET/runtime/components
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults
-[ ! -d $TARGET_DIR/$TARGET/runtime/defaults/pref ] && mkdir -p $TARGET_DIR/$TARGET/runtime/defaults/pref
-[ ! -d $TARGET_DIR/$TARGET/lib ] && mkdir -p $TARGET_DIR/$TARGET/lib
-[ ! -d $TARGET_DIR/$TARGET/inc ] && mkdir -p $TARGET_DIR/$TARGET/inc
-[ ! -d $TARGET_DIR/$TARGET/inc/nspr ] && mkdir -p $TARGET_DIR/$TARGET/inc/nspr
-[ ! -d $TARGET_DIR/$TARGET/inc/obsolete ] && mkdir -p $TARGET_DIR/$TARGET/inc/obsolete
-
-# Copy the files
-echo
-echo --- copying files
-echo
-
-for i in $RUNTIME_FILES; do
-	if [ ! -f $MOZ_DIST/bin/$i ]; then
-		echo $MOZ_DIST/bin/$i does not exist, check your distribution
-	else
-		if [ `echo $i | grep component` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/components/
-		elif [ `echo $i | grep defaults` ]; then
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/defaults/pref/
-		else
-			cp $MOZ_DIST/bin/$i $TARGET_DIR/$TARGET/runtime/
-		fi
-	fi
-done
-
-for i in $LIB_FILES; do
-	if [ ! -f $MOZ_DIST/$i ]; then
-		echo $MOZ_DIST/$i does not exist, check your distribution
-	else
-		cp -R -L $MOZ_DIST/$i $TARGET_DIR/$TARGET/lib/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES`; do
-	if [ ! -d $i ]; then 
-		cp -R -L $MOZ_DIST/include/$i $TARGET_DIR/$TARGET/inc/
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES2`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/public/$i $TARGET_DIR/$TARGET/inc
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/$i $TARGET_DIR/$TARGET/inc/nspr
-	fi
-done
-
-for i in `ls -1 $MOZ_DIST/$INC_FILES/nspr/obsolete`; do
-        if [ ! -d $i ]; then
-		cp -R -L $MOZ_DIST/include/nspr/obsolete/$i $TARGET_DIR/$TARGET/inc/obsolete
-	fi
-done
-
-# delete old zips
-
-[ -f $TARGET_DIR/$TARGET/runtime.zip ] && rm -f $TARGET_DIR/$TARGET/runtime.zip
-[ -f $TARGET_DIR/$TARGET/lib.zip ] && rm -f $TARGET_DIR/$TARGET/lib.zip
-[ -f $TARGET_DIR/$TARGET/inc.zip ] && rm -f $TARGET_DIR/$TARGET/inc.zip
-
-# zip the runtime files
-
-echo
-echo --- creating ${TARGET}runtime.zip
-echo
-
-cd $TARGET_DIR/$TARGET/runtime
-find . -type f | zip $ZIP_TARGET/${TARGET}runtime.zip -@
-
-# zip the lib files
-echo 
-echo --- creating ${TARGET}lib.zip
-echo 
-
-cd $TARGET_DIR/$TARGET/lib
-find . -type f | zip $ZIP_TARGET/${TARGET}lib.zip -@
-
-# zip the inc files
-echo
-echo --- creating ${TARGET}inc.zip
-echo
-
-cd $TARGET_DIR/$TARGET/inc
-find . -type f | zip $ZIP_TARGET/${TARGET}inc.zip -@
-
-# remove dirs
-cd $STARTING_DIR
-rm -rf $TARGET_DIR/$TARGET
-
-echo
-echo --- done
-echo
-