Make open-url work with firefox3 and seamonkey.

3 files changed, 29 insertions, 2 deletions

diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo
index 60d714f2fcd..532a1f266e0 100644
--- a/misc/openoffice3/distinfo
+++ b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2008/10/20 16:14:54 hira Exp $
+$NetBSD: distinfo,v 1.9 2008/10/20 23:03:25 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,6 +6,9 @@ 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
@@ -77,3 +80,4 @@ SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405
 SHA1 (patch-dz) = 3932f59e8f78c8a641e52d5284ccc0395c7ee172
 SHA1 (patch-ea) = 8c54345a53bd49d9c4c3b206d43778a56df0b292
 SHA1 (patch-eb) = 34562ae59bc67ab6ced1d63b39594a1b44ca3834
+SHA1 (patch-ec) = 4cfdda3d07972329de9d5e1c5ea7db2b4ab47247
diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk
index 2ef02e43959..21a553f988a 100644
--- a/misc/openoffice3/options.mk
+++ b/misc/openoffice3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2008/10/20 16:14:54 hira Exp $
+# $NetBSD: options.mk,v 1.8 2008/10/20 23:03:25 hira Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice3
 PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 java kde ooo-external-libwpd
@@ -28,12 +28,15 @@ OO_LANGS+=	${l:S/^lang-//1}
 OO_LANGS?=	en-US
 
 .if !empty(PKG_OPTIONS:Mfirefox)
+MOZ_FLAVOUR=		firefox
 CONFIGURE_ARGS+=	--with-system-mozilla=firefox
 .include "../../www/firefox/buildlink3.mk"
 .elif !empty(PKG_OPTIONS:Mfirefox3)
+MOZ_FLAVOUR=		firefox3
 CONFIGURE_ARGS+=	--with-system-mozilla=firefox3
 .include "../../www/firefox3/buildlink3.mk"
 .elif !empty(PKG_OPTIONS:Mseamonkey)
+MOZ_FLAVOUR=		seamonkey
 CONFIGURE_ARGS+=	--with-system-mozilla=seamonkey
 .include "../../www/seamonkey/buildlink3.mk"
 # The following browsers do not install *.pc files.
@@ -44,9 +47,16 @@ CONFIGURE_ARGS+=	--with-system-mozilla=seamonkey
 #CONFIGURE_ARGS+=	--with-system-mozilla=seamonkey
 #.include "../../www/seamonkey-gtk1/buildlink3.mk"
 .else
+MOZ_FLAVOUR=
 CONFIGURE_ARGS+=	--disable-mozilla
 .endif
 
+SUBST_CLASSES+=		browser
+SUBST_STAGE.browser=	post-patch
+SUBST_MESSAGE.browser=	Adding MOZ_FLAVOUR
+SUBST_FILES.browser=	shell/source/unix/misc/open-url.sh
+SUBST_SED.browser+=	-e 's,@MOZ_FLAVOUR@,${MOZ_FLAVOUR},g'
+
 .if !empty(PKG_OPTIONS:Mooo-external-libwpd)
 CONFIGURE_ARGS+=	--with-system-libwpd
 .include "../../converters/libwpd/buildlink3.mk"
diff --git a/misc/openoffice3/patches/patch-ec b/misc/openoffice3/patches/patch-ec
new file mode 100644
index 00000000000..bd0367c3127
--- /dev/null
+++ b/misc/openoffice3/patches/patch-ec
@@ -0,0 +1,13 @@
+$NetBSD: patch-ec,v 1.1 2008/10/20 23:03:25 hira Exp $
+
+--- shell/source/unix/misc/open-url.sh.orig	2008-10-21 07:41:00.000000000 +0900
++++ shell/source/unix/misc/open-url.sh	2008-10-21 07:41:22.000000000 +0900
+@@ -69,7 +69,7 @@
+     exit 0
+   else
+     # mozilla derivates may need -remote semantics
+-    for i in firefox mozilla netscape; do
++    for i in @MOZ_FLAVOUR@ firefox mozilla netscape; do
+       browser=`which $i`
+       if [ ! -z "$browser" ]; then
+         run_mozilla "$browser" "$1"