Update to 1.9m82

36 files changed, 1080 insertions, 48 deletions

diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 85e78434000f..fdf884a0e930 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -18,7 +18,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=	20050225
+SNAPDATE=	20050302
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20050212.tar.gz
@@ -49,7 +49,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		81
+MILESTONE=		82
 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 f6fab7876351..01a84cd42616 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.9m81_source.tar.bz2) = 061e1e9dcd6aa94ba327b6f6f9feefb1
-SIZE (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 241690536
+MD5 (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 5beaa95c27d693353b574ae0553d5e68
+SIZE (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 241645781
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
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
new file mode 100644
index 000000000000..f1597ef75e84
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-curl-7.12.2.patch
@@ -0,0 +1,86 @@
+#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/Makefile b/editors/openoffice-3-devel/Makefile
index 85e78434000f..fdf884a0e930 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -18,7 +18,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=	20050225
+SNAPDATE=	20050302
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20050212.tar.gz
@@ -49,7 +49,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		81
+MILESTONE=		82
 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 f6fab7876351..01a84cd42616 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 061e1e9dcd6aa94ba327b6f6f9feefb1
-SIZE (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 241690536
+MD5 (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 5beaa95c27d693353b574ae0553d5e68
+SIZE (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 241645781
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
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
new file mode 100644
index 000000000000..f1597ef75e84
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-curl-7.12.2.patch
@@ -0,0 +1,86 @@
+#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/Makefile b/editors/openoffice-3/Makefile
index 85e78434000f..fdf884a0e930 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -18,7 +18,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=	20050225
+SNAPDATE=	20050302
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20050212.tar.gz
@@ -49,7 +49,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		81
+MILESTONE=		82
 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 f6fab7876351..01a84cd42616 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 061e1e9dcd6aa94ba327b6f6f9feefb1
-SIZE (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 241690536
+MD5 (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 5beaa95c27d693353b574ae0553d5e68
+SIZE (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 241645781
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
diff --git a/editors/openoffice-3/files/patch-curl-7.12.2.patch b/editors/openoffice-3/files/patch-curl-7.12.2.patch
new file mode 100644
index 000000000000..f1597ef75e84
--- /dev/null
+++ b/editors/openoffice-3/files/patch-curl-7.12.2.patch
@@ -0,0 +1,86 @@
+#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/Makefile b/editors/openoffice.org-2-RC/Makefile
index 85e78434000f..fdf884a0e930 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -18,7 +18,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=	20050225
+SNAPDATE=	20050302
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20050212.tar.gz
@@ -49,7 +49,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		81
+MILESTONE=		82
 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 f6fab7876351..01a84cd42616 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.9m81_source.tar.bz2) = 061e1e9dcd6aa94ba327b6f6f9feefb1
-SIZE (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 241690536
+MD5 (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 5beaa95c27d693353b574ae0553d5e68
+SIZE (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 241645781
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
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
new file mode 100644
index 000000000000..f1597ef75e84
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-curl-7.12.2.patch
@@ -0,0 +1,86 @@
+#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/Makefile b/editors/openoffice.org-2-devel/Makefile
index 85e78434000f..fdf884a0e930 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -18,7 +18,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=	20050225
+SNAPDATE=	20050302
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20050212.tar.gz
@@ -49,7 +49,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		81
+MILESTONE=		82
 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 f6fab7876351..01a84cd42616 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.9m81_source.tar.bz2) = 061e1e9dcd6aa94ba327b6f6f9feefb1
-SIZE (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 241690536
+MD5 (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 5beaa95c27d693353b574ae0553d5e68
+SIZE (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 241645781
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
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
new file mode 100644
index 000000000000..f1597ef75e84
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-curl-7.12.2.patch
@@ -0,0 +1,86 @@
+#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/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 85e78434000f..fdf884a0e930 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -18,7 +18,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=	20050225
+SNAPDATE=	20050302
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20050212.tar.gz
@@ -49,7 +49,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		81
+MILESTONE=		82
 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 f6fab7876351..01a84cd42616 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.9m81_source.tar.bz2) = 061e1e9dcd6aa94ba327b6f6f9feefb1
-SIZE (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 241690536
+MD5 (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 5beaa95c27d693353b574ae0553d5e68
+SIZE (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 241645781
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
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
new file mode 100644
index 000000000000..f1597ef75e84
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-curl-7.12.2.patch
@@ -0,0 +1,86 @@
+#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/Makefile b/editors/openoffice.org-2.0/Makefile
index 85e78434000f..fdf884a0e930 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -18,7 +18,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=	20050225
+SNAPDATE=	20050302
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20050212.tar.gz
@@ -49,7 +49,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		81
+MILESTONE=		82
 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 f6fab7876351..01a84cd42616 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.9m81_source.tar.bz2) = 061e1e9dcd6aa94ba327b6f6f9feefb1
-SIZE (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 241690536
+MD5 (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 5beaa95c27d693353b574ae0553d5e68
+SIZE (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 241645781
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
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
new file mode 100644
index 000000000000..f1597ef75e84
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-curl-7.12.2.patch
@@ -0,0 +1,86 @@
+#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/Makefile b/editors/openoffice.org-2/Makefile
index 85e78434000f..fdf884a0e930 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -18,7 +18,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=	20050225
+SNAPDATE=	20050302
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20050212.tar.gz
@@ -49,7 +49,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		81
+MILESTONE=		82
 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 f6fab7876351..01a84cd42616 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 061e1e9dcd6aa94ba327b6f6f9feefb1
-SIZE (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 241690536
+MD5 (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 5beaa95c27d693353b574ae0553d5e68
+SIZE (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 241645781
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
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
new file mode 100644
index 000000000000..f1597ef75e84
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-curl-7.12.2.patch
@@ -0,0 +1,86 @@
+#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/Makefile b/editors/openoffice.org-3-RC/Makefile
index 85e78434000f..fdf884a0e930 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -18,7 +18,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=	20050225
+SNAPDATE=	20050302
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20050212.tar.gz
@@ -49,7 +49,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		81
+MILESTONE=		82
 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 f6fab7876351..01a84cd42616 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.9m81_source.tar.bz2) = 061e1e9dcd6aa94ba327b6f6f9feefb1
-SIZE (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 241690536
+MD5 (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 5beaa95c27d693353b574ae0553d5e68
+SIZE (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 241645781
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
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
new file mode 100644
index 000000000000..f1597ef75e84
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-curl-7.12.2.patch
@@ -0,0 +1,86 @@
+#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/Makefile b/editors/openoffice.org-3-devel/Makefile
index 85e78434000f..fdf884a0e930 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -18,7 +18,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=	20050225
+SNAPDATE=	20050302
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20050212.tar.gz
@@ -49,7 +49,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		81
+MILESTONE=		82
 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 f6fab7876351..01a84cd42616 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.9m81_source.tar.bz2) = 061e1e9dcd6aa94ba327b6f6f9feefb1
-SIZE (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 241690536
+MD5 (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 5beaa95c27d693353b574ae0553d5e68
+SIZE (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 241645781
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
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
new file mode 100644
index 000000000000..f1597ef75e84
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-curl-7.12.2.patch
@@ -0,0 +1,86 @@
+#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/Makefile b/editors/openoffice.org-3/Makefile
index 85e78434000f..fdf884a0e930 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -18,7 +18,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=	20050225
+SNAPDATE=	20050302
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20050212.tar.gz
@@ -49,7 +49,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		81
+MILESTONE=		82
 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 f6fab7876351..01a84cd42616 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 061e1e9dcd6aa94ba327b6f6f9feefb1
-SIZE (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 241690536
+MD5 (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 5beaa95c27d693353b574ae0553d5e68
+SIZE (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 241645781
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
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
new file mode 100644
index 000000000000..f1597ef75e84
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-curl-7.12.2.patch
@@ -0,0 +1,86 @@
+#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/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 85e78434000f..fdf884a0e930 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -18,7 +18,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=	20050225
+SNAPDATE=	20050302
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20050212.tar.gz
@@ -49,7 +49,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		81
+MILESTONE=		82
 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 f6fab7876351..01a84cd42616 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 061e1e9dcd6aa94ba327b6f6f9feefb1
-SIZE (openoffice.org2.0/OOo_1.9m81_source.tar.bz2) = 241690536
+MD5 (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 5beaa95c27d693353b574ae0553d5e68
+SIZE (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 241645781
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
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
new file mode 100644
index 000000000000..f1597ef75e84
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-curl-7.12.2.patch
@@ -0,0 +1,86 @@
+#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"
++  	  ;;