diff options
| author | tnn <tnn@pkgsrc.org> | 2009-08-05 01:35:42 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2009-08-05 01:35:42 +0000 |
| commit | f2dc939772f8585cadb2ca11bedaa8b4b20ed4f5 (patch) | |
| tree | d8d6f7bd3532c170beac5c45e90deddd93fbbeed /misc | |
| parent | ff67a165876f680f6f1e6f1de18c77d030085f8e (diff) | |
| download | pkgsrc-f2dc939772f8585cadb2ca11bedaa8b4b20ed4f5.tar.gz | |
drop the "firefox" option for now.
Keep "firefox3" option as default (also for now)
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice2/options.mk | 9 | ||||
| -rw-r--r-- | misc/openoffice3/options.mk | 10 |
2 files changed, 6 insertions, 13 deletions
diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk index 0428698367e..2559e79c455 100644 --- a/misc/openoffice2/options.mk +++ b/misc/openoffice2/options.mk @@ -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_LANGS?= en-US 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 --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk index aaabe267f9c..edb53f05a69 100644 --- a/misc/openoffice3/options.mk +++ b/misc/openoffice3/options.mk @@ -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_LANGS?= en-US 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" |