diff options
| author | hira <hira@pkgsrc.org> | 2007-10-08 07:05:14 +0000 |
|---|---|---|
| committer | hira <hira@pkgsrc.org> | 2007-10-08 07:05:14 +0000 |
| commit | e9c12a2d21da5a3a77d8a29bc21ee88cab2f6ae4 (patch) | |
| tree | 6b7cc1cb6f9c3b693e5f1182dc50f82a5783f444 /misc/openoffice2 | |
| parent | 1276a6c61d90bd8389ebbe1363a1502699502d8f (diff) | |
| download | pkgsrc-e9c12a2d21da5a3a77d8a29bc21ee88cab2f6ae4.tar.gz | |
Use PKG_OPTIONS_OPTIONAL_GROUPS instead of PKG_OPTIONS_REQUIRED_GROUPS.
Remove ooo-without-browser option. Pointed out by wiz@.
Diffstat (limited to 'misc/openoffice2')
| -rw-r--r-- | misc/openoffice2/options.mk | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk index e8539ddd43a..f5753d22f59 100644 --- a/misc/openoffice2/options.mk +++ b/misc/openoffice2/options.mk @@ -1,10 +1,9 @@ -# $NetBSD: options.mk,v 1.12 2007/10/08 01:15:01 hira Exp $ +# $NetBSD: options.mk,v 1.13 2007/10/08 07:05:14 hira Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice2 PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde -PKG_OPTIONS_REQUIRED_GROUPS= browser -PKG_OPTIONS_GROUP.browser= firefox seamonkey ooo-without-browser - # firefox-gtk1 seamonkey-gtk1 +PKG_OPTIONS_OPTIONAL_GROUPS= browser +PKG_OPTIONS_GROUP.browser= firefox seamonkey # firefox-gtk1 seamonkey-gtk1 # The list from instsetoo_native/util/pack.lst:OpenOfficeLanguagepack. OO_SUPPORTED_LANGUAGES= en-US af as-IN be-BY bg br bs ca cs da de dz \ el en-GB en-ZA es et fi fr ga gl gu he hi-IN \ @@ -29,24 +28,16 @@ OO_LANGS?= en-US .if !empty(PKG_OPTIONS:Mfirefox) CONFIGURE_ARGS+= --with-system-mozilla=firefox .include "../../www/firefox/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mfirefox-gtk1) -CONFIGURE_ARGS+= --with-system-mozilla=firefox -.include "../../www/firefox-gtk1/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mseamonkey) +.elif !empty(PKG_OPTIONS:Mseamonkey) CONFIGURE_ARGS+= --with-system-mozilla=seamonkey .include "../../www/seamonkey/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mseamonkey-gtk1) -CONFIGURE_ARGS+= --with-system-mozilla=seamonkey -.include "../../www/seamonkey-gtk1/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mooo-without-browser) +#.elif !empty(PKG_OPTIONS:Mfirefox-gtk1) +#CONFIGURE_ARGS+= --with-system-mozilla=firefox +#.include "../../www/firefox-gtk1/buildlink3.mk" +#.elif !empty(PKG_OPTIONS:Mseamonkey-gtk1) +#CONFIGURE_ARGS+= --with-system-mozilla=seamonkey +#.include "../../www/seamonkey-gtk1/buildlink3.mk" +.else CONFIGURE_ARGS+= --disable-mozilla .endif |