summaryrefslogtreecommitdiff
path: root/misc/openoffice3
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2009-08-05 01:35:42 +0000
committertnn <tnn@pkgsrc.org>2009-08-05 01:35:42 +0000
commit8d11b05ef617f8b7ec67e0e186ecd425edbb9a74 (patch)
treed8d6f7bd3532c170beac5c45e90deddd93fbbeed /misc/openoffice3
parent618d32d440fa6d9d96764dfd9f9bdbd5f983a007 (diff)
downloadpkgsrc-8d11b05ef617f8b7ec67e0e186ecd425edbb9a74.tar.gz
drop the "firefox" option for now.
Keep "firefox3" option as default (also for now)
Diffstat (limited to 'misc/openoffice3')
-rw-r--r--misc/openoffice3/options.mk10
1 files changed, 3 insertions, 7 deletions
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"