Update to 1.9m74s1

48 files changed, 240 insertions, 552 deletions

diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index e88baf549b5f..2647d8119583 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -19,7 +19,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=	20050127
+SNAPDATE=	20050128
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.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=		74
+MILESTONE=		74s1
 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 f637f04c2868..741e66858cb0 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.9m74_source.tar.bz2) = 87572abefbadc17c92a9a3287461d330
-SIZE (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 233587154
+MD5 (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = be0be2491c523cc1d453505b433a8f6a
+SIZE (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = 234587338
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
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
index ff953c9a2cc7..a1aeeef73064 100644
--- a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in
+++ b/editors/openoffice-2.0-devel/files/patch-config_office+configure.in
@@ -1,44 +1,18 @@
-#iZ and CWS data
-o http://www.openoffice.org/issues/show_bug.cgi?id=40176
-  http://www.openoffice.org/issues/show_bug.cgi?id=40226
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4
-o configure4
-
-Description
-o Correct PTHREAD_CFLAGS, PTHREAD_LIBS
-o CUPS support via --enable-cups
-
+o http://www.openoffice.org/issues/show_bug.cgi?id=41516
+o configuretypofix
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.82
-diff -u -r1.82 configure.in
---- config_office/configure.in	5 Jan 2005 12:09:48 -0000	1.82
-+++ config_office/configure.in	9 Jan 2005 10:36:08 -0000
-@@ -449,7 +449,7 @@
- 		test_x=yes
- 		test_gtk=yes
-       test_kde=yes
--      test_cups=no
-+      test_cups=yes
- 		AC_MSG_CHECKING([the FreeBSD operating system release])
- 		if test -n "$with_os_version"; then
- 			OSVERSION="$with_os_version"
-@@ -457,13 +457,15 @@
- 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
- 		fi
- 		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
--		PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 		if test "$OSVERSION" -lt "500016"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-pthread"
- 		elif test "$OSVERSION" -lt "502102"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-lc_r"
- 		else 
--			PTHREAD_LIBS="-lpthread"
-+			PTHREAD_CFLAGS=""
-+			PTHREAD_LIBS="-pthread"
- 		fi
- 		;;
- 	"OSF1")
+retrieving revision 1.87
+diff -u -r1.87 configure.in
+--- config_office/configure.in	25 Jan 2005 16:54:53 -0000	1.87
++++ config_office/configure.in	28 Jan 2005 09:26:37 -0000
+@@ -2408,7 +2408,7 @@
+    fi
+ 
+    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
+-   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/deV/null; then
++   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+ 	AC_MSG_RESULT([yes])
+    else
+   	AC_MSG_ERROR([no, GNU patch needed. install or specifiy with --with-gnu-patch=/path/to/it])
diff --git a/editors/openoffice-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
index 4385f524d262..f77e24a3a1bf 100644
--- a/editors/openoffice-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
+++ b/editors/openoffice-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -1,6 +1,6 @@
 IZ and CWS
 o http://www.openoffice.org/issues/show_bug.cgi?id=41006
-o CWS (not yet)
+o CWS sdksample
 
 offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 
 contains an illigal char
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index e88baf549b5f..2647d8119583 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -19,7 +19,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=	20050127
+SNAPDATE=	20050128
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.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=		74
+MILESTONE=		74s1
 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 f637f04c2868..741e66858cb0 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 87572abefbadc17c92a9a3287461d330
-SIZE (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 233587154
+MD5 (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = be0be2491c523cc1d453505b433a8f6a
+SIZE (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = 234587338
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice-3-devel/files/patch-config_office+configure.in b/editors/openoffice-3-devel/files/patch-config_office+configure.in
index ff953c9a2cc7..a1aeeef73064 100644
--- a/editors/openoffice-3-devel/files/patch-config_office+configure.in
+++ b/editors/openoffice-3-devel/files/patch-config_office+configure.in
@@ -1,44 +1,18 @@
-#iZ and CWS data
-o http://www.openoffice.org/issues/show_bug.cgi?id=40176
-  http://www.openoffice.org/issues/show_bug.cgi?id=40226
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4
-o configure4
-
-Description
-o Correct PTHREAD_CFLAGS, PTHREAD_LIBS
-o CUPS support via --enable-cups
-
+o http://www.openoffice.org/issues/show_bug.cgi?id=41516
+o configuretypofix
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.82
-diff -u -r1.82 configure.in
---- config_office/configure.in	5 Jan 2005 12:09:48 -0000	1.82
-+++ config_office/configure.in	9 Jan 2005 10:36:08 -0000
-@@ -449,7 +449,7 @@
- 		test_x=yes
- 		test_gtk=yes
-       test_kde=yes
--      test_cups=no
-+      test_cups=yes
- 		AC_MSG_CHECKING([the FreeBSD operating system release])
- 		if test -n "$with_os_version"; then
- 			OSVERSION="$with_os_version"
-@@ -457,13 +457,15 @@
- 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
- 		fi
- 		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
--		PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 		if test "$OSVERSION" -lt "500016"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-pthread"
- 		elif test "$OSVERSION" -lt "502102"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-lc_r"
- 		else 
--			PTHREAD_LIBS="-lpthread"
-+			PTHREAD_CFLAGS=""
-+			PTHREAD_LIBS="-pthread"
- 		fi
- 		;;
- 	"OSF1")
+retrieving revision 1.87
+diff -u -r1.87 configure.in
+--- config_office/configure.in	25 Jan 2005 16:54:53 -0000	1.87
++++ config_office/configure.in	28 Jan 2005 09:26:37 -0000
+@@ -2408,7 +2408,7 @@
+    fi
+ 
+    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
+-   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/deV/null; then
++   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+ 	AC_MSG_RESULT([yes])
+    else
+   	AC_MSG_ERROR([no, GNU patch needed. install or specifiy with --with-gnu-patch=/path/to/it])
diff --git a/editors/openoffice-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
index 4385f524d262..f77e24a3a1bf 100644
--- a/editors/openoffice-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
+++ b/editors/openoffice-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -1,6 +1,6 @@
 IZ and CWS
 o http://www.openoffice.org/issues/show_bug.cgi?id=41006
-o CWS (not yet)
+o CWS sdksample
 
 offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 
 contains an illigal char
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index e88baf549b5f..2647d8119583 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -19,7 +19,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=	20050127
+SNAPDATE=	20050128
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.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=		74
+MILESTONE=		74s1
 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 f637f04c2868..741e66858cb0 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 87572abefbadc17c92a9a3287461d330
-SIZE (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 233587154
+MD5 (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = be0be2491c523cc1d453505b433a8f6a
+SIZE (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = 234587338
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice-3/files/patch-config_office+configure.in b/editors/openoffice-3/files/patch-config_office+configure.in
index ff953c9a2cc7..a1aeeef73064 100644
--- a/editors/openoffice-3/files/patch-config_office+configure.in
+++ b/editors/openoffice-3/files/patch-config_office+configure.in
@@ -1,44 +1,18 @@
-#iZ and CWS data
-o http://www.openoffice.org/issues/show_bug.cgi?id=40176
-  http://www.openoffice.org/issues/show_bug.cgi?id=40226
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4
-o configure4
-
-Description
-o Correct PTHREAD_CFLAGS, PTHREAD_LIBS
-o CUPS support via --enable-cups
-
+o http://www.openoffice.org/issues/show_bug.cgi?id=41516
+o configuretypofix
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.82
-diff -u -r1.82 configure.in
---- config_office/configure.in	5 Jan 2005 12:09:48 -0000	1.82
-+++ config_office/configure.in	9 Jan 2005 10:36:08 -0000
-@@ -449,7 +449,7 @@
- 		test_x=yes
- 		test_gtk=yes
-       test_kde=yes
--      test_cups=no
-+      test_cups=yes
- 		AC_MSG_CHECKING([the FreeBSD operating system release])
- 		if test -n "$with_os_version"; then
- 			OSVERSION="$with_os_version"
-@@ -457,13 +457,15 @@
- 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
- 		fi
- 		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
--		PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 		if test "$OSVERSION" -lt "500016"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-pthread"
- 		elif test "$OSVERSION" -lt "502102"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-lc_r"
- 		else 
--			PTHREAD_LIBS="-lpthread"
-+			PTHREAD_CFLAGS=""
-+			PTHREAD_LIBS="-pthread"
- 		fi
- 		;;
- 	"OSF1")
+retrieving revision 1.87
+diff -u -r1.87 configure.in
+--- config_office/configure.in	25 Jan 2005 16:54:53 -0000	1.87
++++ config_office/configure.in	28 Jan 2005 09:26:37 -0000
+@@ -2408,7 +2408,7 @@
+    fi
+ 
+    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
+-   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/deV/null; then
++   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+ 	AC_MSG_RESULT([yes])
+    else
+   	AC_MSG_ERROR([no, GNU patch needed. install or specifiy with --with-gnu-patch=/path/to/it])
diff --git a/editors/openoffice-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
index 4385f524d262..f77e24a3a1bf 100644
--- a/editors/openoffice-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
+++ b/editors/openoffice-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -1,6 +1,6 @@
 IZ and CWS
 o http://www.openoffice.org/issues/show_bug.cgi?id=41006
-o CWS (not yet)
+o CWS sdksample
 
 offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 
 contains an illigal char
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index e88baf549b5f..2647d8119583 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -19,7 +19,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=	20050127
+SNAPDATE=	20050128
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.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=		74
+MILESTONE=		74s1
 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 f637f04c2868..741e66858cb0 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.9m74_source.tar.bz2) = 87572abefbadc17c92a9a3287461d330
-SIZE (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 233587154
+MD5 (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = be0be2491c523cc1d453505b433a8f6a
+SIZE (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = 234587338
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
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
index ff953c9a2cc7..a1aeeef73064 100644
--- a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
@@ -1,44 +1,18 @@
-#iZ and CWS data
-o http://www.openoffice.org/issues/show_bug.cgi?id=40176
-  http://www.openoffice.org/issues/show_bug.cgi?id=40226
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4
-o configure4
-
-Description
-o Correct PTHREAD_CFLAGS, PTHREAD_LIBS
-o CUPS support via --enable-cups
-
+o http://www.openoffice.org/issues/show_bug.cgi?id=41516
+o configuretypofix
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.82
-diff -u -r1.82 configure.in
---- config_office/configure.in	5 Jan 2005 12:09:48 -0000	1.82
-+++ config_office/configure.in	9 Jan 2005 10:36:08 -0000
-@@ -449,7 +449,7 @@
- 		test_x=yes
- 		test_gtk=yes
-       test_kde=yes
--      test_cups=no
-+      test_cups=yes
- 		AC_MSG_CHECKING([the FreeBSD operating system release])
- 		if test -n "$with_os_version"; then
- 			OSVERSION="$with_os_version"
-@@ -457,13 +457,15 @@
- 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
- 		fi
- 		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
--		PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 		if test "$OSVERSION" -lt "500016"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-pthread"
- 		elif test "$OSVERSION" -lt "502102"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-lc_r"
- 		else 
--			PTHREAD_LIBS="-lpthread"
-+			PTHREAD_CFLAGS=""
-+			PTHREAD_LIBS="-pthread"
- 		fi
- 		;;
- 	"OSF1")
+retrieving revision 1.87
+diff -u -r1.87 configure.in
+--- config_office/configure.in	25 Jan 2005 16:54:53 -0000	1.87
++++ config_office/configure.in	28 Jan 2005 09:26:37 -0000
+@@ -2408,7 +2408,7 @@
+    fi
+ 
+    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
+-   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/deV/null; then
++   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+ 	AC_MSG_RESULT([yes])
+    else
+   	AC_MSG_ERROR([no, GNU patch needed. install or specifiy with --with-gnu-patch=/path/to/it])
diff --git a/editors/openoffice.org-2-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
index 4385f524d262..f77e24a3a1bf 100644
--- a/editors/openoffice.org-2-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
+++ b/editors/openoffice.org-2-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -1,6 +1,6 @@
 IZ and CWS
 o http://www.openoffice.org/issues/show_bug.cgi?id=41006
-o CWS (not yet)
+o CWS sdksample
 
 offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 
 contains an illigal char
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index e88baf549b5f..2647d8119583 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -19,7 +19,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=	20050127
+SNAPDATE=	20050128
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.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=		74
+MILESTONE=		74s1
 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 f637f04c2868..741e66858cb0 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.9m74_source.tar.bz2) = 87572abefbadc17c92a9a3287461d330
-SIZE (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 233587154
+MD5 (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = be0be2491c523cc1d453505b433a8f6a
+SIZE (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = 234587338
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
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
index ff953c9a2cc7..a1aeeef73064 100644
--- a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in
@@ -1,44 +1,18 @@
-#iZ and CWS data
-o http://www.openoffice.org/issues/show_bug.cgi?id=40176
-  http://www.openoffice.org/issues/show_bug.cgi?id=40226
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4
-o configure4
-
-Description
-o Correct PTHREAD_CFLAGS, PTHREAD_LIBS
-o CUPS support via --enable-cups
-
+o http://www.openoffice.org/issues/show_bug.cgi?id=41516
+o configuretypofix
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.82
-diff -u -r1.82 configure.in
---- config_office/configure.in	5 Jan 2005 12:09:48 -0000	1.82
-+++ config_office/configure.in	9 Jan 2005 10:36:08 -0000
-@@ -449,7 +449,7 @@
- 		test_x=yes
- 		test_gtk=yes
-       test_kde=yes
--      test_cups=no
-+      test_cups=yes
- 		AC_MSG_CHECKING([the FreeBSD operating system release])
- 		if test -n "$with_os_version"; then
- 			OSVERSION="$with_os_version"
-@@ -457,13 +457,15 @@
- 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
- 		fi
- 		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
--		PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 		if test "$OSVERSION" -lt "500016"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-pthread"
- 		elif test "$OSVERSION" -lt "502102"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-lc_r"
- 		else 
--			PTHREAD_LIBS="-lpthread"
-+			PTHREAD_CFLAGS=""
-+			PTHREAD_LIBS="-pthread"
- 		fi
- 		;;
- 	"OSF1")
+retrieving revision 1.87
+diff -u -r1.87 configure.in
+--- config_office/configure.in	25 Jan 2005 16:54:53 -0000	1.87
++++ config_office/configure.in	28 Jan 2005 09:26:37 -0000
+@@ -2408,7 +2408,7 @@
+    fi
+ 
+    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
+-   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/deV/null; then
++   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+ 	AC_MSG_RESULT([yes])
+    else
+   	AC_MSG_ERROR([no, GNU patch needed. install or specifiy with --with-gnu-patch=/path/to/it])
diff --git a/editors/openoffice.org-2-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
index 4385f524d262..f77e24a3a1bf 100644
--- a/editors/openoffice.org-2-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
+++ b/editors/openoffice.org-2-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -1,6 +1,6 @@
 IZ and CWS
 o http://www.openoffice.org/issues/show_bug.cgi?id=41006
-o CWS (not yet)
+o CWS sdksample
 
 offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 
 contains an illigal char
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index e88baf549b5f..2647d8119583 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -19,7 +19,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=	20050127
+SNAPDATE=	20050128
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.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=		74
+MILESTONE=		74s1
 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 f637f04c2868..741e66858cb0 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.9m74_source.tar.bz2) = 87572abefbadc17c92a9a3287461d330
-SIZE (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 233587154
+MD5 (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = be0be2491c523cc1d453505b433a8f6a
+SIZE (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = 234587338
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
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
index ff953c9a2cc7..a1aeeef73064 100644
--- 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
@@ -1,44 +1,18 @@
-#iZ and CWS data
-o http://www.openoffice.org/issues/show_bug.cgi?id=40176
-  http://www.openoffice.org/issues/show_bug.cgi?id=40226
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4
-o configure4
-
-Description
-o Correct PTHREAD_CFLAGS, PTHREAD_LIBS
-o CUPS support via --enable-cups
-
+o http://www.openoffice.org/issues/show_bug.cgi?id=41516
+o configuretypofix
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.82
-diff -u -r1.82 configure.in
---- config_office/configure.in	5 Jan 2005 12:09:48 -0000	1.82
-+++ config_office/configure.in	9 Jan 2005 10:36:08 -0000
-@@ -449,7 +449,7 @@
- 		test_x=yes
- 		test_gtk=yes
-       test_kde=yes
--      test_cups=no
-+      test_cups=yes
- 		AC_MSG_CHECKING([the FreeBSD operating system release])
- 		if test -n "$with_os_version"; then
- 			OSVERSION="$with_os_version"
-@@ -457,13 +457,15 @@
- 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
- 		fi
- 		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
--		PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 		if test "$OSVERSION" -lt "500016"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-pthread"
- 		elif test "$OSVERSION" -lt "502102"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-lc_r"
- 		else 
--			PTHREAD_LIBS="-lpthread"
-+			PTHREAD_CFLAGS=""
-+			PTHREAD_LIBS="-pthread"
- 		fi
- 		;;
- 	"OSF1")
+retrieving revision 1.87
+diff -u -r1.87 configure.in
+--- config_office/configure.in	25 Jan 2005 16:54:53 -0000	1.87
++++ config_office/configure.in	28 Jan 2005 09:26:37 -0000
+@@ -2408,7 +2408,7 @@
+    fi
+ 
+    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
+-   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/deV/null; then
++   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+ 	AC_MSG_RESULT([yes])
+    else
+   	AC_MSG_ERROR([no, GNU patch needed. install or specifiy with --with-gnu-patch=/path/to/it])
diff --git a/editors/openoffice.org-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
index 4385f524d262..f77e24a3a1bf 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
+++ b/editors/openoffice.org-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -1,6 +1,6 @@
 IZ and CWS
 o http://www.openoffice.org/issues/show_bug.cgi?id=41006
-o CWS (not yet)
+o CWS sdksample
 
 offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 
 contains an illigal char
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index e88baf549b5f..2647d8119583 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -19,7 +19,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=	20050127
+SNAPDATE=	20050128
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.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=		74
+MILESTONE=		74s1
 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 f637f04c2868..741e66858cb0 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.9m74_source.tar.bz2) = 87572abefbadc17c92a9a3287461d330
-SIZE (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 233587154
+MD5 (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = be0be2491c523cc1d453505b433a8f6a
+SIZE (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = 234587338
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
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
index ff953c9a2cc7..a1aeeef73064 100644
--- a/editors/openoffice.org-2.0/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-2.0/files/patch-config_office+configure.in
@@ -1,44 +1,18 @@
-#iZ and CWS data
-o http://www.openoffice.org/issues/show_bug.cgi?id=40176
-  http://www.openoffice.org/issues/show_bug.cgi?id=40226
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4
-o configure4
-
-Description
-o Correct PTHREAD_CFLAGS, PTHREAD_LIBS
-o CUPS support via --enable-cups
-
+o http://www.openoffice.org/issues/show_bug.cgi?id=41516
+o configuretypofix
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.82
-diff -u -r1.82 configure.in
---- config_office/configure.in	5 Jan 2005 12:09:48 -0000	1.82
-+++ config_office/configure.in	9 Jan 2005 10:36:08 -0000
-@@ -449,7 +449,7 @@
- 		test_x=yes
- 		test_gtk=yes
-       test_kde=yes
--      test_cups=no
-+      test_cups=yes
- 		AC_MSG_CHECKING([the FreeBSD operating system release])
- 		if test -n "$with_os_version"; then
- 			OSVERSION="$with_os_version"
-@@ -457,13 +457,15 @@
- 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
- 		fi
- 		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
--		PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 		if test "$OSVERSION" -lt "500016"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-pthread"
- 		elif test "$OSVERSION" -lt "502102"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-lc_r"
- 		else 
--			PTHREAD_LIBS="-lpthread"
-+			PTHREAD_CFLAGS=""
-+			PTHREAD_LIBS="-pthread"
- 		fi
- 		;;
- 	"OSF1")
+retrieving revision 1.87
+diff -u -r1.87 configure.in
+--- config_office/configure.in	25 Jan 2005 16:54:53 -0000	1.87
++++ config_office/configure.in	28 Jan 2005 09:26:37 -0000
+@@ -2408,7 +2408,7 @@
+    fi
+ 
+    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
+-   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/deV/null; then
++   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+ 	AC_MSG_RESULT([yes])
+    else
+   	AC_MSG_ERROR([no, GNU patch needed. install or specifiy with --with-gnu-patch=/path/to/it])
diff --git a/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
index 4385f524d262..f77e24a3a1bf 100644
--- a/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
+++ b/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -1,6 +1,6 @@
 IZ and CWS
 o http://www.openoffice.org/issues/show_bug.cgi?id=41006
-o CWS (not yet)
+o CWS sdksample
 
 offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 
 contains an illigal char
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index e88baf549b5f..2647d8119583 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -19,7 +19,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=	20050127
+SNAPDATE=	20050128
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.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=		74
+MILESTONE=		74s1
 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 f637f04c2868..741e66858cb0 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 87572abefbadc17c92a9a3287461d330
-SIZE (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 233587154
+MD5 (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = be0be2491c523cc1d453505b433a8f6a
+SIZE (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = 234587338
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice.org-2/files/patch-config_office+configure.in b/editors/openoffice.org-2/files/patch-config_office+configure.in
index ff953c9a2cc7..a1aeeef73064 100644
--- a/editors/openoffice.org-2/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-2/files/patch-config_office+configure.in
@@ -1,44 +1,18 @@
-#iZ and CWS data
-o http://www.openoffice.org/issues/show_bug.cgi?id=40176
-  http://www.openoffice.org/issues/show_bug.cgi?id=40226
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4
-o configure4
-
-Description
-o Correct PTHREAD_CFLAGS, PTHREAD_LIBS
-o CUPS support via --enable-cups
-
+o http://www.openoffice.org/issues/show_bug.cgi?id=41516
+o configuretypofix
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.82
-diff -u -r1.82 configure.in
---- config_office/configure.in	5 Jan 2005 12:09:48 -0000	1.82
-+++ config_office/configure.in	9 Jan 2005 10:36:08 -0000
-@@ -449,7 +449,7 @@
- 		test_x=yes
- 		test_gtk=yes
-       test_kde=yes
--      test_cups=no
-+      test_cups=yes
- 		AC_MSG_CHECKING([the FreeBSD operating system release])
- 		if test -n "$with_os_version"; then
- 			OSVERSION="$with_os_version"
-@@ -457,13 +457,15 @@
- 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
- 		fi
- 		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
--		PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 		if test "$OSVERSION" -lt "500016"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-pthread"
- 		elif test "$OSVERSION" -lt "502102"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-lc_r"
- 		else 
--			PTHREAD_LIBS="-lpthread"
-+			PTHREAD_CFLAGS=""
-+			PTHREAD_LIBS="-pthread"
- 		fi
- 		;;
- 	"OSF1")
+retrieving revision 1.87
+diff -u -r1.87 configure.in
+--- config_office/configure.in	25 Jan 2005 16:54:53 -0000	1.87
++++ config_office/configure.in	28 Jan 2005 09:26:37 -0000
+@@ -2408,7 +2408,7 @@
+    fi
+ 
+    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
+-   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/deV/null; then
++   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+ 	AC_MSG_RESULT([yes])
+    else
+   	AC_MSG_ERROR([no, GNU patch needed. install or specifiy with --with-gnu-patch=/path/to/it])
diff --git a/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
index 4385f524d262..f77e24a3a1bf 100644
--- a/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
+++ b/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -1,6 +1,6 @@
 IZ and CWS
 o http://www.openoffice.org/issues/show_bug.cgi?id=41006
-o CWS (not yet)
+o CWS sdksample
 
 offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 
 contains an illigal char
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index e88baf549b5f..2647d8119583 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -19,7 +19,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=	20050127
+SNAPDATE=	20050128
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.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=		74
+MILESTONE=		74s1
 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 f637f04c2868..741e66858cb0 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.9m74_source.tar.bz2) = 87572abefbadc17c92a9a3287461d330
-SIZE (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 233587154
+MD5 (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = be0be2491c523cc1d453505b433a8f6a
+SIZE (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = 234587338
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
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
index ff953c9a2cc7..a1aeeef73064 100644
--- a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in
@@ -1,44 +1,18 @@
-#iZ and CWS data
-o http://www.openoffice.org/issues/show_bug.cgi?id=40176
-  http://www.openoffice.org/issues/show_bug.cgi?id=40226
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4
-o configure4
-
-Description
-o Correct PTHREAD_CFLAGS, PTHREAD_LIBS
-o CUPS support via --enable-cups
-
+o http://www.openoffice.org/issues/show_bug.cgi?id=41516
+o configuretypofix
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.82
-diff -u -r1.82 configure.in
---- config_office/configure.in	5 Jan 2005 12:09:48 -0000	1.82
-+++ config_office/configure.in	9 Jan 2005 10:36:08 -0000
-@@ -449,7 +449,7 @@
- 		test_x=yes
- 		test_gtk=yes
-       test_kde=yes
--      test_cups=no
-+      test_cups=yes
- 		AC_MSG_CHECKING([the FreeBSD operating system release])
- 		if test -n "$with_os_version"; then
- 			OSVERSION="$with_os_version"
-@@ -457,13 +457,15 @@
- 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
- 		fi
- 		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
--		PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 		if test "$OSVERSION" -lt "500016"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-pthread"
- 		elif test "$OSVERSION" -lt "502102"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-lc_r"
- 		else 
--			PTHREAD_LIBS="-lpthread"
-+			PTHREAD_CFLAGS=""
-+			PTHREAD_LIBS="-pthread"
- 		fi
- 		;;
- 	"OSF1")
+retrieving revision 1.87
+diff -u -r1.87 configure.in
+--- config_office/configure.in	25 Jan 2005 16:54:53 -0000	1.87
++++ config_office/configure.in	28 Jan 2005 09:26:37 -0000
+@@ -2408,7 +2408,7 @@
+    fi
+ 
+    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
+-   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/deV/null; then
++   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+ 	AC_MSG_RESULT([yes])
+    else
+   	AC_MSG_ERROR([no, GNU patch needed. install or specifiy with --with-gnu-patch=/path/to/it])
diff --git a/editors/openoffice.org-3-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-3-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
index 4385f524d262..f77e24a3a1bf 100644
--- a/editors/openoffice.org-3-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
+++ b/editors/openoffice.org-3-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -1,6 +1,6 @@
 IZ and CWS
 o http://www.openoffice.org/issues/show_bug.cgi?id=41006
-o CWS (not yet)
+o CWS sdksample
 
 offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 
 contains an illigal char
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index e88baf549b5f..2647d8119583 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -19,7 +19,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=	20050127
+SNAPDATE=	20050128
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.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=		74
+MILESTONE=		74s1
 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 f637f04c2868..741e66858cb0 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.9m74_source.tar.bz2) = 87572abefbadc17c92a9a3287461d330
-SIZE (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 233587154
+MD5 (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = be0be2491c523cc1d453505b433a8f6a
+SIZE (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = 234587338
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
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
index ff953c9a2cc7..a1aeeef73064 100644
--- a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in
@@ -1,44 +1,18 @@
-#iZ and CWS data
-o http://www.openoffice.org/issues/show_bug.cgi?id=40176
-  http://www.openoffice.org/issues/show_bug.cgi?id=40226
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4
-o configure4
-
-Description
-o Correct PTHREAD_CFLAGS, PTHREAD_LIBS
-o CUPS support via --enable-cups
-
+o http://www.openoffice.org/issues/show_bug.cgi?id=41516
+o configuretypofix
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.82
-diff -u -r1.82 configure.in
---- config_office/configure.in	5 Jan 2005 12:09:48 -0000	1.82
-+++ config_office/configure.in	9 Jan 2005 10:36:08 -0000
-@@ -449,7 +449,7 @@
- 		test_x=yes
- 		test_gtk=yes
-       test_kde=yes
--      test_cups=no
-+      test_cups=yes
- 		AC_MSG_CHECKING([the FreeBSD operating system release])
- 		if test -n "$with_os_version"; then
- 			OSVERSION="$with_os_version"
-@@ -457,13 +457,15 @@
- 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
- 		fi
- 		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
--		PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 		if test "$OSVERSION" -lt "500016"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-pthread"
- 		elif test "$OSVERSION" -lt "502102"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-lc_r"
- 		else 
--			PTHREAD_LIBS="-lpthread"
-+			PTHREAD_CFLAGS=""
-+			PTHREAD_LIBS="-pthread"
- 		fi
- 		;;
- 	"OSF1")
+retrieving revision 1.87
+diff -u -r1.87 configure.in
+--- config_office/configure.in	25 Jan 2005 16:54:53 -0000	1.87
++++ config_office/configure.in	28 Jan 2005 09:26:37 -0000
+@@ -2408,7 +2408,7 @@
+    fi
+ 
+    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
+-   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/deV/null; then
++   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+ 	AC_MSG_RESULT([yes])
+    else
+   	AC_MSG_ERROR([no, GNU patch needed. install or specifiy with --with-gnu-patch=/path/to/it])
diff --git a/editors/openoffice.org-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
index 4385f524d262..f77e24a3a1bf 100644
--- a/editors/openoffice.org-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
+++ b/editors/openoffice.org-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -1,6 +1,6 @@
 IZ and CWS
 o http://www.openoffice.org/issues/show_bug.cgi?id=41006
-o CWS (not yet)
+o CWS sdksample
 
 offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 
 contains an illigal char
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index e88baf549b5f..2647d8119583 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -19,7 +19,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=	20050127
+SNAPDATE=	20050128
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.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=		74
+MILESTONE=		74s1
 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 f637f04c2868..741e66858cb0 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 87572abefbadc17c92a9a3287461d330
-SIZE (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 233587154
+MD5 (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = be0be2491c523cc1d453505b433a8f6a
+SIZE (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = 234587338
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice.org-3/files/patch-config_office+configure.in b/editors/openoffice.org-3/files/patch-config_office+configure.in
index ff953c9a2cc7..a1aeeef73064 100644
--- a/editors/openoffice.org-3/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-3/files/patch-config_office+configure.in
@@ -1,44 +1,18 @@
-#iZ and CWS data
-o http://www.openoffice.org/issues/show_bug.cgi?id=40176
-  http://www.openoffice.org/issues/show_bug.cgi?id=40226
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4
-o configure4
-
-Description
-o Correct PTHREAD_CFLAGS, PTHREAD_LIBS
-o CUPS support via --enable-cups
-
+o http://www.openoffice.org/issues/show_bug.cgi?id=41516
+o configuretypofix
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.82
-diff -u -r1.82 configure.in
---- config_office/configure.in	5 Jan 2005 12:09:48 -0000	1.82
-+++ config_office/configure.in	9 Jan 2005 10:36:08 -0000
-@@ -449,7 +449,7 @@
- 		test_x=yes
- 		test_gtk=yes
-       test_kde=yes
--      test_cups=no
-+      test_cups=yes
- 		AC_MSG_CHECKING([the FreeBSD operating system release])
- 		if test -n "$with_os_version"; then
- 			OSVERSION="$with_os_version"
-@@ -457,13 +457,15 @@
- 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
- 		fi
- 		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
--		PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 		if test "$OSVERSION" -lt "500016"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-pthread"
- 		elif test "$OSVERSION" -lt "502102"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-lc_r"
- 		else 
--			PTHREAD_LIBS="-lpthread"
-+			PTHREAD_CFLAGS=""
-+			PTHREAD_LIBS="-pthread"
- 		fi
- 		;;
- 	"OSF1")
+retrieving revision 1.87
+diff -u -r1.87 configure.in
+--- config_office/configure.in	25 Jan 2005 16:54:53 -0000	1.87
++++ config_office/configure.in	28 Jan 2005 09:26:37 -0000
+@@ -2408,7 +2408,7 @@
+    fi
+ 
+    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
+-   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/deV/null; then
++   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+ 	AC_MSG_RESULT([yes])
+    else
+   	AC_MSG_ERROR([no, GNU patch needed. install or specifiy with --with-gnu-patch=/path/to/it])
diff --git a/editors/openoffice.org-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
index 4385f524d262..f77e24a3a1bf 100644
--- a/editors/openoffice.org-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
+++ b/editors/openoffice.org-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -1,6 +1,6 @@
 IZ and CWS
 o http://www.openoffice.org/issues/show_bug.cgi?id=41006
-o CWS (not yet)
+o CWS sdksample
 
 offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 
 contains an illigal char
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index e88baf549b5f..2647d8119583 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -19,7 +19,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=	20050127
+SNAPDATE=	20050128
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.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=		74
+MILESTONE=		74s1
 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 f637f04c2868..741e66858cb0 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 87572abefbadc17c92a9a3287461d330
-SIZE (openoffice.org2.0/OOo_1.9m74_source.tar.bz2) = 233587154
+MD5 (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = be0be2491c523cc1d453505b433a8f6a
+SIZE (openoffice.org2.0/OOo_1.9m74s1_source.tar.bz2) = 234587338
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
diff --git a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in b/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in
index ff953c9a2cc7..a1aeeef73064 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in
@@ -1,44 +1,18 @@
-#iZ and CWS data
-o http://www.openoffice.org/issues/show_bug.cgi?id=40176
-  http://www.openoffice.org/issues/show_bug.cgi?id=40226
-o http://eis.services.openoffice.org/EIS2/servlet/cws.ShowCWS?Id=1806&Path=SRC680%2Fconfigure4
-o configure4
-
-Description
-o Correct PTHREAD_CFLAGS, PTHREAD_LIBS
-o CUPS support via --enable-cups
-
+o http://www.openoffice.org/issues/show_bug.cgi?id=41516
+o configuretypofix
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.82
-diff -u -r1.82 configure.in
---- config_office/configure.in	5 Jan 2005 12:09:48 -0000	1.82
-+++ config_office/configure.in	9 Jan 2005 10:36:08 -0000
-@@ -449,7 +449,7 @@
- 		test_x=yes
- 		test_gtk=yes
-       test_kde=yes
--      test_cups=no
-+      test_cups=yes
- 		AC_MSG_CHECKING([the FreeBSD operating system release])
- 		if test -n "$with_os_version"; then
- 			OSVERSION="$with_os_version"
-@@ -457,13 +457,15 @@
- 			OSVERSION=`/sbin/sysctl -n kern.osreldate`
- 		fi
- 		AC_MSG_RESULT([found OSVERSION=$OSVERSION])
--		PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 		if test "$OSVERSION" -lt "500016"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-pthread"
- 		elif test "$OSVERSION" -lt "502102"; then
-+			PTHREAD_CFLAGS="-D_THREAD_SAFE"
- 			PTHREAD_LIBS="-lc_r"
- 		else 
--			PTHREAD_LIBS="-lpthread"
-+			PTHREAD_CFLAGS=""
-+			PTHREAD_LIBS="-pthread"
- 		fi
- 		;;
- 	"OSF1")
+retrieving revision 1.87
+diff -u -r1.87 configure.in
+--- config_office/configure.in	25 Jan 2005 16:54:53 -0000	1.87
++++ config_office/configure.in	28 Jan 2005 09:26:37 -0000
+@@ -2408,7 +2408,7 @@
+    fi
+ 
+    AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
+-   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/deV/null; then
++   if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+ 	AC_MSG_RESULT([yes])
+    else
+   	AC_MSG_ERROR([no, GNU patch needed. install or specifiy with --with-gnu-patch=/path/to/it])
diff --git a/editors/openoffice.org-vcltesttool/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-vcltesttool/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
index 4385f524d262..f77e24a3a1bf 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
+++ b/editors/openoffice.org-vcltesttool/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl
@@ -1,6 +1,6 @@
 IZ and CWS
 o http://www.openoffice.org/issues/show_bug.cgi?id=41006
-o CWS (not yet)
+o CWS sdksample
 
 offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 
 contains an illigal char