Update to m91

204 files changed, 3420 insertions, 3852 deletions

diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index ad6dc4fa8749..9c5509af0a2e 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050310
+SNAPDATE=	20050406
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -47,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		85
+MILESTONE=		91
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -76,7 +76,6 @@ CXX=	g++-ooo
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
-		epm:${PORTSDIR}/devel/epm \
 		gpatch:${PORTSDIR}/devel/patch \
 		xmkmf:${X_IMAKE_PORT} \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
@@ -104,7 +103,7 @@ UNZIP?=		${PREFIX}/bin/unzip
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	4
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index 5831691b8684..bbd66668973c 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 044e96faae97761f3343bff2d123531a
-SIZE (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 243497173
+MD5 (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = b186d557a51b8fa9faf700e7a71b2470
+SIZE (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = 250068979
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-2.0-devel/files/patch-canvas+inc+canvas+canvastools.hxx b/editors/openoffice-2.0-devel/files/patch-canvas+inc+canvas+canvastools.hxx
new file mode 100644
index 000000000000..5c0c6bd78884
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-canvas+inc+canvas+canvastools.hxx
@@ -0,0 +1,21 @@
+
+Index: canvas/inc/canvas/canvastools.hxx
+===================================================================
+RCS file: /cvs/gsl/canvas/inc/canvas/canvastools.hxx,v
+retrieving revision 1.7
+diff -u -r1.7 canvastools.hxx
+--- canvas/inc/canvas/canvastools.hxx	30 Mar 2005 07:34:18 -0000	1.7
++++ canvas/inc/canvas/canvastools.hxx	6 Apr 2005 01:22:58 -0000
+@@ -133,9 +133,9 @@
+ 		 */
+ 
+ 		// mickey's math tricks...
+-		inline unsigned int powerof2( unsigned int c ) { return 0x1 << c; }
+-		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2(powerof2(c)) + 1); }
+-		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2(c))) & mask(c)); }
++		inline unsigned int powerof2_ooo( unsigned int c ) { return 0x1 << c; }
++		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2_ooo(powerof2_ooo(c)) + 1); }
++		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2_ooo(c))) & mask(c)); }
+ 		template<typename T>
+ 		inline unsigned int bitcount( T c ) {
+ 			unsigned int nByteIndex = 0;
diff --git a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in b/editors/openoffice-2.0-devel/files/patch-config_office+configure.in
deleted file mode 100644
index 20602d3402a6..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=44913
-o configure7
-
---- config_office/configure.in~	Wed Mar  9 01:31:52 2005
-+++ config_office/configure.in	Sun Mar 13 15:53:13 2005
-@@ -565,7 +565,7 @@
- 		test_cups=no
- 		_os=Darwin
- 		;;
--	freebsd)
-+	freebsd*)
- 		test_x=yes
- 		test_gtk=yes
- 		test_kde=yes
diff --git a/editors/openoffice-2.0-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
new file mode 100644
index 000000000000..6cb60786e2e5
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
@@ -0,0 +1,19 @@
+Index: crashrep/source/unx/makefile.mk
+===================================================================
+RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
+retrieving revision 1.14
+diff -u -r1.14 makefile.mk
+--- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
++++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
+@@ -82,7 +82,10 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ 
+-APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
++APP1STDLIBS=$(DYNAMIC) -lXext -lX11
++.IF "$(OS)" != "FREEBSD"
++APP1STDLIBS+=-ldl -lnsl
++.ENDIF
+ .IF "$(OS)" == "SOLARIS"
+ APP1STDLIBS+=-lsocket
+ .ENDIF
diff --git a/editors/openoffice-2.0-devel/files/patch-curl-7.12.2.patch b/editors/openoffice-2.0-devel/files/patch-curl-7.12.2.patch
deleted file mode 100644
index f1597ef75e84..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-curl-7.12.2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-#i 43986#
-
-version number of curl for FreeBSD is somewhat odd.
-we need libcurl.so.3.0.0 not libcurl.so.3
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3*
-after applying this pach
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3.0.0*
-
-Index: curl-7.12.2.patch
-===================================================================
-RCS file: /cvs/external/curl/curl-7.12.2.patch,v
-retrieving revision 1.4
-diff -u -r1.4 curl-7.12.2.patch
---- curl/curl-7.12.2.patch	27 Jan 2005 11:11:50 -0000	1.4
-+++ curl/curl-7.12.2.patch	3 Mar 2005 11:57:27 -0000
-@@ -304,3 +304,68 @@
-      * Check the current list of connections to see if we can
-      * re-use an already existing one or if we have to create a
-      * new one.
-+*** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 20:12:17 2004
-+--- misc/build/curl-7.12.2/ltmain.sh	Thu Mar  3 20:52:09 2005
-+***************
-+*** 2915,2926 ****
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  freebsd-aout|freebsd-elf|sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+--- 2915,2926 ----
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+***************
-+*** 2990,3005 ****
-+  	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+  	  ;;
-+  
-+- 	freebsd-aout)
-+- 	  major=".$current"
-+- 	  versuffix=".$current.$revision";
-+- 	  ;;
-+- 
-+- 	freebsd-elf)
-+- 	  major=".$current"
-+- 	  versuffix=".$current";
-+- 	  ;;
-+- 
-+  	irix | nonstopux)
-+  	  major=`expr $current - $age + 1`
-+  
-+--- 2990,2995 ----
-+***************
-+*** 3022,3028 ****
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
-+--- 3012,3018 ----
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux|freebsd-aout|freebsd-elf)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
diff --git a/editors/openoffice-2.0-devel/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice-2.0-devel/files/patch-extensions+source+config+ldap+makefile.mk
deleted file mode 100644
index fb5f8b09a7ef..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-extensions+source+config+ldap+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-o llber50 is missing
-o http://www.openoffice.org/issues/show_bug.cgi?id=43037
-
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.4.24.2
-diff -u -u -r1.4.24.2 makefile.mk
---- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
-+++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
-@@ -114,6 +114,9 @@
-         $(SALLIB)
- .IF "$(OS)"=="FREEBSD"
- SHL1STDLIBS+=-lcompat
-+.IF "$(WITH_OPENLDAP)" != "YES"
-+SHL1STDLIBS+=-llber50
-+.ENDIF
- .ENDIF
- 
- DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice-2.0-devel/files/patch-instsetoo_native+util+makefile.mk b/editors/openoffice-2.0-devel/files/patch-instsetoo_native+util+makefile.mk
deleted file mode 100644
index 4837e39a6a2b..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-instsetoo_native+util+makefile.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-For instsetoo_native project, we should use FORMAT*=-format bsd.
-However, for FreeBSD, we cannot write script towards multiple line,
-so -format bsd break builds. We temporary set -format portable at
-the moment so that we can treat as we want.
-
-Index: instsetoo_native/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- instsetoo_native/util/makefile.mk	10 Dec 2004 17:03:50 -0000	1.13
-+++ instsetoo_native/util/makefile.mk	20 Dec 2004 11:32:33 -0000
-@@ -82,6 +82,12 @@
- FORMAT*=-format pkg
- .ENDIF
- 
-+.IF "$(OS)" == "FREEBSD"
-+#bsd is preffered but epm does not produce valid packages atm
-+#FORMAT*=-format bsd
-+FORMAT*=-format portable
-+.ENDIF
-+
- # epm supports the following formats:
- # aix - AIX software distribution
- # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
diff --git a/editors/openoffice-2.0-devel/files/patch-libxml2 b/editors/openoffice-2.0-devel/files/patch-libxml2
deleted file mode 100644
index b4d2aca8b1c5..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-libxml2
+++ /dev/null
@@ -1,61 +0,0 @@
-o version number of libxml2
-o http://www.openoffice.org/issues/show_bug.cgi?id=42393
-
-Index: libxml2-2.6.17.patch
-===================================================================
-RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxml2-2.6.17.patch
---- libxml2/libxml2-2.6.17.patch.orig	4 Feb 2005 11:29:07 -0000	1.2
-+++ libxml2/libxml2-2.6.17.patch	12 Feb 2005 13:11:40 -0000
-@@ -1,5 +1,5 @@
--*** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
----- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
-+*** misc/libxml2-2.6.17/configure	Mon Jan 17 04:24:22 2005
-+--- misc/build/libxml2-2.6.17/configure	Sat Feb 12 22:08:54 2005
- ***************
- *** 26339,26347 ****
-   
-@@ -38,8 +38,8 @@
-   echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
-   echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
-   if test $ac_cv_func_setsockopt = yes; then
--*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	2005-01-16 21:02:54.000000000 +0100
----- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	2005-02-02 17:39:50.923232015 +0100
-+*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	Mon Jan 17 05:02:54 2005
-+--- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	Sat Feb 12 22:08:54 2005
- ***************
- *** 263,269 ****
-    *
-@@ -91,8 +91,29 @@
-   #define DEBUG_MEMORY_LOCATION
-   #endif
-   
--*** misc/libxml2-2.6.17/nanohttp.c	2005-01-04 15:49:47.000000000 +0100
----- misc/build/libxml2-2.6.17/nanohttp.c	2005-02-02 17:39:50.924231930 +0100
-+*** misc/libxml2-2.6.17/ltmain.sh	Mon Jan 17 05:02:25 2005
-+--- misc/build/libxml2-2.6.17/ltmain.sh	Sat Feb 12 22:10:00 2005
-+***************
-+*** 2999,3006 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2999,3006 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+*** misc/libxml2-2.6.17/nanohttp.c	Tue Jan  4 23:49:47 2005
-+--- misc/build/libxml2-2.6.17/nanohttp.c	Sat Feb 12 22:08:54 2005
- ***************
- *** 248,254 ****
-   void
diff --git a/editors/openoffice-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
new file mode 100644
index 000000000000..88ec6c234485
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
@@ -0,0 +1,69 @@
+Index: libxmlsec/xmlsec1-1.2.6.patch
+===================================================================
+RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
+retrieving revision 1.3
+diff -u -r1.3 xmlsec1-1.2.6.patch
+--- libxmlsec/xmlsec1-1.2.6.patch	29 Mar 2005 11:45:08 -0000	1.3
++++ libxmlsec/xmlsec1-1.2.6.patch	6 Apr 2005 04:46:13 -0000
+@@ -13957,3 +13957,61 @@
+   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
+   
+   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
++*** misc/xmlsec1-1.2.6/ltmain.sh	Thu Aug 26 15:00:15 2004
++--- misc/build/xmlsec1-1.2.6/ltmain.sh	Wed Apr  6 13:32:04 2005
++***************
++*** 2918,2929 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2918,2929 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2994,3006 ****
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=".$current"
++! 	  versuffix=".$current.$revision";
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2994,3006 ----
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice-2.0-devel/files/patch-odk+configure.pl b/editors/openoffice-2.0-devel/files/patch-odk+configure.pl
deleted file mode 100644
index db196e368e6d..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-o gmake support
-o suggestion from Juegen Schmidt <Juergen.Schmidt@Sun.COM>
-
-http://www.openoffice.org/issues/show_bug.cgi?id=41142
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.8.4.10
-diff -u -r1.8.4.10 configure.pl
---- odk/configure.pl	11 Jan 2005 11:00:15 -0000	1.8.4.10
-+++ odk/configure.pl	23 Jan 2005 09:13:41 -0000
-@@ -43,7 +43,14 @@
- }
- 
- $main::OO_SDK_MAKE_HOME = "";
-+$main::OO_MAKE_NAME = "make";
-+if ( $main::operatingSystem eq "FreeBSD" )
-+{
-+    $main::OO_MAKE_NAME = "gmake";
-+    $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
-+} else {
- $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
-+}
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
- 
-@@ -137,7 +144,7 @@
- # prepare GNU make path
- while ( (!$main::correctVersion) &&
- 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME" ))) )
- {
-     print " Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
-     $main::OO_SDK_MAKE_HOME = readStdIn();
-@@ -146,15 +153,16 @@
-     {
- 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
-     }
-+
-     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME")) )
-     { 
- 		$main::OO_SDK_MAKE_HOME = "";
- 		print " Error: GNU make is required, please specify a GNU make tools directory.\n";
-     } else 
-     {
- 		#check version
--		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
-+		my $testVersion = `$OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME --version`;
- 		if ( $testVersion eq "")
- 		{
- 			print " Set the environment variable OO_SDK_MAKE_HOME to your GNU build tools directory.\n";
-@@ -165,7 +173,7 @@
- 			{
- 				$testVersion = $1;
- 			}
--			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/make", 1);
-+			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME", 1);
- 			if ( !$main::correctVersion )
- 			{
- 				print " The 'make' command found at '$main::OO_SDK_MAKE_HOME' has a wrong version\n";
diff --git a/editors/openoffice-2.0-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice-2.0-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
new file mode 100644
index 000000000000..59b013e50010
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
@@ -0,0 +1,25 @@
+Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.2
+diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
+--- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
++++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
+@@ -109,7 +109,7 @@
+ 		linearly between center and endColor via concentric ellipses
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		circular. If it's not 1, the gradient is elliptical, with the
+ 		special twist that the aspect ratio is maintained also for the
+ 		center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ 		linearly between center and endColor via rectangular boxes
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		quadratic. If it's not 1, the gradient is rectangular, with
+ 		the special twist that the aspect ratio is maintained also for
+ 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice-2.0-devel/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice-2.0-devel/files/patch-portaudio+portaudio_v18_1.patch
new file mode 100644
index 000000000000..88317fafc354
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-portaudio+portaudio_v18_1.patch
@@ -0,0 +1,24 @@
+Index: portaudio/portaudio_v18_1.patch
+===================================================================
+RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
+retrieving revision 1.1
+diff -u -r1.1 portaudio_v18_1.patch
+--- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
++++ portaudio/portaudio_v18_1.patch	28 Mar 2005 06:55:37 -0000
+@@ -52,3 +52,16 @@
+   LIBINST = /usr/local/lib
+   
+   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
++*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
++--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Mon Mar 28 15:45:37 2005
++***************
++*** 43,48 ****
++--- 43,50 ----
++  
++  #ifdef __linux__
++  #include <linux/soundcard.h>
+++ #elif defined (__FreeBSD__)
+++ #include <sys/soundcard.h>
++  #else
++  #include <machine/soundcard.h> /* JH20010905 */
++  #endif
diff --git a/editors/openoffice-2.0-devel/files/patch-project-xmlsecurity b/editors/openoffice-2.0-devel/files/patch-project-xmlsecurity
deleted file mode 100644
index b8dfc459e784..000000000000
--- a/editors/openoffice-2.0-devel/files/patch-project-xmlsecurity
+++ /dev/null
@@ -1,45 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=39958
-o http://www.openoffice.org/issues/show_bug.cgi?id=38417
-o xmlsec08
-
-Description
-o Not for integration, we should provide configure based one
-  Note: malloc.h is deprecated for FreeBSD.
-o use configure to produce config.h
-
-Index: libxmlsec/xmlsec1-1.2.4.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v
-retrieving revision 1.7
-diff -u -r1.7 xmlsec1-1.2.4.patch
---- libxmlsec/xmlsec1-1.2.4.patch	9 Sep 2004 08:31:29 -0000	1.7
-+++ libxmlsec/xmlsec1-1.2.4.patch	3 Oct 2004 05:52:20 -0000
-@@ -83,7 +83,7 @@
- ! #undef HAVE_MACH_O_DYLD_H
- ! 
- ! /* Define to 1 if you have the <malloc.h> header file. */
--! #define HAVE_MALLOC_H 1
-+! #define HAVE_MALLOC_H 0
- ! 
- ! /* Define to 1 if you have the `memcpy' function. */
- ! #undef HAVE_MEMCPY
-
-
-Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
-===================================================================
-RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx
---- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	12 Jul 2004 13:15:21 -0000	1.1.1.1
-+++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	4 Oct 2004 22:04:08 -0000
-@@ -68,7 +68,9 @@
- #include <xmloff/attrlist.hxx>
- #include "xmlelementwrapper_xmlsecimpl.hxx"
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/editors/openoffice-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch
new file mode 100644
index 000000000000..ee4d7e4d07d9
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch
@@ -0,0 +1,59 @@
+Index: sndfile/libsndfile-1.0.9.patch
+===================================================================
+RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
+retrieving revision 1.1
+diff -u -r1.1 libsndfile-1.0.9.patch
+--- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
++++ sndfile/libsndfile-1.0.9.patch	28 Mar 2005 07:59:15 -0000
+@@ -231,3 +231,51 @@
+   
+   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
+   
++*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
++--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
++***************
++*** 2899,2910 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2899,2910 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2980,2987 ****
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2980,2987 ----
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice-2.0-devel/files/patch-sndfile+makefile.mk b/editors/openoffice-2.0-devel/files/patch-sndfile+makefile.mk
new file mode 100644
index 000000000000..df33e5cb4c25
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-sndfile+makefile.mk
@@ -0,0 +1,16 @@
+Index: sndfile/makefile.mk
+===================================================================
+RCS file: /cvs/external/sndfile/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
++++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
+@@ -81,7 +81,7 @@
+ CONFIGURE_DIR=
+ 
+ CONFIGURE_ACTION=./configure --with-pic
+-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
++.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
+ CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+ .ENDIF
+ 
diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+util b/editors/openoffice-2.0-devel/files/patch-vcl+util
new file mode 100644
index 000000000000..2ebfdda8ce4c
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-vcl+util
@@ -0,0 +1,47 @@
+Get rid of -ldl for FREEBSD and MACOSX
+
+Index: vcl/util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.65
+diff -u -r1.65 makefile.mk
+--- vcl/util/makefile.mk	13 Jan 2005 18:16:05 -0000	1.65
++++ vcl/util/makefile.mk	7 Apr 2005 01:29:29 -0000
+@@ -252,10 +252,11 @@
+ 
+ .IF "$(GUI)"=="UNX"
+ 
+-.IF "$(OS)"=="MACOSX"
+-SHL1STDLIBS += -ldl
++.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
++SHL1STDLIBS+= -ldl
+ .ENDIF
+ 
++
+ .IF "$(GUIBASE)"=="aqua"
+ SHL1STDLIBS += -framework Cocoa
+ .ENDIF
+@@ -383,7 +384,11 @@
+ 
+ 
+ SHL4STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_GTK)" != ""
+ 
+ # KDE plugin
+@@ -396,7 +401,11 @@
+ # libs for KDE plugin
+ SHL5STDLIBS=$(KDE_LIBS)
+ SHL5STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL5STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_KDE)" != ""
+ 
+ .ENDIF # UNX
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index ad6dc4fa8749..9c5509af0a2e 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050310
+SNAPDATE=	20050406
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -47,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		85
+MILESTONE=		91
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -76,7 +76,6 @@ CXX=	g++-ooo
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
-		epm:${PORTSDIR}/devel/epm \
 		gpatch:${PORTSDIR}/devel/patch \
 		xmkmf:${X_IMAKE_PORT} \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
@@ -104,7 +103,7 @@ UNZIP?=		${PREFIX}/bin/unzip
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	4
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 5831691b8684..bbd66668973c 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 044e96faae97761f3343bff2d123531a
-SIZE (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 243497173
+MD5 (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = b186d557a51b8fa9faf700e7a71b2470
+SIZE (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = 250068979
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-3-devel/files/patch-canvas+inc+canvas+canvastools.hxx b/editors/openoffice-3-devel/files/patch-canvas+inc+canvas+canvastools.hxx
new file mode 100644
index 000000000000..5c0c6bd78884
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-canvas+inc+canvas+canvastools.hxx
@@ -0,0 +1,21 @@
+
+Index: canvas/inc/canvas/canvastools.hxx
+===================================================================
+RCS file: /cvs/gsl/canvas/inc/canvas/canvastools.hxx,v
+retrieving revision 1.7
+diff -u -r1.7 canvastools.hxx
+--- canvas/inc/canvas/canvastools.hxx	30 Mar 2005 07:34:18 -0000	1.7
++++ canvas/inc/canvas/canvastools.hxx	6 Apr 2005 01:22:58 -0000
+@@ -133,9 +133,9 @@
+ 		 */
+ 
+ 		// mickey's math tricks...
+-		inline unsigned int powerof2( unsigned int c ) { return 0x1 << c; }
+-		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2(powerof2(c)) + 1); }
+-		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2(c))) & mask(c)); }
++		inline unsigned int powerof2_ooo( unsigned int c ) { return 0x1 << c; }
++		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2_ooo(powerof2_ooo(c)) + 1); }
++		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2_ooo(c))) & mask(c)); }
+ 		template<typename T>
+ 		inline unsigned int bitcount( T c ) {
+ 			unsigned int nByteIndex = 0;
diff --git a/editors/openoffice-3-devel/files/patch-config_office+configure.in b/editors/openoffice-3-devel/files/patch-config_office+configure.in
deleted file mode 100644
index 20602d3402a6..000000000000
--- a/editors/openoffice-3-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=44913
-o configure7
-
---- config_office/configure.in~	Wed Mar  9 01:31:52 2005
-+++ config_office/configure.in	Sun Mar 13 15:53:13 2005
-@@ -565,7 +565,7 @@
- 		test_cups=no
- 		_os=Darwin
- 		;;
--	freebsd)
-+	freebsd*)
- 		test_x=yes
- 		test_gtk=yes
- 		test_kde=yes
diff --git a/editors/openoffice-3-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice-3-devel/files/patch-crashrep+source+unx+makefile.mk
new file mode 100644
index 000000000000..6cb60786e2e5
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-crashrep+source+unx+makefile.mk
@@ -0,0 +1,19 @@
+Index: crashrep/source/unx/makefile.mk
+===================================================================
+RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
+retrieving revision 1.14
+diff -u -r1.14 makefile.mk
+--- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
++++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
+@@ -82,7 +82,10 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ 
+-APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
++APP1STDLIBS=$(DYNAMIC) -lXext -lX11
++.IF "$(OS)" != "FREEBSD"
++APP1STDLIBS+=-ldl -lnsl
++.ENDIF
+ .IF "$(OS)" == "SOLARIS"
+ APP1STDLIBS+=-lsocket
+ .ENDIF
diff --git a/editors/openoffice-3-devel/files/patch-curl-7.12.2.patch b/editors/openoffice-3-devel/files/patch-curl-7.12.2.patch
deleted file mode 100644
index f1597ef75e84..000000000000
--- a/editors/openoffice-3-devel/files/patch-curl-7.12.2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-#i 43986#
-
-version number of curl for FreeBSD is somewhat odd.
-we need libcurl.so.3.0.0 not libcurl.so.3
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3*
-after applying this pach
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3.0.0*
-
-Index: curl-7.12.2.patch
-===================================================================
-RCS file: /cvs/external/curl/curl-7.12.2.patch,v
-retrieving revision 1.4
-diff -u -r1.4 curl-7.12.2.patch
---- curl/curl-7.12.2.patch	27 Jan 2005 11:11:50 -0000	1.4
-+++ curl/curl-7.12.2.patch	3 Mar 2005 11:57:27 -0000
-@@ -304,3 +304,68 @@
-      * Check the current list of connections to see if we can
-      * re-use an already existing one or if we have to create a
-      * new one.
-+*** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 20:12:17 2004
-+--- misc/build/curl-7.12.2/ltmain.sh	Thu Mar  3 20:52:09 2005
-+***************
-+*** 2915,2926 ****
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  freebsd-aout|freebsd-elf|sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+--- 2915,2926 ----
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+***************
-+*** 2990,3005 ****
-+  	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+  	  ;;
-+  
-+- 	freebsd-aout)
-+- 	  major=".$current"
-+- 	  versuffix=".$current.$revision";
-+- 	  ;;
-+- 
-+- 	freebsd-elf)
-+- 	  major=".$current"
-+- 	  versuffix=".$current";
-+- 	  ;;
-+- 
-+  	irix | nonstopux)
-+  	  major=`expr $current - $age + 1`
-+  
-+--- 2990,2995 ----
-+***************
-+*** 3022,3028 ****
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
-+--- 3012,3018 ----
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux|freebsd-aout|freebsd-elf)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
diff --git a/editors/openoffice-3-devel/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice-3-devel/files/patch-extensions+source+config+ldap+makefile.mk
deleted file mode 100644
index fb5f8b09a7ef..000000000000
--- a/editors/openoffice-3-devel/files/patch-extensions+source+config+ldap+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-o llber50 is missing
-o http://www.openoffice.org/issues/show_bug.cgi?id=43037
-
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.4.24.2
-diff -u -u -r1.4.24.2 makefile.mk
---- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
-+++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
-@@ -114,6 +114,9 @@
-         $(SALLIB)
- .IF "$(OS)"=="FREEBSD"
- SHL1STDLIBS+=-lcompat
-+.IF "$(WITH_OPENLDAP)" != "YES"
-+SHL1STDLIBS+=-llber50
-+.ENDIF
- .ENDIF
- 
- DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice-3-devel/files/patch-instsetoo_native+util+makefile.mk b/editors/openoffice-3-devel/files/patch-instsetoo_native+util+makefile.mk
deleted file mode 100644
index 4837e39a6a2b..000000000000
--- a/editors/openoffice-3-devel/files/patch-instsetoo_native+util+makefile.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-For instsetoo_native project, we should use FORMAT*=-format bsd.
-However, for FreeBSD, we cannot write script towards multiple line,
-so -format bsd break builds. We temporary set -format portable at
-the moment so that we can treat as we want.
-
-Index: instsetoo_native/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- instsetoo_native/util/makefile.mk	10 Dec 2004 17:03:50 -0000	1.13
-+++ instsetoo_native/util/makefile.mk	20 Dec 2004 11:32:33 -0000
-@@ -82,6 +82,12 @@
- FORMAT*=-format pkg
- .ENDIF
- 
-+.IF "$(OS)" == "FREEBSD"
-+#bsd is preffered but epm does not produce valid packages atm
-+#FORMAT*=-format bsd
-+FORMAT*=-format portable
-+.ENDIF
-+
- # epm supports the following formats:
- # aix - AIX software distribution
- # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
diff --git a/editors/openoffice-3-devel/files/patch-libxml2 b/editors/openoffice-3-devel/files/patch-libxml2
deleted file mode 100644
index b4d2aca8b1c5..000000000000
--- a/editors/openoffice-3-devel/files/patch-libxml2
+++ /dev/null
@@ -1,61 +0,0 @@
-o version number of libxml2
-o http://www.openoffice.org/issues/show_bug.cgi?id=42393
-
-Index: libxml2-2.6.17.patch
-===================================================================
-RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxml2-2.6.17.patch
---- libxml2/libxml2-2.6.17.patch.orig	4 Feb 2005 11:29:07 -0000	1.2
-+++ libxml2/libxml2-2.6.17.patch	12 Feb 2005 13:11:40 -0000
-@@ -1,5 +1,5 @@
--*** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
----- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
-+*** misc/libxml2-2.6.17/configure	Mon Jan 17 04:24:22 2005
-+--- misc/build/libxml2-2.6.17/configure	Sat Feb 12 22:08:54 2005
- ***************
- *** 26339,26347 ****
-   
-@@ -38,8 +38,8 @@
-   echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
-   echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
-   if test $ac_cv_func_setsockopt = yes; then
--*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	2005-01-16 21:02:54.000000000 +0100
----- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	2005-02-02 17:39:50.923232015 +0100
-+*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	Mon Jan 17 05:02:54 2005
-+--- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	Sat Feb 12 22:08:54 2005
- ***************
- *** 263,269 ****
-    *
-@@ -91,8 +91,29 @@
-   #define DEBUG_MEMORY_LOCATION
-   #endif
-   
--*** misc/libxml2-2.6.17/nanohttp.c	2005-01-04 15:49:47.000000000 +0100
----- misc/build/libxml2-2.6.17/nanohttp.c	2005-02-02 17:39:50.924231930 +0100
-+*** misc/libxml2-2.6.17/ltmain.sh	Mon Jan 17 05:02:25 2005
-+--- misc/build/libxml2-2.6.17/ltmain.sh	Sat Feb 12 22:10:00 2005
-+***************
-+*** 2999,3006 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2999,3006 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+*** misc/libxml2-2.6.17/nanohttp.c	Tue Jan  4 23:49:47 2005
-+--- misc/build/libxml2-2.6.17/nanohttp.c	Sat Feb 12 22:08:54 2005
- ***************
- *** 248,254 ****
-   void
diff --git a/editors/openoffice-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
new file mode 100644
index 000000000000..88ec6c234485
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
@@ -0,0 +1,69 @@
+Index: libxmlsec/xmlsec1-1.2.6.patch
+===================================================================
+RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
+retrieving revision 1.3
+diff -u -r1.3 xmlsec1-1.2.6.patch
+--- libxmlsec/xmlsec1-1.2.6.patch	29 Mar 2005 11:45:08 -0000	1.3
++++ libxmlsec/xmlsec1-1.2.6.patch	6 Apr 2005 04:46:13 -0000
+@@ -13957,3 +13957,61 @@
+   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
+   
+   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
++*** misc/xmlsec1-1.2.6/ltmain.sh	Thu Aug 26 15:00:15 2004
++--- misc/build/xmlsec1-1.2.6/ltmain.sh	Wed Apr  6 13:32:04 2005
++***************
++*** 2918,2929 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2918,2929 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2994,3006 ****
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=".$current"
++! 	  versuffix=".$current.$revision";
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2994,3006 ----
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice-3-devel/files/patch-odk+configure.pl b/editors/openoffice-3-devel/files/patch-odk+configure.pl
deleted file mode 100644
index db196e368e6d..000000000000
--- a/editors/openoffice-3-devel/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-o gmake support
-o suggestion from Juegen Schmidt <Juergen.Schmidt@Sun.COM>
-
-http://www.openoffice.org/issues/show_bug.cgi?id=41142
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.8.4.10
-diff -u -r1.8.4.10 configure.pl
---- odk/configure.pl	11 Jan 2005 11:00:15 -0000	1.8.4.10
-+++ odk/configure.pl	23 Jan 2005 09:13:41 -0000
-@@ -43,7 +43,14 @@
- }
- 
- $main::OO_SDK_MAKE_HOME = "";
-+$main::OO_MAKE_NAME = "make";
-+if ( $main::operatingSystem eq "FreeBSD" )
-+{
-+    $main::OO_MAKE_NAME = "gmake";
-+    $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
-+} else {
- $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
-+}
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
- 
-@@ -137,7 +144,7 @@
- # prepare GNU make path
- while ( (!$main::correctVersion) &&
- 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME" ))) )
- {
-     print " Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
-     $main::OO_SDK_MAKE_HOME = readStdIn();
-@@ -146,15 +153,16 @@
-     {
- 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
-     }
-+
-     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME")) )
-     { 
- 		$main::OO_SDK_MAKE_HOME = "";
- 		print " Error: GNU make is required, please specify a GNU make tools directory.\n";
-     } else 
-     {
- 		#check version
--		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
-+		my $testVersion = `$OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME --version`;
- 		if ( $testVersion eq "")
- 		{
- 			print " Set the environment variable OO_SDK_MAKE_HOME to your GNU build tools directory.\n";
-@@ -165,7 +173,7 @@
- 			{
- 				$testVersion = $1;
- 			}
--			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/make", 1);
-+			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME", 1);
- 			if ( !$main::correctVersion )
- 			{
- 				print " The 'make' command found at '$main::OO_SDK_MAKE_HOME' has a wrong version\n";
diff --git a/editors/openoffice-3-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice-3-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
new file mode 100644
index 000000000000..59b013e50010
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
@@ -0,0 +1,25 @@
+Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.2
+diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
+--- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
++++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
+@@ -109,7 +109,7 @@
+ 		linearly between center and endColor via concentric ellipses
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		circular. If it's not 1, the gradient is elliptical, with the
+ 		special twist that the aspect ratio is maintained also for the
+ 		center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ 		linearly between center and endColor via rectangular boxes
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		quadratic. If it's not 1, the gradient is rectangular, with
+ 		the special twist that the aspect ratio is maintained also for
+ 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice-3-devel/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice-3-devel/files/patch-portaudio+portaudio_v18_1.patch
new file mode 100644
index 000000000000..88317fafc354
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-portaudio+portaudio_v18_1.patch
@@ -0,0 +1,24 @@
+Index: portaudio/portaudio_v18_1.patch
+===================================================================
+RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
+retrieving revision 1.1
+diff -u -r1.1 portaudio_v18_1.patch
+--- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
++++ portaudio/portaudio_v18_1.patch	28 Mar 2005 06:55:37 -0000
+@@ -52,3 +52,16 @@
+   LIBINST = /usr/local/lib
+   
+   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
++*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
++--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Mon Mar 28 15:45:37 2005
++***************
++*** 43,48 ****
++--- 43,50 ----
++  
++  #ifdef __linux__
++  #include <linux/soundcard.h>
+++ #elif defined (__FreeBSD__)
+++ #include <sys/soundcard.h>
++  #else
++  #include <machine/soundcard.h> /* JH20010905 */
++  #endif
diff --git a/editors/openoffice-3-devel/files/patch-project-xmlsecurity b/editors/openoffice-3-devel/files/patch-project-xmlsecurity
deleted file mode 100644
index b8dfc459e784..000000000000
--- a/editors/openoffice-3-devel/files/patch-project-xmlsecurity
+++ /dev/null
@@ -1,45 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=39958
-o http://www.openoffice.org/issues/show_bug.cgi?id=38417
-o xmlsec08
-
-Description
-o Not for integration, we should provide configure based one
-  Note: malloc.h is deprecated for FreeBSD.
-o use configure to produce config.h
-
-Index: libxmlsec/xmlsec1-1.2.4.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v
-retrieving revision 1.7
-diff -u -r1.7 xmlsec1-1.2.4.patch
---- libxmlsec/xmlsec1-1.2.4.patch	9 Sep 2004 08:31:29 -0000	1.7
-+++ libxmlsec/xmlsec1-1.2.4.patch	3 Oct 2004 05:52:20 -0000
-@@ -83,7 +83,7 @@
- ! #undef HAVE_MACH_O_DYLD_H
- ! 
- ! /* Define to 1 if you have the <malloc.h> header file. */
--! #define HAVE_MALLOC_H 1
-+! #define HAVE_MALLOC_H 0
- ! 
- ! /* Define to 1 if you have the `memcpy' function. */
- ! #undef HAVE_MEMCPY
-
-
-Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
-===================================================================
-RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx
---- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	12 Jul 2004 13:15:21 -0000	1.1.1.1
-+++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	4 Oct 2004 22:04:08 -0000
-@@ -68,7 +68,9 @@
- #include <xmloff/attrlist.hxx>
- #include "xmlelementwrapper_xmlsecimpl.hxx"
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/editors/openoffice-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch
new file mode 100644
index 000000000000..ee4d7e4d07d9
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch
@@ -0,0 +1,59 @@
+Index: sndfile/libsndfile-1.0.9.patch
+===================================================================
+RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
+retrieving revision 1.1
+diff -u -r1.1 libsndfile-1.0.9.patch
+--- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
++++ sndfile/libsndfile-1.0.9.patch	28 Mar 2005 07:59:15 -0000
+@@ -231,3 +231,51 @@
+   
+   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
+   
++*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
++--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
++***************
++*** 2899,2910 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2899,2910 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2980,2987 ****
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2980,2987 ----
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice-3-devel/files/patch-sndfile+makefile.mk b/editors/openoffice-3-devel/files/patch-sndfile+makefile.mk
new file mode 100644
index 000000000000..df33e5cb4c25
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-sndfile+makefile.mk
@@ -0,0 +1,16 @@
+Index: sndfile/makefile.mk
+===================================================================
+RCS file: /cvs/external/sndfile/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
++++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
+@@ -81,7 +81,7 @@
+ CONFIGURE_DIR=
+ 
+ CONFIGURE_ACTION=./configure --with-pic
+-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
++.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
+ CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+ .ENDIF
+ 
diff --git a/editors/openoffice-3-devel/files/patch-vcl+util b/editors/openoffice-3-devel/files/patch-vcl+util
new file mode 100644
index 000000000000..2ebfdda8ce4c
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-vcl+util
@@ -0,0 +1,47 @@
+Get rid of -ldl for FREEBSD and MACOSX
+
+Index: vcl/util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.65
+diff -u -r1.65 makefile.mk
+--- vcl/util/makefile.mk	13 Jan 2005 18:16:05 -0000	1.65
++++ vcl/util/makefile.mk	7 Apr 2005 01:29:29 -0000
+@@ -252,10 +252,11 @@
+ 
+ .IF "$(GUI)"=="UNX"
+ 
+-.IF "$(OS)"=="MACOSX"
+-SHL1STDLIBS += -ldl
++.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
++SHL1STDLIBS+= -ldl
+ .ENDIF
+ 
++
+ .IF "$(GUIBASE)"=="aqua"
+ SHL1STDLIBS += -framework Cocoa
+ .ENDIF
+@@ -383,7 +384,11 @@
+ 
+ 
+ SHL4STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_GTK)" != ""
+ 
+ # KDE plugin
+@@ -396,7 +401,11 @@
+ # libs for KDE plugin
+ SHL5STDLIBS=$(KDE_LIBS)
+ SHL5STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL5STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_KDE)" != ""
+ 
+ .ENDIF # UNX
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index ad6dc4fa8749..9c5509af0a2e 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050310
+SNAPDATE=	20050406
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -47,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		85
+MILESTONE=		91
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -76,7 +76,6 @@ CXX=	g++-ooo
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
-		epm:${PORTSDIR}/devel/epm \
 		gpatch:${PORTSDIR}/devel/patch \
 		xmkmf:${X_IMAKE_PORT} \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
@@ -104,7 +103,7 @@ UNZIP?=		${PREFIX}/bin/unzip
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	4
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 5831691b8684..bbd66668973c 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 044e96faae97761f3343bff2d123531a
-SIZE (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 243497173
+MD5 (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = b186d557a51b8fa9faf700e7a71b2470
+SIZE (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = 250068979
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice-3/files/patch-canvas+inc+canvas+canvastools.hxx b/editors/openoffice-3/files/patch-canvas+inc+canvas+canvastools.hxx
new file mode 100644
index 000000000000..5c0c6bd78884
--- /dev/null
+++ b/editors/openoffice-3/files/patch-canvas+inc+canvas+canvastools.hxx
@@ -0,0 +1,21 @@
+
+Index: canvas/inc/canvas/canvastools.hxx
+===================================================================
+RCS file: /cvs/gsl/canvas/inc/canvas/canvastools.hxx,v
+retrieving revision 1.7
+diff -u -r1.7 canvastools.hxx
+--- canvas/inc/canvas/canvastools.hxx	30 Mar 2005 07:34:18 -0000	1.7
++++ canvas/inc/canvas/canvastools.hxx	6 Apr 2005 01:22:58 -0000
+@@ -133,9 +133,9 @@
+ 		 */
+ 
+ 		// mickey's math tricks...
+-		inline unsigned int powerof2( unsigned int c ) { return 0x1 << c; }
+-		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2(powerof2(c)) + 1); }
+-		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2(c))) & mask(c)); }
++		inline unsigned int powerof2_ooo( unsigned int c ) { return 0x1 << c; }
++		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2_ooo(powerof2_ooo(c)) + 1); }
++		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2_ooo(c))) & mask(c)); }
+ 		template<typename T>
+ 		inline unsigned int bitcount( T c ) {
+ 			unsigned int nByteIndex = 0;
diff --git a/editors/openoffice-3/files/patch-config_office+configure.in b/editors/openoffice-3/files/patch-config_office+configure.in
deleted file mode 100644
index 20602d3402a6..000000000000
--- a/editors/openoffice-3/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=44913
-o configure7
-
---- config_office/configure.in~	Wed Mar  9 01:31:52 2005
-+++ config_office/configure.in	Sun Mar 13 15:53:13 2005
-@@ -565,7 +565,7 @@
- 		test_cups=no
- 		_os=Darwin
- 		;;
--	freebsd)
-+	freebsd*)
- 		test_x=yes
- 		test_gtk=yes
- 		test_kde=yes
diff --git a/editors/openoffice-3/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice-3/files/patch-crashrep+source+unx+makefile.mk
new file mode 100644
index 000000000000..6cb60786e2e5
--- /dev/null
+++ b/editors/openoffice-3/files/patch-crashrep+source+unx+makefile.mk
@@ -0,0 +1,19 @@
+Index: crashrep/source/unx/makefile.mk
+===================================================================
+RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
+retrieving revision 1.14
+diff -u -r1.14 makefile.mk
+--- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
++++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
+@@ -82,7 +82,10 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ 
+-APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
++APP1STDLIBS=$(DYNAMIC) -lXext -lX11
++.IF "$(OS)" != "FREEBSD"
++APP1STDLIBS+=-ldl -lnsl
++.ENDIF
+ .IF "$(OS)" == "SOLARIS"
+ APP1STDLIBS+=-lsocket
+ .ENDIF
diff --git a/editors/openoffice-3/files/patch-curl-7.12.2.patch b/editors/openoffice-3/files/patch-curl-7.12.2.patch
deleted file mode 100644
index f1597ef75e84..000000000000
--- a/editors/openoffice-3/files/patch-curl-7.12.2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-#i 43986#
-
-version number of curl for FreeBSD is somewhat odd.
-we need libcurl.so.3.0.0 not libcurl.so.3
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3*
-after applying this pach
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3.0.0*
-
-Index: curl-7.12.2.patch
-===================================================================
-RCS file: /cvs/external/curl/curl-7.12.2.patch,v
-retrieving revision 1.4
-diff -u -r1.4 curl-7.12.2.patch
---- curl/curl-7.12.2.patch	27 Jan 2005 11:11:50 -0000	1.4
-+++ curl/curl-7.12.2.patch	3 Mar 2005 11:57:27 -0000
-@@ -304,3 +304,68 @@
-      * Check the current list of connections to see if we can
-      * re-use an already existing one or if we have to create a
-      * new one.
-+*** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 20:12:17 2004
-+--- misc/build/curl-7.12.2/ltmain.sh	Thu Mar  3 20:52:09 2005
-+***************
-+*** 2915,2926 ****
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  freebsd-aout|freebsd-elf|sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+--- 2915,2926 ----
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+***************
-+*** 2990,3005 ****
-+  	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+  	  ;;
-+  
-+- 	freebsd-aout)
-+- 	  major=".$current"
-+- 	  versuffix=".$current.$revision";
-+- 	  ;;
-+- 
-+- 	freebsd-elf)
-+- 	  major=".$current"
-+- 	  versuffix=".$current";
-+- 	  ;;
-+- 
-+  	irix | nonstopux)
-+  	  major=`expr $current - $age + 1`
-+  
-+--- 2990,2995 ----
-+***************
-+*** 3022,3028 ****
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
-+--- 3012,3018 ----
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux|freebsd-aout|freebsd-elf)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
diff --git a/editors/openoffice-3/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice-3/files/patch-extensions+source+config+ldap+makefile.mk
deleted file mode 100644
index fb5f8b09a7ef..000000000000
--- a/editors/openoffice-3/files/patch-extensions+source+config+ldap+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-o llber50 is missing
-o http://www.openoffice.org/issues/show_bug.cgi?id=43037
-
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.4.24.2
-diff -u -u -r1.4.24.2 makefile.mk
---- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
-+++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
-@@ -114,6 +114,9 @@
-         $(SALLIB)
- .IF "$(OS)"=="FREEBSD"
- SHL1STDLIBS+=-lcompat
-+.IF "$(WITH_OPENLDAP)" != "YES"
-+SHL1STDLIBS+=-llber50
-+.ENDIF
- .ENDIF
- 
- DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice-3/files/patch-instsetoo_native+util+makefile.mk b/editors/openoffice-3/files/patch-instsetoo_native+util+makefile.mk
deleted file mode 100644
index 4837e39a6a2b..000000000000
--- a/editors/openoffice-3/files/patch-instsetoo_native+util+makefile.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-For instsetoo_native project, we should use FORMAT*=-format bsd.
-However, for FreeBSD, we cannot write script towards multiple line,
-so -format bsd break builds. We temporary set -format portable at
-the moment so that we can treat as we want.
-
-Index: instsetoo_native/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- instsetoo_native/util/makefile.mk	10 Dec 2004 17:03:50 -0000	1.13
-+++ instsetoo_native/util/makefile.mk	20 Dec 2004 11:32:33 -0000
-@@ -82,6 +82,12 @@
- FORMAT*=-format pkg
- .ENDIF
- 
-+.IF "$(OS)" == "FREEBSD"
-+#bsd is preffered but epm does not produce valid packages atm
-+#FORMAT*=-format bsd
-+FORMAT*=-format portable
-+.ENDIF
-+
- # epm supports the following formats:
- # aix - AIX software distribution
- # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
diff --git a/editors/openoffice-3/files/patch-libxml2 b/editors/openoffice-3/files/patch-libxml2
deleted file mode 100644
index b4d2aca8b1c5..000000000000
--- a/editors/openoffice-3/files/patch-libxml2
+++ /dev/null
@@ -1,61 +0,0 @@
-o version number of libxml2
-o http://www.openoffice.org/issues/show_bug.cgi?id=42393
-
-Index: libxml2-2.6.17.patch
-===================================================================
-RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxml2-2.6.17.patch
---- libxml2/libxml2-2.6.17.patch.orig	4 Feb 2005 11:29:07 -0000	1.2
-+++ libxml2/libxml2-2.6.17.patch	12 Feb 2005 13:11:40 -0000
-@@ -1,5 +1,5 @@
--*** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
----- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
-+*** misc/libxml2-2.6.17/configure	Mon Jan 17 04:24:22 2005
-+--- misc/build/libxml2-2.6.17/configure	Sat Feb 12 22:08:54 2005
- ***************
- *** 26339,26347 ****
-   
-@@ -38,8 +38,8 @@
-   echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
-   echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
-   if test $ac_cv_func_setsockopt = yes; then
--*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	2005-01-16 21:02:54.000000000 +0100
----- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	2005-02-02 17:39:50.923232015 +0100
-+*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	Mon Jan 17 05:02:54 2005
-+--- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	Sat Feb 12 22:08:54 2005
- ***************
- *** 263,269 ****
-    *
-@@ -91,8 +91,29 @@
-   #define DEBUG_MEMORY_LOCATION
-   #endif
-   
--*** misc/libxml2-2.6.17/nanohttp.c	2005-01-04 15:49:47.000000000 +0100
----- misc/build/libxml2-2.6.17/nanohttp.c	2005-02-02 17:39:50.924231930 +0100
-+*** misc/libxml2-2.6.17/ltmain.sh	Mon Jan 17 05:02:25 2005
-+--- misc/build/libxml2-2.6.17/ltmain.sh	Sat Feb 12 22:10:00 2005
-+***************
-+*** 2999,3006 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2999,3006 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+*** misc/libxml2-2.6.17/nanohttp.c	Tue Jan  4 23:49:47 2005
-+--- misc/build/libxml2-2.6.17/nanohttp.c	Sat Feb 12 22:08:54 2005
- ***************
- *** 248,254 ****
-   void
diff --git a/editors/openoffice-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch
new file mode 100644
index 000000000000..88ec6c234485
--- /dev/null
+++ b/editors/openoffice-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch
@@ -0,0 +1,69 @@
+Index: libxmlsec/xmlsec1-1.2.6.patch
+===================================================================
+RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
+retrieving revision 1.3
+diff -u -r1.3 xmlsec1-1.2.6.patch
+--- libxmlsec/xmlsec1-1.2.6.patch	29 Mar 2005 11:45:08 -0000	1.3
++++ libxmlsec/xmlsec1-1.2.6.patch	6 Apr 2005 04:46:13 -0000
+@@ -13957,3 +13957,61 @@
+   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
+   
+   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
++*** misc/xmlsec1-1.2.6/ltmain.sh	Thu Aug 26 15:00:15 2004
++--- misc/build/xmlsec1-1.2.6/ltmain.sh	Wed Apr  6 13:32:04 2005
++***************
++*** 2918,2929 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2918,2929 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2994,3006 ****
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=".$current"
++! 	  versuffix=".$current.$revision";
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2994,3006 ----
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice-3/files/patch-odk+configure.pl b/editors/openoffice-3/files/patch-odk+configure.pl
deleted file mode 100644
index db196e368e6d..000000000000
--- a/editors/openoffice-3/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-o gmake support
-o suggestion from Juegen Schmidt <Juergen.Schmidt@Sun.COM>
-
-http://www.openoffice.org/issues/show_bug.cgi?id=41142
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.8.4.10
-diff -u -r1.8.4.10 configure.pl
---- odk/configure.pl	11 Jan 2005 11:00:15 -0000	1.8.4.10
-+++ odk/configure.pl	23 Jan 2005 09:13:41 -0000
-@@ -43,7 +43,14 @@
- }
- 
- $main::OO_SDK_MAKE_HOME = "";
-+$main::OO_MAKE_NAME = "make";
-+if ( $main::operatingSystem eq "FreeBSD" )
-+{
-+    $main::OO_MAKE_NAME = "gmake";
-+    $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
-+} else {
- $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
-+}
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
- 
-@@ -137,7 +144,7 @@
- # prepare GNU make path
- while ( (!$main::correctVersion) &&
- 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME" ))) )
- {
-     print " Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
-     $main::OO_SDK_MAKE_HOME = readStdIn();
-@@ -146,15 +153,16 @@
-     {
- 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
-     }
-+
-     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME")) )
-     { 
- 		$main::OO_SDK_MAKE_HOME = "";
- 		print " Error: GNU make is required, please specify a GNU make tools directory.\n";
-     } else 
-     {
- 		#check version
--		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
-+		my $testVersion = `$OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME --version`;
- 		if ( $testVersion eq "")
- 		{
- 			print " Set the environment variable OO_SDK_MAKE_HOME to your GNU build tools directory.\n";
-@@ -165,7 +173,7 @@
- 			{
- 				$testVersion = $1;
- 			}
--			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/make", 1);
-+			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME", 1);
- 			if ( !$main::correctVersion )
- 			{
- 				print " The 'make' command found at '$main::OO_SDK_MAKE_HOME' has a wrong version\n";
diff --git a/editors/openoffice-3/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice-3/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
new file mode 100644
index 000000000000..59b013e50010
--- /dev/null
+++ b/editors/openoffice-3/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
@@ -0,0 +1,25 @@
+Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.2
+diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
+--- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
++++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
+@@ -109,7 +109,7 @@
+ 		linearly between center and endColor via concentric ellipses
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		circular. If it's not 1, the gradient is elliptical, with the
+ 		special twist that the aspect ratio is maintained also for the
+ 		center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ 		linearly between center and endColor via rectangular boxes
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		quadratic. If it's not 1, the gradient is rectangular, with
+ 		the special twist that the aspect ratio is maintained also for
+ 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice-3/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice-3/files/patch-portaudio+portaudio_v18_1.patch
new file mode 100644
index 000000000000..88317fafc354
--- /dev/null
+++ b/editors/openoffice-3/files/patch-portaudio+portaudio_v18_1.patch
@@ -0,0 +1,24 @@
+Index: portaudio/portaudio_v18_1.patch
+===================================================================
+RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
+retrieving revision 1.1
+diff -u -r1.1 portaudio_v18_1.patch
+--- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
++++ portaudio/portaudio_v18_1.patch	28 Mar 2005 06:55:37 -0000
+@@ -52,3 +52,16 @@
+   LIBINST = /usr/local/lib
+   
+   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
++*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
++--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Mon Mar 28 15:45:37 2005
++***************
++*** 43,48 ****
++--- 43,50 ----
++  
++  #ifdef __linux__
++  #include <linux/soundcard.h>
+++ #elif defined (__FreeBSD__)
+++ #include <sys/soundcard.h>
++  #else
++  #include <machine/soundcard.h> /* JH20010905 */
++  #endif
diff --git a/editors/openoffice-3/files/patch-project-xmlsecurity b/editors/openoffice-3/files/patch-project-xmlsecurity
deleted file mode 100644
index b8dfc459e784..000000000000
--- a/editors/openoffice-3/files/patch-project-xmlsecurity
+++ /dev/null
@@ -1,45 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=39958
-o http://www.openoffice.org/issues/show_bug.cgi?id=38417
-o xmlsec08
-
-Description
-o Not for integration, we should provide configure based one
-  Note: malloc.h is deprecated for FreeBSD.
-o use configure to produce config.h
-
-Index: libxmlsec/xmlsec1-1.2.4.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v
-retrieving revision 1.7
-diff -u -r1.7 xmlsec1-1.2.4.patch
---- libxmlsec/xmlsec1-1.2.4.patch	9 Sep 2004 08:31:29 -0000	1.7
-+++ libxmlsec/xmlsec1-1.2.4.patch	3 Oct 2004 05:52:20 -0000
-@@ -83,7 +83,7 @@
- ! #undef HAVE_MACH_O_DYLD_H
- ! 
- ! /* Define to 1 if you have the <malloc.h> header file. */
--! #define HAVE_MALLOC_H 1
-+! #define HAVE_MALLOC_H 0
- ! 
- ! /* Define to 1 if you have the `memcpy' function. */
- ! #undef HAVE_MEMCPY
-
-
-Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
-===================================================================
-RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx
---- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	12 Jul 2004 13:15:21 -0000	1.1.1.1
-+++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	4 Oct 2004 22:04:08 -0000
-@@ -68,7 +68,9 @@
- #include <xmloff/attrlist.hxx>
- #include "xmlelementwrapper_xmlsecimpl.hxx"
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/editors/openoffice-3/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice-3/files/patch-sndfile+libsndfile-1.0.9.patch
new file mode 100644
index 000000000000..ee4d7e4d07d9
--- /dev/null
+++ b/editors/openoffice-3/files/patch-sndfile+libsndfile-1.0.9.patch
@@ -0,0 +1,59 @@
+Index: sndfile/libsndfile-1.0.9.patch
+===================================================================
+RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
+retrieving revision 1.1
+diff -u -r1.1 libsndfile-1.0.9.patch
+--- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
++++ sndfile/libsndfile-1.0.9.patch	28 Mar 2005 07:59:15 -0000
+@@ -231,3 +231,51 @@
+   
+   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
+   
++*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
++--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
++***************
++*** 2899,2910 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2899,2910 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2980,2987 ****
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2980,2987 ----
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice-3/files/patch-sndfile+makefile.mk b/editors/openoffice-3/files/patch-sndfile+makefile.mk
new file mode 100644
index 000000000000..df33e5cb4c25
--- /dev/null
+++ b/editors/openoffice-3/files/patch-sndfile+makefile.mk
@@ -0,0 +1,16 @@
+Index: sndfile/makefile.mk
+===================================================================
+RCS file: /cvs/external/sndfile/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
++++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
+@@ -81,7 +81,7 @@
+ CONFIGURE_DIR=
+ 
+ CONFIGURE_ACTION=./configure --with-pic
+-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
++.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
+ CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+ .ENDIF
+ 
diff --git a/editors/openoffice-3/files/patch-vcl+util b/editors/openoffice-3/files/patch-vcl+util
new file mode 100644
index 000000000000..2ebfdda8ce4c
--- /dev/null
+++ b/editors/openoffice-3/files/patch-vcl+util
@@ -0,0 +1,47 @@
+Get rid of -ldl for FREEBSD and MACOSX
+
+Index: vcl/util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.65
+diff -u -r1.65 makefile.mk
+--- vcl/util/makefile.mk	13 Jan 2005 18:16:05 -0000	1.65
++++ vcl/util/makefile.mk	7 Apr 2005 01:29:29 -0000
+@@ -252,10 +252,11 @@
+ 
+ .IF "$(GUI)"=="UNX"
+ 
+-.IF "$(OS)"=="MACOSX"
+-SHL1STDLIBS += -ldl
++.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
++SHL1STDLIBS+= -ldl
+ .ENDIF
+ 
++
+ .IF "$(GUIBASE)"=="aqua"
+ SHL1STDLIBS += -framework Cocoa
+ .ENDIF
+@@ -383,7 +384,11 @@
+ 
+ 
+ SHL4STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_GTK)" != ""
+ 
+ # KDE plugin
+@@ -396,7 +401,11 @@
+ # libs for KDE plugin
+ SHL5STDLIBS=$(KDE_LIBS)
+ SHL5STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL5STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_KDE)" != ""
+ 
+ .ENDIF # UNX
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index ad6dc4fa8749..9c5509af0a2e 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050310
+SNAPDATE=	20050406
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -47,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		85
+MILESTONE=		91
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -76,7 +76,6 @@ CXX=	g++-ooo
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
-		epm:${PORTSDIR}/devel/epm \
 		gpatch:${PORTSDIR}/devel/patch \
 		xmkmf:${X_IMAKE_PORT} \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
@@ -104,7 +103,7 @@ UNZIP?=		${PREFIX}/bin/unzip
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	4
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 5831691b8684..bbd66668973c 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 044e96faae97761f3343bff2d123531a
-SIZE (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 243497173
+MD5 (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = b186d557a51b8fa9faf700e7a71b2470
+SIZE (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = 250068979
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2-RC/files/patch-canvas+inc+canvas+canvastools.hxx b/editors/openoffice.org-2-RC/files/patch-canvas+inc+canvas+canvastools.hxx
new file mode 100644
index 000000000000..5c0c6bd78884
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-canvas+inc+canvas+canvastools.hxx
@@ -0,0 +1,21 @@
+
+Index: canvas/inc/canvas/canvastools.hxx
+===================================================================
+RCS file: /cvs/gsl/canvas/inc/canvas/canvastools.hxx,v
+retrieving revision 1.7
+diff -u -r1.7 canvastools.hxx
+--- canvas/inc/canvas/canvastools.hxx	30 Mar 2005 07:34:18 -0000	1.7
++++ canvas/inc/canvas/canvastools.hxx	6 Apr 2005 01:22:58 -0000
+@@ -133,9 +133,9 @@
+ 		 */
+ 
+ 		// mickey's math tricks...
+-		inline unsigned int powerof2( unsigned int c ) { return 0x1 << c; }
+-		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2(powerof2(c)) + 1); }
+-		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2(c))) & mask(c)); }
++		inline unsigned int powerof2_ooo( unsigned int c ) { return 0x1 << c; }
++		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2_ooo(powerof2_ooo(c)) + 1); }
++		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2_ooo(c))) & mask(c)); }
+ 		template<typename T>
+ 		inline unsigned int bitcount( T c ) {
+ 			unsigned int nByteIndex = 0;
diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
deleted file mode 100644
index 20602d3402a6..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=44913
-o configure7
-
---- config_office/configure.in~	Wed Mar  9 01:31:52 2005
-+++ config_office/configure.in	Sun Mar 13 15:53:13 2005
-@@ -565,7 +565,7 @@
- 		test_cups=no
- 		_os=Darwin
- 		;;
--	freebsd)
-+	freebsd*)
- 		test_x=yes
- 		test_gtk=yes
- 		test_kde=yes
diff --git a/editors/openoffice.org-2-RC/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2-RC/files/patch-crashrep+source+unx+makefile.mk
new file mode 100644
index 000000000000..6cb60786e2e5
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-crashrep+source+unx+makefile.mk
@@ -0,0 +1,19 @@
+Index: crashrep/source/unx/makefile.mk
+===================================================================
+RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
+retrieving revision 1.14
+diff -u -r1.14 makefile.mk
+--- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
++++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
+@@ -82,7 +82,10 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ 
+-APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
++APP1STDLIBS=$(DYNAMIC) -lXext -lX11
++.IF "$(OS)" != "FREEBSD"
++APP1STDLIBS+=-ldl -lnsl
++.ENDIF
+ .IF "$(OS)" == "SOLARIS"
+ APP1STDLIBS+=-lsocket
+ .ENDIF
diff --git a/editors/openoffice.org-2-RC/files/patch-curl-7.12.2.patch b/editors/openoffice.org-2-RC/files/patch-curl-7.12.2.patch
deleted file mode 100644
index f1597ef75e84..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-curl-7.12.2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-#i 43986#
-
-version number of curl for FreeBSD is somewhat odd.
-we need libcurl.so.3.0.0 not libcurl.so.3
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3*
-after applying this pach
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3.0.0*
-
-Index: curl-7.12.2.patch
-===================================================================
-RCS file: /cvs/external/curl/curl-7.12.2.patch,v
-retrieving revision 1.4
-diff -u -r1.4 curl-7.12.2.patch
---- curl/curl-7.12.2.patch	27 Jan 2005 11:11:50 -0000	1.4
-+++ curl/curl-7.12.2.patch	3 Mar 2005 11:57:27 -0000
-@@ -304,3 +304,68 @@
-      * Check the current list of connections to see if we can
-      * re-use an already existing one or if we have to create a
-      * new one.
-+*** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 20:12:17 2004
-+--- misc/build/curl-7.12.2/ltmain.sh	Thu Mar  3 20:52:09 2005
-+***************
-+*** 2915,2926 ****
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  freebsd-aout|freebsd-elf|sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+--- 2915,2926 ----
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+***************
-+*** 2990,3005 ****
-+  	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+  	  ;;
-+  
-+- 	freebsd-aout)
-+- 	  major=".$current"
-+- 	  versuffix=".$current.$revision";
-+- 	  ;;
-+- 
-+- 	freebsd-elf)
-+- 	  major=".$current"
-+- 	  versuffix=".$current";
-+- 	  ;;
-+- 
-+  	irix | nonstopux)
-+  	  major=`expr $current - $age + 1`
-+  
-+--- 2990,2995 ----
-+***************
-+*** 3022,3028 ****
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
-+--- 3012,3018 ----
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux|freebsd-aout|freebsd-elf)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
diff --git a/editors/openoffice.org-2-RC/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-2-RC/files/patch-extensions+source+config+ldap+makefile.mk
deleted file mode 100644
index fb5f8b09a7ef..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-extensions+source+config+ldap+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-o llber50 is missing
-o http://www.openoffice.org/issues/show_bug.cgi?id=43037
-
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.4.24.2
-diff -u -u -r1.4.24.2 makefile.mk
---- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
-+++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
-@@ -114,6 +114,9 @@
-         $(SALLIB)
- .IF "$(OS)"=="FREEBSD"
- SHL1STDLIBS+=-lcompat
-+.IF "$(WITH_OPENLDAP)" != "YES"
-+SHL1STDLIBS+=-llber50
-+.ENDIF
- .ENDIF
- 
- DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-2-RC/files/patch-instsetoo_native+util+makefile.mk b/editors/openoffice.org-2-RC/files/patch-instsetoo_native+util+makefile.mk
deleted file mode 100644
index 4837e39a6a2b..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-instsetoo_native+util+makefile.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-For instsetoo_native project, we should use FORMAT*=-format bsd.
-However, for FreeBSD, we cannot write script towards multiple line,
-so -format bsd break builds. We temporary set -format portable at
-the moment so that we can treat as we want.
-
-Index: instsetoo_native/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- instsetoo_native/util/makefile.mk	10 Dec 2004 17:03:50 -0000	1.13
-+++ instsetoo_native/util/makefile.mk	20 Dec 2004 11:32:33 -0000
-@@ -82,6 +82,12 @@
- FORMAT*=-format pkg
- .ENDIF
- 
-+.IF "$(OS)" == "FREEBSD"
-+#bsd is preffered but epm does not produce valid packages atm
-+#FORMAT*=-format bsd
-+FORMAT*=-format portable
-+.ENDIF
-+
- # epm supports the following formats:
- # aix - AIX software distribution
- # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
diff --git a/editors/openoffice.org-2-RC/files/patch-libxml2 b/editors/openoffice.org-2-RC/files/patch-libxml2
deleted file mode 100644
index b4d2aca8b1c5..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-libxml2
+++ /dev/null
@@ -1,61 +0,0 @@
-o version number of libxml2
-o http://www.openoffice.org/issues/show_bug.cgi?id=42393
-
-Index: libxml2-2.6.17.patch
-===================================================================
-RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxml2-2.6.17.patch
---- libxml2/libxml2-2.6.17.patch.orig	4 Feb 2005 11:29:07 -0000	1.2
-+++ libxml2/libxml2-2.6.17.patch	12 Feb 2005 13:11:40 -0000
-@@ -1,5 +1,5 @@
--*** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
----- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
-+*** misc/libxml2-2.6.17/configure	Mon Jan 17 04:24:22 2005
-+--- misc/build/libxml2-2.6.17/configure	Sat Feb 12 22:08:54 2005
- ***************
- *** 26339,26347 ****
-   
-@@ -38,8 +38,8 @@
-   echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
-   echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
-   if test $ac_cv_func_setsockopt = yes; then
--*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	2005-01-16 21:02:54.000000000 +0100
----- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	2005-02-02 17:39:50.923232015 +0100
-+*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	Mon Jan 17 05:02:54 2005
-+--- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	Sat Feb 12 22:08:54 2005
- ***************
- *** 263,269 ****
-    *
-@@ -91,8 +91,29 @@
-   #define DEBUG_MEMORY_LOCATION
-   #endif
-   
--*** misc/libxml2-2.6.17/nanohttp.c	2005-01-04 15:49:47.000000000 +0100
----- misc/build/libxml2-2.6.17/nanohttp.c	2005-02-02 17:39:50.924231930 +0100
-+*** misc/libxml2-2.6.17/ltmain.sh	Mon Jan 17 05:02:25 2005
-+--- misc/build/libxml2-2.6.17/ltmain.sh	Sat Feb 12 22:10:00 2005
-+***************
-+*** 2999,3006 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2999,3006 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+*** misc/libxml2-2.6.17/nanohttp.c	Tue Jan  4 23:49:47 2005
-+--- misc/build/libxml2-2.6.17/nanohttp.c	Sat Feb 12 22:08:54 2005
- ***************
- *** 248,254 ****
-   void
diff --git a/editors/openoffice.org-2-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch
new file mode 100644
index 000000000000..88ec6c234485
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch
@@ -0,0 +1,69 @@
+Index: libxmlsec/xmlsec1-1.2.6.patch
+===================================================================
+RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
+retrieving revision 1.3
+diff -u -r1.3 xmlsec1-1.2.6.patch
+--- libxmlsec/xmlsec1-1.2.6.patch	29 Mar 2005 11:45:08 -0000	1.3
++++ libxmlsec/xmlsec1-1.2.6.patch	6 Apr 2005 04:46:13 -0000
+@@ -13957,3 +13957,61 @@
+   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
+   
+   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
++*** misc/xmlsec1-1.2.6/ltmain.sh	Thu Aug 26 15:00:15 2004
++--- misc/build/xmlsec1-1.2.6/ltmain.sh	Wed Apr  6 13:32:04 2005
++***************
++*** 2918,2929 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2918,2929 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2994,3006 ****
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=".$current"
++! 	  versuffix=".$current.$revision";
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2994,3006 ----
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-2-RC/files/patch-odk+configure.pl b/editors/openoffice.org-2-RC/files/patch-odk+configure.pl
deleted file mode 100644
index db196e368e6d..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-o gmake support
-o suggestion from Juegen Schmidt <Juergen.Schmidt@Sun.COM>
-
-http://www.openoffice.org/issues/show_bug.cgi?id=41142
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.8.4.10
-diff -u -r1.8.4.10 configure.pl
---- odk/configure.pl	11 Jan 2005 11:00:15 -0000	1.8.4.10
-+++ odk/configure.pl	23 Jan 2005 09:13:41 -0000
-@@ -43,7 +43,14 @@
- }
- 
- $main::OO_SDK_MAKE_HOME = "";
-+$main::OO_MAKE_NAME = "make";
-+if ( $main::operatingSystem eq "FreeBSD" )
-+{
-+    $main::OO_MAKE_NAME = "gmake";
-+    $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
-+} else {
- $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
-+}
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
- 
-@@ -137,7 +144,7 @@
- # prepare GNU make path
- while ( (!$main::correctVersion) &&
- 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME" ))) )
- {
-     print " Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
-     $main::OO_SDK_MAKE_HOME = readStdIn();
-@@ -146,15 +153,16 @@
-     {
- 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
-     }
-+
-     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME")) )
-     { 
- 		$main::OO_SDK_MAKE_HOME = "";
- 		print " Error: GNU make is required, please specify a GNU make tools directory.\n";
-     } else 
-     {
- 		#check version
--		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
-+		my $testVersion = `$OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME --version`;
- 		if ( $testVersion eq "")
- 		{
- 			print " Set the environment variable OO_SDK_MAKE_HOME to your GNU build tools directory.\n";
-@@ -165,7 +173,7 @@
- 			{
- 				$testVersion = $1;
- 			}
--			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/make", 1);
-+			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME", 1);
- 			if ( !$main::correctVersion )
- 			{
- 				print " The 'make' command found at '$main::OO_SDK_MAKE_HOME' has a wrong version\n";
diff --git a/editors/openoffice.org-2-RC/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-2-RC/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
new file mode 100644
index 000000000000..59b013e50010
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
@@ -0,0 +1,25 @@
+Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.2
+diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
+--- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
++++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
+@@ -109,7 +109,7 @@
+ 		linearly between center and endColor via concentric ellipses
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		circular. If it's not 1, the gradient is elliptical, with the
+ 		special twist that the aspect ratio is maintained also for the
+ 		center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ 		linearly between center and endColor via rectangular boxes
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		quadratic. If it's not 1, the gradient is rectangular, with
+ 		the special twist that the aspect ratio is maintained also for
+ 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2-RC/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-2-RC/files/patch-portaudio+portaudio_v18_1.patch
new file mode 100644
index 000000000000..88317fafc354
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-portaudio+portaudio_v18_1.patch
@@ -0,0 +1,24 @@
+Index: portaudio/portaudio_v18_1.patch
+===================================================================
+RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
+retrieving revision 1.1
+diff -u -r1.1 portaudio_v18_1.patch
+--- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
++++ portaudio/portaudio_v18_1.patch	28 Mar 2005 06:55:37 -0000
+@@ -52,3 +52,16 @@
+   LIBINST = /usr/local/lib
+   
+   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
++*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
++--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Mon Mar 28 15:45:37 2005
++***************
++*** 43,48 ****
++--- 43,50 ----
++  
++  #ifdef __linux__
++  #include <linux/soundcard.h>
+++ #elif defined (__FreeBSD__)
+++ #include <sys/soundcard.h>
++  #else
++  #include <machine/soundcard.h> /* JH20010905 */
++  #endif
diff --git a/editors/openoffice.org-2-RC/files/patch-project-xmlsecurity b/editors/openoffice.org-2-RC/files/patch-project-xmlsecurity
deleted file mode 100644
index b8dfc459e784..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-project-xmlsecurity
+++ /dev/null
@@ -1,45 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=39958
-o http://www.openoffice.org/issues/show_bug.cgi?id=38417
-o xmlsec08
-
-Description
-o Not for integration, we should provide configure based one
-  Note: malloc.h is deprecated for FreeBSD.
-o use configure to produce config.h
-
-Index: libxmlsec/xmlsec1-1.2.4.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v
-retrieving revision 1.7
-diff -u -r1.7 xmlsec1-1.2.4.patch
---- libxmlsec/xmlsec1-1.2.4.patch	9 Sep 2004 08:31:29 -0000	1.7
-+++ libxmlsec/xmlsec1-1.2.4.patch	3 Oct 2004 05:52:20 -0000
-@@ -83,7 +83,7 @@
- ! #undef HAVE_MACH_O_DYLD_H
- ! 
- ! /* Define to 1 if you have the <malloc.h> header file. */
--! #define HAVE_MALLOC_H 1
-+! #define HAVE_MALLOC_H 0
- ! 
- ! /* Define to 1 if you have the `memcpy' function. */
- ! #undef HAVE_MEMCPY
-
-
-Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
-===================================================================
-RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx
---- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	12 Jul 2004 13:15:21 -0000	1.1.1.1
-+++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	4 Oct 2004 22:04:08 -0000
-@@ -68,7 +68,9 @@
- #include <xmloff/attrlist.hxx>
- #include "xmlelementwrapper_xmlsecimpl.hxx"
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/editors/openoffice.org-2-RC/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2-RC/files/patch-sndfile+libsndfile-1.0.9.patch
new file mode 100644
index 000000000000..ee4d7e4d07d9
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-sndfile+libsndfile-1.0.9.patch
@@ -0,0 +1,59 @@
+Index: sndfile/libsndfile-1.0.9.patch
+===================================================================
+RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
+retrieving revision 1.1
+diff -u -r1.1 libsndfile-1.0.9.patch
+--- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
++++ sndfile/libsndfile-1.0.9.patch	28 Mar 2005 07:59:15 -0000
+@@ -231,3 +231,51 @@
+   
+   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
+   
++*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
++--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
++***************
++*** 2899,2910 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2899,2910 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2980,2987 ****
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2980,2987 ----
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-2-RC/files/patch-sndfile+makefile.mk b/editors/openoffice.org-2-RC/files/patch-sndfile+makefile.mk
new file mode 100644
index 000000000000..df33e5cb4c25
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-sndfile+makefile.mk
@@ -0,0 +1,16 @@
+Index: sndfile/makefile.mk
+===================================================================
+RCS file: /cvs/external/sndfile/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
++++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
+@@ -81,7 +81,7 @@
+ CONFIGURE_DIR=
+ 
+ CONFIGURE_ACTION=./configure --with-pic
+-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
++.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
+ CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+ .ENDIF
+ 
diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+util b/editors/openoffice.org-2-RC/files/patch-vcl+util
new file mode 100644
index 000000000000..2ebfdda8ce4c
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-vcl+util
@@ -0,0 +1,47 @@
+Get rid of -ldl for FREEBSD and MACOSX
+
+Index: vcl/util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.65
+diff -u -r1.65 makefile.mk
+--- vcl/util/makefile.mk	13 Jan 2005 18:16:05 -0000	1.65
++++ vcl/util/makefile.mk	7 Apr 2005 01:29:29 -0000
+@@ -252,10 +252,11 @@
+ 
+ .IF "$(GUI)"=="UNX"
+ 
+-.IF "$(OS)"=="MACOSX"
+-SHL1STDLIBS += -ldl
++.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
++SHL1STDLIBS+= -ldl
+ .ENDIF
+ 
++
+ .IF "$(GUIBASE)"=="aqua"
+ SHL1STDLIBS += -framework Cocoa
+ .ENDIF
+@@ -383,7 +384,11 @@
+ 
+ 
+ SHL4STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_GTK)" != ""
+ 
+ # KDE plugin
+@@ -396,7 +401,11 @@
+ # libs for KDE plugin
+ SHL5STDLIBS=$(KDE_LIBS)
+ SHL5STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL5STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_KDE)" != ""
+ 
+ .ENDIF # UNX
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index ad6dc4fa8749..9c5509af0a2e 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050310
+SNAPDATE=	20050406
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -47,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		85
+MILESTONE=		91
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -76,7 +76,6 @@ CXX=	g++-ooo
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
-		epm:${PORTSDIR}/devel/epm \
 		gpatch:${PORTSDIR}/devel/patch \
 		xmkmf:${X_IMAKE_PORT} \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
@@ -104,7 +103,7 @@ UNZIP?=		${PREFIX}/bin/unzip
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	4
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 5831691b8684..bbd66668973c 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 044e96faae97761f3343bff2d123531a
-SIZE (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 243497173
+MD5 (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = b186d557a51b8fa9faf700e7a71b2470
+SIZE (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = 250068979
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2-devel/files/patch-canvas+inc+canvas+canvastools.hxx b/editors/openoffice.org-2-devel/files/patch-canvas+inc+canvas+canvastools.hxx
new file mode 100644
index 000000000000..5c0c6bd78884
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-canvas+inc+canvas+canvastools.hxx
@@ -0,0 +1,21 @@
+
+Index: canvas/inc/canvas/canvastools.hxx
+===================================================================
+RCS file: /cvs/gsl/canvas/inc/canvas/canvastools.hxx,v
+retrieving revision 1.7
+diff -u -r1.7 canvastools.hxx
+--- canvas/inc/canvas/canvastools.hxx	30 Mar 2005 07:34:18 -0000	1.7
++++ canvas/inc/canvas/canvastools.hxx	6 Apr 2005 01:22:58 -0000
+@@ -133,9 +133,9 @@
+ 		 */
+ 
+ 		// mickey's math tricks...
+-		inline unsigned int powerof2( unsigned int c ) { return 0x1 << c; }
+-		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2(powerof2(c)) + 1); }
+-		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2(c))) & mask(c)); }
++		inline unsigned int powerof2_ooo( unsigned int c ) { return 0x1 << c; }
++		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2_ooo(powerof2_ooo(c)) + 1); }
++		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2_ooo(c))) & mask(c)); }
+ 		template<typename T>
+ 		inline unsigned int bitcount( T c ) {
+ 			unsigned int nByteIndex = 0;
diff --git a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
deleted file mode 100644
index 20602d3402a6..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=44913
-o configure7
-
---- config_office/configure.in~	Wed Mar  9 01:31:52 2005
-+++ config_office/configure.in	Sun Mar 13 15:53:13 2005
-@@ -565,7 +565,7 @@
- 		test_cups=no
- 		_os=Darwin
- 		;;
--	freebsd)
-+	freebsd*)
- 		test_x=yes
- 		test_gtk=yes
- 		test_kde=yes
diff --git a/editors/openoffice.org-2-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2-devel/files/patch-crashrep+source+unx+makefile.mk
new file mode 100644
index 000000000000..6cb60786e2e5
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-crashrep+source+unx+makefile.mk
@@ -0,0 +1,19 @@
+Index: crashrep/source/unx/makefile.mk
+===================================================================
+RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
+retrieving revision 1.14
+diff -u -r1.14 makefile.mk
+--- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
++++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
+@@ -82,7 +82,10 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ 
+-APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
++APP1STDLIBS=$(DYNAMIC) -lXext -lX11
++.IF "$(OS)" != "FREEBSD"
++APP1STDLIBS+=-ldl -lnsl
++.ENDIF
+ .IF "$(OS)" == "SOLARIS"
+ APP1STDLIBS+=-lsocket
+ .ENDIF
diff --git a/editors/openoffice.org-2-devel/files/patch-curl-7.12.2.patch b/editors/openoffice.org-2-devel/files/patch-curl-7.12.2.patch
deleted file mode 100644
index f1597ef75e84..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-curl-7.12.2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-#i 43986#
-
-version number of curl for FreeBSD is somewhat odd.
-we need libcurl.so.3.0.0 not libcurl.so.3
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3*
-after applying this pach
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3.0.0*
-
-Index: curl-7.12.2.patch
-===================================================================
-RCS file: /cvs/external/curl/curl-7.12.2.patch,v
-retrieving revision 1.4
-diff -u -r1.4 curl-7.12.2.patch
---- curl/curl-7.12.2.patch	27 Jan 2005 11:11:50 -0000	1.4
-+++ curl/curl-7.12.2.patch	3 Mar 2005 11:57:27 -0000
-@@ -304,3 +304,68 @@
-      * Check the current list of connections to see if we can
-      * re-use an already existing one or if we have to create a
-      * new one.
-+*** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 20:12:17 2004
-+--- misc/build/curl-7.12.2/ltmain.sh	Thu Mar  3 20:52:09 2005
-+***************
-+*** 2915,2926 ****
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  freebsd-aout|freebsd-elf|sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+--- 2915,2926 ----
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+***************
-+*** 2990,3005 ****
-+  	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+  	  ;;
-+  
-+- 	freebsd-aout)
-+- 	  major=".$current"
-+- 	  versuffix=".$current.$revision";
-+- 	  ;;
-+- 
-+- 	freebsd-elf)
-+- 	  major=".$current"
-+- 	  versuffix=".$current";
-+- 	  ;;
-+- 
-+  	irix | nonstopux)
-+  	  major=`expr $current - $age + 1`
-+  
-+--- 2990,2995 ----
-+***************
-+*** 3022,3028 ****
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
-+--- 3012,3018 ----
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux|freebsd-aout|freebsd-elf)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
diff --git a/editors/openoffice.org-2-devel/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-2-devel/files/patch-extensions+source+config+ldap+makefile.mk
deleted file mode 100644
index fb5f8b09a7ef..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-extensions+source+config+ldap+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-o llber50 is missing
-o http://www.openoffice.org/issues/show_bug.cgi?id=43037
-
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.4.24.2
-diff -u -u -r1.4.24.2 makefile.mk
---- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
-+++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
-@@ -114,6 +114,9 @@
-         $(SALLIB)
- .IF "$(OS)"=="FREEBSD"
- SHL1STDLIBS+=-lcompat
-+.IF "$(WITH_OPENLDAP)" != "YES"
-+SHL1STDLIBS+=-llber50
-+.ENDIF
- .ENDIF
- 
- DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-2-devel/files/patch-instsetoo_native+util+makefile.mk b/editors/openoffice.org-2-devel/files/patch-instsetoo_native+util+makefile.mk
deleted file mode 100644
index 4837e39a6a2b..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-instsetoo_native+util+makefile.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-For instsetoo_native project, we should use FORMAT*=-format bsd.
-However, for FreeBSD, we cannot write script towards multiple line,
-so -format bsd break builds. We temporary set -format portable at
-the moment so that we can treat as we want.
-
-Index: instsetoo_native/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- instsetoo_native/util/makefile.mk	10 Dec 2004 17:03:50 -0000	1.13
-+++ instsetoo_native/util/makefile.mk	20 Dec 2004 11:32:33 -0000
-@@ -82,6 +82,12 @@
- FORMAT*=-format pkg
- .ENDIF
- 
-+.IF "$(OS)" == "FREEBSD"
-+#bsd is preffered but epm does not produce valid packages atm
-+#FORMAT*=-format bsd
-+FORMAT*=-format portable
-+.ENDIF
-+
- # epm supports the following formats:
- # aix - AIX software distribution
- # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
diff --git a/editors/openoffice.org-2-devel/files/patch-libxml2 b/editors/openoffice.org-2-devel/files/patch-libxml2
deleted file mode 100644
index b4d2aca8b1c5..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-libxml2
+++ /dev/null
@@ -1,61 +0,0 @@
-o version number of libxml2
-o http://www.openoffice.org/issues/show_bug.cgi?id=42393
-
-Index: libxml2-2.6.17.patch
-===================================================================
-RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxml2-2.6.17.patch
---- libxml2/libxml2-2.6.17.patch.orig	4 Feb 2005 11:29:07 -0000	1.2
-+++ libxml2/libxml2-2.6.17.patch	12 Feb 2005 13:11:40 -0000
-@@ -1,5 +1,5 @@
--*** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
----- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
-+*** misc/libxml2-2.6.17/configure	Mon Jan 17 04:24:22 2005
-+--- misc/build/libxml2-2.6.17/configure	Sat Feb 12 22:08:54 2005
- ***************
- *** 26339,26347 ****
-   
-@@ -38,8 +38,8 @@
-   echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
-   echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
-   if test $ac_cv_func_setsockopt = yes; then
--*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	2005-01-16 21:02:54.000000000 +0100
----- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	2005-02-02 17:39:50.923232015 +0100
-+*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	Mon Jan 17 05:02:54 2005
-+--- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	Sat Feb 12 22:08:54 2005
- ***************
- *** 263,269 ****
-    *
-@@ -91,8 +91,29 @@
-   #define DEBUG_MEMORY_LOCATION
-   #endif
-   
--*** misc/libxml2-2.6.17/nanohttp.c	2005-01-04 15:49:47.000000000 +0100
----- misc/build/libxml2-2.6.17/nanohttp.c	2005-02-02 17:39:50.924231930 +0100
-+*** misc/libxml2-2.6.17/ltmain.sh	Mon Jan 17 05:02:25 2005
-+--- misc/build/libxml2-2.6.17/ltmain.sh	Sat Feb 12 22:10:00 2005
-+***************
-+*** 2999,3006 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2999,3006 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+*** misc/libxml2-2.6.17/nanohttp.c	Tue Jan  4 23:49:47 2005
-+--- misc/build/libxml2-2.6.17/nanohttp.c	Sat Feb 12 22:08:54 2005
- ***************
- *** 248,254 ****
-   void
diff --git a/editors/openoffice.org-2-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
new file mode 100644
index 000000000000..88ec6c234485
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
@@ -0,0 +1,69 @@
+Index: libxmlsec/xmlsec1-1.2.6.patch
+===================================================================
+RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
+retrieving revision 1.3
+diff -u -r1.3 xmlsec1-1.2.6.patch
+--- libxmlsec/xmlsec1-1.2.6.patch	29 Mar 2005 11:45:08 -0000	1.3
++++ libxmlsec/xmlsec1-1.2.6.patch	6 Apr 2005 04:46:13 -0000
+@@ -13957,3 +13957,61 @@
+   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
+   
+   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
++*** misc/xmlsec1-1.2.6/ltmain.sh	Thu Aug 26 15:00:15 2004
++--- misc/build/xmlsec1-1.2.6/ltmain.sh	Wed Apr  6 13:32:04 2005
++***************
++*** 2918,2929 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2918,2929 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2994,3006 ****
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=".$current"
++! 	  versuffix=".$current.$revision";
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2994,3006 ----
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-2-devel/files/patch-odk+configure.pl b/editors/openoffice.org-2-devel/files/patch-odk+configure.pl
deleted file mode 100644
index db196e368e6d..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-o gmake support
-o suggestion from Juegen Schmidt <Juergen.Schmidt@Sun.COM>
-
-http://www.openoffice.org/issues/show_bug.cgi?id=41142
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.8.4.10
-diff -u -r1.8.4.10 configure.pl
---- odk/configure.pl	11 Jan 2005 11:00:15 -0000	1.8.4.10
-+++ odk/configure.pl	23 Jan 2005 09:13:41 -0000
-@@ -43,7 +43,14 @@
- }
- 
- $main::OO_SDK_MAKE_HOME = "";
-+$main::OO_MAKE_NAME = "make";
-+if ( $main::operatingSystem eq "FreeBSD" )
-+{
-+    $main::OO_MAKE_NAME = "gmake";
-+    $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
-+} else {
- $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
-+}
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
- 
-@@ -137,7 +144,7 @@
- # prepare GNU make path
- while ( (!$main::correctVersion) &&
- 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME" ))) )
- {
-     print " Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
-     $main::OO_SDK_MAKE_HOME = readStdIn();
-@@ -146,15 +153,16 @@
-     {
- 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
-     }
-+
-     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME")) )
-     { 
- 		$main::OO_SDK_MAKE_HOME = "";
- 		print " Error: GNU make is required, please specify a GNU make tools directory.\n";
-     } else 
-     {
- 		#check version
--		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
-+		my $testVersion = `$OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME --version`;
- 		if ( $testVersion eq "")
- 		{
- 			print " Set the environment variable OO_SDK_MAKE_HOME to your GNU build tools directory.\n";
-@@ -165,7 +173,7 @@
- 			{
- 				$testVersion = $1;
- 			}
--			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/make", 1);
-+			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME", 1);
- 			if ( !$main::correctVersion )
- 			{
- 				print " The 'make' command found at '$main::OO_SDK_MAKE_HOME' has a wrong version\n";
diff --git a/editors/openoffice.org-2-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-2-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
new file mode 100644
index 000000000000..59b013e50010
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
@@ -0,0 +1,25 @@
+Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.2
+diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
+--- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
++++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
+@@ -109,7 +109,7 @@
+ 		linearly between center and endColor via concentric ellipses
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		circular. If it's not 1, the gradient is elliptical, with the
+ 		special twist that the aspect ratio is maintained also for the
+ 		center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ 		linearly between center and endColor via rectangular boxes
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		quadratic. If it's not 1, the gradient is rectangular, with
+ 		the special twist that the aspect ratio is maintained also for
+ 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2-devel/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-2-devel/files/patch-portaudio+portaudio_v18_1.patch
new file mode 100644
index 000000000000..88317fafc354
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-portaudio+portaudio_v18_1.patch
@@ -0,0 +1,24 @@
+Index: portaudio/portaudio_v18_1.patch
+===================================================================
+RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
+retrieving revision 1.1
+diff -u -r1.1 portaudio_v18_1.patch
+--- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
++++ portaudio/portaudio_v18_1.patch	28 Mar 2005 06:55:37 -0000
+@@ -52,3 +52,16 @@
+   LIBINST = /usr/local/lib
+   
+   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
++*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
++--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Mon Mar 28 15:45:37 2005
++***************
++*** 43,48 ****
++--- 43,50 ----
++  
++  #ifdef __linux__
++  #include <linux/soundcard.h>
+++ #elif defined (__FreeBSD__)
+++ #include <sys/soundcard.h>
++  #else
++  #include <machine/soundcard.h> /* JH20010905 */
++  #endif
diff --git a/editors/openoffice.org-2-devel/files/patch-project-xmlsecurity b/editors/openoffice.org-2-devel/files/patch-project-xmlsecurity
deleted file mode 100644
index b8dfc459e784..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-project-xmlsecurity
+++ /dev/null
@@ -1,45 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=39958
-o http://www.openoffice.org/issues/show_bug.cgi?id=38417
-o xmlsec08
-
-Description
-o Not for integration, we should provide configure based one
-  Note: malloc.h is deprecated for FreeBSD.
-o use configure to produce config.h
-
-Index: libxmlsec/xmlsec1-1.2.4.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v
-retrieving revision 1.7
-diff -u -r1.7 xmlsec1-1.2.4.patch
---- libxmlsec/xmlsec1-1.2.4.patch	9 Sep 2004 08:31:29 -0000	1.7
-+++ libxmlsec/xmlsec1-1.2.4.patch	3 Oct 2004 05:52:20 -0000
-@@ -83,7 +83,7 @@
- ! #undef HAVE_MACH_O_DYLD_H
- ! 
- ! /* Define to 1 if you have the <malloc.h> header file. */
--! #define HAVE_MALLOC_H 1
-+! #define HAVE_MALLOC_H 0
- ! 
- ! /* Define to 1 if you have the `memcpy' function. */
- ! #undef HAVE_MEMCPY
-
-
-Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
-===================================================================
-RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx
---- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	12 Jul 2004 13:15:21 -0000	1.1.1.1
-+++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	4 Oct 2004 22:04:08 -0000
-@@ -68,7 +68,9 @@
- #include <xmloff/attrlist.hxx>
- #include "xmlelementwrapper_xmlsecimpl.hxx"
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/editors/openoffice.org-2-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2-devel/files/patch-sndfile+libsndfile-1.0.9.patch
new file mode 100644
index 000000000000..ee4d7e4d07d9
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-sndfile+libsndfile-1.0.9.patch
@@ -0,0 +1,59 @@
+Index: sndfile/libsndfile-1.0.9.patch
+===================================================================
+RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
+retrieving revision 1.1
+diff -u -r1.1 libsndfile-1.0.9.patch
+--- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
++++ sndfile/libsndfile-1.0.9.patch	28 Mar 2005 07:59:15 -0000
+@@ -231,3 +231,51 @@
+   
+   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
+   
++*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
++--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
++***************
++*** 2899,2910 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2899,2910 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2980,2987 ****
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2980,2987 ----
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-2-devel/files/patch-sndfile+makefile.mk b/editors/openoffice.org-2-devel/files/patch-sndfile+makefile.mk
new file mode 100644
index 000000000000..df33e5cb4c25
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-sndfile+makefile.mk
@@ -0,0 +1,16 @@
+Index: sndfile/makefile.mk
+===================================================================
+RCS file: /cvs/external/sndfile/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
++++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
+@@ -81,7 +81,7 @@
+ CONFIGURE_DIR=
+ 
+ CONFIGURE_ACTION=./configure --with-pic
+-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
++.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
+ CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+ .ENDIF
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-vcl+util b/editors/openoffice.org-2-devel/files/patch-vcl+util
new file mode 100644
index 000000000000..2ebfdda8ce4c
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-vcl+util
@@ -0,0 +1,47 @@
+Get rid of -ldl for FREEBSD and MACOSX
+
+Index: vcl/util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.65
+diff -u -r1.65 makefile.mk
+--- vcl/util/makefile.mk	13 Jan 2005 18:16:05 -0000	1.65
++++ vcl/util/makefile.mk	7 Apr 2005 01:29:29 -0000
+@@ -252,10 +252,11 @@
+ 
+ .IF "$(GUI)"=="UNX"
+ 
+-.IF "$(OS)"=="MACOSX"
+-SHL1STDLIBS += -ldl
++.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
++SHL1STDLIBS+= -ldl
+ .ENDIF
+ 
++
+ .IF "$(GUIBASE)"=="aqua"
+ SHL1STDLIBS += -framework Cocoa
+ .ENDIF
+@@ -383,7 +384,11 @@
+ 
+ 
+ SHL4STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_GTK)" != ""
+ 
+ # KDE plugin
+@@ -396,7 +401,11 @@
+ # libs for KDE plugin
+ SHL5STDLIBS=$(KDE_LIBS)
+ SHL5STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL5STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_KDE)" != ""
+ 
+ .ENDIF # UNX
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index ad6dc4fa8749..9c5509af0a2e 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050310
+SNAPDATE=	20050406
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -47,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		85
+MILESTONE=		91
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -76,7 +76,6 @@ CXX=	g++-ooo
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
-		epm:${PORTSDIR}/devel/epm \
 		gpatch:${PORTSDIR}/devel/patch \
 		xmkmf:${X_IMAKE_PORT} \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
@@ -104,7 +103,7 @@ UNZIP?=		${PREFIX}/bin/unzip
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	4
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 5831691b8684..bbd66668973c 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 044e96faae97761f3343bff2d123531a
-SIZE (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 243497173
+MD5 (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = b186d557a51b8fa9faf700e7a71b2470
+SIZE (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = 250068979
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2.0-devel/files/patch-canvas+inc+canvas+canvastools.hxx b/editors/openoffice.org-2.0-devel/files/patch-canvas+inc+canvas+canvastools.hxx
new file mode 100644
index 000000000000..5c0c6bd78884
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-canvas+inc+canvas+canvastools.hxx
@@ -0,0 +1,21 @@
+
+Index: canvas/inc/canvas/canvastools.hxx
+===================================================================
+RCS file: /cvs/gsl/canvas/inc/canvas/canvastools.hxx,v
+retrieving revision 1.7
+diff -u -r1.7 canvastools.hxx
+--- canvas/inc/canvas/canvastools.hxx	30 Mar 2005 07:34:18 -0000	1.7
++++ canvas/inc/canvas/canvastools.hxx	6 Apr 2005 01:22:58 -0000
+@@ -133,9 +133,9 @@
+ 		 */
+ 
+ 		// mickey's math tricks...
+-		inline unsigned int powerof2( unsigned int c ) { return 0x1 << c; }
+-		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2(powerof2(c)) + 1); }
+-		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2(c))) & mask(c)); }
++		inline unsigned int powerof2_ooo( unsigned int c ) { return 0x1 << c; }
++		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2_ooo(powerof2_ooo(c)) + 1); }
++		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2_ooo(c))) & mask(c)); }
+ 		template<typename T>
+ 		inline unsigned int bitcount( T c ) {
+ 			unsigned int nByteIndex = 0;
diff --git a/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in
deleted file mode 100644
index 20602d3402a6..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=44913
-o configure7
-
---- config_office/configure.in~	Wed Mar  9 01:31:52 2005
-+++ config_office/configure.in	Sun Mar 13 15:53:13 2005
-@@ -565,7 +565,7 @@
- 		test_cups=no
- 		_os=Darwin
- 		;;
--	freebsd)
-+	freebsd*)
- 		test_x=yes
- 		test_gtk=yes
- 		test_kde=yes
diff --git a/editors/openoffice.org-2.0-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
new file mode 100644
index 000000000000..6cb60786e2e5
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-crashrep+source+unx+makefile.mk
@@ -0,0 +1,19 @@
+Index: crashrep/source/unx/makefile.mk
+===================================================================
+RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
+retrieving revision 1.14
+diff -u -r1.14 makefile.mk
+--- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
++++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
+@@ -82,7 +82,10 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ 
+-APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
++APP1STDLIBS=$(DYNAMIC) -lXext -lX11
++.IF "$(OS)" != "FREEBSD"
++APP1STDLIBS+=-ldl -lnsl
++.ENDIF
+ .IF "$(OS)" == "SOLARIS"
+ APP1STDLIBS+=-lsocket
+ .ENDIF
diff --git a/editors/openoffice.org-2.0-devel/files/patch-curl-7.12.2.patch b/editors/openoffice.org-2.0-devel/files/patch-curl-7.12.2.patch
deleted file mode 100644
index f1597ef75e84..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-curl-7.12.2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-#i 43986#
-
-version number of curl for FreeBSD is somewhat odd.
-we need libcurl.so.3.0.0 not libcurl.so.3
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3*
-after applying this pach
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3.0.0*
-
-Index: curl-7.12.2.patch
-===================================================================
-RCS file: /cvs/external/curl/curl-7.12.2.patch,v
-retrieving revision 1.4
-diff -u -r1.4 curl-7.12.2.patch
---- curl/curl-7.12.2.patch	27 Jan 2005 11:11:50 -0000	1.4
-+++ curl/curl-7.12.2.patch	3 Mar 2005 11:57:27 -0000
-@@ -304,3 +304,68 @@
-      * Check the current list of connections to see if we can
-      * re-use an already existing one or if we have to create a
-      * new one.
-+*** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 20:12:17 2004
-+--- misc/build/curl-7.12.2/ltmain.sh	Thu Mar  3 20:52:09 2005
-+***************
-+*** 2915,2926 ****
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  freebsd-aout|freebsd-elf|sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+--- 2915,2926 ----
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+***************
-+*** 2990,3005 ****
-+  	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+  	  ;;
-+  
-+- 	freebsd-aout)
-+- 	  major=".$current"
-+- 	  versuffix=".$current.$revision";
-+- 	  ;;
-+- 
-+- 	freebsd-elf)
-+- 	  major=".$current"
-+- 	  versuffix=".$current";
-+- 	  ;;
-+- 
-+  	irix | nonstopux)
-+  	  major=`expr $current - $age + 1`
-+  
-+--- 2990,2995 ----
-+***************
-+*** 3022,3028 ****
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
-+--- 3012,3018 ----
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux|freebsd-aout|freebsd-elf)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
diff --git a/editors/openoffice.org-2.0-devel/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-extensions+source+config+ldap+makefile.mk
deleted file mode 100644
index fb5f8b09a7ef..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-extensions+source+config+ldap+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-o llber50 is missing
-o http://www.openoffice.org/issues/show_bug.cgi?id=43037
-
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.4.24.2
-diff -u -u -r1.4.24.2 makefile.mk
---- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
-+++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
-@@ -114,6 +114,9 @@
-         $(SALLIB)
- .IF "$(OS)"=="FREEBSD"
- SHL1STDLIBS+=-lcompat
-+.IF "$(WITH_OPENLDAP)" != "YES"
-+SHL1STDLIBS+=-llber50
-+.ENDIF
- .ENDIF
- 
- DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-instsetoo_native+util+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-instsetoo_native+util+makefile.mk
deleted file mode 100644
index 4837e39a6a2b..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-instsetoo_native+util+makefile.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-For instsetoo_native project, we should use FORMAT*=-format bsd.
-However, for FreeBSD, we cannot write script towards multiple line,
-so -format bsd break builds. We temporary set -format portable at
-the moment so that we can treat as we want.
-
-Index: instsetoo_native/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- instsetoo_native/util/makefile.mk	10 Dec 2004 17:03:50 -0000	1.13
-+++ instsetoo_native/util/makefile.mk	20 Dec 2004 11:32:33 -0000
-@@ -82,6 +82,12 @@
- FORMAT*=-format pkg
- .ENDIF
- 
-+.IF "$(OS)" == "FREEBSD"
-+#bsd is preffered but epm does not produce valid packages atm
-+#FORMAT*=-format bsd
-+FORMAT*=-format portable
-+.ENDIF
-+
- # epm supports the following formats:
- # aix - AIX software distribution
- # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
diff --git a/editors/openoffice.org-2.0-devel/files/patch-libxml2 b/editors/openoffice.org-2.0-devel/files/patch-libxml2
deleted file mode 100644
index b4d2aca8b1c5..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-libxml2
+++ /dev/null
@@ -1,61 +0,0 @@
-o version number of libxml2
-o http://www.openoffice.org/issues/show_bug.cgi?id=42393
-
-Index: libxml2-2.6.17.patch
-===================================================================
-RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxml2-2.6.17.patch
---- libxml2/libxml2-2.6.17.patch.orig	4 Feb 2005 11:29:07 -0000	1.2
-+++ libxml2/libxml2-2.6.17.patch	12 Feb 2005 13:11:40 -0000
-@@ -1,5 +1,5 @@
--*** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
----- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
-+*** misc/libxml2-2.6.17/configure	Mon Jan 17 04:24:22 2005
-+--- misc/build/libxml2-2.6.17/configure	Sat Feb 12 22:08:54 2005
- ***************
- *** 26339,26347 ****
-   
-@@ -38,8 +38,8 @@
-   echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
-   echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
-   if test $ac_cv_func_setsockopt = yes; then
--*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	2005-01-16 21:02:54.000000000 +0100
----- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	2005-02-02 17:39:50.923232015 +0100
-+*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	Mon Jan 17 05:02:54 2005
-+--- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	Sat Feb 12 22:08:54 2005
- ***************
- *** 263,269 ****
-    *
-@@ -91,8 +91,29 @@
-   #define DEBUG_MEMORY_LOCATION
-   #endif
-   
--*** misc/libxml2-2.6.17/nanohttp.c	2005-01-04 15:49:47.000000000 +0100
----- misc/build/libxml2-2.6.17/nanohttp.c	2005-02-02 17:39:50.924231930 +0100
-+*** misc/libxml2-2.6.17/ltmain.sh	Mon Jan 17 05:02:25 2005
-+--- misc/build/libxml2-2.6.17/ltmain.sh	Sat Feb 12 22:10:00 2005
-+***************
-+*** 2999,3006 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2999,3006 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+*** misc/libxml2-2.6.17/nanohttp.c	Tue Jan  4 23:49:47 2005
-+--- misc/build/libxml2-2.6.17/nanohttp.c	Sat Feb 12 22:08:54 2005
- ***************
- *** 248,254 ****
-   void
diff --git a/editors/openoffice.org-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
new file mode 100644
index 000000000000..88ec6c234485
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
@@ -0,0 +1,69 @@
+Index: libxmlsec/xmlsec1-1.2.6.patch
+===================================================================
+RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
+retrieving revision 1.3
+diff -u -r1.3 xmlsec1-1.2.6.patch
+--- libxmlsec/xmlsec1-1.2.6.patch	29 Mar 2005 11:45:08 -0000	1.3
++++ libxmlsec/xmlsec1-1.2.6.patch	6 Apr 2005 04:46:13 -0000
+@@ -13957,3 +13957,61 @@
+   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
+   
+   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
++*** misc/xmlsec1-1.2.6/ltmain.sh	Thu Aug 26 15:00:15 2004
++--- misc/build/xmlsec1-1.2.6/ltmain.sh	Wed Apr  6 13:32:04 2005
++***************
++*** 2918,2929 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2918,2929 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2994,3006 ****
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=".$current"
++! 	  versuffix=".$current.$revision";
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2994,3006 ----
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-odk+configure.pl b/editors/openoffice.org-2.0-devel/files/patch-odk+configure.pl
deleted file mode 100644
index db196e368e6d..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-o gmake support
-o suggestion from Juegen Schmidt <Juergen.Schmidt@Sun.COM>
-
-http://www.openoffice.org/issues/show_bug.cgi?id=41142
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.8.4.10
-diff -u -r1.8.4.10 configure.pl
---- odk/configure.pl	11 Jan 2005 11:00:15 -0000	1.8.4.10
-+++ odk/configure.pl	23 Jan 2005 09:13:41 -0000
-@@ -43,7 +43,14 @@
- }
- 
- $main::OO_SDK_MAKE_HOME = "";
-+$main::OO_MAKE_NAME = "make";
-+if ( $main::operatingSystem eq "FreeBSD" )
-+{
-+    $main::OO_MAKE_NAME = "gmake";
-+    $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
-+} else {
- $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
-+}
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
- 
-@@ -137,7 +144,7 @@
- # prepare GNU make path
- while ( (!$main::correctVersion) &&
- 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME" ))) )
- {
-     print " Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
-     $main::OO_SDK_MAKE_HOME = readStdIn();
-@@ -146,15 +153,16 @@
-     {
- 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
-     }
-+
-     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME")) )
-     { 
- 		$main::OO_SDK_MAKE_HOME = "";
- 		print " Error: GNU make is required, please specify a GNU make tools directory.\n";
-     } else 
-     {
- 		#check version
--		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
-+		my $testVersion = `$OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME --version`;
- 		if ( $testVersion eq "")
- 		{
- 			print " Set the environment variable OO_SDK_MAKE_HOME to your GNU build tools directory.\n";
-@@ -165,7 +173,7 @@
- 			{
- 				$testVersion = $1;
- 			}
--			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/make", 1);
-+			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME", 1);
- 			if ( !$main::correctVersion )
- 			{
- 				print " The 'make' command found at '$main::OO_SDK_MAKE_HOME' has a wrong version\n";
diff --git a/editors/openoffice.org-2.0-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-2.0-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
new file mode 100644
index 000000000000..59b013e50010
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
@@ -0,0 +1,25 @@
+Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.2
+diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
+--- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
++++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
+@@ -109,7 +109,7 @@
+ 		linearly between center and endColor via concentric ellipses
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		circular. If it's not 1, the gradient is elliptical, with the
+ 		special twist that the aspect ratio is maintained also for the
+ 		center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ 		linearly between center and endColor via rectangular boxes
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		quadratic. If it's not 1, the gradient is rectangular, with
+ 		the special twist that the aspect ratio is maintained also for
+ 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2.0-devel/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-2.0-devel/files/patch-portaudio+portaudio_v18_1.patch
new file mode 100644
index 000000000000..88317fafc354
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-portaudio+portaudio_v18_1.patch
@@ -0,0 +1,24 @@
+Index: portaudio/portaudio_v18_1.patch
+===================================================================
+RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
+retrieving revision 1.1
+diff -u -r1.1 portaudio_v18_1.patch
+--- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
++++ portaudio/portaudio_v18_1.patch	28 Mar 2005 06:55:37 -0000
+@@ -52,3 +52,16 @@
+   LIBINST = /usr/local/lib
+   
+   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
++*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
++--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Mon Mar 28 15:45:37 2005
++***************
++*** 43,48 ****
++--- 43,50 ----
++  
++  #ifdef __linux__
++  #include <linux/soundcard.h>
+++ #elif defined (__FreeBSD__)
+++ #include <sys/soundcard.h>
++  #else
++  #include <machine/soundcard.h> /* JH20010905 */
++  #endif
diff --git a/editors/openoffice.org-2.0-devel/files/patch-project-xmlsecurity b/editors/openoffice.org-2.0-devel/files/patch-project-xmlsecurity
deleted file mode 100644
index b8dfc459e784..000000000000
--- a/editors/openoffice.org-2.0-devel/files/patch-project-xmlsecurity
+++ /dev/null
@@ -1,45 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=39958
-o http://www.openoffice.org/issues/show_bug.cgi?id=38417
-o xmlsec08
-
-Description
-o Not for integration, we should provide configure based one
-  Note: malloc.h is deprecated for FreeBSD.
-o use configure to produce config.h
-
-Index: libxmlsec/xmlsec1-1.2.4.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v
-retrieving revision 1.7
-diff -u -r1.7 xmlsec1-1.2.4.patch
---- libxmlsec/xmlsec1-1.2.4.patch	9 Sep 2004 08:31:29 -0000	1.7
-+++ libxmlsec/xmlsec1-1.2.4.patch	3 Oct 2004 05:52:20 -0000
-@@ -83,7 +83,7 @@
- ! #undef HAVE_MACH_O_DYLD_H
- ! 
- ! /* Define to 1 if you have the <malloc.h> header file. */
--! #define HAVE_MALLOC_H 1
-+! #define HAVE_MALLOC_H 0
- ! 
- ! /* Define to 1 if you have the `memcpy' function. */
- ! #undef HAVE_MEMCPY
-
-
-Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
-===================================================================
-RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx
---- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	12 Jul 2004 13:15:21 -0000	1.1.1.1
-+++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	4 Oct 2004 22:04:08 -0000
-@@ -68,7 +68,9 @@
- #include <xmloff/attrlist.hxx>
- #include "xmlelementwrapper_xmlsecimpl.hxx"
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch
new file mode 100644
index 000000000000..ee4d7e4d07d9
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-sndfile+libsndfile-1.0.9.patch
@@ -0,0 +1,59 @@
+Index: sndfile/libsndfile-1.0.9.patch
+===================================================================
+RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
+retrieving revision 1.1
+diff -u -r1.1 libsndfile-1.0.9.patch
+--- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
++++ sndfile/libsndfile-1.0.9.patch	28 Mar 2005 07:59:15 -0000
+@@ -231,3 +231,51 @@
+   
+   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
+   
++*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
++--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
++***************
++*** 2899,2910 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2899,2910 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2980,2987 ****
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2980,2987 ----
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sndfile+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-sndfile+makefile.mk
new file mode 100644
index 000000000000..df33e5cb4c25
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-sndfile+makefile.mk
@@ -0,0 +1,16 @@
+Index: sndfile/makefile.mk
+===================================================================
+RCS file: /cvs/external/sndfile/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
++++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
+@@ -81,7 +81,7 @@
+ CONFIGURE_DIR=
+ 
+ CONFIGURE_ACTION=./configure --with-pic
+-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
++.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
+ CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+ .ENDIF
+ 
diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+util b/editors/openoffice.org-2.0-devel/files/patch-vcl+util
new file mode 100644
index 000000000000..2ebfdda8ce4c
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-vcl+util
@@ -0,0 +1,47 @@
+Get rid of -ldl for FREEBSD and MACOSX
+
+Index: vcl/util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.65
+diff -u -r1.65 makefile.mk
+--- vcl/util/makefile.mk	13 Jan 2005 18:16:05 -0000	1.65
++++ vcl/util/makefile.mk	7 Apr 2005 01:29:29 -0000
+@@ -252,10 +252,11 @@
+ 
+ .IF "$(GUI)"=="UNX"
+ 
+-.IF "$(OS)"=="MACOSX"
+-SHL1STDLIBS += -ldl
++.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
++SHL1STDLIBS+= -ldl
+ .ENDIF
+ 
++
+ .IF "$(GUIBASE)"=="aqua"
+ SHL1STDLIBS += -framework Cocoa
+ .ENDIF
+@@ -383,7 +384,11 @@
+ 
+ 
+ SHL4STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_GTK)" != ""
+ 
+ # KDE plugin
+@@ -396,7 +401,11 @@
+ # libs for KDE plugin
+ SHL5STDLIBS=$(KDE_LIBS)
+ SHL5STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL5STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_KDE)" != ""
+ 
+ .ENDIF # UNX
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index ad6dc4fa8749..9c5509af0a2e 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050310
+SNAPDATE=	20050406
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -47,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		85
+MILESTONE=		91
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -76,7 +76,6 @@ CXX=	g++-ooo
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
-		epm:${PORTSDIR}/devel/epm \
 		gpatch:${PORTSDIR}/devel/patch \
 		xmkmf:${X_IMAKE_PORT} \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
@@ -104,7 +103,7 @@ UNZIP?=		${PREFIX}/bin/unzip
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	4
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 5831691b8684..bbd66668973c 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 044e96faae97761f3343bff2d123531a
-SIZE (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 243497173
+MD5 (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = b186d557a51b8fa9faf700e7a71b2470
+SIZE (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = 250068979
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2.0/files/patch-canvas+inc+canvas+canvastools.hxx b/editors/openoffice.org-2.0/files/patch-canvas+inc+canvas+canvastools.hxx
new file mode 100644
index 000000000000..5c0c6bd78884
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-canvas+inc+canvas+canvastools.hxx
@@ -0,0 +1,21 @@
+
+Index: canvas/inc/canvas/canvastools.hxx
+===================================================================
+RCS file: /cvs/gsl/canvas/inc/canvas/canvastools.hxx,v
+retrieving revision 1.7
+diff -u -r1.7 canvastools.hxx
+--- canvas/inc/canvas/canvastools.hxx	30 Mar 2005 07:34:18 -0000	1.7
++++ canvas/inc/canvas/canvastools.hxx	6 Apr 2005 01:22:58 -0000
+@@ -133,9 +133,9 @@
+ 		 */
+ 
+ 		// mickey's math tricks...
+-		inline unsigned int powerof2( unsigned int c ) { return 0x1 << c; }
+-		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2(powerof2(c)) + 1); }
+-		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2(c))) & mask(c)); }
++		inline unsigned int powerof2_ooo( unsigned int c ) { return 0x1 << c; }
++		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2_ooo(powerof2_ooo(c)) + 1); }
++		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2_ooo(c))) & mask(c)); }
+ 		template<typename T>
+ 		inline unsigned int bitcount( T c ) {
+ 			unsigned int nByteIndex = 0;
diff --git a/editors/openoffice.org-2.0/files/patch-config_office+configure.in b/editors/openoffice.org-2.0/files/patch-config_office+configure.in
deleted file mode 100644
index 20602d3402a6..000000000000
--- a/editors/openoffice.org-2.0/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=44913
-o configure7
-
---- config_office/configure.in~	Wed Mar  9 01:31:52 2005
-+++ config_office/configure.in	Sun Mar 13 15:53:13 2005
-@@ -565,7 +565,7 @@
- 		test_cups=no
- 		_os=Darwin
- 		;;
--	freebsd)
-+	freebsd*)
- 		test_x=yes
- 		test_gtk=yes
- 		test_kde=yes
diff --git a/editors/openoffice.org-2.0/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2.0/files/patch-crashrep+source+unx+makefile.mk
new file mode 100644
index 000000000000..6cb60786e2e5
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-crashrep+source+unx+makefile.mk
@@ -0,0 +1,19 @@
+Index: crashrep/source/unx/makefile.mk
+===================================================================
+RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
+retrieving revision 1.14
+diff -u -r1.14 makefile.mk
+--- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
++++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
+@@ -82,7 +82,10 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ 
+-APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
++APP1STDLIBS=$(DYNAMIC) -lXext -lX11
++.IF "$(OS)" != "FREEBSD"
++APP1STDLIBS+=-ldl -lnsl
++.ENDIF
+ .IF "$(OS)" == "SOLARIS"
+ APP1STDLIBS+=-lsocket
+ .ENDIF
diff --git a/editors/openoffice.org-2.0/files/patch-curl-7.12.2.patch b/editors/openoffice.org-2.0/files/patch-curl-7.12.2.patch
deleted file mode 100644
index f1597ef75e84..000000000000
--- a/editors/openoffice.org-2.0/files/patch-curl-7.12.2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-#i 43986#
-
-version number of curl for FreeBSD is somewhat odd.
-we need libcurl.so.3.0.0 not libcurl.so.3
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3*
-after applying this pach
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3.0.0*
-
-Index: curl-7.12.2.patch
-===================================================================
-RCS file: /cvs/external/curl/curl-7.12.2.patch,v
-retrieving revision 1.4
-diff -u -r1.4 curl-7.12.2.patch
---- curl/curl-7.12.2.patch	27 Jan 2005 11:11:50 -0000	1.4
-+++ curl/curl-7.12.2.patch	3 Mar 2005 11:57:27 -0000
-@@ -304,3 +304,68 @@
-      * Check the current list of connections to see if we can
-      * re-use an already existing one or if we have to create a
-      * new one.
-+*** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 20:12:17 2004
-+--- misc/build/curl-7.12.2/ltmain.sh	Thu Mar  3 20:52:09 2005
-+***************
-+*** 2915,2926 ****
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  freebsd-aout|freebsd-elf|sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+--- 2915,2926 ----
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+***************
-+*** 2990,3005 ****
-+  	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+  	  ;;
-+  
-+- 	freebsd-aout)
-+- 	  major=".$current"
-+- 	  versuffix=".$current.$revision";
-+- 	  ;;
-+- 
-+- 	freebsd-elf)
-+- 	  major=".$current"
-+- 	  versuffix=".$current";
-+- 	  ;;
-+- 
-+  	irix | nonstopux)
-+  	  major=`expr $current - $age + 1`
-+  
-+--- 2990,2995 ----
-+***************
-+*** 3022,3028 ****
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
-+--- 3012,3018 ----
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux|freebsd-aout|freebsd-elf)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
diff --git a/editors/openoffice.org-2.0/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-2.0/files/patch-extensions+source+config+ldap+makefile.mk
deleted file mode 100644
index fb5f8b09a7ef..000000000000
--- a/editors/openoffice.org-2.0/files/patch-extensions+source+config+ldap+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-o llber50 is missing
-o http://www.openoffice.org/issues/show_bug.cgi?id=43037
-
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.4.24.2
-diff -u -u -r1.4.24.2 makefile.mk
---- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
-+++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
-@@ -114,6 +114,9 @@
-         $(SALLIB)
- .IF "$(OS)"=="FREEBSD"
- SHL1STDLIBS+=-lcompat
-+.IF "$(WITH_OPENLDAP)" != "YES"
-+SHL1STDLIBS+=-llber50
-+.ENDIF
- .ENDIF
- 
- DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-2.0/files/patch-instsetoo_native+util+makefile.mk b/editors/openoffice.org-2.0/files/patch-instsetoo_native+util+makefile.mk
deleted file mode 100644
index 4837e39a6a2b..000000000000
--- a/editors/openoffice.org-2.0/files/patch-instsetoo_native+util+makefile.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-For instsetoo_native project, we should use FORMAT*=-format bsd.
-However, for FreeBSD, we cannot write script towards multiple line,
-so -format bsd break builds. We temporary set -format portable at
-the moment so that we can treat as we want.
-
-Index: instsetoo_native/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- instsetoo_native/util/makefile.mk	10 Dec 2004 17:03:50 -0000	1.13
-+++ instsetoo_native/util/makefile.mk	20 Dec 2004 11:32:33 -0000
-@@ -82,6 +82,12 @@
- FORMAT*=-format pkg
- .ENDIF
- 
-+.IF "$(OS)" == "FREEBSD"
-+#bsd is preffered but epm does not produce valid packages atm
-+#FORMAT*=-format bsd
-+FORMAT*=-format portable
-+.ENDIF
-+
- # epm supports the following formats:
- # aix - AIX software distribution
- # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
diff --git a/editors/openoffice.org-2.0/files/patch-libxml2 b/editors/openoffice.org-2.0/files/patch-libxml2
deleted file mode 100644
index b4d2aca8b1c5..000000000000
--- a/editors/openoffice.org-2.0/files/patch-libxml2
+++ /dev/null
@@ -1,61 +0,0 @@
-o version number of libxml2
-o http://www.openoffice.org/issues/show_bug.cgi?id=42393
-
-Index: libxml2-2.6.17.patch
-===================================================================
-RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxml2-2.6.17.patch
---- libxml2/libxml2-2.6.17.patch.orig	4 Feb 2005 11:29:07 -0000	1.2
-+++ libxml2/libxml2-2.6.17.patch	12 Feb 2005 13:11:40 -0000
-@@ -1,5 +1,5 @@
--*** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
----- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
-+*** misc/libxml2-2.6.17/configure	Mon Jan 17 04:24:22 2005
-+--- misc/build/libxml2-2.6.17/configure	Sat Feb 12 22:08:54 2005
- ***************
- *** 26339,26347 ****
-   
-@@ -38,8 +38,8 @@
-   echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
-   echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
-   if test $ac_cv_func_setsockopt = yes; then
--*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	2005-01-16 21:02:54.000000000 +0100
----- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	2005-02-02 17:39:50.923232015 +0100
-+*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	Mon Jan 17 05:02:54 2005
-+--- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	Sat Feb 12 22:08:54 2005
- ***************
- *** 263,269 ****
-    *
-@@ -91,8 +91,29 @@
-   #define DEBUG_MEMORY_LOCATION
-   #endif
-   
--*** misc/libxml2-2.6.17/nanohttp.c	2005-01-04 15:49:47.000000000 +0100
----- misc/build/libxml2-2.6.17/nanohttp.c	2005-02-02 17:39:50.924231930 +0100
-+*** misc/libxml2-2.6.17/ltmain.sh	Mon Jan 17 05:02:25 2005
-+--- misc/build/libxml2-2.6.17/ltmain.sh	Sat Feb 12 22:10:00 2005
-+***************
-+*** 2999,3006 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2999,3006 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+*** misc/libxml2-2.6.17/nanohttp.c	Tue Jan  4 23:49:47 2005
-+--- misc/build/libxml2-2.6.17/nanohttp.c	Sat Feb 12 22:08:54 2005
- ***************
- *** 248,254 ****
-   void
diff --git a/editors/openoffice.org-2.0/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2.0/files/patch-libxmlsec+xmlsec1-1.2.6.patch
new file mode 100644
index 000000000000..88ec6c234485
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-libxmlsec+xmlsec1-1.2.6.patch
@@ -0,0 +1,69 @@
+Index: libxmlsec/xmlsec1-1.2.6.patch
+===================================================================
+RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
+retrieving revision 1.3
+diff -u -r1.3 xmlsec1-1.2.6.patch
+--- libxmlsec/xmlsec1-1.2.6.patch	29 Mar 2005 11:45:08 -0000	1.3
++++ libxmlsec/xmlsec1-1.2.6.patch	6 Apr 2005 04:46:13 -0000
+@@ -13957,3 +13957,61 @@
+   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
+   
+   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
++*** misc/xmlsec1-1.2.6/ltmain.sh	Thu Aug 26 15:00:15 2004
++--- misc/build/xmlsec1-1.2.6/ltmain.sh	Wed Apr  6 13:32:04 2005
++***************
++*** 2918,2929 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2918,2929 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2994,3006 ****
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=".$current"
++! 	  versuffix=".$current.$revision";
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2994,3006 ----
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-2.0/files/patch-odk+configure.pl b/editors/openoffice.org-2.0/files/patch-odk+configure.pl
deleted file mode 100644
index db196e368e6d..000000000000
--- a/editors/openoffice.org-2.0/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-o gmake support
-o suggestion from Juegen Schmidt <Juergen.Schmidt@Sun.COM>
-
-http://www.openoffice.org/issues/show_bug.cgi?id=41142
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.8.4.10
-diff -u -r1.8.4.10 configure.pl
---- odk/configure.pl	11 Jan 2005 11:00:15 -0000	1.8.4.10
-+++ odk/configure.pl	23 Jan 2005 09:13:41 -0000
-@@ -43,7 +43,14 @@
- }
- 
- $main::OO_SDK_MAKE_HOME = "";
-+$main::OO_MAKE_NAME = "make";
-+if ( $main::operatingSystem eq "FreeBSD" )
-+{
-+    $main::OO_MAKE_NAME = "gmake";
-+    $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
-+} else {
- $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
-+}
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
- 
-@@ -137,7 +144,7 @@
- # prepare GNU make path
- while ( (!$main::correctVersion) &&
- 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME" ))) )
- {
-     print " Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
-     $main::OO_SDK_MAKE_HOME = readStdIn();
-@@ -146,15 +153,16 @@
-     {
- 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
-     }
-+
-     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME")) )
-     { 
- 		$main::OO_SDK_MAKE_HOME = "";
- 		print " Error: GNU make is required, please specify a GNU make tools directory.\n";
-     } else 
-     {
- 		#check version
--		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
-+		my $testVersion = `$OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME --version`;
- 		if ( $testVersion eq "")
- 		{
- 			print " Set the environment variable OO_SDK_MAKE_HOME to your GNU build tools directory.\n";
-@@ -165,7 +173,7 @@
- 			{
- 				$testVersion = $1;
- 			}
--			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/make", 1);
-+			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME", 1);
- 			if ( !$main::correctVersion )
- 			{
- 				print " The 'make' command found at '$main::OO_SDK_MAKE_HOME' has a wrong version\n";
diff --git a/editors/openoffice.org-2.0/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-2.0/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
new file mode 100644
index 000000000000..59b013e50010
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
@@ -0,0 +1,25 @@
+Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.2
+diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
+--- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
++++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
+@@ -109,7 +109,7 @@
+ 		linearly between center and endColor via concentric ellipses
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		circular. If it's not 1, the gradient is elliptical, with the
+ 		special twist that the aspect ratio is maintained also for the
+ 		center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ 		linearly between center and endColor via rectangular boxes
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		quadratic. If it's not 1, the gradient is rectangular, with
+ 		the special twist that the aspect ratio is maintained also for
+ 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2.0/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-2.0/files/patch-portaudio+portaudio_v18_1.patch
new file mode 100644
index 000000000000..88317fafc354
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-portaudio+portaudio_v18_1.patch
@@ -0,0 +1,24 @@
+Index: portaudio/portaudio_v18_1.patch
+===================================================================
+RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
+retrieving revision 1.1
+diff -u -r1.1 portaudio_v18_1.patch
+--- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
++++ portaudio/portaudio_v18_1.patch	28 Mar 2005 06:55:37 -0000
+@@ -52,3 +52,16 @@
+   LIBINST = /usr/local/lib
+   
+   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
++*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
++--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Mon Mar 28 15:45:37 2005
++***************
++*** 43,48 ****
++--- 43,50 ----
++  
++  #ifdef __linux__
++  #include <linux/soundcard.h>
+++ #elif defined (__FreeBSD__)
+++ #include <sys/soundcard.h>
++  #else
++  #include <machine/soundcard.h> /* JH20010905 */
++  #endif
diff --git a/editors/openoffice.org-2.0/files/patch-project-xmlsecurity b/editors/openoffice.org-2.0/files/patch-project-xmlsecurity
deleted file mode 100644
index b8dfc459e784..000000000000
--- a/editors/openoffice.org-2.0/files/patch-project-xmlsecurity
+++ /dev/null
@@ -1,45 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=39958
-o http://www.openoffice.org/issues/show_bug.cgi?id=38417
-o xmlsec08
-
-Description
-o Not for integration, we should provide configure based one
-  Note: malloc.h is deprecated for FreeBSD.
-o use configure to produce config.h
-
-Index: libxmlsec/xmlsec1-1.2.4.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v
-retrieving revision 1.7
-diff -u -r1.7 xmlsec1-1.2.4.patch
---- libxmlsec/xmlsec1-1.2.4.patch	9 Sep 2004 08:31:29 -0000	1.7
-+++ libxmlsec/xmlsec1-1.2.4.patch	3 Oct 2004 05:52:20 -0000
-@@ -83,7 +83,7 @@
- ! #undef HAVE_MACH_O_DYLD_H
- ! 
- ! /* Define to 1 if you have the <malloc.h> header file. */
--! #define HAVE_MALLOC_H 1
-+! #define HAVE_MALLOC_H 0
- ! 
- ! /* Define to 1 if you have the `memcpy' function. */
- ! #undef HAVE_MEMCPY
-
-
-Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
-===================================================================
-RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx
---- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	12 Jul 2004 13:15:21 -0000	1.1.1.1
-+++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	4 Oct 2004 22:04:08 -0000
-@@ -68,7 +68,9 @@
- #include <xmloff/attrlist.hxx>
- #include "xmlelementwrapper_xmlsecimpl.hxx"
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/editors/openoffice.org-2.0/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2.0/files/patch-sndfile+libsndfile-1.0.9.patch
new file mode 100644
index 000000000000..ee4d7e4d07d9
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-sndfile+libsndfile-1.0.9.patch
@@ -0,0 +1,59 @@
+Index: sndfile/libsndfile-1.0.9.patch
+===================================================================
+RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
+retrieving revision 1.1
+diff -u -r1.1 libsndfile-1.0.9.patch
+--- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
++++ sndfile/libsndfile-1.0.9.patch	28 Mar 2005 07:59:15 -0000
+@@ -231,3 +231,51 @@
+   
+   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
+   
++*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
++--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
++***************
++*** 2899,2910 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2899,2910 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2980,2987 ****
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2980,2987 ----
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-2.0/files/patch-sndfile+makefile.mk b/editors/openoffice.org-2.0/files/patch-sndfile+makefile.mk
new file mode 100644
index 000000000000..df33e5cb4c25
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-sndfile+makefile.mk
@@ -0,0 +1,16 @@
+Index: sndfile/makefile.mk
+===================================================================
+RCS file: /cvs/external/sndfile/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
++++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
+@@ -81,7 +81,7 @@
+ CONFIGURE_DIR=
+ 
+ CONFIGURE_ACTION=./configure --with-pic
+-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
++.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
+ CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+ .ENDIF
+ 
diff --git a/editors/openoffice.org-2.0/files/patch-vcl+util b/editors/openoffice.org-2.0/files/patch-vcl+util
new file mode 100644
index 000000000000..2ebfdda8ce4c
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-vcl+util
@@ -0,0 +1,47 @@
+Get rid of -ldl for FREEBSD and MACOSX
+
+Index: vcl/util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.65
+diff -u -r1.65 makefile.mk
+--- vcl/util/makefile.mk	13 Jan 2005 18:16:05 -0000	1.65
++++ vcl/util/makefile.mk	7 Apr 2005 01:29:29 -0000
+@@ -252,10 +252,11 @@
+ 
+ .IF "$(GUI)"=="UNX"
+ 
+-.IF "$(OS)"=="MACOSX"
+-SHL1STDLIBS += -ldl
++.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
++SHL1STDLIBS+= -ldl
+ .ENDIF
+ 
++
+ .IF "$(GUIBASE)"=="aqua"
+ SHL1STDLIBS += -framework Cocoa
+ .ENDIF
+@@ -383,7 +384,11 @@
+ 
+ 
+ SHL4STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_GTK)" != ""
+ 
+ # KDE plugin
+@@ -396,7 +401,11 @@
+ # libs for KDE plugin
+ SHL5STDLIBS=$(KDE_LIBS)
+ SHL5STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL5STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_KDE)" != ""
+ 
+ .ENDIF # UNX
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index ad6dc4fa8749..9c5509af0a2e 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050310
+SNAPDATE=	20050406
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -47,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		85
+MILESTONE=		91
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -76,7 +76,6 @@ CXX=	g++-ooo
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
-		epm:${PORTSDIR}/devel/epm \
 		gpatch:${PORTSDIR}/devel/patch \
 		xmkmf:${X_IMAKE_PORT} \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
@@ -104,7 +103,7 @@ UNZIP?=		${PREFIX}/bin/unzip
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	4
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 5831691b8684..bbd66668973c 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 044e96faae97761f3343bff2d123531a
-SIZE (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 243497173
+MD5 (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = b186d557a51b8fa9faf700e7a71b2470
+SIZE (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = 250068979
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2/files/patch-canvas+inc+canvas+canvastools.hxx b/editors/openoffice.org-2/files/patch-canvas+inc+canvas+canvastools.hxx
new file mode 100644
index 000000000000..5c0c6bd78884
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-canvas+inc+canvas+canvastools.hxx
@@ -0,0 +1,21 @@
+
+Index: canvas/inc/canvas/canvastools.hxx
+===================================================================
+RCS file: /cvs/gsl/canvas/inc/canvas/canvastools.hxx,v
+retrieving revision 1.7
+diff -u -r1.7 canvastools.hxx
+--- canvas/inc/canvas/canvastools.hxx	30 Mar 2005 07:34:18 -0000	1.7
++++ canvas/inc/canvas/canvastools.hxx	6 Apr 2005 01:22:58 -0000
+@@ -133,9 +133,9 @@
+ 		 */
+ 
+ 		// mickey's math tricks...
+-		inline unsigned int powerof2( unsigned int c ) { return 0x1 << c; }
+-		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2(powerof2(c)) + 1); }
+-		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2(c))) & mask(c)); }
++		inline unsigned int powerof2_ooo( unsigned int c ) { return 0x1 << c; }
++		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2_ooo(powerof2_ooo(c)) + 1); }
++		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2_ooo(c))) & mask(c)); }
+ 		template<typename T>
+ 		inline unsigned int bitcount( T c ) {
+ 			unsigned int nByteIndex = 0;
diff --git a/editors/openoffice.org-2/files/patch-config_office+configure.in b/editors/openoffice.org-2/files/patch-config_office+configure.in
deleted file mode 100644
index 20602d3402a6..000000000000
--- a/editors/openoffice.org-2/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=44913
-o configure7
-
---- config_office/configure.in~	Wed Mar  9 01:31:52 2005
-+++ config_office/configure.in	Sun Mar 13 15:53:13 2005
-@@ -565,7 +565,7 @@
- 		test_cups=no
- 		_os=Darwin
- 		;;
--	freebsd)
-+	freebsd*)
- 		test_x=yes
- 		test_gtk=yes
- 		test_kde=yes
diff --git a/editors/openoffice.org-2/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-2/files/patch-crashrep+source+unx+makefile.mk
new file mode 100644
index 000000000000..6cb60786e2e5
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-crashrep+source+unx+makefile.mk
@@ -0,0 +1,19 @@
+Index: crashrep/source/unx/makefile.mk
+===================================================================
+RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
+retrieving revision 1.14
+diff -u -r1.14 makefile.mk
+--- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
++++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
+@@ -82,7 +82,10 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ 
+-APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
++APP1STDLIBS=$(DYNAMIC) -lXext -lX11
++.IF "$(OS)" != "FREEBSD"
++APP1STDLIBS+=-ldl -lnsl
++.ENDIF
+ .IF "$(OS)" == "SOLARIS"
+ APP1STDLIBS+=-lsocket
+ .ENDIF
diff --git a/editors/openoffice.org-2/files/patch-curl-7.12.2.patch b/editors/openoffice.org-2/files/patch-curl-7.12.2.patch
deleted file mode 100644
index f1597ef75e84..000000000000
--- a/editors/openoffice.org-2/files/patch-curl-7.12.2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-#i 43986#
-
-version number of curl for FreeBSD is somewhat odd.
-we need libcurl.so.3.0.0 not libcurl.so.3
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3*
-after applying this pach
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3.0.0*
-
-Index: curl-7.12.2.patch
-===================================================================
-RCS file: /cvs/external/curl/curl-7.12.2.patch,v
-retrieving revision 1.4
-diff -u -r1.4 curl-7.12.2.patch
---- curl/curl-7.12.2.patch	27 Jan 2005 11:11:50 -0000	1.4
-+++ curl/curl-7.12.2.patch	3 Mar 2005 11:57:27 -0000
-@@ -304,3 +304,68 @@
-      * Check the current list of connections to see if we can
-      * re-use an already existing one or if we have to create a
-      * new one.
-+*** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 20:12:17 2004
-+--- misc/build/curl-7.12.2/ltmain.sh	Thu Mar  3 20:52:09 2005
-+***************
-+*** 2915,2926 ****
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  freebsd-aout|freebsd-elf|sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+--- 2915,2926 ----
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+***************
-+*** 2990,3005 ****
-+  	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+  	  ;;
-+  
-+- 	freebsd-aout)
-+- 	  major=".$current"
-+- 	  versuffix=".$current.$revision";
-+- 	  ;;
-+- 
-+- 	freebsd-elf)
-+- 	  major=".$current"
-+- 	  versuffix=".$current";
-+- 	  ;;
-+- 
-+  	irix | nonstopux)
-+  	  major=`expr $current - $age + 1`
-+  
-+--- 2990,2995 ----
-+***************
-+*** 3022,3028 ****
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
-+--- 3012,3018 ----
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux|freebsd-aout|freebsd-elf)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
diff --git a/editors/openoffice.org-2/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-2/files/patch-extensions+source+config+ldap+makefile.mk
deleted file mode 100644
index fb5f8b09a7ef..000000000000
--- a/editors/openoffice.org-2/files/patch-extensions+source+config+ldap+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-o llber50 is missing
-o http://www.openoffice.org/issues/show_bug.cgi?id=43037
-
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.4.24.2
-diff -u -u -r1.4.24.2 makefile.mk
---- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
-+++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
-@@ -114,6 +114,9 @@
-         $(SALLIB)
- .IF "$(OS)"=="FREEBSD"
- SHL1STDLIBS+=-lcompat
-+.IF "$(WITH_OPENLDAP)" != "YES"
-+SHL1STDLIBS+=-llber50
-+.ENDIF
- .ENDIF
- 
- DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-2/files/patch-instsetoo_native+util+makefile.mk b/editors/openoffice.org-2/files/patch-instsetoo_native+util+makefile.mk
deleted file mode 100644
index 4837e39a6a2b..000000000000
--- a/editors/openoffice.org-2/files/patch-instsetoo_native+util+makefile.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-For instsetoo_native project, we should use FORMAT*=-format bsd.
-However, for FreeBSD, we cannot write script towards multiple line,
-so -format bsd break builds. We temporary set -format portable at
-the moment so that we can treat as we want.
-
-Index: instsetoo_native/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- instsetoo_native/util/makefile.mk	10 Dec 2004 17:03:50 -0000	1.13
-+++ instsetoo_native/util/makefile.mk	20 Dec 2004 11:32:33 -0000
-@@ -82,6 +82,12 @@
- FORMAT*=-format pkg
- .ENDIF
- 
-+.IF "$(OS)" == "FREEBSD"
-+#bsd is preffered but epm does not produce valid packages atm
-+#FORMAT*=-format bsd
-+FORMAT*=-format portable
-+.ENDIF
-+
- # epm supports the following formats:
- # aix - AIX software distribution
- # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
diff --git a/editors/openoffice.org-2/files/patch-libxml2 b/editors/openoffice.org-2/files/patch-libxml2
deleted file mode 100644
index b4d2aca8b1c5..000000000000
--- a/editors/openoffice.org-2/files/patch-libxml2
+++ /dev/null
@@ -1,61 +0,0 @@
-o version number of libxml2
-o http://www.openoffice.org/issues/show_bug.cgi?id=42393
-
-Index: libxml2-2.6.17.patch
-===================================================================
-RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxml2-2.6.17.patch
---- libxml2/libxml2-2.6.17.patch.orig	4 Feb 2005 11:29:07 -0000	1.2
-+++ libxml2/libxml2-2.6.17.patch	12 Feb 2005 13:11:40 -0000
-@@ -1,5 +1,5 @@
--*** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
----- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
-+*** misc/libxml2-2.6.17/configure	Mon Jan 17 04:24:22 2005
-+--- misc/build/libxml2-2.6.17/configure	Sat Feb 12 22:08:54 2005
- ***************
- *** 26339,26347 ****
-   
-@@ -38,8 +38,8 @@
-   echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
-   echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
-   if test $ac_cv_func_setsockopt = yes; then
--*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	2005-01-16 21:02:54.000000000 +0100
----- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	2005-02-02 17:39:50.923232015 +0100
-+*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	Mon Jan 17 05:02:54 2005
-+--- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	Sat Feb 12 22:08:54 2005
- ***************
- *** 263,269 ****
-    *
-@@ -91,8 +91,29 @@
-   #define DEBUG_MEMORY_LOCATION
-   #endif
-   
--*** misc/libxml2-2.6.17/nanohttp.c	2005-01-04 15:49:47.000000000 +0100
----- misc/build/libxml2-2.6.17/nanohttp.c	2005-02-02 17:39:50.924231930 +0100
-+*** misc/libxml2-2.6.17/ltmain.sh	Mon Jan 17 05:02:25 2005
-+--- misc/build/libxml2-2.6.17/ltmain.sh	Sat Feb 12 22:10:00 2005
-+***************
-+*** 2999,3006 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2999,3006 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+*** misc/libxml2-2.6.17/nanohttp.c	Tue Jan  4 23:49:47 2005
-+--- misc/build/libxml2-2.6.17/nanohttp.c	Sat Feb 12 22:08:54 2005
- ***************
- *** 248,254 ****
-   void
diff --git a/editors/openoffice.org-2/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-2/files/patch-libxmlsec+xmlsec1-1.2.6.patch
new file mode 100644
index 000000000000..88ec6c234485
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-libxmlsec+xmlsec1-1.2.6.patch
@@ -0,0 +1,69 @@
+Index: libxmlsec/xmlsec1-1.2.6.patch
+===================================================================
+RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
+retrieving revision 1.3
+diff -u -r1.3 xmlsec1-1.2.6.patch
+--- libxmlsec/xmlsec1-1.2.6.patch	29 Mar 2005 11:45:08 -0000	1.3
++++ libxmlsec/xmlsec1-1.2.6.patch	6 Apr 2005 04:46:13 -0000
+@@ -13957,3 +13957,61 @@
+   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
+   
+   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
++*** misc/xmlsec1-1.2.6/ltmain.sh	Thu Aug 26 15:00:15 2004
++--- misc/build/xmlsec1-1.2.6/ltmain.sh	Wed Apr  6 13:32:04 2005
++***************
++*** 2918,2929 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2918,2929 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2994,3006 ****
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=".$current"
++! 	  versuffix=".$current.$revision";
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2994,3006 ----
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-2/files/patch-odk+configure.pl b/editors/openoffice.org-2/files/patch-odk+configure.pl
deleted file mode 100644
index db196e368e6d..000000000000
--- a/editors/openoffice.org-2/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-o gmake support
-o suggestion from Juegen Schmidt <Juergen.Schmidt@Sun.COM>
-
-http://www.openoffice.org/issues/show_bug.cgi?id=41142
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.8.4.10
-diff -u -r1.8.4.10 configure.pl
---- odk/configure.pl	11 Jan 2005 11:00:15 -0000	1.8.4.10
-+++ odk/configure.pl	23 Jan 2005 09:13:41 -0000
-@@ -43,7 +43,14 @@
- }
- 
- $main::OO_SDK_MAKE_HOME = "";
-+$main::OO_MAKE_NAME = "make";
-+if ( $main::operatingSystem eq "FreeBSD" )
-+{
-+    $main::OO_MAKE_NAME = "gmake";
-+    $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
-+} else {
- $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
-+}
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
- 
-@@ -137,7 +144,7 @@
- # prepare GNU make path
- while ( (!$main::correctVersion) &&
- 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME" ))) )
- {
-     print " Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
-     $main::OO_SDK_MAKE_HOME = readStdIn();
-@@ -146,15 +153,16 @@
-     {
- 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
-     }
-+
-     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME")) )
-     { 
- 		$main::OO_SDK_MAKE_HOME = "";
- 		print " Error: GNU make is required, please specify a GNU make tools directory.\n";
-     } else 
-     {
- 		#check version
--		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
-+		my $testVersion = `$OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME --version`;
- 		if ( $testVersion eq "")
- 		{
- 			print " Set the environment variable OO_SDK_MAKE_HOME to your GNU build tools directory.\n";
-@@ -165,7 +173,7 @@
- 			{
- 				$testVersion = $1;
- 			}
--			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/make", 1);
-+			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME", 1);
- 			if ( !$main::correctVersion )
- 			{
- 				print " The 'make' command found at '$main::OO_SDK_MAKE_HOME' has a wrong version\n";
diff --git a/editors/openoffice.org-2/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-2/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
new file mode 100644
index 000000000000..59b013e50010
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
@@ -0,0 +1,25 @@
+Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.2
+diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
+--- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
++++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
+@@ -109,7 +109,7 @@
+ 		linearly between center and endColor via concentric ellipses
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		circular. If it's not 1, the gradient is elliptical, with the
+ 		special twist that the aspect ratio is maintained also for the
+ 		center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ 		linearly between center and endColor via rectangular boxes
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		quadratic. If it's not 1, the gradient is rectangular, with
+ 		the special twist that the aspect ratio is maintained also for
+ 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-2/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-2/files/patch-portaudio+portaudio_v18_1.patch
new file mode 100644
index 000000000000..88317fafc354
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-portaudio+portaudio_v18_1.patch
@@ -0,0 +1,24 @@
+Index: portaudio/portaudio_v18_1.patch
+===================================================================
+RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
+retrieving revision 1.1
+diff -u -r1.1 portaudio_v18_1.patch
+--- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
++++ portaudio/portaudio_v18_1.patch	28 Mar 2005 06:55:37 -0000
+@@ -52,3 +52,16 @@
+   LIBINST = /usr/local/lib
+   
+   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
++*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
++--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Mon Mar 28 15:45:37 2005
++***************
++*** 43,48 ****
++--- 43,50 ----
++  
++  #ifdef __linux__
++  #include <linux/soundcard.h>
+++ #elif defined (__FreeBSD__)
+++ #include <sys/soundcard.h>
++  #else
++  #include <machine/soundcard.h> /* JH20010905 */
++  #endif
diff --git a/editors/openoffice.org-2/files/patch-project-xmlsecurity b/editors/openoffice.org-2/files/patch-project-xmlsecurity
deleted file mode 100644
index b8dfc459e784..000000000000
--- a/editors/openoffice.org-2/files/patch-project-xmlsecurity
+++ /dev/null
@@ -1,45 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=39958
-o http://www.openoffice.org/issues/show_bug.cgi?id=38417
-o xmlsec08
-
-Description
-o Not for integration, we should provide configure based one
-  Note: malloc.h is deprecated for FreeBSD.
-o use configure to produce config.h
-
-Index: libxmlsec/xmlsec1-1.2.4.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v
-retrieving revision 1.7
-diff -u -r1.7 xmlsec1-1.2.4.patch
---- libxmlsec/xmlsec1-1.2.4.patch	9 Sep 2004 08:31:29 -0000	1.7
-+++ libxmlsec/xmlsec1-1.2.4.patch	3 Oct 2004 05:52:20 -0000
-@@ -83,7 +83,7 @@
- ! #undef HAVE_MACH_O_DYLD_H
- ! 
- ! /* Define to 1 if you have the <malloc.h> header file. */
--! #define HAVE_MALLOC_H 1
-+! #define HAVE_MALLOC_H 0
- ! 
- ! /* Define to 1 if you have the `memcpy' function. */
- ! #undef HAVE_MEMCPY
-
-
-Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
-===================================================================
-RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx
---- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	12 Jul 2004 13:15:21 -0000	1.1.1.1
-+++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	4 Oct 2004 22:04:08 -0000
-@@ -68,7 +68,9 @@
- #include <xmloff/attrlist.hxx>
- #include "xmlelementwrapper_xmlsecimpl.hxx"
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/editors/openoffice.org-2/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-2/files/patch-sndfile+libsndfile-1.0.9.patch
new file mode 100644
index 000000000000..ee4d7e4d07d9
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-sndfile+libsndfile-1.0.9.patch
@@ -0,0 +1,59 @@
+Index: sndfile/libsndfile-1.0.9.patch
+===================================================================
+RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
+retrieving revision 1.1
+diff -u -r1.1 libsndfile-1.0.9.patch
+--- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
++++ sndfile/libsndfile-1.0.9.patch	28 Mar 2005 07:59:15 -0000
+@@ -231,3 +231,51 @@
+   
+   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
+   
++*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
++--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
++***************
++*** 2899,2910 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2899,2910 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2980,2987 ****
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2980,2987 ----
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-2/files/patch-sndfile+makefile.mk b/editors/openoffice.org-2/files/patch-sndfile+makefile.mk
new file mode 100644
index 000000000000..df33e5cb4c25
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-sndfile+makefile.mk
@@ -0,0 +1,16 @@
+Index: sndfile/makefile.mk
+===================================================================
+RCS file: /cvs/external/sndfile/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
++++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
+@@ -81,7 +81,7 @@
+ CONFIGURE_DIR=
+ 
+ CONFIGURE_ACTION=./configure --with-pic
+-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
++.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
+ CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+ .ENDIF
+ 
diff --git a/editors/openoffice.org-2/files/patch-vcl+util b/editors/openoffice.org-2/files/patch-vcl+util
new file mode 100644
index 000000000000..2ebfdda8ce4c
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-vcl+util
@@ -0,0 +1,47 @@
+Get rid of -ldl for FREEBSD and MACOSX
+
+Index: vcl/util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.65
+diff -u -r1.65 makefile.mk
+--- vcl/util/makefile.mk	13 Jan 2005 18:16:05 -0000	1.65
++++ vcl/util/makefile.mk	7 Apr 2005 01:29:29 -0000
+@@ -252,10 +252,11 @@
+ 
+ .IF "$(GUI)"=="UNX"
+ 
+-.IF "$(OS)"=="MACOSX"
+-SHL1STDLIBS += -ldl
++.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
++SHL1STDLIBS+= -ldl
+ .ENDIF
+ 
++
+ .IF "$(GUIBASE)"=="aqua"
+ SHL1STDLIBS += -framework Cocoa
+ .ENDIF
+@@ -383,7 +384,11 @@
+ 
+ 
+ SHL4STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_GTK)" != ""
+ 
+ # KDE plugin
+@@ -396,7 +401,11 @@
+ # libs for KDE plugin
+ SHL5STDLIBS=$(KDE_LIBS)
+ SHL5STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL5STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_KDE)" != ""
+ 
+ .ENDIF # UNX
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index ad6dc4fa8749..9c5509af0a2e 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050310
+SNAPDATE=	20050406
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -47,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		85
+MILESTONE=		91
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -76,7 +76,6 @@ CXX=	g++-ooo
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
-		epm:${PORTSDIR}/devel/epm \
 		gpatch:${PORTSDIR}/devel/patch \
 		xmkmf:${X_IMAKE_PORT} \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
@@ -104,7 +103,7 @@ UNZIP?=		${PREFIX}/bin/unzip
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	4
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 5831691b8684..bbd66668973c 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 044e96faae97761f3343bff2d123531a
-SIZE (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 243497173
+MD5 (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = b186d557a51b8fa9faf700e7a71b2470
+SIZE (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = 250068979
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3-RC/files/patch-canvas+inc+canvas+canvastools.hxx b/editors/openoffice.org-3-RC/files/patch-canvas+inc+canvas+canvastools.hxx
new file mode 100644
index 000000000000..5c0c6bd78884
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-canvas+inc+canvas+canvastools.hxx
@@ -0,0 +1,21 @@
+
+Index: canvas/inc/canvas/canvastools.hxx
+===================================================================
+RCS file: /cvs/gsl/canvas/inc/canvas/canvastools.hxx,v
+retrieving revision 1.7
+diff -u -r1.7 canvastools.hxx
+--- canvas/inc/canvas/canvastools.hxx	30 Mar 2005 07:34:18 -0000	1.7
++++ canvas/inc/canvas/canvastools.hxx	6 Apr 2005 01:22:58 -0000
+@@ -133,9 +133,9 @@
+ 		 */
+ 
+ 		// mickey's math tricks...
+-		inline unsigned int powerof2( unsigned int c ) { return 0x1 << c; }
+-		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2(powerof2(c)) + 1); }
+-		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2(c))) & mask(c)); }
++		inline unsigned int powerof2_ooo( unsigned int c ) { return 0x1 << c; }
++		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2_ooo(powerof2_ooo(c)) + 1); }
++		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2_ooo(c))) & mask(c)); }
+ 		template<typename T>
+ 		inline unsigned int bitcount( T c ) {
+ 			unsigned int nByteIndex = 0;
diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
deleted file mode 100644
index 20602d3402a6..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=44913
-o configure7
-
---- config_office/configure.in~	Wed Mar  9 01:31:52 2005
-+++ config_office/configure.in	Sun Mar 13 15:53:13 2005
-@@ -565,7 +565,7 @@
- 		test_cups=no
- 		_os=Darwin
- 		;;
--	freebsd)
-+	freebsd*)
- 		test_x=yes
- 		test_gtk=yes
- 		test_kde=yes
diff --git a/editors/openoffice.org-3-RC/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-3-RC/files/patch-crashrep+source+unx+makefile.mk
new file mode 100644
index 000000000000..6cb60786e2e5
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-crashrep+source+unx+makefile.mk
@@ -0,0 +1,19 @@
+Index: crashrep/source/unx/makefile.mk
+===================================================================
+RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
+retrieving revision 1.14
+diff -u -r1.14 makefile.mk
+--- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
++++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
+@@ -82,7 +82,10 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ 
+-APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
++APP1STDLIBS=$(DYNAMIC) -lXext -lX11
++.IF "$(OS)" != "FREEBSD"
++APP1STDLIBS+=-ldl -lnsl
++.ENDIF
+ .IF "$(OS)" == "SOLARIS"
+ APP1STDLIBS+=-lsocket
+ .ENDIF
diff --git a/editors/openoffice.org-3-RC/files/patch-curl-7.12.2.patch b/editors/openoffice.org-3-RC/files/patch-curl-7.12.2.patch
deleted file mode 100644
index f1597ef75e84..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-curl-7.12.2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-#i 43986#
-
-version number of curl for FreeBSD is somewhat odd.
-we need libcurl.so.3.0.0 not libcurl.so.3
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3*
-after applying this pach
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3.0.0*
-
-Index: curl-7.12.2.patch
-===================================================================
-RCS file: /cvs/external/curl/curl-7.12.2.patch,v
-retrieving revision 1.4
-diff -u -r1.4 curl-7.12.2.patch
---- curl/curl-7.12.2.patch	27 Jan 2005 11:11:50 -0000	1.4
-+++ curl/curl-7.12.2.patch	3 Mar 2005 11:57:27 -0000
-@@ -304,3 +304,68 @@
-      * Check the current list of connections to see if we can
-      * re-use an already existing one or if we have to create a
-      * new one.
-+*** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 20:12:17 2004
-+--- misc/build/curl-7.12.2/ltmain.sh	Thu Mar  3 20:52:09 2005
-+***************
-+*** 2915,2926 ****
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  freebsd-aout|freebsd-elf|sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+--- 2915,2926 ----
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+***************
-+*** 2990,3005 ****
-+  	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+  	  ;;
-+  
-+- 	freebsd-aout)
-+- 	  major=".$current"
-+- 	  versuffix=".$current.$revision";
-+- 	  ;;
-+- 
-+- 	freebsd-elf)
-+- 	  major=".$current"
-+- 	  versuffix=".$current";
-+- 	  ;;
-+- 
-+  	irix | nonstopux)
-+  	  major=`expr $current - $age + 1`
-+  
-+--- 2990,2995 ----
-+***************
-+*** 3022,3028 ****
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
-+--- 3012,3018 ----
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux|freebsd-aout|freebsd-elf)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
diff --git a/editors/openoffice.org-3-RC/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-3-RC/files/patch-extensions+source+config+ldap+makefile.mk
deleted file mode 100644
index fb5f8b09a7ef..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-extensions+source+config+ldap+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-o llber50 is missing
-o http://www.openoffice.org/issues/show_bug.cgi?id=43037
-
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.4.24.2
-diff -u -u -r1.4.24.2 makefile.mk
---- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
-+++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
-@@ -114,6 +114,9 @@
-         $(SALLIB)
- .IF "$(OS)"=="FREEBSD"
- SHL1STDLIBS+=-lcompat
-+.IF "$(WITH_OPENLDAP)" != "YES"
-+SHL1STDLIBS+=-llber50
-+.ENDIF
- .ENDIF
- 
- DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-3-RC/files/patch-instsetoo_native+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-instsetoo_native+util+makefile.mk
deleted file mode 100644
index 4837e39a6a2b..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-instsetoo_native+util+makefile.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-For instsetoo_native project, we should use FORMAT*=-format bsd.
-However, for FreeBSD, we cannot write script towards multiple line,
-so -format bsd break builds. We temporary set -format portable at
-the moment so that we can treat as we want.
-
-Index: instsetoo_native/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- instsetoo_native/util/makefile.mk	10 Dec 2004 17:03:50 -0000	1.13
-+++ instsetoo_native/util/makefile.mk	20 Dec 2004 11:32:33 -0000
-@@ -82,6 +82,12 @@
- FORMAT*=-format pkg
- .ENDIF
- 
-+.IF "$(OS)" == "FREEBSD"
-+#bsd is preffered but epm does not produce valid packages atm
-+#FORMAT*=-format bsd
-+FORMAT*=-format portable
-+.ENDIF
-+
- # epm supports the following formats:
- # aix - AIX software distribution
- # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
diff --git a/editors/openoffice.org-3-RC/files/patch-libxml2 b/editors/openoffice.org-3-RC/files/patch-libxml2
deleted file mode 100644
index b4d2aca8b1c5..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-libxml2
+++ /dev/null
@@ -1,61 +0,0 @@
-o version number of libxml2
-o http://www.openoffice.org/issues/show_bug.cgi?id=42393
-
-Index: libxml2-2.6.17.patch
-===================================================================
-RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxml2-2.6.17.patch
---- libxml2/libxml2-2.6.17.patch.orig	4 Feb 2005 11:29:07 -0000	1.2
-+++ libxml2/libxml2-2.6.17.patch	12 Feb 2005 13:11:40 -0000
-@@ -1,5 +1,5 @@
--*** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
----- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
-+*** misc/libxml2-2.6.17/configure	Mon Jan 17 04:24:22 2005
-+--- misc/build/libxml2-2.6.17/configure	Sat Feb 12 22:08:54 2005
- ***************
- *** 26339,26347 ****
-   
-@@ -38,8 +38,8 @@
-   echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
-   echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
-   if test $ac_cv_func_setsockopt = yes; then
--*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	2005-01-16 21:02:54.000000000 +0100
----- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	2005-02-02 17:39:50.923232015 +0100
-+*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	Mon Jan 17 05:02:54 2005
-+--- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	Sat Feb 12 22:08:54 2005
- ***************
- *** 263,269 ****
-    *
-@@ -91,8 +91,29 @@
-   #define DEBUG_MEMORY_LOCATION
-   #endif
-   
--*** misc/libxml2-2.6.17/nanohttp.c	2005-01-04 15:49:47.000000000 +0100
----- misc/build/libxml2-2.6.17/nanohttp.c	2005-02-02 17:39:50.924231930 +0100
-+*** misc/libxml2-2.6.17/ltmain.sh	Mon Jan 17 05:02:25 2005
-+--- misc/build/libxml2-2.6.17/ltmain.sh	Sat Feb 12 22:10:00 2005
-+***************
-+*** 2999,3006 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2999,3006 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+*** misc/libxml2-2.6.17/nanohttp.c	Tue Jan  4 23:49:47 2005
-+--- misc/build/libxml2-2.6.17/nanohttp.c	Sat Feb 12 22:08:54 2005
- ***************
- *** 248,254 ****
-   void
diff --git a/editors/openoffice.org-3-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-3-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch
new file mode 100644
index 000000000000..88ec6c234485
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-libxmlsec+xmlsec1-1.2.6.patch
@@ -0,0 +1,69 @@
+Index: libxmlsec/xmlsec1-1.2.6.patch
+===================================================================
+RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
+retrieving revision 1.3
+diff -u -r1.3 xmlsec1-1.2.6.patch
+--- libxmlsec/xmlsec1-1.2.6.patch	29 Mar 2005 11:45:08 -0000	1.3
++++ libxmlsec/xmlsec1-1.2.6.patch	6 Apr 2005 04:46:13 -0000
+@@ -13957,3 +13957,61 @@
+   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
+   
+   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
++*** misc/xmlsec1-1.2.6/ltmain.sh	Thu Aug 26 15:00:15 2004
++--- misc/build/xmlsec1-1.2.6/ltmain.sh	Wed Apr  6 13:32:04 2005
++***************
++*** 2918,2929 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2918,2929 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2994,3006 ****
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=".$current"
++! 	  versuffix=".$current.$revision";
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2994,3006 ----
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-3-RC/files/patch-odk+configure.pl b/editors/openoffice.org-3-RC/files/patch-odk+configure.pl
deleted file mode 100644
index db196e368e6d..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-o gmake support
-o suggestion from Juegen Schmidt <Juergen.Schmidt@Sun.COM>
-
-http://www.openoffice.org/issues/show_bug.cgi?id=41142
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.8.4.10
-diff -u -r1.8.4.10 configure.pl
---- odk/configure.pl	11 Jan 2005 11:00:15 -0000	1.8.4.10
-+++ odk/configure.pl	23 Jan 2005 09:13:41 -0000
-@@ -43,7 +43,14 @@
- }
- 
- $main::OO_SDK_MAKE_HOME = "";
-+$main::OO_MAKE_NAME = "make";
-+if ( $main::operatingSystem eq "FreeBSD" )
-+{
-+    $main::OO_MAKE_NAME = "gmake";
-+    $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
-+} else {
- $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
-+}
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
- 
-@@ -137,7 +144,7 @@
- # prepare GNU make path
- while ( (!$main::correctVersion) &&
- 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME" ))) )
- {
-     print " Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
-     $main::OO_SDK_MAKE_HOME = readStdIn();
-@@ -146,15 +153,16 @@
-     {
- 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
-     }
-+
-     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME")) )
-     { 
- 		$main::OO_SDK_MAKE_HOME = "";
- 		print " Error: GNU make is required, please specify a GNU make tools directory.\n";
-     } else 
-     {
- 		#check version
--		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
-+		my $testVersion = `$OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME --version`;
- 		if ( $testVersion eq "")
- 		{
- 			print " Set the environment variable OO_SDK_MAKE_HOME to your GNU build tools directory.\n";
-@@ -165,7 +173,7 @@
- 			{
- 				$testVersion = $1;
- 			}
--			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/make", 1);
-+			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME", 1);
- 			if ( !$main::correctVersion )
- 			{
- 				print " The 'make' command found at '$main::OO_SDK_MAKE_HOME' has a wrong version\n";
diff --git a/editors/openoffice.org-3-RC/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-3-RC/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
new file mode 100644
index 000000000000..59b013e50010
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
@@ -0,0 +1,25 @@
+Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.2
+diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
+--- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
++++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
+@@ -109,7 +109,7 @@
+ 		linearly between center and endColor via concentric ellipses
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		circular. If it's not 1, the gradient is elliptical, with the
+ 		special twist that the aspect ratio is maintained also for the
+ 		center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ 		linearly between center and endColor via rectangular boxes
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		quadratic. If it's not 1, the gradient is rectangular, with
+ 		the special twist that the aspect ratio is maintained also for
+ 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-3-RC/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-3-RC/files/patch-portaudio+portaudio_v18_1.patch
new file mode 100644
index 000000000000..88317fafc354
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-portaudio+portaudio_v18_1.patch
@@ -0,0 +1,24 @@
+Index: portaudio/portaudio_v18_1.patch
+===================================================================
+RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
+retrieving revision 1.1
+diff -u -r1.1 portaudio_v18_1.patch
+--- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
++++ portaudio/portaudio_v18_1.patch	28 Mar 2005 06:55:37 -0000
+@@ -52,3 +52,16 @@
+   LIBINST = /usr/local/lib
+   
+   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
++*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
++--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Mon Mar 28 15:45:37 2005
++***************
++*** 43,48 ****
++--- 43,50 ----
++  
++  #ifdef __linux__
++  #include <linux/soundcard.h>
+++ #elif defined (__FreeBSD__)
+++ #include <sys/soundcard.h>
++  #else
++  #include <machine/soundcard.h> /* JH20010905 */
++  #endif
diff --git a/editors/openoffice.org-3-RC/files/patch-project-xmlsecurity b/editors/openoffice.org-3-RC/files/patch-project-xmlsecurity
deleted file mode 100644
index b8dfc459e784..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-project-xmlsecurity
+++ /dev/null
@@ -1,45 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=39958
-o http://www.openoffice.org/issues/show_bug.cgi?id=38417
-o xmlsec08
-
-Description
-o Not for integration, we should provide configure based one
-  Note: malloc.h is deprecated for FreeBSD.
-o use configure to produce config.h
-
-Index: libxmlsec/xmlsec1-1.2.4.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v
-retrieving revision 1.7
-diff -u -r1.7 xmlsec1-1.2.4.patch
---- libxmlsec/xmlsec1-1.2.4.patch	9 Sep 2004 08:31:29 -0000	1.7
-+++ libxmlsec/xmlsec1-1.2.4.patch	3 Oct 2004 05:52:20 -0000
-@@ -83,7 +83,7 @@
- ! #undef HAVE_MACH_O_DYLD_H
- ! 
- ! /* Define to 1 if you have the <malloc.h> header file. */
--! #define HAVE_MALLOC_H 1
-+! #define HAVE_MALLOC_H 0
- ! 
- ! /* Define to 1 if you have the `memcpy' function. */
- ! #undef HAVE_MEMCPY
-
-
-Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
-===================================================================
-RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx
---- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	12 Jul 2004 13:15:21 -0000	1.1.1.1
-+++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	4 Oct 2004 22:04:08 -0000
-@@ -68,7 +68,9 @@
- #include <xmloff/attrlist.hxx>
- #include "xmlelementwrapper_xmlsecimpl.hxx"
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/editors/openoffice.org-3-RC/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-3-RC/files/patch-sndfile+libsndfile-1.0.9.patch
new file mode 100644
index 000000000000..ee4d7e4d07d9
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-sndfile+libsndfile-1.0.9.patch
@@ -0,0 +1,59 @@
+Index: sndfile/libsndfile-1.0.9.patch
+===================================================================
+RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
+retrieving revision 1.1
+diff -u -r1.1 libsndfile-1.0.9.patch
+--- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
++++ sndfile/libsndfile-1.0.9.patch	28 Mar 2005 07:59:15 -0000
+@@ -231,3 +231,51 @@
+   
+   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
+   
++*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
++--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
++***************
++*** 2899,2910 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2899,2910 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2980,2987 ****
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2980,2987 ----
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-3-RC/files/patch-sndfile+makefile.mk b/editors/openoffice.org-3-RC/files/patch-sndfile+makefile.mk
new file mode 100644
index 000000000000..df33e5cb4c25
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-sndfile+makefile.mk
@@ -0,0 +1,16 @@
+Index: sndfile/makefile.mk
+===================================================================
+RCS file: /cvs/external/sndfile/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
++++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
+@@ -81,7 +81,7 @@
+ CONFIGURE_DIR=
+ 
+ CONFIGURE_ACTION=./configure --with-pic
+-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
++.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
+ CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+ .ENDIF
+ 
diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+util b/editors/openoffice.org-3-RC/files/patch-vcl+util
new file mode 100644
index 000000000000..2ebfdda8ce4c
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-vcl+util
@@ -0,0 +1,47 @@
+Get rid of -ldl for FREEBSD and MACOSX
+
+Index: vcl/util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.65
+diff -u -r1.65 makefile.mk
+--- vcl/util/makefile.mk	13 Jan 2005 18:16:05 -0000	1.65
++++ vcl/util/makefile.mk	7 Apr 2005 01:29:29 -0000
+@@ -252,10 +252,11 @@
+ 
+ .IF "$(GUI)"=="UNX"
+ 
+-.IF "$(OS)"=="MACOSX"
+-SHL1STDLIBS += -ldl
++.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
++SHL1STDLIBS+= -ldl
+ .ENDIF
+ 
++
+ .IF "$(GUIBASE)"=="aqua"
+ SHL1STDLIBS += -framework Cocoa
+ .ENDIF
+@@ -383,7 +384,11 @@
+ 
+ 
+ SHL4STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_GTK)" != ""
+ 
+ # KDE plugin
+@@ -396,7 +401,11 @@
+ # libs for KDE plugin
+ SHL5STDLIBS=$(KDE_LIBS)
+ SHL5STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL5STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_KDE)" != ""
+ 
+ .ENDIF # UNX
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index ad6dc4fa8749..9c5509af0a2e 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050310
+SNAPDATE=	20050406
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -47,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		85
+MILESTONE=		91
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -76,7 +76,6 @@ CXX=	g++-ooo
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
-		epm:${PORTSDIR}/devel/epm \
 		gpatch:${PORTSDIR}/devel/patch \
 		xmkmf:${X_IMAKE_PORT} \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
@@ -104,7 +103,7 @@ UNZIP?=		${PREFIX}/bin/unzip
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	4
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 5831691b8684..bbd66668973c 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 044e96faae97761f3343bff2d123531a
-SIZE (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 243497173
+MD5 (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = b186d557a51b8fa9faf700e7a71b2470
+SIZE (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = 250068979
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3-devel/files/patch-canvas+inc+canvas+canvastools.hxx b/editors/openoffice.org-3-devel/files/patch-canvas+inc+canvas+canvastools.hxx
new file mode 100644
index 000000000000..5c0c6bd78884
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-canvas+inc+canvas+canvastools.hxx
@@ -0,0 +1,21 @@
+
+Index: canvas/inc/canvas/canvastools.hxx
+===================================================================
+RCS file: /cvs/gsl/canvas/inc/canvas/canvastools.hxx,v
+retrieving revision 1.7
+diff -u -r1.7 canvastools.hxx
+--- canvas/inc/canvas/canvastools.hxx	30 Mar 2005 07:34:18 -0000	1.7
++++ canvas/inc/canvas/canvastools.hxx	6 Apr 2005 01:22:58 -0000
+@@ -133,9 +133,9 @@
+ 		 */
+ 
+ 		// mickey's math tricks...
+-		inline unsigned int powerof2( unsigned int c ) { return 0x1 << c; }
+-		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2(powerof2(c)) + 1); }
+-		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2(c))) & mask(c)); }
++		inline unsigned int powerof2_ooo( unsigned int c ) { return 0x1 << c; }
++		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2_ooo(powerof2_ooo(c)) + 1); }
++		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2_ooo(c))) & mask(c)); }
+ 		template<typename T>
+ 		inline unsigned int bitcount( T c ) {
+ 			unsigned int nByteIndex = 0;
diff --git a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in
deleted file mode 100644
index 20602d3402a6..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=44913
-o configure7
-
---- config_office/configure.in~	Wed Mar  9 01:31:52 2005
-+++ config_office/configure.in	Sun Mar 13 15:53:13 2005
-@@ -565,7 +565,7 @@
- 		test_cups=no
- 		_os=Darwin
- 		;;
--	freebsd)
-+	freebsd*)
- 		test_x=yes
- 		test_gtk=yes
- 		test_kde=yes
diff --git a/editors/openoffice.org-3-devel/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-3-devel/files/patch-crashrep+source+unx+makefile.mk
new file mode 100644
index 000000000000..6cb60786e2e5
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-crashrep+source+unx+makefile.mk
@@ -0,0 +1,19 @@
+Index: crashrep/source/unx/makefile.mk
+===================================================================
+RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
+retrieving revision 1.14
+diff -u -r1.14 makefile.mk
+--- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
++++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
+@@ -82,7 +82,10 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ 
+-APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
++APP1STDLIBS=$(DYNAMIC) -lXext -lX11
++.IF "$(OS)" != "FREEBSD"
++APP1STDLIBS+=-ldl -lnsl
++.ENDIF
+ .IF "$(OS)" == "SOLARIS"
+ APP1STDLIBS+=-lsocket
+ .ENDIF
diff --git a/editors/openoffice.org-3-devel/files/patch-curl-7.12.2.patch b/editors/openoffice.org-3-devel/files/patch-curl-7.12.2.patch
deleted file mode 100644
index f1597ef75e84..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-curl-7.12.2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-#i 43986#
-
-version number of curl for FreeBSD is somewhat odd.
-we need libcurl.so.3.0.0 not libcurl.so.3
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3*
-after applying this pach
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3.0.0*
-
-Index: curl-7.12.2.patch
-===================================================================
-RCS file: /cvs/external/curl/curl-7.12.2.patch,v
-retrieving revision 1.4
-diff -u -r1.4 curl-7.12.2.patch
---- curl/curl-7.12.2.patch	27 Jan 2005 11:11:50 -0000	1.4
-+++ curl/curl-7.12.2.patch	3 Mar 2005 11:57:27 -0000
-@@ -304,3 +304,68 @@
-      * Check the current list of connections to see if we can
-      * re-use an already existing one or if we have to create a
-      * new one.
-+*** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 20:12:17 2004
-+--- misc/build/curl-7.12.2/ltmain.sh	Thu Mar  3 20:52:09 2005
-+***************
-+*** 2915,2926 ****
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  freebsd-aout|freebsd-elf|sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+--- 2915,2926 ----
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+***************
-+*** 2990,3005 ****
-+  	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+  	  ;;
-+  
-+- 	freebsd-aout)
-+- 	  major=".$current"
-+- 	  versuffix=".$current.$revision";
-+- 	  ;;
-+- 
-+- 	freebsd-elf)
-+- 	  major=".$current"
-+- 	  versuffix=".$current";
-+- 	  ;;
-+- 
-+  	irix | nonstopux)
-+  	  major=`expr $current - $age + 1`
-+  
-+--- 2990,2995 ----
-+***************
-+*** 3022,3028 ****
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
-+--- 3012,3018 ----
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux|freebsd-aout|freebsd-elf)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
diff --git a/editors/openoffice.org-3-devel/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-3-devel/files/patch-extensions+source+config+ldap+makefile.mk
deleted file mode 100644
index fb5f8b09a7ef..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-extensions+source+config+ldap+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-o llber50 is missing
-o http://www.openoffice.org/issues/show_bug.cgi?id=43037
-
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.4.24.2
-diff -u -u -r1.4.24.2 makefile.mk
---- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
-+++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
-@@ -114,6 +114,9 @@
-         $(SALLIB)
- .IF "$(OS)"=="FREEBSD"
- SHL1STDLIBS+=-lcompat
-+.IF "$(WITH_OPENLDAP)" != "YES"
-+SHL1STDLIBS+=-llber50
-+.ENDIF
- .ENDIF
- 
- DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-3-devel/files/patch-instsetoo_native+util+makefile.mk b/editors/openoffice.org-3-devel/files/patch-instsetoo_native+util+makefile.mk
deleted file mode 100644
index 4837e39a6a2b..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-instsetoo_native+util+makefile.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-For instsetoo_native project, we should use FORMAT*=-format bsd.
-However, for FreeBSD, we cannot write script towards multiple line,
-so -format bsd break builds. We temporary set -format portable at
-the moment so that we can treat as we want.
-
-Index: instsetoo_native/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- instsetoo_native/util/makefile.mk	10 Dec 2004 17:03:50 -0000	1.13
-+++ instsetoo_native/util/makefile.mk	20 Dec 2004 11:32:33 -0000
-@@ -82,6 +82,12 @@
- FORMAT*=-format pkg
- .ENDIF
- 
-+.IF "$(OS)" == "FREEBSD"
-+#bsd is preffered but epm does not produce valid packages atm
-+#FORMAT*=-format bsd
-+FORMAT*=-format portable
-+.ENDIF
-+
- # epm supports the following formats:
- # aix - AIX software distribution
- # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
diff --git a/editors/openoffice.org-3-devel/files/patch-libxml2 b/editors/openoffice.org-3-devel/files/patch-libxml2
deleted file mode 100644
index b4d2aca8b1c5..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-libxml2
+++ /dev/null
@@ -1,61 +0,0 @@
-o version number of libxml2
-o http://www.openoffice.org/issues/show_bug.cgi?id=42393
-
-Index: libxml2-2.6.17.patch
-===================================================================
-RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxml2-2.6.17.patch
---- libxml2/libxml2-2.6.17.patch.orig	4 Feb 2005 11:29:07 -0000	1.2
-+++ libxml2/libxml2-2.6.17.patch	12 Feb 2005 13:11:40 -0000
-@@ -1,5 +1,5 @@
--*** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
----- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
-+*** misc/libxml2-2.6.17/configure	Mon Jan 17 04:24:22 2005
-+--- misc/build/libxml2-2.6.17/configure	Sat Feb 12 22:08:54 2005
- ***************
- *** 26339,26347 ****
-   
-@@ -38,8 +38,8 @@
-   echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
-   echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
-   if test $ac_cv_func_setsockopt = yes; then
--*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	2005-01-16 21:02:54.000000000 +0100
----- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	2005-02-02 17:39:50.923232015 +0100
-+*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	Mon Jan 17 05:02:54 2005
-+--- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	Sat Feb 12 22:08:54 2005
- ***************
- *** 263,269 ****
-    *
-@@ -91,8 +91,29 @@
-   #define DEBUG_MEMORY_LOCATION
-   #endif
-   
--*** misc/libxml2-2.6.17/nanohttp.c	2005-01-04 15:49:47.000000000 +0100
----- misc/build/libxml2-2.6.17/nanohttp.c	2005-02-02 17:39:50.924231930 +0100
-+*** misc/libxml2-2.6.17/ltmain.sh	Mon Jan 17 05:02:25 2005
-+--- misc/build/libxml2-2.6.17/ltmain.sh	Sat Feb 12 22:10:00 2005
-+***************
-+*** 2999,3006 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2999,3006 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+*** misc/libxml2-2.6.17/nanohttp.c	Tue Jan  4 23:49:47 2005
-+--- misc/build/libxml2-2.6.17/nanohttp.c	Sat Feb 12 22:08:54 2005
- ***************
- *** 248,254 ****
-   void
diff --git a/editors/openoffice.org-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
new file mode 100644
index 000000000000..88ec6c234485
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-libxmlsec+xmlsec1-1.2.6.patch
@@ -0,0 +1,69 @@
+Index: libxmlsec/xmlsec1-1.2.6.patch
+===================================================================
+RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
+retrieving revision 1.3
+diff -u -r1.3 xmlsec1-1.2.6.patch
+--- libxmlsec/xmlsec1-1.2.6.patch	29 Mar 2005 11:45:08 -0000	1.3
++++ libxmlsec/xmlsec1-1.2.6.patch	6 Apr 2005 04:46:13 -0000
+@@ -13957,3 +13957,61 @@
+   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
+   
+   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
++*** misc/xmlsec1-1.2.6/ltmain.sh	Thu Aug 26 15:00:15 2004
++--- misc/build/xmlsec1-1.2.6/ltmain.sh	Wed Apr  6 13:32:04 2005
++***************
++*** 2918,2929 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2918,2929 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2994,3006 ****
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=".$current"
++! 	  versuffix=".$current.$revision";
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2994,3006 ----
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-3-devel/files/patch-odk+configure.pl b/editors/openoffice.org-3-devel/files/patch-odk+configure.pl
deleted file mode 100644
index db196e368e6d..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-o gmake support
-o suggestion from Juegen Schmidt <Juergen.Schmidt@Sun.COM>
-
-http://www.openoffice.org/issues/show_bug.cgi?id=41142
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.8.4.10
-diff -u -r1.8.4.10 configure.pl
---- odk/configure.pl	11 Jan 2005 11:00:15 -0000	1.8.4.10
-+++ odk/configure.pl	23 Jan 2005 09:13:41 -0000
-@@ -43,7 +43,14 @@
- }
- 
- $main::OO_SDK_MAKE_HOME = "";
-+$main::OO_MAKE_NAME = "make";
-+if ( $main::operatingSystem eq "FreeBSD" )
-+{
-+    $main::OO_MAKE_NAME = "gmake";
-+    $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
-+} else {
- $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
-+}
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
- 
-@@ -137,7 +144,7 @@
- # prepare GNU make path
- while ( (!$main::correctVersion) &&
- 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME" ))) )
- {
-     print " Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
-     $main::OO_SDK_MAKE_HOME = readStdIn();
-@@ -146,15 +153,16 @@
-     {
- 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
-     }
-+
-     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME")) )
-     { 
- 		$main::OO_SDK_MAKE_HOME = "";
- 		print " Error: GNU make is required, please specify a GNU make tools directory.\n";
-     } else 
-     {
- 		#check version
--		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
-+		my $testVersion = `$OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME --version`;
- 		if ( $testVersion eq "")
- 		{
- 			print " Set the environment variable OO_SDK_MAKE_HOME to your GNU build tools directory.\n";
-@@ -165,7 +173,7 @@
- 			{
- 				$testVersion = $1;
- 			}
--			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/make", 1);
-+			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME", 1);
- 			if ( !$main::correctVersion )
- 			{
- 				print " The 'make' command found at '$main::OO_SDK_MAKE_HOME' has a wrong version\n";
diff --git a/editors/openoffice.org-3-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-3-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
new file mode 100644
index 000000000000..59b013e50010
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
@@ -0,0 +1,25 @@
+Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.2
+diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
+--- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
++++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
+@@ -109,7 +109,7 @@
+ 		linearly between center and endColor via concentric ellipses
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		circular. If it's not 1, the gradient is elliptical, with the
+ 		special twist that the aspect ratio is maintained also for the
+ 		center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ 		linearly between center and endColor via rectangular boxes
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		quadratic. If it's not 1, the gradient is rectangular, with
+ 		the special twist that the aspect ratio is maintained also for
+ 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-3-devel/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-3-devel/files/patch-portaudio+portaudio_v18_1.patch
new file mode 100644
index 000000000000..88317fafc354
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-portaudio+portaudio_v18_1.patch
@@ -0,0 +1,24 @@
+Index: portaudio/portaudio_v18_1.patch
+===================================================================
+RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
+retrieving revision 1.1
+diff -u -r1.1 portaudio_v18_1.patch
+--- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
++++ portaudio/portaudio_v18_1.patch	28 Mar 2005 06:55:37 -0000
+@@ -52,3 +52,16 @@
+   LIBINST = /usr/local/lib
+   
+   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
++*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
++--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Mon Mar 28 15:45:37 2005
++***************
++*** 43,48 ****
++--- 43,50 ----
++  
++  #ifdef __linux__
++  #include <linux/soundcard.h>
+++ #elif defined (__FreeBSD__)
+++ #include <sys/soundcard.h>
++  #else
++  #include <machine/soundcard.h> /* JH20010905 */
++  #endif
diff --git a/editors/openoffice.org-3-devel/files/patch-project-xmlsecurity b/editors/openoffice.org-3-devel/files/patch-project-xmlsecurity
deleted file mode 100644
index b8dfc459e784..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-project-xmlsecurity
+++ /dev/null
@@ -1,45 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=39958
-o http://www.openoffice.org/issues/show_bug.cgi?id=38417
-o xmlsec08
-
-Description
-o Not for integration, we should provide configure based one
-  Note: malloc.h is deprecated for FreeBSD.
-o use configure to produce config.h
-
-Index: libxmlsec/xmlsec1-1.2.4.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v
-retrieving revision 1.7
-diff -u -r1.7 xmlsec1-1.2.4.patch
---- libxmlsec/xmlsec1-1.2.4.patch	9 Sep 2004 08:31:29 -0000	1.7
-+++ libxmlsec/xmlsec1-1.2.4.patch	3 Oct 2004 05:52:20 -0000
-@@ -83,7 +83,7 @@
- ! #undef HAVE_MACH_O_DYLD_H
- ! 
- ! /* Define to 1 if you have the <malloc.h> header file. */
--! #define HAVE_MALLOC_H 1
-+! #define HAVE_MALLOC_H 0
- ! 
- ! /* Define to 1 if you have the `memcpy' function. */
- ! #undef HAVE_MEMCPY
-
-
-Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
-===================================================================
-RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx
---- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	12 Jul 2004 13:15:21 -0000	1.1.1.1
-+++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	4 Oct 2004 22:04:08 -0000
-@@ -68,7 +68,9 @@
- #include <xmloff/attrlist.hxx>
- #include "xmlelementwrapper_xmlsecimpl.hxx"
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/editors/openoffice.org-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch
new file mode 100644
index 000000000000..ee4d7e4d07d9
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-sndfile+libsndfile-1.0.9.patch
@@ -0,0 +1,59 @@
+Index: sndfile/libsndfile-1.0.9.patch
+===================================================================
+RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
+retrieving revision 1.1
+diff -u -r1.1 libsndfile-1.0.9.patch
+--- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
++++ sndfile/libsndfile-1.0.9.patch	28 Mar 2005 07:59:15 -0000
+@@ -231,3 +231,51 @@
+   
+   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
+   
++*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
++--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
++***************
++*** 2899,2910 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2899,2910 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2980,2987 ****
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2980,2987 ----
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-3-devel/files/patch-sndfile+makefile.mk b/editors/openoffice.org-3-devel/files/patch-sndfile+makefile.mk
new file mode 100644
index 000000000000..df33e5cb4c25
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-sndfile+makefile.mk
@@ -0,0 +1,16 @@
+Index: sndfile/makefile.mk
+===================================================================
+RCS file: /cvs/external/sndfile/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
++++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
+@@ -81,7 +81,7 @@
+ CONFIGURE_DIR=
+ 
+ CONFIGURE_ACTION=./configure --with-pic
+-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
++.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
+ CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+ .ENDIF
+ 
diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+util b/editors/openoffice.org-3-devel/files/patch-vcl+util
new file mode 100644
index 000000000000..2ebfdda8ce4c
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-vcl+util
@@ -0,0 +1,47 @@
+Get rid of -ldl for FREEBSD and MACOSX
+
+Index: vcl/util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.65
+diff -u -r1.65 makefile.mk
+--- vcl/util/makefile.mk	13 Jan 2005 18:16:05 -0000	1.65
++++ vcl/util/makefile.mk	7 Apr 2005 01:29:29 -0000
+@@ -252,10 +252,11 @@
+ 
+ .IF "$(GUI)"=="UNX"
+ 
+-.IF "$(OS)"=="MACOSX"
+-SHL1STDLIBS += -ldl
++.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
++SHL1STDLIBS+= -ldl
+ .ENDIF
+ 
++
+ .IF "$(GUIBASE)"=="aqua"
+ SHL1STDLIBS += -framework Cocoa
+ .ENDIF
+@@ -383,7 +384,11 @@
+ 
+ 
+ SHL4STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_GTK)" != ""
+ 
+ # KDE plugin
+@@ -396,7 +401,11 @@
+ # libs for KDE plugin
+ SHL5STDLIBS=$(KDE_LIBS)
+ SHL5STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL5STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_KDE)" != ""
+ 
+ .ENDIF # UNX
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index ad6dc4fa8749..9c5509af0a2e 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050310
+SNAPDATE=	20050406
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -47,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		85
+MILESTONE=		91
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -76,7 +76,6 @@ CXX=	g++-ooo
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
-		epm:${PORTSDIR}/devel/epm \
 		gpatch:${PORTSDIR}/devel/patch \
 		xmkmf:${X_IMAKE_PORT} \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
@@ -104,7 +103,7 @@ UNZIP?=		${PREFIX}/bin/unzip
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	4
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 5831691b8684..bbd66668973c 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 044e96faae97761f3343bff2d123531a
-SIZE (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 243497173
+MD5 (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = b186d557a51b8fa9faf700e7a71b2470
+SIZE (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = 250068979
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-3/files/patch-canvas+inc+canvas+canvastools.hxx b/editors/openoffice.org-3/files/patch-canvas+inc+canvas+canvastools.hxx
new file mode 100644
index 000000000000..5c0c6bd78884
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-canvas+inc+canvas+canvastools.hxx
@@ -0,0 +1,21 @@
+
+Index: canvas/inc/canvas/canvastools.hxx
+===================================================================
+RCS file: /cvs/gsl/canvas/inc/canvas/canvastools.hxx,v
+retrieving revision 1.7
+diff -u -r1.7 canvastools.hxx
+--- canvas/inc/canvas/canvastools.hxx	30 Mar 2005 07:34:18 -0000	1.7
++++ canvas/inc/canvas/canvastools.hxx	6 Apr 2005 01:22:58 -0000
+@@ -133,9 +133,9 @@
+ 		 */
+ 
+ 		// mickey's math tricks...
+-		inline unsigned int powerof2( unsigned int c ) { return 0x1 << c; }
+-		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2(powerof2(c)) + 1); }
+-		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2(c))) & mask(c)); }
++		inline unsigned int powerof2_ooo( unsigned int c ) { return 0x1 << c; }
++		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2_ooo(powerof2_ooo(c)) + 1); }
++		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2_ooo(c))) & mask(c)); }
+ 		template<typename T>
+ 		inline unsigned int bitcount( T c ) {
+ 			unsigned int nByteIndex = 0;
diff --git a/editors/openoffice.org-3/files/patch-config_office+configure.in b/editors/openoffice.org-3/files/patch-config_office+configure.in
deleted file mode 100644
index 20602d3402a6..000000000000
--- a/editors/openoffice.org-3/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=44913
-o configure7
-
---- config_office/configure.in~	Wed Mar  9 01:31:52 2005
-+++ config_office/configure.in	Sun Mar 13 15:53:13 2005
-@@ -565,7 +565,7 @@
- 		test_cups=no
- 		_os=Darwin
- 		;;
--	freebsd)
-+	freebsd*)
- 		test_x=yes
- 		test_gtk=yes
- 		test_kde=yes
diff --git a/editors/openoffice.org-3/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-3/files/patch-crashrep+source+unx+makefile.mk
new file mode 100644
index 000000000000..6cb60786e2e5
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-crashrep+source+unx+makefile.mk
@@ -0,0 +1,19 @@
+Index: crashrep/source/unx/makefile.mk
+===================================================================
+RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
+retrieving revision 1.14
+diff -u -r1.14 makefile.mk
+--- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
++++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
+@@ -82,7 +82,10 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ 
+-APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
++APP1STDLIBS=$(DYNAMIC) -lXext -lX11
++.IF "$(OS)" != "FREEBSD"
++APP1STDLIBS+=-ldl -lnsl
++.ENDIF
+ .IF "$(OS)" == "SOLARIS"
+ APP1STDLIBS+=-lsocket
+ .ENDIF
diff --git a/editors/openoffice.org-3/files/patch-curl-7.12.2.patch b/editors/openoffice.org-3/files/patch-curl-7.12.2.patch
deleted file mode 100644
index f1597ef75e84..000000000000
--- a/editors/openoffice.org-3/files/patch-curl-7.12.2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-#i 43986#
-
-version number of curl for FreeBSD is somewhat odd.
-we need libcurl.so.3.0.0 not libcurl.so.3
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3*
-after applying this pach
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3.0.0*
-
-Index: curl-7.12.2.patch
-===================================================================
-RCS file: /cvs/external/curl/curl-7.12.2.patch,v
-retrieving revision 1.4
-diff -u -r1.4 curl-7.12.2.patch
---- curl/curl-7.12.2.patch	27 Jan 2005 11:11:50 -0000	1.4
-+++ curl/curl-7.12.2.patch	3 Mar 2005 11:57:27 -0000
-@@ -304,3 +304,68 @@
-      * Check the current list of connections to see if we can
-      * re-use an already existing one or if we have to create a
-      * new one.
-+*** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 20:12:17 2004
-+--- misc/build/curl-7.12.2/ltmain.sh	Thu Mar  3 20:52:09 2005
-+***************
-+*** 2915,2926 ****
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  freebsd-aout|freebsd-elf|sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+--- 2915,2926 ----
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+***************
-+*** 2990,3005 ****
-+  	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+  	  ;;
-+  
-+- 	freebsd-aout)
-+- 	  major=".$current"
-+- 	  versuffix=".$current.$revision";
-+- 	  ;;
-+- 
-+- 	freebsd-elf)
-+- 	  major=".$current"
-+- 	  versuffix=".$current";
-+- 	  ;;
-+- 
-+  	irix | nonstopux)
-+  	  major=`expr $current - $age + 1`
-+  
-+--- 2990,2995 ----
-+***************
-+*** 3022,3028 ****
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
-+--- 3012,3018 ----
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux|freebsd-aout|freebsd-elf)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
diff --git a/editors/openoffice.org-3/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-3/files/patch-extensions+source+config+ldap+makefile.mk
deleted file mode 100644
index fb5f8b09a7ef..000000000000
--- a/editors/openoffice.org-3/files/patch-extensions+source+config+ldap+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-o llber50 is missing
-o http://www.openoffice.org/issues/show_bug.cgi?id=43037
-
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.4.24.2
-diff -u -u -r1.4.24.2 makefile.mk
---- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
-+++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
-@@ -114,6 +114,9 @@
-         $(SALLIB)
- .IF "$(OS)"=="FREEBSD"
- SHL1STDLIBS+=-lcompat
-+.IF "$(WITH_OPENLDAP)" != "YES"
-+SHL1STDLIBS+=-llber50
-+.ENDIF
- .ENDIF
- 
- DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-3/files/patch-instsetoo_native+util+makefile.mk b/editors/openoffice.org-3/files/patch-instsetoo_native+util+makefile.mk
deleted file mode 100644
index 4837e39a6a2b..000000000000
--- a/editors/openoffice.org-3/files/patch-instsetoo_native+util+makefile.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-For instsetoo_native project, we should use FORMAT*=-format bsd.
-However, for FreeBSD, we cannot write script towards multiple line,
-so -format bsd break builds. We temporary set -format portable at
-the moment so that we can treat as we want.
-
-Index: instsetoo_native/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- instsetoo_native/util/makefile.mk	10 Dec 2004 17:03:50 -0000	1.13
-+++ instsetoo_native/util/makefile.mk	20 Dec 2004 11:32:33 -0000
-@@ -82,6 +82,12 @@
- FORMAT*=-format pkg
- .ENDIF
- 
-+.IF "$(OS)" == "FREEBSD"
-+#bsd is preffered but epm does not produce valid packages atm
-+#FORMAT*=-format bsd
-+FORMAT*=-format portable
-+.ENDIF
-+
- # epm supports the following formats:
- # aix - AIX software distribution
- # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
diff --git a/editors/openoffice.org-3/files/patch-libxml2 b/editors/openoffice.org-3/files/patch-libxml2
deleted file mode 100644
index b4d2aca8b1c5..000000000000
--- a/editors/openoffice.org-3/files/patch-libxml2
+++ /dev/null
@@ -1,61 +0,0 @@
-o version number of libxml2
-o http://www.openoffice.org/issues/show_bug.cgi?id=42393
-
-Index: libxml2-2.6.17.patch
-===================================================================
-RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxml2-2.6.17.patch
---- libxml2/libxml2-2.6.17.patch.orig	4 Feb 2005 11:29:07 -0000	1.2
-+++ libxml2/libxml2-2.6.17.patch	12 Feb 2005 13:11:40 -0000
-@@ -1,5 +1,5 @@
--*** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
----- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
-+*** misc/libxml2-2.6.17/configure	Mon Jan 17 04:24:22 2005
-+--- misc/build/libxml2-2.6.17/configure	Sat Feb 12 22:08:54 2005
- ***************
- *** 26339,26347 ****
-   
-@@ -38,8 +38,8 @@
-   echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
-   echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
-   if test $ac_cv_func_setsockopt = yes; then
--*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	2005-01-16 21:02:54.000000000 +0100
----- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	2005-02-02 17:39:50.923232015 +0100
-+*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	Mon Jan 17 05:02:54 2005
-+--- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	Sat Feb 12 22:08:54 2005
- ***************
- *** 263,269 ****
-    *
-@@ -91,8 +91,29 @@
-   #define DEBUG_MEMORY_LOCATION
-   #endif
-   
--*** misc/libxml2-2.6.17/nanohttp.c	2005-01-04 15:49:47.000000000 +0100
----- misc/build/libxml2-2.6.17/nanohttp.c	2005-02-02 17:39:50.924231930 +0100
-+*** misc/libxml2-2.6.17/ltmain.sh	Mon Jan 17 05:02:25 2005
-+--- misc/build/libxml2-2.6.17/ltmain.sh	Sat Feb 12 22:10:00 2005
-+***************
-+*** 2999,3006 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2999,3006 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+*** misc/libxml2-2.6.17/nanohttp.c	Tue Jan  4 23:49:47 2005
-+--- misc/build/libxml2-2.6.17/nanohttp.c	Sat Feb 12 22:08:54 2005
- ***************
- *** 248,254 ****
-   void
diff --git a/editors/openoffice.org-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch
new file mode 100644
index 000000000000..88ec6c234485
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-libxmlsec+xmlsec1-1.2.6.patch
@@ -0,0 +1,69 @@
+Index: libxmlsec/xmlsec1-1.2.6.patch
+===================================================================
+RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
+retrieving revision 1.3
+diff -u -r1.3 xmlsec1-1.2.6.patch
+--- libxmlsec/xmlsec1-1.2.6.patch	29 Mar 2005 11:45:08 -0000	1.3
++++ libxmlsec/xmlsec1-1.2.6.patch	6 Apr 2005 04:46:13 -0000
+@@ -13957,3 +13957,61 @@
+   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
+   
+   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
++*** misc/xmlsec1-1.2.6/ltmain.sh	Thu Aug 26 15:00:15 2004
++--- misc/build/xmlsec1-1.2.6/ltmain.sh	Wed Apr  6 13:32:04 2005
++***************
++*** 2918,2929 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2918,2929 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2994,3006 ****
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=".$current"
++! 	  versuffix=".$current.$revision";
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2994,3006 ----
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-3/files/patch-odk+configure.pl b/editors/openoffice.org-3/files/patch-odk+configure.pl
deleted file mode 100644
index db196e368e6d..000000000000
--- a/editors/openoffice.org-3/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-o gmake support
-o suggestion from Juegen Schmidt <Juergen.Schmidt@Sun.COM>
-
-http://www.openoffice.org/issues/show_bug.cgi?id=41142
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.8.4.10
-diff -u -r1.8.4.10 configure.pl
---- odk/configure.pl	11 Jan 2005 11:00:15 -0000	1.8.4.10
-+++ odk/configure.pl	23 Jan 2005 09:13:41 -0000
-@@ -43,7 +43,14 @@
- }
- 
- $main::OO_SDK_MAKE_HOME = "";
-+$main::OO_MAKE_NAME = "make";
-+if ( $main::operatingSystem eq "FreeBSD" )
-+{
-+    $main::OO_MAKE_NAME = "gmake";
-+    $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
-+} else {
- $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
-+}
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
- 
-@@ -137,7 +144,7 @@
- # prepare GNU make path
- while ( (!$main::correctVersion) &&
- 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME" ))) )
- {
-     print " Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
-     $main::OO_SDK_MAKE_HOME = readStdIn();
-@@ -146,15 +153,16 @@
-     {
- 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
-     }
-+
-     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME")) )
-     { 
- 		$main::OO_SDK_MAKE_HOME = "";
- 		print " Error: GNU make is required, please specify a GNU make tools directory.\n";
-     } else 
-     {
- 		#check version
--		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
-+		my $testVersion = `$OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME --version`;
- 		if ( $testVersion eq "")
- 		{
- 			print " Set the environment variable OO_SDK_MAKE_HOME to your GNU build tools directory.\n";
-@@ -165,7 +173,7 @@
- 			{
- 				$testVersion = $1;
- 			}
--			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/make", 1);
-+			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME", 1);
- 			if ( !$main::correctVersion )
- 			{
- 				print " The 'make' command found at '$main::OO_SDK_MAKE_HOME' has a wrong version\n";
diff --git a/editors/openoffice.org-3/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-3/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
new file mode 100644
index 000000000000..59b013e50010
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
@@ -0,0 +1,25 @@
+Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.2
+diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
+--- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
++++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
+@@ -109,7 +109,7 @@
+ 		linearly between center and endColor via concentric ellipses
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		circular. If it's not 1, the gradient is elliptical, with the
+ 		special twist that the aspect ratio is maintained also for the
+ 		center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ 		linearly between center and endColor via rectangular boxes
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		quadratic. If it's not 1, the gradient is rectangular, with
+ 		the special twist that the aspect ratio is maintained also for
+ 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-3/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-3/files/patch-portaudio+portaudio_v18_1.patch
new file mode 100644
index 000000000000..88317fafc354
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-portaudio+portaudio_v18_1.patch
@@ -0,0 +1,24 @@
+Index: portaudio/portaudio_v18_1.patch
+===================================================================
+RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
+retrieving revision 1.1
+diff -u -r1.1 portaudio_v18_1.patch
+--- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
++++ portaudio/portaudio_v18_1.patch	28 Mar 2005 06:55:37 -0000
+@@ -52,3 +52,16 @@
+   LIBINST = /usr/local/lib
+   
+   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
++*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
++--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Mon Mar 28 15:45:37 2005
++***************
++*** 43,48 ****
++--- 43,50 ----
++  
++  #ifdef __linux__
++  #include <linux/soundcard.h>
+++ #elif defined (__FreeBSD__)
+++ #include <sys/soundcard.h>
++  #else
++  #include <machine/soundcard.h> /* JH20010905 */
++  #endif
diff --git a/editors/openoffice.org-3/files/patch-project-xmlsecurity b/editors/openoffice.org-3/files/patch-project-xmlsecurity
deleted file mode 100644
index b8dfc459e784..000000000000
--- a/editors/openoffice.org-3/files/patch-project-xmlsecurity
+++ /dev/null
@@ -1,45 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=39958
-o http://www.openoffice.org/issues/show_bug.cgi?id=38417
-o xmlsec08
-
-Description
-o Not for integration, we should provide configure based one
-  Note: malloc.h is deprecated for FreeBSD.
-o use configure to produce config.h
-
-Index: libxmlsec/xmlsec1-1.2.4.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v
-retrieving revision 1.7
-diff -u -r1.7 xmlsec1-1.2.4.patch
---- libxmlsec/xmlsec1-1.2.4.patch	9 Sep 2004 08:31:29 -0000	1.7
-+++ libxmlsec/xmlsec1-1.2.4.patch	3 Oct 2004 05:52:20 -0000
-@@ -83,7 +83,7 @@
- ! #undef HAVE_MACH_O_DYLD_H
- ! 
- ! /* Define to 1 if you have the <malloc.h> header file. */
--! #define HAVE_MALLOC_H 1
-+! #define HAVE_MALLOC_H 0
- ! 
- ! /* Define to 1 if you have the `memcpy' function. */
- ! #undef HAVE_MEMCPY
-
-
-Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
-===================================================================
-RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx
---- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	12 Jul 2004 13:15:21 -0000	1.1.1.1
-+++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	4 Oct 2004 22:04:08 -0000
-@@ -68,7 +68,9 @@
- #include <xmloff/attrlist.hxx>
- #include "xmlelementwrapper_xmlsecimpl.hxx"
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/editors/openoffice.org-3/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-3/files/patch-sndfile+libsndfile-1.0.9.patch
new file mode 100644
index 000000000000..ee4d7e4d07d9
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-sndfile+libsndfile-1.0.9.patch
@@ -0,0 +1,59 @@
+Index: sndfile/libsndfile-1.0.9.patch
+===================================================================
+RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
+retrieving revision 1.1
+diff -u -r1.1 libsndfile-1.0.9.patch
+--- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
++++ sndfile/libsndfile-1.0.9.patch	28 Mar 2005 07:59:15 -0000
+@@ -231,3 +231,51 @@
+   
+   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
+   
++*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
++--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
++***************
++*** 2899,2910 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2899,2910 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2980,2987 ****
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2980,2987 ----
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-3/files/patch-sndfile+makefile.mk b/editors/openoffice.org-3/files/patch-sndfile+makefile.mk
new file mode 100644
index 000000000000..df33e5cb4c25
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-sndfile+makefile.mk
@@ -0,0 +1,16 @@
+Index: sndfile/makefile.mk
+===================================================================
+RCS file: /cvs/external/sndfile/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
++++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
+@@ -81,7 +81,7 @@
+ CONFIGURE_DIR=
+ 
+ CONFIGURE_ACTION=./configure --with-pic
+-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
++.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
+ CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+ .ENDIF
+ 
diff --git a/editors/openoffice.org-3/files/patch-vcl+util b/editors/openoffice.org-3/files/patch-vcl+util
new file mode 100644
index 000000000000..2ebfdda8ce4c
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-vcl+util
@@ -0,0 +1,47 @@
+Get rid of -ldl for FREEBSD and MACOSX
+
+Index: vcl/util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.65
+diff -u -r1.65 makefile.mk
+--- vcl/util/makefile.mk	13 Jan 2005 18:16:05 -0000	1.65
++++ vcl/util/makefile.mk	7 Apr 2005 01:29:29 -0000
+@@ -252,10 +252,11 @@
+ 
+ .IF "$(GUI)"=="UNX"
+ 
+-.IF "$(OS)"=="MACOSX"
+-SHL1STDLIBS += -ldl
++.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
++SHL1STDLIBS+= -ldl
+ .ENDIF
+ 
++
+ .IF "$(GUIBASE)"=="aqua"
+ SHL1STDLIBS += -framework Cocoa
+ .ENDIF
+@@ -383,7 +384,11 @@
+ 
+ 
+ SHL4STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_GTK)" != ""
+ 
+ # KDE plugin
+@@ -396,7 +401,11 @@
+ # libs for KDE plugin
+ SHL5STDLIBS=$(KDE_LIBS)
+ SHL5STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL5STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_KDE)" != ""
+ 
+ .ENDIF # UNX
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index ad6dc4fa8749..9c5509af0a2e 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050310
+SNAPDATE=	20050406
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -47,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		85
+MILESTONE=		91
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -76,7 +76,6 @@ CXX=	g++-ooo
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
-		epm:${PORTSDIR}/devel/epm \
 		gpatch:${PORTSDIR}/devel/patch \
 		xmkmf:${X_IMAKE_PORT} \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
@@ -104,7 +103,7 @@ UNZIP?=		${PREFIX}/bin/unzip
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	4
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp  --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-package-format=portable
 
 .include <${FILESDIR}/Makefile.knobs>
 
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 5831691b8684..bbd66668973c 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 044e96faae97761f3343bff2d123531a
-SIZE (openoffice.org2.0/OOo_1.9m85_source.tar.bz2) = 243497173
+MD5 (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = b186d557a51b8fa9faf700e7a71b2470
+SIZE (openoffice.org2.0/OOo_1.9m91_source.tar.bz2) = 250068979
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-vcltesttool/files/patch-canvas+inc+canvas+canvastools.hxx b/editors/openoffice.org-vcltesttool/files/patch-canvas+inc+canvas+canvastools.hxx
new file mode 100644
index 000000000000..5c0c6bd78884
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-canvas+inc+canvas+canvastools.hxx
@@ -0,0 +1,21 @@
+
+Index: canvas/inc/canvas/canvastools.hxx
+===================================================================
+RCS file: /cvs/gsl/canvas/inc/canvas/canvastools.hxx,v
+retrieving revision 1.7
+diff -u -r1.7 canvastools.hxx
+--- canvas/inc/canvas/canvastools.hxx	30 Mar 2005 07:34:18 -0000	1.7
++++ canvas/inc/canvas/canvastools.hxx	6 Apr 2005 01:22:58 -0000
+@@ -133,9 +133,9 @@
+ 		 */
+ 
+ 		// mickey's math tricks...
+-		inline unsigned int powerof2( unsigned int c ) { return 0x1 << c; }
+-		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2(powerof2(c)) + 1); }
+-		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2(c))) & mask(c)); }
++		inline unsigned int powerof2_ooo( unsigned int c ) { return 0x1 << c; }
++		inline unsigned int mask( unsigned int c ) { return ((unsigned int)(-1)) / (powerof2_ooo(powerof2_ooo(c)) + 1); }
++		inline unsigned int count( unsigned int x, unsigned int c ) { return ((x) & mask(c)) + (((x) >> (powerof2_ooo(c))) & mask(c)); }
+ 		template<typename T>
+ 		inline unsigned int bitcount( T c ) {
+ 			unsigned int nByteIndex = 0;
diff --git a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in b/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in
deleted file mode 100644
index 20602d3402a6..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in
+++ /dev/null
@@ -1,14 +0,0 @@
-o http://www.openoffice.org/issues/show_bug.cgi?id=44913
-o configure7
-
---- config_office/configure.in~	Wed Mar  9 01:31:52 2005
-+++ config_office/configure.in	Sun Mar 13 15:53:13 2005
-@@ -565,7 +565,7 @@
- 		test_cups=no
- 		_os=Darwin
- 		;;
--	freebsd)
-+	freebsd*)
- 		test_x=yes
- 		test_gtk=yes
- 		test_kde=yes
diff --git a/editors/openoffice.org-vcltesttool/files/patch-crashrep+source+unx+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-crashrep+source+unx+makefile.mk
new file mode 100644
index 000000000000..6cb60786e2e5
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-crashrep+source+unx+makefile.mk
@@ -0,0 +1,19 @@
+Index: crashrep/source/unx/makefile.mk
+===================================================================
+RCS file: /cvs/porting/crashrep/source/unx/makefile.mk,v
+retrieving revision 1.14
+diff -u -r1.14 makefile.mk
+--- crashrep/source/unx/makefile.mk	8 Mar 2005 16:24:14 -0000	1.14
++++ crashrep/source/unx/makefile.mk	28 Mar 2005 08:11:57 -0000
+@@ -82,7 +82,10 @@
+ APP1TARGET=$(TARGET)
+ APP1OBJS=$(OBJFILES)
+ 
+-APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -ldl -lnsl
++APP1STDLIBS=$(DYNAMIC) -lXext -lX11
++.IF "$(OS)" != "FREEBSD"
++APP1STDLIBS+=-ldl -lnsl
++.ENDIF
+ .IF "$(OS)" == "SOLARIS"
+ APP1STDLIBS+=-lsocket
+ .ENDIF
diff --git a/editors/openoffice.org-vcltesttool/files/patch-curl-7.12.2.patch b/editors/openoffice.org-vcltesttool/files/patch-curl-7.12.2.patch
deleted file mode 100644
index f1597ef75e84..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-curl-7.12.2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-#i 43986#
-
-version number of curl for FreeBSD is somewhat odd.
-we need libcurl.so.3.0.0 not libcurl.so.3
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3*
-after applying this pach
-# ls unxfbsd.pro/lib/
-libcurl.so*             libcurl.so.3.0.0*
-
-Index: curl-7.12.2.patch
-===================================================================
-RCS file: /cvs/external/curl/curl-7.12.2.patch,v
-retrieving revision 1.4
-diff -u -r1.4 curl-7.12.2.patch
---- curl/curl-7.12.2.patch	27 Jan 2005 11:11:50 -0000	1.4
-+++ curl/curl-7.12.2.patch	3 Mar 2005 11:57:27 -0000
-@@ -304,3 +304,68 @@
-      * Check the current list of connections to see if we can
-      * re-use an already existing one or if we have to create a
-      * new one.
-+*** misc/curl-7.12.2/ltmain.sh	Mon Aug  9 20:12:17 2004
-+--- misc/build/curl-7.12.2/ltmain.sh	Thu Mar  3 20:52:09 2005
-+***************
-+*** 2915,2926 ****
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  freebsd-aout|freebsd-elf|sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+--- 2915,2926 ----
-+  	  # which has an extra 1 added just for fun
-+  	  #
-+  	  case $version_type in
-+! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
-+  	    current=`expr $number_major + $number_minor`
-+  	    age="$number_minor"
-+  	    revision="$number_revision"
-+  	    ;;
-+! 	  sunos)
-+  	    current="$number_major"
-+  	    revision="$number_minor"
-+  	    age="0"
-+***************
-+*** 2990,3005 ****
-+  	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+  	  ;;
-+  
-+- 	freebsd-aout)
-+- 	  major=".$current"
-+- 	  versuffix=".$current.$revision";
-+- 	  ;;
-+- 
-+- 	freebsd-elf)
-+- 	  major=".$current"
-+- 	  versuffix=".$current";
-+- 	  ;;
-+- 
-+  	irix | nonstopux)
-+  	  major=`expr $current - $age + 1`
-+  
-+--- 2990,2995 ----
-+***************
-+*** 3022,3028 ****
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
-+--- 3012,3018 ----
-+  	  versuffix="$major.$revision"
-+  	  ;;
-+  
-+! 	linux|freebsd-aout|freebsd-elf)
-+  	  major=.`expr $current - $age`
-+  	  versuffix="$major.$age.$revision"
-+  	  ;;
diff --git a/editors/openoffice.org-vcltesttool/files/patch-extensions+source+config+ldap+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-extensions+source+config+ldap+makefile.mk
deleted file mode 100644
index fb5f8b09a7ef..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-extensions+source+config+ldap+makefile.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-o llber50 is missing
-o http://www.openoffice.org/issues/show_bug.cgi?id=43037
-
-Index: makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.4.24.2
-diff -u -u -r1.4.24.2 makefile.mk
---- extensions/source/config/ldap/makefile.mk	27 Jan 2005 19:26:59 -0000	1.4.24.2
-+++ extensions/source/config/ldap/makefile.mk	18 Feb 2005 08:21:16 -0000
-@@ -114,6 +114,9 @@
-         $(SALLIB)
- .IF "$(OS)"=="FREEBSD"
- SHL1STDLIBS+=-lcompat
-+.IF "$(WITH_OPENLDAP)" != "YES"
-+SHL1STDLIBS+=-llber50
-+.ENDIF
- .ENDIF
- 
- DEF1NAME=$(SHL1TARGET)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-instsetoo_native+util+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-instsetoo_native+util+makefile.mk
deleted file mode 100644
index 4837e39a6a2b..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-instsetoo_native+util+makefile.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-For instsetoo_native project, we should use FORMAT*=-format bsd.
-However, for FreeBSD, we cannot write script towards multiple line,
-so -format bsd break builds. We temporary set -format portable at
-the moment so that we can treat as we want.
-
-Index: instsetoo_native/util/makefile.mk
-===================================================================
-RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- instsetoo_native/util/makefile.mk	10 Dec 2004 17:03:50 -0000	1.13
-+++ instsetoo_native/util/makefile.mk	20 Dec 2004 11:32:33 -0000
-@@ -82,6 +82,12 @@
- FORMAT*=-format pkg
- .ENDIF
- 
-+.IF "$(OS)" == "FREEBSD"
-+#bsd is preffered but epm does not produce valid packages atm
-+#FORMAT*=-format bsd
-+FORMAT*=-format portable
-+.ENDIF
-+
- # epm supports the following formats:
- # aix - AIX software distribution
- # bsd - FreeBSD, NetBSD, or OpenBSD software distribution
diff --git a/editors/openoffice.org-vcltesttool/files/patch-libxml2 b/editors/openoffice.org-vcltesttool/files/patch-libxml2
deleted file mode 100644
index b4d2aca8b1c5..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-libxml2
+++ /dev/null
@@ -1,61 +0,0 @@
-o version number of libxml2
-o http://www.openoffice.org/issues/show_bug.cgi?id=42393
-
-Index: libxml2-2.6.17.patch
-===================================================================
-RCS file: /cvs/external/libxml2/libxml2-2.6.17.patch,v
-retrieving revision 1.2
-diff -u -r1.2 libxml2-2.6.17.patch
---- libxml2/libxml2-2.6.17.patch.orig	4 Feb 2005 11:29:07 -0000	1.2
-+++ libxml2/libxml2-2.6.17.patch	12 Feb 2005 13:11:40 -0000
-@@ -1,5 +1,5 @@
--*** misc/libxml2-2.6.17/configure	2005-01-16 20:24:22.000000000 +0100
----- misc/build/libxml2-2.6.17/configure	2005-02-02 17:41:10.751412243 +0100
-+*** misc/libxml2-2.6.17/configure	Mon Jan 17 04:24:22 2005
-+--- misc/build/libxml2-2.6.17/configure	Sat Feb 12 22:08:54 2005
- ***************
- *** 26339,26347 ****
-   
-@@ -38,8 +38,8 @@
-   echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5
-   echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
-   if test $ac_cv_func_setsockopt = yes; then
--*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	2005-01-16 21:02:54.000000000 +0100
----- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	2005-02-02 17:39:50.923232015 +0100
-+*** misc/libxml2-2.6.17/include/libxml/xmlversion.h	Mon Jan 17 05:02:54 2005
-+--- misc/build/libxml2-2.6.17/include/libxml/xmlversion.h	Sat Feb 12 22:08:54 2005
- ***************
- *** 263,269 ****
-    *
-@@ -91,8 +91,29 @@
-   #define DEBUG_MEMORY_LOCATION
-   #endif
-   
--*** misc/libxml2-2.6.17/nanohttp.c	2005-01-04 15:49:47.000000000 +0100
----- misc/build/libxml2-2.6.17/nanohttp.c	2005-02-02 17:39:50.924231930 +0100
-+*** misc/libxml2-2.6.17/ltmain.sh	Mon Jan 17 05:02:25 2005
-+--- misc/build/libxml2-2.6.17/ltmain.sh	Sat Feb 12 22:10:00 2005
-+***************
-+*** 2999,3006 ****
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=".$current"
-+! 	  versuffix=".$current";
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+--- 2999,3006 ----
-+  	  ;;
-+  
-+  	freebsd-elf)
-+! 	  major=.`expr $current - $age`
-+! 	  versuffix="$major.$age.$revision"
-+  	  ;;
-+  
-+  	irix | nonstopux)
-+*** misc/libxml2-2.6.17/nanohttp.c	Tue Jan  4 23:49:47 2005
-+--- misc/build/libxml2-2.6.17/nanohttp.c	Sat Feb 12 22:08:54 2005
- ***************
- *** 248,254 ****
-   void
diff --git a/editors/openoffice.org-vcltesttool/files/patch-libxmlsec+xmlsec1-1.2.6.patch b/editors/openoffice.org-vcltesttool/files/patch-libxmlsec+xmlsec1-1.2.6.patch
new file mode 100644
index 000000000000..88ec6c234485
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-libxmlsec+xmlsec1-1.2.6.patch
@@ -0,0 +1,69 @@
+Index: libxmlsec/xmlsec1-1.2.6.patch
+===================================================================
+RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.6.patch,v
+retrieving revision 1.3
+diff -u -r1.3 xmlsec1-1.2.6.patch
+--- libxmlsec/xmlsec1-1.2.6.patch	29 Mar 2005 11:45:08 -0000	1.3
++++ libxmlsec/xmlsec1-1.2.6.patch	6 Apr 2005 04:46:13 -0000
+@@ -13957,3 +13957,61 @@
+   XMLSEC_NSS_ALIBS    	= smime3.lib ssl3.lib nss3.lib libnspr4_s.lib libplds4_s.lib libplc4_s.lib kernel32.lib user32.lib gdi32.lib
+   
+   XMLSEC_MSCRYPTO_SOLIBS  = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
++*** misc/xmlsec1-1.2.6/ltmain.sh	Thu Aug 26 15:00:15 2004
++--- misc/build/xmlsec1-1.2.6/ltmain.sh	Wed Apr  6 13:32:04 2005
++***************
++*** 2918,2929 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2918,2929 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2994,3006 ****
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=".$current"
++! 	  versuffix=".$current.$revision";
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2994,3006 ----
++  	  ;;
++  
++  	freebsd-aout)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-odk+configure.pl b/editors/openoffice.org-vcltesttool/files/patch-odk+configure.pl
deleted file mode 100644
index db196e368e6d..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-odk+configure.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-o gmake support
-o suggestion from Juegen Schmidt <Juergen.Schmidt@Sun.COM>
-
-http://www.openoffice.org/issues/show_bug.cgi?id=41142
-
-Index: odk/configure.pl
-===================================================================
-RCS file: /cvs/api/odk/configure.pl,v
-retrieving revision 1.8.4.10
-diff -u -r1.8.4.10 configure.pl
---- odk/configure.pl	11 Jan 2005 11:00:15 -0000	1.8.4.10
-+++ odk/configure.pl	23 Jan 2005 09:13:41 -0000
-@@ -43,7 +43,14 @@
- }
- 
- $main::OO_SDK_MAKE_HOME = "";
-+$main::OO_MAKE_NAME = "make";
-+if ( $main::operatingSystem eq "FreeBSD" )
-+{
-+    $main::OO_MAKE_NAME = "gmake";
-+    $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
-+} else {
- $main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
-+}
- $main::makeVersion = "3.79.1";
- $main::correctVersion = 0;
- 
-@@ -137,7 +144,7 @@
- # prepare GNU make path
- while ( (!$main::correctVersion) &&
- 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME" ))) )
- {
-     print " Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
-     $main::OO_SDK_MAKE_HOME = readStdIn();
-@@ -146,15 +153,16 @@
-     {
- 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
-     }
-+
-     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
--		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
-+		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME")) )
-     { 
- 		$main::OO_SDK_MAKE_HOME = "";
- 		print " Error: GNU make is required, please specify a GNU make tools directory.\n";
-     } else 
-     {
- 		#check version
--		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
-+		my $testVersion = `$OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME --version`;
- 		if ( $testVersion eq "")
- 		{
- 			print " Set the environment variable OO_SDK_MAKE_HOME to your GNU build tools directory.\n";
-@@ -165,7 +173,7 @@
- 			{
- 				$testVersion = $1;
- 			}
--			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/make", 1);
-+			$main::correctVersion = testVersion($main::makeVersion, $testVersion, "$main::OO_SDK_MAKE_HOME/$main::OO_MAKE_NAME", 1);
- 			if ( !$main::correctVersion )
- 			{
- 				print " The 'make' command found at '$main::OO_SDK_MAKE_HOME' has a wrong version\n";
diff --git a/editors/openoffice.org-vcltesttool/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl b/editors/openoffice.org-vcltesttool/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
new file mode 100644
index 000000000000..59b013e50010
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-offapi+com+sun+star+rendering+XParametricPolyPolygon2DFactory.idl
@@ -0,0 +1,25 @@
+Index: offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl
+===================================================================
+RCS file: /cvs/api/offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v
+retrieving revision 1.2
+diff -u -r1.2 XParametricPolyPolygon2DFactory.idl
+--- offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	10 Mar 2005 12:35:07 -0000	1.2
++++ offapi/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl	28 Mar 2005 08:34:51 -0000
+@@ -109,7 +109,7 @@
+ 		linearly between center and endColor via concentric ellipses
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		circular. If it's not 1, the gradient is elliptical, with the
+ 		special twist that the aspect ratio is maintained also for the
+ 		center color: the gradient will not collapse into a single
+@@ -124,7 +124,7 @@
+ 		linearly between center and endColor via rectangular boxes
+ 		around the center point. Note that the absolute size of the
+ 		rectangle given at this method does not matter, only it's
+-		aspect ratio: if this aspect ratio ís 1, the gradient is
++		aspect ratio: if this aspect ratio is 1, the gradient is
+ 		quadratic. If it's not 1, the gradient is rectangular, with
+ 		the special twist that the aspect ratio is maintained also for
+ 		the center color: the gradient will not collapse into a single
diff --git a/editors/openoffice.org-vcltesttool/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-vcltesttool/files/patch-portaudio+portaudio_v18_1.patch
new file mode 100644
index 000000000000..88317fafc354
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-portaudio+portaudio_v18_1.patch
@@ -0,0 +1,24 @@
+Index: portaudio/portaudio_v18_1.patch
+===================================================================
+RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
+retrieving revision 1.1
+diff -u -r1.1 portaudio_v18_1.patch
+--- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
++++ portaudio/portaudio_v18_1.patch	28 Mar 2005 06:55:37 -0000
+@@ -52,3 +52,16 @@
+   LIBINST = /usr/local/lib
+   
+   TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
++*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
++--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Mon Mar 28 15:45:37 2005
++***************
++*** 43,48 ****
++--- 43,50 ----
++  
++  #ifdef __linux__
++  #include <linux/soundcard.h>
+++ #elif defined (__FreeBSD__)
+++ #include <sys/soundcard.h>
++  #else
++  #include <machine/soundcard.h> /* JH20010905 */
++  #endif
diff --git a/editors/openoffice.org-vcltesttool/files/patch-project-xmlsecurity b/editors/openoffice.org-vcltesttool/files/patch-project-xmlsecurity
deleted file mode 100644
index b8dfc459e784..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-project-xmlsecurity
+++ /dev/null
@@ -1,45 +0,0 @@
-#iZ and CWS
-o http://www.openoffice.org/issues/show_bug.cgi?id=39958
-o http://www.openoffice.org/issues/show_bug.cgi?id=38417
-o xmlsec08
-
-Description
-o Not for integration, we should provide configure based one
-  Note: malloc.h is deprecated for FreeBSD.
-o use configure to produce config.h
-
-Index: libxmlsec/xmlsec1-1.2.4.patch
-===================================================================
-RCS file: /cvs/external/libxmlsec/xmlsec1-1.2.4.patch,v
-retrieving revision 1.7
-diff -u -r1.7 xmlsec1-1.2.4.patch
---- libxmlsec/xmlsec1-1.2.4.patch	9 Sep 2004 08:31:29 -0000	1.7
-+++ libxmlsec/xmlsec1-1.2.4.patch	3 Oct 2004 05:52:20 -0000
-@@ -83,7 +83,7 @@
- ! #undef HAVE_MACH_O_DYLD_H
- ! 
- ! /* Define to 1 if you have the <malloc.h> header file. */
--! #define HAVE_MALLOC_H 1
-+! #define HAVE_MALLOC_H 0
- ! 
- ! /* Define to 1 if you have the `memcpy' function. */
- ! #undef HAVE_MEMCPY
-
-
-Index: xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
-===================================================================
-RCS file: /cvs/xml/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 xmldocumentwrapper_xmlsecimpl.cxx
---- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	12 Jul 2004 13:15:21 -0000	1.1.1.1
-+++ xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx	4 Oct 2004 22:04:08 -0000
-@@ -68,7 +68,9 @@
- #include <xmloff/attrlist.hxx>
- #include "xmlelementwrapper_xmlsecimpl.hxx"
- 
-+#if !defined (FREEBSD)
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sndfile+libsndfile-1.0.9.patch b/editors/openoffice.org-vcltesttool/files/patch-sndfile+libsndfile-1.0.9.patch
new file mode 100644
index 000000000000..ee4d7e4d07d9
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-sndfile+libsndfile-1.0.9.patch
@@ -0,0 +1,59 @@
+Index: sndfile/libsndfile-1.0.9.patch
+===================================================================
+RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
+retrieving revision 1.1
+diff -u -r1.1 libsndfile-1.0.9.patch
+--- sndfile/libsndfile-1.0.9.patch	6 Oct 2004 11:49:36 -0000	1.1
++++ sndfile/libsndfile-1.0.9.patch	28 Mar 2005 07:59:15 -0000
+@@ -231,3 +231,51 @@
+   
+   #define SF_COUNT_MAX		0x7FFFFFFFFFFFFFFFLL
+   
++*** misc/libsndfile-1.0.9/ltmain.sh	Sat Mar 27 13:02:07 2004
++--- misc/build/libsndfile-1.0.9/ltmain.sh	Mon Mar 28 16:37:47 2005
++***************
++*** 2899,2910 ****
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  freebsd-aout|freebsd-elf|sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++--- 2899,2910 ----
++  	  # which has an extra 1 added just for fun
++  	  #
++  	  case $version_type in
++! 	  darwin|linux|osf|windows|freebsd-aout|freebsd-elf)
++  	    current=`expr $number_major + $number_minor`
++  	    age="$number_minor"
++  	    revision="$number_revision"
++  	    ;;
++! 	  sunos)
++  	    current="$number_major"
++  	    revision="$number_minor"
++  	    age="0"
++***************
++*** 2980,2987 ****
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=".$current"
++! 	  versuffix=".$current";
++  	  ;;
++  
++  	irix | nonstopux)
++--- 2980,2987 ----
++  	  ;;
++  
++  	freebsd-elf)
++! 	  major=.`expr $current - $age`
++! 	  versuffix="$major.$age.$revision"
++  	  ;;
++  
++  	irix | nonstopux)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sndfile+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-sndfile+makefile.mk
new file mode 100644
index 000000000000..df33e5cb4c25
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-sndfile+makefile.mk
@@ -0,0 +1,16 @@
+Index: sndfile/makefile.mk
+===================================================================
+RCS file: /cvs/external/sndfile/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- sndfile/makefile.mk	30 Mar 2005 08:52:06 -0000	1.5
++++ sndfile/makefile.mk	5 Apr 2005 01:23:46 -0000
+@@ -81,7 +81,7 @@
+ CONFIGURE_DIR=
+ 
+ CONFIGURE_ACTION=./configure --with-pic
+-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX"
++.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
+ CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+ .ENDIF
+ 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-vcl+util b/editors/openoffice.org-vcltesttool/files/patch-vcl+util
new file mode 100644
index 000000000000..2ebfdda8ce4c
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-vcl+util
@@ -0,0 +1,47 @@
+Get rid of -ldl for FREEBSD and MACOSX
+
+Index: vcl/util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.65
+diff -u -r1.65 makefile.mk
+--- vcl/util/makefile.mk	13 Jan 2005 18:16:05 -0000	1.65
++++ vcl/util/makefile.mk	7 Apr 2005 01:29:29 -0000
+@@ -252,10 +252,11 @@
+ 
+ .IF "$(GUI)"=="UNX"
+ 
+-.IF "$(OS)"=="MACOSX"
+-SHL1STDLIBS += -ldl
++.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
++SHL1STDLIBS+= -ldl
+ .ENDIF
+ 
++
+ .IF "$(GUIBASE)"=="aqua"
+ SHL1STDLIBS += -framework Cocoa
+ .ENDIF
+@@ -383,7 +384,11 @@
+ 
+ 
+ SHL4STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL4STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_GTK)" != ""
+ 
+ # KDE plugin
+@@ -396,7 +401,11 @@
+ # libs for KDE plugin
+ SHL5STDLIBS=$(KDE_LIBS)
+ SHL5STDLIBS+=-l$(SHL2TARGET)
++.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
++SHL5STDLIBS+=$(SHL3STDLIBS) -lX11
++.ELSE
+ SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl
++.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX"
+ .ENDIF # "$(ENABLE_KDE)" != ""
+ 
+ .ENDIF # UNX