diff options
| author | hira <hira> | 2008-10-23 09:18:12 +0000 |
|---|---|---|
| committer | hira <hira> | 2008-10-23 09:18:12 +0000 |
| commit | f0b35fca791046ee62c64a07d60ef153b238b9e3 (patch) | |
| tree | e64651107979013968bc538bcfffb83163194ce1 /misc | |
| parent | b6dcdfcb4f9f1348c5b50009f6eba666895a8afd (diff) | |
| download | pkgsrc-f0b35fca791046ee62c64a07d60ef153b238b9e3.tar.gz | |
- Remove unused entry from distinfo.
- Fix browser plugin on NetBSD (re-open socket before retry).
Bump PKGREVISION.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice3/Makefile | 4 | ||||
| -rw-r--r-- | misc/openoffice3/distinfo | 6 | ||||
| -rw-r--r-- | misc/openoffice3/patches/patch-ed | 26 |
3 files changed, 30 insertions, 6 deletions
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile index 999c0219916..7ad55583f35 100644 --- a/misc/openoffice3/Makefile +++ b/misc/openoffice3/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2008/10/22 16:35:47 tnn Exp $ +# $NetBSD: Makefile,v 1.9 2008/10/23 09:18:12 hira Exp $ # OO_VER= 3.0.0 -PKGREVISION= 2 +PKGREVISION= 3 OO_TAG= OOO300_m9 DISTNAME= openoffice-${OO_VER} PKGNAME= openoffice3-${OO_VER} diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo index 532a1f266e0..56a1833cbf4 100644 --- a/misc/openoffice3/distinfo +++ b/misc/openoffice3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2008/10/20 23:03:25 hira Exp $ +$NetBSD: distinfo,v 1.10 2008/10/23 09:18:12 hira Exp $ SHA1 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 09ff91fd871f00c696befa8064fe04d7a88a3c8a RMD160 (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = edc71b8b0596d63e60431c7266140bf5188abc6d @@ -6,9 +6,6 @@ Size (openoffice-3.0.0/OOo_3.0.0_src_binfilter.tar.bz2) = 6596201 bytes SHA1 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 8fc1e6140f8a0695accf8d34746253af431c2542 RMD160 (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 43be2cf77523d0d95ec4c684fe705fa9b4ee4b9d Size (openoffice-3.0.0/OOo_3.0.0_src_core.tar.bz2) = 183003517 bytes -SHA1 (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = 1632374bf75eb6080c0d36e88fd981529be17a0f -RMD160 (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = a19bdd687abc7829de937b46e4e484a4b27f045b -Size (openoffice-3.0.0/OOo_3.0.0_src_extensions.tar.bz2) = 13941316 bytes SHA1 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 0ee7f44cea5549a3d3473ff7669974e8914caf97 RMD160 (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = cb3eac1537b75cb34485037b916b634b90c6ff13 Size (openoffice-3.0.0/OOo_3.0.0_src_l10n.tar.bz2) = 86009445 bytes @@ -81,3 +78,4 @@ SHA1 (patch-dz) = 3932f59e8f78c8a641e52d5284ccc0395c7ee172 SHA1 (patch-ea) = 8c54345a53bd49d9c4c3b206d43778a56df0b292 SHA1 (patch-eb) = 34562ae59bc67ab6ced1d63b39594a1b44ca3834 SHA1 (patch-ec) = 4cfdda3d07972329de9d5e1c5ea7db2b4ab47247 +SHA1 (patch-ed) = 235cd96522e8fec1cd3cc2f49f410cf832a07604 diff --git a/misc/openoffice3/patches/patch-ed b/misc/openoffice3/patches/patch-ed new file mode 100644 index 00000000000..00fd75acce1 --- /dev/null +++ b/misc/openoffice3/patches/patch-ed @@ -0,0 +1,26 @@ +$NetBSD: patch-ed,v 1.1 2008/10/23 09:18:12 hira Exp $ + +--- extensions/source/nsplugin/source/so_main.cxx.orig 2008-10-22 10:41:18.000000000 +0900 ++++ extensions/source/nsplugin/source/so_main.cxx 2008-10-22 20:52:24.000000000 +0900 +@@ -320,6 +320,10 @@ + } + + NSP_Sleep(5); ++#ifdef NETBSD ++ NSP_CloseSocket(my_sock); ++ my_sock=socket(PF_INET, SOCK_STREAM, 0); ++#endif + // try to connect to background SO, thus judge if it is ready + while(0 > connect(my_sock, (struct sockaddr *)&dst_addr, sizeof(dst_addr))) + { +@@ -331,6 +335,10 @@ + return sal_False; + } + debug_fprintf(NSP_LOG_APPEND, "print by nsplugin, Current count: %d\n", count); ++#ifdef NETBSD ++ NSP_CloseSocket(my_sock); ++ my_sock=socket(PF_INET, SOCK_STREAM, 0); ++#endif + } + NSP_CloseSocket(my_sock); + NSP_Sleep(5); |