1 files changed, 37 insertions, 32 deletions

diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile
index 5e1fbf446fdd..0e9e332d8ab4 100644
--- a/www/firefox-esr-i18n/Makefile
+++ b/www/firefox-esr-i18n/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox-i18n
-PORTVERSION=	2.0.0.20
+PORTVERSION=	3.6
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	firefox/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=
@@ -14,50 +14,51 @@ DISTFILES=	${FIREFOX_I18N_:S/$/.xpi/}
 DIST_SUBDIR=	xpi/${DISTNAME}
 
 MAINTAINER=	gecko@FreeBSD.org
-COMMENT=	Localized interface for Firefox
+COMMENT=	Localized interface for Firefox 3.6
+
+USE_XPI=	*firefox3
+
+USE_SUBMAKE=	yes
+
+WDIR=	langpack3-*@firefox.mozilla.org
+
+XPI_DISTNAMES=	${FIREFOX_I18N_}
+
+.include "${.CURDIR}/Makefile.option"
+.include <bsd.port.pre.mk>
 
 .ifndef WITHOUT_SWITCHER
 RUN_DEPENDS+=	xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
 .endif
 
-NO_BUILD=	yes
-USE_XPI=	*firefox
-
-FIREFOX_I18N_ALL=	af ar be bg ca cs da de el en-GB es-AR es-ES eu fi fr \
-			fy-NL ga-IE gu-IN he hu it ja ka ko ku lt mk mn nb-NO \
-			nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sl sv-SE tr uk \
-			zh-CN zh-TW
-.ifdef PACKAGE_BUILDING
-FIREFOX_I18N?=	all
-.else
-FIREFOX_I18N?=	zh-CN zh-TW es-ES ar pt-BR ru ja de fr pa-IN ko it
-.endif
-# http://en.wikipedia.org/wiki/List_of_languages_by_number_of_native_speakers
+.include "${.CURDIR}/Makefile.lang"
 
-.if ${FIREFOX_I18N} == all
-FIREFOX_I18N_=	${FIREFOX_I18N_ALL}
-.endif
 FIREFOX_I18N_?=	${FIREFOX_I18N}
 
-WDIR=	langpack-*@firefox.mozilla.org
-
-XPI_DISTNAMES=	${FIREFOX_I18N_}
 .for dist in ${XPI_DISTNAMES}
-XPI_ID_${dist}=		langpack-${dist}@firefox.mozilla.org
-XPI_FILES_${dist}=	chrome.manifest install.rdf chrome/${dist}.jar chrome/chromelist.txt
+XPI_ID_${dist}=		langpack3-${dist}@firefox.mozilla.org
+XPI_FILES_${dist}=	chrome.manifest install.rdf chrome/${dist}.jar
 XPI_DIRS_${dist}=	chrome
 .endfor
 
+pre-everything::
+	@${ECHO_CMD}
+	@${ECHO_CMD} "Please define FIREFOX_I18N_ALL to install all languages."
+	@${ECHO_CMD}
+	@${MKDIR} ${WRKSRC}
+
 do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR} ${WRKSRC}
 	@for lang in ${FIREFOX_I18N_}; do \
-		if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@firefox.mozilla.org);\
+		if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack3-$$lang@firefox.mozilla.org);\
 		then \
 			exit 1; \
 		fi \
 	done
 
+.if !exists(${OPTIONSFILE}) && !defined(PACKAGE_BUILDING)
+pre-configure: config
+.endif
+
 do-install:
 	@${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL}
 	@${CP} -R ${WRKSRC}/ ${XPI_LIBDIR}/
@@ -67,16 +68,20 @@ do-install:
 	@${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A}
 	@${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \
 		${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A}
-	@${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A}
-	@${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A}
+	@${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -fR $$_dir/${WDIR} ; }' ${_A}
+
+	@${ECHO_CMD} '@unexec ${RMDIR} ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A}
 
 post-patch:
 	${FIND} ${WRKSRC} -name install.rdf -print0 | \
-		${XARGS} -0L1 ${REINPLACE_CMD} -i '' '/<?xml/,$$!d'
+		${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/<?xml/,$$!d' \
+			-e 's/\(langpack\)/\13/'
 
-list-langs:
+List-Langs:
 	@fetch -o- "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PORTVERSION}/linux-i686/xpi"|\
-		perl -ne 'if(/.*href="([a-zA-Z-]+).xpi.*/){print "$$1 "}'
+		${PERL} -ne 'if(/.*href="([a-zA-Z-]+).xpi.*/){print "$$1\n"}' |\
+		${AWK} 'BEGIN{ORS=" "}{print $1}END{printf "\nNumber of languages: %d\n",NR}'
 
 .include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
-.include <bsd.port.mk>
+
+.include <bsd.port.post.mk>