- adoption of optionsNG

- while here separate options and dictionaries into separate files

Approved by:	portmgr (bapt)

3 files changed, 118 insertions, 118 deletions

diff --git a/mail/thunderbird-dictionaries/Makefile b/mail/thunderbird-dictionaries/Makefile
index 2fd03186bb17..98328243adb9 100644
--- a/mail/thunderbird-dictionaries/Makefile
+++ b/mail/thunderbird-dictionaries/Makefile
@@ -1,10 +1,5 @@
-# Ports collection Makefile for:	thunderbird-dictionaries
-# Date created:				19 February 2006
-# Whom:					Matthew Luckie <mjl@luckie.org.nz>
-# Based on:				multimedia/mplayer-skins
-#
+# Created by: Matthew Luckie <mjl@luckie.org.nz>
 # $FreeBSD$
-#
 
 PORTNAME=	thunderbird-dictionaries
 PORTVERSION=	20060220
@@ -21,125 +16,34 @@ COMMENT=	Dictionaries for Mozilla Thunderbird
 RUN_DEPENDS=	thunderbird>=6.0:${PORTSDIR}/mail/thunderbird
 
 USE_ZIP=	yes
+NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/dictionaries
 
-# Dictionary files
-AF_ZA_FILE=	spell-af-ZA.xpi
-BG_FILE=	spell-bg.xpi
-CA_FILE=	spell-ca.xpi
-CS_FILE=	spell-cs.xpi
-CY_GB_FILE=	spell-cy-GB.xpi
-DA_FILE=	spell-da.xpi
-DE_AT_FILE=	spell-de-AT.xpi
-DE_CH_FILE=	spell-de-CH.xpi
-DE_DE_FILE=	spell-de-DE.xpi
-EL_FILE=	spell-el.xpi
-EN_AU_FILE=	spell-en-AU.xpi
-EN_CA_FILE=	spell-en-CA.xpi
-EN_GB_FILE=	spell-en-GB.xpi
-EN_NZ_FILE=	spell-en-NZ.xpi
-ES_ES_FILE=	spell-es-ES.xpi
-ES_MX_FILE=	spell-es-MX.xpi
-FO_FILE=	spell-fo.xpi
-FR_FR_FILE=	spell-fr-FR.xpi
-GA_FILE=	spell-ga.xpi
-GL_FILE=	spell-gl.xpi
-HE_IL_FILE=	spell-he-IL.xpi
-HR_FILE=	spell-hr.xpi
-HU_FILE=	spell-hu.xpi
-IA_FILE=	spell-ia.xpi
-IT_FILE=	spell-it.xpi
-LA_FILE=	spell-la.xpi
-LT_FILE=	spell-lt.xpi
-LV_LV_FILE=	spell-lv-LV.xpi
-MI_FILE=	spell-mi.xpi
-MS_FILE=	spell-ms.xpi
-NB_FILE=	spell-nb.xpi
-NL_FILE=	spell-nl.xpi
-NN_FILE=	spell-nn.xpi
-PL_FILE=	spell-pl.xpi
-PT_FILE=	spell-pt.xpi
-PT_BR_FILE=	spell-pt-BR.xpi
-RO_FILE=	spell-ro.xpi
-RU_FILE=	spell-ru.xpi
-SK_FILE=	spell-sk.xpi
-SL_FILE=	spell-sl.xpi
-SV_FILE=	spell-sv.xpi
-UK_FILE=	spell-uk.xpi
-ZU_ZA_FILE=	spell-zu-ZA.xpi
-
-# Dictionary options
-OPTIONS=	DICT_ALL "all dictionaries" on
-OPTIONS+=	DICT_AF_ZA "Afrikaans" off
-OPTIONS+=	DICT_BG "Bulgarian" off
-OPTIONS+=	DICT_CA "Catalan" off
-OPTIONS+=	DICT_HR "Croatian" off
-OPTIONS+=	DICT_CS "Czech" off
-OPTIONS+=	DICT_DA "Danish" off
-OPTIONS+=	DICT_NL "Dutch" off
-OPTIONS+=	DICT_EN_AU "English (Australia)" off
-OPTIONS+=	DICT_EN_CA "English (Canada)" off
-OPTIONS+=	DICT_EN_NZ "English (New Zealand)" off
-OPTIONS+=	DICT_EN_GB "English (United Kingdom)" off
-OPTIONS+=	DICT_FR_FR "French (France)" off
-OPTIONS+=	DICT_FO "Faroese" off
-OPTIONS+=	DICT_GL "Galician (Spain)" off
-OPTIONS+=	DICT_DE_AT "German (Austria)" off
-OPTIONS+=	DICT_DE_DE "German (Germany)" off
-OPTIONS+=	DICT_DE_CH "German (Switzerland)" off
-OPTIONS+=	DICT_EL "Greek" off
-OPTIONS+=	DICT_HE_IL "Hebrew" off
-OPTIONS+=	DICT_HU "Hungarian" off
-OPTIONS+=	DICT_IA "Interlingua" off
-OPTIONS+=	DICT_GA "Irish" off
-OPTIONS+=	DICT_IT "Italian" off
-OPTIONS+=	DICT_LA "Latin" off
-OPTIONS+=	DICT_LV_LV "Latvian" off
-OPTIONS+=	DICT_LT "Lithuanian" off
-OPTIONS+=	DICT_MS "Malay" off
-OPTIONS+=	DICT_MI "Maori" off
-OPTIONS+=	DICT_NB "Norwegian (Bokmal)" off
-OPTIONS+=	DICT_NN "Norwegian (Nynorsk)" off
-OPTIONS+=	DICT_PL "Polish" off
-OPTIONS+=	DICT_PT "Portuguese (Portugal)" off
-OPTIONS+=	DICT_PT_BR "Portuguese (Brasil)" off
-OPTIONS+=	DICT_RO "Romanian" off
-OPTIONS+=	DICT_RU "Russian" off
-OPTIONS+=	DICT_ES_MX "Spanish (Mexico)" off
-OPTIONS+=	DICT_ES_ES "Spanish (Spain)" off
-OPTIONS+=	DICT_SK "Slovak" off
-OPTIONS+=	DICT_SL "Slovenian" off
-OPTIONS+=	DICT_SV "Swedish" off
-OPTIONS+=	DICT_UK "Ukrainian" off
-OPTIONS+=	DICT_CY_GB "Welsh" off
-OPTIONS+=	DICT_ZU_ZA "Zulu (South Africa)" off
+.include "${.CURDIR}/Makefile.options"
 
+.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
+.include "${.CURDIR}/Makefile.dict"
+
 # For batch building, build all dictionaries
 .if defined(BATCH)
-WITH_DICT_ALL=yes
+PORT_OPTIONS+=	${ALLDICTS}
 .endif
 
-# All available dictionaries
-ALLDICTS=	AF_ZA BG CA CS CY_GB DA DE_AT DE_CH DE_DE EL EN_AU EN_CA \
-		EN_GB EN_NZ ES_ES ES_MX FO FR_FR GA GL HE_IL HR HU IA IT \
-		LA LT LV_LV MI MS NB NL NN PL PT PT_BR RO RU SK SL SV \
-		UK ZU_ZA
+# All available dictionaries are listed in Makefile.dict
 
 # this dictionary requires special handling in do-install
 BG_DICT=	BG
 
 # Build and install all dictionaries
-.if defined(WITH_DICT_ALL)
-.for f in ${ALLDICTS}
-WITH_DICT_${f}=	yes
-.endfor
+.if ${PORT_OPTIONS:MALL}
+PORT_OPTIONS+=	${ALLDICTS}
 .endif
 
 # Figure out which distfiles to use, and how to construct the plist
 .for f in ${ALLDICTS}
-.ifdef(WITH_DICT_${f})
+.if ${PORT_OPTIONS:M${f}}
 PLIST_SUB+=	${f}=""
 HAVE_DICT=	yes
 DISTFILES+=	${${f}_FILE}
@@ -152,24 +56,15 @@ PLIST_SUB+=	${f}="@comment "
 do-extract:
 	@${MKDIR} ${WRKSRC}
 .for f in ${ALLDICTS}
-.ifdef(WITH_DICT_${f})
+.if  ${PORT_OPTIONS:M$${f}}
 	@${UNZIP_CMD} -q ${DISTDIR}/${DIST_SUBDIR}/${${f}_FILE} -d ${WRKSRC}/${${f}_FILE}
 .endif
 .endfor
 
-# Check to make sure that at least one dictionary was selected
-do-build:
-.if !defined(HAVE_DICT)
-	@${ECHO_MSG} "No dictionary selected"
-	@${FALSE}
-.else
-	@${DO_NADA}
-.endif
-
 # Install the requested dictionaries
 do-install:
 .for f in ${ALLDICTS}
-.ifdef(WITH_DICT_${f})
+.if ${PORT_OPTIONS:M${f}}
 .if ${BG_DICT}==${f}
 	@${INSTALL_DATA} \
 		${WRKSRC}/${${f}_FILE}/bin/components/myspell/${${f}_FILE:S/spell-//:S/xpi//}aff \
diff --git a/mail/thunderbird-dictionaries/Makefile.dict b/mail/thunderbird-dictionaries/Makefile.dict
new file mode 100644
index 000000000000..67dc00820b8f
--- /dev/null
+++ b/mail/thunderbird-dictionaries/Makefile.dict
@@ -0,0 +1,49 @@
+# This file lists the Dictionary files to not bloat Makefile
+# $FreeBSD$
+
+AF_ZA_FILE=	spell-af-ZA.xpi
+BG_FILE=	spell-bg.xpi
+CA_FILE=	spell-ca.xpi
+CS_FILE=	spell-cs.xpi
+CY_GB_FILE=	spell-cy-GB.xpi
+DA_FILE=	spell-da.xpi
+DE_AT_FILE=	spell-de-AT.xpi
+DE_CH_FILE=	spell-de-CH.xpi
+DE_DE_FILE=	spell-de-DE.xpi
+EL_FILE=	spell-el.xpi
+EN_AU_FILE=	spell-en-AU.xpi
+EN_CA_FILE=	spell-en-CA.xpi
+EN_GB_FILE=	spell-en-GB.xpi
+EN_NZ_FILE=	spell-en-NZ.xpi
+ES_ES_FILE=	spell-es-ES.xpi
+ES_MX_FILE=	spell-es-MX.xpi
+FO_FILE=	spell-fo.xpi
+FR_FR_FILE=	spell-fr-FR.xpi
+GA_FILE=	spell-ga.xpi
+GL_FILE=	spell-gl.xpi
+HE_IL_FILE=	spell-he-IL.xpi
+HR_FILE=	spell-hr.xpi
+HU_FILE=	spell-hu.xpi
+IA_FILE=	spell-ia.xpi
+IT_FILE=	spell-it.xpi
+LA_FILE=	spell-la.xpi
+LT_FILE=	spell-lt.xpi
+LV_LV_FILE=	spell-lv-LV.xpi
+MI_FILE=	spell-mi.xpi
+MS_FILE=	spell-ms.xpi
+NB_FILE=	spell-nb.xpi
+NL_FILE=	spell-nl.xpi
+NN_FILE=	spell-nn.xpi
+PL_FILE=	spell-pl.xpi
+PT_FILE=	spell-pt.xpi
+PT_BR_FILE=	spell-pt-BR.xpi
+RO_FILE=	spell-ro.xpi
+RU_FILE=	spell-ru.xpi
+SK_FILE=	spell-sk.xpi
+SL_FILE=	spell-sl.xpi
+SV_FILE=	spell-sv.xpi
+UK_FILE=	spell-uk.xpi
+ZU_ZA_FILE=	spell-zu-ZA.xpi
+
+ALLDICTS_CMD:=	${GREP} FILE ${.CURDIR}/Makefile.dict | ${GREP} -v ALLDICTS_CMD | ${SED} s/_FILE.*//g | ${XARGS} | ${GREP} .
+ALLDICTS!=	${ALLDICTS_CMD}
diff --git a/mail/thunderbird-dictionaries/Makefile.options b/mail/thunderbird-dictionaries/Makefile.options
new file mode 100644
index 000000000000..0359039042af
--- /dev/null
+++ b/mail/thunderbird-dictionaries/Makefile.options
@@ -0,0 +1,56 @@
+# This file lists the options to not bloat Makefile
+# $FreeBSD$
+
+OPTIONS_MULTI=	DICT
+OPTIONS_MULTI_DICT=	ALL AF_ZA BG CA HR CS DA NL EN_AU EN_CA \
+			EN_NZ EN_GB FR_FR FO GL DE_AT DE_DE DE_CH \
+			EL HE_IL HU IA GA IT LA LV_LV LT MS MI NB \
+			NN PL PT PT_BR RO RU ES_MX ES_ES SK SL SV UK \
+			CY_GB ZU_ZA
+
+ALL_DESC=	all dictionaries
+AF_ZA_DESC=	Afrikaans
+BG_DESC=	Bulgarian
+CA_DESC=	Catalan
+HR_DESC=	Croatian
+CS_DESC=	Czech
+DA_DESC=	Danish
+NL_DESC=	Dutch
+EN_AU_DESC=	English (Australia)
+EN_CA_DESC=	English (Canada)
+EN_NZ_DESC=	English (New Zealand)
+EN_GB_DESC=	English (United Kingdom)
+FR_FR_DESC=	French (France)
+FO_DESC=	Faroese
+GL_DESC=	Galician (Spain)
+DE_AT_DESC=	German (Austria)
+DE_DE_DESC=	German (Germany)
+DE_CH_DESC=	German (Switzerland)
+EL_DESC=	Greek
+HE_IL_DESC=	Hebrew
+HU_DESC=	Hungarian
+IA_DESC=	Interlingua
+GA_DESC=	Irish
+IT_DESC=	Italian
+LA_DESC=	Latin
+LV_LV_DESC=	Latvian
+LT_DESC=	Lithuanian
+MS_DESC=	Malay
+MI_DESC=	Maori
+NB_DESC=	Norwegian (Bokmal)
+NN_DESC=	Norwegian (Nynorsk)
+PL_DESC=	Polish
+PT_DESC=	Portuguese (Portugal)
+PT_BR_DESC=	Portuguese (Brasil)
+RO_DESC=	Romanian
+RU_DESC=	Russian
+ES_MX_DESC=	Spanish (Mexico)
+ES_ES_DESC=	Spanish (Spain)
+SK_DESC=	Slovak
+SL_DESC=	Slovenian
+SV_DESC=	Swedish
+UK_DESC=	Ukrainian
+CY_GB_DESC=	Welsh
+ZU_ZA_DESC=	Zulu (South Africa)
+
+OPTIONS_DEFAULT=	ALL