Update to 1.9m85

36 files changed, 216 insertions, 48 deletions

diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 9a6a78b588d4..ad6dc4fa8749 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=	20050307
+SNAPDATE=	20050310
 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=		84
+MILESTONE=		85
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index 762f36b369cc..5831691b8684 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.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
-SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
+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/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-config_office+configure.in b/editors/openoffice-2.0-devel/files/patch-config_office+configure.in
new file mode 100644
index 000000000000..20602d3402a6
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-config_office+configure.in
@@ -0,0 +1,14 @@
+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/Makefile b/editors/openoffice-3-devel/Makefile
index 9a6a78b588d4..ad6dc4fa8749 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=	20050307
+SNAPDATE=	20050310
 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=		84
+MILESTONE=		85
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index 762f36b369cc..5831691b8684 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
-SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
+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/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-config_office+configure.in b/editors/openoffice-3-devel/files/patch-config_office+configure.in
new file mode 100644
index 000000000000..20602d3402a6
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-config_office+configure.in
@@ -0,0 +1,14 @@
+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/Makefile b/editors/openoffice-3/Makefile
index 9a6a78b588d4..ad6dc4fa8749 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=	20050307
+SNAPDATE=	20050310
 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=		84
+MILESTONE=		85
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 762f36b369cc..5831691b8684 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
-SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
+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/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-config_office+configure.in b/editors/openoffice-3/files/patch-config_office+configure.in
new file mode 100644
index 000000000000..20602d3402a6
--- /dev/null
+++ b/editors/openoffice-3/files/patch-config_office+configure.in
@@ -0,0 +1,14 @@
+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/Makefile b/editors/openoffice.org-2-RC/Makefile
index 9a6a78b588d4..ad6dc4fa8749 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=	20050307
+SNAPDATE=	20050310
 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=		84
+MILESTONE=		85
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 762f36b369cc..5831691b8684 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.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
-SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
+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/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-config_office+configure.in b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
new file mode 100644
index 000000000000..20602d3402a6
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
@@ -0,0 +1,14 @@
+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/Makefile b/editors/openoffice.org-2-devel/Makefile
index 9a6a78b588d4..ad6dc4fa8749 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=	20050307
+SNAPDATE=	20050310
 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=		84
+MILESTONE=		85
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index 762f36b369cc..5831691b8684 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.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
-SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
+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/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-config_office+configure.in b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
new file mode 100644
index 000000000000..20602d3402a6
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
@@ -0,0 +1,14 @@
+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/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 9a6a78b588d4..ad6dc4fa8749 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=	20050307
+SNAPDATE=	20050310
 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=		84
+MILESTONE=		85
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index 762f36b369cc..5831691b8684 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.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
-SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
+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/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-config_office+configure.in b/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in
new file mode 100644
index 000000000000..20602d3402a6
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in
@@ -0,0 +1,14 @@
+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/Makefile b/editors/openoffice.org-2.0/Makefile
index 9a6a78b588d4..ad6dc4fa8749 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=	20050307
+SNAPDATE=	20050310
 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=		84
+MILESTONE=		85
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 762f36b369cc..5831691b8684 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.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
-SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
+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/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-config_office+configure.in b/editors/openoffice.org-2.0/files/patch-config_office+configure.in
new file mode 100644
index 000000000000..20602d3402a6
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-config_office+configure.in
@@ -0,0 +1,14 @@
+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/Makefile b/editors/openoffice.org-2/Makefile
index 9a6a78b588d4..ad6dc4fa8749 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=	20050307
+SNAPDATE=	20050310
 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=		84
+MILESTONE=		85
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 762f36b369cc..5831691b8684 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
-SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
+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/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-config_office+configure.in b/editors/openoffice.org-2/files/patch-config_office+configure.in
new file mode 100644
index 000000000000..20602d3402a6
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-config_office+configure.in
@@ -0,0 +1,14 @@
+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/Makefile b/editors/openoffice.org-3-RC/Makefile
index 9a6a78b588d4..ad6dc4fa8749 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=	20050307
+SNAPDATE=	20050310
 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=		84
+MILESTONE=		85
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 762f36b369cc..5831691b8684 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.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
-SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
+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/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-config_office+configure.in b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
new file mode 100644
index 000000000000..20602d3402a6
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
@@ -0,0 +1,14 @@
+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/Makefile b/editors/openoffice.org-3-devel/Makefile
index 9a6a78b588d4..ad6dc4fa8749 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=	20050307
+SNAPDATE=	20050310
 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=		84
+MILESTONE=		85
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index 762f36b369cc..5831691b8684 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.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
-SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
+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/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-config_office+configure.in b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in
new file mode 100644
index 000000000000..20602d3402a6
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in
@@ -0,0 +1,14 @@
+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/Makefile b/editors/openoffice.org-3/Makefile
index 9a6a78b588d4..ad6dc4fa8749 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=	20050307
+SNAPDATE=	20050310
 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=		84
+MILESTONE=		85
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 762f36b369cc..5831691b8684 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
-SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
+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/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-config_office+configure.in b/editors/openoffice.org-3/files/patch-config_office+configure.in
new file mode 100644
index 000000000000..20602d3402a6
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-config_office+configure.in
@@ -0,0 +1,14 @@
+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/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 9a6a78b588d4..ad6dc4fa8749 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=	20050307
+SNAPDATE=	20050310
 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=		84
+MILESTONE=		85
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index 762f36b369cc..5831691b8684 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 376603236315a85135b000b3cf8c7b44
-SIZE (openoffice.org2.0/OOo_1.9m84_source.tar.bz2) = 243553690
+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/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-config_office+configure.in b/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in
new file mode 100644
index 000000000000..20602d3402a6
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in
@@ -0,0 +1,14 @@
+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