- convert to optionsng

- trim headers
- remove stale comments
- add common LANG_XX variables to bsd.options.desc.mk

Reviewed by:	bapt

10 files changed, 681 insertions, 427 deletions

diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk
index 6cfdc138a4c5..5b8831972bae 100644
--- a/Mk/bsd.options.desc.mk
+++ b/Mk/bsd.options.desc.mk
@@ -163,6 +163,94 @@ KML_DESC?=		KML support
 KWALLET_DESC?=		KWallet password manager support
 LADSPA_DESC?=		LADSPA audio plugins support
 LAME_DESC?=		LAME MP3 audio encoder support
+LANG_AF_DESC?=		Africaans language support
+LANG_AK_DESC?=		Akan language support
+LANG_AM_DESC?=		Armenian language support
+LANG_AR_DESC?=		Arabic language support
+LANG_AST_DESC?=		Asturian language support
+LANG_BB_DESC?=		Bengali (Bangladesh) language support
+LANG_BE_DESC?=		Byelorussian language support
+LANG_BG_DESC?=		Bulgarian language support
+LANG_BN_DESC?=		Bengali language support
+LANG_BR_DESC?=		Breton language support
+LANG_BS_DESC?=		Bosnian language support
+LANG_CA_DESC?=		Catalan language support
+LANG_CN_DESC?=		Chinese language support
+LANG_CS_DESC?=		Czech language support
+LANG_CY_DESC?=		Welsh language support
+LANG_DA_DESC?=		Danish language support
+LANG_DE_DESC?=		German language support
+LANG_EL_DESC?=		Greek language support
+LANG_EO_DESC?=		Esperanto language support
+LANG_ES_DESC?=		Spanish language support
+LANG_ET_DESC?=		Estonian language support
+LANG_EU_DESC?=		Basque language support
+LANG_FA_DESC?=		Persian language support
+LANG_FI_DESC?=		Finnish language support
+LANG_FR_DESC?=		French language support
+LANG_FY_DESC?=		Frisian language support
+LANG_GA_DESC?=		Irish language support
+LANG_GB_DESC?=		English GB language support
+LANG_GD_DESC?=		Gaelic (Scotland) language support
+LANG_GL_DESC?=		Galician language support
+LANG_GU_DESC?=		Gujarati language support
+LANG_HE_DESC?=		Hebrew language support
+LANG_HI_DESC?=		Hindi language support
+LANG_HR_DESC?=		Hrvatski language support
+LANG_HU_DESC?=		Hungarian language support
+LANG_ID_DESC?=		Indonesian language support
+LANG_IS_DESC?=		Icelandic language support
+LANG_IT_DESC?=		Italian language support
+LANG_JA_DESC?=		Japanese language support
+LANG_JP_DESC?=		Japanese (ja-JP-mac) language support
+LANG_KK_DESC?=		Kazakh language support
+LANG_KN_DESC?=		Kannada language support
+LANG_KO_DESC?=		Korean language support
+LANG_KU_DESC?=		Kurdish language support
+LANG_LG_DESC?=		Luganda language support
+LANG_LK_DESC?=		Tamil (Sri Lanka) language support
+LANG_LT_DESC?=		Lithuanian language support
+LANG_LV_DESC?=		Latvian language support
+LANG_MAI_DESC?=		Maithili language support
+LANG_MK_DESC?=		Macedonian language support
+LANG_ML_DESC?=		Malayalam language support
+LANG_MN_DESC?=		Mongolian language support
+LANG_MR_DESC?=		Marathi language support
+LANG_NB_DESC?=		Norwegian language support
+LANG_NL_DESC?=		Dutch language support
+LANG_NN_DESC?=		Norwegian Nynorsk language support
+LANG_NSO_DESC?=		Northern Sotho language support
+LANG_OR_DESC?=		Oriya language support
+LANG_PA_DESC?=		Punjabi language support
+LANG_PBR_DESC?=		Portuguese (Brazil) language support
+LANG_PL_DESC?=		Polish language support
+LANG_PT_DESC?=		Portuguese language support
+LANG_RM_DESC?=		Romansh language support
+LANG_RO_DESC?=		Romanian language support
+LANG_RU_DESC?=		Russian language support
+LANG_SA_DESC?=		Spanish (Argentina) language support
+LANG_SC_DESC?=		Spanish (Chile) language support
+LANG_SE_DESC?=		Swedish language support
+LANG_SI_DESC?=		Singhalese language support
+LANG_SK_DESC?=		Slovak language support
+LANG_SL_DESC?=		Slovenian language support
+LANG_SM_DESC?=		Spanish (Mexico) language support
+LANG_SON_DESC?=		Songhai language support
+LANG_SQ_DESC?=		Albanian language support
+LANG_SR_DESC?=		Serbian language support
+LANG_SV_DESC?=		Swedish language support
+LANG_TA_DESC?=		Tamil language support
+LANG_TE_DESC?=		Telugu language support
+LANG_TH_DESC?=		Thai language support
+LANG_TR_DESC?=		Turkish language support
+LANG_TW_DESC?=		Taiwanese language support
+LANG_UA_DESC?=		Ukrainian language support
+LANG_UK_DESC?=		Ukrainian language support
+LANG_US_DESC?=		English (US) language support
+LANG_US_DESC?=		English US language support
+LANG_VI_DESC?=		Vietnamese language support
+LANG_ZA_DESC?=		English (South Afrika) language support
+LANG_ZU_DESC?=		Zulu language support
 LASH_DESC?=		LASH audio support
 LASTFM_DESC?=		Last.fm streaming support
 LATEX_DESC?=		LaTeX support
diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile
index 8937b2353b00..07df4e6cea96 100644
--- a/mail/thunderbird-i18n/Makefile
+++ b/mail/thunderbird-i18n/Makefile
@@ -18,27 +18,20 @@ PLIST?=		${WRKDIR}/plist
 PLISTD?=	${WRKDIR}/plist_dirs
 PLISTF?=	${WRKDIR}/plist_files
 
-.ifndef WITHOUT_SWITCHER
-RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
-.endif
-
 NO_BUILD=	yes
 USE_THUNDERBIRD=	17
 USE_XPI=	thunderbird linux-thunderbird
+USE_SUBMAKE=	yes
 
-THUNDERBIRD_I18N_ALL=	ar br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \
-			fy-NL ga-IE gd gl he hu is it ja ko lt nb-NO nl nn-NO \
-			pl pt-BR pt-PT rm ru si sk sl sq sv-SE ta-LK tr uk zh-TW
+.include "${.CURDIR}/Makefile.option"
+.include <bsd.port.pre.mk>
 
-.ifdef PACKAGE_BUILDING
-THUNDERBIRD_I18N?=	all
-.else
-THUNDERBIRD_I18N?=	es-ES pt-BR ru ja de fr ko it
+.ifndef WITHOUT_SWITCHER
+RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
 .endif
 
-.if ${THUNDERBIRD_I18N} == all
-THUNDERBIRD_I18N_=	${THUNDERBIRD_I18N_ALL}
-.endif
+.include "${.CURDIR}/Makefile.lang"
+
 THUNDERBIRD_I18N_?=	${THUNDERBIRD_I18N}
 
 WDIR=	langpack-*@thunderbird.mozilla.org
@@ -86,4 +79,4 @@ list-langs:
 		perl -ne 'if(/.*href="([a-zA-Z-]+).xpi.*/){print "$$1 "}'
 
 .include "${.CURDIR}/../../www/xpi-adblock/Makefile.xpi"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/thunderbird-i18n/Makefile.lang b/mail/thunderbird-i18n/Makefile.lang
new file mode 100644
index 000000000000..d878b7781c2c
--- /dev/null
+++ b/mail/thunderbird-i18n/Makefile.lang
@@ -0,0 +1,139 @@
+# $FreeBSD$
+
+THUNDERBIRD_I18N_ALL_=	ar br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \
+			fy-NL ga-IE gd gl he hu is it ja ko lt nb-NO nl nn-NO \
+			pl pt-BR pt-PT rm ru si sk sl sq sv-SE ta-LK tr uk zh-TW
+
+.if defined(THUNDERBIRD_I18N_ALL) || defined(PACKAGE_BUILDING) || target(package)
+THUNDERBIRD_I18N=   ${THUNDERBIRD_I18N_ALL_}
+.else
+.if ${PORT_OPTIONS:MLANG_AR}
+THUNDERBIRD_I18N+=  ar
+.endif
+.if ${PORT_OPTIONS:MLANG_BR}
+THUNDERBIRD_I18N+=  br
+.endif
+.if ${PORT_OPTIONS:MLANG_CA}
+THUNDERBIRD_I18N+=  ca
+.endif
+.if ${PORT_OPTIONS:MLANG_CS}
+THUNDERBIRD_I18N+=  cs
+.endif
+.if ${PORT_OPTIONS:MLANG_DA}
+THUNDERBIRD_I18N+=  da
+.endif
+.if ${PORT_OPTIONS:MLANG_DE}
+THUNDERBIRD_I18N+=  de
+.endif
+.if ${PORT_OPTIONS:MLANG_GB}
+THUNDERBIRD_I18N+=  en-GB
+.endif
+.if ${PORT_OPTIONS:MLANG_US}
+THUNDERBIRD_I18N+=  en-US
+.endif
+.if ${PORT_OPTIONS:MLANG_SA}
+THUNDERBIRD_I18N+=  es-AR
+.endif
+.if ${PORT_OPTIONS:MLANG_ES}
+THUNDERBIRD_I18N+=  es-ES
+.endif
+.if ${PORT_OPTIONS:MLANG_ET}
+THUNDERBIRD_I18N+=  et
+.endif
+.if ${PORT_OPTIONS:MLANG_EU}
+THUNDERBIRD_I18N+=  eu
+.endif
+.if ${PORT_OPTIONS:MLANG_FI}
+THUNDERBIRD_I18N+=  fi
+.endif
+.if ${PORT_OPTIONS:MLANG_FR}
+THUNDERBIRD_I18N+=  fr
+.endif
+.if ${PORT_OPTIONS:MLANG_FY}
+THUNDERBIRD_I18N+=  fy-NL
+.endif
+.if ${PORT_OPTIONS:MLANG_GA}
+THUNDERBIRD_I18N+=  ga-IE
+.endif
+.if ${PORT_OPTIONS:MLANG_GD}
+THUNDERBIRD_I18N+=  gd
+.endif
+.if ${PORT_OPTIONS:MLANG_GL}
+THUNDERBIRD_I18N+=  gl
+.endif
+.if ${PORT_OPTIONS:MLANG_HE}
+THUNDERBIRD_I18N+=  he
+.endif
+.if ${PORT_OPTIONS:MLANG_HU}
+THUNDERBIRD_I18N+=  hu
+.endif
+.if ${PORT_OPTIONS:MLANG_IS}
+THUNDERBIRD_I18N+=  is
+.endif
+.if ${PORT_OPTIONS:MLANG_IT}
+THUNDERBIRD_I18N+=  it
+.endif
+.if ${PORT_OPTIONS:MLANG_JA}
+THUNDERBIRD_I18N+=  ja
+.endif
+.if ${PORT_OPTIONS:MLANG_KO}
+THUNDERBIRD_I18N+=  ko
+.endif
+.if ${PORT_OPTIONS:MLANG_LT}
+THUNDERBIRD_I18N+=  lt
+.endif
+.if ${PORT_OPTIONS:MLANG_LV}
+THUNDERBIRD_I18N+=  lv
+.endif
+.if ${PORT_OPTIONS:MLANG_NB}
+THUNDERBIRD_I18N+=  nb-NO
+.endif
+.if ${PORT_OPTIONS:MLANG_NL}
+THUNDERBIRD_I18N+=  nl
+.endif
+.if ${PORT_OPTIONS:MLANG_NN}
+THUNDERBIRD_I18N+=  nn-NO
+.endif
+.if ${PORT_OPTIONS:MLANG_PL}
+THUNDERBIRD_I18N+=  pl
+.endif
+.if ${PORT_OPTIONS:MLANG_PBR}
+THUNDERBIRD_I18N+=  pt-BR
+.endif
+.if ${PORT_OPTIONS:MLANG_PT}
+THUNDERBIRD_I18N+=  pt-PT
+.endif
+.if ${PORT_OPTIONS:MLANG_RM}
+THUNDERBIRD_I18N+=  rm
+.endif
+.if ${PORT_OPTIONS:MLANG_RU}
+THUNDERBIRD_I18N+=  ru
+.endif
+.if ${PORT_OPTIONS:MLANG_SI}
+THUNDERBIRD_I18N+=  si
+.endif
+.if ${PORT_OPTIONS:MLANG_SK}
+THUNDERBIRD_I18N+=  sk
+.endif
+.if ${PORT_OPTIONS:MLANG_SL}
+THUNDERBIRD_I18N+=  sl
+.endif
+.if ${PORT_OPTIONS:MLANG_SQ}
+THUNDERBIRD_I18N+=  sq
+.endif
+.if ${PORT_OPTIONS:MLANG_SV}
+THUNDERBIRD_I18N+=  sv-SE
+.endif
+.if ${PORT_OPTIONS:MLANG_LK}
+THUNDERBIRD_I18N+=  ta-LK
+.endif
+.if ${PORT_OPTIONS:MLANG_TR}
+THUNDERBIRD_I18N+=  tr
+.endif
+.if ${PORT_OPTIONS:MLANG_UK}
+THUNDERBIRD_I18N+=  uk
+.endif
+.if ${PORT_OPTIONS:MLANG_TW}
+THUNDERBIRD_I18N+=  zh-TW
+.endif
+.endif
diff --git a/mail/thunderbird-i18n/Makefile.option b/mail/thunderbird-i18n/Makefile.option
new file mode 100644
index 000000000000..7b41d4d3a549
--- /dev/null
+++ b/mail/thunderbird-i18n/Makefile.option
@@ -0,0 +1,48 @@
+# $FreeBSD$
+
+OPTIONS_DEFINE=	LANG_AR \
+		LANG_BR \
+		LANG_CA \
+		LANG_CS \
+		LANG_DA \
+		LANG_DE \
+		LANG_GB \
+		LANG_US \
+		LANG_SA \
+		LANG_ES \
+		LANG_ET \
+		LANG_EU \
+		LANG_FI \
+		LANG_FR \
+		LANG_FY \
+		LANG_GA \
+		LANG_GD \
+		LANG_GL \
+		LANG_HE \
+		LANG_HU \
+		LANG_IS \
+		LANG_IT \
+		LANG_JA \
+		LANG_KO \
+		LANG_LT \
+		LANG_LV \
+		LANG_NB \
+		LANG_NL \
+		LANG_NN \
+		LANG_PL \
+		LANG_PBR \
+		LANG_PT \
+		LANG_RM \
+		LANG_RU \
+		LANG_SI \
+		LANG_SK \
+		LANG_SL \
+		LANG_SQ \
+		LANG_SV \
+		LANG_LK \
+		LANG_TR \
+		LANG_UK \
+		LANG_TW
+
+OPTIONS_DEFAULT=LANG_ES LANG_PBR LANG_RU LANG_JA LANG_DE LANG_FR LANG_KO \
+		LANG_IT
diff --git a/www/firefox-esr-i18n/Makefile.lang b/www/firefox-esr-i18n/Makefile.lang
index 78da11805c1c..b65109e88dc9 100644
--- a/www/firefox-esr-i18n/Makefile.lang
+++ b/www/firefox-esr-i18n/Makefile.lang
@@ -1,11 +1,6 @@
-# New ports collection makefile.lang for:    firefox3-i18n
-# Date created:         30 Nov 2008
-# Whom:                 Koji Yokota <yokota@res.otaru-uc.ac.jp>
-#
+# Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
 # $FreeBSD$
-#
-# Currently, the following 71 languages are supported.
-#
+
 FIREFOX_I18N_ALL_=	af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el \
 			en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa \
 			fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu hy-AM id is \
@@ -16,250 +11,250 @@ FIREFOX_I18N_ALL_=	af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el \
 .if defined(FIREFOX_I18N_ALL) || defined(PACKAGE_BUILDING) || target(package)
 FIREFOX_I18N=   ${FIREFOX_I18N_ALL_}
 .else
-.ifndef WITHOUT_LANG_AF
+.if ${PORT_OPTIONS:MLANG_AF}
 FIREFOX_I18N+=  af
 .endif
-.ifndef WITHOUT_LANG_AK
+.if ${PORT_OPTIONS:MLANG_AK}
 FIREFOX_I18N+=  ak
 .endif
-.ifndef WITHOUT_LANG_AR
+.if ${PORT_OPTIONS:MLANG_AR}
 FIREFOX_I18N+=  ar
 .endif
-.ifndef WITHOUT_LANG_AST
+.if ${PORT_OPTIONS:MLANG_AST}
 FIREFOX_I18N+=  ast
 .endif
-.ifndef WITHOUT_LANG_BE
+.if ${PORT_OPTIONS:MLANG_BE}
 FIREFOX_I18N+=  be
 .endif
-.ifndef WITHOUT_LANG_BG
+.if ${PORT_OPTIONS:MLANG_BG}
 FIREFOX_I18N+=  bg
 .endif
-.ifndef WITHOUT_LANG_BB
+.if ${PORT_OPTIONS:MLANG_BB}
 FIREFOX_I18N+=  bn-BD
 .endif
-.ifndef WITHOUT_LANG_BN
+.if ${PORT_OPTIONS:MLANG_BN}
 FIREFOX_I18N+=  bn-IN
 .endif
-.ifndef WITHOUT_LANG_BR
+.if ${PORT_OPTIONS:MLANG_BR}
 FIREFOX_I18N+=  br
 .endif
-.ifndef WITHOUT_LANG_BS
+.if ${PORT_OPTIONS:MLANG_BS}
 FIREFOX_I18N+=  bs
 .endif
-.ifndef WITHOUT_LANG_CA
+.if ${PORT_OPTIONS:MLANG_CA}
 FIREFOX_I18N+=  ca
 .endif
-.ifndef WITHOUT_LANG_CS
+.if ${PORT_OPTIONS:MLANG_CS}
 FIREFOX_I18N+=  cs
 .endif
-.ifndef WITHOUT_LANG_CY
+.if ${PORT_OPTIONS:MLANG_CY}
 FIREFOX_I18N+=  cy
 .endif
-.ifndef WITHOUT_LANG_DA
+.if ${PORT_OPTIONS:MLANG_DA}
 FIREFOX_I18N+=  da
 .endif
-.ifndef WITHOUT_LANG_DE
+.if ${PORT_OPTIONS:MLANG_DE}
 FIREFOX_I18N+=  de
 .endif
-.ifndef WITHOUT_LANG_EL
+.if ${PORT_OPTIONS:MLANG_EL}
 FIREFOX_I18N+=  el
 .endif
-.ifndef WITHOUT_LANG_GB
+.if ${PORT_OPTIONS:MLANG_GB}
 FIREFOX_I18N+=  en-GB
 .endif
-.ifndef WITHOUT_LANG_US
+.if ${PORT_OPTIONS:MLANG_US}
 FIREFOX_I18N+=  en-US
 .endif
-.ifndef WITHOUT_LANG_ZA
+.if ${PORT_OPTIONS:MLANG_ZA}
 FIREFOX_I18N+=  en-ZA
 .endif
-.ifndef WITHOUT_LANG_EO
+.if ${PORT_OPTIONS:MLANG_EO}
 FIREFOX_I18N+=  eo
 .endif
-.ifndef WITHOUT_LANG_SA
+.if ${PORT_OPTIONS:MLANG_SA}
 FIREFOX_I18N+=  es-AR
 .endif
-.ifndef WITHOUT_LANG_SC
+.if ${PORT_OPTIONS:MLANG_SC}
 FIREFOX_I18N+=  es-CL
 .endif
-.ifndef WITHOUT_LANG_ES
+.if ${PORT_OPTIONS:MLANG_ES}
 FIREFOX_I18N+=  es-ES
 .endif
-.ifndef WITHOUT_LANG_SM
+.if ${PORT_OPTIONS:MLANG_SM}
 FIREFOX_I18N+=  es-MX
 .endif
-.ifndef WITHOUT_LANG_ET
+.if ${PORT_OPTIONS:MLANG_ET}
 FIREFOX_I18N+=  et
 .endif
-.ifndef WITHOUT_LANG_EU
+.if ${PORT_OPTIONS:MLANG_EU}
 FIREFOX_I18N+=  eu
 .endif
-.ifndef WITHOUT_LANG_FA
+.if ${PORT_OPTIONS:MLANG_FA}
 FIREFOX_I18N+=  fa
 .endif
-.ifndef WITHOUT_LANG_FI
+.if ${PORT_OPTIONS:MLANG_FI}
 FIREFOX_I18N+=  fi
 .endif
-.ifndef WITHOUT_LANG_FR
+.if ${PORT_OPTIONS:MLANG_FR}
 FIREFOX_I18N+=  fr
 .endif
-.ifndef WITHOUT_LANG_FY
+.if ${PORT_OPTIONS:MLANG_FY}
 FIREFOX_I18N+=  fy-NL
 .endif
-.ifndef WITHOUT_LANG_GA
+.if ${PORT_OPTIONS:MLANG_GA}
 FIREFOX_I18N+=  ga-IE
 .endif
-.ifndef WITHOUT_LANG_GL
+.if ${PORT_OPTIONS:MLANG_GL}
 FIREFOX_I18N+=  gl
 .endif
-.ifndef WITHOUT_LANG_GU
+.if ${PORT_OPTIONS:MLANG_GU}
 FIREFOX_I18N+=  gu-IN
 .endif
-.ifndef WITHOUT_LANG_HE
+.if ${PORT_OPTIONS:MLANG_HE}
 FIREFOX_I18N+=  he
 .endif
-.ifndef WITHOUT_LANG_HI
+.if ${PORT_OPTIONS:MLANG_HI}
 FIREFOX_I18N+=  hi-IN
 .endif
-.ifndef WITHOUT_LANG_HR
+.if ${PORT_OPTIONS:MLANG_HR}
 FIREFOX_I18N+=  hr
 .endif
-.ifndef WITHOUT_LANG_HU
+.if ${PORT_OPTIONS:MLANG_HU}
 FIREFOX_I18N+=  hu
 .endif
-.ifndef WITHOUT_LANG_AM
+.if ${PORT_OPTIONS:MLANG_AM}
 FIREFOX_I18N+=  hy-AM
 .endif
-.ifndef WITHOUT_LANG_ID
+.if ${PORT_OPTIONS:MLANG_ID}
 FIREFOX_I18N+=  id
 .endif
-.ifndef WITHOUT_LANG_IS
+.if ${PORT_OPTIONS:MLANG_IS}
 FIREFOX_I18N+=  is
 .endif
-.ifndef WITHOUT_LANG_IT
+.if ${PORT_OPTIONS:MLANG_IT}
 FIREFOX_I18N+=  it
 .endif
-.ifndef WITHOUT_LANG_JA
+.if ${PORT_OPTIONS:MLANG_JA}
 FIREFOX_I18N+=  ja
 .endif
-.ifndef WITHOUT_LANG_KK
+.if ${PORT_OPTIONS:MLANG_KK}
 FIREFOX_I18N+=  kk
 .endif
-.ifndef WITHOUT_LANG_KN
+.if ${PORT_OPTIONS:MLANG_KN}
 FIREFOX_I18N+=  kn
 .endif
-.ifndef WITHOUT_LANG_KO
+.if ${PORT_OPTIONS:MLANG_KO}
 FIREFOX_I18N+=  ko
 .endif
-.ifndef WITHOUT_LANG_KU
+.if ${PORT_OPTIONS:MLANG_KU}
 FIREFOX_I18N+=  ku
 .endif
-.ifndef WITHOUT_LANG_LG
+.if ${PORT_OPTIONS:MLANG_LG}
 FIREFOX_I18N+=  lg
 .endif
-.ifndef WITHOUT_LANG_LT
+.if ${PORT_OPTIONS:MLANG_LT}
 FIREFOX_I18N+=  lt
 .endif
-.ifndef WITHOUT_LANG_LV
+.if ${PORT_OPTIONS:MLANG_LV}
 FIREFOX_I18N+=  lv
 .endif
-.ifndef WITHOUT_LANG_MAI
+.if ${PORT_OPTIONS:MLANG_MAI}
 FIREFOX_I18N+=  mai
 .endif
-.ifndef WITHOUT_LANG_MK
+.if ${PORT_OPTIONS:MLANG_MK}
 FIREFOX_I18N+=  mk
 .endif
-.ifndef WITHOUT_LANG_ML
+.if ${PORT_OPTIONS:MLANG_ML}
 FIREFOX_I18N+=  ml
 .endif
-.ifndef WITHOUT_LANG_MR
+.if ${PORT_OPTIONS:MLANG_MR}
 FIREFOX_I18N+=  mr
 .endif
-.ifndef WITHOUT_LANG_NB
+.if ${PORT_OPTIONS:MLANG_NB}
 FIREFOX_I18N+=  nb-NO
 .endif
-.ifndef WITHOUT_LANG_NL
+.if ${PORT_OPTIONS:MLANG_NL}
 FIREFOX_I18N+=  nl
 .endif
-.ifndef WITHOUT_LANG_NN
+.if ${PORT_OPTIONS:MLANG_NN}
 FIREFOX_I18N+=  nn-NO
 .endif
-.ifndef WITHOUT_LANG_NSO
+.if ${PORT_OPTIONS:MLANG_NSO}
 FIREFOX_I18N+=  nso
 .endif
-.ifndef WITHOUT_LANG_OR
+.if ${PORT_OPTIONS:MLANG_OR}
 FIREFOX_I18N+=  or
 .endif
-.ifndef WITHOUT_LANG_PA
+.if ${PORT_OPTIONS:MLANG_PA}
 FIREFOX_I18N+=  pa-IN
 .endif
-.ifndef WITHOUT_LANG_PL
+.if ${PORT_OPTIONS:MLANG_PL}
 FIREFOX_I18N+=  pl
 .endif
-.ifndef WITHOUT_LANG_PBR
+.if ${PORT_OPTIONS:MLANG_PBR}
 FIREFOX_I18N+=  pt-BR
 .endif
-.ifndef WITHOUT_LANG_PT
+.if ${PORT_OPTIONS:MLANG_PT}
 FIREFOX_I18N+=  pt-PT
 .endif
-.ifndef WITHOUT_LANG_RM
+.if ${PORT_OPTIONS:MLANG_RM}
 FIREFOX_I18N+=  rm
 .endif
-.ifndef WITHOUT_LANG_RO
+.if ${PORT_OPTIONS:MLANG_RO}
 FIREFOX_I18N+=  ro
 .endif
-.ifndef WITHOUT_LANG_RU
+.if ${PORT_OPTIONS:MLANG_RU}
 FIREFOX_I18N+=  ru
 .endif
-.ifndef WITHOUT_LANG_SI
+.if ${PORT_OPTIONS:MLANG_SI}
 FIREFOX_I18N+=  si
 .endif
-.ifndef WITHOUT_LANG_SK
+.if ${PORT_OPTIONS:MLANG_SK}
 FIREFOX_I18N+=  sk
 .endif
-.ifndef WITHOUT_LANG_SON
+.if ${PORT_OPTIONS:MLANG_SON}
 FIREFOX_I18N+=  son
 .endif
-.ifndef WITHOUT_LANG_SL
+.if ${PORT_OPTIONS:MLANG_SL}
 FIREFOX_I18N+=  sl
 .endif
-.ifndef WITHOUT_LANG_SQ
+.if ${PORT_OPTIONS:MLANG_SQ}
 FIREFOX_I18N+=  sq
 .endif
-.ifndef WITHOUT_LANG_SR
+.if ${PORT_OPTIONS:MLANG_SR}
 FIREFOX_I18N+=  sr
 .endif
-.ifndef WITHOUT_LANG_SV
+.if ${PORT_OPTIONS:MLANG_SV}
 FIREFOX_I18N+=  sv-SE
 .endif
-.ifndef WITHOUT_LANG_TA
+.if ${PORT_OPTIONS:MLANG_TA}
 FIREFOX_I18N+=  ta
 .endif
-.ifndef WITHOUT_LANG_LK
+.if ${PORT_OPTIONS:MLANG_LK}
 FIREFOX_I18N+=  ta-LK
 .endif
-.ifndef WITHOUT_LANG_TE
+.if ${PORT_OPTIONS:MLANG_TE}
 FIREFOX_I18N+=  te
 .endif
-.ifndef WITHOUT_LANG_TH
+.if ${PORT_OPTIONS:MLANG_TH}
 FIREFOX_I18N+=  th
 .endif
-.ifndef WITHOUT_LANG_TR
+.if ${PORT_OPTIONS:MLANG_TR}
 FIREFOX_I18N+=  tr
 .endif
-.ifndef WITHOUT_LANG_UK
+.if ${PORT_OPTIONS:MLANG_UK}
 FIREFOX_I18N+=  uk
 .endif
-.ifndef WITHOUT_LANG_VI
+.if ${PORT_OPTIONS:MLANG_VI}
 FIREFOX_I18N+=  vi
 .endif
-.ifndef WITHOUT_LANG_CN
+.if ${PORT_OPTIONS:MLANG_CN}
 FIREFOX_I18N+=  zh-CN
 .endif
-.ifndef WITHOUT_LANG_TW
+.if ${PORT_OPTIONS:MLANG_TW}
 FIREFOX_I18N+=  zh-TW
 .endif
-.ifndef WITHOUT_LANG_ZU
+.if ${PORT_OPTIONS:MLANG_ZU}
 FIREFOX_I18N+=  zu
 .endif
 .endif
diff --git a/www/firefox-esr-i18n/Makefile.option b/www/firefox-esr-i18n/Makefile.option
index 14fc8a6d43c0..8f6acc47cef3 100644
--- a/www/firefox-esr-i18n/Makefile.option
+++ b/www/firefox-esr-i18n/Makefile.option
@@ -1,89 +1,91 @@
-# New ports collection makefile.option for:    firefox3-i18n
-# Date created:         30 Nov 2008
-# Whom:                 Koji Yokota <yokota@res.otaru-uc.ac.jp>
-#
+# Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
 # $FreeBSD$
-#
-OPTIONS=        LANG_AF  "Africaans"              off \
-                LANG_AK  "Akan"                   off \
-                LANG_SQ  "Albanian"               off \
-                LANG_AR  "Arabic"                 on \
-                LANG_AM  "Armenian"               off \
-                LANG_AST "Asturian"               off \
-                LANG_EU  "Basque"                 off \
-                LANG_BN  "Bengali"                on \
-                LANG_BB  "Bengali (Bangladesh)"   off \
-                LANG_BS  "Bosnian"                off \
-                LANG_BR  "Breton"                 off \
-                LANG_BG  "Bulgarian"              off \
-                LANG_BE  "Byelorussian"           off \
-                LANG_CA  "Catalan"                off \
-                LANG_CN  "Chinese"                on \
-                LANG_CS  "Czech"                  off \
-                LANG_DA  "Danish"                 off \
-                LANG_NL  "Dutch"                  off \
-                LANG_GB  "English (UK)"           off \
-                LANG_US  "English (US)"           off \
-                LANG_EO  "Esperanto"              off \
-                LANG_ET  "Estonian"               off \
-                LANG_GL  "Galician"               off \
-                LANG_DE  "German"                 on \
-                LANG_EL  "Greek"                  off \
-                LANG_GU  "Gujarati"               off \
-                LANG_FI  "Finnish"                off \
-                LANG_FR  "French"                 on \
-                LANG_FY  "Frisian"                off \
-                LANG_GA  "Irish"                  off \
-                LANG_HE  "Hebrew"                 off \
-                LANG_HI  "Hindi"                  on \
-                LANG_HR  "Hrvatski"               off \
-                LANG_HU  "Hungarian"              off \
-                LANG_IS  "Icelandic"              off \
-                LANG_ID  "Indonesian"             off \
-                LANG_IT  "Italian"                on \
-                LANG_JA  "Japanese"               on \
-                LANG_KN  "Kannada"                off \
-                LANG_KK  "Kazakh"                 off \
-                LANG_KO  "Korean"                 on \
-                LANG_KU  "Kurdish"                off \
-                LANG_LV  "Latvian"                off \
-                LANG_LT  "Lithuanian"             off \
-                LANG_LG  "Luganda"                off \
-                LANG_MK  "Macedonian"             off \
-                LANG_MAI "Maithili"               off \
-                LANG_ML  "Malayalam"              off \
-                LANG_MR  "Marathi"                on \
-                LANG_MN  "Mongolian"              off \
-                LANG_NSO "Northern Sotho"         off \
-                LANG_NB  "Norwegian"              off \
-                LANG_NN  "Norwegian Nynorsk"      off \
-                LANG_OR  "Oriya"                  off \
-                LANG_FA  "Persian"                off \
-                LANG_PL  "Polish"                 off \
-                LANG_PT  "Portuguese"             off \
-                LANG_PBR "Portuguese (Brazil)"    on \
-                LANG_PA  "Punjabi"                on \
-                LANG_RO  "Romanian"               off \
-                LANG_RM  "Romansh"                off \
-                LANG_RU  "Russian"                on \
-                LANG_SR  "Serbian"                off \
-                LANG_SI  "Singhalese"             off \
-                LANG_ES  "Spanish"                on \
-                LANG_SON "Songhai"                off \
-                LANG_SA  "Spanish (Argentina)"    off \
-                LANG_SC  "Spanish (Chile)"        off \
-                LANG_SM  "Spanish (Mexico)"       off \
-                LANG_SK  "Slovak"                 off \
-                LANG_SL  "Slovenian"              off \
-                LANG_SV  "Swedish"                off \
-                LANG_TW  "Taiwanese"              off \
-                LANG_TA  "Tamil"                  off \
-                LANG_LK  "Tamil (Sri Lanka)"      off \
-                LANG_TE  "Telugu"                 on \
-                LANG_TH  "Thai"                   off \
-                LANG_TR  "Turkish"                off \
-                LANG_UK  "Ukrainian"              off \
-                LANG_VI  "Vietnamese"             off \
-                LANG_CY  "Welsh"                  off \
-                LANG_ZA  "English (South Afrika)" off \
-                LANG_ZU  "Zulu"                   off 
+
+OPTIONS_DEFINE=	LANG_AF \
+		LANG_AK \
+		LANG_SQ \
+		LANG_AR \
+		LANG_AM \
+		LANG_AST \
+		LANG_EU \
+		LANG_BN \
+		LANG_BB \
+		LANG_BS \
+		LANG_BR \
+		LANG_BG \
+		LANG_BE \
+		LANG_CA \
+		LANG_CN \
+		LANG_CS \
+		LANG_DA \
+		LANG_NL \
+		LANG_GB \
+		LANG_US \
+		LANG_EO \
+		LANG_ET \
+		LANG_GL \
+		LANG_DE \
+		LANG_EL \
+		LANG_GU \
+		LANG_FI \
+		LANG_FR \
+		LANG_FY \
+		LANG_GA \
+		LANG_HE \
+		LANG_HI \
+		LANG_HR \
+		LANG_HU \
+		LANG_IS \
+		LANG_ID \
+		LANG_IT \
+		LANG_JA \
+		LANG_KN \
+		LANG_KK \
+		LANG_KO \
+		LANG_KU \
+		LANG_LV \
+		LANG_LT \
+		LANG_LG \
+		LANG_MK \
+		LANG_MAI \
+		LANG_ML \
+		LANG_MR \
+		LANG_MN \
+		LANG_NSO \
+		LANG_NB \
+		LANG_NN \
+		LANG_OR \
+		LANG_FA \
+		LANG_PL \
+		LANG_PT \
+		LANG_PBR \
+		LANG_PA \
+		LANG_RO \
+		LANG_RM \
+		LANG_RU \
+		LANG_SR \
+		LANG_SI \
+		LANG_ES \
+		LANG_SON \
+		LANG_SA \
+		LANG_SC \
+		LANG_SM \
+		LANG_SK \
+		LANG_SL \
+		LANG_SV \
+		LANG_TW \
+		LANG_TA \
+		LANG_LK \
+		LANG_TE \
+		LANG_TH \
+		LANG_TR \
+		LANG_UK \
+		LANG_VI \
+		LANG_CY \
+		LANG_ZA \
+		LANG_ZU
+
+OPTIONS_DEFAULT=LANG_AR LANG_BN LANG_BR LANG_CN LANG_ET LANG_DE LANG_FR \
+		LANG_HI LANG_ID LANG_IT LANG_JA LANG_KO LANG_MK LANG_MR \
+		LANG_MN LANG_PBR LANG_PA LANG_RU LANG_ES LANG_SON LANG_TE
+
diff --git a/www/firefox-i18n/Makefile.lang b/www/firefox-i18n/Makefile.lang
index 78da11805c1c..b65109e88dc9 100644
--- a/www/firefox-i18n/Makefile.lang
+++ b/www/firefox-i18n/Makefile.lang
@@ -1,11 +1,6 @@
-# New ports collection makefile.lang for:    firefox3-i18n
-# Date created:         30 Nov 2008
-# Whom:                 Koji Yokota <yokota@res.otaru-uc.ac.jp>
-#
+# Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
 # $FreeBSD$
-#
-# Currently, the following 71 languages are supported.
-#
+
 FIREFOX_I18N_ALL_=	af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el \
 			en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa \
 			fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu hy-AM id is \
@@ -16,250 +11,250 @@ FIREFOX_I18N_ALL_=	af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el \
 .if defined(FIREFOX_I18N_ALL) || defined(PACKAGE_BUILDING) || target(package)
 FIREFOX_I18N=   ${FIREFOX_I18N_ALL_}
 .else
-.ifndef WITHOUT_LANG_AF
+.if ${PORT_OPTIONS:MLANG_AF}
 FIREFOX_I18N+=  af
 .endif
-.ifndef WITHOUT_LANG_AK
+.if ${PORT_OPTIONS:MLANG_AK}
 FIREFOX_I18N+=  ak
 .endif
-.ifndef WITHOUT_LANG_AR
+.if ${PORT_OPTIONS:MLANG_AR}
 FIREFOX_I18N+=  ar
 .endif
-.ifndef WITHOUT_LANG_AST
+.if ${PORT_OPTIONS:MLANG_AST}
 FIREFOX_I18N+=  ast
 .endif
-.ifndef WITHOUT_LANG_BE
+.if ${PORT_OPTIONS:MLANG_BE}
 FIREFOX_I18N+=  be
 .endif
-.ifndef WITHOUT_LANG_BG
+.if ${PORT_OPTIONS:MLANG_BG}
 FIREFOX_I18N+=  bg
 .endif
-.ifndef WITHOUT_LANG_BB
+.if ${PORT_OPTIONS:MLANG_BB}
 FIREFOX_I18N+=  bn-BD
 .endif
-.ifndef WITHOUT_LANG_BN
+.if ${PORT_OPTIONS:MLANG_BN}
 FIREFOX_I18N+=  bn-IN
 .endif
-.ifndef WITHOUT_LANG_BR
+.if ${PORT_OPTIONS:MLANG_BR}
 FIREFOX_I18N+=  br
 .endif
-.ifndef WITHOUT_LANG_BS
+.if ${PORT_OPTIONS:MLANG_BS}
 FIREFOX_I18N+=  bs
 .endif
-.ifndef WITHOUT_LANG_CA
+.if ${PORT_OPTIONS:MLANG_CA}
 FIREFOX_I18N+=  ca
 .endif
-.ifndef WITHOUT_LANG_CS
+.if ${PORT_OPTIONS:MLANG_CS}
 FIREFOX_I18N+=  cs
 .endif
-.ifndef WITHOUT_LANG_CY
+.if ${PORT_OPTIONS:MLANG_CY}
 FIREFOX_I18N+=  cy
 .endif
-.ifndef WITHOUT_LANG_DA
+.if ${PORT_OPTIONS:MLANG_DA}
 FIREFOX_I18N+=  da
 .endif
-.ifndef WITHOUT_LANG_DE
+.if ${PORT_OPTIONS:MLANG_DE}
 FIREFOX_I18N+=  de
 .endif
-.ifndef WITHOUT_LANG_EL
+.if ${PORT_OPTIONS:MLANG_EL}
 FIREFOX_I18N+=  el
 .endif
-.ifndef WITHOUT_LANG_GB
+.if ${PORT_OPTIONS:MLANG_GB}
 FIREFOX_I18N+=  en-GB
 .endif
-.ifndef WITHOUT_LANG_US
+.if ${PORT_OPTIONS:MLANG_US}
 FIREFOX_I18N+=  en-US
 .endif
-.ifndef WITHOUT_LANG_ZA
+.if ${PORT_OPTIONS:MLANG_ZA}
 FIREFOX_I18N+=  en-ZA
 .endif
-.ifndef WITHOUT_LANG_EO
+.if ${PORT_OPTIONS:MLANG_EO}
 FIREFOX_I18N+=  eo
 .endif
-.ifndef WITHOUT_LANG_SA
+.if ${PORT_OPTIONS:MLANG_SA}
 FIREFOX_I18N+=  es-AR
 .endif
-.ifndef WITHOUT_LANG_SC
+.if ${PORT_OPTIONS:MLANG_SC}
 FIREFOX_I18N+=  es-CL
 .endif
-.ifndef WITHOUT_LANG_ES
+.if ${PORT_OPTIONS:MLANG_ES}
 FIREFOX_I18N+=  es-ES
 .endif
-.ifndef WITHOUT_LANG_SM
+.if ${PORT_OPTIONS:MLANG_SM}
 FIREFOX_I18N+=  es-MX
 .endif
-.ifndef WITHOUT_LANG_ET
+.if ${PORT_OPTIONS:MLANG_ET}
 FIREFOX_I18N+=  et
 .endif
-.ifndef WITHOUT_LANG_EU
+.if ${PORT_OPTIONS:MLANG_EU}
 FIREFOX_I18N+=  eu
 .endif
-.ifndef WITHOUT_LANG_FA
+.if ${PORT_OPTIONS:MLANG_FA}
 FIREFOX_I18N+=  fa
 .endif
-.ifndef WITHOUT_LANG_FI
+.if ${PORT_OPTIONS:MLANG_FI}
 FIREFOX_I18N+=  fi
 .endif
-.ifndef WITHOUT_LANG_FR
+.if ${PORT_OPTIONS:MLANG_FR}
 FIREFOX_I18N+=  fr
 .endif
-.ifndef WITHOUT_LANG_FY
+.if ${PORT_OPTIONS:MLANG_FY}
 FIREFOX_I18N+=  fy-NL
 .endif
-.ifndef WITHOUT_LANG_GA
+.if ${PORT_OPTIONS:MLANG_GA}
 FIREFOX_I18N+=  ga-IE
 .endif
-.ifndef WITHOUT_LANG_GL
+.if ${PORT_OPTIONS:MLANG_GL}
 FIREFOX_I18N+=  gl
 .endif
-.ifndef WITHOUT_LANG_GU
+.if ${PORT_OPTIONS:MLANG_GU}
 FIREFOX_I18N+=  gu-IN
 .endif
-.ifndef WITHOUT_LANG_HE
+.if ${PORT_OPTIONS:MLANG_HE}
 FIREFOX_I18N+=  he
 .endif
-.ifndef WITHOUT_LANG_HI
+.if ${PORT_OPTIONS:MLANG_HI}
 FIREFOX_I18N+=  hi-IN
 .endif
-.ifndef WITHOUT_LANG_HR
+.if ${PORT_OPTIONS:MLANG_HR}
 FIREFOX_I18N+=  hr
 .endif
-.ifndef WITHOUT_LANG_HU
+.if ${PORT_OPTIONS:MLANG_HU}
 FIREFOX_I18N+=  hu
 .endif
-.ifndef WITHOUT_LANG_AM
+.if ${PORT_OPTIONS:MLANG_AM}
 FIREFOX_I18N+=  hy-AM
 .endif
-.ifndef WITHOUT_LANG_ID
+.if ${PORT_OPTIONS:MLANG_ID}
 FIREFOX_I18N+=  id
 .endif
-.ifndef WITHOUT_LANG_IS
+.if ${PORT_OPTIONS:MLANG_IS}
 FIREFOX_I18N+=  is
 .endif
-.ifndef WITHOUT_LANG_IT
+.if ${PORT_OPTIONS:MLANG_IT}
 FIREFOX_I18N+=  it
 .endif
-.ifndef WITHOUT_LANG_JA
+.if ${PORT_OPTIONS:MLANG_JA}
 FIREFOX_I18N+=  ja
 .endif
-.ifndef WITHOUT_LANG_KK
+.if ${PORT_OPTIONS:MLANG_KK}
 FIREFOX_I18N+=  kk
 .endif
-.ifndef WITHOUT_LANG_KN
+.if ${PORT_OPTIONS:MLANG_KN}
 FIREFOX_I18N+=  kn
 .endif
-.ifndef WITHOUT_LANG_KO
+.if ${PORT_OPTIONS:MLANG_KO}
 FIREFOX_I18N+=  ko
 .endif
-.ifndef WITHOUT_LANG_KU
+.if ${PORT_OPTIONS:MLANG_KU}
 FIREFOX_I18N+=  ku
 .endif
-.ifndef WITHOUT_LANG_LG
+.if ${PORT_OPTIONS:MLANG_LG}
 FIREFOX_I18N+=  lg
 .endif
-.ifndef WITHOUT_LANG_LT
+.if ${PORT_OPTIONS:MLANG_LT}
 FIREFOX_I18N+=  lt
 .endif
-.ifndef WITHOUT_LANG_LV
+.if ${PORT_OPTIONS:MLANG_LV}
 FIREFOX_I18N+=  lv
 .endif
-.ifndef WITHOUT_LANG_MAI
+.if ${PORT_OPTIONS:MLANG_MAI}
 FIREFOX_I18N+=  mai
 .endif
-.ifndef WITHOUT_LANG_MK
+.if ${PORT_OPTIONS:MLANG_MK}
 FIREFOX_I18N+=  mk
 .endif
-.ifndef WITHOUT_LANG_ML
+.if ${PORT_OPTIONS:MLANG_ML}
 FIREFOX_I18N+=  ml
 .endif
-.ifndef WITHOUT_LANG_MR
+.if ${PORT_OPTIONS:MLANG_MR}
 FIREFOX_I18N+=  mr
 .endif
-.ifndef WITHOUT_LANG_NB
+.if ${PORT_OPTIONS:MLANG_NB}
 FIREFOX_I18N+=  nb-NO
 .endif
-.ifndef WITHOUT_LANG_NL
+.if ${PORT_OPTIONS:MLANG_NL}
 FIREFOX_I18N+=  nl
 .endif
-.ifndef WITHOUT_LANG_NN
+.if ${PORT_OPTIONS:MLANG_NN}
 FIREFOX_I18N+=  nn-NO
 .endif
-.ifndef WITHOUT_LANG_NSO
+.if ${PORT_OPTIONS:MLANG_NSO}
 FIREFOX_I18N+=  nso
 .endif
-.ifndef WITHOUT_LANG_OR
+.if ${PORT_OPTIONS:MLANG_OR}
 FIREFOX_I18N+=  or
 .endif
-.ifndef WITHOUT_LANG_PA
+.if ${PORT_OPTIONS:MLANG_PA}
 FIREFOX_I18N+=  pa-IN
 .endif
-.ifndef WITHOUT_LANG_PL
+.if ${PORT_OPTIONS:MLANG_PL}
 FIREFOX_I18N+=  pl
 .endif
-.ifndef WITHOUT_LANG_PBR
+.if ${PORT_OPTIONS:MLANG_PBR}
 FIREFOX_I18N+=  pt-BR
 .endif
-.ifndef WITHOUT_LANG_PT
+.if ${PORT_OPTIONS:MLANG_PT}
 FIREFOX_I18N+=  pt-PT
 .endif
-.ifndef WITHOUT_LANG_RM
+.if ${PORT_OPTIONS:MLANG_RM}
 FIREFOX_I18N+=  rm
 .endif
-.ifndef WITHOUT_LANG_RO
+.if ${PORT_OPTIONS:MLANG_RO}
 FIREFOX_I18N+=  ro
 .endif
-.ifndef WITHOUT_LANG_RU
+.if ${PORT_OPTIONS:MLANG_RU}
 FIREFOX_I18N+=  ru
 .endif
-.ifndef WITHOUT_LANG_SI
+.if ${PORT_OPTIONS:MLANG_SI}
 FIREFOX_I18N+=  si
 .endif
-.ifndef WITHOUT_LANG_SK
+.if ${PORT_OPTIONS:MLANG_SK}
 FIREFOX_I18N+=  sk
 .endif
-.ifndef WITHOUT_LANG_SON
+.if ${PORT_OPTIONS:MLANG_SON}
 FIREFOX_I18N+=  son
 .endif
-.ifndef WITHOUT_LANG_SL
+.if ${PORT_OPTIONS:MLANG_SL}
 FIREFOX_I18N+=  sl
 .endif
-.ifndef WITHOUT_LANG_SQ
+.if ${PORT_OPTIONS:MLANG_SQ}
 FIREFOX_I18N+=  sq
 .endif
-.ifndef WITHOUT_LANG_SR
+.if ${PORT_OPTIONS:MLANG_SR}
 FIREFOX_I18N+=  sr
 .endif
-.ifndef WITHOUT_LANG_SV
+.if ${PORT_OPTIONS:MLANG_SV}
 FIREFOX_I18N+=  sv-SE
 .endif
-.ifndef WITHOUT_LANG_TA
+.if ${PORT_OPTIONS:MLANG_TA}
 FIREFOX_I18N+=  ta
 .endif
-.ifndef WITHOUT_LANG_LK
+.if ${PORT_OPTIONS:MLANG_LK}
 FIREFOX_I18N+=  ta-LK
 .endif
-.ifndef WITHOUT_LANG_TE
+.if ${PORT_OPTIONS:MLANG_TE}
 FIREFOX_I18N+=  te
 .endif
-.ifndef WITHOUT_LANG_TH
+.if ${PORT_OPTIONS:MLANG_TH}
 FIREFOX_I18N+=  th
 .endif
-.ifndef WITHOUT_LANG_TR
+.if ${PORT_OPTIONS:MLANG_TR}
 FIREFOX_I18N+=  tr
 .endif
-.ifndef WITHOUT_LANG_UK
+.if ${PORT_OPTIONS:MLANG_UK}
 FIREFOX_I18N+=  uk
 .endif
-.ifndef WITHOUT_LANG_VI
+.if ${PORT_OPTIONS:MLANG_VI}
 FIREFOX_I18N+=  vi
 .endif
-.ifndef WITHOUT_LANG_CN
+.if ${PORT_OPTIONS:MLANG_CN}
 FIREFOX_I18N+=  zh-CN
 .endif
-.ifndef WITHOUT_LANG_TW
+.if ${PORT_OPTIONS:MLANG_TW}
 FIREFOX_I18N+=  zh-TW
 .endif
-.ifndef WITHOUT_LANG_ZU
+.if ${PORT_OPTIONS:MLANG_ZU}
 FIREFOX_I18N+=  zu
 .endif
 .endif
diff --git a/www/firefox-i18n/Makefile.option b/www/firefox-i18n/Makefile.option
index 14fc8a6d43c0..68b6b79762df 100644
--- a/www/firefox-i18n/Makefile.option
+++ b/www/firefox-i18n/Makefile.option
@@ -1,89 +1,90 @@
-# New ports collection makefile.option for:    firefox3-i18n
-# Date created:         30 Nov 2008
-# Whom:                 Koji Yokota <yokota@res.otaru-uc.ac.jp>
-#
+# Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
 # $FreeBSD$
-#
-OPTIONS=        LANG_AF  "Africaans"              off \
-                LANG_AK  "Akan"                   off \
-                LANG_SQ  "Albanian"               off \
-                LANG_AR  "Arabic"                 on \
-                LANG_AM  "Armenian"               off \
-                LANG_AST "Asturian"               off \
-                LANG_EU  "Basque"                 off \
-                LANG_BN  "Bengali"                on \
-                LANG_BB  "Bengali (Bangladesh)"   off \
-                LANG_BS  "Bosnian"                off \
-                LANG_BR  "Breton"                 off \
-                LANG_BG  "Bulgarian"              off \
-                LANG_BE  "Byelorussian"           off \
-                LANG_CA  "Catalan"                off \
-                LANG_CN  "Chinese"                on \
-                LANG_CS  "Czech"                  off \
-                LANG_DA  "Danish"                 off \
-                LANG_NL  "Dutch"                  off \
-                LANG_GB  "English (UK)"           off \
-                LANG_US  "English (US)"           off \
-                LANG_EO  "Esperanto"              off \
-                LANG_ET  "Estonian"               off \
-                LANG_GL  "Galician"               off \
-                LANG_DE  "German"                 on \
-                LANG_EL  "Greek"                  off \
-                LANG_GU  "Gujarati"               off \
-                LANG_FI  "Finnish"                off \
-                LANG_FR  "French"                 on \
-                LANG_FY  "Frisian"                off \
-                LANG_GA  "Irish"                  off \
-                LANG_HE  "Hebrew"                 off \
-                LANG_HI  "Hindi"                  on \
-                LANG_HR  "Hrvatski"               off \
-                LANG_HU  "Hungarian"              off \
-                LANG_IS  "Icelandic"              off \
-                LANG_ID  "Indonesian"             off \
-                LANG_IT  "Italian"                on \
-                LANG_JA  "Japanese"               on \
-                LANG_KN  "Kannada"                off \
-                LANG_KK  "Kazakh"                 off \
-                LANG_KO  "Korean"                 on \
-                LANG_KU  "Kurdish"                off \
-                LANG_LV  "Latvian"                off \
-                LANG_LT  "Lithuanian"             off \
-                LANG_LG  "Luganda"                off \
-                LANG_MK  "Macedonian"             off \
-                LANG_MAI "Maithili"               off \
-                LANG_ML  "Malayalam"              off \
-                LANG_MR  "Marathi"                on \
-                LANG_MN  "Mongolian"              off \
-                LANG_NSO "Northern Sotho"         off \
-                LANG_NB  "Norwegian"              off \
-                LANG_NN  "Norwegian Nynorsk"      off \
-                LANG_OR  "Oriya"                  off \
-                LANG_FA  "Persian"                off \
-                LANG_PL  "Polish"                 off \
-                LANG_PT  "Portuguese"             off \
-                LANG_PBR "Portuguese (Brazil)"    on \
-                LANG_PA  "Punjabi"                on \
-                LANG_RO  "Romanian"               off \
-                LANG_RM  "Romansh"                off \
-                LANG_RU  "Russian"                on \
-                LANG_SR  "Serbian"                off \
-                LANG_SI  "Singhalese"             off \
-                LANG_ES  "Spanish"                on \
-                LANG_SON "Songhai"                off \
-                LANG_SA  "Spanish (Argentina)"    off \
-                LANG_SC  "Spanish (Chile)"        off \
-                LANG_SM  "Spanish (Mexico)"       off \
-                LANG_SK  "Slovak"                 off \
-                LANG_SL  "Slovenian"              off \
-                LANG_SV  "Swedish"                off \
-                LANG_TW  "Taiwanese"              off \
-                LANG_TA  "Tamil"                  off \
-                LANG_LK  "Tamil (Sri Lanka)"      off \
-                LANG_TE  "Telugu"                 on \
-                LANG_TH  "Thai"                   off \
-                LANG_TR  "Turkish"                off \
-                LANG_UK  "Ukrainian"              off \
-                LANG_VI  "Vietnamese"             off \
-                LANG_CY  "Welsh"                  off \
-                LANG_ZA  "English (South Afrika)" off \
-                LANG_ZU  "Zulu"                   off 
+
+OPTIONS_DEFINE=	LANG_AF \
+		LANG_AK \
+		LANG_SQ \
+		LANG_AR \
+		LANG_AM \
+		LANG_AST \
+		LANG_EU \
+		LANG_BN \
+		LANG_BB \
+		LANG_BS \
+		LANG_BR \
+		LANG_BG \
+		LANG_BE \
+		LANG_CA \
+		LANG_CN \
+		LANG_CS \
+		LANG_DA \
+		LANG_NL \
+		LANG_GB \
+		LANG_US \
+		LANG_EO \
+		LANG_ET \
+		LANG_GL \
+		LANG_DE \
+		LANG_EL \
+		LANG_GU \
+		LANG_FI \
+		LANG_FR \
+		LANG_FY \
+		LANG_GA \
+		LANG_HE \
+		LANG_HI \
+		LANG_HR \
+		LANG_HU \
+		LANG_IS \
+		LANG_ID \
+		LANG_IT \
+		LANG_JA \
+		LANG_KN \
+		LANG_KK \
+		LANG_KO \
+		LANG_KU \
+		LANG_LV \
+		LANG_LT \
+		LANG_LG \
+		LANG_MK \
+		LANG_MAI \
+		LANG_ML \
+		LANG_MR \
+		LANG_MN \
+		LANG_NSO \
+		LANG_NB \
+		LANG_NN \
+		LANG_OR \
+		LANG_FA \
+		LANG_PL \
+		LANG_PT \
+		LANG_PBR\
+		LANG_PA \
+		LANG_RO \
+		LANG_RM \
+		LANG_RU \
+		LANG_SR \
+		LANG_SI \
+		LANG_ES \
+		LANG_SON \
+		LANG_SA \
+		LANG_SC \
+		LANG_SM \
+		LANG_SK \
+		LANG_SL \
+		LANG_SV \
+		LANG_TW \
+		LANG_TA \
+		LANG_LK \
+		LANG_TE \
+		LANG_TH \
+		LANG_TR \
+		LANG_UK \
+		LANG_VI \
+		LANG_CY \
+		LANG_ZA \
+		LANG_ZU
+
+OPTIONS_DEFAULT=LANG_AR LANG_BN LANG_BR LANG_CN LANG_ET LANG_DE LANG_FR \
+		LANG_HI LANG_ID LANG_IT LANG_JA LANG_KO LANG_MK LANG_MR \
+		LANG_MN LANG_PBR LANG_PA LANG_RU LANG_ES LANG_SON LANG_TE
diff --git a/www/seamonkey-i18n/Makefile.lang b/www/seamonkey-i18n/Makefile.lang
index ff9c1690e369..a14341a48f91 100644
--- a/www/seamonkey-i18n/Makefile.lang
+++ b/www/seamonkey-i18n/Makefile.lang
@@ -1,11 +1,6 @@
-# New ports collection makefile.lang for:    firefox3-i18n
-# Date created:         30 Nov 2008
-# Whom:                 Koji Yokota <yokota@res.otaru-uc.ac.jp>
-#
+# Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
 # $FreeBSD$
-#
-# Currently, the following 22 languages are supported.
-#
+
 SEAMONKEY_I18N_ALL_=	ca cs de en-GB en-US es-AR es-ES \
 			fi fr hu it ja-JP-mac ja lt nb-NO nl pl \
 			pt-PT ru sk sv-SE tr uk
@@ -13,73 +8,73 @@ SEAMONKEY_I18N_ALL_=	ca cs de en-GB en-US es-AR es-ES \
 .if defined(SEAMONKEY_I18N_ALL) || (defined(PACKAGE_BUILDING) && !exists(${OPTIONSFILE})) || make(makesum)
 SEAMONKEY_I18N=   ${SEAMONKEY_I18N_ALL_}
 .else
-.ifndef WITHOUT_LANG_CA
+.if ${PORT_OPTIONS:MLANG_CA}
 SEAMONKEY_I18N+=  ca
 .endif
-.ifndef WITHOUT_LANG_CS
+.if ${PORT_OPTIONS:MLANG_CS}
 SEAMONKEY_I18N+=  cs
 .endif
-.ifndef WITHOUT_LANG_DE
+.if ${PORT_OPTIONS:MLANG_DE}
 SEAMONKEY_I18N+=  de
 .endif
-.ifndef WITHOUT_LANG_GB
+.if ${PORT_OPTIONS:MLANG_GB}
 SEAMONKEY_I18N+=  en-GB
 .endif
-.ifndef WITHOUT_LANG_US
+.if ${PORT_OPTIONS:MLANG_US}
 SEAMONKEY_I18N+=  en-US
 .endif
-.ifndef WITHOUT_LANG_SA
+.if ${PORT_OPTIONS:MLANG_SA}
 SEAMONKEY_I18N+=  es-AR
 .endif
-.ifndef WITHOUT_LANG_ES
+.if ${PORT_OPTIONS:MLANG_ES}
 SEAMONKEY_I18N+=  es-ES
 .endif
-.ifndef WITHOUT_LANG_FI
+.if ${PORT_OPTIONS:MLANG_FI}
 SEAMONKEY_I18N+=  fi
 .endif
-.ifndef WITHOUT_LANG_FR
+.if ${PORT_OPTIONS:MLANG_FR}
 SEAMONKEY_I18N+=  fr
 .endif
-.ifndef WITHOUT_LANG_HU
+.if ${PORT_OPTIONS:MLANG_HU}
 SEAMONKEY_I18N+=  hu
 .endif
-.ifndef WITHOUT_LANG_IT
+.if ${PORT_OPTIONS:MLANG_IT}
 SEAMONKEY_I18N+=  it
 .endif
-.ifndef WITHOUT_LANG_JP
+.if ${PORT_OPTIONS:MLANG_JP}
 SEAMONKEY_I18N+=  ja-JP-mac
 .endif
-.ifndef WITHOUT_LANG_JA
+.if ${PORT_OPTIONS:MLANG_JA}
 SEAMONKEY_I18N+=  ja
 .endif
-.ifndef WITHOUT_LANG_LT
+.if ${PORT_OPTIONS:MLANG_LT}
 SEAMONKEY_I18N+=  lt
 .endif
-.ifndef WITHOUT_LANG_NB
+.if ${PORT_OPTIONS:MLANG_NB}
 SEAMONKEY_I18N+=  nb-NO
 .endif
-.ifndef WITHOUT_LANG_NL
+.if ${PORT_OPTIONS:MLANG_NL}
 SEAMONKEY_I18N+=  nl
 .endif
-.ifndef WITHOUT_LANG_PL
+.if ${PORT_OPTIONS:MLANG_PL}
 SEAMONKEY_I18N+=  pl
 .endif
-.ifndef WITHOUT_LANG_PT
+.if ${PORT_OPTIONS:MLANG_PT}
 SEAMONKEY_I18N+=  pt-PT
 .endif
-.ifndef WITHOUT_LANG_RU
+.if ${PORT_OPTIONS:MLANG_RU}
 SEAMONKEY_I18N+=  ru
 .endif
-.ifndef WITHOUT_LANG_SK
+.if ${PORT_OPTIONS:MLANG_SK}
 SEAMONKEY_I18N+=  sk
 .endif
-.ifndef WITHOUT_LANG_SE
+.if ${PORT_OPTIONS:MLANG_SE}
 SEAMONKEY_I18N+=  sv-SE
 .endif
-.ifndef WITHOUT_LANG_TR
+.if ${PORT_OPTIONS:MLANG_TR}
 SEAMONKEY_I18N+=  tr
 .endif
-.ifndef WITHOUT_LANG_UA
+.if ${PORT_OPTIONS:MLANG_UA}
 SEAMONKEY_I18N+=  uk
 .endif
 .endif
diff --git a/www/seamonkey-i18n/Makefile.option b/www/seamonkey-i18n/Makefile.option
index cb80aacf0c30..d3ae226acb83 100644
--- a/www/seamonkey-i18n/Makefile.option
+++ b/www/seamonkey-i18n/Makefile.option
@@ -1,30 +1,28 @@
-# New ports collection makefile.option for:    firefox3-i18n
-# Date created:         30 Nov 2008
-# Whom:                 Koji Yokota <yokota@res.otaru-uc.ac.jp>
-#
+# Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
 # $FreeBSD$
-#
 
-OPTIONS=		LANG_CA "Catalan"               off \
-				LANG_CS "Czech"                 off \
-				LANG_NL "Dutch"                 off \
-				LANG_DE "German"                on \
-				LANG_GB "English GB"            off \
-				LANG_US "English US"            off \
-				LANG_FI "Finnish"               off \
-				LANG_FR "French"                on \
-				LANG_HU "Hungarian"             on \
-				LANG_IT "Italian"               on \
-				LANG_JA "Japanese"              off \
-				LANG_JP "Japanese (ja-JP-mac)"  off \
-				LANG_LT "Lithuanian"            off \
-				LANG_NB "Norwegian"             off \
-				LANG_PL "Polish"                off \
-				LANG_PT "Portuguese"            off \
-				LANG_RU "Russian"               on \
-				LANG_ES "Spanish"               on \
-				LANG_SA "Spanish (Argentina)"   off \
-				LANG_SE "Swedish"               off \
-				LANG_SK "Slovak"                off \
-				LANG_TR "Turkish"               off \
-				LANG_UA "Ukrainian"             off
+OPTIONS_DEFINE=	LANG_CA \
+		LANG_CS \
+		LANG_NL \
+		LANG_DE \
+		LANG_GB \
+		LANG_US \
+		LANG_FI \
+		LANG_FR \
+		LANG_HU \
+		LANG_IT \
+		LANG_JA \
+		LANG_JP \
+		LANG_LT \
+		LANG_NB \
+		LANG_PL \
+		LANG_PT \
+		LANG_RU \
+		LANG_ES \
+		LANG_SA \
+		LANG_SE \
+		LANG_SK \
+		LANG_TR \
+		LANG_UA
+
+OPTIONS_DEFAULT=LANG_DE LANG_FR LANG_HU LANG_IT LANG_RU LANG_ES