diff options
author | mrauch <mrauch@pkgsrc.org> | 2005-10-03 16:03:19 +0000 |
---|---|---|
committer | mrauch <mrauch@pkgsrc.org> | 2005-10-03 16:03:19 +0000 |
commit | 0c054393180b20ae0ae8466d0f7994c8157f4d4a (patch) | |
tree | e8526faee834d9e6dbd45412f63cfa8c03f56930 /misc/openoffice | |
parent | f132fb31b771698c33ffc843753ef95b424df72e (diff) | |
download | pkgsrc-0c054393180b20ae0ae8466d0f7994c8157f4d4a.tar.gz |
Update to version 1.1.5.
This version contains read support for the new OpenDocument format OASIS which
will be default in OOo 2.0.
Additionally some minor bugs have been fixed. A complete list can be found at
http://download.openoffice.org/1.1.5/release_notes_1.1.5.html.
Diffstat (limited to 'misc/openoffice')
-rw-r--r-- | misc/openoffice/Makefile | 19 | ||||
-rw-r--r-- | misc/openoffice/Makefile.i18n | 2 | ||||
-rw-r--r-- | misc/openoffice/PLIST.common | 4 | ||||
-rw-r--r-- | misc/openoffice/distinfo | 81 | ||||
-rw-r--r-- | misc/openoffice/patches/patch-ab | 8 | ||||
-rw-r--r-- | misc/openoffice/patches/patch-ax | 15 | ||||
-rw-r--r-- | misc/openoffice/patches/patch-ay | 13 | ||||
-rw-r--r-- | misc/openoffice/patches/patch-az | 13 |
8 files changed, 71 insertions, 84 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index fe500772ed8..084ce42ac34 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.70 2005/09/12 18:42:11 mrauch Exp $ +# $NetBSD: Makefile,v 1.71 2005/10/03 16:03:19 mrauch Exp $ -DISTNAME= openoffice-1.1.4 -PKGREVISION= 2 +DISTNAME= openoffice-1.1.5 CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/1.1.4/} -DISTFILES= OOo_1.1.4_source.tar.gz +MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/1.1.5/} +DISTFILES= OOo_1.1.5_src.tar.gz DISTFILES+= gpc231.tar.Z -DISTFILES+= ooo_addons_114.tar.bz2 +DISTFILES+= ooo_addons_115.tar.bz2 SITES_gpc231.tar.Z= ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ -SITES_ooo_addons_114.tar.bz2=http://www.fs.tum.de/~mrauch/OpenOffice/download/\ +SITES_ooo_addons_115.tar.bz2=http://www.fs.tum.de/~mrauch/OpenOffice/download/\ ftp://ftp.NetBSD.org/pub/NetBSD/misc/mrauch/ DIST_SUBDIR= ${PKGNAME_NOREV} @@ -21,7 +20,7 @@ BUILD_DEPENDS+= {standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip -WRKSRC= ${WRKDIR}/config_office +WRKSRC= ${WRKDIR}/OOo_1.1.5/config_office GCC_REQD= 3.0 USE_LANGUAGES+= c c++ @@ -53,7 +52,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST.${OPSYS} . endif MESSAGE_SUBST+= OPENOFFICE_VERSION=${OPENOFFICE_VERSION} -OPENOFFICE_VERSION= OpenOffice.org1.1.4 +OPENOFFICE_VERSION= OpenOffice.org1.1.5 INSTALLATION_DIRS= bin @@ -95,7 +94,7 @@ do-install: < ${FILESDIR}/soffice > ${PREFIX}/bin/soffice ${CHMOD} +x ${PREFIX}/bin/soffice .for i in scalc sdraw simpress swriter - ${LN} -sf ${PREFIX}/${OPENOFFICE_VERSION}/program/$i ${PREFIX}/bin/$i + ${LN} -sf ${PREFIX}/${OPENOFFICE_VERSION}/program/${i} ${PREFIX}/bin/${i} .endfor # everything specific to your OS/Arch goes into its own Makefile diff --git a/misc/openoffice/Makefile.i18n b/misc/openoffice/Makefile.i18n index de430a70a25..28e6edbcc53 100644 --- a/misc/openoffice/Makefile.i18n +++ b/misc/openoffice/Makefile.i18n @@ -1,3 +1,5 @@ +# $NetBSD: Makefile.i18n,v 1.4 2005/10/03 16:03:19 mrauch Exp $ + .if ${PKG_LANG:C/_.*//} == "afrikaans" OPENOFFICE_ISOCODE= af OPENOFFICE_LANG= afrikaans diff --git a/misc/openoffice/PLIST.common b/misc/openoffice/PLIST.common index 08bb5d5569e..8f11fd163ec 100644 --- a/misc/openoffice/PLIST.common +++ b/misc/openoffice/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.3 2005/01/06 15:52:19 mrauch Exp $ +@comment $NetBSD: PLIST.common,v 1.4 2005/10/03 16:03:19 mrauch Exp $ ${OPENOFFICE_VERSION}/LICENSE ${OPENOFFICE_VERSION}/LICENSE.html ${OPENOFFICE_VERSION}/README @@ -357,6 +357,7 @@ ${OPENOFFICE_VERSION}/program/libwrp645${OPENOFFICE_DLLSUFFIX}.so ${OPENOFFICE_VERSION}/program/libxcr645${OPENOFFICE_DLLSUFFIX}.so ${OPENOFFICE_VERSION}/program/libxmx645${OPENOFFICE_DLLSUFFIX}.so ${OPENOFFICE_VERSION}/program/libxo645${OPENOFFICE_DLLSUFFIX}.so +${OPENOFFICE_VERSION}/program/libxod645${OPENOFFICE_DLLSUFFIX}.so ${OPENOFFICE_VERSION}/program/libxpcom.so ${OPENOFFICE_VERSION}/program/libxsltdlg645${OPENOFFICE_DLLSUFFIX}.so ${OPENOFFICE_VERSION}/program/libxsltfilter645${OPENOFFICE_DLLSUFFIX}.so @@ -379,6 +380,7 @@ ${OPENOFFICE_VERSION}/program/pagein-writer ${OPENOFFICE_VERSION}/program/pkgchk ${OPENOFFICE_VERSION}/program/pkgchk.bin ${OPENOFFICE_VERSION}/program/pluginapp.bin +${OPENOFFICE_VERSION}/program/pp5.dat ${OPENOFFICE_VERSION}/program/proxyfac.uno.so ${OPENOFFICE_VERSION}/program/python ${OPENOFFICE_VERSION}/program/python-core diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo index db546c270c6..0671a1ca3b3 100644 --- a/misc/openoffice/distinfo +++ b/misc/openoffice/distinfo @@ -1,38 +1,49 @@ -$NetBSD: distinfo,v 1.33 2005/10/01 07:00:08 mrauch Exp $ +$NetBSD: distinfo,v 1.34 2005/10/03 16:03:19 mrauch Exp $ -SHA1 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 3161dbe53f6ec0b0d5a65790a2b1dd3d7331b430 -RMD160 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 0e218792bb72106cd494532de373d0f40a5a9587 -Size (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 219743530 bytes -SHA1 (openoffice-1.1.4/gpc231.tar.Z) = dd70a665179a9eac23624a4fe9f22104aad9bb1d -RMD160 (openoffice-1.1.4/gpc231.tar.Z) = e90f5f0f59433f1229117e01a5160669af58527d -Size (openoffice-1.1.4/gpc231.tar.Z) = 27917 bytes -SHA1 (openoffice-1.1.4/helpcontent_31_unix.tgz) = 1295c30cb3efd4bfa6bb3b4fd1f9ae66a1543f20 -Size (openoffice-1.1.4/helpcontent_31_unix.tgz) = 12073861 bytes -SHA1 (openoffice-1.1.4/helpcontent_33_unix.tgz) = c300bdd82576414ba55c880d79222fabf6618881 -Size (openoffice-1.1.4/helpcontent_33_unix.tgz) = 12574720 bytes -SHA1 (openoffice-1.1.4/helpcontent_34_unix.tgz) = 2ac65d7f1f4400d3daf25006ca077f9a864623a3 -Size (openoffice-1.1.4/helpcontent_34_unix.tgz) = 12554240 bytes -SHA1 (openoffice-1.1.4/helpcontent_39_unix.tgz) = 1f82bd7cb216798cb92b24bfb29600109699f399 -Size (openoffice-1.1.4/helpcontent_39_unix.tgz) = 12482560 bytes -SHA1 (openoffice-1.1.4/helpcontent_46_unix.tgz) = 1df7173d028a3e922a2ae290a2d6f61be05a8332 -Size (openoffice-1.1.4/helpcontent_46_unix.tgz) = 12072960 bytes -SHA1 (openoffice-1.1.4/helpcontent_49_unix.tgz) = c3b49646d0c73dccb640f87dd87fcb897b33407d -Size (openoffice-1.1.4/helpcontent_49_unix.tgz) = 13649920 bytes -SHA1 (openoffice-1.1.4/helpcontent_55_unix.tgz) = ad646a73159b66cfc9175272b654276f043d7fb1 -Size (openoffice-1.1.4/helpcontent_55_unix.tgz) = 11549758 bytes -SHA1 (openoffice-1.1.4/helpcontent_81_unix.tgz) = 2ce6f94541f55972d0eacabe57ab620afada9834 -Size (openoffice-1.1.4/helpcontent_81_unix.tgz) = 12902400 bytes -SHA1 (openoffice-1.1.4/helpcontent_82_unix.tgz) = 02a939cd50c9f9c75bdf9de8c4ad41ce3274c013 -Size (openoffice-1.1.4/helpcontent_82_unix.tgz) = 12369920 bytes -SHA1 (openoffice-1.1.4/helpcontent_86_unix.tgz) = 75a48b9da2fa2df1a63255cb476e068cb1a88bb2 -Size (openoffice-1.1.4/helpcontent_86_unix.tgz) = 12769280 bytes -SHA1 (openoffice-1.1.4/helpcontent_88_unix.tgz) = ed03e5bdb574228580ed83dbf7a2095b5409918a -Size (openoffice-1.1.4/helpcontent_88_unix.tgz) = 12953600 bytes -SHA1 (openoffice-1.1.4/ooo_addons_114.tar.bz2) = 87920f3547cf7170bc99e39c3799c779fa3c625e -RMD160 (openoffice-1.1.4/ooo_addons_114.tar.bz2) = 927829bff619bc42546d9b3c645a9bf4d4397a50 -Size (openoffice-1.1.4/ooo_addons_114.tar.bz2) = 11766494 bytes +SHA1 (openoffice-1.1.5/OOo_1.1.5_src.tar.gz) = 55b316209eaabf151a59ead2abc3c621502058ea +RMD160 (openoffice-1.1.5/OOo_1.1.5_src.tar.gz) = 4f0759d0e3951dd511487f1ed774649dcc94e0db +Size (openoffice-1.1.5/OOo_1.1.5_src.tar.gz) = 223418209 bytes +SHA1 (openoffice-1.1.5/gpc231.tar.Z) = dd70a665179a9eac23624a4fe9f22104aad9bb1d +RMD160 (openoffice-1.1.5/gpc231.tar.Z) = e90f5f0f59433f1229117e01a5160669af58527d +Size (openoffice-1.1.5/gpc231.tar.Z) = 27917 bytes +SHA1 (openoffice-1.1.5/helpcontent_31_unix.tgz) = 1295c30cb3efd4bfa6bb3b4fd1f9ae66a1543f20 +RMD160 (openoffice-1.1.5/helpcontent_31_unix.tgz) = 3e90cc89e27e7ef0420fe3da0ad051a87b27a3b5 +Size (openoffice-1.1.5/helpcontent_31_unix.tgz) = 12073861 bytes +SHA1 (openoffice-1.1.5/helpcontent_33_unix.tgz) = c300bdd82576414ba55c880d79222fabf6618881 +RMD160 (openoffice-1.1.5/helpcontent_33_unix.tgz) = 9213d1d175fb3abf73e5a20c8afc2c3ccf9c07fb +Size (openoffice-1.1.5/helpcontent_33_unix.tgz) = 12574720 bytes +SHA1 (openoffice-1.1.5/helpcontent_34_unix.tgz) = 2ac65d7f1f4400d3daf25006ca077f9a864623a3 +RMD160 (openoffice-1.1.5/helpcontent_34_unix.tgz) = 4722bd94f409aa122fbbb2aa9b68d730d641df6a +Size (openoffice-1.1.5/helpcontent_34_unix.tgz) = 12554240 bytes +SHA1 (openoffice-1.1.5/helpcontent_39_unix.tgz) = 1f82bd7cb216798cb92b24bfb29600109699f399 +RMD160 (openoffice-1.1.5/helpcontent_39_unix.tgz) = cd13733daa33cb8b805f723050e58a28527bc61a +Size (openoffice-1.1.5/helpcontent_39_unix.tgz) = 12482560 bytes +SHA1 (openoffice-1.1.5/helpcontent_46_unix.tgz) = 1df7173d028a3e922a2ae290a2d6f61be05a8332 +RMD160 (openoffice-1.1.5/helpcontent_46_unix.tgz) = 9200783e3abb1f28517522cc01b3be8a555ed61f +Size (openoffice-1.1.5/helpcontent_46_unix.tgz) = 12072960 bytes +SHA1 (openoffice-1.1.5/helpcontent_49_unix.tgz) = c3b49646d0c73dccb640f87dd87fcb897b33407d +RMD160 (openoffice-1.1.5/helpcontent_49_unix.tgz) = 697e65d2b0767f382576be4ca4467c7868000e7b +Size (openoffice-1.1.5/helpcontent_49_unix.tgz) = 13649920 bytes +SHA1 (openoffice-1.1.5/helpcontent_55_unix.tgz) = ad646a73159b66cfc9175272b654276f043d7fb1 +RMD160 (openoffice-1.1.5/helpcontent_55_unix.tgz) = ce2625a390a03efb41f506dccefff1cc5e1aa0cd +Size (openoffice-1.1.5/helpcontent_55_unix.tgz) = 11549758 bytes +SHA1 (openoffice-1.1.5/helpcontent_81_unix.tgz) = 2ce6f94541f55972d0eacabe57ab620afada9834 +RMD160 (openoffice-1.1.5/helpcontent_81_unix.tgz) = 994654a261191a9fed3e90761d03914934cc29b1 +Size (openoffice-1.1.5/helpcontent_81_unix.tgz) = 12902400 bytes +SHA1 (openoffice-1.1.5/helpcontent_82_unix.tgz) = 02a939cd50c9f9c75bdf9de8c4ad41ce3274c013 +RMD160 (openoffice-1.1.5/helpcontent_82_unix.tgz) = aebe8a85a41122b65e8b3eabb20ed6734ecf0d44 +Size (openoffice-1.1.5/helpcontent_82_unix.tgz) = 12369920 bytes +SHA1 (openoffice-1.1.5/helpcontent_86_unix.tgz) = 75a48b9da2fa2df1a63255cb476e068cb1a88bb2 +RMD160 (openoffice-1.1.5/helpcontent_86_unix.tgz) = dbec251d2e7d245ebc6e442ce02cc4a64937054c +Size (openoffice-1.1.5/helpcontent_86_unix.tgz) = 12769280 bytes +SHA1 (openoffice-1.1.5/helpcontent_88_unix.tgz) = ed03e5bdb574228580ed83dbf7a2095b5409918a +RMD160 (openoffice-1.1.5/helpcontent_88_unix.tgz) = dd2350f67704c1dabd06a027dda1da0fe1fe5757 +Size (openoffice-1.1.5/helpcontent_88_unix.tgz) = 12953600 bytes +SHA1 (openoffice-1.1.5/ooo_addons_115.tar.bz2) = 87920f3547cf7170bc99e39c3799c779fa3c625e +RMD160 (openoffice-1.1.5/ooo_addons_115.tar.bz2) = 927829bff619bc42546d9b3c645a9bf4d4397a50 +Size (openoffice-1.1.5/ooo_addons_115.tar.bz2) = 11766494 bytes SHA1 (patch-aa) = 783e0cf32bc942cc6f8d31a0fb74a9d91205e0e7 -SHA1 (patch-ab) = 873131e69215c063edb9e65af0155ca1725ac552 +SHA1 (patch-ab) = fe065a6e7afe405c6924c01c95ccd5005762df42 SHA1 (patch-ac) = 0c5962741c749299379ddbc96474fd2b567232ce SHA1 (patch-ad) = 5f9911429cde69ed5a73fbadab59f3163a8e1924 SHA1 (patch-ae) = 9015ca0800ee0b440a4a0aa4723f2597c3e6718d @@ -53,6 +64,4 @@ SHA1 (patch-at) = d208593e5fd37687c4be0b2735fdcc57760f7f3a SHA1 (patch-au) = 3fd383266f24c4a0c5e6f0cd00d419e1fe20cafa SHA1 (patch-av) = fa1910700a104347bf29ba19851f47eca34c8be1 SHA1 (patch-aw) = f0decfe7d1bac881ec83b09328a6b863a9bed7b1 -SHA1 (patch-ax) = 4a918df6dfd058fd6abecfc4c9b85a21bfc18364 -SHA1 (patch-ay) = f548c8c79d6ef9b1a0d1e521d295bf03cd8f8849 -SHA1 (patch-az) = 2c53d79f5d78aebefc4bc43a7f95b484cadd674a +SHA1 (patch-ax) = 4679a5b3eda8dbe5927cf09de81e54557a4a0809 diff --git a/misc/openoffice/patches/patch-ab b/misc/openoffice/patches/patch-ab index efaa159af5e..147c9c0d875 100644 --- a/misc/openoffice/patches/patch-ab +++ b/misc/openoffice/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.2 2004/05/03 20:56:36 mrauch Exp $ +$NetBSD: patch-ab,v 1.3 2005/10/03 16:03:19 mrauch Exp $ ---- ../desktop/source/pkgchk/pkgchk_misc.h.orig 2004-04-17 19:21:18.000000000 +0200 +--- ../desktop/source/pkgchk/pkgchk_misc.h.orig 2005-04-29 17:02:31.000000000 +0200 +++ ../desktop/source/pkgchk/pkgchk_misc.h -@@ -244,6 +244,8 @@ bool office_is_running( ::rtl::Bootstrap - #define THIS_PLATFORM_PATH "/linux_sparc.plt" +@@ -246,6 +246,8 @@ bool office_is_running( ::rtl::Bootstrap + #define THIS_PLATFORM_PATH "/linux_arm.plt" #elif defined (MACOSX) && defined (POWERPC) #define THIS_PLATFORM_PATH "/macosx_powerpc.plt" +#elif defined (NETBSD) && defined (INTEL) diff --git a/misc/openoffice/patches/patch-ax b/misc/openoffice/patches/patch-ax index 3e928719346..72aa904fb79 100644 --- a/misc/openoffice/patches/patch-ax +++ b/misc/openoffice/patches/patch-ax @@ -1,12 +1,13 @@ -$NetBSD: patch-ax,v 1.3 2005/01/06 15:52:20 mrauch Exp $ +$NetBSD: patch-ax,v 1.4 2005/10/03 16:03:19 mrauch Exp $ ---- ../ucbhelper/source/client/proxydecider.cxx.orig 2004-10-20 14:04:36.000000000 +0200 +--- ../ucbhelper/source/client/proxydecider.cxx.orig 2005-06-03 12:31:52.000000000 +0200 +++ ../ucbhelper/source/client/proxydecider.cxx -@@ -125,6 +125,7 @@ using namespace ucbhelper; - #else - #include <netdb.h> +@@ -126,7 +126,7 @@ using namespace ucbhelper; #include <unistd.h> -+#include <sys/socket.h> #endif - #ifdef SOLARIS +-#if defined (FREEBSD) ++#if defined (FREEBSD) || defined (NETBSD) + #include <sys/socket.h> + #endif + diff --git a/misc/openoffice/patches/patch-ay b/misc/openoffice/patches/patch-ay deleted file mode 100644 index de3adca9f14..00000000000 --- a/misc/openoffice/patches/patch-ay +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ay,v 1.3 2005/02/26 16:07:46 mrauch Exp $ - ---- ../sal/osl/unx/nlsupport.c.orig 28 Jan 2004 10:17:50 -0000 -+++ ../sal/osl/unx/nlsupport.c 21 Feb 2005 04:57:37 -0000 -@@ -329,7 +329,7 @@ - { "sjis", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */ - }; - --#elif defined(LINUX) || defined(NETBSD) -+#elif defined(LINUX) - - const _pair _nl_language_list[] = { - { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ diff --git a/misc/openoffice/patches/patch-az b/misc/openoffice/patches/patch-az deleted file mode 100644 index 481e35c3be0..00000000000 --- a/misc/openoffice/patches/patch-az +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-az,v 1.3 2005/04/14 20:48:58 mrauch Exp $ - ---- ../sot/source/sdstor/stgole.cxx.orig 2002-07-22 14:28:43.000000000 +0200 -+++ ../sot/source/sdstor/stgole.cxx -@@ -156,6 +156,8 @@ BOOL StgCompObjStream::Load() - *this >> aClsId; - INT32 nLen1 = 0; - *this >> nLen1; -+ // the higher bits are ignored -+ nLen1 &= 0xFFFF; - sal_Char* p = new sal_Char[ (USHORT) nLen1 ]; - if( Read( p, nLen1 ) == (ULONG) nLen1 ) - { |