23 files changed, 336 insertions, 288 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index f6011079ea04..45c5fb4e7289 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
-PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -33,7 +32,7 @@ DISTFILES+=	${CWSARCHIVE}:cws
 .endif
 CWSARCHIVE=	${WITH_CWS}.tar.gz
 
-OOOVERSION=	3.0.0.b
+OOOVERSION=	3.0.0.b2
 NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
 MOZILLA_VERSION=	1.7.5
@@ -78,8 +77,8 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		2
-OOOTAG?=		BEA300_m${MILESTONE}
+MILESTONE?=		3
+OOOTAG?=		BEB300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
@@ -206,7 +205,7 @@ pre-configure:
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
-	@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}"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}"
 
 .if ${LOCALIZED_LANG} == "alllangs"
 	@${MAKE} languagepack
@@ -244,9 +243,8 @@ post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
+			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
 			-e 's#%%OOODIR%%#${OOODIR}#g' \
-			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
@@ -255,8 +253,8 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${ECHO_CMD} "" > ${TMPPLIST}
@@ -264,13 +262,16 @@ post-install:
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
 	@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}/${OOODIR}/share/xdg/*.desktop
-	@for app in base calc draw impress math printeradmin writer; do \
+	@for app in base calc draw impress math writer; do \
 		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
 			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
 		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
 	done
+	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \
+		-e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \
+		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop
+	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \
+		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/qstart.desktop
 	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
 	@${RM} -f ${DESKTOPDIR}/${EXECBASE}
 	@${MKDIR} ${DESKTOPDIR}
@@ -300,10 +301,9 @@ post-install:
 	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
-			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
+			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
+			-e 's#%%OOODIR%%#${OOODIR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 27fe53121f25..917c7efaf0d8 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,6 +1,6 @@
-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/OOo_BEB300_m3_source.tar.bz2) = e5f3677affcf64293048a8e9235bba89
+SHA256 (openoffice.org3/OOo_BEB300_m3_source.tar.bz2) = 493d6e45407a14de1acda5ed64adbd4cca966de11ffd6acec9ba24f7e359e185
+SIZE (openoffice.org3/OOo_BEB300_m3_source.tar.bz2) = 299207769
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3/files/openoffice.org-wrapper b/editors/openoffice-3/files/openoffice.org-wrapper
index c409ec71d079..40d33c578c71 100644
--- a/editors/openoffice-3/files/openoffice.org-wrapper
+++ b/editors/openoffice-3/files/openoffice.org-wrapper
@@ -1,15 +1,18 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/Attic/openoffice.org-wrapper,v 1.4 2008-06-14 01:32:33 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3/files/Attic/openoffice.org-wrapper,v 1.5 2008-07-12 22:56:44 maho Exp $
 
-oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/%%OOODIR%%/program/
+oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/%%OOODIR%%
 program=`echo $0 | sed -e 's|.*-%%OOOVERSION%%-||'`
 
 case $program in
 $0)
-	$oopath/soffice "$@"
+	$oopath/program/soffice "$@"
 	;;
-	*)
-	$oopath/$program "$@"
+setofficelang)
+	$oopath/basis-link/program/$program "$@"
+	;;
+*)
+	$oopath/program/$program "$@"
 	;;
 esac
diff --git a/editors/openoffice-3/files/patch-i80129 b/editors/openoffice-3/files/patch-i80129
index 24cc48f48ccd..d6d5861503e0 100644
--- a/editors/openoffice-3/files/patch-i80129
+++ b/editors/openoffice-3/files/patch-i80129
@@ -1,18 +1,35 @@
 Merely a workaround
 
+Index: libxml2/libxml2-2.6.31.patch
+===================================================================
+RCS file: /cvs/external/libxml2/libxml2-2.6.31.patch,v
+retrieving revision 1.2
+diff -u -r1.2 libxml2-2.6.31.patch
+--- libxml2/libxml2-2.6.31.patch	6 Jun 2008 11:48:45 -0000	1.2
++++ libxml2/libxml2-2.6.31.patch	10 Jun 2008 09:34:51 -0000
+@@ -87,7 +87,7 @@
+   	  ;;
+   
+   	freebsd-elf)
+-! 	  major=.`expr $current - $age`
++! 	  major=`expr $current - $age`
+ ! 	  versuffix=".$major.$age.$revision";
+   	  ;;
+   
+
 Index: scp2/source/ooo/ure.scp
 ===================================================================
 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 @@
+retrieving revision 1.7
+diff -u -r1.7 ure.scp
+--- scp2/source/ooo/ure.scp	6 Jun 2008 17:05:51 -0000	1.7
++++ scp2/source/ooo/ure.scp	10 Jun 2008 09:45:54 -0000
+@@ -679,6 +679,8 @@
  #endif
  #elif defined MACOSX
      Name = SCP2_URE_DL_NORMAL("xml2.2");
 +#elif defined FREEBSD
-+    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
++    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.31));
  #else
      Name = SCP2_URE_DL_VER("xml2", "2");
  #endif
diff --git a/editors/openoffice-3/files/patch-i85127 b/editors/openoffice-3/files/patch-i85127
index 60d99db2fc18..75f41e93f555 100644
--- a/editors/openoffice-3/files/patch-i85127
+++ b/editors/openoffice-3/files/patch-i85127
@@ -1,17 +1,17 @@
 - Add support for FreeBSD 8.x.
 - Add patches for setup.py and Lib/posixfile.py.
 
-Index: python/Python-2.3.4.patch
+Index: 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'
-       from posix import *
+retrieving revision 1.22
+diff -u -r1.22 Python-2.3.4.patch
+--- python/Python-2.3.4.patch	9 Jun 2008 13:04:49 -0000	1.22
++++ python/Python-2.3.4.patch	14 Jun 2008 01:41:01 -0000
+@@ -14661,3 +14661,1648 @@
+  
+  /* Define the macros needed if on a UnixWare 7.x system. */
+  #if defined(__USLC__) && defined(__SCO_VERSION__)
 +*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py	Wed Dec 31 19:00:00 1969
 +--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Jan  8 14:12:12 2008
 +***************
@@ -1631,13 +1631,13 @@ diff -u -r1.21 Python-2.3.4.patch
 +              flock = struct.pack('lxxxxlxxxxlhh', \
 +                    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	Tue Jan 15 12:11:51 2008
- ***************
-@@ -15547,3 +17166,22 @@
-   
-   /* Define the macros needed if on a UnixWare 7.x system. */
-   #if defined(__USLC__) && defined(__SCO_VERSION__)
++*** misc/Python-2.3.4/Mac/OSX/Makefile	Tue Nov  4 23:45:16 2003
++--- misc/build/Python-2.3.4/Mac/OSX/Makefile	Tue Jan 15 12:11:51 2008
++***************
++@ -15547,3 +17166,22 @@
++  
++  /* Define the macros needed if on a UnixWare 7.x system. */
++  #if defined(__USLC__) && defined(__SCO_VERSION__)
 +*** misc/Python-2.3.4/setup.py	Tue Oct 21 16:01:21 2003
 +--- misc/build/Python-2.3.4/setup.py	Tue Jan  8 14:17:55 2008
 +***************
diff --git a/editors/openoffice-3/files/patch-i85972 b/editors/openoffice-3/files/patch-i85972
index 4b24c9d2ca7d..931cbb8c535d 100644
--- a/editors/openoffice-3/files/patch-i85972
+++ b/editors/openoffice-3/files/patch-i85972
@@ -1,46 +1,44 @@
 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
+retrieving revision 1.4
+diff -u -r1.4 lp_solve_5.5.patch
+--- lpsolve/lp_solve_5.5.patch	16 Jun 2008 14:19:46 -0000	1.4
++++ lpsolve/lp_solve_5.5.patch	3 Jul 2008 00:20:52 -0000
+@@ -72,3 +72,25 @@
+ +fi
+ +
+ +rm *.o 2>/dev/null
++--- misc/lp_solve_5.5/lpsolve55/ccc.freebsd	Wed May 21 17:45:07 2008
+++++ misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd	Wed May 21 17:44:54 2008
++@@ -1,1 +1,18 @@
++-dummy
+++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'
+++
+++c=$CC
+++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 @@
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- lpsolve/makefile.mk	11 Apr 2008 07:18:41 -0000	1.5
++++ lpsolve/makefile.mk	3 Jul 2008 00:20:53 -0000
+@@ -46,7 +46,7 @@
  PATCH_FILE_NAME=lp_solve_5.5-windows.patch
  .ELSE
  PATCH_FILE_NAME=lp_solve_5.5.patch
diff --git a/editors/openoffice-3/files/patch-i86558 b/editors/openoffice-3/files/patch-i86558
deleted file mode 100644
index ff723e835f09..000000000000
--- a/editors/openoffice-3/files/patch-i86558
+++ /dev/null
@@ -1,18 +0,0 @@
---- psprint/source/printer/printerinfomanager.cxx.orig	2007-12-12 09:56:19.000000000 -0500
-+++ psprint/source/printer/printerinfomanager.cxx	2008-02-28 17:46:34.000000000 -0500
-@@ -145,12 +145,12 @@
-     bool bSuccess = false;
- 
-     // try libpaper
--    #ifdef SOLARIS
-+    #ifdef LINUX
-     // #i78617# workaround missing paperconf command; on e.g. Linux
-     // the 2>/dev/null works on the started shell also
--    FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" );
--    #else
-     FILE* pPipe = popen( "paperconf 2>/dev/null", "r" );
-+    #else
-+    FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" );
-     #endif
-     if( pPipe )
-     {
diff --git a/editors/openoffice-3/files/patch-i87583 b/editors/openoffice-3/files/patch-i87583
index 17d3d37ee8e3..e82f268d7ad0 100644
--- a/editors/openoffice-3/files/patch-i87583
+++ b/editors/openoffice-3/files/patch-i87583
@@ -1,26 +1,50 @@
---- 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 @@
+--- configmgr/source/cmdtools/setofficelang.sh.orig	2008-06-09 08:42:48.000000000 -0400
++++ configmgr/source/cmdtools/setofficelang.sh	2008-06-27 15:47:37.000000000 -0400
+@@ -75,6 +75,11 @@
+     export DYLD_LIBRARY_PATH
+     ;;
  
- sd_binary=`basename "$0"`.bin
++  FreeBSD)
++    LD_LIBRARY_PATH=${sd_prog}:${sd_prog}/../ure-link/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
++    export LD_LIBRARY_PATH
++    ;;
++
+   HP-UX)
+     SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}}
+     export SHLIB_PATH
+--- desktop/scripts/soffice.sh.orig	2008-06-09 08:57:10.000000000 -0400
++++ desktop/scripts/soffice.sh	2008-06-27 16:12:58.000000000 -0400
+@@ -75,6 +75,15 @@
  
-+# this is a temporary hack until we can live with the default search paths
-+case "`uname -s`" in
+ # extend the ld_library_path for java: javaldx checks the sofficerc for us
+ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
++    # 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_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
++	LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
 +	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 $@
++    esac
+     my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
+         "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
+     if [ -n "$my_path" ] ; then
+--- padmin/source/spadmin.sh.orig	2008-06-27 01:18:09.000000000 -0400
++++ padmin/source/spadmin.sh	2008-06-27 13:31:09.000000000 -0400
+@@ -58,6 +58,15 @@
+ 
+ # extend the ld_library_path for java: javaldx checks the sofficerc for us
+ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
++    # 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"
++	LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
++	export LD_LIBRARY_PATH
++	;;
++    esac
+     my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
+         "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
+     if [ -n "$my_path" ] ; then
diff --git a/editors/openoffice-3/files/patch-i88160 b/editors/openoffice-3/files/patch-i88160
deleted file mode 100644
index fc21b222aa2c..000000000000
--- a/editors/openoffice-3/files/patch-i88160
+++ /dev/null
@@ -1,16 +0,0 @@
-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/patch-i91318 b/editors/openoffice-3/files/patch-i91318
new file mode 100644
index 000000000000..172af1ddae5a
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i91318
@@ -0,0 +1,18 @@
+Index: hunspell/hunspell-1.1.12.patch
+===================================================================
+RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v
+retrieving revision 1.11
+diff -u -r1.11 hunspell-1.1.12.patch
+--- hunspell/hunspell-1.1.12.patch	18 Jun 2008 10:07:23 -0000	1.11
++++ hunspell/hunspell-1.1.12.patch	2 Jul 2008 20:13:47 -0000
+@@ -450,3 +450,10 @@
+  i68568utf.test \
+  1706659.test \
+  digits_in_words.test \
++--- misc/hunspell-1.1.12/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
+++++ misc/build/hunspell-1.1.12/tests/test.sh	2008-07-01 06:18:31.000000000 +0900
++@@ -1,4 +1,4 @@
++-#!/bin/bash
+++#!/usr/local/bin/bash
++ export LC_ALL="C"
++ 
diff --git a/editors/openoffice-3/files/pkg-message.in b/editors/openoffice-3/files/pkg-message.in
index f2e1165799a7..7bfa92c74667 100644
--- a/editors/openoffice-3/files/pkg-message.in
+++ b/editors/openoffice-3/files/pkg-message.in
@@ -1,20 +1,17 @@
-OpenOffice.org Build %%OOOVERSION%% Personal Install How-To
+OpenOffice.org Build %%OOOTAG%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
-OpenOffice.org %%OOOVERSION%% will soon been installed in
+OpenOffice.org %%OOOTAG%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
 1. User installation
 --------------------
 
 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.org3" folder
-in your homedir.
+installed the package. If there is no installed OO.org dir
+in your homedir, the setup installs ".%%OOODIR%%" folder.
 
 2. Starting OO.org
 ------------------
@@ -37,6 +34,6 @@ 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.org3" dir in your homedir. Redo the user
+If you somehow run into problems, please remove the already
+installed ".%%OOODIR%%" dir in your homedir. Redo the user
 installation and the problems should go away.
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 1b74835aaf19..06333ea5c519 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -26,6 +26,8 @@ EXTRACT_ONLY=	${OOOSRC}
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(release branch)
 
+IGNORE=		please use openoffice.org-3 port
+
 .if defined(WITH_CWS)
 PORTNAME:=	openoffice.org-${WITH_CWS}
 DISTFILES+=	${CWSARCHIVE}:cws
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index f6011079ea04..45c5fb4e7289 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
-PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -33,7 +32,7 @@ DISTFILES+=	${CWSARCHIVE}:cws
 .endif
 CWSARCHIVE=	${WITH_CWS}.tar.gz
 
-OOOVERSION=	3.0.0.b
+OOOVERSION=	3.0.0.b2
 NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
 MOZILLA_VERSION=	1.7.5
@@ -78,8 +77,8 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		2
-OOOTAG?=		BEA300_m${MILESTONE}
+MILESTONE?=		3
+OOOTAG?=		BEB300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
@@ -206,7 +205,7 @@ pre-configure:
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
-	@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}"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" "TMP=${WRKSRC}" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${MAXMODULES} --all --html --dontgraboutput -- -P${MAXPROCESSES}"
 
 .if ${LOCALIZED_LANG} == "alllangs"
 	@${MAKE} languagepack
@@ -244,9 +243,8 @@ post-install:
 	@${ECHO_MSG} "===>  Add wrapper scripts";
 	@${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
+			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
 			-e 's#%%OOODIR%%#${OOODIR}#g' \
-			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
 			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			${WRKDIR}/openoffice.org-wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \
@@ -255,8 +253,8 @@ post-install:
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setofficelang
-	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
+	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
 	@${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
 	@${ECHO_CMD} "" > ${TMPPLIST}
@@ -264,13 +262,16 @@ post-install:
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST}
 	@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}/${OOODIR}/share/xdg/*.desktop
-	@for app in base calc draw impress math printeradmin writer; do \
+	@for app in base calc draw impress math writer; do \
 		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
 			-e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \
 		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/$${app}.desktop ; \
 	done
+	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE}-spadmin %U/" \
+		-e "s/^Icon.*/Icon=${EXECBASE}-printeradmin.png/" \
+		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/printeradmin.desktop
+	@${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -quickstart -nologo -nodefault/" \
+		${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/qstart.desktop
 	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/share/xdg/*.desktop.bak
 	@${RM} -f ${DESKTOPDIR}/${EXECBASE}
 	@${MKDIR} ${DESKTOPDIR}
@@ -300,10 +301,9 @@ post-install:
 	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gtk-update-icon-cache -q -f %D/share/icons/hicolor 2>/dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
-			-e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \
 			-e 's#%%EXECBASE%%#${EXECBASE}#g' \
-			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
-			-e 's#%%OOOVERSION%%#${OOOVERSION}#g' \
+			-e 's#%%OOOTAG%%#${OOOTAG}#g' \
+			-e 's#%%OOODIR%%#${OOODIR}#g' \
 			${PKGMESSAGE}
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 27fe53121f25..917c7efaf0d8 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,6 +1,6 @@
-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/OOo_BEB300_m3_source.tar.bz2) = e5f3677affcf64293048a8e9235bba89
+SHA256 (openoffice.org3/OOo_BEB300_m3_source.tar.bz2) = 493d6e45407a14de1acda5ed64adbd4cca966de11ffd6acec9ba24f7e359e185
+SIZE (openoffice.org3/OOo_BEB300_m3_source.tar.bz2) = 299207769
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3/files/openoffice.org-wrapper b/editors/openoffice.org-3/files/openoffice.org-wrapper
index cab5d9589b9d..91e76a8ef849 100644
--- a/editors/openoffice.org-3/files/openoffice.org-wrapper
+++ b/editors/openoffice.org-3/files/openoffice.org-wrapper
@@ -1,15 +1,18 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/openoffice.org-wrapper,v 1.4 2008-06-14 01:32:33 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3/files/Attic/openoffice.org-wrapper,v 1.5 2008-07-12 22:56:44 maho Exp $
 
-oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/%%OOODIR%%/program/
+oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/%%OOODIR%%
 program=`echo $0 | sed -e 's|.*-%%OOOVERSION%%-||'`
 
 case $program in
 $0)
-	$oopath/soffice "$@"
+	$oopath/program/soffice "$@"
 	;;
-	*)
-	$oopath/$program "$@"
+setofficelang)
+	$oopath/basis-link/program/$program "$@"
+	;;
+*)
+	$oopath/program/$program "$@"
 	;;
 esac
diff --git a/editors/openoffice.org-3/files/patch-i80129 b/editors/openoffice.org-3/files/patch-i80129
index 24cc48f48ccd..d6d5861503e0 100644
--- a/editors/openoffice.org-3/files/patch-i80129
+++ b/editors/openoffice.org-3/files/patch-i80129
@@ -1,18 +1,35 @@
 Merely a workaround
 
+Index: libxml2/libxml2-2.6.31.patch
+===================================================================
+RCS file: /cvs/external/libxml2/libxml2-2.6.31.patch,v
+retrieving revision 1.2
+diff -u -r1.2 libxml2-2.6.31.patch
+--- libxml2/libxml2-2.6.31.patch	6 Jun 2008 11:48:45 -0000	1.2
++++ libxml2/libxml2-2.6.31.patch	10 Jun 2008 09:34:51 -0000
+@@ -87,7 +87,7 @@
+   	  ;;
+   
+   	freebsd-elf)
+-! 	  major=.`expr $current - $age`
++! 	  major=`expr $current - $age`
+ ! 	  versuffix=".$major.$age.$revision";
+   	  ;;
+   
+
 Index: scp2/source/ooo/ure.scp
 ===================================================================
 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 @@
+retrieving revision 1.7
+diff -u -r1.7 ure.scp
+--- scp2/source/ooo/ure.scp	6 Jun 2008 17:05:51 -0000	1.7
++++ scp2/source/ooo/ure.scp	10 Jun 2008 09:45:54 -0000
+@@ -679,6 +679,8 @@
  #endif
  #elif defined MACOSX
      Name = SCP2_URE_DL_NORMAL("xml2.2");
 +#elif defined FREEBSD
-+    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
++    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.31));
  #else
      Name = SCP2_URE_DL_VER("xml2", "2");
  #endif
diff --git a/editors/openoffice.org-3/files/patch-i85127 b/editors/openoffice.org-3/files/patch-i85127
index 60d99db2fc18..75f41e93f555 100644
--- a/editors/openoffice.org-3/files/patch-i85127
+++ b/editors/openoffice.org-3/files/patch-i85127
@@ -1,17 +1,17 @@
 - Add support for FreeBSD 8.x.
 - Add patches for setup.py and Lib/posixfile.py.
 
-Index: python/Python-2.3.4.patch
+Index: 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'
-       from posix import *
+retrieving revision 1.22
+diff -u -r1.22 Python-2.3.4.patch
+--- python/Python-2.3.4.patch	9 Jun 2008 13:04:49 -0000	1.22
++++ python/Python-2.3.4.patch	14 Jun 2008 01:41:01 -0000
+@@ -14661,3 +14661,1648 @@
+  
+  /* Define the macros needed if on a UnixWare 7.x system. */
+  #if defined(__USLC__) && defined(__SCO_VERSION__)
 +*** misc/Python-2.3.4/Lib/plat-freebsd6/IN.py	Wed Dec 31 19:00:00 1969
 +--- misc/build/Python-2.3.4/Lib/plat-freebsd6/IN.py	Tue Jan  8 14:12:12 2008
 +***************
@@ -1631,13 +1631,13 @@ diff -u -r1.21 Python-2.3.4.patch
 +              flock = struct.pack('lxxxxlxxxxlhh', \
 +                    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	Tue Jan 15 12:11:51 2008
- ***************
-@@ -15547,3 +17166,22 @@
-   
-   /* Define the macros needed if on a UnixWare 7.x system. */
-   #if defined(__USLC__) && defined(__SCO_VERSION__)
++*** misc/Python-2.3.4/Mac/OSX/Makefile	Tue Nov  4 23:45:16 2003
++--- misc/build/Python-2.3.4/Mac/OSX/Makefile	Tue Jan 15 12:11:51 2008
++***************
++@ -15547,3 +17166,22 @@
++  
++  /* Define the macros needed if on a UnixWare 7.x system. */
++  #if defined(__USLC__) && defined(__SCO_VERSION__)
 +*** misc/Python-2.3.4/setup.py	Tue Oct 21 16:01:21 2003
 +--- misc/build/Python-2.3.4/setup.py	Tue Jan  8 14:17:55 2008
 +***************
diff --git a/editors/openoffice.org-3/files/patch-i85972 b/editors/openoffice.org-3/files/patch-i85972
index 4b24c9d2ca7d..931cbb8c535d 100644
--- a/editors/openoffice.org-3/files/patch-i85972
+++ b/editors/openoffice.org-3/files/patch-i85972
@@ -1,46 +1,44 @@
 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
+retrieving revision 1.4
+diff -u -r1.4 lp_solve_5.5.patch
+--- lpsolve/lp_solve_5.5.patch	16 Jun 2008 14:19:46 -0000	1.4
++++ lpsolve/lp_solve_5.5.patch	3 Jul 2008 00:20:52 -0000
+@@ -72,3 +72,25 @@
+ +fi
+ +
+ +rm *.o 2>/dev/null
++--- misc/lp_solve_5.5/lpsolve55/ccc.freebsd	Wed May 21 17:45:07 2008
+++++ misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd	Wed May 21 17:44:54 2008
++@@ -1,1 +1,18 @@
++-dummy
+++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'
+++
+++c=$CC
+++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 @@
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- lpsolve/makefile.mk	11 Apr 2008 07:18:41 -0000	1.5
++++ lpsolve/makefile.mk	3 Jul 2008 00:20:53 -0000
+@@ -46,7 +46,7 @@
  PATCH_FILE_NAME=lp_solve_5.5-windows.patch
  .ELSE
  PATCH_FILE_NAME=lp_solve_5.5.patch
diff --git a/editors/openoffice.org-3/files/patch-i86558 b/editors/openoffice.org-3/files/patch-i86558
deleted file mode 100644
index ff723e835f09..000000000000
--- a/editors/openoffice.org-3/files/patch-i86558
+++ /dev/null
@@ -1,18 +0,0 @@
---- psprint/source/printer/printerinfomanager.cxx.orig	2007-12-12 09:56:19.000000000 -0500
-+++ psprint/source/printer/printerinfomanager.cxx	2008-02-28 17:46:34.000000000 -0500
-@@ -145,12 +145,12 @@
-     bool bSuccess = false;
- 
-     // try libpaper
--    #ifdef SOLARIS
-+    #ifdef LINUX
-     // #i78617# workaround missing paperconf command; on e.g. Linux
-     // the 2>/dev/null works on the started shell also
--    FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" );
--    #else
-     FILE* pPipe = popen( "paperconf 2>/dev/null", "r" );
-+    #else
-+    FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" );
-     #endif
-     if( pPipe )
-     {
diff --git a/editors/openoffice.org-3/files/patch-i87583 b/editors/openoffice.org-3/files/patch-i87583
index 17d3d37ee8e3..e82f268d7ad0 100644
--- a/editors/openoffice.org-3/files/patch-i87583
+++ b/editors/openoffice.org-3/files/patch-i87583
@@ -1,26 +1,50 @@
---- 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 @@
+--- configmgr/source/cmdtools/setofficelang.sh.orig	2008-06-09 08:42:48.000000000 -0400
++++ configmgr/source/cmdtools/setofficelang.sh	2008-06-27 15:47:37.000000000 -0400
+@@ -75,6 +75,11 @@
+     export DYLD_LIBRARY_PATH
+     ;;
  
- sd_binary=`basename "$0"`.bin
++  FreeBSD)
++    LD_LIBRARY_PATH=${sd_prog}:${sd_prog}/../ure-link/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
++    export LD_LIBRARY_PATH
++    ;;
++
+   HP-UX)
+     SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}}
+     export SHLIB_PATH
+--- desktop/scripts/soffice.sh.orig	2008-06-09 08:57:10.000000000 -0400
++++ desktop/scripts/soffice.sh	2008-06-27 16:12:58.000000000 -0400
+@@ -75,6 +75,15 @@
  
-+# this is a temporary hack until we can live with the default search paths
-+case "`uname -s`" in
+ # extend the ld_library_path for java: javaldx checks the sofficerc for us
+ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
++    # 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_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
++	LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
 +	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 $@
++    esac
+     my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
+         "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
+     if [ -n "$my_path" ] ; then
+--- padmin/source/spadmin.sh.orig	2008-06-27 01:18:09.000000000 -0400
++++ padmin/source/spadmin.sh	2008-06-27 13:31:09.000000000 -0400
+@@ -58,6 +58,15 @@
+ 
+ # extend the ld_library_path for java: javaldx checks the sofficerc for us
+ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
++    # 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"
++	LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
++	export LD_LIBRARY_PATH
++	;;
++    esac
+     my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
+         "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
+     if [ -n "$my_path" ] ; then
diff --git a/editors/openoffice.org-3/files/patch-i88160 b/editors/openoffice.org-3/files/patch-i88160
deleted file mode 100644
index fc21b222aa2c..000000000000
--- a/editors/openoffice.org-3/files/patch-i88160
+++ /dev/null
@@ -1,16 +0,0 @@
-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/patch-i91318 b/editors/openoffice.org-3/files/patch-i91318
new file mode 100644
index 000000000000..172af1ddae5a
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i91318
@@ -0,0 +1,18 @@
+Index: hunspell/hunspell-1.1.12.patch
+===================================================================
+RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v
+retrieving revision 1.11
+diff -u -r1.11 hunspell-1.1.12.patch
+--- hunspell/hunspell-1.1.12.patch	18 Jun 2008 10:07:23 -0000	1.11
++++ hunspell/hunspell-1.1.12.patch	2 Jul 2008 20:13:47 -0000
+@@ -450,3 +450,10 @@
+  i68568utf.test \
+  1706659.test \
+  digits_in_words.test \
++--- misc/hunspell-1.1.12/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
+++++ misc/build/hunspell-1.1.12/tests/test.sh	2008-07-01 06:18:31.000000000 +0900
++@@ -1,4 +1,4 @@
++-#!/bin/bash
+++#!/usr/local/bin/bash
++ export LC_ALL="C"
++ 
diff --git a/editors/openoffice.org-3/files/pkg-message.in b/editors/openoffice.org-3/files/pkg-message.in
index f2e1165799a7..7bfa92c74667 100644
--- a/editors/openoffice.org-3/files/pkg-message.in
+++ b/editors/openoffice.org-3/files/pkg-message.in
@@ -1,20 +1,17 @@
-OpenOffice.org Build %%OOOVERSION%% Personal Install How-To
+OpenOffice.org Build %%OOOTAG%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
-OpenOffice.org %%OOOVERSION%% will soon been installed in
+OpenOffice.org %%OOOTAG%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
 1. User installation
 --------------------
 
 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.org3" folder
-in your homedir.
+installed the package. If there is no installed OO.org dir
+in your homedir, the setup installs ".%%OOODIR%%" folder.
 
 2. Starting OO.org
 ------------------
@@ -37,6 +34,6 @@ 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.org3" dir in your homedir. Redo the user
+If you somehow run into problems, please remove the already
+installed ".%%OOODIR%%" dir in your homedir. Redo the user
 installation and the problems should go away.