diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-02-04 23:57:18 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-02-04 23:57:18 +0000 |
| commit | 1b7bcfd35f63a7d36be6d9f373902aaccfbc7a57 (patch) | |
| tree | 8ea0cb8c452c854cc88460f681c1b3b9f07bafe9 /editors | |
| parent | 73c56ea05bfcde5b9a5084046e41d25150a32a76 (diff) | |
| download | ports-1b7bcfd35f63a7d36be6d9f373902aaccfbc7a57.tar.gz ports-1b7bcfd35f63a7d36be6d9f373902aaccfbc7a57.zip | |
Notes
Diffstat (limited to 'editors')
72 files changed, 96 insertions, 1872 deletions
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile index c83ebda174c4..6b7746859266 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= 20050130 +SNAPDATE= 20050202 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= 75 +MILESTONE= 76 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 @@ -149,10 +149,10 @@ do-build: .endif @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}' -OOOFILES1= openofficeorg-calc.sw openofficeorg-core.sw openofficeorg-draw.sw openofficeorg-graphicfilter.sw -OOOFILES2= openofficeorg-impress.sw openofficeorg-javafilter.sw -OOOFILES3= openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw -OOOFILES4= openofficeorg-writer.sw openofficeorg-xsltfilter.sw +OOOFILES1= openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw +OOOFILES2= openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw +OOOFILES3= openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw +OOOFILES4= openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw do-install: @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo index 2edb271d5d18..fdc9e5a397f1 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.9m75_source.tar.bz2) = f21638bfbd7123d9a1f8d4aebbfcab4d -SIZE (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = 234721517 +MD5 (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 9a009beb8824d0d0a0191cf519323b62 +SIZE (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 242321515 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-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl deleted file mode 100644 index f77e24a3a1bf..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl +++ /dev/null @@ -1,32 +0,0 @@ -IZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=41006 -o CWS sdksample - -offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -contains an illigal char - -Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -=================================================================== -RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v -retrieving revision 1.4 -diff -u -r1.4 XParametricPolyPolygon2DFactory.idl ---- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4 -+++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000 -@@ -109,7 +109,7 @@ - linearly between center and endColor via concentric ellipses - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - circular. If it's not 1, the gradient is elliptical, with the - special twist that the aspect ratio is maintained also for the - center color: the gradient will not collapse into a single -@@ -124,7 +124,7 @@ - linearly between center and endColor via rectangular boxes - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - quadratic. If it's not 1, the gradient is rectangular, with - the special twist that the aspect ratio is maintained also for - the center color: the gradient will not collapse into a single diff --git a/editors/openoffice-2.0-devel/files/patch-project-jvmfwk b/editors/openoffice-2.0-devel/files/patch-project-jvmfwk deleted file mode 100644 index 65325d6056e8..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-project-jvmfwk +++ /dev/null @@ -1,67 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=40180 -o jre5issues -Description - -Vendor name of FreeBSD's Java -(http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk14/) -is Sun Microsystems Inc. so that we can use as Linux version -only difference is the out put of java -version -java version "1.4.2-p6" -trailing -pXX is different. - -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 16 Dec 2004 11:45:15 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 30 Dec 2004 12:55:14 -0000 -@@ -231,6 +231,8 @@ - m_preRelease = getPreRelease(pCur); - if (m_preRelease == Rel_NONE) - return false; -+ if (m_preRelease == Rel_FreeBSD) -+ return true; - } - else - { -@@ -267,6 +269,20 @@ - return Rel_RC2; - else if (! strcmp(szRelease, "rc3")) - return Rel_RC3; -+ else if (! strcmp(szRelease, "p5")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p6")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p7")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p8")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p9")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p10")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p11")) -+ return Rel_FreeBSD; - else - return Rel_NONE; - } -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.hxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 16 Dec 2004 11:45:27 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 30 Dec 2004 12:55:14 -0000 -@@ -107,6 +107,10 @@ - Rel_RC1, - Rel_RC2, - Rel_RC3 -+#if defined(FREEBSD) -+ , -+ Rel_FreeBSD -+#endif - }; - - //contains major,minor,micro,update diff --git a/editors/openoffice-2.0-devel/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice-2.0-devel/files/patch-psprint+source+helper+strhelper.cxx deleted file mode 100644 index 428681897449..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-psprint+source+helper+strhelper.cxx +++ /dev/null @@ -1,24 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=27753 -o vcl34 - -Description -The isnan() macro is a new feature of C99 and not yet part of C++. -Index: source/helper/strhelper.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v -retrieving revision 1.6 -diff -u -r1.6 strhelper.cxx ---- psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 -+++ psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 -@@ -67,6 +67,10 @@ - #include <cmath> // for isnan - #include <cstring> - -+#if defined (FREEBSD) -+using namespace __gnu_cxx; //for isnan -+#endif -+ - namespace psp { - - inline int isSpace( char cChar ) diff --git a/editors/openoffice-2.0-devel/files/patch-scp2+source+ooo+file_ooo.scp b/editors/openoffice-2.0-devel/files/patch-scp2+source+ooo+file_ooo.scp deleted file mode 100644 index ada03742b6cb..000000000000 --- a/editors/openoffice-2.0-devel/files/patch-scp2+source+ooo+file_ooo.scp +++ /dev/null @@ -1,25 +0,0 @@ -o #iZ XXXX -o CWS nativefixer3 -http://porting.openoffice.org/servlets/ReadMsg?list=dev&msgNo=15066 - -Index: scp2/source/ooo/file_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v -retrieving revision 1.66 -diff -u -r1.66 file_ooo.scp ---- scp2/source/ooo/file_ooo.scp 21 Jan 2005 12:14:20 -0000 1.66 -+++ scp2/source/ooo/file_ooo.scp 28 Jan 2005 08:29:31 -0000 -@@ -371,13 +371,6 @@ - Styles = (PACKED); - End - --File gid_File_Bin_Gnome_Set_Default_Application -- BIN_FILE_BODY; -- Dir = gid_Dir_Program; -- Name = "gnome-set-default-application"; -- Styles = (PACKED); --End -- - #endif - - File gid_File_Bin_Senddoc diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index c83ebda174c4..6b7746859266 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= 20050130 +SNAPDATE= 20050202 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= 75 +MILESTONE= 76 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 @@ -149,10 +149,10 @@ do-build: .endif @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}' -OOOFILES1= openofficeorg-calc.sw openofficeorg-core.sw openofficeorg-draw.sw openofficeorg-graphicfilter.sw -OOOFILES2= openofficeorg-impress.sw openofficeorg-javafilter.sw -OOOFILES3= openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw -OOOFILES4= openofficeorg-writer.sw openofficeorg-xsltfilter.sw +OOOFILES1= openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw +OOOFILES2= openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw +OOOFILES3= openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw +OOOFILES4= openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw do-install: @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index 2edb271d5d18..fdc9e5a397f1 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = f21638bfbd7123d9a1f8d4aebbfcab4d -SIZE (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = 234721517 +MD5 (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 9a009beb8824d0d0a0191cf519323b62 +SIZE (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 242321515 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-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl deleted file mode 100644 index f77e24a3a1bf..000000000000 --- a/editors/openoffice-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl +++ /dev/null @@ -1,32 +0,0 @@ -IZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=41006 -o CWS sdksample - -offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -contains an illigal char - -Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -=================================================================== -RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v -retrieving revision 1.4 -diff -u -r1.4 XParametricPolyPolygon2DFactory.idl ---- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4 -+++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000 -@@ -109,7 +109,7 @@ - linearly between center and endColor via concentric ellipses - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - circular. If it's not 1, the gradient is elliptical, with the - special twist that the aspect ratio is maintained also for the - center color: the gradient will not collapse into a single -@@ -124,7 +124,7 @@ - linearly between center and endColor via rectangular boxes - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - quadratic. If it's not 1, the gradient is rectangular, with - the special twist that the aspect ratio is maintained also for - the center color: the gradient will not collapse into a single diff --git a/editors/openoffice-3-devel/files/patch-project-jvmfwk b/editors/openoffice-3-devel/files/patch-project-jvmfwk deleted file mode 100644 index 65325d6056e8..000000000000 --- a/editors/openoffice-3-devel/files/patch-project-jvmfwk +++ /dev/null @@ -1,67 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=40180 -o jre5issues -Description - -Vendor name of FreeBSD's Java -(http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk14/) -is Sun Microsystems Inc. so that we can use as Linux version -only difference is the out put of java -version -java version "1.4.2-p6" -trailing -pXX is different. - -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 16 Dec 2004 11:45:15 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 30 Dec 2004 12:55:14 -0000 -@@ -231,6 +231,8 @@ - m_preRelease = getPreRelease(pCur); - if (m_preRelease == Rel_NONE) - return false; -+ if (m_preRelease == Rel_FreeBSD) -+ return true; - } - else - { -@@ -267,6 +269,20 @@ - return Rel_RC2; - else if (! strcmp(szRelease, "rc3")) - return Rel_RC3; -+ else if (! strcmp(szRelease, "p5")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p6")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p7")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p8")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p9")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p10")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p11")) -+ return Rel_FreeBSD; - else - return Rel_NONE; - } -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.hxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 16 Dec 2004 11:45:27 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 30 Dec 2004 12:55:14 -0000 -@@ -107,6 +107,10 @@ - Rel_RC1, - Rel_RC2, - Rel_RC3 -+#if defined(FREEBSD) -+ , -+ Rel_FreeBSD -+#endif - }; - - //contains major,minor,micro,update diff --git a/editors/openoffice-3-devel/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice-3-devel/files/patch-psprint+source+helper+strhelper.cxx deleted file mode 100644 index 428681897449..000000000000 --- a/editors/openoffice-3-devel/files/patch-psprint+source+helper+strhelper.cxx +++ /dev/null @@ -1,24 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=27753 -o vcl34 - -Description -The isnan() macro is a new feature of C99 and not yet part of C++. -Index: source/helper/strhelper.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v -retrieving revision 1.6 -diff -u -r1.6 strhelper.cxx ---- psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 -+++ psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 -@@ -67,6 +67,10 @@ - #include <cmath> // for isnan - #include <cstring> - -+#if defined (FREEBSD) -+using namespace __gnu_cxx; //for isnan -+#endif -+ - namespace psp { - - inline int isSpace( char cChar ) diff --git a/editors/openoffice-3-devel/files/patch-scp2+source+ooo+file_ooo.scp b/editors/openoffice-3-devel/files/patch-scp2+source+ooo+file_ooo.scp deleted file mode 100644 index ada03742b6cb..000000000000 --- a/editors/openoffice-3-devel/files/patch-scp2+source+ooo+file_ooo.scp +++ /dev/null @@ -1,25 +0,0 @@ -o #iZ XXXX -o CWS nativefixer3 -http://porting.openoffice.org/servlets/ReadMsg?list=dev&msgNo=15066 - -Index: scp2/source/ooo/file_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v -retrieving revision 1.66 -diff -u -r1.66 file_ooo.scp ---- scp2/source/ooo/file_ooo.scp 21 Jan 2005 12:14:20 -0000 1.66 -+++ scp2/source/ooo/file_ooo.scp 28 Jan 2005 08:29:31 -0000 -@@ -371,13 +371,6 @@ - Styles = (PACKED); - End - --File gid_File_Bin_Gnome_Set_Default_Application -- BIN_FILE_BODY; -- Dir = gid_Dir_Program; -- Name = "gnome-set-default-application"; -- Styles = (PACKED); --End -- - #endif - - File gid_File_Bin_Senddoc diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index c83ebda174c4..6b7746859266 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= 20050130 +SNAPDATE= 20050202 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= 75 +MILESTONE= 76 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 @@ -149,10 +149,10 @@ do-build: .endif @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}' -OOOFILES1= openofficeorg-calc.sw openofficeorg-core.sw openofficeorg-draw.sw openofficeorg-graphicfilter.sw -OOOFILES2= openofficeorg-impress.sw openofficeorg-javafilter.sw -OOOFILES3= openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw -OOOFILES4= openofficeorg-writer.sw openofficeorg-xsltfilter.sw +OOOFILES1= openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw +OOOFILES2= openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw +OOOFILES3= openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw +OOOFILES4= openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw do-install: @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo index 2edb271d5d18..fdc9e5a397f1 100644 --- a/editors/openoffice-3/distinfo +++ b/editors/openoffice-3/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = f21638bfbd7123d9a1f8d4aebbfcab4d -SIZE (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = 234721517 +MD5 (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 9a009beb8824d0d0a0191cf519323b62 +SIZE (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 242321515 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-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl deleted file mode 100644 index f77e24a3a1bf..000000000000 --- a/editors/openoffice-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl +++ /dev/null @@ -1,32 +0,0 @@ -IZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=41006 -o CWS sdksample - -offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -contains an illigal char - -Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -=================================================================== -RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v -retrieving revision 1.4 -diff -u -r1.4 XParametricPolyPolygon2DFactory.idl ---- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4 -+++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000 -@@ -109,7 +109,7 @@ - linearly between center and endColor via concentric ellipses - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - circular. If it's not 1, the gradient is elliptical, with the - special twist that the aspect ratio is maintained also for the - center color: the gradient will not collapse into a single -@@ -124,7 +124,7 @@ - linearly between center and endColor via rectangular boxes - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - quadratic. If it's not 1, the gradient is rectangular, with - the special twist that the aspect ratio is maintained also for - the center color: the gradient will not collapse into a single diff --git a/editors/openoffice-3/files/patch-project-jvmfwk b/editors/openoffice-3/files/patch-project-jvmfwk deleted file mode 100644 index 65325d6056e8..000000000000 --- a/editors/openoffice-3/files/patch-project-jvmfwk +++ /dev/null @@ -1,67 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=40180 -o jre5issues -Description - -Vendor name of FreeBSD's Java -(http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk14/) -is Sun Microsystems Inc. so that we can use as Linux version -only difference is the out put of java -version -java version "1.4.2-p6" -trailing -pXX is different. - -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 16 Dec 2004 11:45:15 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 30 Dec 2004 12:55:14 -0000 -@@ -231,6 +231,8 @@ - m_preRelease = getPreRelease(pCur); - if (m_preRelease == Rel_NONE) - return false; -+ if (m_preRelease == Rel_FreeBSD) -+ return true; - } - else - { -@@ -267,6 +269,20 @@ - return Rel_RC2; - else if (! strcmp(szRelease, "rc3")) - return Rel_RC3; -+ else if (! strcmp(szRelease, "p5")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p6")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p7")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p8")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p9")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p10")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p11")) -+ return Rel_FreeBSD; - else - return Rel_NONE; - } -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.hxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 16 Dec 2004 11:45:27 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 30 Dec 2004 12:55:14 -0000 -@@ -107,6 +107,10 @@ - Rel_RC1, - Rel_RC2, - Rel_RC3 -+#if defined(FREEBSD) -+ , -+ Rel_FreeBSD -+#endif - }; - - //contains major,minor,micro,update diff --git a/editors/openoffice-3/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice-3/files/patch-psprint+source+helper+strhelper.cxx deleted file mode 100644 index 428681897449..000000000000 --- a/editors/openoffice-3/files/patch-psprint+source+helper+strhelper.cxx +++ /dev/null @@ -1,24 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=27753 -o vcl34 - -Description -The isnan() macro is a new feature of C99 and not yet part of C++. -Index: source/helper/strhelper.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v -retrieving revision 1.6 -diff -u -r1.6 strhelper.cxx ---- psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 -+++ psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 -@@ -67,6 +67,10 @@ - #include <cmath> // for isnan - #include <cstring> - -+#if defined (FREEBSD) -+using namespace __gnu_cxx; //for isnan -+#endif -+ - namespace psp { - - inline int isSpace( char cChar ) diff --git a/editors/openoffice-3/files/patch-scp2+source+ooo+file_ooo.scp b/editors/openoffice-3/files/patch-scp2+source+ooo+file_ooo.scp deleted file mode 100644 index ada03742b6cb..000000000000 --- a/editors/openoffice-3/files/patch-scp2+source+ooo+file_ooo.scp +++ /dev/null @@ -1,25 +0,0 @@ -o #iZ XXXX -o CWS nativefixer3 -http://porting.openoffice.org/servlets/ReadMsg?list=dev&msgNo=15066 - -Index: scp2/source/ooo/file_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v -retrieving revision 1.66 -diff -u -r1.66 file_ooo.scp ---- scp2/source/ooo/file_ooo.scp 21 Jan 2005 12:14:20 -0000 1.66 -+++ scp2/source/ooo/file_ooo.scp 28 Jan 2005 08:29:31 -0000 -@@ -371,13 +371,6 @@ - Styles = (PACKED); - End - --File gid_File_Bin_Gnome_Set_Default_Application -- BIN_FILE_BODY; -- Dir = gid_Dir_Program; -- Name = "gnome-set-default-application"; -- Styles = (PACKED); --End -- - #endif - - File gid_File_Bin_Senddoc diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index c83ebda174c4..6b7746859266 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= 20050130 +SNAPDATE= 20050202 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= 75 +MILESTONE= 76 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 @@ -149,10 +149,10 @@ do-build: .endif @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}' -OOOFILES1= openofficeorg-calc.sw openofficeorg-core.sw openofficeorg-draw.sw openofficeorg-graphicfilter.sw -OOOFILES2= openofficeorg-impress.sw openofficeorg-javafilter.sw -OOOFILES3= openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw -OOOFILES4= openofficeorg-writer.sw openofficeorg-xsltfilter.sw +OOOFILES1= openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw +OOOFILES2= openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw +OOOFILES3= openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw +OOOFILES4= openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw do-install: @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo index 2edb271d5d18..fdc9e5a397f1 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.9m75_source.tar.bz2) = f21638bfbd7123d9a1f8d4aebbfcab4d -SIZE (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = 234721517 +MD5 (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 9a009beb8824d0d0a0191cf519323b62 +SIZE (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 242321515 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-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl deleted file mode 100644 index f77e24a3a1bf..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl +++ /dev/null @@ -1,32 +0,0 @@ -IZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=41006 -o CWS sdksample - -offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -contains an illigal char - -Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -=================================================================== -RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v -retrieving revision 1.4 -diff -u -r1.4 XParametricPolyPolygon2DFactory.idl ---- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4 -+++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000 -@@ -109,7 +109,7 @@ - linearly between center and endColor via concentric ellipses - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - circular. If it's not 1, the gradient is elliptical, with the - special twist that the aspect ratio is maintained also for the - center color: the gradient will not collapse into a single -@@ -124,7 +124,7 @@ - linearly between center and endColor via rectangular boxes - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - quadratic. If it's not 1, the gradient is rectangular, with - the special twist that the aspect ratio is maintained also for - the center color: the gradient will not collapse into a single diff --git a/editors/openoffice.org-2-RC/files/patch-project-jvmfwk b/editors/openoffice.org-2-RC/files/patch-project-jvmfwk deleted file mode 100644 index 65325d6056e8..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-project-jvmfwk +++ /dev/null @@ -1,67 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=40180 -o jre5issues -Description - -Vendor name of FreeBSD's Java -(http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk14/) -is Sun Microsystems Inc. so that we can use as Linux version -only difference is the out put of java -version -java version "1.4.2-p6" -trailing -pXX is different. - -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 16 Dec 2004 11:45:15 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 30 Dec 2004 12:55:14 -0000 -@@ -231,6 +231,8 @@ - m_preRelease = getPreRelease(pCur); - if (m_preRelease == Rel_NONE) - return false; -+ if (m_preRelease == Rel_FreeBSD) -+ return true; - } - else - { -@@ -267,6 +269,20 @@ - return Rel_RC2; - else if (! strcmp(szRelease, "rc3")) - return Rel_RC3; -+ else if (! strcmp(szRelease, "p5")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p6")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p7")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p8")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p9")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p10")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p11")) -+ return Rel_FreeBSD; - else - return Rel_NONE; - } -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.hxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 16 Dec 2004 11:45:27 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 30 Dec 2004 12:55:14 -0000 -@@ -107,6 +107,10 @@ - Rel_RC1, - Rel_RC2, - Rel_RC3 -+#if defined(FREEBSD) -+ , -+ Rel_FreeBSD -+#endif - }; - - //contains major,minor,micro,update diff --git a/editors/openoffice.org-2-RC/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-2-RC/files/patch-psprint+source+helper+strhelper.cxx deleted file mode 100644 index 428681897449..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-psprint+source+helper+strhelper.cxx +++ /dev/null @@ -1,24 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=27753 -o vcl34 - -Description -The isnan() macro is a new feature of C99 and not yet part of C++. -Index: source/helper/strhelper.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v -retrieving revision 1.6 -diff -u -r1.6 strhelper.cxx ---- psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 -+++ psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 -@@ -67,6 +67,10 @@ - #include <cmath> // for isnan - #include <cstring> - -+#if defined (FREEBSD) -+using namespace __gnu_cxx; //for isnan -+#endif -+ - namespace psp { - - inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-2-RC/files/patch-scp2+source+ooo+file_ooo.scp b/editors/openoffice.org-2-RC/files/patch-scp2+source+ooo+file_ooo.scp deleted file mode 100644 index ada03742b6cb..000000000000 --- a/editors/openoffice.org-2-RC/files/patch-scp2+source+ooo+file_ooo.scp +++ /dev/null @@ -1,25 +0,0 @@ -o #iZ XXXX -o CWS nativefixer3 -http://porting.openoffice.org/servlets/ReadMsg?list=dev&msgNo=15066 - -Index: scp2/source/ooo/file_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v -retrieving revision 1.66 -diff -u -r1.66 file_ooo.scp ---- scp2/source/ooo/file_ooo.scp 21 Jan 2005 12:14:20 -0000 1.66 -+++ scp2/source/ooo/file_ooo.scp 28 Jan 2005 08:29:31 -0000 -@@ -371,13 +371,6 @@ - Styles = (PACKED); - End - --File gid_File_Bin_Gnome_Set_Default_Application -- BIN_FILE_BODY; -- Dir = gid_Dir_Program; -- Name = "gnome-set-default-application"; -- Styles = (PACKED); --End -- - #endif - - File gid_File_Bin_Senddoc diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index c83ebda174c4..6b7746859266 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= 20050130 +SNAPDATE= 20050202 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= 75 +MILESTONE= 76 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 @@ -149,10 +149,10 @@ do-build: .endif @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}' -OOOFILES1= openofficeorg-calc.sw openofficeorg-core.sw openofficeorg-draw.sw openofficeorg-graphicfilter.sw -OOOFILES2= openofficeorg-impress.sw openofficeorg-javafilter.sw -OOOFILES3= openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw -OOOFILES4= openofficeorg-writer.sw openofficeorg-xsltfilter.sw +OOOFILES1= openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw +OOOFILES2= openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw +OOOFILES3= openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw +OOOFILES4= openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw do-install: @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo index 2edb271d5d18..fdc9e5a397f1 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.9m75_source.tar.bz2) = f21638bfbd7123d9a1f8d4aebbfcab4d -SIZE (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = 234721517 +MD5 (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 9a009beb8824d0d0a0191cf519323b62 +SIZE (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 242321515 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-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl deleted file mode 100644 index f77e24a3a1bf..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl +++ /dev/null @@ -1,32 +0,0 @@ -IZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=41006 -o CWS sdksample - -offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -contains an illigal char - -Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -=================================================================== -RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v -retrieving revision 1.4 -diff -u -r1.4 XParametricPolyPolygon2DFactory.idl ---- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4 -+++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000 -@@ -109,7 +109,7 @@ - linearly between center and endColor via concentric ellipses - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - circular. If it's not 1, the gradient is elliptical, with the - special twist that the aspect ratio is maintained also for the - center color: the gradient will not collapse into a single -@@ -124,7 +124,7 @@ - linearly between center and endColor via rectangular boxes - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - quadratic. If it's not 1, the gradient is rectangular, with - the special twist that the aspect ratio is maintained also for - the center color: the gradient will not collapse into a single diff --git a/editors/openoffice.org-2-devel/files/patch-project-jvmfwk b/editors/openoffice.org-2-devel/files/patch-project-jvmfwk deleted file mode 100644 index 65325d6056e8..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-project-jvmfwk +++ /dev/null @@ -1,67 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=40180 -o jre5issues -Description - -Vendor name of FreeBSD's Java -(http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk14/) -is Sun Microsystems Inc. so that we can use as Linux version -only difference is the out put of java -version -java version "1.4.2-p6" -trailing -pXX is different. - -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 16 Dec 2004 11:45:15 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 30 Dec 2004 12:55:14 -0000 -@@ -231,6 +231,8 @@ - m_preRelease = getPreRelease(pCur); - if (m_preRelease == Rel_NONE) - return false; -+ if (m_preRelease == Rel_FreeBSD) -+ return true; - } - else - { -@@ -267,6 +269,20 @@ - return Rel_RC2; - else if (! strcmp(szRelease, "rc3")) - return Rel_RC3; -+ else if (! strcmp(szRelease, "p5")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p6")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p7")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p8")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p9")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p10")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p11")) -+ return Rel_FreeBSD; - else - return Rel_NONE; - } -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.hxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 16 Dec 2004 11:45:27 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 30 Dec 2004 12:55:14 -0000 -@@ -107,6 +107,10 @@ - Rel_RC1, - Rel_RC2, - Rel_RC3 -+#if defined(FREEBSD) -+ , -+ Rel_FreeBSD -+#endif - }; - - //contains major,minor,micro,update diff --git a/editors/openoffice.org-2-devel/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-2-devel/files/patch-psprint+source+helper+strhelper.cxx deleted file mode 100644 index 428681897449..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-psprint+source+helper+strhelper.cxx +++ /dev/null @@ -1,24 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=27753 -o vcl34 - -Description -The isnan() macro is a new feature of C99 and not yet part of C++. -Index: source/helper/strhelper.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v -retrieving revision 1.6 -diff -u -r1.6 strhelper.cxx ---- psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 -+++ psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 -@@ -67,6 +67,10 @@ - #include <cmath> // for isnan - #include <cstring> - -+#if defined (FREEBSD) -+using namespace __gnu_cxx; //for isnan -+#endif -+ - namespace psp { - - inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-2-devel/files/patch-scp2+source+ooo+file_ooo.scp b/editors/openoffice.org-2-devel/files/patch-scp2+source+ooo+file_ooo.scp deleted file mode 100644 index ada03742b6cb..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-scp2+source+ooo+file_ooo.scp +++ /dev/null @@ -1,25 +0,0 @@ -o #iZ XXXX -o CWS nativefixer3 -http://porting.openoffice.org/servlets/ReadMsg?list=dev&msgNo=15066 - -Index: scp2/source/ooo/file_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v -retrieving revision 1.66 -diff -u -r1.66 file_ooo.scp ---- scp2/source/ooo/file_ooo.scp 21 Jan 2005 12:14:20 -0000 1.66 -+++ scp2/source/ooo/file_ooo.scp 28 Jan 2005 08:29:31 -0000 -@@ -371,13 +371,6 @@ - Styles = (PACKED); - End - --File gid_File_Bin_Gnome_Set_Default_Application -- BIN_FILE_BODY; -- Dir = gid_Dir_Program; -- Name = "gnome-set-default-application"; -- Styles = (PACKED); --End -- - #endif - - File gid_File_Bin_Senddoc diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index c83ebda174c4..6b7746859266 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= 20050130 +SNAPDATE= 20050202 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= 75 +MILESTONE= 76 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 @@ -149,10 +149,10 @@ do-build: .endif @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}' -OOOFILES1= openofficeorg-calc.sw openofficeorg-core.sw openofficeorg-draw.sw openofficeorg-graphicfilter.sw -OOOFILES2= openofficeorg-impress.sw openofficeorg-javafilter.sw -OOOFILES3= openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw -OOOFILES4= openofficeorg-writer.sw openofficeorg-xsltfilter.sw +OOOFILES1= openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw +OOOFILES2= openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw +OOOFILES3= openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw +OOOFILES4= openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw do-install: @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo index 2edb271d5d18..fdc9e5a397f1 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.9m75_source.tar.bz2) = f21638bfbd7123d9a1f8d4aebbfcab4d -SIZE (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = 234721517 +MD5 (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 9a009beb8824d0d0a0191cf519323b62 +SIZE (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 242321515 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-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 deleted file mode 100644 index f77e24a3a1bf..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl +++ /dev/null @@ -1,32 +0,0 @@ -IZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=41006 -o CWS sdksample - -offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -contains an illigal char - -Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -=================================================================== -RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v -retrieving revision 1.4 -diff -u -r1.4 XParametricPolyPolygon2DFactory.idl ---- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4 -+++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000 -@@ -109,7 +109,7 @@ - linearly between center and endColor via concentric ellipses - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - circular. If it's not 1, the gradient is elliptical, with the - special twist that the aspect ratio is maintained also for the - center color: the gradient will not collapse into a single -@@ -124,7 +124,7 @@ - linearly between center and endColor via rectangular boxes - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - quadratic. If it's not 1, the gradient is rectangular, with - the special twist that the aspect ratio is maintained also for - the center color: the gradient will not collapse into a single diff --git a/editors/openoffice.org-2.0-devel/files/patch-project-jvmfwk b/editors/openoffice.org-2.0-devel/files/patch-project-jvmfwk deleted file mode 100644 index 65325d6056e8..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-project-jvmfwk +++ /dev/null @@ -1,67 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=40180 -o jre5issues -Description - -Vendor name of FreeBSD's Java -(http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk14/) -is Sun Microsystems Inc. so that we can use as Linux version -only difference is the out put of java -version -java version "1.4.2-p6" -trailing -pXX is different. - -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 16 Dec 2004 11:45:15 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 30 Dec 2004 12:55:14 -0000 -@@ -231,6 +231,8 @@ - m_preRelease = getPreRelease(pCur); - if (m_preRelease == Rel_NONE) - return false; -+ if (m_preRelease == Rel_FreeBSD) -+ return true; - } - else - { -@@ -267,6 +269,20 @@ - return Rel_RC2; - else if (! strcmp(szRelease, "rc3")) - return Rel_RC3; -+ else if (! strcmp(szRelease, "p5")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p6")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p7")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p8")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p9")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p10")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p11")) -+ return Rel_FreeBSD; - else - return Rel_NONE; - } -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.hxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 16 Dec 2004 11:45:27 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 30 Dec 2004 12:55:14 -0000 -@@ -107,6 +107,10 @@ - Rel_RC1, - Rel_RC2, - Rel_RC3 -+#if defined(FREEBSD) -+ , -+ Rel_FreeBSD -+#endif - }; - - //contains major,minor,micro,update diff --git a/editors/openoffice.org-2.0-devel/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-2.0-devel/files/patch-psprint+source+helper+strhelper.cxx deleted file mode 100644 index 428681897449..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-psprint+source+helper+strhelper.cxx +++ /dev/null @@ -1,24 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=27753 -o vcl34 - -Description -The isnan() macro is a new feature of C99 and not yet part of C++. -Index: source/helper/strhelper.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v -retrieving revision 1.6 -diff -u -r1.6 strhelper.cxx ---- psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 -+++ psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 -@@ -67,6 +67,10 @@ - #include <cmath> // for isnan - #include <cstring> - -+#if defined (FREEBSD) -+using namespace __gnu_cxx; //for isnan -+#endif -+ - namespace psp { - - inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-2.0-devel/files/patch-scp2+source+ooo+file_ooo.scp b/editors/openoffice.org-2.0-devel/files/patch-scp2+source+ooo+file_ooo.scp deleted file mode 100644 index ada03742b6cb..000000000000 --- a/editors/openoffice.org-2.0-devel/files/patch-scp2+source+ooo+file_ooo.scp +++ /dev/null @@ -1,25 +0,0 @@ -o #iZ XXXX -o CWS nativefixer3 -http://porting.openoffice.org/servlets/ReadMsg?list=dev&msgNo=15066 - -Index: scp2/source/ooo/file_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v -retrieving revision 1.66 -diff -u -r1.66 file_ooo.scp ---- scp2/source/ooo/file_ooo.scp 21 Jan 2005 12:14:20 -0000 1.66 -+++ scp2/source/ooo/file_ooo.scp 28 Jan 2005 08:29:31 -0000 -@@ -371,13 +371,6 @@ - Styles = (PACKED); - End - --File gid_File_Bin_Gnome_Set_Default_Application -- BIN_FILE_BODY; -- Dir = gid_Dir_Program; -- Name = "gnome-set-default-application"; -- Styles = (PACKED); --End -- - #endif - - File gid_File_Bin_Senddoc diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index c83ebda174c4..6b7746859266 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= 20050130 +SNAPDATE= 20050202 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= 75 +MILESTONE= 76 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 @@ -149,10 +149,10 @@ do-build: .endif @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}' -OOOFILES1= openofficeorg-calc.sw openofficeorg-core.sw openofficeorg-draw.sw openofficeorg-graphicfilter.sw -OOOFILES2= openofficeorg-impress.sw openofficeorg-javafilter.sw -OOOFILES3= openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw -OOOFILES4= openofficeorg-writer.sw openofficeorg-xsltfilter.sw +OOOFILES1= openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw +OOOFILES2= openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw +OOOFILES3= openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw +OOOFILES4= openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw do-install: @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo index 2edb271d5d18..fdc9e5a397f1 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.9m75_source.tar.bz2) = f21638bfbd7123d9a1f8d4aebbfcab4d -SIZE (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = 234721517 +MD5 (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 9a009beb8824d0d0a0191cf519323b62 +SIZE (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 242321515 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-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl deleted file mode 100644 index f77e24a3a1bf..000000000000 --- a/editors/openoffice.org-2.0/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl +++ /dev/null @@ -1,32 +0,0 @@ -IZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=41006 -o CWS sdksample - -offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -contains an illigal char - -Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -=================================================================== -RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v -retrieving revision 1.4 -diff -u -r1.4 XParametricPolyPolygon2DFactory.idl ---- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4 -+++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000 -@@ -109,7 +109,7 @@ - linearly between center and endColor via concentric ellipses - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - circular. If it's not 1, the gradient is elliptical, with the - special twist that the aspect ratio is maintained also for the - center color: the gradient will not collapse into a single -@@ -124,7 +124,7 @@ - linearly between center and endColor via rectangular boxes - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - quadratic. If it's not 1, the gradient is rectangular, with - the special twist that the aspect ratio is maintained also for - the center color: the gradient will not collapse into a single diff --git a/editors/openoffice.org-2.0/files/patch-project-jvmfwk b/editors/openoffice.org-2.0/files/patch-project-jvmfwk deleted file mode 100644 index 65325d6056e8..000000000000 --- a/editors/openoffice.org-2.0/files/patch-project-jvmfwk +++ /dev/null @@ -1,67 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=40180 -o jre5issues -Description - -Vendor name of FreeBSD's Java -(http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk14/) -is Sun Microsystems Inc. so that we can use as Linux version -only difference is the out put of java -version -java version "1.4.2-p6" -trailing -pXX is different. - -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 16 Dec 2004 11:45:15 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 30 Dec 2004 12:55:14 -0000 -@@ -231,6 +231,8 @@ - m_preRelease = getPreRelease(pCur); - if (m_preRelease == Rel_NONE) - return false; -+ if (m_preRelease == Rel_FreeBSD) -+ return true; - } - else - { -@@ -267,6 +269,20 @@ - return Rel_RC2; - else if (! strcmp(szRelease, "rc3")) - return Rel_RC3; -+ else if (! strcmp(szRelease, "p5")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p6")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p7")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p8")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p9")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p10")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p11")) -+ return Rel_FreeBSD; - else - return Rel_NONE; - } -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.hxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 16 Dec 2004 11:45:27 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 30 Dec 2004 12:55:14 -0000 -@@ -107,6 +107,10 @@ - Rel_RC1, - Rel_RC2, - Rel_RC3 -+#if defined(FREEBSD) -+ , -+ Rel_FreeBSD -+#endif - }; - - //contains major,minor,micro,update diff --git a/editors/openoffice.org-2.0/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-2.0/files/patch-psprint+source+helper+strhelper.cxx deleted file mode 100644 index 428681897449..000000000000 --- a/editors/openoffice.org-2.0/files/patch-psprint+source+helper+strhelper.cxx +++ /dev/null @@ -1,24 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=27753 -o vcl34 - -Description -The isnan() macro is a new feature of C99 and not yet part of C++. -Index: source/helper/strhelper.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v -retrieving revision 1.6 -diff -u -r1.6 strhelper.cxx ---- psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 -+++ psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 -@@ -67,6 +67,10 @@ - #include <cmath> // for isnan - #include <cstring> - -+#if defined (FREEBSD) -+using namespace __gnu_cxx; //for isnan -+#endif -+ - namespace psp { - - inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-2.0/files/patch-scp2+source+ooo+file_ooo.scp b/editors/openoffice.org-2.0/files/patch-scp2+source+ooo+file_ooo.scp deleted file mode 100644 index ada03742b6cb..000000000000 --- a/editors/openoffice.org-2.0/files/patch-scp2+source+ooo+file_ooo.scp +++ /dev/null @@ -1,25 +0,0 @@ -o #iZ XXXX -o CWS nativefixer3 -http://porting.openoffice.org/servlets/ReadMsg?list=dev&msgNo=15066 - -Index: scp2/source/ooo/file_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v -retrieving revision 1.66 -diff -u -r1.66 file_ooo.scp ---- scp2/source/ooo/file_ooo.scp 21 Jan 2005 12:14:20 -0000 1.66 -+++ scp2/source/ooo/file_ooo.scp 28 Jan 2005 08:29:31 -0000 -@@ -371,13 +371,6 @@ - Styles = (PACKED); - End - --File gid_File_Bin_Gnome_Set_Default_Application -- BIN_FILE_BODY; -- Dir = gid_Dir_Program; -- Name = "gnome-set-default-application"; -- Styles = (PACKED); --End -- - #endif - - File gid_File_Bin_Senddoc diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile index c83ebda174c4..6b7746859266 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= 20050130 +SNAPDATE= 20050202 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= 75 +MILESTONE= 76 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 @@ -149,10 +149,10 @@ do-build: .endif @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}' -OOOFILES1= openofficeorg-calc.sw openofficeorg-core.sw openofficeorg-draw.sw openofficeorg-graphicfilter.sw -OOOFILES2= openofficeorg-impress.sw openofficeorg-javafilter.sw -OOOFILES3= openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw -OOOFILES4= openofficeorg-writer.sw openofficeorg-xsltfilter.sw +OOOFILES1= openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw +OOOFILES2= openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw +OOOFILES3= openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw +OOOFILES4= openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw do-install: @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo index 2edb271d5d18..fdc9e5a397f1 100644 --- a/editors/openoffice.org-2/distinfo +++ b/editors/openoffice.org-2/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = f21638bfbd7123d9a1f8d4aebbfcab4d -SIZE (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = 234721517 +MD5 (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 9a009beb8824d0d0a0191cf519323b62 +SIZE (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 242321515 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-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl deleted file mode 100644 index f77e24a3a1bf..000000000000 --- a/editors/openoffice.org-2/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl +++ /dev/null @@ -1,32 +0,0 @@ -IZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=41006 -o CWS sdksample - -offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -contains an illigal char - -Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -=================================================================== -RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v -retrieving revision 1.4 -diff -u -r1.4 XParametricPolyPolygon2DFactory.idl ---- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4 -+++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000 -@@ -109,7 +109,7 @@ - linearly between center and endColor via concentric ellipses - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - circular. If it's not 1, the gradient is elliptical, with the - special twist that the aspect ratio is maintained also for the - center color: the gradient will not collapse into a single -@@ -124,7 +124,7 @@ - linearly between center and endColor via rectangular boxes - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - quadratic. If it's not 1, the gradient is rectangular, with - the special twist that the aspect ratio is maintained also for - the center color: the gradient will not collapse into a single diff --git a/editors/openoffice.org-2/files/patch-project-jvmfwk b/editors/openoffice.org-2/files/patch-project-jvmfwk deleted file mode 100644 index 65325d6056e8..000000000000 --- a/editors/openoffice.org-2/files/patch-project-jvmfwk +++ /dev/null @@ -1,67 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=40180 -o jre5issues -Description - -Vendor name of FreeBSD's Java -(http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk14/) -is Sun Microsystems Inc. so that we can use as Linux version -only difference is the out put of java -version -java version "1.4.2-p6" -trailing -pXX is different. - -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 16 Dec 2004 11:45:15 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 30 Dec 2004 12:55:14 -0000 -@@ -231,6 +231,8 @@ - m_preRelease = getPreRelease(pCur); - if (m_preRelease == Rel_NONE) - return false; -+ if (m_preRelease == Rel_FreeBSD) -+ return true; - } - else - { -@@ -267,6 +269,20 @@ - return Rel_RC2; - else if (! strcmp(szRelease, "rc3")) - return Rel_RC3; -+ else if (! strcmp(szRelease, "p5")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p6")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p7")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p8")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p9")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p10")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p11")) -+ return Rel_FreeBSD; - else - return Rel_NONE; - } -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.hxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 16 Dec 2004 11:45:27 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 30 Dec 2004 12:55:14 -0000 -@@ -107,6 +107,10 @@ - Rel_RC1, - Rel_RC2, - Rel_RC3 -+#if defined(FREEBSD) -+ , -+ Rel_FreeBSD -+#endif - }; - - //contains major,minor,micro,update diff --git a/editors/openoffice.org-2/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-2/files/patch-psprint+source+helper+strhelper.cxx deleted file mode 100644 index 428681897449..000000000000 --- a/editors/openoffice.org-2/files/patch-psprint+source+helper+strhelper.cxx +++ /dev/null @@ -1,24 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=27753 -o vcl34 - -Description -The isnan() macro is a new feature of C99 and not yet part of C++. -Index: source/helper/strhelper.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v -retrieving revision 1.6 -diff -u -r1.6 strhelper.cxx ---- psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 -+++ psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 -@@ -67,6 +67,10 @@ - #include <cmath> // for isnan - #include <cstring> - -+#if defined (FREEBSD) -+using namespace __gnu_cxx; //for isnan -+#endif -+ - namespace psp { - - inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-2/files/patch-scp2+source+ooo+file_ooo.scp b/editors/openoffice.org-2/files/patch-scp2+source+ooo+file_ooo.scp deleted file mode 100644 index ada03742b6cb..000000000000 --- a/editors/openoffice.org-2/files/patch-scp2+source+ooo+file_ooo.scp +++ /dev/null @@ -1,25 +0,0 @@ -o #iZ XXXX -o CWS nativefixer3 -http://porting.openoffice.org/servlets/ReadMsg?list=dev&msgNo=15066 - -Index: scp2/source/ooo/file_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v -retrieving revision 1.66 -diff -u -r1.66 file_ooo.scp ---- scp2/source/ooo/file_ooo.scp 21 Jan 2005 12:14:20 -0000 1.66 -+++ scp2/source/ooo/file_ooo.scp 28 Jan 2005 08:29:31 -0000 -@@ -371,13 +371,6 @@ - Styles = (PACKED); - End - --File gid_File_Bin_Gnome_Set_Default_Application -- BIN_FILE_BODY; -- Dir = gid_Dir_Program; -- Name = "gnome-set-default-application"; -- Styles = (PACKED); --End -- - #endif - - File gid_File_Bin_Senddoc diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index c83ebda174c4..6b7746859266 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= 20050130 +SNAPDATE= 20050202 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= 75 +MILESTONE= 76 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 @@ -149,10 +149,10 @@ do-build: .endif @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}' -OOOFILES1= openofficeorg-calc.sw openofficeorg-core.sw openofficeorg-draw.sw openofficeorg-graphicfilter.sw -OOOFILES2= openofficeorg-impress.sw openofficeorg-javafilter.sw -OOOFILES3= openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw -OOOFILES4= openofficeorg-writer.sw openofficeorg-xsltfilter.sw +OOOFILES1= openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw +OOOFILES2= openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw +OOOFILES3= openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw +OOOFILES4= openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw do-install: @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo index 2edb271d5d18..fdc9e5a397f1 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.9m75_source.tar.bz2) = f21638bfbd7123d9a1f8d4aebbfcab4d -SIZE (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = 234721517 +MD5 (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 9a009beb8824d0d0a0191cf519323b62 +SIZE (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 242321515 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-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-3-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl deleted file mode 100644 index f77e24a3a1bf..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl +++ /dev/null @@ -1,32 +0,0 @@ -IZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=41006 -o CWS sdksample - -offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -contains an illigal char - -Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -=================================================================== -RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v -retrieving revision 1.4 -diff -u -r1.4 XParametricPolyPolygon2DFactory.idl ---- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4 -+++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000 -@@ -109,7 +109,7 @@ - linearly between center and endColor via concentric ellipses - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - circular. If it's not 1, the gradient is elliptical, with the - special twist that the aspect ratio is maintained also for the - center color: the gradient will not collapse into a single -@@ -124,7 +124,7 @@ - linearly between center and endColor via rectangular boxes - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - quadratic. If it's not 1, the gradient is rectangular, with - the special twist that the aspect ratio is maintained also for - the center color: the gradient will not collapse into a single diff --git a/editors/openoffice.org-3-RC/files/patch-project-jvmfwk b/editors/openoffice.org-3-RC/files/patch-project-jvmfwk deleted file mode 100644 index 65325d6056e8..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-project-jvmfwk +++ /dev/null @@ -1,67 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=40180 -o jre5issues -Description - -Vendor name of FreeBSD's Java -(http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk14/) -is Sun Microsystems Inc. so that we can use as Linux version -only difference is the out put of java -version -java version "1.4.2-p6" -trailing -pXX is different. - -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 16 Dec 2004 11:45:15 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 30 Dec 2004 12:55:14 -0000 -@@ -231,6 +231,8 @@ - m_preRelease = getPreRelease(pCur); - if (m_preRelease == Rel_NONE) - return false; -+ if (m_preRelease == Rel_FreeBSD) -+ return true; - } - else - { -@@ -267,6 +269,20 @@ - return Rel_RC2; - else if (! strcmp(szRelease, "rc3")) - return Rel_RC3; -+ else if (! strcmp(szRelease, "p5")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p6")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p7")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p8")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p9")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p10")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p11")) -+ return Rel_FreeBSD; - else - return Rel_NONE; - } -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.hxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 16 Dec 2004 11:45:27 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 30 Dec 2004 12:55:14 -0000 -@@ -107,6 +107,10 @@ - Rel_RC1, - Rel_RC2, - Rel_RC3 -+#if defined(FREEBSD) -+ , -+ Rel_FreeBSD -+#endif - }; - - //contains major,minor,micro,update diff --git a/editors/openoffice.org-3-RC/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-3-RC/files/patch-psprint+source+helper+strhelper.cxx deleted file mode 100644 index 428681897449..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-psprint+source+helper+strhelper.cxx +++ /dev/null @@ -1,24 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=27753 -o vcl34 - -Description -The isnan() macro is a new feature of C99 and not yet part of C++. -Index: source/helper/strhelper.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v -retrieving revision 1.6 -diff -u -r1.6 strhelper.cxx ---- psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 -+++ psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 -@@ -67,6 +67,10 @@ - #include <cmath> // for isnan - #include <cstring> - -+#if defined (FREEBSD) -+using namespace __gnu_cxx; //for isnan -+#endif -+ - namespace psp { - - inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-3-RC/files/patch-scp2+source+ooo+file_ooo.scp b/editors/openoffice.org-3-RC/files/patch-scp2+source+ooo+file_ooo.scp deleted file mode 100644 index ada03742b6cb..000000000000 --- a/editors/openoffice.org-3-RC/files/patch-scp2+source+ooo+file_ooo.scp +++ /dev/null @@ -1,25 +0,0 @@ -o #iZ XXXX -o CWS nativefixer3 -http://porting.openoffice.org/servlets/ReadMsg?list=dev&msgNo=15066 - -Index: scp2/source/ooo/file_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v -retrieving revision 1.66 -diff -u -r1.66 file_ooo.scp ---- scp2/source/ooo/file_ooo.scp 21 Jan 2005 12:14:20 -0000 1.66 -+++ scp2/source/ooo/file_ooo.scp 28 Jan 2005 08:29:31 -0000 -@@ -371,13 +371,6 @@ - Styles = (PACKED); - End - --File gid_File_Bin_Gnome_Set_Default_Application -- BIN_FILE_BODY; -- Dir = gid_Dir_Program; -- Name = "gnome-set-default-application"; -- Styles = (PACKED); --End -- - #endif - - File gid_File_Bin_Senddoc diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index c83ebda174c4..6b7746859266 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= 20050130 +SNAPDATE= 20050202 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= 75 +MILESTONE= 76 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 @@ -149,10 +149,10 @@ do-build: .endif @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}' -OOOFILES1= openofficeorg-calc.sw openofficeorg-core.sw openofficeorg-draw.sw openofficeorg-graphicfilter.sw -OOOFILES2= openofficeorg-impress.sw openofficeorg-javafilter.sw -OOOFILES3= openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw -OOOFILES4= openofficeorg-writer.sw openofficeorg-xsltfilter.sw +OOOFILES1= openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw +OOOFILES2= openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw +OOOFILES3= openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw +OOOFILES4= openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw do-install: @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index 2edb271d5d18..fdc9e5a397f1 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.9m75_source.tar.bz2) = f21638bfbd7123d9a1f8d4aebbfcab4d -SIZE (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = 234721517 +MD5 (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 9a009beb8824d0d0a0191cf519323b62 +SIZE (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 242321515 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-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl deleted file mode 100644 index f77e24a3a1bf..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl +++ /dev/null @@ -1,32 +0,0 @@ -IZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=41006 -o CWS sdksample - -offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -contains an illigal char - -Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -=================================================================== -RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v -retrieving revision 1.4 -diff -u -r1.4 XParametricPolyPolygon2DFactory.idl ---- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4 -+++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000 -@@ -109,7 +109,7 @@ - linearly between center and endColor via concentric ellipses - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - circular. If it's not 1, the gradient is elliptical, with the - special twist that the aspect ratio is maintained also for the - center color: the gradient will not collapse into a single -@@ -124,7 +124,7 @@ - linearly between center and endColor via rectangular boxes - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - quadratic. If it's not 1, the gradient is rectangular, with - the special twist that the aspect ratio is maintained also for - the center color: the gradient will not collapse into a single diff --git a/editors/openoffice.org-3-devel/files/patch-project-jvmfwk b/editors/openoffice.org-3-devel/files/patch-project-jvmfwk deleted file mode 100644 index 65325d6056e8..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-project-jvmfwk +++ /dev/null @@ -1,67 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=40180 -o jre5issues -Description - -Vendor name of FreeBSD's Java -(http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk14/) -is Sun Microsystems Inc. so that we can use as Linux version -only difference is the out put of java -version -java version "1.4.2-p6" -trailing -pXX is different. - -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 16 Dec 2004 11:45:15 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 30 Dec 2004 12:55:14 -0000 -@@ -231,6 +231,8 @@ - m_preRelease = getPreRelease(pCur); - if (m_preRelease == Rel_NONE) - return false; -+ if (m_preRelease == Rel_FreeBSD) -+ return true; - } - else - { -@@ -267,6 +269,20 @@ - return Rel_RC2; - else if (! strcmp(szRelease, "rc3")) - return Rel_RC3; -+ else if (! strcmp(szRelease, "p5")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p6")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p7")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p8")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p9")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p10")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p11")) -+ return Rel_FreeBSD; - else - return Rel_NONE; - } -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.hxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 16 Dec 2004 11:45:27 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 30 Dec 2004 12:55:14 -0000 -@@ -107,6 +107,10 @@ - Rel_RC1, - Rel_RC2, - Rel_RC3 -+#if defined(FREEBSD) -+ , -+ Rel_FreeBSD -+#endif - }; - - //contains major,minor,micro,update diff --git a/editors/openoffice.org-3-devel/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-3-devel/files/patch-psprint+source+helper+strhelper.cxx deleted file mode 100644 index 428681897449..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-psprint+source+helper+strhelper.cxx +++ /dev/null @@ -1,24 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=27753 -o vcl34 - -Description -The isnan() macro is a new feature of C99 and not yet part of C++. -Index: source/helper/strhelper.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v -retrieving revision 1.6 -diff -u -r1.6 strhelper.cxx ---- psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 -+++ psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 -@@ -67,6 +67,10 @@ - #include <cmath> // for isnan - #include <cstring> - -+#if defined (FREEBSD) -+using namespace __gnu_cxx; //for isnan -+#endif -+ - namespace psp { - - inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-3-devel/files/patch-scp2+source+ooo+file_ooo.scp b/editors/openoffice.org-3-devel/files/patch-scp2+source+ooo+file_ooo.scp deleted file mode 100644 index ada03742b6cb..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-scp2+source+ooo+file_ooo.scp +++ /dev/null @@ -1,25 +0,0 @@ -o #iZ XXXX -o CWS nativefixer3 -http://porting.openoffice.org/servlets/ReadMsg?list=dev&msgNo=15066 - -Index: scp2/source/ooo/file_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v -retrieving revision 1.66 -diff -u -r1.66 file_ooo.scp ---- scp2/source/ooo/file_ooo.scp 21 Jan 2005 12:14:20 -0000 1.66 -+++ scp2/source/ooo/file_ooo.scp 28 Jan 2005 08:29:31 -0000 -@@ -371,13 +371,6 @@ - Styles = (PACKED); - End - --File gid_File_Bin_Gnome_Set_Default_Application -- BIN_FILE_BODY; -- Dir = gid_Dir_Program; -- Name = "gnome-set-default-application"; -- Styles = (PACKED); --End -- - #endif - - File gid_File_Bin_Senddoc diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile index c83ebda174c4..6b7746859266 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= 20050130 +SNAPDATE= 20050202 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= 75 +MILESTONE= 76 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 @@ -149,10 +149,10 @@ do-build: .endif @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}' -OOOFILES1= openofficeorg-calc.sw openofficeorg-core.sw openofficeorg-draw.sw openofficeorg-graphicfilter.sw -OOOFILES2= openofficeorg-impress.sw openofficeorg-javafilter.sw -OOOFILES3= openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw -OOOFILES4= openofficeorg-writer.sw openofficeorg-xsltfilter.sw +OOOFILES1= openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw +OOOFILES2= openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw +OOOFILES3= openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw +OOOFILES4= openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw do-install: @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo index 2edb271d5d18..fdc9e5a397f1 100644 --- a/editors/openoffice.org-3/distinfo +++ b/editors/openoffice.org-3/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = f21638bfbd7123d9a1f8d4aebbfcab4d -SIZE (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = 234721517 +MD5 (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 9a009beb8824d0d0a0191cf519323b62 +SIZE (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 242321515 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-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl deleted file mode 100644 index f77e24a3a1bf..000000000000 --- a/editors/openoffice.org-3/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl +++ /dev/null @@ -1,32 +0,0 @@ -IZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=41006 -o CWS sdksample - -offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -contains an illigal char - -Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -=================================================================== -RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v -retrieving revision 1.4 -diff -u -r1.4 XParametricPolyPolygon2DFactory.idl ---- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4 -+++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000 -@@ -109,7 +109,7 @@ - linearly between center and endColor via concentric ellipses - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - circular. If it's not 1, the gradient is elliptical, with the - special twist that the aspect ratio is maintained also for the - center color: the gradient will not collapse into a single -@@ -124,7 +124,7 @@ - linearly between center and endColor via rectangular boxes - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - quadratic. If it's not 1, the gradient is rectangular, with - the special twist that the aspect ratio is maintained also for - the center color: the gradient will not collapse into a single diff --git a/editors/openoffice.org-3/files/patch-project-jvmfwk b/editors/openoffice.org-3/files/patch-project-jvmfwk deleted file mode 100644 index 65325d6056e8..000000000000 --- a/editors/openoffice.org-3/files/patch-project-jvmfwk +++ /dev/null @@ -1,67 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=40180 -o jre5issues -Description - -Vendor name of FreeBSD's Java -(http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk14/) -is Sun Microsystems Inc. so that we can use as Linux version -only difference is the out put of java -version -java version "1.4.2-p6" -trailing -pXX is different. - -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 16 Dec 2004 11:45:15 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 30 Dec 2004 12:55:14 -0000 -@@ -231,6 +231,8 @@ - m_preRelease = getPreRelease(pCur); - if (m_preRelease == Rel_NONE) - return false; -+ if (m_preRelease == Rel_FreeBSD) -+ return true; - } - else - { -@@ -267,6 +269,20 @@ - return Rel_RC2; - else if (! strcmp(szRelease, "rc3")) - return Rel_RC3; -+ else if (! strcmp(szRelease, "p5")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p6")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p7")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p8")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p9")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p10")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p11")) -+ return Rel_FreeBSD; - else - return Rel_NONE; - } -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.hxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 16 Dec 2004 11:45:27 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 30 Dec 2004 12:55:14 -0000 -@@ -107,6 +107,10 @@ - Rel_RC1, - Rel_RC2, - Rel_RC3 -+#if defined(FREEBSD) -+ , -+ Rel_FreeBSD -+#endif - }; - - //contains major,minor,micro,update diff --git a/editors/openoffice.org-3/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-3/files/patch-psprint+source+helper+strhelper.cxx deleted file mode 100644 index 428681897449..000000000000 --- a/editors/openoffice.org-3/files/patch-psprint+source+helper+strhelper.cxx +++ /dev/null @@ -1,24 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=27753 -o vcl34 - -Description -The isnan() macro is a new feature of C99 and not yet part of C++. -Index: source/helper/strhelper.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v -retrieving revision 1.6 -diff -u -r1.6 strhelper.cxx ---- psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 -+++ psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 -@@ -67,6 +67,10 @@ - #include <cmath> // for isnan - #include <cstring> - -+#if defined (FREEBSD) -+using namespace __gnu_cxx; //for isnan -+#endif -+ - namespace psp { - - inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-3/files/patch-scp2+source+ooo+file_ooo.scp b/editors/openoffice.org-3/files/patch-scp2+source+ooo+file_ooo.scp deleted file mode 100644 index ada03742b6cb..000000000000 --- a/editors/openoffice.org-3/files/patch-scp2+source+ooo+file_ooo.scp +++ /dev/null @@ -1,25 +0,0 @@ -o #iZ XXXX -o CWS nativefixer3 -http://porting.openoffice.org/servlets/ReadMsg?list=dev&msgNo=15066 - -Index: scp2/source/ooo/file_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v -retrieving revision 1.66 -diff -u -r1.66 file_ooo.scp ---- scp2/source/ooo/file_ooo.scp 21 Jan 2005 12:14:20 -0000 1.66 -+++ scp2/source/ooo/file_ooo.scp 28 Jan 2005 08:29:31 -0000 -@@ -371,13 +371,6 @@ - Styles = (PACKED); - End - --File gid_File_Bin_Gnome_Set_Default_Application -- BIN_FILE_BODY; -- Dir = gid_Dir_Program; -- Name = "gnome-set-default-application"; -- Styles = (PACKED); --End -- - #endif - - File gid_File_Bin_Senddoc diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index c83ebda174c4..6b7746859266 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= 20050130 +SNAPDATE= 20050202 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= 75 +MILESTONE= 76 INSTALLATION_BASEDIR= openoffice.org${RELEASE_NR}m${MILESTONE} EXECBASE= openoffice.org-${RELEASE_NR}m${MILESTONE} DIST_SUBDIR= openoffice.org2.0 @@ -149,10 +149,10 @@ do-build: .endif @cd ${WRKSRC} ; ${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c 'source FreeBSDEnv.Set ; dmake -P${NUMOFPROCESSES}' -OOOFILES1= openofficeorg-calc.sw openofficeorg-core.sw openofficeorg-draw.sw openofficeorg-graphicfilter.sw -OOOFILES2= openofficeorg-impress.sw openofficeorg-javafilter.sw -OOOFILES3= openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw -OOOFILES4= openofficeorg-writer.sw openofficeorg-xsltfilter.sw +OOOFILES1= openofficeorg-calc.sw openofficeorg-core01.sw openofficeorg-core02.sw openofficeorg-core03.sw openofficeorg-core04.sw openofficeorg-core05.sw +OOOFILES2= openofficeorg-core06.sw openofficeorg-core07.sw openofficeorg-core08.sw +OOOFILES3= openofficeorg-draw.sw openofficeorg-graphicfilter.sw openofficeorg-impress.sw +OOOFILES4= openofficeorg-javafilter.sw openofficeorg-math.sw openofficeorg-spellcheck.sw openofficeorg-testtool.sw openofficeorg-writer.sw openofficeorg-xsltfilter.sw do-install: @${RM} -Rf ${WRKDIR}/tmp diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo index 2edb271d5d18..fdc9e5a397f1 100644 --- a/editors/openoffice.org-vcltesttool/distinfo +++ b/editors/openoffice.org-vcltesttool/distinfo @@ -1,5 +1,5 @@ -MD5 (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = f21638bfbd7123d9a1f8d4aebbfcab4d -SIZE (openoffice.org2.0/OOo_1.9m75_source.tar.bz2) = 234721517 +MD5 (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 9a009beb8824d0d0a0191cf519323b62 +SIZE (openoffice.org2.0/OOo_1.9m76_source.tar.bz2) = 242321515 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-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl b/editors/openoffice.org-vcltesttool/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl deleted file mode 100644 index f77e24a3a1bf..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-offapi+drafts+com+sun+star+rendering+XParametericPolyPolygon2DFactory.idl +++ /dev/null @@ -1,32 +0,0 @@ -IZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=41006 -o CWS sdksample - -offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -contains an illigal char - -Index: offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl -=================================================================== -RCS file: /cvs/api/offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl,v -retrieving revision 1.4 -diff -u -r1.4 XParametricPolyPolygon2DFactory.idl ---- offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 13 Jan 2005 18:04:20 -0000 1.4 -+++ offapi/drafts/com/sun/star/rendering/XParametricPolyPolygon2DFactory.idl 19 Jan 2005 23:45:31 -0000 -@@ -109,7 +109,7 @@ - linearly between center and endColor via concentric ellipses - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - circular. If it's not 1, the gradient is elliptical, with the - special twist that the aspect ratio is maintained also for the - center color: the gradient will not collapse into a single -@@ -124,7 +124,7 @@ - linearly between center and endColor via rectangular boxes - around the center point. Note that the absolute size of the - rectangle given at this method does not matter, only it's -- aspect ratio: if this aspect ratio ís 1, the gradient is -+ aspect ratio: if this aspect ratio is 1, the gradient is - quadratic. If it's not 1, the gradient is rectangular, with - the special twist that the aspect ratio is maintained also for - the center color: the gradient will not collapse into a single diff --git a/editors/openoffice.org-vcltesttool/files/patch-project-jvmfwk b/editors/openoffice.org-vcltesttool/files/patch-project-jvmfwk deleted file mode 100644 index 65325d6056e8..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-project-jvmfwk +++ /dev/null @@ -1,67 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=40180 -o jre5issues -Description - -Vendor name of FreeBSD's Java -(http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk14/) -is Sun Microsystems Inc. so that we can use as Linux version -only difference is the out put of java -version -java version "1.4.2-p6" -trailing -pXX is different. - -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.cxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 16 Dec 2004 11:45:15 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx 30 Dec 2004 12:55:14 -0000 -@@ -231,6 +231,8 @@ - m_preRelease = getPreRelease(pCur); - if (m_preRelease == Rel_NONE) - return false; -+ if (m_preRelease == Rel_FreeBSD) -+ return true; - } - else - { -@@ -267,6 +269,20 @@ - return Rel_RC2; - else if (! strcmp(szRelease, "rc3")) - return Rel_RC3; -+ else if (! strcmp(szRelease, "p5")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p6")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p7")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p8")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p9")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p10")) -+ return Rel_FreeBSD; -+ else if (! strcmp(szRelease, "p11")) -+ return Rel_FreeBSD; - else - return Rel_NONE; - } -Index: jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx -=================================================================== -RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx,v -retrieving revision 1.5 -diff -u -r1.5 sunversion.hxx ---- jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 16 Dec 2004 11:45:27 -0000 1.5 -+++ jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx 30 Dec 2004 12:55:14 -0000 -@@ -107,6 +107,10 @@ - Rel_RC1, - Rel_RC2, - Rel_RC3 -+#if defined(FREEBSD) -+ , -+ Rel_FreeBSD -+#endif - }; - - //contains major,minor,micro,update diff --git a/editors/openoffice.org-vcltesttool/files/patch-psprint+source+helper+strhelper.cxx b/editors/openoffice.org-vcltesttool/files/patch-psprint+source+helper+strhelper.cxx deleted file mode 100644 index 428681897449..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-psprint+source+helper+strhelper.cxx +++ /dev/null @@ -1,24 +0,0 @@ -#iZ and CWS -o http://www.openoffice.org/issues/show_bug.cgi?id=27753 -o vcl34 - -Description -The isnan() macro is a new feature of C99 and not yet part of C++. -Index: source/helper/strhelper.cxx -=================================================================== -RCS file: /cvs/gsl/psprint/source/helper/strhelper.cxx,v -retrieving revision 1.6 -diff -u -r1.6 strhelper.cxx ---- psprint/source/helper/strhelper.cxx 30 Mar 2004 13:48:06 -0000 1.6 -+++ psprint/source/helper/strhelper.cxx 13 Apr 2004 22:26:11 -0000 -@@ -67,6 +67,10 @@ - #include <cmath> // for isnan - #include <cstring> - -+#if defined (FREEBSD) -+using namespace __gnu_cxx; //for isnan -+#endif -+ - namespace psp { - - inline int isSpace( char cChar ) diff --git a/editors/openoffice.org-vcltesttool/files/patch-scp2+source+ooo+file_ooo.scp b/editors/openoffice.org-vcltesttool/files/patch-scp2+source+ooo+file_ooo.scp deleted file mode 100644 index ada03742b6cb..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-scp2+source+ooo+file_ooo.scp +++ /dev/null @@ -1,25 +0,0 @@ -o #iZ XXXX -o CWS nativefixer3 -http://porting.openoffice.org/servlets/ReadMsg?list=dev&msgNo=15066 - -Index: scp2/source/ooo/file_ooo.scp -=================================================================== -RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v -retrieving revision 1.66 -diff -u -r1.66 file_ooo.scp ---- scp2/source/ooo/file_ooo.scp 21 Jan 2005 12:14:20 -0000 1.66 -+++ scp2/source/ooo/file_ooo.scp 28 Jan 2005 08:29:31 -0000 -@@ -371,13 +371,6 @@ - Styles = (PACKED); - End - --File gid_File_Bin_Gnome_Set_Default_Application -- BIN_FILE_BODY; -- Dir = gid_Dir_Program; -- Name = "gnome-set-default-application"; -- Styles = (PACKED); --End -- - #endif - - File gid_File_Bin_Senddoc |