2 files changed, 51 insertions, 58 deletions

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