[pkgsrc/trunk]: pkgsrc/misc drop the "firefox" option for now.

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3da9d37397b2
branches:  trunk
changeset: 396856:3da9d37397b2
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Aug 05 01:35:42 2009 +0000

description:
drop the "firefox" option for now.
Keep "firefox3" option as default (also for now)

diffstat:

 misc/openoffice2/options.mk |   9 +++------
 misc/openoffice3/options.mk |  10 +++-------
 2 files changed, 6 insertions(+), 13 deletions(-)

diffs (56 lines):

diff -r 06803e3aa7d4 -r 3da9d37397b2 misc/openoffice2/options.mk
--- a/misc/openoffice2/options.mk       Wed Aug 05 01:27:31 2009 +0000
+++ b/misc/openoffice2/options.mk       Wed Aug 05 01:35:42 2009 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.24 2009/04/21 16:47:48 tnn Exp $
+# $NetBSD: options.mk,v 1.25 2009/08/05 01:35:42 tnn 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 firefox3 seamonkey
+PKG_OPTIONS_GROUP.browser=     firefox3 seamonkey
 # 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 \
@@ -36,10 +36,7 @@
 OO_BASELANG?=  en-US
 OO_LANGPACKS?= ${OO_LANGS:S/${OO_BASELANG}//1}
 
-.if !empty(PKG_OPTIONS:Mfirefox)
-CONFIGURE_ARGS+=       --with-system-mozilla=firefox
-.include "../../www/firefox/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mfirefox3)
+.if !empty(PKG_OPTIONS:Mfirefox3)
 CONFIGURE_ARGS+=       --with-system-mozilla=firefox3
 .include "../../www/firefox3/buildlink3.mk"
 .elif !empty(PKG_OPTIONS:Mseamonkey)
diff -r 06803e3aa7d4 -r 3da9d37397b2 misc/openoffice3/options.mk
--- a/misc/openoffice3/options.mk       Wed Aug 05 01:27:31 2009 +0000
+++ b/misc/openoffice3/options.mk       Wed Aug 05 01:35:42 2009 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.15 2009/05/09 18:43:41 hira Exp $
+# $NetBSD: options.mk,v 1.16 2009/08/05 01:35:42 tnn Exp $
 #
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openoffice3
 PKG_SUPPORTED_OPTIONS=         cups gnome gtk2 kde ooo-external-libwpd
 PKG_OPTIONS_OPTIONAL_GROUPS=   browser
-PKG_OPTIONS_GROUP.browser=     firefox firefox3 seamonkey
+PKG_OPTIONS_GROUP.browser=     firefox3 seamonkey
 # The list from completelangiso in solenv/inc/postset.mk.
 OO_SUPPORTED_LANGUAGES=                af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs \
                                by ca cs cy da de dgo dz el en-GB en-US en-ZA \
@@ -42,11 +42,7 @@
 OO_BASELANG?=  en-US
 OO_LANGPACKS?= ${OO_LANGS:S/${OO_BASELANG}//1}
 
-.if !empty(PKG_OPTIONS:Mfirefox)
-MOZ_FLAVOUR=           firefox
-CONFIGURE_ARGS+=       --with-system-mozilla=firefox
-.include "../../www/firefox/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mfirefox3)
+.if !empty(PKG_OPTIONS:Mfirefox3)
 MOZ_FLAVOUR=           firefox3
 CONFIGURE_ARGS+=       --with-system-mozilla=firefox3
 .include "../../www/firefox3/buildlink3.mk"