Create openoffice.org-3 port. Repocopied from

openoffice.org-2 port. Currently this is the
beta version. Second beta will be July 1st 2008, and
the final release will be September 2nd, 2008.
http://wiki.services.openoffice.org/wiki/OOoRelease30

PR:             123105

27 files changed, 505 insertions, 1680 deletions

diff --git a/editors/Makefile b/editors/Makefile
index 685f9a4d2787..bf189e503754 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -118,6 +118,7 @@
     SUBDIR += openoffice.org-2
     SUBDIR += openoffice.org-2-RC
     SUBDIR += openoffice.org-2-devel
+    SUBDIR += openoffice.org-3
     SUBDIR += openoffice.org-3-RC
     SUBDIR += openoffice.org-3-devel
     SUBDIR += pdfedit
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 547bc9ee306b..365a6ed67b82 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -1,3 +1,4 @@
+
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
@@ -7,7 +8,6 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
-PORTREVISION?=	5
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -24,7 +24,7 @@ DISTFILES+=	gpc231.tar.Z:gpc
 EXTRACT_ONLY=	${OOOSRC}
 
 MAINTAINER=	openoffice@FreeBSD.org
-COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
+COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch)
 
 .if defined(WITH_CWS)
 PORTNAME:=	openoffice.org-${OOOVERSION}-${WITH_CWS}
@@ -32,7 +32,7 @@ DISTFILES+=	${CWSARCHIVE}:cws
 .endif
 CWSARCHIVE=	${WITH_CWS}.tar.gz
 
-OOOVERSION=	2.4.0
+OOOVERSION=	3.0.0.b
 NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
 MOZILLA_VERSION=	1.7.5
@@ -46,7 +46,7 @@ USE_GNOME+=	libidl
 USE_KDELIBS_VER=	3
 .endif
 USE_XORG=	x11 ice xaw xau xext xrender xrandr \
-		xi xt xcursor xdamage xcomposite xfixes 
+		xi xt xcursor xdamage xcomposite xfixes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_BZIP2=	yes
@@ -77,21 +77,22 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		12
-OOOTAG?=		OOH680_m${MILESTONE}
+MILESTONE?=		2
+OOOTAG?=		BEA300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
+OOODIR=			openoffice.org3
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
 EXECBASE?=		openoffice.org-${OOOVERSION}
 .if defined(WITH_CWS)
 INSTALLATION_BASEDIR=	openoffice.org-${OOOVERSION}-${WITH_CWS}
 EXECBASE=		openoffice.org-${OOOVERSION}-${WITH_CWS}
 .endif
-DIST_SUBDIR=		openoffice.org2
+DIST_SUBDIR=		openoffice.org3
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86-64
+PACKAGE_BASENAME=	OOo_Dev_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86-64
 .else
-PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_Dev_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 .endif
 
 LOCALIZED_LANG?=	en-US
@@ -121,7 +122,8 @@ OOOCXX=		${CXX}
 .endif
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
 		CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		PATH=${WRKSRC}/solenv/bin:$$PATH
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
@@ -129,7 +131,9 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bash:${PORTSDIR}/shells/bash \
-		imake:${PORTSDIR}/devel/imake
+		imake:${PORTSDIR}/devel/imake \
+		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469#
+
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
@@ -141,7 +145,8 @@ WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
-NUMOFPROCESSES?=	1
+MAXPROCESSES?=	1
+MAXMODULES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
@@ -194,15 +199,14 @@ post-extract:
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
+pre-configure:
+#Workaround for gperf. #i85469#
+	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
-# PR:84786 #i53289#
-.if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
-.else
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake"
-.endif
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}"
+
 .if ${LOCALIZED_LANG} == "alllangs"
 	@${MAKE} languagepack
 .endif
@@ -222,7 +226,7 @@ do-install:
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/$$i ;\
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
-	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
+	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 .else
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
@@ -232,14 +236,15 @@ do-install:
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
-	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
+	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 .endif
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
+			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
+			-e 's#%%OOODIR%%#${OOODIR}#g' \
 			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
@@ -259,16 +264,16 @@ post-install:
 	@cd ${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \
 		${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \
-			${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
+			${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop
 	@for app in base calc draw impress math printeradmin writer; do \
 		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
 			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/$${app}.desktop ; \
+		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
 	done
-	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
+	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
 	@${RM} -f ${DESKTOPDIR}/${EXECBASE}
 	@${MKDIR} ${DESKTOPDIR}
-	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
+	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
 			${DESKTOPDIR}/${EXECBASE}
 	@${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
@@ -296,7 +301,7 @@ post-install:
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
+			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
 			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index c355613080ec..27fe53121f25 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,12 +1,12 @@
-MD5 (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 40b8a3a214f780d4bc8e823f3c580660
-SHA256 (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 66752fca6177059f2cf2f533db2ef694aae70e7cc0a508c51e2518870e918d7b
-SIZE (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 286332380
-MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
-SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-SIZE (openoffice.org2/unowinreg.dll) = 6144
-MD5 (openoffice.org2/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-SHA256 (openoffice.org2/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
-SIZE (openoffice.org2/gpc231.tar.Z) = 27917
-MD5 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
-SHA256 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
-SIZE (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 38721366
+MD5 (openoffice.org3/OOo_BEA300_m2_source.tar.bz2) = a8cf80fb2f160c659eafe85b03ab7538
+SHA256 (openoffice.org3/OOo_BEA300_m2_source.tar.bz2) = d8aca58e0767d5ffc39d443c8ff47f204f27592ef804290bf62e3b4879b34a74
+SIZE (openoffice.org3/OOo_BEA300_m2_source.tar.bz2) = 298564280
+MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
+SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
+SIZE (openoffice.org3/unowinreg.dll) = 6144
+MD5 (openoffice.org3/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+SHA256 (openoffice.org3/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
+SIZE (openoffice.org3/gpc231.tar.Z) = 27917
+MD5 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
+SHA256 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
+SIZE (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice-3/files/Makefile.others b/editors/openoffice-3/files/Makefile.others
index 444a91beac69..f5848df41e31 100644
--- a/editors/openoffice-3/files/Makefile.others
+++ b/editors/openoffice-3/files/Makefile.others
@@ -57,9 +57,13 @@ languagepack:
 	@${RM} -fr ${WRKDIR}/langpack_tmp
 	@${MKDIR} ${WRKDIR}/langpack_tmp
 .if defined (LOCALIZED_LANG)
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ls openoffice*.t?z > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK
 	@cd ${WRKDIR}/langpack_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
-	@cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \
+	for i in `${CAT} ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK`; do \
+                ${ECHO_CMD} "extracting $$i" ; \
+                cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \
+        done
+	@cd ${WRKDIR}/langpack_tmp/opt/ ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
 		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_langpack_${LOCALIZED_LANG}.tar.bz2 ${INSTALLATION_BASEDIR}
diff --git a/editors/openoffice-3/files/generate.pl b/editors/openoffice-3/files/generate.pl
index 5846e667c472..bb980eb5c901 100644
--- a/editors/openoffice-3/files/generate.pl
+++ b/editors/openoffice-3/files/generate.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/generate.pl,v 1.10 2008-04-04 10:05:22 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/generate.pl,v 1.11 2008-05-27 07:37:30 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
@@ -26,5 +26,5 @@ if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1];
 }
 close FILE;
 print "md5 OOo* > MD5SUMS.log\n";
-print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/FreeBSD/`make -V PORTVERSION`/`uname -r`/`uname -m`\n";
-print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/FreeBSD/`make -V PORTVERSION`/`uname -r`/`uname -m`\n";
+print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
+print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
diff --git a/editors/openoffice-3/files/patch-i80129 b/editors/openoffice-3/files/patch-i80129
index 90fd4ceb9dc5..24cc48f48ccd 100644
--- a/editors/openoffice-3/files/patch-i80129
+++ b/editors/openoffice-3/files/patch-i80129
@@ -1,18 +1,18 @@
 Merely a workaround
 
-Index: scp2/source/ure/ure.scp
+Index: scp2/source/ooo/ure.scp
 ===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.14
-diff -u -r1.14 ure.scp
---- scp2/source/ure/ure.scp	18 Jul 2007 08:07:32 -0000	1.14
-+++ scp2/source/ure/ure.scp	27 Jul 2007 22:07:16 -0000
-@@ -610,6 +610,8 @@
+RCS file: /cvs/installation/scp2/source/ooo/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ooo/ure.scp	18 Mar 2008 13:35:26 -0000	1.2
++++ scp2/source/ooo/ure.scp	21 Mar 2008 07:30:43 -0000
+@@ -684,6 +684,8 @@
  #endif
  #elif defined MACOSX
-     Name = SCP2_URE_DL_NORMAL(xml2.2);
+     Name = SCP2_URE_DL_NORMAL("xml2.2");
 +#elif defined FREEBSD
 +    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
  #else
-     Name = SCP2_URE_DL_VER(xml2, 2);
+     Name = SCP2_URE_DL_VER("xml2", "2");
  #endif
diff --git a/editors/openoffice-3/files/patch-i85027 b/editors/openoffice-3/files/patch-i85027
index 7afbd7d17349..e6fe720647bc 100644
--- a/editors/openoffice-3/files/patch-i85027
+++ b/editors/openoffice-3/files/patch-i85027
@@ -1,30 +1,3 @@
-Index: scp2/source/ooo/file_library_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
-retrieving revision 1.269
-diff -u -r1.269 file_library_ooo.scp
---- scp2/source/ooo/file_library_ooo.scp	12 Dec 2007 13:29:11 -0000	1.269
-+++ scp2/source/ooo/file_library_ooo.scp	6 Jan 2008 04:19:50 -0000
-@@ -979,7 +979,7 @@
- 
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwm , fwm)
- 
--#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
-+#if ! (defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
- #if defined( _gcc3 )
- 
- File gid_File_Lib_Gcc
-@@ -993,7 +993,7 @@
- 
- #endif
- 
--#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
-+#if ! (defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
- #if defined( _gcc3 )
- 
- File gid_File_Lib_Stdc
-
-
 -----------------
 Strange behaviour of stock gcc of FreeBSD 7.
 
@@ -67,3 +40,24 @@ diff -u -r1.5 makefile.mk
  .ENDIF 
  .ENDIF 
  
+--- scp2/source/ooo/ure.scp	18 Mar 2008 13:35:26 -0000	1.2
++++ scp2/source/ooo/ure.scp	21 Mar 2008 09:26:48 -0000
+@@ -728,7 +730,7 @@
+ End
+ #endif
+ 
+-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
++#if defined _gcc3 && !(defined NETBSD \
+ 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+ File gid_File_Dl_GccS
+     TXT_FILE_BODY;
+@@ -739,7 +741,7 @@
+ End
+ #endif
+ 
+-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
++#if defined _gcc3 && !(defined NETBSD \
+ 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+ File gid_File_Dl_Stdcpp
+     Dir = SCP2_URE_DL_DIR;
+
diff --git a/editors/openoffice-3/files/patch-i85126 b/editors/openoffice-3/files/patch-i85126
index f70616a998e1..cc013d213630 100644
--- a/editors/openoffice-3/files/patch-i85126
+++ b/editors/openoffice-3/files/patch-i85126
@@ -1,7 +1,12 @@
-Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
+Update to newest cpp-uno bridge from Linux x86-64.
 
+Index: bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx,v
+retrieving revision 1.3
+diff -u -r1.3 abi.cxx
 --- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx	16 Sep 2006 15:46:23 -0000	1.3
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx	8 Jan 2008 16:57:00 -0000
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx	12 Apr 2008 00:10:44 -0000
 @@ -358,6 +358,8 @@
              case X86_64_SSEDF_CLASS:
                  *pStructAlign++ = *reinterpret_cast<sal_uInt64 *>( *pSSE++ );
@@ -11,8 +16,13 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
          }
  }
  
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx	16 Sep 2006 15:46:37 -0000	1.3
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx	8 Jan 2008 16:57:00 -0000
+Index: bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 cpp2uno.cxx
+--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx	27 Feb 2008 09:49:58 -0000	1.4
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx	12 Apr 2008 00:10:44 -0000
 @@ -82,8 +82,8 @@
  	void ** gpreg, void ** fpreg, void ** ovrflw,
  	sal_uInt64 * pRegisterReturn /* space for register return */ )
@@ -24,17 +34,21 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
         
  	// return
  	typelib_TypeDescription * pReturnTypeDescr = 0;
-@@ -492,7 +492,7 @@
- unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
- 	void ** slots, unsigned char * code,
- 	typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset,
--	sal_Int32 functionCount, sal_Int32 nVtableOffset )
-+	sal_Int32 /* functionCount */, sal_Int32 nVtableOffset )
+@@ -500,7 +500,6 @@
  {
+ 	(*slots) -= functionCount;
+ 	Slot * s = *slots;
+-
  	for ( sal_Int32 nPos = 0; nPos < type->nMembers; ++nPos )
  	{
+ 		typelib_TypeDescription * pTD = 0;
+Index: bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 except.cxx
 --- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx	5 Jul 2007 09:01:44 -0000	1.4
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx	8 Jan 2008 16:57:00 -0000
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx	12 Apr 2008 00:10:44 -0000
 @@ -180,8 +180,8 @@
          else
          {
@@ -55,8 +69,13 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
              }
          }
      }
+Index: bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 uno2cpp.cxx
 --- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	5 Jul 2007 09:02:53 -0000	1.4
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	8 Jan 2008 16:57:00 -0000
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	12 Apr 2008 00:10:44 -0000
 @@ -73,13 +73,13 @@
      // Let's figure out what is really going on here
      {
diff --git a/editors/openoffice-3/files/patch-i85127 b/editors/openoffice-3/files/patch-i85127
index 3f50bdcb9668..60d99db2fc18 100644
--- a/editors/openoffice-3/files/patch-i85127
+++ b/editors/openoffice-3/files/patch-i85127
@@ -1,8 +1,13 @@
 - Add support for FreeBSD 8.x.
 - Add patches for setup.py and Lib/posixfile.py.
 
---- python/Python-2.3.4.patch	26 Oct 2007 11:27:52 -0000	1.20
-+++ python/Python-2.3.4.patch	8 Jan 2008 19:37:10 -0000
+Index: python/Python-2.3.4.patch
+===================================================================
+RCS file: /cvs/external/python/Python-2.3.4.patch,v
+retrieving revision 1.21
+diff -u -r1.21 Python-2.3.4.patch
+--- python/Python-2.3.4.patch	4 Feb 2008 12:57:01 -0000	1.21
++++ python/Python-2.3.4.patch	9 Feb 2008 05:09:14 -0000
 @@ -131,6 +131,1625 @@
        name = 'posix'
        linesep = '\n'
@@ -1627,752 +1632,9 @@
 +                    l_start, l_len, os.getpid(), l_type, l_whence)
 +          elif sys.platform in ['aix3', 'aix4']:
  *** misc/Python-2.3.4/Mac/OSX/Makefile	Tue Nov  4 23:45:16 2003
- --- misc/build/Python-2.3.4/Mac/OSX/Makefile	Wed Oct 17 14:01:01 2007
+ --- misc/build/Python-2.3.4/Mac/OSX/Makefile	Tue Jan 15 12:11:51 2008
  ***************
-@@ -14688,742 +16307,6 @@
-   	handler = signal(sig, SIG_IGN);
-   	signal(sig, handler);
-   	return handler;
--*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Aug  9 06:26:23 2005
----- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Aug  9 06:20:25 2005
--***************
--*** 0 ****
----- 1,355 ----
--+ # Generated by h2py from /usr/include/netinet/in.h
--+ IPPROTO_IP = 0
--+ IPPROTO_HOPOPTS = 0
--+ IPPROTO_ICMP = 1
--+ IPPROTO_IGMP = 2
--+ IPPROTO_GGP = 3
--+ IPPROTO_IPV4 = 4
--+ IPPROTO_IPIP = IPPROTO_IPV4
--+ IPPROTO_TCP = 6
--+ IPPROTO_ST = 7
--+ IPPROTO_EGP = 8
--+ IPPROTO_PIGP = 9
--+ IPPROTO_RCCMON = 10
--+ IPPROTO_NVPII = 11
--+ IPPROTO_PUP = 12
--+ IPPROTO_ARGUS = 13
--+ IPPROTO_EMCON = 14
--+ IPPROTO_XNET = 15
--+ IPPROTO_CHAOS = 16
--+ IPPROTO_UDP = 17
--+ IPPROTO_MUX = 18
--+ IPPROTO_MEAS = 19
--+ IPPROTO_HMP = 20
--+ IPPROTO_PRM = 21
--+ IPPROTO_IDP = 22
--+ IPPROTO_TRUNK1 = 23
--+ IPPROTO_TRUNK2 = 24
--+ IPPROTO_LEAF1 = 25
--+ IPPROTO_LEAF2 = 26
--+ IPPROTO_RDP = 27
--+ IPPROTO_IRTP = 28
--+ IPPROTO_TP = 29
--+ IPPROTO_BLT = 30
--+ IPPROTO_NSP = 31
--+ IPPROTO_INP = 32
--+ IPPROTO_SEP = 33
--+ IPPROTO_3PC = 34
--+ IPPROTO_IDPR = 35
--+ IPPROTO_XTP = 36
--+ IPPROTO_DDP = 37
--+ IPPROTO_CMTP = 38
--+ IPPROTO_TPXX = 39
--+ IPPROTO_IL = 40
--+ IPPROTO_IPV6 = 41
--+ IPPROTO_SDRP = 42
--+ IPPROTO_ROUTING = 43
--+ IPPROTO_FRAGMENT = 44
--+ IPPROTO_IDRP = 45
--+ IPPROTO_RSVP = 46
--+ IPPROTO_GRE = 47
--+ IPPROTO_MHRP = 48
--+ IPPROTO_BHA = 49
--+ IPPROTO_ESP = 50
--+ IPPROTO_AH = 51
--+ IPPROTO_INLSP = 52
--+ IPPROTO_SWIPE = 53
--+ IPPROTO_NHRP = 54
--+ IPPROTO_ICMPV6 = 58
--+ IPPROTO_NONE = 59
--+ IPPROTO_DSTOPTS = 60
--+ IPPROTO_AHIP = 61
--+ IPPROTO_CFTP = 62
--+ IPPROTO_HELLO = 63
--+ IPPROTO_SATEXPAK = 64
--+ IPPROTO_KRYPTOLAN = 65
--+ IPPROTO_RVD = 66
--+ IPPROTO_IPPC = 67
--+ IPPROTO_ADFS = 68
--+ IPPROTO_SATMON = 69
--+ IPPROTO_VISA = 70
--+ IPPROTO_IPCV = 71
--+ IPPROTO_CPNX = 72
--+ IPPROTO_CPHB = 73
--+ IPPROTO_WSN = 74
--+ IPPROTO_PVP = 75
--+ IPPROTO_BRSATMON = 76
--+ IPPROTO_ND = 77
--+ IPPROTO_WBMON = 78
--+ IPPROTO_WBEXPAK = 79
--+ IPPROTO_EON = 80
--+ IPPROTO_VMTP = 81
--+ IPPROTO_SVMTP = 82
--+ IPPROTO_VINES = 83
--+ IPPROTO_TTP = 84
--+ IPPROTO_IGP = 85
--+ IPPROTO_DGP = 86
--+ IPPROTO_TCF = 87
--+ IPPROTO_IGRP = 88
--+ IPPROTO_OSPFIGP = 89
--+ IPPROTO_SRPC = 90
--+ IPPROTO_LARP = 91
--+ IPPROTO_MTP = 92
--+ IPPROTO_AX25 = 93
--+ IPPROTO_IPEIP = 94
--+ IPPROTO_MICP = 95
--+ IPPROTO_SCCSP = 96
--+ IPPROTO_ETHERIP = 97
--+ IPPROTO_ENCAP = 98
--+ IPPROTO_APES = 99
--+ IPPROTO_GMTP = 100
--+ IPPROTO_IPCOMP = 108
--+ IPPROTO_PIM = 103
--+ IPPROTO_PGM = 113
--+ IPPROTO_DIVERT = 254
--+ IPPROTO_RAW = 255
--+ IPPROTO_MAX = 256
--+ IPPROTO_DONE = 257
--+ IPPORT_RESERVED = 1024
--+ IPPORT_USERRESERVED = 5000
--+ IPPORT_HIFIRSTAUTO = 49152
--+ IPPORT_HILASTAUTO = 65535
--+ IPPORT_RESERVEDSTART = 600
--+ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
--+ 
--+ IN_CLASSA_NET = 0xff000000
--+ IN_CLASSA_NSHIFT = 24
--+ IN_CLASSA_HOST = 0x00ffffff
--+ IN_CLASSA_MAX = 128
--+ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
--+ 
--+ IN_CLASSB_NET = 0xffff0000
--+ IN_CLASSB_NSHIFT = 16
--+ IN_CLASSB_HOST = 0x0000ffff
--+ IN_CLASSB_MAX = 65536
--+ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
--+ 
--+ IN_CLASSC_NET = 0xffffff00
--+ IN_CLASSC_NSHIFT = 8
--+ IN_CLASSC_HOST = 0x000000ff
--+ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
--+ 
--+ IN_CLASSD_NET = 0xf0000000
--+ IN_CLASSD_NSHIFT = 28
--+ IN_CLASSD_HOST = 0x0fffffff
--+ def IN_MULTICAST(i): return IN_CLASSD(i)
--+ 
--+ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
--+ 
--+ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
--+ 
--+ INADDR_NONE = 0xffffffff
--+ IN_LOOPBACKNET = 127
--+ INET_ADDRSTRLEN = 16
--+ IP_OPTIONS = 1
--+ IP_HDRINCL = 2
--+ IP_TOS = 3
--+ IP_TTL = 4
--+ IP_RECVOPTS = 5
--+ IP_RECVRETOPTS = 6
--+ IP_RECVDSTADDR = 7
--+ IP_RETOPTS = 8
--+ IP_MULTICAST_IF = 9
--+ IP_MULTICAST_TTL = 10
--+ IP_MULTICAST_LOOP = 11
--+ IP_ADD_MEMBERSHIP = 12
--+ IP_DROP_MEMBERSHIP = 13
--+ IP_MULTICAST_VIF = 14
--+ IP_RSVP_ON = 15
--+ IP_RSVP_OFF = 16
--+ IP_RSVP_VIF_ON = 17
--+ IP_RSVP_VIF_OFF = 18
--+ IP_PORTRANGE = 19
--+ IP_RECVIF = 20
--+ IP_IPSEC_POLICY = 21
--+ IP_FAITH = 22
--+ IP_FW_ADD = 50
--+ IP_FW_DEL = 51
--+ IP_FW_FLUSH = 52
--+ IP_FW_ZERO = 53
--+ IP_FW_GET = 54
--+ IP_FW_RESETLOG = 55
--+ IP_DUMMYNET_CONFIGURE = 60
--+ IP_DUMMYNET_DEL = 61
--+ IP_DUMMYNET_FLUSH = 62
--+ IP_DUMMYNET_GET = 64
--+ IP_DEFAULT_MULTICAST_TTL = 1
--+ IP_DEFAULT_MULTICAST_LOOP = 1
--+ IP_MAX_MEMBERSHIPS = 20
--+ IP_PORTRANGE_DEFAULT = 0
--+ IP_PORTRANGE_HIGH = 1
--+ IP_PORTRANGE_LOW = 2
--+ IPPROTO_MAXID = (IPPROTO_AH + 1)
--+ IPCTL_FORWARDING = 1
--+ IPCTL_SENDREDIRECTS = 2
--+ IPCTL_DEFTTL = 3
--+ IPCTL_DEFMTU = 4
--+ IPCTL_RTEXPIRE = 5
--+ IPCTL_RTMINEXPIRE = 6
--+ IPCTL_RTMAXCACHE = 7
--+ IPCTL_SOURCEROUTE = 8
--+ IPCTL_DIRECTEDBROADCAST = 9
--+ IPCTL_INTRQMAXLEN = 10
--+ IPCTL_INTRQDROPS = 11
--+ IPCTL_STATS = 12
--+ IPCTL_ACCEPTSOURCEROUTE = 13
--+ IPCTL_FASTFORWARDING = 14
--+ IPCTL_KEEPFAITH = 15
--+ IPCTL_GIF_TTL = 16
--+ IPCTL_MAXID = 17
--+ 
--+ # Included from netinet6/in6.h
--+ 
--+ # Included from sys/queue.h
--+ def SLIST_HEAD_INITIALIZER(head): return \
--+ 
--+ def SLIST_ENTRY(type): return \
--+ 
--+ def STAILQ_HEAD_INITIALIZER(head): return \
--+ 
--+ def STAILQ_ENTRY(type): return \
--+ 
--+ def LIST_HEAD_INITIALIZER(head): return \
--+ 
--+ def LIST_ENTRY(type): return \
--+ 
--+ def TAILQ_HEAD_INITIALIZER(head): return \
--+ 
--+ def TAILQ_ENTRY(type): return \
--+ 
--+ def CIRCLEQ_ENTRY(type): return \
--+ 
--+ __KAME_VERSION = "20000701/FreeBSD-current"
--+ IPV6PORT_RESERVED = 1024
--+ IPV6PORT_ANONMIN = 49152
--+ IPV6PORT_ANONMAX = 65535
--+ IPV6PORT_RESERVEDMIN = 600
--+ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
--+ INET6_ADDRSTRLEN = 46
--+ IPV6_ADDR_INT32_ONE = 1
--+ IPV6_ADDR_INT32_TWO = 2
--+ IPV6_ADDR_INT32_MNL = 0xff010000
--+ IPV6_ADDR_INT32_MLL = 0xff020000
--+ IPV6_ADDR_INT32_SMP = 0x0000ffff
--+ IPV6_ADDR_INT16_ULL = 0xfe80
--+ IPV6_ADDR_INT16_USL = 0xfec0
--+ IPV6_ADDR_INT16_MLL = 0xff02
--+ IPV6_ADDR_INT32_ONE = 0x01000000
--+ IPV6_ADDR_INT32_TWO = 0x02000000
--+ IPV6_ADDR_INT32_MNL = 0x000001ff
--+ IPV6_ADDR_INT32_MLL = 0x000002ff
--+ IPV6_ADDR_INT32_SMP = 0xffff0000
--+ IPV6_ADDR_INT16_ULL = 0x80fe
--+ IPV6_ADDR_INT16_USL = 0xc0fe
--+ IPV6_ADDR_INT16_MLL = 0x02ff
--+ def IN6_IS_ADDR_UNSPECIFIED(a): return \
--+ 
--+ def IN6_IS_ADDR_LOOPBACK(a): return \
--+ 
--+ def IN6_IS_ADDR_V4COMPAT(a): return \
--+ 
--+ def IN6_IS_ADDR_V4MAPPED(a): return \
--+ 
--+ IPV6_ADDR_SCOPE_NODELOCAL = 0x01
--+ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
--+ IPV6_ADDR_SCOPE_SITELOCAL = 0x05
--+ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
--+ IPV6_ADDR_SCOPE_GLOBAL = 0x0e
--+ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01
--+ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
--+ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05
--+ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
--+ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e
--+ def IN6_IS_ADDR_LINKLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_SITELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_GLOBAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_GLOBAL(a): return \
--+ 
--+ def IN6_IS_SCOPE_LINKLOCAL(a): return \
--+ 
--+ IPV6_OPTIONS = 1
--+ IPV6_RECVOPTS = 5
--+ IPV6_RECVRETOPTS = 6
--+ IPV6_RECVDSTADDR = 7
--+ IPV6_RETOPTS = 8
--+ IPV6_SOCKOPT_RESERVED1 = 3
--+ IPV6_UNICAST_HOPS = 4
--+ IPV6_MULTICAST_IF = 9
--+ IPV6_MULTICAST_HOPS = 10
--+ IPV6_MULTICAST_LOOP = 11
--+ IPV6_JOIN_GROUP = 12
--+ IPV6_LEAVE_GROUP = 13
--+ IPV6_PORTRANGE = 14
--+ ICMP6_FILTER = 18
--+ IPV6_PKTINFO = 19
--+ IPV6_HOPLIMIT = 20
--+ IPV6_NEXTHOP = 21
--+ IPV6_HOPOPTS = 22
--+ IPV6_DSTOPTS = 23
--+ IPV6_RTHDR = 24
--+ IPV6_PKTOPTIONS = 25
--+ IPV6_CHECKSUM = 26
--+ IPV6_BINDV6ONLY = 27
--+ IPV6_IPSEC_POLICY = 28
--+ IPV6_FAITH = 29
--+ IPV6_FW_ADD = 30
--+ IPV6_FW_DEL = 31
--+ IPV6_FW_FLUSH = 32
--+ IPV6_FW_ZERO = 33
--+ IPV6_FW_GET = 34
--+ IPV6_RTHDR_LOOSE = 0
--+ IPV6_RTHDR_STRICT = 1
--+ IPV6_RTHDR_TYPE_0 = 0
--+ IPV6_DEFAULT_MULTICAST_HOPS = 1
--+ IPV6_DEFAULT_MULTICAST_LOOP = 1
--+ IPV6_PORTRANGE_DEFAULT = 0
--+ IPV6_PORTRANGE_HIGH = 1
--+ IPV6_PORTRANGE_LOW = 2
--+ IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
--+ IPV6CTL_FORWARDING = 1
--+ IPV6CTL_SENDREDIRECTS = 2
--+ IPV6CTL_DEFHLIM = 3
--+ IPV6CTL_DEFMTU = 4
--+ IPV6CTL_FORWSRCRT = 5
--+ IPV6CTL_STATS = 6
--+ IPV6CTL_MRTSTATS = 7
--+ IPV6CTL_MRTPROTO = 8
--+ IPV6CTL_MAXFRAGPACKETS = 9
--+ IPV6CTL_SOURCECHECK = 10
--+ IPV6CTL_SOURCECHECK_LOGINT = 11
--+ IPV6CTL_ACCEPT_RTADV = 12
--+ IPV6CTL_KEEPFAITH = 13
--+ IPV6CTL_LOG_INTERVAL = 14
--+ IPV6CTL_HDRNESTLIMIT = 15
--+ IPV6CTL_DAD_COUNT = 16
--+ IPV6CTL_AUTO_FLOWLABEL = 17
--+ IPV6CTL_DEFMCASTHLIM = 18
--+ IPV6CTL_GIF_HLIM = 19
--+ IPV6CTL_KAME_VERSION = 20
--+ IPV6CTL_USE_DEPRECATED = 21
--+ IPV6CTL_RR_PRUNE = 22
--+ IPV6CTL_MAPPED_ADDR = 23
--+ IPV6CTL_BINDV6ONLY = 24
--+ IPV6CTL_RTEXPIRE = 25
--+ IPV6CTL_RTMINEXPIRE = 26
--+ IPV6CTL_RTMAXCACHE = 27
--+ IPV6CTL_MAXID = 28
--*** misc/Python-2.3.4/Lib/plat-freebsd6/regen	Tue Aug  9 06:26:27 2005
----- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen	Tue Aug  9 06:19:02 2005
--***************
--*** 0 ****
----- 1,3 ----
--+ #! /bin/sh
--+ set -v
--+ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
--*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Aug  9 06:26:23 2005
----- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Aug  9 06:20:25 2005
--***************
--*** 0 ****
----- 1,355 ----
--+ # Generated by h2py from /usr/include/netinet/in.h
--+ IPPROTO_IP = 0
--+ IPPROTO_HOPOPTS = 0
--+ IPPROTO_ICMP = 1
--+ IPPROTO_IGMP = 2
--+ IPPROTO_GGP = 3
--+ IPPROTO_IPV4 = 4
--+ IPPROTO_IPIP = IPPROTO_IPV4
--+ IPPROTO_TCP = 6
--+ IPPROTO_ST = 7
--+ IPPROTO_EGP = 8
--+ IPPROTO_PIGP = 9
--+ IPPROTO_RCCMON = 10
--+ IPPROTO_NVPII = 11
--+ IPPROTO_PUP = 12
--+ IPPROTO_ARGUS = 13
--+ IPPROTO_EMCON = 14
--+ IPPROTO_XNET = 15
--+ IPPROTO_CHAOS = 16
--+ IPPROTO_UDP = 17
--+ IPPROTO_MUX = 18
--+ IPPROTO_MEAS = 19
--+ IPPROTO_HMP = 20
--+ IPPROTO_PRM = 21
--+ IPPROTO_IDP = 22
--+ IPPROTO_TRUNK1 = 23
--+ IPPROTO_TRUNK2 = 24
--+ IPPROTO_LEAF1 = 25
--+ IPPROTO_LEAF2 = 26
--+ IPPROTO_RDP = 27
--+ IPPROTO_IRTP = 28
--+ IPPROTO_TP = 29
--+ IPPROTO_BLT = 30
--+ IPPROTO_NSP = 31
--+ IPPROTO_INP = 32
--+ IPPROTO_SEP = 33
--+ IPPROTO_3PC = 34
--+ IPPROTO_IDPR = 35
--+ IPPROTO_XTP = 36
--+ IPPROTO_DDP = 37
--+ IPPROTO_CMTP = 38
--+ IPPROTO_TPXX = 39
--+ IPPROTO_IL = 40
--+ IPPROTO_IPV6 = 41
--+ IPPROTO_SDRP = 42
--+ IPPROTO_ROUTING = 43
--+ IPPROTO_FRAGMENT = 44
--+ IPPROTO_IDRP = 45
--+ IPPROTO_RSVP = 46
--+ IPPROTO_GRE = 47
--+ IPPROTO_MHRP = 48
--+ IPPROTO_BHA = 49
--+ IPPROTO_ESP = 50
--+ IPPROTO_AH = 51
--+ IPPROTO_INLSP = 52
--+ IPPROTO_SWIPE = 53
--+ IPPROTO_NHRP = 54
--+ IPPROTO_ICMPV6 = 58
--+ IPPROTO_NONE = 59
--+ IPPROTO_DSTOPTS = 60
--+ IPPROTO_AHIP = 61
--+ IPPROTO_CFTP = 62
--+ IPPROTO_HELLO = 63
--+ IPPROTO_SATEXPAK = 64
--+ IPPROTO_KRYPTOLAN = 65
--+ IPPROTO_RVD = 66
--+ IPPROTO_IPPC = 67
--+ IPPROTO_ADFS = 68
--+ IPPROTO_SATMON = 69
--+ IPPROTO_VISA = 70
--+ IPPROTO_IPCV = 71
--+ IPPROTO_CPNX = 72
--+ IPPROTO_CPHB = 73
--+ IPPROTO_WSN = 74
--+ IPPROTO_PVP = 75
--+ IPPROTO_BRSATMON = 76
--+ IPPROTO_ND = 77
--+ IPPROTO_WBMON = 78
--+ IPPROTO_WBEXPAK = 79
--+ IPPROTO_EON = 80
--+ IPPROTO_VMTP = 81
--+ IPPROTO_SVMTP = 82
--+ IPPROTO_VINES = 83
--+ IPPROTO_TTP = 84
--+ IPPROTO_IGP = 85
--+ IPPROTO_DGP = 86
--+ IPPROTO_TCF = 87
--+ IPPROTO_IGRP = 88
--+ IPPROTO_OSPFIGP = 89
--+ IPPROTO_SRPC = 90
--+ IPPROTO_LARP = 91
--+ IPPROTO_MTP = 92
--+ IPPROTO_AX25 = 93
--+ IPPROTO_IPEIP = 94
--+ IPPROTO_MICP = 95
--+ IPPROTO_SCCSP = 96
--+ IPPROTO_ETHERIP = 97
--+ IPPROTO_ENCAP = 98
--+ IPPROTO_APES = 99
--+ IPPROTO_GMTP = 100
--+ IPPROTO_IPCOMP = 108
--+ IPPROTO_PIM = 103
--+ IPPROTO_PGM = 113
--+ IPPROTO_DIVERT = 254
--+ IPPROTO_RAW = 255
--+ IPPROTO_MAX = 256
--+ IPPROTO_DONE = 257
--+ IPPORT_RESERVED = 1024
--+ IPPORT_USERRESERVED = 5000
--+ IPPORT_HIFIRSTAUTO = 49152
--+ IPPORT_HILASTAUTO = 65535
--+ IPPORT_RESERVEDSTART = 600
--+ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
--+ 
--+ IN_CLASSA_NET = 0xff000000
--+ IN_CLASSA_NSHIFT = 24
--+ IN_CLASSA_HOST = 0x00ffffff
--+ IN_CLASSA_MAX = 128
--+ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
--+ 
--+ IN_CLASSB_NET = 0xffff0000
--+ IN_CLASSB_NSHIFT = 16
--+ IN_CLASSB_HOST = 0x0000ffff
--+ IN_CLASSB_MAX = 65536
--+ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
--+ 
--+ IN_CLASSC_NET = 0xffffff00
--+ IN_CLASSC_NSHIFT = 8
--+ IN_CLASSC_HOST = 0x000000ff
--+ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
--+ 
--+ IN_CLASSD_NET = 0xf0000000
--+ IN_CLASSD_NSHIFT = 28
--+ IN_CLASSD_HOST = 0x0fffffff
--+ def IN_MULTICAST(i): return IN_CLASSD(i)
--+ 
--+ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
--+ 
--+ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
--+ 
--+ INADDR_NONE = 0xffffffff
--+ IN_LOOPBACKNET = 127
--+ INET_ADDRSTRLEN = 16
--+ IP_OPTIONS = 1
--+ IP_HDRINCL = 2
--+ IP_TOS = 3
--+ IP_TTL = 4
--+ IP_RECVOPTS = 5
--+ IP_RECVRETOPTS = 6
--+ IP_RECVDSTADDR = 7
--+ IP_RETOPTS = 8
--+ IP_MULTICAST_IF = 9
--+ IP_MULTICAST_TTL = 10
--+ IP_MULTICAST_LOOP = 11
--+ IP_ADD_MEMBERSHIP = 12
--+ IP_DROP_MEMBERSHIP = 13
--+ IP_MULTICAST_VIF = 14
--+ IP_RSVP_ON = 15
--+ IP_RSVP_OFF = 16
--+ IP_RSVP_VIF_ON = 17
--+ IP_RSVP_VIF_OFF = 18
--+ IP_PORTRANGE = 19
--+ IP_RECVIF = 20
--+ IP_IPSEC_POLICY = 21
--+ IP_FAITH = 22
--+ IP_FW_ADD = 50
--+ IP_FW_DEL = 51
--+ IP_FW_FLUSH = 52
--+ IP_FW_ZERO = 53
--+ IP_FW_GET = 54
--+ IP_FW_RESETLOG = 55
--+ IP_DUMMYNET_CONFIGURE = 60
--+ IP_DUMMYNET_DEL = 61
--+ IP_DUMMYNET_FLUSH = 62
--+ IP_DUMMYNET_GET = 64
--+ IP_DEFAULT_MULTICAST_TTL = 1
--+ IP_DEFAULT_MULTICAST_LOOP = 1
--+ IP_MAX_MEMBERSHIPS = 20
--+ IP_PORTRANGE_DEFAULT = 0
--+ IP_PORTRANGE_HIGH = 1
--+ IP_PORTRANGE_LOW = 2
--+ IPPROTO_MAXID = (IPPROTO_AH + 1)
--+ IPCTL_FORWARDING = 1
--+ IPCTL_SENDREDIRECTS = 2
--+ IPCTL_DEFTTL = 3
--+ IPCTL_DEFMTU = 4
--+ IPCTL_RTEXPIRE = 5
--+ IPCTL_RTMINEXPIRE = 6
--+ IPCTL_RTMAXCACHE = 7
--+ IPCTL_SOURCEROUTE = 8
--+ IPCTL_DIRECTEDBROADCAST = 9
--+ IPCTL_INTRQMAXLEN = 10
--+ IPCTL_INTRQDROPS = 11
--+ IPCTL_STATS = 12
--+ IPCTL_ACCEPTSOURCEROUTE = 13
--+ IPCTL_FASTFORWARDING = 14
--+ IPCTL_KEEPFAITH = 15
--+ IPCTL_GIF_TTL = 16
--+ IPCTL_MAXID = 17
--+ 
--+ # Included from netinet6/in6.h
--+ 
--+ # Included from sys/queue.h
--+ def SLIST_HEAD_INITIALIZER(head): return \
--+ 
--+ def SLIST_ENTRY(type): return \
--+ 
--+ def STAILQ_HEAD_INITIALIZER(head): return \
--+ 
--+ def STAILQ_ENTRY(type): return \
--+ 
--+ def LIST_HEAD_INITIALIZER(head): return \
--+ 
--+ def LIST_ENTRY(type): return \
--+ 
--+ def TAILQ_HEAD_INITIALIZER(head): return \
--+ 
--+ def TAILQ_ENTRY(type): return \
--+ 
--+ def CIRCLEQ_ENTRY(type): return \
--+ 
--+ __KAME_VERSION = "20000701/FreeBSD-current"
--+ IPV6PORT_RESERVED = 1024
--+ IPV6PORT_ANONMIN = 49152
--+ IPV6PORT_ANONMAX = 65535
--+ IPV6PORT_RESERVEDMIN = 600
--+ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
--+ INET6_ADDRSTRLEN = 46
--+ IPV6_ADDR_INT32_ONE = 1
--+ IPV6_ADDR_INT32_TWO = 2
--+ IPV6_ADDR_INT32_MNL = 0xff010000
--+ IPV6_ADDR_INT32_MLL = 0xff020000
--+ IPV6_ADDR_INT32_SMP = 0x0000ffff
--+ IPV6_ADDR_INT16_ULL = 0xfe80
--+ IPV6_ADDR_INT16_USL = 0xfec0
--+ IPV6_ADDR_INT16_MLL = 0xff02
--+ IPV6_ADDR_INT32_ONE = 0x01000000
--+ IPV6_ADDR_INT32_TWO = 0x02000000
--+ IPV6_ADDR_INT32_MNL = 0x000001ff
--+ IPV6_ADDR_INT32_MLL = 0x000002ff
--+ IPV6_ADDR_INT32_SMP = 0xffff0000
--+ IPV6_ADDR_INT16_ULL = 0x80fe
--+ IPV6_ADDR_INT16_USL = 0xc0fe
--+ IPV6_ADDR_INT16_MLL = 0x02ff
--+ def IN6_IS_ADDR_UNSPECIFIED(a): return \
--+ 
--+ def IN6_IS_ADDR_LOOPBACK(a): return \
--+ 
--+ def IN6_IS_ADDR_V4COMPAT(a): return \
--+ 
--+ def IN6_IS_ADDR_V4MAPPED(a): return \
--+ 
--+ IPV6_ADDR_SCOPE_NODELOCAL = 0x01
--+ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
--+ IPV6_ADDR_SCOPE_SITELOCAL = 0x05
--+ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
--+ IPV6_ADDR_SCOPE_GLOBAL = 0x0e
--+ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01
--+ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
--+ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05
--+ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
--+ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e
--+ def IN6_IS_ADDR_LINKLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_SITELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_GLOBAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_GLOBAL(a): return \
--+ 
--+ def IN6_IS_SCOPE_LINKLOCAL(a): return \
--+ 
--+ IPV6_OPTIONS = 1
--+ IPV6_RECVOPTS = 5
--+ IPV6_RECVRETOPTS = 6
--+ IPV6_RECVDSTADDR = 7
--+ IPV6_RETOPTS = 8
--+ IPV6_SOCKOPT_RESERVED1 = 3
--+ IPV6_UNICAST_HOPS = 4
--+ IPV6_MULTICAST_IF = 9
--+ IPV6_MULTICAST_HOPS = 10
--+ IPV6_MULTICAST_LOOP = 11
--+ IPV6_JOIN_GROUP = 12
--+ IPV6_LEAVE_GROUP = 13
--+ IPV6_PORTRANGE = 14
--+ ICMP6_FILTER = 18
--+ IPV6_PKTINFO = 19
--+ IPV6_HOPLIMIT = 20
--+ IPV6_NEXTHOP = 21
--+ IPV6_HOPOPTS = 22
--+ IPV6_DSTOPTS = 23
--+ IPV6_RTHDR = 24
--+ IPV6_PKTOPTIONS = 25
--+ IPV6_CHECKSUM = 26
--+ IPV6_BINDV6ONLY = 27
--+ IPV6_IPSEC_POLICY = 28
--+ IPV6_FAITH = 29
--+ IPV6_FW_ADD = 30
--+ IPV6_FW_DEL = 31
--+ IPV6_FW_FLUSH = 32
--+ IPV6_FW_ZERO = 33
--+ IPV6_FW_GET = 34
--+ IPV6_RTHDR_LOOSE = 0
--+ IPV6_RTHDR_STRICT = 1
--+ IPV6_RTHDR_TYPE_0 = 0
--+ IPV6_DEFAULT_MULTICAST_HOPS = 1
--+ IPV6_DEFAULT_MULTICAST_LOOP = 1
--+ IPV6_PORTRANGE_DEFAULT = 0
--+ IPV6_PORTRANGE_HIGH = 1
--+ IPV6_PORTRANGE_LOW = 2
--+ IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
--+ IPV6CTL_FORWARDING = 1
--+ IPV6CTL_SENDREDIRECTS = 2
--+ IPV6CTL_DEFHLIM = 3
--+ IPV6CTL_DEFMTU = 4
--+ IPV6CTL_FORWSRCRT = 5
--+ IPV6CTL_STATS = 6
--+ IPV6CTL_MRTSTATS = 7
--+ IPV6CTL_MRTPROTO = 8
--+ IPV6CTL_MAXFRAGPACKETS = 9
--+ IPV6CTL_SOURCECHECK = 10
--+ IPV6CTL_SOURCECHECK_LOGINT = 11
--+ IPV6CTL_ACCEPT_RTADV = 12
--+ IPV6CTL_KEEPFAITH = 13
--+ IPV6CTL_LOG_INTERVAL = 14
--+ IPV6CTL_HDRNESTLIMIT = 15
--+ IPV6CTL_DAD_COUNT = 16
--+ IPV6CTL_AUTO_FLOWLABEL = 17
--+ IPV6CTL_DEFMCASTHLIM = 18
--+ IPV6CTL_GIF_HLIM = 19
--+ IPV6CTL_KAME_VERSION = 20
--+ IPV6CTL_USE_DEPRECATED = 21
--+ IPV6CTL_RR_PRUNE = 22
--+ IPV6CTL_MAPPED_ADDR = 23
--+ IPV6CTL_BINDV6ONLY = 24
--+ IPV6CTL_RTEXPIRE = 25
--+ IPV6CTL_RTMINEXPIRE = 26
--+ IPV6CTL_RTMAXCACHE = 27
--+ IPV6CTL_MAXID = 28
--*** misc/Python-2.3.4/Lib/plat-freebsd7/regen	Tue Aug  9 06:26:27 2005
----- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen	Tue Aug  9 06:19:02 2005
--***************
--*** 0 ****
----- 1,3 ----
--+ #! /bin/sh
--+ set -v
--+ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
- *** misc/Python-2.3.4/configure	Fri May  7 21:13:40 2004
- --- misc/build/Python-2.3.4/configure	Wed Oct 17 14:01:02 2007
- ***************
-@@ -16214,3 +17097,22 @@
+@@ -15547,3 +17166,22 @@
    
    /* Define the macros needed if on a UnixWare 7.x system. */
    #if defined(__USLC__) && defined(__SCO_VERSION__)
diff --git a/editors/openoffice-3/files/patch-i85972 b/editors/openoffice-3/files/patch-i85972
new file mode 100644
index 000000000000..4b24c9d2ca7d
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i85972
@@ -0,0 +1,68 @@
+Index: lpsolve/lp_solve_5.5.patch
+===================================================================
+RCS file: /cvs/external/lpsolve/lp_solve_5.5.patch,v
+retrieving revision 1.2
+diff -u -r1.2 lp_solve_5.5.patch
+--- lpsolve/lp_solve_5.5.patch	20 Dec 2007 15:58:45 -0000	1.2
++++ lpsolve/lp_solve_5.5.patch	9 Feb 2008 07:19:59 -0000
+@@ -29,3 +29,27 @@
+ ! fi
+ ! 
+ ! rm *.o 2>/dev/null
++*** misc/lp_solve_5.5/lpsolve55/ccc.freebsd	Fri Nov 23 21:38:12 2007
++--- misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd	Fri Nov 23 21:58:29 2007
++***************
++*** 1 ****
++! dummy
++--- 1,18 ----
++! src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
++! 
++! def=
++! so=yes
++! 
++! opts='-O3 -DINTEGERTIME'
++!
++! $CC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++! ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++! ranlib liblpsolve55.a
++! 
++! if [ "$so" != "" ]
++! then
++!   $CC -fPIC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++!   $CC -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm
++! fi
++! 
++! rm *.o 2>/dev/null
+Index: lpsolve/makefile.mk
+===================================================================
+RCS file: /cvs/external/lpsolve/makefile.mk,v
+retrieving revision 1.3
+diff -u -r1.3 makefile.mk
+--- lpsolve/makefile.mk	21 Dec 2007 09:32:37 -0000	1.3
++++ lpsolve/makefile.mk	9 Feb 2008 07:20:00 -0000
+@@ -50,7 +50,7 @@
+ PATCH_FILE_NAME=lp_solve_5.5-windows.patch
+ .ELSE
+ PATCH_FILE_NAME=lp_solve_5.5.patch
+-ADDITIONAL_FILES=lpsolve55$/ccc.solaris
++ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd
+ .ENDIF
+ 
+ CONFIGURE_DIR=
+@@ -70,11 +70,16 @@
+ .IF "$(COMNAME)"=="sunpro5"
+ BUILD_ACTION=sh ccc.solaris
+ .ELSE
++.IF "$(OS)"=="FREEBSD"
++BUILD_ACTION=sh -x ccc.freebsd
++OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
++.ELSE
+ BUILD_ACTION=sh ccc
+ .ENDIF
+ OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
+ .ENDIF
+ .ENDIF
++.ENDIF
+ 
+ OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h
+ 
diff --git a/editors/openoffice-3/files/patch-i87583 b/editors/openoffice-3/files/patch-i87583
new file mode 100644
index 000000000000..17d3d37ee8e3
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i87583
@@ -0,0 +1,26 @@
+--- desktop/scripts/soffice.sh	2008-03-18 22:44:45.000000000 +0900
++++ desktop/scripts/soffice.sh	2008-03-29 19:17:49.000000000 +0900
+@@ -68,6 +68,23 @@
+ 
+ sd_binary=`basename "$0"`.bin
+ 
++# this is a temporary hack until we can live with the default search paths
++case "`uname -s`" in
++    FreeBSD)
++        sd_prog1="$sd_prog/../basis-link/program"
++	sd_prog2="$sd_prog/../basis-link/ure-link/lib"
++	if [ $LD_LIBRARY_PATH ]; then
++    	    SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
++   	    export SYSTEM_LD_LIBRARY_PATH
++    	    LD_LIBRARY_PATH="$sd_prog1:$sd_prog2":$LD_LIBRARY_PATH
++	else
++    	    LD_LIBRARY_PATH="$sd_prog1:$sd_prog2"
++	fi
++	export LD_LIBRARY_PATH
++	;;
++
++esac
++
+ #collect all bootstrap variables specified on the command line
+ #so that they can be passed as arguments to javaldx later on
+ for arg in $@
diff --git a/editors/openoffice-3/files/patch-i88156 b/editors/openoffice-3/files/patch-i88156
new file mode 100644
index 000000000000..7c8b38558433
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i88156
@@ -0,0 +1,18 @@
+Index: binfilter/bf_sw/source/filter/w4w/makefile.mk
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/filter/w4w/makefile.mk,v
+retrieving revision 1.9
+diff -u -r1.9 makefile.mk
+--- binfilter/bf_sw/source/filter/w4w/makefile.mk	20 Nov 2006 12:38:59 -0000	1.9
++++ binfilter/bf_sw/source/filter/w4w/makefile.mk	12 Apr 2008 00:02:49 -0000
+@@ -58,6 +58,10 @@
+ CDEFS=$(CDEFS) -Dmydebug
+ .ENDIF
+ 
++.IF "$(OSL_DEBUG_LEVEL)" > 0
++CDEFS += -DENABLE_BYTESTRING_STREAM_OPERATORS
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+ 
+ CXXFILES = \
diff --git a/editors/openoffice-3/files/patch-i88160 b/editors/openoffice-3/files/patch-i88160
new file mode 100644
index 000000000000..fc21b222aa2c
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i88160
@@ -0,0 +1,16 @@
+Index: sw/source/core/doc/dbgoutsw.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/core/doc/dbgoutsw.cxx,v
+retrieving revision 1.23
+diff -u -r1.23 dbgoutsw.cxx
+--- sw/source/core/doc/dbgoutsw.cxx	19 Feb 2008 13:40:02 -0000	1.23
++++ sw/source/core/doc/dbgoutsw.cxx	12 Apr 2008 00:17:46 -0000
+@@ -296,7 +296,7 @@
+         if (!bFirst)
+             aStr += String(", ", RTL_TEXTENCODING_ASCII_US);
+ 
+-        if ((sal_uInt32)pItem != 0xffffffff)
++        if (! pItem->IsInvalidItem())
+             aStr += lcl_dbg_out(*pItem);
+         else
+             aStr += String("invalid", RTL_TEXTENCODING_ASCII_US);
diff --git a/editors/openoffice-3/files/pkg-message.in b/editors/openoffice-3/files/pkg-message.in
index 4215af3b4049..f2e1165799a7 100644
--- a/editors/openoffice-3/files/pkg-message.in
+++ b/editors/openoffice-3/files/pkg-message.in
@@ -13,7 +13,7 @@ Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
 install some files and choose an installed JDK.
-The setup installs a ".openoffice.org2" folder
+The setup installs a ".openoffice.org3" folder
 in your homedir.
 
 2. Starting OO.org
@@ -38,5 +38,5 @@ OO.org does need $LANG to be set to a suitable value.
 3. If you run into problems
 --------------------------------------------------
 If you somehow run into problems, please remove the already installed
-".openoffice.org2" dir in your homedir. Redo the user
+".openoffice.org3" dir in your homedir. Redo the user
 installation and the problems should go away.
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 547bc9ee306b..365a6ed67b82 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -1,3 +1,4 @@
+
 # New ports collection makefile for: OpenOffice.org
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
@@ -7,7 +8,6 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
-PORTREVISION?=	5
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -24,7 +24,7 @@ DISTFILES+=	gpc231.tar.Z:gpc
 EXTRACT_ONLY=	${OOOSRC}
 
 MAINTAINER=	openoffice@FreeBSD.org
-COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
+COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch)
 
 .if defined(WITH_CWS)
 PORTNAME:=	openoffice.org-${OOOVERSION}-${WITH_CWS}
@@ -32,7 +32,7 @@ DISTFILES+=	${CWSARCHIVE}:cws
 .endif
 CWSARCHIVE=	${WITH_CWS}.tar.gz
 
-OOOVERSION=	2.4.0
+OOOVERSION=	3.0.0.b
 NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
 MOZILLA_VERSION=	1.7.5
@@ -46,7 +46,7 @@ USE_GNOME+=	libidl
 USE_KDELIBS_VER=	3
 .endif
 USE_XORG=	x11 ice xaw xau xext xrender xrandr \
-		xi xt xcursor xdamage xcomposite xfixes 
+		xi xt xcursor xdamage xcomposite xfixes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_BZIP2=	yes
@@ -77,21 +77,22 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		12
-OOOTAG?=		OOH680_m${MILESTONE}
+MILESTONE?=		2
+OOOTAG?=		BEA300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
+OOODIR=			openoffice.org3
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
 EXECBASE?=		openoffice.org-${OOOVERSION}
 .if defined(WITH_CWS)
 INSTALLATION_BASEDIR=	openoffice.org-${OOOVERSION}-${WITH_CWS}
 EXECBASE=		openoffice.org-${OOOVERSION}-${WITH_CWS}
 .endif
-DIST_SUBDIR=		openoffice.org2
+DIST_SUBDIR=		openoffice.org3
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86-64
+PACKAGE_BASENAME=	OOo_Dev_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86-64
 .else
-PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_Dev_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 .endif
 
 LOCALIZED_LANG?=	en-US
@@ -121,7 +122,8 @@ OOOCXX=		${CXX}
 .endif
 CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
 		CPPFLAGS="-I${LOCALBASE}/include"	\
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		PATH=${WRKSRC}/solenv/bin:$$PATH
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
@@ -129,7 +131,9 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		gpatch:${PORTSDIR}/devel/patch \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		bash:${PORTSDIR}/shells/bash \
-		imake:${PORTSDIR}/devel/imake
+		imake:${PORTSDIR}/devel/imake \
+		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469#
+
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
@@ -141,7 +145,8 @@ WRKSRC?=		${WRKDIR}/${OOOTAG}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
-NUMOFPROCESSES?=	1
+MAXPROCESSES?=	1
+MAXMODULES?=	1
 
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
@@ -194,15 +199,14 @@ post-extract:
 .if !defined(WITHOUT_MOZILLA)
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
+pre-configure:
+#Workaround for gperf. #i85469#
+	@${LN} -sf ${LOCALBASE}/bin/gperf ${WRKSRC}/solenv/bin/gperf
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
-# PR:84786 #i53289#
-.if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
-.else
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; dmake"
-.endif
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; setenv TMP ${WRKSRC} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}"
+
 .if ${LOCALIZED_LANG} == "alllangs"
 	@${MAKE} languagepack
 .endif
@@ -222,7 +226,7 @@ do-install:
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/$$i ;\
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
-	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
+	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 .else
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
@@ -232,14 +236,15 @@ do-install:
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
-	@cd ${WRKDIR}/tmp/opt/openoffice* ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
+	@cd ${WRKDIR}/tmp/opt/ ; ${TAR} cf - -C . . | ${TAR} xf - -C ${PREFIX}/${INSTALLATION_BASEDIR}
 .endif
 
 post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
+			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
+			-e 's#%%OOODIR%%#${OOODIR}#g' \
 			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
@@ -259,16 +264,16 @@ post-install:
 	@cd ${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \
 		${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST}
 	@${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \
-			${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
+			${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop
 	@for app in base calc draw impress math printeradmin writer; do \
 		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
 			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
-		${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/$${app}.desktop ; \
+		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
 	done
-	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
+	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
 	@${RM} -f ${DESKTOPDIR}/${EXECBASE}
 	@${MKDIR} ${DESKTOPDIR}
-	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
+	@${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg \
 			${DESKTOPDIR}/${EXECBASE}
 	@${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
@@ -296,7 +301,7 @@ post-install:
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
+			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
 			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index c355613080ec..27fe53121f25 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,12 +1,12 @@
-MD5 (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 40b8a3a214f780d4bc8e823f3c580660
-SHA256 (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 66752fca6177059f2cf2f533db2ef694aae70e7cc0a508c51e2518870e918d7b
-SIZE (openoffice.org2/OOo_OOH680_m12_source.tar.bz2) = 286332380
-MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
-SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-SIZE (openoffice.org2/unowinreg.dll) = 6144
-MD5 (openoffice.org2/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
-SHA256 (openoffice.org2/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
-SIZE (openoffice.org2/gpc231.tar.Z) = 27917
-MD5 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
-SHA256 (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
-SIZE (openoffice.org2/mozilla-source-1.7.5.tar.gz) = 38721366
+MD5 (openoffice.org3/OOo_BEA300_m2_source.tar.bz2) = a8cf80fb2f160c659eafe85b03ab7538
+SHA256 (openoffice.org3/OOo_BEA300_m2_source.tar.bz2) = d8aca58e0767d5ffc39d443c8ff47f204f27592ef804290bf62e3b4879b34a74
+SIZE (openoffice.org3/OOo_BEA300_m2_source.tar.bz2) = 298564280
+MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
+SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
+SIZE (openoffice.org3/unowinreg.dll) = 6144
+MD5 (openoffice.org3/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
+SHA256 (openoffice.org3/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
+SIZE (openoffice.org3/gpc231.tar.Z) = 27917
+MD5 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
+SHA256 (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 3e252bab95ecad3016b72fa594e0c44b9633d8c7b6af187e088a092019b56445
+SIZE (openoffice.org3/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice.org-3/files/Makefile.others b/editors/openoffice.org-3/files/Makefile.others
index 444a91beac69..f5848df41e31 100644
--- a/editors/openoffice.org-3/files/Makefile.others
+++ b/editors/openoffice.org-3/files/Makefile.others
@@ -57,9 +57,13 @@ languagepack:
 	@${RM} -fr ${WRKDIR}/langpack_tmp
 	@${MKDIR} ${WRKDIR}/langpack_tmp
 .if defined (LOCALIZED_LANG)
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ls openoffice*.t?z > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK
 	@cd ${WRKDIR}/langpack_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
-	@cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \
+	for i in `${CAT} ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK`; do \
+                ${ECHO_CMD} "extracting $$i" ; \
+                cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ; \
+        done
+	@cd ${WRKDIR}/langpack_tmp/opt/ ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
 		${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_langpack_${LOCALIZED_LANG}.tar.bz2 ${INSTALLATION_BASEDIR}
diff --git a/editors/openoffice.org-3/files/generate.pl b/editors/openoffice.org-3/files/generate.pl
index 526c081554bd..b08d5632707b 100644
--- a/editors/openoffice.org-3/files/generate.pl
+++ b/editors/openoffice.org-3/files/generate.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # generate full build shell script for OpenOffice.org
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/generate.pl,v 1.10 2008-04-04 10:05:22 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/generate.pl,v 1.11 2008-05-27 07:37:30 maho Exp $
 
 print "#!/bin/csh\n";
 print "make deinstall clean\n";
@@ -26,5 +26,5 @@ if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1];
 }
 close FILE;
 print "md5 OOo* > MD5SUMS.log\n";
-print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/FreeBSD/`make -V PORTVERSION`/`uname -r`/`uname -m`\n";
-print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/FreeBSD/`make -V PORTVERSION`/`uname -r`/`uname -m`\n";
+print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
+print "sudo -u `who am i | awk '{print \$1}'` scp OOo* MD5SUMS.log build.good-day.net:/home/ftp/pub/OpenOffice.org/FreeBSD/`make -V OOOTAG`/`uname -r`/`uname -m`\n";
diff --git a/editors/openoffice.org-3/files/patch-i80129 b/editors/openoffice.org-3/files/patch-i80129
index 90fd4ceb9dc5..24cc48f48ccd 100644
--- a/editors/openoffice.org-3/files/patch-i80129
+++ b/editors/openoffice.org-3/files/patch-i80129
@@ -1,18 +1,18 @@
 Merely a workaround
 
-Index: scp2/source/ure/ure.scp
+Index: scp2/source/ooo/ure.scp
 ===================================================================
-RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
-retrieving revision 1.14
-diff -u -r1.14 ure.scp
---- scp2/source/ure/ure.scp	18 Jul 2007 08:07:32 -0000	1.14
-+++ scp2/source/ure/ure.scp	27 Jul 2007 22:07:16 -0000
-@@ -610,6 +610,8 @@
+RCS file: /cvs/installation/scp2/source/ooo/ure.scp,v
+retrieving revision 1.2
+diff -u -r1.2 ure.scp
+--- scp2/source/ooo/ure.scp	18 Mar 2008 13:35:26 -0000	1.2
++++ scp2/source/ooo/ure.scp	21 Mar 2008 07:30:43 -0000
+@@ -684,6 +684,8 @@
  #endif
  #elif defined MACOSX
-     Name = SCP2_URE_DL_NORMAL(xml2.2);
+     Name = SCP2_URE_DL_NORMAL("xml2.2");
 +#elif defined FREEBSD
 +    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
  #else
-     Name = SCP2_URE_DL_VER(xml2, 2);
+     Name = SCP2_URE_DL_VER("xml2", "2");
  #endif
diff --git a/editors/openoffice.org-3/files/patch-i85027 b/editors/openoffice.org-3/files/patch-i85027
index 7afbd7d17349..e6fe720647bc 100644
--- a/editors/openoffice.org-3/files/patch-i85027
+++ b/editors/openoffice.org-3/files/patch-i85027
@@ -1,30 +1,3 @@
-Index: scp2/source/ooo/file_library_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
-retrieving revision 1.269
-diff -u -r1.269 file_library_ooo.scp
---- scp2/source/ooo/file_library_ooo.scp	12 Dec 2007 13:29:11 -0000	1.269
-+++ scp2/source/ooo/file_library_ooo.scp	6 Jan 2008 04:19:50 -0000
-@@ -979,7 +979,7 @@
- 
- STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Fwm , fwm)
- 
--#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
-+#if ! (defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
- #if defined( _gcc3 )
- 
- File gid_File_Lib_Gcc
-@@ -993,7 +993,7 @@
- 
- #endif
- 
--#if ! (defined (FREEBSD) || defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
-+#if ! (defined (NETBSD) || defined(MACOSX) || defined(SYSTEM_STDLIBS) || defined(WNT))
- #if defined( _gcc3 )
- 
- File gid_File_Lib_Stdc
-
-
 -----------------
 Strange behaviour of stock gcc of FreeBSD 7.
 
@@ -67,3 +40,24 @@ diff -u -r1.5 makefile.mk
  .ENDIF 
  .ENDIF 
  
+--- scp2/source/ooo/ure.scp	18 Mar 2008 13:35:26 -0000	1.2
++++ scp2/source/ooo/ure.scp	21 Mar 2008 09:26:48 -0000
+@@ -728,7 +730,7 @@
+ End
+ #endif
+ 
+-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
++#if defined _gcc3 && !(defined NETBSD \
+ 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+ File gid_File_Dl_GccS
+     TXT_FILE_BODY;
+@@ -739,7 +741,7 @@
+ End
+ #endif
+ 
+-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
++#if defined _gcc3 && !(defined NETBSD \
+ 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+ File gid_File_Dl_Stdcpp
+     Dir = SCP2_URE_DL_DIR;
+
diff --git a/editors/openoffice.org-3/files/patch-i85126 b/editors/openoffice.org-3/files/patch-i85126
index f70616a998e1..cc013d213630 100644
--- a/editors/openoffice.org-3/files/patch-i85126
+++ b/editors/openoffice.org-3/files/patch-i85126
@@ -1,7 +1,12 @@
-Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
+Update to newest cpp-uno bridge from Linux x86-64.
 
+Index: bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx,v
+retrieving revision 1.3
+diff -u -r1.3 abi.cxx
 --- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx	16 Sep 2006 15:46:23 -0000	1.3
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx	8 Jan 2008 16:57:00 -0000
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx	12 Apr 2008 00:10:44 -0000
 @@ -358,6 +358,8 @@
              case X86_64_SSEDF_CLASS:
                  *pStructAlign++ = *reinterpret_cast<sal_uInt64 *>( *pSSE++ );
@@ -11,8 +16,13 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
          }
  }
  
---- bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx	16 Sep 2006 15:46:37 -0000	1.3
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx	8 Jan 2008 16:57:00 -0000
+Index: bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 cpp2uno.cxx
+--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx	27 Feb 2008 09:49:58 -0000	1.4
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx	12 Apr 2008 00:10:44 -0000
 @@ -82,8 +82,8 @@
  	void ** gpreg, void ** fpreg, void ** ovrflw,
  	sal_uInt64 * pRegisterReturn /* space for register return */ )
@@ -24,17 +34,21 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
         
  	// return
  	typelib_TypeDescription * pReturnTypeDescr = 0;
-@@ -492,7 +492,7 @@
- unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
- 	void ** slots, unsigned char * code,
- 	typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset,
--	sal_Int32 functionCount, sal_Int32 nVtableOffset )
-+	sal_Int32 /* functionCount */, sal_Int32 nVtableOffset )
+@@ -500,7 +500,6 @@
  {
+ 	(*slots) -= functionCount;
+ 	Slot * s = *slots;
+-
  	for ( sal_Int32 nPos = 0; nPos < type->nMembers; ++nPos )
  	{
+ 		typelib_TypeDescription * pTD = 0;
+Index: bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 except.cxx
 --- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx	5 Jul 2007 09:01:44 -0000	1.4
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx	8 Jan 2008 16:57:00 -0000
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx	12 Apr 2008 00:10:44 -0000
 @@ -180,8 +180,8 @@
          else
          {
@@ -55,8 +69,13 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
              }
          }
      }
+Index: bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx
+===================================================================
+RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 uno2cpp.cxx
 --- bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	5 Jul 2007 09:02:53 -0000	1.4
-+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	8 Jan 2008 16:57:00 -0000
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	12 Apr 2008 00:10:44 -0000
 @@ -73,13 +73,13 @@
      // Let's figure out what is really going on here
      {
diff --git a/editors/openoffice.org-3/files/patch-i85127 b/editors/openoffice.org-3/files/patch-i85127
index 3f50bdcb9668..60d99db2fc18 100644
--- a/editors/openoffice.org-3/files/patch-i85127
+++ b/editors/openoffice.org-3/files/patch-i85127
@@ -1,8 +1,13 @@
 - Add support for FreeBSD 8.x.
 - Add patches for setup.py and Lib/posixfile.py.
 
---- python/Python-2.3.4.patch	26 Oct 2007 11:27:52 -0000	1.20
-+++ python/Python-2.3.4.patch	8 Jan 2008 19:37:10 -0000
+Index: python/Python-2.3.4.patch
+===================================================================
+RCS file: /cvs/external/python/Python-2.3.4.patch,v
+retrieving revision 1.21
+diff -u -r1.21 Python-2.3.4.patch
+--- python/Python-2.3.4.patch	4 Feb 2008 12:57:01 -0000	1.21
++++ python/Python-2.3.4.patch	9 Feb 2008 05:09:14 -0000
 @@ -131,6 +131,1625 @@
        name = 'posix'
        linesep = '\n'
@@ -1627,752 +1632,9 @@
 +                    l_start, l_len, os.getpid(), l_type, l_whence)
 +          elif sys.platform in ['aix3', 'aix4']:
  *** misc/Python-2.3.4/Mac/OSX/Makefile	Tue Nov  4 23:45:16 2003
- --- misc/build/Python-2.3.4/Mac/OSX/Makefile	Wed Oct 17 14:01:01 2007
+ --- misc/build/Python-2.3.4/Mac/OSX/Makefile	Tue Jan 15 12:11:51 2008
  ***************
-@@ -14688,742 +16307,6 @@
-   	handler = signal(sig, SIG_IGN);
-   	signal(sig, handler);
-   	return handler;
--*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Aug  9 06:26:23 2005
----- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Aug  9 06:20:25 2005
--***************
--*** 0 ****
----- 1,355 ----
--+ # Generated by h2py from /usr/include/netinet/in.h
--+ IPPROTO_IP = 0
--+ IPPROTO_HOPOPTS = 0
--+ IPPROTO_ICMP = 1
--+ IPPROTO_IGMP = 2
--+ IPPROTO_GGP = 3
--+ IPPROTO_IPV4 = 4
--+ IPPROTO_IPIP = IPPROTO_IPV4
--+ IPPROTO_TCP = 6
--+ IPPROTO_ST = 7
--+ IPPROTO_EGP = 8
--+ IPPROTO_PIGP = 9
--+ IPPROTO_RCCMON = 10
--+ IPPROTO_NVPII = 11
--+ IPPROTO_PUP = 12
--+ IPPROTO_ARGUS = 13
--+ IPPROTO_EMCON = 14
--+ IPPROTO_XNET = 15
--+ IPPROTO_CHAOS = 16
--+ IPPROTO_UDP = 17
--+ IPPROTO_MUX = 18
--+ IPPROTO_MEAS = 19
--+ IPPROTO_HMP = 20
--+ IPPROTO_PRM = 21
--+ IPPROTO_IDP = 22
--+ IPPROTO_TRUNK1 = 23
--+ IPPROTO_TRUNK2 = 24
--+ IPPROTO_LEAF1 = 25
--+ IPPROTO_LEAF2 = 26
--+ IPPROTO_RDP = 27
--+ IPPROTO_IRTP = 28
--+ IPPROTO_TP = 29
--+ IPPROTO_BLT = 30
--+ IPPROTO_NSP = 31
--+ IPPROTO_INP = 32
--+ IPPROTO_SEP = 33
--+ IPPROTO_3PC = 34
--+ IPPROTO_IDPR = 35
--+ IPPROTO_XTP = 36
--+ IPPROTO_DDP = 37
--+ IPPROTO_CMTP = 38
--+ IPPROTO_TPXX = 39
--+ IPPROTO_IL = 40
--+ IPPROTO_IPV6 = 41
--+ IPPROTO_SDRP = 42
--+ IPPROTO_ROUTING = 43
--+ IPPROTO_FRAGMENT = 44
--+ IPPROTO_IDRP = 45
--+ IPPROTO_RSVP = 46
--+ IPPROTO_GRE = 47
--+ IPPROTO_MHRP = 48
--+ IPPROTO_BHA = 49
--+ IPPROTO_ESP = 50
--+ IPPROTO_AH = 51
--+ IPPROTO_INLSP = 52
--+ IPPROTO_SWIPE = 53
--+ IPPROTO_NHRP = 54
--+ IPPROTO_ICMPV6 = 58
--+ IPPROTO_NONE = 59
--+ IPPROTO_DSTOPTS = 60
--+ IPPROTO_AHIP = 61
--+ IPPROTO_CFTP = 62
--+ IPPROTO_HELLO = 63
--+ IPPROTO_SATEXPAK = 64
--+ IPPROTO_KRYPTOLAN = 65
--+ IPPROTO_RVD = 66
--+ IPPROTO_IPPC = 67
--+ IPPROTO_ADFS = 68
--+ IPPROTO_SATMON = 69
--+ IPPROTO_VISA = 70
--+ IPPROTO_IPCV = 71
--+ IPPROTO_CPNX = 72
--+ IPPROTO_CPHB = 73
--+ IPPROTO_WSN = 74
--+ IPPROTO_PVP = 75
--+ IPPROTO_BRSATMON = 76
--+ IPPROTO_ND = 77
--+ IPPROTO_WBMON = 78
--+ IPPROTO_WBEXPAK = 79
--+ IPPROTO_EON = 80
--+ IPPROTO_VMTP = 81
--+ IPPROTO_SVMTP = 82
--+ IPPROTO_VINES = 83
--+ IPPROTO_TTP = 84
--+ IPPROTO_IGP = 85
--+ IPPROTO_DGP = 86
--+ IPPROTO_TCF = 87
--+ IPPROTO_IGRP = 88
--+ IPPROTO_OSPFIGP = 89
--+ IPPROTO_SRPC = 90
--+ IPPROTO_LARP = 91
--+ IPPROTO_MTP = 92
--+ IPPROTO_AX25 = 93
--+ IPPROTO_IPEIP = 94
--+ IPPROTO_MICP = 95
--+ IPPROTO_SCCSP = 96
--+ IPPROTO_ETHERIP = 97
--+ IPPROTO_ENCAP = 98
--+ IPPROTO_APES = 99
--+ IPPROTO_GMTP = 100
--+ IPPROTO_IPCOMP = 108
--+ IPPROTO_PIM = 103
--+ IPPROTO_PGM = 113
--+ IPPROTO_DIVERT = 254
--+ IPPROTO_RAW = 255
--+ IPPROTO_MAX = 256
--+ IPPROTO_DONE = 257
--+ IPPORT_RESERVED = 1024
--+ IPPORT_USERRESERVED = 5000
--+ IPPORT_HIFIRSTAUTO = 49152
--+ IPPORT_HILASTAUTO = 65535
--+ IPPORT_RESERVEDSTART = 600
--+ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
--+ 
--+ IN_CLASSA_NET = 0xff000000
--+ IN_CLASSA_NSHIFT = 24
--+ IN_CLASSA_HOST = 0x00ffffff
--+ IN_CLASSA_MAX = 128
--+ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
--+ 
--+ IN_CLASSB_NET = 0xffff0000
--+ IN_CLASSB_NSHIFT = 16
--+ IN_CLASSB_HOST = 0x0000ffff
--+ IN_CLASSB_MAX = 65536
--+ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
--+ 
--+ IN_CLASSC_NET = 0xffffff00
--+ IN_CLASSC_NSHIFT = 8
--+ IN_CLASSC_HOST = 0x000000ff
--+ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
--+ 
--+ IN_CLASSD_NET = 0xf0000000
--+ IN_CLASSD_NSHIFT = 28
--+ IN_CLASSD_HOST = 0x0fffffff
--+ def IN_MULTICAST(i): return IN_CLASSD(i)
--+ 
--+ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
--+ 
--+ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
--+ 
--+ INADDR_NONE = 0xffffffff
--+ IN_LOOPBACKNET = 127
--+ INET_ADDRSTRLEN = 16
--+ IP_OPTIONS = 1
--+ IP_HDRINCL = 2
--+ IP_TOS = 3
--+ IP_TTL = 4
--+ IP_RECVOPTS = 5
--+ IP_RECVRETOPTS = 6
--+ IP_RECVDSTADDR = 7
--+ IP_RETOPTS = 8
--+ IP_MULTICAST_IF = 9
--+ IP_MULTICAST_TTL = 10
--+ IP_MULTICAST_LOOP = 11
--+ IP_ADD_MEMBERSHIP = 12
--+ IP_DROP_MEMBERSHIP = 13
--+ IP_MULTICAST_VIF = 14
--+ IP_RSVP_ON = 15
--+ IP_RSVP_OFF = 16
--+ IP_RSVP_VIF_ON = 17
--+ IP_RSVP_VIF_OFF = 18
--+ IP_PORTRANGE = 19
--+ IP_RECVIF = 20
--+ IP_IPSEC_POLICY = 21
--+ IP_FAITH = 22
--+ IP_FW_ADD = 50
--+ IP_FW_DEL = 51
--+ IP_FW_FLUSH = 52
--+ IP_FW_ZERO = 53
--+ IP_FW_GET = 54
--+ IP_FW_RESETLOG = 55
--+ IP_DUMMYNET_CONFIGURE = 60
--+ IP_DUMMYNET_DEL = 61
--+ IP_DUMMYNET_FLUSH = 62
--+ IP_DUMMYNET_GET = 64
--+ IP_DEFAULT_MULTICAST_TTL = 1
--+ IP_DEFAULT_MULTICAST_LOOP = 1
--+ IP_MAX_MEMBERSHIPS = 20
--+ IP_PORTRANGE_DEFAULT = 0
--+ IP_PORTRANGE_HIGH = 1
--+ IP_PORTRANGE_LOW = 2
--+ IPPROTO_MAXID = (IPPROTO_AH + 1)
--+ IPCTL_FORWARDING = 1
--+ IPCTL_SENDREDIRECTS = 2
--+ IPCTL_DEFTTL = 3
--+ IPCTL_DEFMTU = 4
--+ IPCTL_RTEXPIRE = 5
--+ IPCTL_RTMINEXPIRE = 6
--+ IPCTL_RTMAXCACHE = 7
--+ IPCTL_SOURCEROUTE = 8
--+ IPCTL_DIRECTEDBROADCAST = 9
--+ IPCTL_INTRQMAXLEN = 10
--+ IPCTL_INTRQDROPS = 11
--+ IPCTL_STATS = 12
--+ IPCTL_ACCEPTSOURCEROUTE = 13
--+ IPCTL_FASTFORWARDING = 14
--+ IPCTL_KEEPFAITH = 15
--+ IPCTL_GIF_TTL = 16
--+ IPCTL_MAXID = 17
--+ 
--+ # Included from netinet6/in6.h
--+ 
--+ # Included from sys/queue.h
--+ def SLIST_HEAD_INITIALIZER(head): return \
--+ 
--+ def SLIST_ENTRY(type): return \
--+ 
--+ def STAILQ_HEAD_INITIALIZER(head): return \
--+ 
--+ def STAILQ_ENTRY(type): return \
--+ 
--+ def LIST_HEAD_INITIALIZER(head): return \
--+ 
--+ def LIST_ENTRY(type): return \
--+ 
--+ def TAILQ_HEAD_INITIALIZER(head): return \
--+ 
--+ def TAILQ_ENTRY(type): return \
--+ 
--+ def CIRCLEQ_ENTRY(type): return \
--+ 
--+ __KAME_VERSION = "20000701/FreeBSD-current"
--+ IPV6PORT_RESERVED = 1024
--+ IPV6PORT_ANONMIN = 49152
--+ IPV6PORT_ANONMAX = 65535
--+ IPV6PORT_RESERVEDMIN = 600
--+ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
--+ INET6_ADDRSTRLEN = 46
--+ IPV6_ADDR_INT32_ONE = 1
--+ IPV6_ADDR_INT32_TWO = 2
--+ IPV6_ADDR_INT32_MNL = 0xff010000
--+ IPV6_ADDR_INT32_MLL = 0xff020000
--+ IPV6_ADDR_INT32_SMP = 0x0000ffff
--+ IPV6_ADDR_INT16_ULL = 0xfe80
--+ IPV6_ADDR_INT16_USL = 0xfec0
--+ IPV6_ADDR_INT16_MLL = 0xff02
--+ IPV6_ADDR_INT32_ONE = 0x01000000
--+ IPV6_ADDR_INT32_TWO = 0x02000000
--+ IPV6_ADDR_INT32_MNL = 0x000001ff
--+ IPV6_ADDR_INT32_MLL = 0x000002ff
--+ IPV6_ADDR_INT32_SMP = 0xffff0000
--+ IPV6_ADDR_INT16_ULL = 0x80fe
--+ IPV6_ADDR_INT16_USL = 0xc0fe
--+ IPV6_ADDR_INT16_MLL = 0x02ff
--+ def IN6_IS_ADDR_UNSPECIFIED(a): return \
--+ 
--+ def IN6_IS_ADDR_LOOPBACK(a): return \
--+ 
--+ def IN6_IS_ADDR_V4COMPAT(a): return \
--+ 
--+ def IN6_IS_ADDR_V4MAPPED(a): return \
--+ 
--+ IPV6_ADDR_SCOPE_NODELOCAL = 0x01
--+ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
--+ IPV6_ADDR_SCOPE_SITELOCAL = 0x05
--+ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
--+ IPV6_ADDR_SCOPE_GLOBAL = 0x0e
--+ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01
--+ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
--+ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05
--+ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
--+ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e
--+ def IN6_IS_ADDR_LINKLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_SITELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_GLOBAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_GLOBAL(a): return \
--+ 
--+ def IN6_IS_SCOPE_LINKLOCAL(a): return \
--+ 
--+ IPV6_OPTIONS = 1
--+ IPV6_RECVOPTS = 5
--+ IPV6_RECVRETOPTS = 6
--+ IPV6_RECVDSTADDR = 7
--+ IPV6_RETOPTS = 8
--+ IPV6_SOCKOPT_RESERVED1 = 3
--+ IPV6_UNICAST_HOPS = 4
--+ IPV6_MULTICAST_IF = 9
--+ IPV6_MULTICAST_HOPS = 10
--+ IPV6_MULTICAST_LOOP = 11
--+ IPV6_JOIN_GROUP = 12
--+ IPV6_LEAVE_GROUP = 13
--+ IPV6_PORTRANGE = 14
--+ ICMP6_FILTER = 18
--+ IPV6_PKTINFO = 19
--+ IPV6_HOPLIMIT = 20
--+ IPV6_NEXTHOP = 21
--+ IPV6_HOPOPTS = 22
--+ IPV6_DSTOPTS = 23
--+ IPV6_RTHDR = 24
--+ IPV6_PKTOPTIONS = 25
--+ IPV6_CHECKSUM = 26
--+ IPV6_BINDV6ONLY = 27
--+ IPV6_IPSEC_POLICY = 28
--+ IPV6_FAITH = 29
--+ IPV6_FW_ADD = 30
--+ IPV6_FW_DEL = 31
--+ IPV6_FW_FLUSH = 32
--+ IPV6_FW_ZERO = 33
--+ IPV6_FW_GET = 34
--+ IPV6_RTHDR_LOOSE = 0
--+ IPV6_RTHDR_STRICT = 1
--+ IPV6_RTHDR_TYPE_0 = 0
--+ IPV6_DEFAULT_MULTICAST_HOPS = 1
--+ IPV6_DEFAULT_MULTICAST_LOOP = 1
--+ IPV6_PORTRANGE_DEFAULT = 0
--+ IPV6_PORTRANGE_HIGH = 1
--+ IPV6_PORTRANGE_LOW = 2
--+ IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
--+ IPV6CTL_FORWARDING = 1
--+ IPV6CTL_SENDREDIRECTS = 2
--+ IPV6CTL_DEFHLIM = 3
--+ IPV6CTL_DEFMTU = 4
--+ IPV6CTL_FORWSRCRT = 5
--+ IPV6CTL_STATS = 6
--+ IPV6CTL_MRTSTATS = 7
--+ IPV6CTL_MRTPROTO = 8
--+ IPV6CTL_MAXFRAGPACKETS = 9
--+ IPV6CTL_SOURCECHECK = 10
--+ IPV6CTL_SOURCECHECK_LOGINT = 11
--+ IPV6CTL_ACCEPT_RTADV = 12
--+ IPV6CTL_KEEPFAITH = 13
--+ IPV6CTL_LOG_INTERVAL = 14
--+ IPV6CTL_HDRNESTLIMIT = 15
--+ IPV6CTL_DAD_COUNT = 16
--+ IPV6CTL_AUTO_FLOWLABEL = 17
--+ IPV6CTL_DEFMCASTHLIM = 18
--+ IPV6CTL_GIF_HLIM = 19
--+ IPV6CTL_KAME_VERSION = 20
--+ IPV6CTL_USE_DEPRECATED = 21
--+ IPV6CTL_RR_PRUNE = 22
--+ IPV6CTL_MAPPED_ADDR = 23
--+ IPV6CTL_BINDV6ONLY = 24
--+ IPV6CTL_RTEXPIRE = 25
--+ IPV6CTL_RTMINEXPIRE = 26
--+ IPV6CTL_RTMAXCACHE = 27
--+ IPV6CTL_MAXID = 28
--*** misc/Python-2.3.4/Lib/plat-freebsd6/regen	Tue Aug  9 06:26:27 2005
----- misc/build/Python-2.3.4/Lib/plat-freebsd6/regen	Tue Aug  9 06:19:02 2005
--***************
--*** 0 ****
----- 1,3 ----
--+ #! /bin/sh
--+ set -v
--+ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
--*** misc/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Aug  9 06:26:23 2005
----- misc/build/Python-2.3.4/Lib/plat-freebsd7/IN.py	Tue Aug  9 06:20:25 2005
--***************
--*** 0 ****
----- 1,355 ----
--+ # Generated by h2py from /usr/include/netinet/in.h
--+ IPPROTO_IP = 0
--+ IPPROTO_HOPOPTS = 0
--+ IPPROTO_ICMP = 1
--+ IPPROTO_IGMP = 2
--+ IPPROTO_GGP = 3
--+ IPPROTO_IPV4 = 4
--+ IPPROTO_IPIP = IPPROTO_IPV4
--+ IPPROTO_TCP = 6
--+ IPPROTO_ST = 7
--+ IPPROTO_EGP = 8
--+ IPPROTO_PIGP = 9
--+ IPPROTO_RCCMON = 10
--+ IPPROTO_NVPII = 11
--+ IPPROTO_PUP = 12
--+ IPPROTO_ARGUS = 13
--+ IPPROTO_EMCON = 14
--+ IPPROTO_XNET = 15
--+ IPPROTO_CHAOS = 16
--+ IPPROTO_UDP = 17
--+ IPPROTO_MUX = 18
--+ IPPROTO_MEAS = 19
--+ IPPROTO_HMP = 20
--+ IPPROTO_PRM = 21
--+ IPPROTO_IDP = 22
--+ IPPROTO_TRUNK1 = 23
--+ IPPROTO_TRUNK2 = 24
--+ IPPROTO_LEAF1 = 25
--+ IPPROTO_LEAF2 = 26
--+ IPPROTO_RDP = 27
--+ IPPROTO_IRTP = 28
--+ IPPROTO_TP = 29
--+ IPPROTO_BLT = 30
--+ IPPROTO_NSP = 31
--+ IPPROTO_INP = 32
--+ IPPROTO_SEP = 33
--+ IPPROTO_3PC = 34
--+ IPPROTO_IDPR = 35
--+ IPPROTO_XTP = 36
--+ IPPROTO_DDP = 37
--+ IPPROTO_CMTP = 38
--+ IPPROTO_TPXX = 39
--+ IPPROTO_IL = 40
--+ IPPROTO_IPV6 = 41
--+ IPPROTO_SDRP = 42
--+ IPPROTO_ROUTING = 43
--+ IPPROTO_FRAGMENT = 44
--+ IPPROTO_IDRP = 45
--+ IPPROTO_RSVP = 46
--+ IPPROTO_GRE = 47
--+ IPPROTO_MHRP = 48
--+ IPPROTO_BHA = 49
--+ IPPROTO_ESP = 50
--+ IPPROTO_AH = 51
--+ IPPROTO_INLSP = 52
--+ IPPROTO_SWIPE = 53
--+ IPPROTO_NHRP = 54
--+ IPPROTO_ICMPV6 = 58
--+ IPPROTO_NONE = 59
--+ IPPROTO_DSTOPTS = 60
--+ IPPROTO_AHIP = 61
--+ IPPROTO_CFTP = 62
--+ IPPROTO_HELLO = 63
--+ IPPROTO_SATEXPAK = 64
--+ IPPROTO_KRYPTOLAN = 65
--+ IPPROTO_RVD = 66
--+ IPPROTO_IPPC = 67
--+ IPPROTO_ADFS = 68
--+ IPPROTO_SATMON = 69
--+ IPPROTO_VISA = 70
--+ IPPROTO_IPCV = 71
--+ IPPROTO_CPNX = 72
--+ IPPROTO_CPHB = 73
--+ IPPROTO_WSN = 74
--+ IPPROTO_PVP = 75
--+ IPPROTO_BRSATMON = 76
--+ IPPROTO_ND = 77
--+ IPPROTO_WBMON = 78
--+ IPPROTO_WBEXPAK = 79
--+ IPPROTO_EON = 80
--+ IPPROTO_VMTP = 81
--+ IPPROTO_SVMTP = 82
--+ IPPROTO_VINES = 83
--+ IPPROTO_TTP = 84
--+ IPPROTO_IGP = 85
--+ IPPROTO_DGP = 86
--+ IPPROTO_TCF = 87
--+ IPPROTO_IGRP = 88
--+ IPPROTO_OSPFIGP = 89
--+ IPPROTO_SRPC = 90
--+ IPPROTO_LARP = 91
--+ IPPROTO_MTP = 92
--+ IPPROTO_AX25 = 93
--+ IPPROTO_IPEIP = 94
--+ IPPROTO_MICP = 95
--+ IPPROTO_SCCSP = 96
--+ IPPROTO_ETHERIP = 97
--+ IPPROTO_ENCAP = 98
--+ IPPROTO_APES = 99
--+ IPPROTO_GMTP = 100
--+ IPPROTO_IPCOMP = 108
--+ IPPROTO_PIM = 103
--+ IPPROTO_PGM = 113
--+ IPPROTO_DIVERT = 254
--+ IPPROTO_RAW = 255
--+ IPPROTO_MAX = 256
--+ IPPROTO_DONE = 257
--+ IPPORT_RESERVED = 1024
--+ IPPORT_USERRESERVED = 5000
--+ IPPORT_HIFIRSTAUTO = 49152
--+ IPPORT_HILASTAUTO = 65535
--+ IPPORT_RESERVEDSTART = 600
--+ def IN_CLASSA(i): return (((u_int32_t)(i) & 0x80000000) == 0)
--+ 
--+ IN_CLASSA_NET = 0xff000000
--+ IN_CLASSA_NSHIFT = 24
--+ IN_CLASSA_HOST = 0x00ffffff
--+ IN_CLASSA_MAX = 128
--+ def IN_CLASSB(i): return (((u_int32_t)(i) & 0xc0000000) == 0x80000000)
--+ 
--+ IN_CLASSB_NET = 0xffff0000
--+ IN_CLASSB_NSHIFT = 16
--+ IN_CLASSB_HOST = 0x0000ffff
--+ IN_CLASSB_MAX = 65536
--+ def IN_CLASSC(i): return (((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
--+ 
--+ IN_CLASSC_NET = 0xffffff00
--+ IN_CLASSC_NSHIFT = 8
--+ IN_CLASSC_HOST = 0x000000ff
--+ def IN_CLASSD(i): return (((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
--+ 
--+ IN_CLASSD_NET = 0xf0000000
--+ IN_CLASSD_NSHIFT = 28
--+ IN_CLASSD_HOST = 0x0fffffff
--+ def IN_MULTICAST(i): return IN_CLASSD(i)
--+ 
--+ def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
--+ 
--+ def IN_BADCLASS(i): return (((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
--+ 
--+ INADDR_NONE = 0xffffffff
--+ IN_LOOPBACKNET = 127
--+ INET_ADDRSTRLEN = 16
--+ IP_OPTIONS = 1
--+ IP_HDRINCL = 2
--+ IP_TOS = 3
--+ IP_TTL = 4
--+ IP_RECVOPTS = 5
--+ IP_RECVRETOPTS = 6
--+ IP_RECVDSTADDR = 7
--+ IP_RETOPTS = 8
--+ IP_MULTICAST_IF = 9
--+ IP_MULTICAST_TTL = 10
--+ IP_MULTICAST_LOOP = 11
--+ IP_ADD_MEMBERSHIP = 12
--+ IP_DROP_MEMBERSHIP = 13
--+ IP_MULTICAST_VIF = 14
--+ IP_RSVP_ON = 15
--+ IP_RSVP_OFF = 16
--+ IP_RSVP_VIF_ON = 17
--+ IP_RSVP_VIF_OFF = 18
--+ IP_PORTRANGE = 19
--+ IP_RECVIF = 20
--+ IP_IPSEC_POLICY = 21
--+ IP_FAITH = 22
--+ IP_FW_ADD = 50
--+ IP_FW_DEL = 51
--+ IP_FW_FLUSH = 52
--+ IP_FW_ZERO = 53
--+ IP_FW_GET = 54
--+ IP_FW_RESETLOG = 55
--+ IP_DUMMYNET_CONFIGURE = 60
--+ IP_DUMMYNET_DEL = 61
--+ IP_DUMMYNET_FLUSH = 62
--+ IP_DUMMYNET_GET = 64
--+ IP_DEFAULT_MULTICAST_TTL = 1
--+ IP_DEFAULT_MULTICAST_LOOP = 1
--+ IP_MAX_MEMBERSHIPS = 20
--+ IP_PORTRANGE_DEFAULT = 0
--+ IP_PORTRANGE_HIGH = 1
--+ IP_PORTRANGE_LOW = 2
--+ IPPROTO_MAXID = (IPPROTO_AH + 1)
--+ IPCTL_FORWARDING = 1
--+ IPCTL_SENDREDIRECTS = 2
--+ IPCTL_DEFTTL = 3
--+ IPCTL_DEFMTU = 4
--+ IPCTL_RTEXPIRE = 5
--+ IPCTL_RTMINEXPIRE = 6
--+ IPCTL_RTMAXCACHE = 7
--+ IPCTL_SOURCEROUTE = 8
--+ IPCTL_DIRECTEDBROADCAST = 9
--+ IPCTL_INTRQMAXLEN = 10
--+ IPCTL_INTRQDROPS = 11
--+ IPCTL_STATS = 12
--+ IPCTL_ACCEPTSOURCEROUTE = 13
--+ IPCTL_FASTFORWARDING = 14
--+ IPCTL_KEEPFAITH = 15
--+ IPCTL_GIF_TTL = 16
--+ IPCTL_MAXID = 17
--+ 
--+ # Included from netinet6/in6.h
--+ 
--+ # Included from sys/queue.h
--+ def SLIST_HEAD_INITIALIZER(head): return \
--+ 
--+ def SLIST_ENTRY(type): return \
--+ 
--+ def STAILQ_HEAD_INITIALIZER(head): return \
--+ 
--+ def STAILQ_ENTRY(type): return \
--+ 
--+ def LIST_HEAD_INITIALIZER(head): return \
--+ 
--+ def LIST_ENTRY(type): return \
--+ 
--+ def TAILQ_HEAD_INITIALIZER(head): return \
--+ 
--+ def TAILQ_ENTRY(type): return \
--+ 
--+ def CIRCLEQ_ENTRY(type): return \
--+ 
--+ __KAME_VERSION = "20000701/FreeBSD-current"
--+ IPV6PORT_RESERVED = 1024
--+ IPV6PORT_ANONMIN = 49152
--+ IPV6PORT_ANONMAX = 65535
--+ IPV6PORT_RESERVEDMIN = 600
--+ IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
--+ INET6_ADDRSTRLEN = 46
--+ IPV6_ADDR_INT32_ONE = 1
--+ IPV6_ADDR_INT32_TWO = 2
--+ IPV6_ADDR_INT32_MNL = 0xff010000
--+ IPV6_ADDR_INT32_MLL = 0xff020000
--+ IPV6_ADDR_INT32_SMP = 0x0000ffff
--+ IPV6_ADDR_INT16_ULL = 0xfe80
--+ IPV6_ADDR_INT16_USL = 0xfec0
--+ IPV6_ADDR_INT16_MLL = 0xff02
--+ IPV6_ADDR_INT32_ONE = 0x01000000
--+ IPV6_ADDR_INT32_TWO = 0x02000000
--+ IPV6_ADDR_INT32_MNL = 0x000001ff
--+ IPV6_ADDR_INT32_MLL = 0x000002ff
--+ IPV6_ADDR_INT32_SMP = 0xffff0000
--+ IPV6_ADDR_INT16_ULL = 0x80fe
--+ IPV6_ADDR_INT16_USL = 0xc0fe
--+ IPV6_ADDR_INT16_MLL = 0x02ff
--+ def IN6_IS_ADDR_UNSPECIFIED(a): return \
--+ 
--+ def IN6_IS_ADDR_LOOPBACK(a): return \
--+ 
--+ def IN6_IS_ADDR_V4COMPAT(a): return \
--+ 
--+ def IN6_IS_ADDR_V4MAPPED(a): return \
--+ 
--+ IPV6_ADDR_SCOPE_NODELOCAL = 0x01
--+ IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
--+ IPV6_ADDR_SCOPE_SITELOCAL = 0x05
--+ IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
--+ IPV6_ADDR_SCOPE_GLOBAL = 0x0e
--+ __IPV6_ADDR_SCOPE_NODELOCAL = 0x01
--+ __IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
--+ __IPV6_ADDR_SCOPE_SITELOCAL = 0x05
--+ __IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
--+ __IPV6_ADDR_SCOPE_GLOBAL = 0x0e
--+ def IN6_IS_ADDR_LINKLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_SITELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_GLOBAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_NODELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_SITELOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
--+ 
--+ def IN6_IS_ADDR_MC_GLOBAL(a): return \
--+ 
--+ def IN6_IS_SCOPE_LINKLOCAL(a): return \
--+ 
--+ IPV6_OPTIONS = 1
--+ IPV6_RECVOPTS = 5
--+ IPV6_RECVRETOPTS = 6
--+ IPV6_RECVDSTADDR = 7
--+ IPV6_RETOPTS = 8
--+ IPV6_SOCKOPT_RESERVED1 = 3
--+ IPV6_UNICAST_HOPS = 4
--+ IPV6_MULTICAST_IF = 9
--+ IPV6_MULTICAST_HOPS = 10
--+ IPV6_MULTICAST_LOOP = 11
--+ IPV6_JOIN_GROUP = 12
--+ IPV6_LEAVE_GROUP = 13
--+ IPV6_PORTRANGE = 14
--+ ICMP6_FILTER = 18
--+ IPV6_PKTINFO = 19
--+ IPV6_HOPLIMIT = 20
--+ IPV6_NEXTHOP = 21
--+ IPV6_HOPOPTS = 22
--+ IPV6_DSTOPTS = 23
--+ IPV6_RTHDR = 24
--+ IPV6_PKTOPTIONS = 25
--+ IPV6_CHECKSUM = 26
--+ IPV6_BINDV6ONLY = 27
--+ IPV6_IPSEC_POLICY = 28
--+ IPV6_FAITH = 29
--+ IPV6_FW_ADD = 30
--+ IPV6_FW_DEL = 31
--+ IPV6_FW_FLUSH = 32
--+ IPV6_FW_ZERO = 33
--+ IPV6_FW_GET = 34
--+ IPV6_RTHDR_LOOSE = 0
--+ IPV6_RTHDR_STRICT = 1
--+ IPV6_RTHDR_TYPE_0 = 0
--+ IPV6_DEFAULT_MULTICAST_HOPS = 1
--+ IPV6_DEFAULT_MULTICAST_LOOP = 1
--+ IPV6_PORTRANGE_DEFAULT = 0
--+ IPV6_PORTRANGE_HIGH = 1
--+ IPV6_PORTRANGE_LOW = 2
--+ IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
--+ IPV6CTL_FORWARDING = 1
--+ IPV6CTL_SENDREDIRECTS = 2
--+ IPV6CTL_DEFHLIM = 3
--+ IPV6CTL_DEFMTU = 4
--+ IPV6CTL_FORWSRCRT = 5
--+ IPV6CTL_STATS = 6
--+ IPV6CTL_MRTSTATS = 7
--+ IPV6CTL_MRTPROTO = 8
--+ IPV6CTL_MAXFRAGPACKETS = 9
--+ IPV6CTL_SOURCECHECK = 10
--+ IPV6CTL_SOURCECHECK_LOGINT = 11
--+ IPV6CTL_ACCEPT_RTADV = 12
--+ IPV6CTL_KEEPFAITH = 13
--+ IPV6CTL_LOG_INTERVAL = 14
--+ IPV6CTL_HDRNESTLIMIT = 15
--+ IPV6CTL_DAD_COUNT = 16
--+ IPV6CTL_AUTO_FLOWLABEL = 17
--+ IPV6CTL_DEFMCASTHLIM = 18
--+ IPV6CTL_GIF_HLIM = 19
--+ IPV6CTL_KAME_VERSION = 20
--+ IPV6CTL_USE_DEPRECATED = 21
--+ IPV6CTL_RR_PRUNE = 22
--+ IPV6CTL_MAPPED_ADDR = 23
--+ IPV6CTL_BINDV6ONLY = 24
--+ IPV6CTL_RTEXPIRE = 25
--+ IPV6CTL_RTMINEXPIRE = 26
--+ IPV6CTL_RTMAXCACHE = 27
--+ IPV6CTL_MAXID = 28
--*** misc/Python-2.3.4/Lib/plat-freebsd7/regen	Tue Aug  9 06:26:27 2005
----- misc/build/Python-2.3.4/Lib/plat-freebsd7/regen	Tue Aug  9 06:19:02 2005
--***************
--*** 0 ****
----- 1,3 ----
--+ #! /bin/sh
--+ set -v
--+ python ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
- *** misc/Python-2.3.4/configure	Fri May  7 21:13:40 2004
- --- misc/build/Python-2.3.4/configure	Wed Oct 17 14:01:02 2007
- ***************
-@@ -16214,3 +17097,22 @@
+@@ -15547,3 +17166,22 @@
    
    /* Define the macros needed if on a UnixWare 7.x system. */
    #if defined(__USLC__) && defined(__SCO_VERSION__)
diff --git a/editors/openoffice.org-3/files/patch-i85972 b/editors/openoffice.org-3/files/patch-i85972
new file mode 100644
index 000000000000..4b24c9d2ca7d
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i85972
@@ -0,0 +1,68 @@
+Index: lpsolve/lp_solve_5.5.patch
+===================================================================
+RCS file: /cvs/external/lpsolve/lp_solve_5.5.patch,v
+retrieving revision 1.2
+diff -u -r1.2 lp_solve_5.5.patch
+--- lpsolve/lp_solve_5.5.patch	20 Dec 2007 15:58:45 -0000	1.2
++++ lpsolve/lp_solve_5.5.patch	9 Feb 2008 07:19:59 -0000
+@@ -29,3 +29,27 @@
+ ! fi
+ ! 
+ ! rm *.o 2>/dev/null
++*** misc/lp_solve_5.5/lpsolve55/ccc.freebsd	Fri Nov 23 21:38:12 2007
++--- misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd	Fri Nov 23 21:58:29 2007
++***************
++*** 1 ****
++! dummy
++--- 1,18 ----
++! src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
++! 
++! def=
++! so=yes
++! 
++! opts='-O3 -DINTEGERTIME'
++!
++! $CC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++! ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++! ranlib liblpsolve55.a
++! 
++! if [ "$so" != "" ]
++! then
++!   $CC -fPIC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++!   $CC -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm
++! fi
++! 
++! rm *.o 2>/dev/null
+Index: lpsolve/makefile.mk
+===================================================================
+RCS file: /cvs/external/lpsolve/makefile.mk,v
+retrieving revision 1.3
+diff -u -r1.3 makefile.mk
+--- lpsolve/makefile.mk	21 Dec 2007 09:32:37 -0000	1.3
++++ lpsolve/makefile.mk	9 Feb 2008 07:20:00 -0000
+@@ -50,7 +50,7 @@
+ PATCH_FILE_NAME=lp_solve_5.5-windows.patch
+ .ELSE
+ PATCH_FILE_NAME=lp_solve_5.5.patch
+-ADDITIONAL_FILES=lpsolve55$/ccc.solaris
++ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd
+ .ENDIF
+ 
+ CONFIGURE_DIR=
+@@ -70,11 +70,16 @@
+ .IF "$(COMNAME)"=="sunpro5"
+ BUILD_ACTION=sh ccc.solaris
+ .ELSE
++.IF "$(OS)"=="FREEBSD"
++BUILD_ACTION=sh -x ccc.freebsd
++OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
++.ELSE
+ BUILD_ACTION=sh ccc
+ .ENDIF
+ OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
+ .ENDIF
+ .ENDIF
++.ENDIF
+ 
+ OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h
+ 
diff --git a/editors/openoffice.org-3/files/patch-i87583 b/editors/openoffice.org-3/files/patch-i87583
new file mode 100644
index 000000000000..17d3d37ee8e3
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i87583
@@ -0,0 +1,26 @@
+--- desktop/scripts/soffice.sh	2008-03-18 22:44:45.000000000 +0900
++++ desktop/scripts/soffice.sh	2008-03-29 19:17:49.000000000 +0900
+@@ -68,6 +68,23 @@
+ 
+ sd_binary=`basename "$0"`.bin
+ 
++# this is a temporary hack until we can live with the default search paths
++case "`uname -s`" in
++    FreeBSD)
++        sd_prog1="$sd_prog/../basis-link/program"
++	sd_prog2="$sd_prog/../basis-link/ure-link/lib"
++	if [ $LD_LIBRARY_PATH ]; then
++    	    SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
++   	    export SYSTEM_LD_LIBRARY_PATH
++    	    LD_LIBRARY_PATH="$sd_prog1:$sd_prog2":$LD_LIBRARY_PATH
++	else
++    	    LD_LIBRARY_PATH="$sd_prog1:$sd_prog2"
++	fi
++	export LD_LIBRARY_PATH
++	;;
++
++esac
++
+ #collect all bootstrap variables specified on the command line
+ #so that they can be passed as arguments to javaldx later on
+ for arg in $@
diff --git a/editors/openoffice.org-3/files/patch-i88156 b/editors/openoffice.org-3/files/patch-i88156
new file mode 100644
index 000000000000..7c8b38558433
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i88156
@@ -0,0 +1,18 @@
+Index: binfilter/bf_sw/source/filter/w4w/makefile.mk
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/filter/w4w/makefile.mk,v
+retrieving revision 1.9
+diff -u -r1.9 makefile.mk
+--- binfilter/bf_sw/source/filter/w4w/makefile.mk	20 Nov 2006 12:38:59 -0000	1.9
++++ binfilter/bf_sw/source/filter/w4w/makefile.mk	12 Apr 2008 00:02:49 -0000
+@@ -58,6 +58,10 @@
+ CDEFS=$(CDEFS) -Dmydebug
+ .ENDIF
+ 
++.IF "$(OSL_DEBUG_LEVEL)" > 0
++CDEFS += -DENABLE_BYTESTRING_STREAM_OPERATORS
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+ 
+ CXXFILES = \
diff --git a/editors/openoffice.org-3/files/patch-i88160 b/editors/openoffice.org-3/files/patch-i88160
new file mode 100644
index 000000000000..fc21b222aa2c
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i88160
@@ -0,0 +1,16 @@
+Index: sw/source/core/doc/dbgoutsw.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/core/doc/dbgoutsw.cxx,v
+retrieving revision 1.23
+diff -u -r1.23 dbgoutsw.cxx
+--- sw/source/core/doc/dbgoutsw.cxx	19 Feb 2008 13:40:02 -0000	1.23
++++ sw/source/core/doc/dbgoutsw.cxx	12 Apr 2008 00:17:46 -0000
+@@ -296,7 +296,7 @@
+         if (!bFirst)
+             aStr += String(", ", RTL_TEXTENCODING_ASCII_US);
+ 
+-        if ((sal_uInt32)pItem != 0xffffffff)
++        if (! pItem->IsInvalidItem())
+             aStr += lcl_dbg_out(*pItem);
+         else
+             aStr += String("invalid", RTL_TEXTENCODING_ASCII_US);
diff --git a/editors/openoffice.org-3/files/pkg-message.in b/editors/openoffice.org-3/files/pkg-message.in
index 4215af3b4049..f2e1165799a7 100644
--- a/editors/openoffice.org-3/files/pkg-message.in
+++ b/editors/openoffice.org-3/files/pkg-message.in
@@ -13,7 +13,7 @@ Just type "%%EXECBASE%%" after you have successfully
 installed the package. If there is no installed
 OO.org dir in your homedir, you'll be prompted to
 install some files and choose an installed JDK.
-The setup installs a ".openoffice.org2" folder
+The setup installs a ".openoffice.org3" folder
 in your homedir.
 
 2. Starting OO.org
@@ -38,5 +38,5 @@ OO.org does need $LANG to be set to a suitable value.
 3. If you run into problems
 --------------------------------------------------
 If you somehow run into problems, please remove the already installed
-".openoffice.org2" dir in your homedir. Redo the user
+".openoffice.org3" dir in your homedir. Redo the user
 installation and the problems should go away.