From e83a33f639389d2e51a138fe8248bce0ee46f8de Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Wed, 17 Jul 2002 07:41:47 +0000 Subject: Upgrade to 1.0.1 --- editors/openoffice-1.0/Makefile | 7 +-- editors/openoffice-1.0/distinfo | 2 +- .../files/patch-MDatabaseMetaDataHelper.cxx | 71 ---------------------- editors/openoffice-1.0/files/patch-MNSInclude.hxx | 22 ------- .../openoffice-1.0/files/patch-MTypeConverter.cxx | 26 -------- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-config_office+set_soenv.1 | 63 ++++++++----------- .../files/patch-config_office::configure.in | 43 ++----------- ...source::drivers::mozab::mozillasrc::MNSInit.cxx | 23 ------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../patch-cosv::source::strings::streamstr.cxx | 11 ++++ .../files/patch-external::zlib::zlibpatch.sh | 11 ---- .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../patch-product::inc::scp::udk_basefiles.scp | 44 +++----------- .../files/patch-product::util::makefile.mk | 67 ++++---------------- editors/openoffice-1.0/files/patch-set_soenv.1 | 63 ++++++++----------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-solenv::inc::tg_ext.mk | 43 ++++--------- .../files/patch-tools::source::string::charset.cxx | 12 ---- .../openoffice-1.0/files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-unzip::source::misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../openoffice-1.1/files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../openoffice-3/files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../openoffice-3/files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- editors/openoffice.org-1.0/Makefile | 7 +-- editors/openoffice.org-1.0/distinfo | 2 +- .../files/patch-MDatabaseMetaDataHelper.cxx | 71 ---------------------- .../openoffice.org-1.0/files/patch-MNSInclude.hxx | 22 ------- .../files/patch-MTypeConverter.cxx | 26 -------- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-config_office+set_soenv.1 | 63 ++++++++----------- .../files/patch-config_office::configure.in | 43 ++----------- ...source::drivers::mozab::mozillasrc::MNSInit.cxx | 23 ------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../patch-cosv::source::strings::streamstr.cxx | 11 ++++ .../files/patch-external::zlib::zlibpatch.sh | 11 ---- .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../patch-product::inc::scp::udk_basefiles.scp | 44 +++----------- .../files/patch-product::util::makefile.mk | 67 ++++---------------- editors/openoffice.org-1.0/files/patch-set_soenv.1 | 63 ++++++++----------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-solenv::inc::tg_ext.mk | 43 ++++--------- .../files/patch-tools::source::string::charset.cxx | 12 ---- .../files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-unzip::source::misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../files/patch-unzip+source+misc.c | 14 +++-- editors/openoffice/Makefile | 7 +-- editors/openoffice/distinfo | 2 +- .../files/patch-MDatabaseMetaDataHelper.cxx | 71 ---------------------- editors/openoffice/files/patch-MNSInclude.hxx | 22 ------- editors/openoffice/files/patch-MTypeConverter.cxx | 26 -------- .../files/patch-config_office+configure.in | 43 ++----------- .../files/patch-config_office+set_soenv.1 | 63 ++++++++----------- .../files/patch-config_office::configure.in | 43 ++----------- ...source::drivers::mozab::mozillasrc::MNSInit.cxx | 23 ------- .../files/patch-cosv+source+strings+streamstr.cxx | 11 ++++ .../patch-cosv::source::strings::streamstr.cxx | 11 ++++ .../files/patch-external::zlib::zlibpatch.sh | 11 ---- .../files/patch-product+inc+scp+udk_basefiles.scp | 44 +++----------- .../files/patch-product+util+makefile.mk | 67 ++++---------------- .../patch-product::inc::scp::udk_basefiles.scp | 44 +++----------- .../files/patch-product::util::makefile.mk | 67 ++++---------------- editors/openoffice/files/patch-set_soenv.1 | 63 ++++++++----------- .../openoffice/files/patch-solenv+inc+tg_ext.mk | 43 ++++--------- .../openoffice/files/patch-solenv::inc::tg_ext.mk | 43 ++++--------- .../files/patch-tools::source::string::charset.cxx | 12 ---- editors/openoffice/files/patch-unzip+source+misc.c | 14 +++-- .../openoffice/files/patch-unzip::source::misc.c | 14 +++-- 168 files changed, 1416 insertions(+), 4590 deletions(-) delete mode 100644 editors/openoffice-1.0/files/patch-MDatabaseMetaDataHelper.cxx delete mode 100644 editors/openoffice-1.0/files/patch-MNSInclude.hxx delete mode 100644 editors/openoffice-1.0/files/patch-MTypeConverter.cxx delete mode 100644 editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx create mode 100644 editors/openoffice-1.0/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice-1.0/files/patch-cosv::source::strings::streamstr.cxx delete mode 100644 editors/openoffice-1.0/files/patch-external::zlib::zlibpatch.sh delete mode 100644 editors/openoffice-1.0/files/patch-tools::source::string::charset.cxx create mode 100644 editors/openoffice-1.1-devel/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice-1.1/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice-2.0-devel/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice-3-devel/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice-3/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice-devel/files/patch-cosv+source+strings+streamstr.cxx delete mode 100644 editors/openoffice.org-1.0/files/patch-MDatabaseMetaDataHelper.cxx delete mode 100644 editors/openoffice.org-1.0/files/patch-MNSInclude.hxx delete mode 100644 editors/openoffice.org-1.0/files/patch-MTypeConverter.cxx delete mode 100644 editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx create mode 100644 editors/openoffice.org-1.0/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice.org-1.0/files/patch-cosv::source::strings::streamstr.cxx delete mode 100644 editors/openoffice.org-1.0/files/patch-external::zlib::zlibpatch.sh delete mode 100644 editors/openoffice.org-1.0/files/patch-tools::source::string::charset.cxx create mode 100644 editors/openoffice.org-1.1-devel/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice.org-1.1/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice.org-2-RC/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice.org-2-devel/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice.org-2.0-devel/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice.org-2.0/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice.org-2/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice.org-3-RC/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice.org-3-devel/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice.org-3/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice.org-vcltesttool/files/patch-cosv+source+strings+streamstr.cxx delete mode 100644 editors/openoffice/files/patch-MDatabaseMetaDataHelper.cxx delete mode 100644 editors/openoffice/files/patch-MNSInclude.hxx delete mode 100644 editors/openoffice/files/patch-MTypeConverter.cxx delete mode 100644 editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx create mode 100644 editors/openoffice/files/patch-cosv+source+strings+streamstr.cxx create mode 100644 editors/openoffice/files/patch-cosv::source::strings::streamstr.cxx delete mode 100644 editors/openoffice/files/patch-external::zlib::zlibpatch.sh delete mode 100644 editors/openoffice/files/patch-tools::source::string::charset.cxx diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index eb0301300ec2..4f881cf264d8 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -6,11 +6,10 @@ # PORTNAME= openoffice -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.0.1 +PORTREVISION= 0 CATEGORIES+= editors MASTER_SITES+= ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \ - http://niihau.student.utwente.nl/openoffice/${PORTVERSION}/ \ http://sf1.mirror.openoffice.org/${PORTVERSION}/ \ ftp://gd.tuwien.ac.at/office/openoffice/${PORTVERSION}/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \ @@ -124,7 +123,7 @@ JAVAVM= ${JDK13DIR}/bin/java GNU_CONFIGURE= yes USE_AUTOCONF= yes -WRKSRC= ${WRKDIR}/oo_1.0_src/config_office +WRKSRC= ${WRKDIR}/oo_1.0.1_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) diff --git a/editors/openoffice-1.0/distinfo b/editors/openoffice-1.0/distinfo index d62a88312f84..3de512652539 100644 --- a/editors/openoffice-1.0/distinfo +++ b/editors/openoffice-1.0/distinfo @@ -1,4 +1,4 @@ -MD5 (openoffice/OOo_1.0.0_source.tar.bz2) = f5dbcf74a3b025280a2afd3e5913da16 +MD5 (openoffice/OOo_1.0.1_source.tar.bz2) = 1c5d8e9195fc4da6ef9745f327fcb3c1 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 MD5 (openoffice/oo_moz1.0RC3_i386_FreeBSD-4-gcc2.95-system.tar.gz) = ea99811ee477a49bc1617dc9dace866d MD5 (openoffice/oo_moz1.0RC3_i386_FreeBSD-5-gcc2.95-ports.tar.gz) = 5364047f750d7fae380bb97887747b39 diff --git a/editors/openoffice-1.0/files/patch-MDatabaseMetaDataHelper.cxx b/editors/openoffice-1.0/files/patch-MDatabaseMetaDataHelper.cxx deleted file mode 100644 index 4b92670204e7..000000000000 --- a/editors/openoffice-1.0/files/patch-MDatabaseMetaDataHelper.cxx +++ /dev/null @@ -1,71 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx.orig Sat May 18 01:46:08 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx Sat May 18 01:56:23 2002 -@@ -2,9 +2,9 @@ - * - * $RCSfile: MDatabaseMetaDataHelper.cxx,v $ - * -- * $Revision: 1.5 $ -+ * $Revision: 1.6 $ - * -- * last change: $Author: dkenny $ $Date: 2001/12/13 09:34:19 $ -+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -213,11 +213,15 @@ - - retCode = dirFactoryService->GetDirFactory(aFactory.getStr(), getter_AddRefs(dirFactory)) ; - NS_ENSURE_SUCCESS (retCode, retCode) ; -- OUString value = OStringToOUString(aFactory, RTL_TEXTENCODING_ASCII_US) ; -- const PRUnichar *valueChars = value.getStr() ; -- nsCOMPtr subDirs ; -+ nsCOMPtr properties; -+ properties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &retCode); -+ NS_ENSURE_SUCCESS(retCode, retCode) ; - -- retCode = dirFactory->CreateDirectory(1, &kPropertyName, &valueChars, getter_AddRefs(subDirs)) ; -+ retCode = properties->SetURI(aFactory.getStr()); -+ NS_ENSURE_SUCCESS(retCode,retCode); -+ -+ nsCOMPtr subDirs ; -+ retCode = dirFactory->CreateDirectory(properties, getter_AddRefs(subDirs)); - NS_ENSURE_SUCCESS(retCode, retCode) ; - PRBool hasMore = PR_TRUE ; - nsCOMPtr array ; -@@ -635,12 +639,12 @@ - if ( NS_FAILED(rv) ) - return sal_False; - -- rv = url->SetSpec( sAbURI.getStr() ); -+ rv = url->SetSpec( nsDependentCString(sAbURI.getStr()) ); - if ( NS_FAILED(rv) ) - return sal_False; - -- nsXPIDLCString host; -- rv = url->GetHost(getter_Copies (host)); -+ nsCAutoString host; -+ rv = url->GetAsciiHost(host); - if ( NS_FAILED(rv) ) - return sal_False; - -@@ -654,6 +658,11 @@ - if ( NS_FAILED(rv) ) - return sal_False; - -+ PRUint32 options; -+ rv = url->GetOptions(&options); -+ if ( NS_FAILED(rv) ) -+ return sal_False; -+ - // Get the ldap connection - nsCOMPtr ldapConnection; - ldapConnection = do_CreateInstance(NS_LDAPCONNECTION_CONTRACTID, &rv); -@@ -671,7 +680,7 @@ - - // Now lets initialize the LDAP connection properly. We'll kick - // off the bind operation in the callback function, |OnLDAPInit()|. -- rv = ldapConnection->Init(host, port, NS_ConvertASCIItoUCS2(dn).get(), -+ rv = ldapConnection->Init(host.get(), port, options, nsnull, - messageListener); - if ( NS_FAILED(rv) ) - return sal_False; diff --git a/editors/openoffice-1.0/files/patch-MNSInclude.hxx b/editors/openoffice-1.0/files/patch-MNSInclude.hxx deleted file mode 100644 index 48ac201682de..000000000000 --- a/editors/openoffice-1.0/files/patch-MNSInclude.hxx +++ /dev/null @@ -1,22 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx.orig Sat May 18 01:58:35 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx Sat May 18 02:00:42 2002 -@@ -2,9 +2,9 @@ - * - * $RCSfile: MNSInclude.hxx,v $ - * -- * $Revision: 1.3 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $ -+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -83,7 +83,6 @@ - # define _DEBUG MOZ_TMP_UDEBUG - #endif - --#include - #include - #include - #include diff --git a/editors/openoffice-1.0/files/patch-MTypeConverter.cxx b/editors/openoffice-1.0/files/patch-MTypeConverter.cxx deleted file mode 100644 index 345d3700936e..000000000000 --- a/editors/openoffice-1.0/files/patch-MTypeConverter.cxx +++ /dev/null @@ -1,26 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx.orig Mon Nov 26 14:52:26 2001 -+++ ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx Sat May 18 14:02:06 2002 -@@ -2,9 +2,9 @@ - * - * $RCSfile: MTypeConverter.cxx,v $ - * -- * $Revision: 1.3 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $ -+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -136,9 +136,11 @@ - ::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US); - return( ::std::string(os.getStr())); - } -+#if 0 - // ------------------------------------------------------------------------- - ::std::string MTypeConverter::nsStringToStlString(nsString const &nss) - { - return( ::std::string(nss.GetBuffer())); - } -+#endif - // ------------------------------------------------------------------------- diff --git a/editors/openoffice-1.0/files/patch-config_office+configure.in b/editors/openoffice-1.0/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice-1.0/files/patch-config_office+configure.in +++ b/editors/openoffice-1.0/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice-1.0/files/patch-config_office+set_soenv.1 b/editors/openoffice-1.0/files/patch-config_office+set_soenv.1 index a778f22c20a2..023d1b997d0e 100644 --- a/editors/openoffice-1.0/files/patch-config_office+set_soenv.1 +++ b/editors/openoffice-1.0/files/patch-config_office+set_soenv.1 @@ -1,5 +1,5 @@ ---- set_soenv.1.orig Wed Apr 17 22:41:31 2002 -+++ set_soenv.1 Thu Jun 6 15:58:56 2002 +--- set_soenv.1.orig Sun Jun 30 21:51:05 2002 ++++ set_soenv.1 Mon Jul 15 14:09:14 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of @@ -21,10 +21,10 @@ # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, - $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx ); -+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -+ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $PTHREAD_CFLAGS, -+ $PTHREAD_LIBS, $EXCEPTIONS ); +- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, $JRETOOLKITDIR, $JRETHREADDIR ); ++ $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, ++ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, ++ $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS); # #------------------------------------------- # IIc. Declaring the environment variables. @@ -40,7 +40,7 @@ @@ -145,7 +146,11 @@ $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 - $use_shell = $ARGV [ 18 ]; # preferred shell + $USE_SHELL = $ARGV [ 18 ]; # preferred shell -$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment) +$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment) +$CC = $ARGV [ 23 ]; # get cc from environment @@ -50,16 +50,7 @@ # #--------------------------------------------------------------- # IIIb. Initialising the variables for the system commands, etc. -@@ -316,7 +321,7 @@ - $PROSWITCH = "-DPRODUCT"; - $XPVERSION = "3"; - $SOLAR_JAVA = "TRUE"; -- $XPVERSION = "3"; -+ $XPVERSION = "3"; - } - elsif ( $platform eq "$FreeBSD" ) - { print "Setting FreeBSD specific values... "; -@@ -326,7 +331,14 @@ +@@ -335,7 +340,14 @@ $COMPATH = $ARGV[ 0 ]; $CPU = "I"; $CPUNAME = "INTEL"; @@ -74,17 +65,17 @@ $DLLSUFFIX = "fi"; $GUI = "UNX"; $GUIBASE = "unx"; -@@ -339,6 +351,9 @@ +@@ -348,6 +360,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; + $OSVERSION = $ARGV[ 20 ]; + $PTHREAD_CFLAGS = $ARGV[ 21 ]; + $PTHREAD_LIBS = $ARGV[ 22 ]; - } - elsif ( $platform eq "$Linux" ) - { -@@ -891,7 +906,7 @@ + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads"; +@@ -927,7 +942,7 @@ $ps_STLPORT_LIB. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; } @@ -93,7 +84,7 @@ { $LD_LIBRARY_PATH = $cur_dir. $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. $ps.$USR_LOCAL.$LIB. -@@ -899,6 +914,13 @@ +@@ -935,6 +950,13 @@ $ps_STLPORT_LIB. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; } @@ -107,7 +98,7 @@ elsif ($platform eq "$Irix" || $platform eq "$Irix64") { $LD_LIBRARY_PATH = $cur_dir. $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -@@ -934,15 +956,16 @@ +@@ -970,15 +992,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -127,7 +118,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -959,7 +982,7 @@ +@@ -995,7 +1018,7 @@ $L.$USR_DT.$LIB. $L.$USR_OPENWIN.$LIB.'"'; } @@ -136,7 +127,7 @@ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. $L.$LIB. $L.$USR.$LIB. -@@ -969,6 +992,11 @@ +@@ -1005,6 +1028,11 @@ { $SOLAREXTRALIB = '"'.$L.$LIB. $L.$USR.$LIB.'"'; } @@ -148,7 +139,7 @@ # Compiler include search directory paths. if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1039,7 +1067,7 @@ +@@ -1076,7 +1104,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -157,7 +148,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1058,6 +1086,22 @@ +@@ -1095,6 +1123,22 @@ $ps.$USR.$ds."X11".$BIN. $ps.$USR.$LIB; } @@ -180,8 +171,8 @@ elsif ($platform eq "$Winnt") { my ( $noldPATH ); -@@ -1155,7 +1199,7 @@ - $L_STLPORT_LIB. +@@ -1195,7 +1239,7 @@ + $L_STLPORT_LIB. $L.$XLIB.'"'; } -elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) @@ -189,8 +180,8 @@ { $SOLARLIB = '"'.$L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1167,6 +1211,15 @@ - $L_STLPORT_LIB. +@@ -1210,6 +1254,15 @@ + $L_STLPORT_LIB. $L.$XLIB.'"'; } +elsif ($platform eq "$FreeBSD") @@ -205,7 +196,7 @@ elsif ($platform eq "$Winnt") { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. -@@ -1196,7 +1249,7 @@ +@@ -1242,7 +1295,7 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -214,7 +205,7 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1210,11 +1263,6 @@ +@@ -1256,11 +1309,6 @@ { $SOLARINC .= $I.'$COMPATH'.$ds."include"; } @@ -226,7 +217,7 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1382,6 +1430,9 @@ +@@ -1428,6 +1476,9 @@ ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); ToFile( "TF_FILTER", "TRUE", "e" ); @@ -236,7 +227,7 @@ if ( $platform ne "$Macosx" ) { ToFile( "PSPRINT", "TRUE", "e" ); } elsif ( $GUIBASE eq "unx" ) { -@@ -1407,6 +1458,12 @@ +@@ -1453,6 +1504,12 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); diff --git a/editors/openoffice-1.0/files/patch-config_office::configure.in b/editors/openoffice-1.0/files/patch-config_office::configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice-1.0/files/patch-config_office::configure.in +++ b/editors/openoffice-1.0/files/patch-config_office::configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx b/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx deleted file mode 100644 index ba52563e23e0..000000000000 --- a/editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx +++ /dev/null @@ -1,23 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/MNSInit.cxx.orig Sat May 18 02:01:33 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInit.cxx Sat May 18 02:02:18 2002 -@@ -2,9 +2,9 @@ - * - * $RCSfile: MNSInit.cxx,v $ - * -- * $Revision: 1.4 $ -+ * $Revision: 1.5 $ - * -- * last change: $Author: dkenny $ $Date: 2001/12/12 15:32:45 $ -+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -269,7 +269,7 @@ - #ifdef _DEBUG - nsCAutoString temp1; - temp1.AssignWithConversion( pUsedProfile ); -- OSL_TRACE("Profile Name: %s\n", NS_STATIC_CAST(const char*, temp1)); -+ OSL_TRACE("Profile Name: %s\n", NS_STATIC_CAST(const char*, temp1.get())); - #endif - theProfile->SetCurrentProfile( pUsedProfile ); - diff --git a/editors/openoffice-1.0/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice-1.0/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice-1.0/files/patch-cosv::source::strings::streamstr.cxx b/editors/openoffice-1.0/files/patch-cosv::source::strings::streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-cosv::source::strings::streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice-1.0/files/patch-external::zlib::zlibpatch.sh b/editors/openoffice-1.0/files/patch-external::zlib::zlibpatch.sh deleted file mode 100644 index 04d96c6ad70f..000000000000 --- a/editors/openoffice-1.0/files/patch-external::zlib::zlibpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ../external/zlib/zlibpatch.sh.orig Wed Mar 13 16:51:46 2002 -+++ ../external/zlib/zlibpatch.sh Wed Mar 13 16:52:02 2002 -@@ -111,7 +111,7 @@ - - for PNAME in `cat flist.pat` - do -- patch -i pat/$PNAME.pat $PNAME -+ patch < pat/$PNAME.pat $PNAME - done - - cp -rf zlib-1.1.3/* rtufiles/ diff --git a/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice-1.0/files/patch-product+util+makefile.mk b/editors/openoffice-1.0/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice-1.0/files/patch-product+util+makefile.mk +++ b/editors/openoffice-1.0/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice-1.0/files/patch-product::inc::scp::udk_basefiles.scp b/editors/openoffice-1.0/files/patch-product::inc::scp::udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice-1.0/files/patch-product::inc::scp::udk_basefiles.scp +++ b/editors/openoffice-1.0/files/patch-product::inc::scp::udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice-1.0/files/patch-product::util::makefile.mk b/editors/openoffice-1.0/files/patch-product::util::makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice-1.0/files/patch-product::util::makefile.mk +++ b/editors/openoffice-1.0/files/patch-product::util::makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice-1.0/files/patch-set_soenv.1 b/editors/openoffice-1.0/files/patch-set_soenv.1 index a778f22c20a2..023d1b997d0e 100644 --- a/editors/openoffice-1.0/files/patch-set_soenv.1 +++ b/editors/openoffice-1.0/files/patch-set_soenv.1 @@ -1,5 +1,5 @@ ---- set_soenv.1.orig Wed Apr 17 22:41:31 2002 -+++ set_soenv.1 Thu Jun 6 15:58:56 2002 +--- set_soenv.1.orig Sun Jun 30 21:51:05 2002 ++++ set_soenv.1 Mon Jul 15 14:09:14 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of @@ -21,10 +21,10 @@ # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, - $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx ); -+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -+ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $PTHREAD_CFLAGS, -+ $PTHREAD_LIBS, $EXCEPTIONS ); +- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, $JRETOOLKITDIR, $JRETHREADDIR ); ++ $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, ++ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, ++ $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS); # #------------------------------------------- # IIc. Declaring the environment variables. @@ -40,7 +40,7 @@ @@ -145,7 +146,11 @@ $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 - $use_shell = $ARGV [ 18 ]; # preferred shell + $USE_SHELL = $ARGV [ 18 ]; # preferred shell -$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment) +$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment) +$CC = $ARGV [ 23 ]; # get cc from environment @@ -50,16 +50,7 @@ # #--------------------------------------------------------------- # IIIb. Initialising the variables for the system commands, etc. -@@ -316,7 +321,7 @@ - $PROSWITCH = "-DPRODUCT"; - $XPVERSION = "3"; - $SOLAR_JAVA = "TRUE"; -- $XPVERSION = "3"; -+ $XPVERSION = "3"; - } - elsif ( $platform eq "$FreeBSD" ) - { print "Setting FreeBSD specific values... "; -@@ -326,7 +331,14 @@ +@@ -335,7 +340,14 @@ $COMPATH = $ARGV[ 0 ]; $CPU = "I"; $CPUNAME = "INTEL"; @@ -74,17 +65,17 @@ $DLLSUFFIX = "fi"; $GUI = "UNX"; $GUIBASE = "unx"; -@@ -339,6 +351,9 @@ +@@ -348,6 +360,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; + $OSVERSION = $ARGV[ 20 ]; + $PTHREAD_CFLAGS = $ARGV[ 21 ]; + $PTHREAD_LIBS = $ARGV[ 22 ]; - } - elsif ( $platform eq "$Linux" ) - { -@@ -891,7 +906,7 @@ + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads"; +@@ -927,7 +942,7 @@ $ps_STLPORT_LIB. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; } @@ -93,7 +84,7 @@ { $LD_LIBRARY_PATH = $cur_dir. $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. $ps.$USR_LOCAL.$LIB. -@@ -899,6 +914,13 @@ +@@ -935,6 +950,13 @@ $ps_STLPORT_LIB. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; } @@ -107,7 +98,7 @@ elsif ($platform eq "$Irix" || $platform eq "$Irix64") { $LD_LIBRARY_PATH = $cur_dir. $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -@@ -934,15 +956,16 @@ +@@ -970,15 +992,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -127,7 +118,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -959,7 +982,7 @@ +@@ -995,7 +1018,7 @@ $L.$USR_DT.$LIB. $L.$USR_OPENWIN.$LIB.'"'; } @@ -136,7 +127,7 @@ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. $L.$LIB. $L.$USR.$LIB. -@@ -969,6 +992,11 @@ +@@ -1005,6 +1028,11 @@ { $SOLAREXTRALIB = '"'.$L.$LIB. $L.$USR.$LIB.'"'; } @@ -148,7 +139,7 @@ # Compiler include search directory paths. if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1039,7 +1067,7 @@ +@@ -1076,7 +1104,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -157,7 +148,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1058,6 +1086,22 @@ +@@ -1095,6 +1123,22 @@ $ps.$USR.$ds."X11".$BIN. $ps.$USR.$LIB; } @@ -180,8 +171,8 @@ elsif ($platform eq "$Winnt") { my ( $noldPATH ); -@@ -1155,7 +1199,7 @@ - $L_STLPORT_LIB. +@@ -1195,7 +1239,7 @@ + $L_STLPORT_LIB. $L.$XLIB.'"'; } -elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) @@ -189,8 +180,8 @@ { $SOLARLIB = '"'.$L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1167,6 +1211,15 @@ - $L_STLPORT_LIB. +@@ -1210,6 +1254,15 @@ + $L_STLPORT_LIB. $L.$XLIB.'"'; } +elsif ($platform eq "$FreeBSD") @@ -205,7 +196,7 @@ elsif ($platform eq "$Winnt") { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. -@@ -1196,7 +1249,7 @@ +@@ -1242,7 +1295,7 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -214,7 +205,7 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1210,11 +1263,6 @@ +@@ -1256,11 +1309,6 @@ { $SOLARINC .= $I.'$COMPATH'.$ds."include"; } @@ -226,7 +217,7 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1382,6 +1430,9 @@ +@@ -1428,6 +1476,9 @@ ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); ToFile( "TF_FILTER", "TRUE", "e" ); @@ -236,7 +227,7 @@ if ( $platform ne "$Macosx" ) { ToFile( "PSPRINT", "TRUE", "e" ); } elsif ( $GUIBASE eq "unx" ) { -@@ -1407,6 +1458,12 @@ +@@ -1453,6 +1504,12 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk +++ b/editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice-1.0/files/patch-tools::source::string::charset.cxx b/editors/openoffice-1.0/files/patch-tools::source::string::charset.cxx deleted file mode 100644 index b989108fbdbb..000000000000 --- a/editors/openoffice-1.0/files/patch-tools::source::string::charset.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- ../tools/source/string/charset.cxx.orig Fri May 31 00:17:15 2002 -+++ ../tools/source/string/charset.cxx Fri May 31 00:17:17 2002 -@@ -68,6 +68,9 @@ - #include - #include - #include -+#if defined(FREEBSD) -+#include -+#endif - #include - #include - #ifndef _TOOLS_LANG_HXX diff --git a/editors/openoffice-1.0/files/patch-unzip+source+misc.c b/editors/openoffice-1.0/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice-1.0/files/patch-unzip+source+misc.c +++ b/editors/openoffice-1.0/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-1.0/files/patch-unzip::source::misc.c b/editors/openoffice-1.0/files/patch-unzip::source::misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice-1.0/files/patch-unzip::source::misc.c +++ b/editors/openoffice-1.0/files/patch-unzip::source::misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in b/editors/openoffice-1.1-devel/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice-1.1-devel/files/patch-config_office+configure.in +++ b/editors/openoffice-1.1-devel/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice-1.1-devel/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice-1.1-devel/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice-1.1-devel/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice-1.1-devel/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice-1.1-devel/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice-1.1-devel/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice-1.1-devel/files/patch-product+util+makefile.mk b/editors/openoffice-1.1-devel/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice-1.1-devel/files/patch-product+util+makefile.mk +++ b/editors/openoffice-1.1-devel/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice-1.1-devel/files/patch-unzip+source+misc.c b/editors/openoffice-1.1-devel/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice-1.1-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice-1.1-devel/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-1.1/files/patch-config_office+configure.in b/editors/openoffice-1.1/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice-1.1/files/patch-config_office+configure.in +++ b/editors/openoffice-1.1/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice-1.1/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice-1.1/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice-1.1/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice-1.1/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice-1.1/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice-1.1/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice-1.1/files/patch-product+util+makefile.mk b/editors/openoffice-1.1/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice-1.1/files/patch-product+util+makefile.mk +++ b/editors/openoffice-1.1/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice-1.1/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-1.1/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice-1.1/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice-1.1/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice-1.1/files/patch-unzip+source+misc.c b/editors/openoffice-1.1/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice-1.1/files/patch-unzip+source+misc.c +++ b/editors/openoffice-1.1/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in b/editors/openoffice-2.0-devel/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice-2.0-devel/files/patch-config_office+configure.in +++ b/editors/openoffice-2.0-devel/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice-2.0-devel/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice-2.0-devel/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice-2.0-devel/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice-2.0-devel/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice-2.0-devel/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice-2.0-devel/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice-2.0-devel/files/patch-product+util+makefile.mk b/editors/openoffice-2.0-devel/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice-2.0-devel/files/patch-product+util+makefile.mk +++ b/editors/openoffice-2.0-devel/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-2.0-devel/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice-2.0-devel/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice-2.0-devel/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice-2.0-devel/files/patch-unzip+source+misc.c b/editors/openoffice-2.0-devel/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice-2.0-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice-2.0-devel/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-3-devel/files/patch-config_office+configure.in b/editors/openoffice-3-devel/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice-3-devel/files/patch-config_office+configure.in +++ b/editors/openoffice-3-devel/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice-3-devel/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice-3-devel/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice-3-devel/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice-3-devel/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice-3-devel/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice-3-devel/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice-3-devel/files/patch-product+util+makefile.mk b/editors/openoffice-3-devel/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice-3-devel/files/patch-product+util+makefile.mk +++ b/editors/openoffice-3-devel/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice-3-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-3-devel/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice-3-devel/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice-3-devel/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice-3-devel/files/patch-unzip+source+misc.c b/editors/openoffice-3-devel/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice-3-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice-3-devel/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-3/files/patch-config_office+configure.in b/editors/openoffice-3/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice-3/files/patch-config_office+configure.in +++ b/editors/openoffice-3/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice-3/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice-3/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice-3/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice-3/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice-3/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice-3/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice-3/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice-3/files/patch-product+util+makefile.mk b/editors/openoffice-3/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice-3/files/patch-product+util+makefile.mk +++ b/editors/openoffice-3/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice-3/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-3/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice-3/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice-3/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice-3/files/patch-unzip+source+misc.c b/editors/openoffice-3/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice-3/files/patch-unzip+source+misc.c +++ b/editors/openoffice-3/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-devel/files/patch-config_office+configure.in b/editors/openoffice-devel/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice-devel/files/patch-config_office+configure.in +++ b/editors/openoffice-devel/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice-devel/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice-devel/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice-devel/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice-devel/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice-devel/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice-devel/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice-devel/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice-devel/files/patch-product+util+makefile.mk b/editors/openoffice-devel/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice-devel/files/patch-product+util+makefile.mk +++ b/editors/openoffice-devel/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-devel/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice-devel/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice-devel/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice-devel/files/patch-unzip+source+misc.c b/editors/openoffice-devel/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice-devel/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index eb0301300ec2..4f881cf264d8 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -6,11 +6,10 @@ # PORTNAME= openoffice -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.0.1 +PORTREVISION= 0 CATEGORIES+= editors MASTER_SITES+= ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \ - http://niihau.student.utwente.nl/openoffice/${PORTVERSION}/ \ http://sf1.mirror.openoffice.org/${PORTVERSION}/ \ ftp://gd.tuwien.ac.at/office/openoffice/${PORTVERSION}/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \ @@ -124,7 +123,7 @@ JAVAVM= ${JDK13DIR}/bin/java GNU_CONFIGURE= yes USE_AUTOCONF= yes -WRKSRC= ${WRKDIR}/oo_1.0_src/config_office +WRKSRC= ${WRKDIR}/oo_1.0.1_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) diff --git a/editors/openoffice.org-1.0/distinfo b/editors/openoffice.org-1.0/distinfo index d62a88312f84..3de512652539 100644 --- a/editors/openoffice.org-1.0/distinfo +++ b/editors/openoffice.org-1.0/distinfo @@ -1,4 +1,4 @@ -MD5 (openoffice/OOo_1.0.0_source.tar.bz2) = f5dbcf74a3b025280a2afd3e5913da16 +MD5 (openoffice/OOo_1.0.1_source.tar.bz2) = 1c5d8e9195fc4da6ef9745f327fcb3c1 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 MD5 (openoffice/oo_moz1.0RC3_i386_FreeBSD-4-gcc2.95-system.tar.gz) = ea99811ee477a49bc1617dc9dace866d MD5 (openoffice/oo_moz1.0RC3_i386_FreeBSD-5-gcc2.95-ports.tar.gz) = 5364047f750d7fae380bb97887747b39 diff --git a/editors/openoffice.org-1.0/files/patch-MDatabaseMetaDataHelper.cxx b/editors/openoffice.org-1.0/files/patch-MDatabaseMetaDataHelper.cxx deleted file mode 100644 index 4b92670204e7..000000000000 --- a/editors/openoffice.org-1.0/files/patch-MDatabaseMetaDataHelper.cxx +++ /dev/null @@ -1,71 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx.orig Sat May 18 01:46:08 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx Sat May 18 01:56:23 2002 -@@ -2,9 +2,9 @@ - * - * $RCSfile: MDatabaseMetaDataHelper.cxx,v $ - * -- * $Revision: 1.5 $ -+ * $Revision: 1.6 $ - * -- * last change: $Author: dkenny $ $Date: 2001/12/13 09:34:19 $ -+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -213,11 +213,15 @@ - - retCode = dirFactoryService->GetDirFactory(aFactory.getStr(), getter_AddRefs(dirFactory)) ; - NS_ENSURE_SUCCESS (retCode, retCode) ; -- OUString value = OStringToOUString(aFactory, RTL_TEXTENCODING_ASCII_US) ; -- const PRUnichar *valueChars = value.getStr() ; -- nsCOMPtr subDirs ; -+ nsCOMPtr properties; -+ properties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &retCode); -+ NS_ENSURE_SUCCESS(retCode, retCode) ; - -- retCode = dirFactory->CreateDirectory(1, &kPropertyName, &valueChars, getter_AddRefs(subDirs)) ; -+ retCode = properties->SetURI(aFactory.getStr()); -+ NS_ENSURE_SUCCESS(retCode,retCode); -+ -+ nsCOMPtr subDirs ; -+ retCode = dirFactory->CreateDirectory(properties, getter_AddRefs(subDirs)); - NS_ENSURE_SUCCESS(retCode, retCode) ; - PRBool hasMore = PR_TRUE ; - nsCOMPtr array ; -@@ -635,12 +639,12 @@ - if ( NS_FAILED(rv) ) - return sal_False; - -- rv = url->SetSpec( sAbURI.getStr() ); -+ rv = url->SetSpec( nsDependentCString(sAbURI.getStr()) ); - if ( NS_FAILED(rv) ) - return sal_False; - -- nsXPIDLCString host; -- rv = url->GetHost(getter_Copies (host)); -+ nsCAutoString host; -+ rv = url->GetAsciiHost(host); - if ( NS_FAILED(rv) ) - return sal_False; - -@@ -654,6 +658,11 @@ - if ( NS_FAILED(rv) ) - return sal_False; - -+ PRUint32 options; -+ rv = url->GetOptions(&options); -+ if ( NS_FAILED(rv) ) -+ return sal_False; -+ - // Get the ldap connection - nsCOMPtr ldapConnection; - ldapConnection = do_CreateInstance(NS_LDAPCONNECTION_CONTRACTID, &rv); -@@ -671,7 +680,7 @@ - - // Now lets initialize the LDAP connection properly. We'll kick - // off the bind operation in the callback function, |OnLDAPInit()|. -- rv = ldapConnection->Init(host, port, NS_ConvertASCIItoUCS2(dn).get(), -+ rv = ldapConnection->Init(host.get(), port, options, nsnull, - messageListener); - if ( NS_FAILED(rv) ) - return sal_False; diff --git a/editors/openoffice.org-1.0/files/patch-MNSInclude.hxx b/editors/openoffice.org-1.0/files/patch-MNSInclude.hxx deleted file mode 100644 index 48ac201682de..000000000000 --- a/editors/openoffice.org-1.0/files/patch-MNSInclude.hxx +++ /dev/null @@ -1,22 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx.orig Sat May 18 01:58:35 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx Sat May 18 02:00:42 2002 -@@ -2,9 +2,9 @@ - * - * $RCSfile: MNSInclude.hxx,v $ - * -- * $Revision: 1.3 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $ -+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -83,7 +83,6 @@ - # define _DEBUG MOZ_TMP_UDEBUG - #endif - --#include - #include - #include - #include diff --git a/editors/openoffice.org-1.0/files/patch-MTypeConverter.cxx b/editors/openoffice.org-1.0/files/patch-MTypeConverter.cxx deleted file mode 100644 index 345d3700936e..000000000000 --- a/editors/openoffice.org-1.0/files/patch-MTypeConverter.cxx +++ /dev/null @@ -1,26 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx.orig Mon Nov 26 14:52:26 2001 -+++ ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx Sat May 18 14:02:06 2002 -@@ -2,9 +2,9 @@ - * - * $RCSfile: MTypeConverter.cxx,v $ - * -- * $Revision: 1.3 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $ -+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -136,9 +136,11 @@ - ::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US); - return( ::std::string(os.getStr())); - } -+#if 0 - // ------------------------------------------------------------------------- - ::std::string MTypeConverter::nsStringToStlString(nsString const &nss) - { - return( ::std::string(nss.GetBuffer())); - } -+#endif - // ------------------------------------------------------------------------- diff --git a/editors/openoffice.org-1.0/files/patch-config_office+configure.in b/editors/openoffice.org-1.0/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice.org-1.0/files/patch-config_office+configure.in +++ b/editors/openoffice.org-1.0/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1 b/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1 index a778f22c20a2..023d1b997d0e 100644 --- a/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1 +++ b/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1 @@ -1,5 +1,5 @@ ---- set_soenv.1.orig Wed Apr 17 22:41:31 2002 -+++ set_soenv.1 Thu Jun 6 15:58:56 2002 +--- set_soenv.1.orig Sun Jun 30 21:51:05 2002 ++++ set_soenv.1 Mon Jul 15 14:09:14 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of @@ -21,10 +21,10 @@ # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, - $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx ); -+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -+ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $PTHREAD_CFLAGS, -+ $PTHREAD_LIBS, $EXCEPTIONS ); +- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, $JRETOOLKITDIR, $JRETHREADDIR ); ++ $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, ++ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, ++ $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS); # #------------------------------------------- # IIc. Declaring the environment variables. @@ -40,7 +40,7 @@ @@ -145,7 +146,11 @@ $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 - $use_shell = $ARGV [ 18 ]; # preferred shell + $USE_SHELL = $ARGV [ 18 ]; # preferred shell -$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment) +$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment) +$CC = $ARGV [ 23 ]; # get cc from environment @@ -50,16 +50,7 @@ # #--------------------------------------------------------------- # IIIb. Initialising the variables for the system commands, etc. -@@ -316,7 +321,7 @@ - $PROSWITCH = "-DPRODUCT"; - $XPVERSION = "3"; - $SOLAR_JAVA = "TRUE"; -- $XPVERSION = "3"; -+ $XPVERSION = "3"; - } - elsif ( $platform eq "$FreeBSD" ) - { print "Setting FreeBSD specific values... "; -@@ -326,7 +331,14 @@ +@@ -335,7 +340,14 @@ $COMPATH = $ARGV[ 0 ]; $CPU = "I"; $CPUNAME = "INTEL"; @@ -74,17 +65,17 @@ $DLLSUFFIX = "fi"; $GUI = "UNX"; $GUIBASE = "unx"; -@@ -339,6 +351,9 @@ +@@ -348,6 +360,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; + $OSVERSION = $ARGV[ 20 ]; + $PTHREAD_CFLAGS = $ARGV[ 21 ]; + $PTHREAD_LIBS = $ARGV[ 22 ]; - } - elsif ( $platform eq "$Linux" ) - { -@@ -891,7 +906,7 @@ + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads"; +@@ -927,7 +942,7 @@ $ps_STLPORT_LIB. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; } @@ -93,7 +84,7 @@ { $LD_LIBRARY_PATH = $cur_dir. $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. $ps.$USR_LOCAL.$LIB. -@@ -899,6 +914,13 @@ +@@ -935,6 +950,13 @@ $ps_STLPORT_LIB. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; } @@ -107,7 +98,7 @@ elsif ($platform eq "$Irix" || $platform eq "$Irix64") { $LD_LIBRARY_PATH = $cur_dir. $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -@@ -934,15 +956,16 @@ +@@ -970,15 +992,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -127,7 +118,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -959,7 +982,7 @@ +@@ -995,7 +1018,7 @@ $L.$USR_DT.$LIB. $L.$USR_OPENWIN.$LIB.'"'; } @@ -136,7 +127,7 @@ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. $L.$LIB. $L.$USR.$LIB. -@@ -969,6 +992,11 @@ +@@ -1005,6 +1028,11 @@ { $SOLAREXTRALIB = '"'.$L.$LIB. $L.$USR.$LIB.'"'; } @@ -148,7 +139,7 @@ # Compiler include search directory paths. if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1039,7 +1067,7 @@ +@@ -1076,7 +1104,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -157,7 +148,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1058,6 +1086,22 @@ +@@ -1095,6 +1123,22 @@ $ps.$USR.$ds."X11".$BIN. $ps.$USR.$LIB; } @@ -180,8 +171,8 @@ elsif ($platform eq "$Winnt") { my ( $noldPATH ); -@@ -1155,7 +1199,7 @@ - $L_STLPORT_LIB. +@@ -1195,7 +1239,7 @@ + $L_STLPORT_LIB. $L.$XLIB.'"'; } -elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) @@ -189,8 +180,8 @@ { $SOLARLIB = '"'.$L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1167,6 +1211,15 @@ - $L_STLPORT_LIB. +@@ -1210,6 +1254,15 @@ + $L_STLPORT_LIB. $L.$XLIB.'"'; } +elsif ($platform eq "$FreeBSD") @@ -205,7 +196,7 @@ elsif ($platform eq "$Winnt") { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. -@@ -1196,7 +1249,7 @@ +@@ -1242,7 +1295,7 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -214,7 +205,7 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1210,11 +1263,6 @@ +@@ -1256,11 +1309,6 @@ { $SOLARINC .= $I.'$COMPATH'.$ds."include"; } @@ -226,7 +217,7 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1382,6 +1430,9 @@ +@@ -1428,6 +1476,9 @@ ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); ToFile( "TF_FILTER", "TRUE", "e" ); @@ -236,7 +227,7 @@ if ( $platform ne "$Macosx" ) { ToFile( "PSPRINT", "TRUE", "e" ); } elsif ( $GUIBASE eq "unx" ) { -@@ -1407,6 +1458,12 @@ +@@ -1453,6 +1504,12 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); diff --git a/editors/openoffice.org-1.0/files/patch-config_office::configure.in b/editors/openoffice.org-1.0/files/patch-config_office::configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice.org-1.0/files/patch-config_office::configure.in +++ b/editors/openoffice.org-1.0/files/patch-config_office::configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx b/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx deleted file mode 100644 index ba52563e23e0..000000000000 --- a/editors/openoffice.org-1.0/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx +++ /dev/null @@ -1,23 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/MNSInit.cxx.orig Sat May 18 02:01:33 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInit.cxx Sat May 18 02:02:18 2002 -@@ -2,9 +2,9 @@ - * - * $RCSfile: MNSInit.cxx,v $ - * -- * $Revision: 1.4 $ -+ * $Revision: 1.5 $ - * -- * last change: $Author: dkenny $ $Date: 2001/12/12 15:32:45 $ -+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -269,7 +269,7 @@ - #ifdef _DEBUG - nsCAutoString temp1; - temp1.AssignWithConversion( pUsedProfile ); -- OSL_TRACE("Profile Name: %s\n", NS_STATIC_CAST(const char*, temp1)); -+ OSL_TRACE("Profile Name: %s\n", NS_STATIC_CAST(const char*, temp1.get())); - #endif - theProfile->SetCurrentProfile( pUsedProfile ); - diff --git a/editors/openoffice.org-1.0/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-1.0/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice.org-1.0/files/patch-cosv::source::strings::streamstr.cxx b/editors/openoffice.org-1.0/files/patch-cosv::source::strings::streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-cosv::source::strings::streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice.org-1.0/files/patch-external::zlib::zlibpatch.sh b/editors/openoffice.org-1.0/files/patch-external::zlib::zlibpatch.sh deleted file mode 100644 index 04d96c6ad70f..000000000000 --- a/editors/openoffice.org-1.0/files/patch-external::zlib::zlibpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ../external/zlib/zlibpatch.sh.orig Wed Mar 13 16:51:46 2002 -+++ ../external/zlib/zlibpatch.sh Wed Mar 13 16:52:02 2002 -@@ -111,7 +111,7 @@ - - for PNAME in `cat flist.pat` - do -- patch -i pat/$PNAME.pat $PNAME -+ patch < pat/$PNAME.pat $PNAME - done - - cp -rf zlib-1.1.3/* rtufiles/ diff --git a/editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-1.0/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice.org-1.0/files/patch-product::inc::scp::udk_basefiles.scp b/editors/openoffice.org-1.0/files/patch-product::inc::scp::udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice.org-1.0/files/patch-product::inc::scp::udk_basefiles.scp +++ b/editors/openoffice.org-1.0/files/patch-product::inc::scp::udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-1.0/files/patch-product::util::makefile.mk b/editors/openoffice.org-1.0/files/patch-product::util::makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice.org-1.0/files/patch-product::util::makefile.mk +++ b/editors/openoffice.org-1.0/files/patch-product::util::makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice.org-1.0/files/patch-set_soenv.1 b/editors/openoffice.org-1.0/files/patch-set_soenv.1 index a778f22c20a2..023d1b997d0e 100644 --- a/editors/openoffice.org-1.0/files/patch-set_soenv.1 +++ b/editors/openoffice.org-1.0/files/patch-set_soenv.1 @@ -1,5 +1,5 @@ ---- set_soenv.1.orig Wed Apr 17 22:41:31 2002 -+++ set_soenv.1 Thu Jun 6 15:58:56 2002 +--- set_soenv.1.orig Sun Jun 30 21:51:05 2002 ++++ set_soenv.1 Mon Jul 15 14:09:14 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of @@ -21,10 +21,10 @@ # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, - $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx ); -+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -+ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $PTHREAD_CFLAGS, -+ $PTHREAD_LIBS, $EXCEPTIONS ); +- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, $JRETOOLKITDIR, $JRETHREADDIR ); ++ $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, ++ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, ++ $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS); # #------------------------------------------- # IIc. Declaring the environment variables. @@ -40,7 +40,7 @@ @@ -145,7 +146,11 @@ $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 - $use_shell = $ARGV [ 18 ]; # preferred shell + $USE_SHELL = $ARGV [ 18 ]; # preferred shell -$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment) +$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment) +$CC = $ARGV [ 23 ]; # get cc from environment @@ -50,16 +50,7 @@ # #--------------------------------------------------------------- # IIIb. Initialising the variables for the system commands, etc. -@@ -316,7 +321,7 @@ - $PROSWITCH = "-DPRODUCT"; - $XPVERSION = "3"; - $SOLAR_JAVA = "TRUE"; -- $XPVERSION = "3"; -+ $XPVERSION = "3"; - } - elsif ( $platform eq "$FreeBSD" ) - { print "Setting FreeBSD specific values... "; -@@ -326,7 +331,14 @@ +@@ -335,7 +340,14 @@ $COMPATH = $ARGV[ 0 ]; $CPU = "I"; $CPUNAME = "INTEL"; @@ -74,17 +65,17 @@ $DLLSUFFIX = "fi"; $GUI = "UNX"; $GUIBASE = "unx"; -@@ -339,6 +351,9 @@ +@@ -348,6 +360,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; + $OSVERSION = $ARGV[ 20 ]; + $PTHREAD_CFLAGS = $ARGV[ 21 ]; + $PTHREAD_LIBS = $ARGV[ 22 ]; - } - elsif ( $platform eq "$Linux" ) - { -@@ -891,7 +906,7 @@ + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads"; +@@ -927,7 +942,7 @@ $ps_STLPORT_LIB. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; } @@ -93,7 +84,7 @@ { $LD_LIBRARY_PATH = $cur_dir. $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. $ps.$USR_LOCAL.$LIB. -@@ -899,6 +914,13 @@ +@@ -935,6 +950,13 @@ $ps_STLPORT_LIB. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; } @@ -107,7 +98,7 @@ elsif ($platform eq "$Irix" || $platform eq "$Irix64") { $LD_LIBRARY_PATH = $cur_dir. $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -@@ -934,15 +956,16 @@ +@@ -970,15 +992,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -127,7 +118,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -959,7 +982,7 @@ +@@ -995,7 +1018,7 @@ $L.$USR_DT.$LIB. $L.$USR_OPENWIN.$LIB.'"'; } @@ -136,7 +127,7 @@ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. $L.$LIB. $L.$USR.$LIB. -@@ -969,6 +992,11 @@ +@@ -1005,6 +1028,11 @@ { $SOLAREXTRALIB = '"'.$L.$LIB. $L.$USR.$LIB.'"'; } @@ -148,7 +139,7 @@ # Compiler include search directory paths. if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1039,7 +1067,7 @@ +@@ -1076,7 +1104,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -157,7 +148,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1058,6 +1086,22 @@ +@@ -1095,6 +1123,22 @@ $ps.$USR.$ds."X11".$BIN. $ps.$USR.$LIB; } @@ -180,8 +171,8 @@ elsif ($platform eq "$Winnt") { my ( $noldPATH ); -@@ -1155,7 +1199,7 @@ - $L_STLPORT_LIB. +@@ -1195,7 +1239,7 @@ + $L_STLPORT_LIB. $L.$XLIB.'"'; } -elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) @@ -189,8 +180,8 @@ { $SOLARLIB = '"'.$L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1167,6 +1211,15 @@ - $L_STLPORT_LIB. +@@ -1210,6 +1254,15 @@ + $L_STLPORT_LIB. $L.$XLIB.'"'; } +elsif ($platform eq "$FreeBSD") @@ -205,7 +196,7 @@ elsif ($platform eq "$Winnt") { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. -@@ -1196,7 +1249,7 @@ +@@ -1242,7 +1295,7 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -214,7 +205,7 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1210,11 +1263,6 @@ +@@ -1256,11 +1309,6 @@ { $SOLARINC .= $I.'$COMPATH'.$ds."include"; } @@ -226,7 +217,7 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1382,6 +1430,9 @@ +@@ -1428,6 +1476,9 @@ ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); ToFile( "TF_FILTER", "TRUE", "e" ); @@ -236,7 +227,7 @@ if ( $platform ne "$Macosx" ) { ToFile( "PSPRINT", "TRUE", "e" ); } elsif ( $GUIBASE eq "unx" ) { -@@ -1407,6 +1458,12 @@ +@@ -1453,6 +1504,12 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice.org-1.0/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-1.0/files/patch-solenv::inc::tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice.org-1.0/files/patch-solenv::inc::tg_ext.mk +++ b/editors/openoffice.org-1.0/files/patch-solenv::inc::tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice.org-1.0/files/patch-tools::source::string::charset.cxx b/editors/openoffice.org-1.0/files/patch-tools::source::string::charset.cxx deleted file mode 100644 index b989108fbdbb..000000000000 --- a/editors/openoffice.org-1.0/files/patch-tools::source::string::charset.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- ../tools/source/string/charset.cxx.orig Fri May 31 00:17:15 2002 -+++ ../tools/source/string/charset.cxx Fri May 31 00:17:17 2002 -@@ -68,6 +68,9 @@ - #include - #include - #include -+#if defined(FREEBSD) -+#include -+#endif - #include - #include - #ifndef _TOOLS_LANG_HXX diff --git a/editors/openoffice.org-1.0/files/patch-unzip+source+misc.c b/editors/openoffice.org-1.0/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice.org-1.0/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-1.0/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-1.0/files/patch-unzip::source::misc.c b/editors/openoffice.org-1.0/files/patch-unzip::source::misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice.org-1.0/files/patch-unzip::source::misc.c +++ b/editors/openoffice.org-1.0/files/patch-unzip::source::misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in b/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in +++ b/editors/openoffice.org-1.1-devel/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice.org-1.1-devel/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-1.1-devel/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice.org-1.1-devel/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-1.1-devel/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-1.1-devel/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-1.1-devel/files/patch-product+util+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-1.1-devel/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice.org-1.1-devel/files/patch-unzip+source+misc.c b/editors/openoffice.org-1.1-devel/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-1.1-devel/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-1.1/files/patch-config_office+configure.in b/editors/openoffice.org-1.1/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice.org-1.1/files/patch-config_office+configure.in +++ b/editors/openoffice.org-1.1/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice.org-1.1/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-1.1/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice.org-1.1/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-1.1/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice.org-1.1/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-1.1/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-1.1/files/patch-product+util+makefile.mk b/editors/openoffice.org-1.1/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice.org-1.1/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-1.1/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice.org-1.1/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-1.1/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice.org-1.1/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice.org-1.1/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice.org-1.1/files/patch-unzip+source+misc.c b/editors/openoffice.org-1.1/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice.org-1.1/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-1.1/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in +++ b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice.org-2-RC/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-2-RC/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice.org-2-RC/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-2-RC/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice.org-2-RC/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-2-RC/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-2-RC/files/patch-product+util+makefile.mk b/editors/openoffice.org-2-RC/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice.org-2-RC/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-2-RC/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice.org-2-RC/files/patch-unzip+source+misc.c b/editors/openoffice.org-2-RC/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice.org-2-RC/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-2-RC/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice.org-2-devel/files/patch-config_office+configure.in +++ b/editors/openoffice.org-2-devel/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice.org-2-devel/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-2-devel/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice.org-2-devel/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-2-devel/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice.org-2-devel/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-2-devel/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-2-devel/files/patch-product+util+makefile.mk b/editors/openoffice.org-2-devel/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice.org-2-devel/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-2-devel/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice.org-2-devel/files/patch-unzip+source+misc.c b/editors/openoffice.org-2-devel/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice.org-2-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-2-devel/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in b/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in +++ b/editors/openoffice.org-2.0-devel/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice.org-2.0-devel/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-2.0-devel/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice.org-2.0-devel/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-2.0-devel/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-2.0-devel/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-2.0-devel/files/patch-product+util+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-2.0-devel/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-2.0-devel/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-2.0/files/patch-config_office+configure.in b/editors/openoffice.org-2.0/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice.org-2.0/files/patch-config_office+configure.in +++ b/editors/openoffice.org-2.0/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice.org-2.0/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-2.0/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice.org-2.0/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-2.0/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice.org-2.0/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-2.0/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-2.0/files/patch-product+util+makefile.mk b/editors/openoffice.org-2.0/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice.org-2.0/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-2.0/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice.org-2.0/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice.org-2.0/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice.org-2.0/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice.org-2.0/files/patch-unzip+source+misc.c b/editors/openoffice.org-2.0/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice.org-2.0/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-2.0/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-2/files/patch-config_office+configure.in b/editors/openoffice.org-2/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice.org-2/files/patch-config_office+configure.in +++ b/editors/openoffice.org-2/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice.org-2/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-2/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice.org-2/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-2/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice.org-2/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-2/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-2/files/patch-product+util+makefile.mk b/editors/openoffice.org-2/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice.org-2/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-2/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice.org-2/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice.org-2/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice.org-2/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice.org-2/files/patch-unzip+source+misc.c b/editors/openoffice.org-2/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice.org-2/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-2/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice.org-3-RC/files/patch-config_office+configure.in +++ b/editors/openoffice.org-3-RC/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice.org-3-RC/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-3-RC/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice.org-3-RC/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-3-RC/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice.org-3-RC/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-3-RC/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-3-RC/files/patch-product+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice.org-3-RC/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice.org-3-RC/files/patch-unzip+source+misc.c b/editors/openoffice.org-3-RC/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice.org-3-RC/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-3-RC/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice.org-3-devel/files/patch-config_office+configure.in +++ b/editors/openoffice.org-3-devel/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice.org-3-devel/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-3-devel/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice.org-3-devel/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-3-devel/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice.org-3-devel/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-3-devel/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-3-devel/files/patch-product+util+makefile.mk b/editors/openoffice.org-3-devel/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice.org-3-devel/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-3-devel/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice.org-3-devel/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice.org-3-devel/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice.org-3-devel/files/patch-unzip+source+misc.c b/editors/openoffice.org-3-devel/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice.org-3-devel/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-3-devel/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-3/files/patch-config_office+configure.in b/editors/openoffice.org-3/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice.org-3/files/patch-config_office+configure.in +++ b/editors/openoffice.org-3/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice.org-3/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-3/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice.org-3/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-3/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice.org-3/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-3/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-3/files/patch-product+util+makefile.mk b/editors/openoffice.org-3/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice.org-3/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-3/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice.org-3/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-3/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice.org-3/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice.org-3/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice.org-3/files/patch-unzip+source+misc.c b/editors/openoffice.org-3/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice.org-3/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-3/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in b/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in +++ b/editors/openoffice.org-vcltesttool/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice.org-vcltesttool/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice.org-vcltesttool/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice.org-vcltesttool/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice.org-vcltesttool/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice.org-vcltesttool/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice.org-vcltesttool/files/patch-product+util+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-product+util+makefile.mk +++ b/editors/openoffice.org-vcltesttool/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice.org-vcltesttool/files/patch-unzip+source+misc.c b/editors/openoffice.org-vcltesttool/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-unzip+source+misc.c +++ b/editors/openoffice.org-vcltesttool/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index eb0301300ec2..4f881cf264d8 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -6,11 +6,10 @@ # PORTNAME= openoffice -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.0.1 +PORTREVISION= 0 CATEGORIES+= editors MASTER_SITES+= ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/${PORTVERSION}/ \ - http://niihau.student.utwente.nl/openoffice/${PORTVERSION}/ \ http://sf1.mirror.openoffice.org/${PORTVERSION}/ \ ftp://gd.tuwien.ac.at/office/openoffice/${PORTVERSION}/ \ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \ @@ -124,7 +123,7 @@ JAVAVM= ${JDK13DIR}/bin/java GNU_CONFIGURE= yes USE_AUTOCONF= yes -WRKSRC= ${WRKDIR}/oo_1.0_src/config_office +WRKSRC= ${WRKDIR}/oo_1.0.1_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) diff --git a/editors/openoffice/distinfo b/editors/openoffice/distinfo index d62a88312f84..3de512652539 100644 --- a/editors/openoffice/distinfo +++ b/editors/openoffice/distinfo @@ -1,4 +1,4 @@ -MD5 (openoffice/OOo_1.0.0_source.tar.bz2) = f5dbcf74a3b025280a2afd3e5913da16 +MD5 (openoffice/OOo_1.0.1_source.tar.bz2) = 1c5d8e9195fc4da6ef9745f327fcb3c1 MD5 (openoffice/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9 MD5 (openoffice/oo_moz1.0RC3_i386_FreeBSD-4-gcc2.95-system.tar.gz) = ea99811ee477a49bc1617dc9dace866d MD5 (openoffice/oo_moz1.0RC3_i386_FreeBSD-5-gcc2.95-ports.tar.gz) = 5364047f750d7fae380bb97887747b39 diff --git a/editors/openoffice/files/patch-MDatabaseMetaDataHelper.cxx b/editors/openoffice/files/patch-MDatabaseMetaDataHelper.cxx deleted file mode 100644 index 4b92670204e7..000000000000 --- a/editors/openoffice/files/patch-MDatabaseMetaDataHelper.cxx +++ /dev/null @@ -1,71 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx.orig Sat May 18 01:46:08 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx Sat May 18 01:56:23 2002 -@@ -2,9 +2,9 @@ - * - * $RCSfile: MDatabaseMetaDataHelper.cxx,v $ - * -- * $Revision: 1.5 $ -+ * $Revision: 1.6 $ - * -- * last change: $Author: dkenny $ $Date: 2001/12/13 09:34:19 $ -+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -213,11 +213,15 @@ - - retCode = dirFactoryService->GetDirFactory(aFactory.getStr(), getter_AddRefs(dirFactory)) ; - NS_ENSURE_SUCCESS (retCode, retCode) ; -- OUString value = OStringToOUString(aFactory, RTL_TEXTENCODING_ASCII_US) ; -- const PRUnichar *valueChars = value.getStr() ; -- nsCOMPtr subDirs ; -+ nsCOMPtr properties; -+ properties = do_CreateInstance(NS_ABDIRECTORYPROPERTIES_CONTRACTID, &retCode); -+ NS_ENSURE_SUCCESS(retCode, retCode) ; - -- retCode = dirFactory->CreateDirectory(1, &kPropertyName, &valueChars, getter_AddRefs(subDirs)) ; -+ retCode = properties->SetURI(aFactory.getStr()); -+ NS_ENSURE_SUCCESS(retCode,retCode); -+ -+ nsCOMPtr subDirs ; -+ retCode = dirFactory->CreateDirectory(properties, getter_AddRefs(subDirs)); - NS_ENSURE_SUCCESS(retCode, retCode) ; - PRBool hasMore = PR_TRUE ; - nsCOMPtr array ; -@@ -635,12 +639,12 @@ - if ( NS_FAILED(rv) ) - return sal_False; - -- rv = url->SetSpec( sAbURI.getStr() ); -+ rv = url->SetSpec( nsDependentCString(sAbURI.getStr()) ); - if ( NS_FAILED(rv) ) - return sal_False; - -- nsXPIDLCString host; -- rv = url->GetHost(getter_Copies (host)); -+ nsCAutoString host; -+ rv = url->GetAsciiHost(host); - if ( NS_FAILED(rv) ) - return sal_False; - -@@ -654,6 +658,11 @@ - if ( NS_FAILED(rv) ) - return sal_False; - -+ PRUint32 options; -+ rv = url->GetOptions(&options); -+ if ( NS_FAILED(rv) ) -+ return sal_False; -+ - // Get the ldap connection - nsCOMPtr ldapConnection; - ldapConnection = do_CreateInstance(NS_LDAPCONNECTION_CONTRACTID, &rv); -@@ -671,7 +680,7 @@ - - // Now lets initialize the LDAP connection properly. We'll kick - // off the bind operation in the callback function, |OnLDAPInit()|. -- rv = ldapConnection->Init(host, port, NS_ConvertASCIItoUCS2(dn).get(), -+ rv = ldapConnection->Init(host.get(), port, options, nsnull, - messageListener); - if ( NS_FAILED(rv) ) - return sal_False; diff --git a/editors/openoffice/files/patch-MNSInclude.hxx b/editors/openoffice/files/patch-MNSInclude.hxx deleted file mode 100644 index 48ac201682de..000000000000 --- a/editors/openoffice/files/patch-MNSInclude.hxx +++ /dev/null @@ -1,22 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx.orig Sat May 18 01:58:35 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx Sat May 18 02:00:42 2002 -@@ -2,9 +2,9 @@ - * - * $RCSfile: MNSInclude.hxx,v $ - * -- * $Revision: 1.3 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $ -+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -83,7 +83,6 @@ - # define _DEBUG MOZ_TMP_UDEBUG - #endif - --#include - #include - #include - #include diff --git a/editors/openoffice/files/patch-MTypeConverter.cxx b/editors/openoffice/files/patch-MTypeConverter.cxx deleted file mode 100644 index 345d3700936e..000000000000 --- a/editors/openoffice/files/patch-MTypeConverter.cxx +++ /dev/null @@ -1,26 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx.orig Mon Nov 26 14:52:26 2001 -+++ ../connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx Sat May 18 14:02:06 2002 -@@ -2,9 +2,9 @@ - * - * $RCSfile: MTypeConverter.cxx,v $ - * -- * $Revision: 1.3 $ -+ * $Revision: 1.4 $ - * -- * last change: $Author: oj $ $Date: 2001/11/26 13:52:26 $ -+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -136,9 +136,11 @@ - ::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US); - return( ::std::string(os.getStr())); - } -+#if 0 - // ------------------------------------------------------------------------- - ::std::string MTypeConverter::nsStringToStlString(nsString const &nss) - { - return( ::std::string(nss.GetBuffer())); - } -+#endif - // ------------------------------------------------------------------------- diff --git a/editors/openoffice/files/patch-config_office+configure.in b/editors/openoffice/files/patch-config_office+configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice/files/patch-config_office+configure.in +++ b/editors/openoffice/files/patch-config_office+configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice/files/patch-config_office+set_soenv.1 b/editors/openoffice/files/patch-config_office+set_soenv.1 index a778f22c20a2..023d1b997d0e 100644 --- a/editors/openoffice/files/patch-config_office+set_soenv.1 +++ b/editors/openoffice/files/patch-config_office+set_soenv.1 @@ -1,5 +1,5 @@ ---- set_soenv.1.orig Wed Apr 17 22:41:31 2002 -+++ set_soenv.1 Thu Jun 6 15:58:56 2002 +--- set_soenv.1.orig Sun Jun 30 21:51:05 2002 ++++ set_soenv.1 Mon Jul 15 14:09:14 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of @@ -21,10 +21,10 @@ # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, - $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx ); -+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -+ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $PTHREAD_CFLAGS, -+ $PTHREAD_LIBS, $EXCEPTIONS ); +- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, $JRETOOLKITDIR, $JRETHREADDIR ); ++ $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, ++ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, ++ $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS); # #------------------------------------------- # IIc. Declaring the environment variables. @@ -40,7 +40,7 @@ @@ -145,7 +146,11 @@ $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 - $use_shell = $ARGV [ 18 ]; # preferred shell + $USE_SHELL = $ARGV [ 18 ]; # preferred shell -$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment) +$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment) +$CC = $ARGV [ 23 ]; # get cc from environment @@ -50,16 +50,7 @@ # #--------------------------------------------------------------- # IIIb. Initialising the variables for the system commands, etc. -@@ -316,7 +321,7 @@ - $PROSWITCH = "-DPRODUCT"; - $XPVERSION = "3"; - $SOLAR_JAVA = "TRUE"; -- $XPVERSION = "3"; -+ $XPVERSION = "3"; - } - elsif ( $platform eq "$FreeBSD" ) - { print "Setting FreeBSD specific values... "; -@@ -326,7 +331,14 @@ +@@ -335,7 +340,14 @@ $COMPATH = $ARGV[ 0 ]; $CPU = "I"; $CPUNAME = "INTEL"; @@ -74,17 +65,17 @@ $DLLSUFFIX = "fi"; $GUI = "UNX"; $GUIBASE = "unx"; -@@ -339,6 +351,9 @@ +@@ -348,6 +360,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; + $OSVERSION = $ARGV[ 20 ]; + $PTHREAD_CFLAGS = $ARGV[ 21 ]; + $PTHREAD_LIBS = $ARGV[ 22 ]; - } - elsif ( $platform eq "$Linux" ) - { -@@ -891,7 +906,7 @@ + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads"; +@@ -927,7 +942,7 @@ $ps_STLPORT_LIB. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; } @@ -93,7 +84,7 @@ { $LD_LIBRARY_PATH = $cur_dir. $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. $ps.$USR_LOCAL.$LIB. -@@ -899,6 +914,13 @@ +@@ -935,6 +950,13 @@ $ps_STLPORT_LIB. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; } @@ -107,7 +98,7 @@ elsif ($platform eq "$Irix" || $platform eq "$Irix64") { $LD_LIBRARY_PATH = $cur_dir. $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -@@ -934,15 +956,16 @@ +@@ -970,15 +992,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -127,7 +118,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -959,7 +982,7 @@ +@@ -995,7 +1018,7 @@ $L.$USR_DT.$LIB. $L.$USR_OPENWIN.$LIB.'"'; } @@ -136,7 +127,7 @@ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. $L.$LIB. $L.$USR.$LIB. -@@ -969,6 +992,11 @@ +@@ -1005,6 +1028,11 @@ { $SOLAREXTRALIB = '"'.$L.$LIB. $L.$USR.$LIB.'"'; } @@ -148,7 +139,7 @@ # Compiler include search directory paths. if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1039,7 +1067,7 @@ +@@ -1076,7 +1104,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -157,7 +148,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1058,6 +1086,22 @@ +@@ -1095,6 +1123,22 @@ $ps.$USR.$ds."X11".$BIN. $ps.$USR.$LIB; } @@ -180,8 +171,8 @@ elsif ($platform eq "$Winnt") { my ( $noldPATH ); -@@ -1155,7 +1199,7 @@ - $L_STLPORT_LIB. +@@ -1195,7 +1239,7 @@ + $L_STLPORT_LIB. $L.$XLIB.'"'; } -elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) @@ -189,8 +180,8 @@ { $SOLARLIB = '"'.$L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1167,6 +1211,15 @@ - $L_STLPORT_LIB. +@@ -1210,6 +1254,15 @@ + $L_STLPORT_LIB. $L.$XLIB.'"'; } +elsif ($platform eq "$FreeBSD") @@ -205,7 +196,7 @@ elsif ($platform eq "$Winnt") { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. -@@ -1196,7 +1249,7 @@ +@@ -1242,7 +1295,7 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -214,7 +205,7 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1210,11 +1263,6 @@ +@@ -1256,11 +1309,6 @@ { $SOLARINC .= $I.'$COMPATH'.$ds."include"; } @@ -226,7 +217,7 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1382,6 +1430,9 @@ +@@ -1428,6 +1476,9 @@ ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); ToFile( "TF_FILTER", "TRUE", "e" ); @@ -236,7 +227,7 @@ if ( $platform ne "$Macosx" ) { ToFile( "PSPRINT", "TRUE", "e" ); } elsif ( $GUIBASE eq "unx" ) { -@@ -1407,6 +1458,12 @@ +@@ -1453,6 +1504,12 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); diff --git a/editors/openoffice/files/patch-config_office::configure.in b/editors/openoffice/files/patch-config_office::configure.in index 5a563718c8e0..2957c2be79d2 100644 --- a/editors/openoffice/files/patch-config_office::configure.in +++ b/editors/openoffice/files/patch-config_office::configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Apr 17 22:37:42 2002 -+++ configure.in Thu Jun 6 13:10:49 2002 +--- configure.in.orig Sat Jun 8 02:49:26 2002 ++++ configure.in Mon Jul 15 13:36:23 2002 @@ -28,6 +28,11 @@ Usage: --enable-gcc3 @@ -34,39 +34,6 @@ dnl ****************************************** dnl Testing for GNU compiler and version... dnl ****************************************** -@@ -277,13 +288,13 @@ - - if test $GCC; then - AC_MSG_CHECKING([the GNU gcc compiler version]) -- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'` -+ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'` - if test "$_gcc_releasetype" = "egcs"; then - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) - AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn -- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'` -+ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'` - else -- _gcc_version=`$GCC --version` -+ _gcc_version=`$CC --version` - fi - _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` - if test -n "$enable_gcc3"; then -@@ -296,13 +307,13 @@ - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` -+ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` - if test "$_gcc_middle" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn - COMPATH="NO_GCC" - else -- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` -+ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` - if test "$_gcc_minor" = "false"; then - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) - AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn @@ -366,8 +377,9 @@ _gcc_include_path="NO_GCC_INCLUDE" fi @@ -180,7 +147,7 @@ dnl ************************************************************** @@ -815,6 +912,10 @@ fi - if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then + if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then @@ -189,7 +156,7 @@ fi if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` -@@ -1169,6 +1270,12 @@ +@@ -1170,6 +1271,12 @@ USE_GCC3="FALSE" fi @@ -202,7 +169,7 @@ # Print args passed to set_soenv. if test 1 = 1; then echo -@@ -1196,12 +1303,14 @@ +@@ -1197,12 +1304,14 @@ echo "\$MINGWIN32="$WITH_MINGWIN echo "\$with_use_shell="$with_use_shell echo "\$USE_GCC3="$USE_GCC3 diff --git a/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx b/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx deleted file mode 100644 index ba52563e23e0..000000000000 --- a/editors/openoffice/files/patch-connectivity::source::drivers::mozab::mozillasrc::MNSInit.cxx +++ /dev/null @@ -1,23 +0,0 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/MNSInit.cxx.orig Sat May 18 02:01:33 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/MNSInit.cxx Sat May 18 02:02:18 2002 -@@ -2,9 +2,9 @@ - * - * $RCSfile: MNSInit.cxx,v $ - * -- * $Revision: 1.4 $ -+ * $Revision: 1.5 $ - * -- * last change: $Author: dkenny $ $Date: 2001/12/12 15:32:45 $ -+ * last change: $Author: fs $ $Date: 2002/05/17 12:08:41 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses -@@ -269,7 +269,7 @@ - #ifdef _DEBUG - nsCAutoString temp1; - temp1.AssignWithConversion( pUsedProfile ); -- OSL_TRACE("Profile Name: %s\n", NS_STATIC_CAST(const char*, temp1)); -+ OSL_TRACE("Profile Name: %s\n", NS_STATIC_CAST(const char*, temp1.get())); - #endif - theProfile->SetCurrentProfile( pUsedProfile ); - diff --git a/editors/openoffice/files/patch-cosv+source+strings+streamstr.cxx b/editors/openoffice/files/patch-cosv+source+strings+streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice/files/patch-cosv+source+strings+streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice/files/patch-cosv::source::strings::streamstr.cxx b/editors/openoffice/files/patch-cosv::source::strings::streamstr.cxx new file mode 100644 index 000000000000..8abdf74d97b8 --- /dev/null +++ b/editors/openoffice/files/patch-cosv::source::strings::streamstr.cxx @@ -0,0 +1,11 @@ +--- ../cosv/source/strings/streamstr.cxx.orig Mon Jul 15 14:49:31 2002 ++++ ../cosv/source/strings/streamstr.cxx Mon Jul 15 14:49:33 2002 +@@ -65,7 +65,7 @@ + // NOT FULLY DECLARED SERVICES + #include + #include +-#if defined(WNT) || defined(LINUX) ++#if defined(WNT) || defined(LINUX) || defined(FREEBSD) + #include + #else + #include diff --git a/editors/openoffice/files/patch-external::zlib::zlibpatch.sh b/editors/openoffice/files/patch-external::zlib::zlibpatch.sh deleted file mode 100644 index 04d96c6ad70f..000000000000 --- a/editors/openoffice/files/patch-external::zlib::zlibpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- ../external/zlib/zlibpatch.sh.orig Wed Mar 13 16:51:46 2002 -+++ ../external/zlib/zlibpatch.sh Wed Mar 13 16:52:02 2002 -@@ -111,7 +111,7 @@ - - for PNAME in `cat flist.pat` - do -- patch -i pat/$PNAME.pat $PNAME -+ patch < pat/$PNAME.pat $PNAME - done - - cp -rf zlib-1.1.3/* rtufiles/ diff --git a/editors/openoffice/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice/files/patch-product+inc+scp+udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice/files/patch-product+inc+scp+udk_basefiles.scp +++ b/editors/openoffice/files/patch-product+inc+scp+udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice/files/patch-product+util+makefile.mk b/editors/openoffice/files/patch-product+util+makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice/files/patch-product+util+makefile.mk +++ b/editors/openoffice/files/patch-product+util+makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice/files/patch-product::inc::scp::udk_basefiles.scp b/editors/openoffice/files/patch-product::inc::scp::udk_basefiles.scp index 53ba0a1f9f7b..7b55cc064156 100644 --- a/editors/openoffice/files/patch-product::inc::scp::udk_basefiles.scp +++ b/editors/openoffice/files/patch-product::inc::scp::udk_basefiles.scp @@ -1,48 +1,18 @@ ---- ../product/inc/scp/udk_basefiles.scp.orig Sun Jun 2 22:58:19 2002 -+++ ../product/inc/scp/udk_basefiles.scp Sun Jun 2 23:28:10 2002 -@@ -2,7 +2,9 @@ +--- ../product/inc/scp/udk_basefiles.scp.orig Fri Jun 7 20:15:12 2002 ++++ ../product/inc/scp/udk_basefiles.scp Tue Jul 16 15:26:15 2002 +@@ -2,6 +2,7 @@ // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment // (setup is linked against it). --#if ( defined( _gcc3 ) && defined( C300 ) ) +#if ( defined ( LINUX )) -+#if ( defined( _gcc3 ) && defined( C300 )) -+ - File gid_File_Lib_gcc - BIN_FILE_BODY; - Name = STRING(libgcc_s.so.1); -@@ -10,6 +12,24 @@ - Styles = (PACKED, SETUPZIP); - End + #if ( defined( _gcc3 ) && defined( C300 ) ) -+#if ( CCNUMVER >= 000300010000 ) -+ -+File gid_File_Lib_Stdc -+ BIN_FILE_BODY; -+ Name = STRING(libstdc++.so.4.0.0); -+ Dir = GCFG_BINARY_DIR; -+ Styles = (PACKED, SETUPZIP); -+End -+ -+Shortcut gid_Shortcut_Lib_Stdc -+ FileID = gid_File_Lib_Stdc; -+ Dir = GCFG_BINARY_DIR; -+ Name = STRING(libstdc++.so.4); -+ Styles = (NETWORK,RELATIVE); -+End -+ -+#else -+ - File gid_File_Lib_Stdc - BIN_FILE_BODY; - Name = STRING(libstdc++.so.3.0.1); -@@ -23,6 +43,9 @@ + File gid_File_Lib_gcc +@@ -42,6 +43,7 @@ Name = STRING(libstdc++.so.3); Styles = (NETWORK,RELATIVE); End -+ -+#endif +#endif #endif + #endif - File gid_File_Lib_Sal diff --git a/editors/openoffice/files/patch-product::util::makefile.mk b/editors/openoffice/files/patch-product::util::makefile.mk index cee4a53a6659..e52b0a4ea6ef 100644 --- a/editors/openoffice/files/patch-product::util::makefile.mk +++ b/editors/openoffice/files/patch-product::util::makefile.mk @@ -1,27 +1,6 @@ ---- ../product/util/makefile.mk.orig Sat Apr 6 12:01:11 2002 -+++ ../product/util/makefile.mk Mon Jun 3 00:00:57 2002 -@@ -108,12 +108,20 @@ - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno - .IF "$(COMID)"=="gcc3" -+.IF "$(CCNUMVER)">="000300010000" -+ADDITIONAL_DLLS= \ -+ $(DESTDIRDLL)$/libgcc_s.so.1 \ -+ $(DESTDIRDLL)$/libgcc_s.so \ -+ $(DESTDIRDLL)$/libstdc++.so.4 \ -+ $(DESTDIRDLL)$/libstdc++.so.4.0.0 -+.ELSE - ADDITIONAL_DLLS= \ - $(DESTDIRDLL)$/libgcc_s.so.1 \ - $(DESTDIRDLL)$/libgcc_s.so \ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 - .ENDIF -+.ENDIF - .ELIF "$(OS)"=="FREEBSD" - ########### - # FREEBSD -@@ -123,13 +131,6 @@ +--- ../product/util/makefile.mk.orig Tue Jun 11 17:09:39 2002 ++++ ../product/util/makefile.mk Mon Jul 15 15:54:13 2002 +@@ -137,13 +137,6 @@ DESTDIRDLL=$(DESTDIRLIB) STLPORTLIBNAME=libstlport_gcc.so BINDINGDLL=$(COMNAME)_uno @@ -32,47 +11,23 @@ - $(DESTDIRDLL)$/libstdc++.so.3 \ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 -.ENDIF + .ELIF "$(OS)"=="NETBSD" ########### - # NETBSD -@@ -438,13 +439,27 @@ - +@@ -498,6 +491,7 @@ #--------------------------------------------------------- - # special targets for linux gcc3 -+ -+.IF "$(OS)"=="LINUX" -+.IF "$(CCNUMVER)">="000300010000" -+ -+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@ -+ -+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST) -+ -rm -f $@ -+ +ln -fs libstdc++.so.4.0.0 $@ -+ -+.ELSE -+ - $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ - $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@ + # special targets for linux gcc3 - $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) - -rm -f $@ -- +ln -s libstdc++.so.3.0.1 $@ -+ +ln -fs libstdc++.so.3.0.1 $@ - - $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ -@@ -452,7 +467,11 @@ ++.IF "$(OS)"=="LINUX" + .IF "$(CCNUMVER)">="000300010000" + $(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST) +@@ -526,6 +520,9 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -- +ln -s libgcc_s.so.1 $@ -+ +ln -fs libgcc_s.so.1 $@ + +ln -s libgcc_s.so.1 $@ + +.ENDIF -+.ENDIF + #------------------------------------------------------------- diff --git a/editors/openoffice/files/patch-set_soenv.1 b/editors/openoffice/files/patch-set_soenv.1 index a778f22c20a2..023d1b997d0e 100644 --- a/editors/openoffice/files/patch-set_soenv.1 +++ b/editors/openoffice/files/patch-set_soenv.1 @@ -1,5 +1,5 @@ ---- set_soenv.1.orig Wed Apr 17 22:41:31 2002 -+++ set_soenv.1 Thu Jun 6 15:58:56 2002 +--- set_soenv.1.orig Sun Jun 30 21:51:05 2002 ++++ set_soenv.1 Mon Jul 15 14:09:14 2002 @@ -40,7 +40,7 @@ # # Set this value equal to the corresponding amount of @@ -21,10 +21,10 @@ # Platform dependent constant values. my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, - $GVER, $GVERDIR, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx ); -+ $GVER, $GVERDIR, $OSVERSION, $OS, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, -+ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $PTHREAD_CFLAGS, -+ $PTHREAD_LIBS, $EXCEPTIONS ); +- $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, $JRETOOLKITDIR, $JRETHREADDIR ); ++ $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, ++ $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, ++ $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS); # #------------------------------------------- # IIc. Declaring the environment variables. @@ -40,7 +40,7 @@ @@ -145,7 +146,11 @@ $STLPORT4 = $ARGV [ 12 ]; # Location of STLport4 $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32 - $use_shell = $ARGV [ 18 ]; # preferred shell + $USE_SHELL = $ARGV [ 18 ]; # preferred shell -$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment) +$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment) +$CC = $ARGV [ 23 ]; # get cc from environment @@ -50,16 +50,7 @@ # #--------------------------------------------------------------- # IIIb. Initialising the variables for the system commands, etc. -@@ -316,7 +321,7 @@ - $PROSWITCH = "-DPRODUCT"; - $XPVERSION = "3"; - $SOLAR_JAVA = "TRUE"; -- $XPVERSION = "3"; -+ $XPVERSION = "3"; - } - elsif ( $platform eq "$FreeBSD" ) - { print "Setting FreeBSD specific values... "; -@@ -326,7 +331,14 @@ +@@ -335,7 +340,14 @@ $COMPATH = $ARGV[ 0 ]; $CPU = "I"; $CPUNAME = "INTEL"; @@ -74,17 +65,17 @@ $DLLSUFFIX = "fi"; $GUI = "UNX"; $GUIBASE = "unx"; -@@ -339,6 +351,9 @@ +@@ -348,6 +360,9 @@ $PATH_SEPERATOR = $ps; $PROSWITCH = "-DPRODUCT"; $XPVERSION = "3"; + $OSVERSION = $ARGV[ 20 ]; + $PTHREAD_CFLAGS = $ARGV[ 21 ]; + $PTHREAD_LIBS = $ARGV[ 22 ]; - } - elsif ( $platform eq "$Linux" ) - { -@@ -891,7 +906,7 @@ + $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; + $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; + $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads"; +@@ -927,7 +942,7 @@ $ps_STLPORT_LIB. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; } @@ -93,7 +84,7 @@ { $LD_LIBRARY_PATH = $cur_dir. $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. $ps.$USR_LOCAL.$LIB. -@@ -899,6 +914,13 @@ +@@ -935,6 +950,13 @@ $ps_STLPORT_LIB. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; } @@ -107,7 +98,7 @@ elsif ($platform eq "$Irix" || $platform eq "$Irix64") { $LD_LIBRARY_PATH = $cur_dir. $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -@@ -934,15 +956,16 @@ +@@ -970,15 +992,16 @@ $D.$COM. $D.$CVER. $D.$GVER. @@ -127,7 +118,7 @@ { $SOLARDEF .= $D."GLIBC=".$GLIBC; } $SOLARDEF .= $D."SUPD=$UPD". -@@ -959,7 +982,7 @@ +@@ -995,7 +1018,7 @@ $L.$USR_DT.$LIB. $L.$USR_OPENWIN.$LIB.'"'; } @@ -136,7 +127,7 @@ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. $L.$LIB. $L.$USR.$LIB. -@@ -969,6 +992,11 @@ +@@ -1005,6 +1028,11 @@ { $SOLAREXTRALIB = '"'.$L.$LIB. $L.$USR.$LIB.'"'; } @@ -148,7 +139,7 @@ # Compiler include search directory paths. if (($platform eq "$Solaris") || ($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"'; -@@ -1039,7 +1067,7 @@ +@@ -1076,7 +1104,7 @@ $ps.$USR.$LIB. $ps.$USR_LOCAL.$BIN; } @@ -157,7 +148,7 @@ { $PATH = $cur_dir. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN. $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN. -@@ -1058,6 +1086,22 @@ +@@ -1095,6 +1123,22 @@ $ps.$USR.$ds."X11".$BIN. $ps.$USR.$LIB; } @@ -180,8 +171,8 @@ elsif ($platform eq "$Winnt") { my ( $noldPATH ); -@@ -1155,7 +1199,7 @@ - $L_STLPORT_LIB. +@@ -1195,7 +1239,7 @@ + $L_STLPORT_LIB. $L.$XLIB.'"'; } -elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) @@ -189,8 +180,8 @@ { $SOLARLIB = '"'.$L.$par_dir.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1167,6 +1211,15 @@ - $L_STLPORT_LIB. +@@ -1210,6 +1254,15 @@ + $L_STLPORT_LIB. $L.$XLIB.'"'; } +elsif ($platform eq "$FreeBSD") @@ -205,7 +196,7 @@ elsif ($platform eq "$Winnt") { $SOLARLIB = '"'.$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. $L.$par_dir.$LIB. -@@ -1196,7 +1249,7 @@ +@@ -1242,7 +1295,7 @@ $SOLARINC .= $I.$USR.$INCLUDE; } $SOLARINC .= $STLPORT_stlport; @@ -214,7 +205,7 @@ { # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; -@@ -1210,11 +1263,6 @@ +@@ -1256,11 +1309,6 @@ { $SOLARINC .= $I.'$COMPATH'.$ds."include"; } @@ -226,7 +217,7 @@ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31". $I.'$JAVA_HOME'.$INCLUDE; -@@ -1382,6 +1430,9 @@ +@@ -1428,6 +1476,9 @@ ToFile( "NEW_JAR_PACK", $NEW_JAR_PACK, "e" ); ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); ToFile( "TF_FILTER", "TRUE", "e" ); @@ -236,7 +227,7 @@ if ( $platform ne "$Macosx" ) { ToFile( "PSPRINT", "TRUE", "e" ); } elsif ( $GUIBASE eq "unx" ) { -@@ -1407,6 +1458,12 @@ +@@ -1453,6 +1504,12 @@ ToFile( "GUIENV", $GUIENV, "e" ); ToFile( "GVER", $GVER, "e" ); ToFile( "OS", $OS, "e" ); diff --git a/editors/openoffice/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice/files/patch-solenv+inc+tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice/files/patch-solenv+inc+tg_ext.mk +++ b/editors/openoffice/files/patch-solenv+inc+tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice/files/patch-solenv::inc::tg_ext.mk index cb652ec9d1f0..701692c9425a 100644 --- a/editors/openoffice/files/patch-solenv::inc::tg_ext.mk +++ b/editors/openoffice/files/patch-solenv::inc::tg_ext.mk @@ -1,33 +1,12 @@ ---- ../solenv/inc/tg_ext.mk.orig Tue Mar 19 12:43:51 2002 -+++ ../solenv/inc/tg_ext.mk Wed Apr 3 01:31:10 2002 -@@ -108,7 +108,7 @@ - - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.gz - @+-$(RM) $@ -- @+echo $(assign UNPACKCMD := gunzip -c $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) -+ @+echo $(assign UNPACKCMD := tar $(TAR_EXCLUDE_SWITCH) -xzvf $(BACK_PATH)download$/$(TARFILE_NAME).tar.gz ) > $(NULLDEV) - @+$(COPY) $(mktmp $(UNPACKCMD)) $@ +--- ../solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 ++++ ../solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 +@@ -81,7 +81,9 @@ + .ENDIF # "$(GUI)"=="WNT" - $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar -@@ -147,17 +147,17 @@ - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | tr -d "\015" | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE # "$(GUI)"=="WNT" - .IF "$(BSCLIENT)"=="TRUE" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ELSE # "$(BSCLIENT)"!="" --.IF "$(OS)"=="NETBSD" -+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE) - .ELSE - +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE) --.ENDIF # "$(OS)"=="NETBSD" -+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - .ENDIF # "$(BSCLIENT)"!="" - .ENDIF # "$(GUI)"=="WNT" - .ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" + .IF "$(OS)"!="NETBSD" ++.IF "$(OS)"!="FREEBSD" + PATCHFLAGS=-b ++.ENDIF # "$(OS)"=="FREEBSD" + .ENDIF # "$(OS)"=="NETBSD" + + #override diff --git a/editors/openoffice/files/patch-tools::source::string::charset.cxx b/editors/openoffice/files/patch-tools::source::string::charset.cxx deleted file mode 100644 index b989108fbdbb..000000000000 --- a/editors/openoffice/files/patch-tools::source::string::charset.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- ../tools/source/string/charset.cxx.orig Fri May 31 00:17:15 2002 -+++ ../tools/source/string/charset.cxx Fri May 31 00:17:17 2002 -@@ -68,6 +68,9 @@ - #include - #include - #include -+#if defined(FREEBSD) -+#include -+#endif - #include - #include - #ifndef _TOOLS_LANG_HXX diff --git a/editors/openoffice/files/patch-unzip+source+misc.c b/editors/openoffice/files/patch-unzip+source+misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice/files/patch-unzip+source+misc.c +++ b/editors/openoffice/files/patch-unzip+source+misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ diff --git a/editors/openoffice/files/patch-unzip::source::misc.c b/editors/openoffice/files/patch-unzip::source::misc.c index 8087b0887af4..649a976f4c4d 100644 --- a/editors/openoffice/files/patch-unzip::source::misc.c +++ b/editors/openoffice/files/patch-unzip::source::misc.c @@ -1,11 +1,15 @@ ---- ../unzip/source/misc.c.orig Sat Apr 6 12:13:38 2002 -+++ ../unzip/source/misc.c Wed May 1 22:36:32 2002 -@@ -300,7 +300,7 @@ +--- ../unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 ++++ ../unzip/source/misc.c Mon Jul 15 14:27:15 2002 +@@ -300,9 +300,9 @@ static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; int yr, mo, dy, hh, mm, ss, leap; long m_time, days=0; -#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) +-#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) +-#if !defined __386BSD__ && !defined FREEBSD +#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) - #if (defined(BSD) || defined(MTS)) - #ifndef __386BSD__ ++#if (defined(BSD) || defined(MTS) ++#if !defined __386BSD__ static struct timeb tbp; + #endif /* __386BSD__ */ + #else /* !(BSD || MTS) */ -- cgit v1.2.3