Index: head/mail/thunderbird-dictionaries/Makefile =================================================================== --- head/mail/thunderbird-dictionaries/Makefile (revision 419663) +++ head/mail/thunderbird-dictionaries/Makefile (revision 419664) @@ -1,85 +1,69 @@ # Created by: Matthew Luckie # $FreeBSD$ PORTNAME= thunderbird-dictionaries PORTVERSION= 20060220 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= mail MASTER_SITES= MOZDEV/dictionaries DISTFILES= # filled in later after options DIST_SUBDIR= thunderbird MAINTAINER= mjl@luckie.org.nz COMMENT= Dictionaries for Mozilla Thunderbird RUN_DEPENDS= thunderbird>=6.0:mail/thunderbird USES= zip:infozip NO_BUILD= yes WRKSRC= ${WRKDIR}/dictionaries -.include "${.CURDIR}/Makefile.options" - -.include - +# All available dictionaries are listed in Makefile.dict +# Makefile.dict pulls in Makefile.options .include "${.CURDIR}/Makefile.dict" -# For batch building, build all dictionaries -.if defined(BATCH) -PORT_OPTIONS+= ${ALLDICTS} -.endif +.include -# 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 ${PORT_OPTIONS:MALL} -PORT_OPTIONS+= ${ALLDICTS} -.endif - # Figure out which distfiles to use, and how to construct the plist .for f in ${ALLDICTS} .if ${PORT_OPTIONS:M${f}} -PLIST_SUB+= ${f}="" -HAVE_DICT= yes DISTFILES+= ${${f}_FILE} -.else -PLIST_SUB+= ${f}="@comment " .endif .endfor # Extract the relevant distfiles do-extract: @${MKDIR} ${WRKSRC} .for f in ${ALLDICTS} .if ${PORT_OPTIONS:M${f}} @${UNZIP_CMD} -q ${DISTDIR}/${DIST_SUBDIR}/${${f}_FILE} -d ${WRKSRC}/${${f}_FILE} .endif .endfor # Install the requested dictionaries do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/thunderbird/dictionaries .for f in ${ALLDICTS} .if ${PORT_OPTIONS:M${f}} .if ${BG_DICT}==${f} ${INSTALL_DATA} \ ${WRKSRC}/${${f}_FILE}/bin/components/myspell/${${f}_FILE:S/spell-//:S/xpi//}aff \ ${STAGEDIR}${PREFIX}/lib/thunderbird/dictionaries ${INSTALL_DATA} \ ${WRKSRC}/${${f}_FILE}/bin/components/myspell/${${f}_FILE:S/spell-//:S/xpi//}dic \ ${STAGEDIR}${PREFIX}/lib/thunderbird/dictionaries .else ${INSTALL_DATA} \ ${WRKSRC}/${${f}_FILE}/${${f}_FILE:S/spell-//:S/xpi//}aff \ ${STAGEDIR}${PREFIX}/lib/thunderbird/dictionaries ${INSTALL_DATA} \ ${WRKSRC}/${${f}_FILE}/${${f}_FILE:S/spell-//:S/xpi//}dic \ ${STAGEDIR}${PREFIX}/lib/thunderbird/dictionaries .endif .endif .endfor -.include +.include Index: head/mail/thunderbird-dictionaries/Makefile.dict =================================================================== --- head/mail/thunderbird-dictionaries/Makefile.dict (revision 419663) +++ head/mail/thunderbird-dictionaries/Makefile.dict (revision 419664) @@ -1,49 +1,50 @@ # This file lists the Dictionary files to not bloat Makefile # $FreeBSD$ +.include "${.CURDIR}/Makefile.options" + 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} +ALLDICTS= ${OPTIONS_MULTI_DICT} Index: head/mail/thunderbird-dictionaries/Makefile.options =================================================================== --- head/mail/thunderbird-dictionaries/Makefile.options (revision 419663) +++ head/mail/thunderbird-dictionaries/Makefile.options (revision 419664) @@ -1,56 +1,57 @@ # 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 \ +OPTIONS_MULTI_DICT= 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 +OPTIONS_DEFAULT= ${OPTIONS_MULTI_DICT} +OPTIONS_SUB= yes