Update to 2.0RC3

30 files changed, 138 insertions, 252 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 86dda1c3b4cf..bc3dd0bad1a7 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	openoffice.org
-PORTVERSION=	2.0.RC1
+PORTVERSION=	2.0.RC3
 CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+=	OOo_2.0RC1_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_2.0RC1_source.tar.bz2
+DISTFILES+=	OOo_2.0RC3_source.tar.bz2 gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_2.0RC3_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 9a826c6e705c..31cbc7e40909 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0RC1_source.tar.bz2) = 8ac07e6d1d11476144afc6542bb50191
-SIZE (openoffice.org2.0/OOo_2.0RC1_source.tar.bz2) = 228689468
+MD5 (openoffice.org2.0/OOo_2.0RC3_source.tar.bz2) = c0271f4130ddabd7f61411d6a5601b8b
+SIZE (openoffice.org2.0/OOo_2.0RC3_source.tar.bz2) = 228730417
 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/fbsd4-workaroundpatch b/editors/openoffice-3/files/fbsd4-workaroundpatch
index 414bb86c38b4..d69388828582 100644
--- a/editors/openoffice-3/files/fbsd4-workaroundpatch
+++ b/editors/openoffice-3/files/fbsd4-workaroundpatch
@@ -40,33 +40,3 @@ diff -u -r1.5 makefile.mk
  
  SHL1STDLIBS= \
  	$(BFXMLOFFLIB) \
-#########################################################################
-Issutracker : #i52984#, #i54178#
-CWS         : N/A
-Author:     : <yury_tarasievich@yahoo.com> <yury_t@openoffice.org> (JCA)
-Description :
-Workaround for FreeBSD4. For rsc/rscpp,  -pthread is ignored although it is
-specifled, so specified twice. it does solve the probem. this is redundant
-for other FreeBSDs, I believe it is safe. otherwise rsc bombs like:
-libstlport_gcc.so which claims `Undefined symbol "pthread_mutex_lock"'.
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.17
-diff -u -r1.17 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	18 Aug 2005 12:04:47 -0000	1.17
-+++ solenv/inc/unxfbsdi.mk	3 Sep 2005 11:10:07 -0000
-@@ -217,8 +217,10 @@
- 
- LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
- 
--LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
--LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+# Workaround for FreeBSD4. In some case $(PTHREAD_LIBS), namely -pthread
-+# is ignored although it is specifled. This is redundant for other FreeBSDs.
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
- 
- #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
- 
diff --git a/editors/openoffice-3/files/patch-rsc+source+rscpp+makefile.mk b/editors/openoffice-3/files/patch-rsc+source+rscpp+makefile.mk
new file mode 100644
index 000000000000..713232e42a70
--- /dev/null
+++ b/editors/openoffice-3/files/patch-rsc+source+rscpp+makefile.mk
@@ -0,0 +1,18 @@
+#i54178#
+
+Index: rsc/source/rscpp/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- rsc/source/rscpp/makefile.mk	8 Sep 2005 14:00:27 -0000	1.5
++++ rsc/source/rscpp/makefile.mk	21 Sep 2005 10:18:09 -0000
+@@ -36,6 +36,8 @@
+ 
+ TARGETTYPE=CUI
+ TARGETTHREAD=ST
++# we don't need STL in this project
++NO_DEFAULT_STL=TRUE
+ 
+ PRJNAME=rsc
+ TARGET=rscpp
diff --git a/editors/openoffice-3/files/pkg-message.in b/editors/openoffice-3/files/pkg-message.in
index 48be938db95f..575013dd3dd9 100644
--- a/editors/openoffice-3/files/pkg-message.in
+++ b/editors/openoffice-3/files/pkg-message.in
@@ -41,10 +41,3 @@ If you somehow run into problems, please remove the already installed
 ".openoffice.org2" dir in your homedir. Redo the user
 installation and the problems should go away.
 
-4. Known issue
---------------------------------------------------
-If you invoke English version of OOo setting LANG as C or not
-setting LANG environment,
-`I18N: Operating system doesn't support locale "en_US"'
-in this case you should set LANG as en_US.ISO8859-15
-or en_US.ISO8859-1.
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 86dda1c3b4cf..bc3dd0bad1a7 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	openoffice.org
-PORTVERSION=	2.0.RC1
+PORTVERSION=	2.0.RC3
 CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+=	OOo_2.0RC1_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_2.0RC1_source.tar.bz2
+DISTFILES+=	OOo_2.0RC3_source.tar.bz2 gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_2.0RC3_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 9a826c6e705c..31cbc7e40909 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0RC1_source.tar.bz2) = 8ac07e6d1d11476144afc6542bb50191
-SIZE (openoffice.org2.0/OOo_2.0RC1_source.tar.bz2) = 228689468
+MD5 (openoffice.org2.0/OOo_2.0RC3_source.tar.bz2) = c0271f4130ddabd7f61411d6a5601b8b
+SIZE (openoffice.org2.0/OOo_2.0RC3_source.tar.bz2) = 228730417
 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/fbsd4-workaroundpatch b/editors/openoffice.org-2-RC/files/fbsd4-workaroundpatch
index 414bb86c38b4..d69388828582 100644
--- a/editors/openoffice.org-2-RC/files/fbsd4-workaroundpatch
+++ b/editors/openoffice.org-2-RC/files/fbsd4-workaroundpatch
@@ -40,33 +40,3 @@ diff -u -r1.5 makefile.mk
  
  SHL1STDLIBS= \
  	$(BFXMLOFFLIB) \
-#########################################################################
-Issutracker : #i52984#, #i54178#
-CWS         : N/A
-Author:     : <yury_tarasievich@yahoo.com> <yury_t@openoffice.org> (JCA)
-Description :
-Workaround for FreeBSD4. For rsc/rscpp,  -pthread is ignored although it is
-specifled, so specified twice. it does solve the probem. this is redundant
-for other FreeBSDs, I believe it is safe. otherwise rsc bombs like:
-libstlport_gcc.so which claims `Undefined symbol "pthread_mutex_lock"'.
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.17
-diff -u -r1.17 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	18 Aug 2005 12:04:47 -0000	1.17
-+++ solenv/inc/unxfbsdi.mk	3 Sep 2005 11:10:07 -0000
-@@ -217,8 +217,10 @@
- 
- LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
- 
--LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
--LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+# Workaround for FreeBSD4. In some case $(PTHREAD_LIBS), namely -pthread
-+# is ignored although it is specifled. This is redundant for other FreeBSDs.
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
- 
- #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
- 
diff --git a/editors/openoffice.org-2-RC/files/patch-rsc+source+rscpp+makefile.mk b/editors/openoffice.org-2-RC/files/patch-rsc+source+rscpp+makefile.mk
new file mode 100644
index 000000000000..713232e42a70
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-rsc+source+rscpp+makefile.mk
@@ -0,0 +1,18 @@
+#i54178#
+
+Index: rsc/source/rscpp/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- rsc/source/rscpp/makefile.mk	8 Sep 2005 14:00:27 -0000	1.5
++++ rsc/source/rscpp/makefile.mk	21 Sep 2005 10:18:09 -0000
+@@ -36,6 +36,8 @@
+ 
+ TARGETTYPE=CUI
+ TARGETTHREAD=ST
++# we don't need STL in this project
++NO_DEFAULT_STL=TRUE
+ 
+ PRJNAME=rsc
+ TARGET=rscpp
diff --git a/editors/openoffice.org-2-RC/files/pkg-message.in b/editors/openoffice.org-2-RC/files/pkg-message.in
index 48be938db95f..575013dd3dd9 100644
--- a/editors/openoffice.org-2-RC/files/pkg-message.in
+++ b/editors/openoffice.org-2-RC/files/pkg-message.in
@@ -41,10 +41,3 @@ If you somehow run into problems, please remove the already installed
 ".openoffice.org2" dir in your homedir. Redo the user
 installation and the problems should go away.
 
-4. Known issue
---------------------------------------------------
-If you invoke English version of OOo setting LANG as C or not
-setting LANG environment,
-`I18N: Operating system doesn't support locale "en_US"'
-in this case you should set LANG as en_US.ISO8859-15
-or en_US.ISO8859-1.
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 86dda1c3b4cf..bc3dd0bad1a7 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	openoffice.org
-PORTVERSION=	2.0.RC1
+PORTVERSION=	2.0.RC3
 CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+=	OOo_2.0RC1_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_2.0RC1_source.tar.bz2
+DISTFILES+=	OOo_2.0RC3_source.tar.bz2 gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_2.0RC3_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 9a826c6e705c..31cbc7e40909 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0RC1_source.tar.bz2) = 8ac07e6d1d11476144afc6542bb50191
-SIZE (openoffice.org2.0/OOo_2.0RC1_source.tar.bz2) = 228689468
+MD5 (openoffice.org2.0/OOo_2.0RC3_source.tar.bz2) = c0271f4130ddabd7f61411d6a5601b8b
+SIZE (openoffice.org2.0/OOo_2.0RC3_source.tar.bz2) = 228730417
 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/fbsd4-workaroundpatch b/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch
index 414bb86c38b4..d69388828582 100644
--- a/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch
+++ b/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch
@@ -40,33 +40,3 @@ diff -u -r1.5 makefile.mk
  
  SHL1STDLIBS= \
  	$(BFXMLOFFLIB) \
-#########################################################################
-Issutracker : #i52984#, #i54178#
-CWS         : N/A
-Author:     : <yury_tarasievich@yahoo.com> <yury_t@openoffice.org> (JCA)
-Description :
-Workaround for FreeBSD4. For rsc/rscpp,  -pthread is ignored although it is
-specifled, so specified twice. it does solve the probem. this is redundant
-for other FreeBSDs, I believe it is safe. otherwise rsc bombs like:
-libstlport_gcc.so which claims `Undefined symbol "pthread_mutex_lock"'.
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.17
-diff -u -r1.17 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	18 Aug 2005 12:04:47 -0000	1.17
-+++ solenv/inc/unxfbsdi.mk	3 Sep 2005 11:10:07 -0000
-@@ -217,8 +217,10 @@
- 
- LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
- 
--LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
--LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+# Workaround for FreeBSD4. In some case $(PTHREAD_LIBS), namely -pthread
-+# is ignored although it is specifled. This is redundant for other FreeBSDs.
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
- 
- #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
- 
diff --git a/editors/openoffice.org-2.0/files/patch-rsc+source+rscpp+makefile.mk b/editors/openoffice.org-2.0/files/patch-rsc+source+rscpp+makefile.mk
new file mode 100644
index 000000000000..713232e42a70
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-rsc+source+rscpp+makefile.mk
@@ -0,0 +1,18 @@
+#i54178#
+
+Index: rsc/source/rscpp/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- rsc/source/rscpp/makefile.mk	8 Sep 2005 14:00:27 -0000	1.5
++++ rsc/source/rscpp/makefile.mk	21 Sep 2005 10:18:09 -0000
+@@ -36,6 +36,8 @@
+ 
+ TARGETTYPE=CUI
+ TARGETTHREAD=ST
++# we don't need STL in this project
++NO_DEFAULT_STL=TRUE
+ 
+ PRJNAME=rsc
+ TARGET=rscpp
diff --git a/editors/openoffice.org-2.0/files/pkg-message.in b/editors/openoffice.org-2.0/files/pkg-message.in
index 48be938db95f..575013dd3dd9 100644
--- a/editors/openoffice.org-2.0/files/pkg-message.in
+++ b/editors/openoffice.org-2.0/files/pkg-message.in
@@ -41,10 +41,3 @@ If you somehow run into problems, please remove the already installed
 ".openoffice.org2" dir in your homedir. Redo the user
 installation and the problems should go away.
 
-4. Known issue
---------------------------------------------------
-If you invoke English version of OOo setting LANG as C or not
-setting LANG environment,
-`I18N: Operating system doesn't support locale "en_US"'
-in this case you should set LANG as en_US.ISO8859-15
-or en_US.ISO8859-1.
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 86dda1c3b4cf..bc3dd0bad1a7 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	openoffice.org
-PORTVERSION=	2.0.RC1
+PORTVERSION=	2.0.RC3
 CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+=	OOo_2.0RC1_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_2.0RC1_source.tar.bz2
+DISTFILES+=	OOo_2.0RC3_source.tar.bz2 gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_2.0RC3_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index 9a826c6e705c..31cbc7e40909 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0RC1_source.tar.bz2) = 8ac07e6d1d11476144afc6542bb50191
-SIZE (openoffice.org2.0/OOo_2.0RC1_source.tar.bz2) = 228689468
+MD5 (openoffice.org2.0/OOo_2.0RC3_source.tar.bz2) = c0271f4130ddabd7f61411d6a5601b8b
+SIZE (openoffice.org2.0/OOo_2.0RC3_source.tar.bz2) = 228730417
 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/fbsd4-workaroundpatch b/editors/openoffice.org-2/files/fbsd4-workaroundpatch
index 414bb86c38b4..d69388828582 100644
--- a/editors/openoffice.org-2/files/fbsd4-workaroundpatch
+++ b/editors/openoffice.org-2/files/fbsd4-workaroundpatch
@@ -40,33 +40,3 @@ diff -u -r1.5 makefile.mk
  
  SHL1STDLIBS= \
  	$(BFXMLOFFLIB) \
-#########################################################################
-Issutracker : #i52984#, #i54178#
-CWS         : N/A
-Author:     : <yury_tarasievich@yahoo.com> <yury_t@openoffice.org> (JCA)
-Description :
-Workaround for FreeBSD4. For rsc/rscpp,  -pthread is ignored although it is
-specifled, so specified twice. it does solve the probem. this is redundant
-for other FreeBSDs, I believe it is safe. otherwise rsc bombs like:
-libstlport_gcc.so which claims `Undefined symbol "pthread_mutex_lock"'.
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.17
-diff -u -r1.17 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	18 Aug 2005 12:04:47 -0000	1.17
-+++ solenv/inc/unxfbsdi.mk	3 Sep 2005 11:10:07 -0000
-@@ -217,8 +217,10 @@
- 
- LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
- 
--LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
--LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+# Workaround for FreeBSD4. In some case $(PTHREAD_LIBS), namely -pthread
-+# is ignored although it is specifled. This is redundant for other FreeBSDs.
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
- 
- #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
- 
diff --git a/editors/openoffice.org-2/files/patch-rsc+source+rscpp+makefile.mk b/editors/openoffice.org-2/files/patch-rsc+source+rscpp+makefile.mk
new file mode 100644
index 000000000000..713232e42a70
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-rsc+source+rscpp+makefile.mk
@@ -0,0 +1,18 @@
+#i54178#
+
+Index: rsc/source/rscpp/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- rsc/source/rscpp/makefile.mk	8 Sep 2005 14:00:27 -0000	1.5
++++ rsc/source/rscpp/makefile.mk	21 Sep 2005 10:18:09 -0000
+@@ -36,6 +36,8 @@
+ 
+ TARGETTYPE=CUI
+ TARGETTHREAD=ST
++# we don't need STL in this project
++NO_DEFAULT_STL=TRUE
+ 
+ PRJNAME=rsc
+ TARGET=rscpp
diff --git a/editors/openoffice.org-2/files/pkg-message.in b/editors/openoffice.org-2/files/pkg-message.in
index 48be938db95f..575013dd3dd9 100644
--- a/editors/openoffice.org-2/files/pkg-message.in
+++ b/editors/openoffice.org-2/files/pkg-message.in
@@ -41,10 +41,3 @@ If you somehow run into problems, please remove the already installed
 ".openoffice.org2" dir in your homedir. Redo the user
 installation and the problems should go away.
 
-4. Known issue
---------------------------------------------------
-If you invoke English version of OOo setting LANG as C or not
-setting LANG environment,
-`I18N: Operating system doesn't support locale "en_US"'
-in this case you should set LANG as en_US.ISO8859-15
-or en_US.ISO8859-1.
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 86dda1c3b4cf..bc3dd0bad1a7 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	openoffice.org
-PORTVERSION=	2.0.RC1
+PORTVERSION=	2.0.RC3
 CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+=	OOo_2.0RC1_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_2.0RC1_source.tar.bz2
+DISTFILES+=	OOo_2.0RC3_source.tar.bz2 gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_2.0RC3_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 9a826c6e705c..31cbc7e40909 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0RC1_source.tar.bz2) = 8ac07e6d1d11476144afc6542bb50191
-SIZE (openoffice.org2.0/OOo_2.0RC1_source.tar.bz2) = 228689468
+MD5 (openoffice.org2.0/OOo_2.0RC3_source.tar.bz2) = c0271f4130ddabd7f61411d6a5601b8b
+SIZE (openoffice.org2.0/OOo_2.0RC3_source.tar.bz2) = 228730417
 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/fbsd4-workaroundpatch b/editors/openoffice.org-3-RC/files/fbsd4-workaroundpatch
index 414bb86c38b4..d69388828582 100644
--- a/editors/openoffice.org-3-RC/files/fbsd4-workaroundpatch
+++ b/editors/openoffice.org-3-RC/files/fbsd4-workaroundpatch
@@ -40,33 +40,3 @@ diff -u -r1.5 makefile.mk
  
  SHL1STDLIBS= \
  	$(BFXMLOFFLIB) \
-#########################################################################
-Issutracker : #i52984#, #i54178#
-CWS         : N/A
-Author:     : <yury_tarasievich@yahoo.com> <yury_t@openoffice.org> (JCA)
-Description :
-Workaround for FreeBSD4. For rsc/rscpp,  -pthread is ignored although it is
-specifled, so specified twice. it does solve the probem. this is redundant
-for other FreeBSDs, I believe it is safe. otherwise rsc bombs like:
-libstlport_gcc.so which claims `Undefined symbol "pthread_mutex_lock"'.
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.17
-diff -u -r1.17 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	18 Aug 2005 12:04:47 -0000	1.17
-+++ solenv/inc/unxfbsdi.mk	3 Sep 2005 11:10:07 -0000
-@@ -217,8 +217,10 @@
- 
- LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
- 
--LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
--LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+# Workaround for FreeBSD4. In some case $(PTHREAD_LIBS), namely -pthread
-+# is ignored although it is specifled. This is redundant for other FreeBSDs.
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
- 
- #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
- 
diff --git a/editors/openoffice.org-3-RC/files/patch-rsc+source+rscpp+makefile.mk b/editors/openoffice.org-3-RC/files/patch-rsc+source+rscpp+makefile.mk
new file mode 100644
index 000000000000..713232e42a70
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-rsc+source+rscpp+makefile.mk
@@ -0,0 +1,18 @@
+#i54178#
+
+Index: rsc/source/rscpp/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- rsc/source/rscpp/makefile.mk	8 Sep 2005 14:00:27 -0000	1.5
++++ rsc/source/rscpp/makefile.mk	21 Sep 2005 10:18:09 -0000
+@@ -36,6 +36,8 @@
+ 
+ TARGETTYPE=CUI
+ TARGETTHREAD=ST
++# we don't need STL in this project
++NO_DEFAULT_STL=TRUE
+ 
+ PRJNAME=rsc
+ TARGET=rscpp
diff --git a/editors/openoffice.org-3-RC/files/pkg-message.in b/editors/openoffice.org-3-RC/files/pkg-message.in
index 48be938db95f..575013dd3dd9 100644
--- a/editors/openoffice.org-3-RC/files/pkg-message.in
+++ b/editors/openoffice.org-3-RC/files/pkg-message.in
@@ -41,10 +41,3 @@ If you somehow run into problems, please remove the already installed
 ".openoffice.org2" dir in your homedir. Redo the user
 installation and the problems should go away.
 
-4. Known issue
---------------------------------------------------
-If you invoke English version of OOo setting LANG as C or not
-setting LANG environment,
-`I18N: Operating system doesn't support locale "en_US"'
-in this case you should set LANG as en_US.ISO8859-15
-or en_US.ISO8859-1.
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 86dda1c3b4cf..bc3dd0bad1a7 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	openoffice.org
-PORTVERSION=	2.0.RC1
+PORTVERSION=	2.0.RC3
 CATEGORIES+=	editors
 MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
 		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
-DISTFILES+=	OOo_2.0RC1_source.tar.bz2 gpc231.tar.Z:gpc
-EXTRACT_ONLY=	OOo_2.0RC1_source.tar.bz2
+DISTFILES+=	OOo_2.0RC3_source.tar.bz2 gpc231.tar.Z:gpc
+EXTRACT_ONLY=	OOo_2.0RC3_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 9a826c6e705c..31cbc7e40909 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_2.0RC1_source.tar.bz2) = 8ac07e6d1d11476144afc6542bb50191
-SIZE (openoffice.org2.0/OOo_2.0RC1_source.tar.bz2) = 228689468
+MD5 (openoffice.org2.0/OOo_2.0RC3_source.tar.bz2) = c0271f4130ddabd7f61411d6a5601b8b
+SIZE (openoffice.org2.0/OOo_2.0RC3_source.tar.bz2) = 228730417
 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/fbsd4-workaroundpatch b/editors/openoffice.org-3/files/fbsd4-workaroundpatch
index 414bb86c38b4..d69388828582 100644
--- a/editors/openoffice.org-3/files/fbsd4-workaroundpatch
+++ b/editors/openoffice.org-3/files/fbsd4-workaroundpatch
@@ -40,33 +40,3 @@ diff -u -r1.5 makefile.mk
  
  SHL1STDLIBS= \
  	$(BFXMLOFFLIB) \
-#########################################################################
-Issutracker : #i52984#, #i54178#
-CWS         : N/A
-Author:     : <yury_tarasievich@yahoo.com> <yury_t@openoffice.org> (JCA)
-Description :
-Workaround for FreeBSD4. For rsc/rscpp,  -pthread is ignored although it is
-specifled, so specified twice. it does solve the probem. this is redundant
-for other FreeBSDs, I believe it is safe. otherwise rsc bombs like:
-libstlport_gcc.so which claims `Undefined symbol "pthread_mutex_lock"'.
-
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.17
-diff -u -r1.17 unxfbsdi.mk
---- solenv/inc/unxfbsdi.mk	18 Aug 2005 12:04:47 -0000	1.17
-+++ solenv/inc/unxfbsdi.mk	3 Sep 2005 11:10:07 -0000
-@@ -217,8 +217,10 @@
- 
- LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
- 
--LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
--LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+# Workaround for FreeBSD4. In some case $(PTHREAD_LIBS), namely -pthread
-+# is ignored although it is specifled. This is redundant for other FreeBSDs.
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS)
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS)
- 
- #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
- 
diff --git a/editors/openoffice.org-3/files/patch-rsc+source+rscpp+makefile.mk b/editors/openoffice.org-3/files/patch-rsc+source+rscpp+makefile.mk
new file mode 100644
index 000000000000..713232e42a70
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-rsc+source+rscpp+makefile.mk
@@ -0,0 +1,18 @@
+#i54178#
+
+Index: rsc/source/rscpp/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v
+retrieving revision 1.5
+diff -u -r1.5 makefile.mk
+--- rsc/source/rscpp/makefile.mk	8 Sep 2005 14:00:27 -0000	1.5
++++ rsc/source/rscpp/makefile.mk	21 Sep 2005 10:18:09 -0000
+@@ -36,6 +36,8 @@
+ 
+ TARGETTYPE=CUI
+ TARGETTHREAD=ST
++# we don't need STL in this project
++NO_DEFAULT_STL=TRUE
+ 
+ PRJNAME=rsc
+ TARGET=rscpp
diff --git a/editors/openoffice.org-3/files/pkg-message.in b/editors/openoffice.org-3/files/pkg-message.in
index 48be938db95f..575013dd3dd9 100644
--- a/editors/openoffice.org-3/files/pkg-message.in
+++ b/editors/openoffice.org-3/files/pkg-message.in
@@ -41,10 +41,3 @@ If you somehow run into problems, please remove the already installed
 ".openoffice.org2" dir in your homedir. Redo the user
 installation and the problems should go away.
 
-4. Known issue
---------------------------------------------------
-If you invoke English version of OOo setting LANG as C or not
-setting LANG environment,
-`I18N: Operating system doesn't support locale "en_US"'
-in this case you should set LANG as en_US.ISO8859-15
-or en_US.ISO8859-1.