Wed Aug 5 01:35:42 2009 UTC ()
drop the "firefox" option for now.
Keep "firefox3" option as default (also for now)


(tnn)
diff -r1.24 -r1.25 pkgsrc/misc/openoffice2/options.mk
diff -r1.15 -r1.16 pkgsrc/misc/openoffice3/options.mk
cvs diff -r1.24 -r1.25 pkgsrc/misc/openoffice2/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/openoffice2/Attic/options.mk 2009/04/21 16:47:48 1.24
+++ pkgsrc/misc/openoffice2/Attic/options.mk 2009/08/05 01:35:42 1.25
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: options.mk,v 1.24 2009/04/21 16:47:48 tnn Exp $ 1# $NetBSD: options.mk,v 1.25 2009/08/05 01:35:42 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice2 3PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice2
4PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde nas ooo-external-libwpd 4PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde nas ooo-external-libwpd
5PKG_OPTIONS_OPTIONAL_GROUPS= browser 5PKG_OPTIONS_OPTIONAL_GROUPS= browser
6PKG_OPTIONS_GROUP.browser= firefox firefox3 seamonkey 6PKG_OPTIONS_GROUP.browser= firefox3 seamonkey
7# The list from completelangiso in solenv/inc/postset.mk. 7# The list from completelangiso in solenv/inc/postset.mk.
8OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \ 8OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \
9 cs cy da de dz el en-GB en-US en-ZA eo es et \ 9 cs cy da de dz el en-GB en-US en-ZA eo es et \
10 eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \ 10 eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
11 ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne \ 11 ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne \
12 nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru \ 12 nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru \
13 rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER \ 13 rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER \
14 ta-IN th tn tr ts tg ur-IN uk ve vi xh zh-CN \ 14 ta-IN th tn tr ts tg ur-IN uk ve vi xh zh-CN \
15 zh-TW zu all 15 zh-TW zu all
16.for l in ${OO_SUPPORTED_LANGUAGES} 16.for l in ${OO_SUPPORTED_LANGUAGES}
17PKG_SUPPORTED_OPTIONS+= lang-${l} 17PKG_SUPPORTED_OPTIONS+= lang-${l}
18.endfor 18.endfor
19PKG_SUGGESTED_OPTIONS= firefox3 gtk2 lang-en-US 19PKG_SUGGESTED_OPTIONS= firefox3 gtk2 lang-en-US
@@ -26,30 +26,27 @@ PKG_OPTIONS_LEGACY_OPTS+= gnome-vfs:gnom @@ -26,30 +26,27 @@ PKG_OPTIONS_LEGACY_OPTS+= gnome-vfs:gnom
26OO_LANGS= ALL 26OO_LANGS= ALL
27OO_BASELANG= en-US 27OO_BASELANG= en-US
28OO_LANGPACKS= ${OO_SUPPORTED_LANGUAGES:S/en-US//1:S/all//1} 28OO_LANGPACKS= ${OO_SUPPORTED_LANGUAGES:S/en-US//1:S/all//1}
29.else 29.else
30. for lang in ${PKG_OPTIONS:Mlang-*:S/lang-//g} 30. for lang in ${PKG_OPTIONS:Mlang-*:S/lang-//g}
31OO_LANGS+= ${lang} 31OO_LANGS+= ${lang}
32OO_BASELANG?= ${lang} # Get first one. 32OO_BASELANG?= ${lang} # Get first one.
33. endfor 33. endfor
34.endif 34.endif
35OO_LANGS?= en-US 35OO_LANGS?= en-US
36OO_BASELANG?= en-US 36OO_BASELANG?= en-US
37OO_LANGPACKS?= ${OO_LANGS:S/${OO_BASELANG}//1} 37OO_LANGPACKS?= ${OO_LANGS:S/${OO_BASELANG}//1}
38 38
39.if !empty(PKG_OPTIONS:Mfirefox) 39.if !empty(PKG_OPTIONS:Mfirefox3)
40CONFIGURE_ARGS+= --with-system-mozilla=firefox 
41.include "../../www/firefox/buildlink3.mk" 
42.elif !empty(PKG_OPTIONS:Mfirefox3) 
43CONFIGURE_ARGS+= --with-system-mozilla=firefox3 40CONFIGURE_ARGS+= --with-system-mozilla=firefox3
44.include "../../www/firefox3/buildlink3.mk" 41.include "../../www/firefox3/buildlink3.mk"
45.elif !empty(PKG_OPTIONS:Mseamonkey) 42.elif !empty(PKG_OPTIONS:Mseamonkey)
46CONFIGURE_ARGS+= --with-system-mozilla=seamonkey 43CONFIGURE_ARGS+= --with-system-mozilla=seamonkey
47.include "../../www/seamonkey/buildlink3.mk" 44.include "../../www/seamonkey/buildlink3.mk"
48# The following browsers do not install *.pc files. 45# The following browsers do not install *.pc files.
49#.elif !empty(PKG_OPTIONS:Mseamonkey-gtk1) 46#.elif !empty(PKG_OPTIONS:Mseamonkey-gtk1)
50#CONFIGURE_ARGS+= --with-system-mozilla=seamonkey 47#CONFIGURE_ARGS+= --with-system-mozilla=seamonkey
51#.include "../../www/seamonkey-gtk1/buildlink3.mk" 48#.include "../../www/seamonkey-gtk1/buildlink3.mk"
52.else 49.else
53CONFIGURE_ARGS+= --disable-mozilla 50CONFIGURE_ARGS+= --disable-mozilla
54.endif 51.endif
55 52
cvs diff -r1.15 -r1.16 pkgsrc/misc/openoffice3/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3/Attic/options.mk 2009/05/09 18:43:41 1.15
+++ pkgsrc/misc/openoffice3/Attic/options.mk 2009/08/05 01:35:42 1.16
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: options.mk,v 1.15 2009/05/09 18:43:41 hira Exp $ 1# $NetBSD: options.mk,v 1.16 2009/08/05 01:35:42 tnn Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3 4PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3
5PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde ooo-external-libwpd 5PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde ooo-external-libwpd
6PKG_OPTIONS_OPTIONAL_GROUPS= browser 6PKG_OPTIONS_OPTIONAL_GROUPS= browser
7PKG_OPTIONS_GROUP.browser= firefox firefox3 seamonkey 7PKG_OPTIONS_GROUP.browser= firefox3 seamonkey
8# The list from completelangiso in solenv/inc/postset.mk. 8# The list from completelangiso in solenv/inc/postset.mk.
9OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs \ 9OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs \
10 by ca cs cy da de dgo dz el en-GB en-US en-ZA \ 10 by ca cs cy da de dgo dz el en-GB en-US en-ZA \
11 eo es et eu fa fi fr ga gd gl gu gu-IN he \ 11 eo es et eu fa fi fr ga gd gl gu gu-IN he \
12 hi-IN hr hu it ja ka kk km kn kn-IN ko kok ks \ 12 hi-IN hr hu it ja ka kk km kn kn-IN ko kok ks \
13 ku lo lt lv mai mk mn mni ms ml-IN mr-IN my \ 13 ku lo lt lv mai mk mn mni ms ml-IN mr-IN my \
14 ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR \ 14 ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR \
15 ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw \ 15 ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw \
16 sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN \ 16 sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN \
17 uk uz ve vi xh zh-CN zh-TW zu all 17 uk uz ve vi xh zh-CN zh-TW zu all
18.for l in ${OO_SUPPORTED_LANGUAGES} 18.for l in ${OO_SUPPORTED_LANGUAGES}
19PKG_SUPPORTED_OPTIONS+= lang-${l} 19PKG_SUPPORTED_OPTIONS+= lang-${l}
20.endfor 20.endfor
@@ -32,31 +32,27 @@ PKG_SUPPORTED_OPTIONS+= java @@ -32,31 +32,27 @@ PKG_SUPPORTED_OPTIONS+= java
32OO_LANGS= ALL 32OO_LANGS= ALL
33OO_BASELANG= en-US 33OO_BASELANG= en-US
34OO_LANGPACKS= ${OO_SUPPORTED_LANGUAGES:S/en-US//1:S/all//1} 34OO_LANGPACKS= ${OO_SUPPORTED_LANGUAGES:S/en-US//1:S/all//1}
35.else 35.else
36. for lang in ${PKG_OPTIONS:Mlang-*:S/lang-//g} 36. for lang in ${PKG_OPTIONS:Mlang-*:S/lang-//g}
37OO_LANGS+= ${lang} 37OO_LANGS+= ${lang}
38OO_BASELANG?= ${lang} # Get first one. 38OO_BASELANG?= ${lang} # Get first one.
39. endfor 39. endfor
40.endif 40.endif
41OO_LANGS?= en-US 41OO_LANGS?= en-US
42OO_BASELANG?= en-US 42OO_BASELANG?= en-US
43OO_LANGPACKS?= ${OO_LANGS:S/${OO_BASELANG}//1} 43OO_LANGPACKS?= ${OO_LANGS:S/${OO_BASELANG}//1}
44 44
45.if !empty(PKG_OPTIONS:Mfirefox) 45.if !empty(PKG_OPTIONS:Mfirefox3)
46MOZ_FLAVOUR= firefox 
47CONFIGURE_ARGS+= --with-system-mozilla=firefox 
48.include "../../www/firefox/buildlink3.mk" 
49.elif !empty(PKG_OPTIONS:Mfirefox3) 
50MOZ_FLAVOUR= firefox3 46MOZ_FLAVOUR= firefox3
51CONFIGURE_ARGS+= --with-system-mozilla=firefox3 47CONFIGURE_ARGS+= --with-system-mozilla=firefox3
52.include "../../www/firefox3/buildlink3.mk" 48.include "../../www/firefox3/buildlink3.mk"
53.elif !empty(PKG_OPTIONS:Mseamonkey) 49.elif !empty(PKG_OPTIONS:Mseamonkey)
54MOZ_FLAVOUR= seamonkey 50MOZ_FLAVOUR= seamonkey
55CONFIGURE_ARGS+= --with-system-mozilla=seamonkey 51CONFIGURE_ARGS+= --with-system-mozilla=seamonkey
56.include "../../www/seamonkey/buildlink3.mk" 52.include "../../www/seamonkey/buildlink3.mk"
57# The following browsers do not install *.pc files. 53# The following browsers do not install *.pc files.
58#.elif !empty(PKG_OPTIONS:Mseamonkey-gtk1) 54#.elif !empty(PKG_OPTIONS:Mseamonkey-gtk1)
59#CONFIGURE_ARGS+= --with-system-mozilla=seamonkey 55#CONFIGURE_ARGS+= --with-system-mozilla=seamonkey
60#.include "../../www/seamonkey-gtk1/buildlink3.mk" 56#.include "../../www/seamonkey-gtk1/buildlink3.mk"
61.else 57.else
62MOZ_FLAVOUR= 58MOZ_FLAVOUR=