Add `firefox3' option. It's disabled by default.

Requested and OK'd during freeze by wiz@.

3 files changed, 24 insertions, 11 deletions

diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index 125899c339e..795a9d23f5e 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2008/09/29 23:17:00 hira Exp $
+$NetBSD: distinfo,v 1.43 2008/09/30 23:14:18 hira Exp $
 
 SHA1 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = a50c7f317643b756c2b0e8937fa9d64b99f05ed9
 RMD160 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = 04ffce167f94a250f94f05923a70af0b0744c417
@@ -26,7 +26,7 @@ SHA1 (patch-aq) = e4f2a84598a6a09b4bedc430cd24921f87f822e5
 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
 SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
 SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = 0134e4055ebe01134029881c3f4d961f7efe8db6
+SHA1 (patch-ba) = 9abaa68d6d48d69273c5f49c25e646de3abf7658
 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
 SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
 SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk
index 4fa1b4bbb0c..82142a38e8f 100644
--- a/misc/openoffice2/options.mk
+++ b/misc/openoffice2/options.mk
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.18 2008/04/07 16:24:51 hira Exp $
+# $NetBSD: options.mk,v 1.19 2008/09/30 23:14:18 hira Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice2
 PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 kde nas ooo-external-libwpd
 PKG_OPTIONS_OPTIONAL_GROUPS=	browser
-PKG_OPTIONS_GROUP.browser=	firefox seamonkey # firefox-gtk1 seamonkey-gtk1
+PKG_OPTIONS_GROUP.browser=	firefox firefox3 seamonkey
+				# firefox-gtk1 seamonkey-gtk1
 # The list from completelangiso in solenv/inc/postset.mk.
 OO_SUPPORTED_LANGUAGES=		af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \
 				cs cy da de dz el en-GB en-US en-ZA eo es et \
@@ -30,6 +31,9 @@ OO_LANGS?=	en-US
 .if !empty(PKG_OPTIONS:Mfirefox)
 CONFIGURE_ARGS+=	--with-system-mozilla=firefox
 .include "../../www/firefox/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mfirefox3)
+CONFIGURE_ARGS+=	--with-system-mozilla=firefox3
+.include "../../www/firefox3/buildlink3.mk"
 .elif !empty(PKG_OPTIONS:Mseamonkey)
 CONFIGURE_ARGS+=	--with-system-mozilla=seamonkey
 .include "../../www/seamonkey/buildlink3.mk"
diff --git a/misc/openoffice2/patches/patch-ba b/misc/openoffice2/patches/patch-ba
index 23fe10cddf8..1a3964fc2ae 100644
--- a/misc/openoffice2/patches/patch-ba
+++ b/misc/openoffice2/patches/patch-ba
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.12 2008/04/09 09:03:59 hira Exp $
+$NetBSD: patch-ba,v 1.13 2008/09/30 23:14:18 hira Exp $
 
---- config_office/configure.orig	2008-01-31 20:47:17.000000000 +0900
-+++ config_office/configure	2008-04-09 17:33:05.000000000 +0900
+--- config_office/configure.orig	2008-05-21 01:28:55.000000000 +0900
++++ config_office/configure	2008-09-30 22:33:09.000000000 +0900
 @@ -3176,11 +3176,11 @@
  		test_cups=no
  		_os=OSF1
@@ -103,7 +103,16 @@ $NetBSD: patch-ba,v 1.12 2008/04/09 09:03:59 hira Exp $
  
  else
    { { echo "$as_me:$LINENO: error: db not installed or functional" >&5
-@@ -19781,7 +19782,7 @@
+@@ -15695,6 +15696,8 @@
+       MOZ_FLAVOUR=seamonkey
+     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox"; then
+       MOZ_FLAVOUR=firefox
++    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox3"; then
++      MOZ_FLAVOUR=firefox3
+     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
+       MOZ_FLAVOUR=mozilla
+     else
+@@ -19718,7 +19721,7 @@
  echo "$as_me:$LINENO: result: $ac_cv_header_audio_audiolib_h" >&5
  echo "${ECHO_T}$ac_cv_header_audio_audiolib_h" >&6
  if test $ac_cv_header_audio_audiolib_h = yes; then
@@ -112,7 +121,7 @@ $NetBSD: patch-ba,v 1.12 2008/04/09 09:03:59 hira Exp $
  else
  
               CFLAGS=-I/usr/X11R6/include
-@@ -24012,7 +24013,7 @@
+@@ -23949,7 +23952,7 @@
    ENABLE_REPORTDESIGN=YES
    echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
  echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6
@@ -121,7 +130,7 @@ $NetBSD: patch-ba,v 1.12 2008/04/09 09:03:59 hira Exp $
     	SYSTEM_JFREEREPORT=YES
    	echo "$as_me:$LINENO: result: external" >&5
  echo "${ECHO_T}external" >&6
-@@ -24529,7 +24530,7 @@
+@@ -24466,7 +24469,7 @@
      fi
  
          KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
@@ -130,7 +139,7 @@ $NetBSD: patch-ba,v 1.12 2008/04/09 09:03:59 hira Exp $
  fi
  
  
-@@ -25082,7 +25083,7 @@
+@@ -25019,7 +25022,7 @@
     XINERAMA_LINK=dynamic
     echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6