Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Mar 2011 08:25:06 GMT
From:      svn-freebsd-gecko@chruetertee.ch
To:        freebsd-gecko@freebsd.org
Subject:   [SVN-Commit] r526 - branches/experimental/www/firefox-i18n
Message-ID:  <201103220825.p2M8P5mr020740@trillian.chruetertee.ch>

next in thread | raw e-mail | index | archive | help
Author: beat
Date: Tue Mar 22 08:25:05 2011
New Revision: 526

Log:
- Fix lang pack installation

Modified:
   branches/experimental/www/firefox-i18n/Makefile

Modified: branches/experimental/www/firefox-i18n/Makefile
==============================================================================
--- branches/experimental/www/firefox-i18n/Makefile	Tue Mar 22 00:15:51 2011	(r525)
+++ branches/experimental/www/firefox-i18n/Makefile	Tue Mar 22 08:25:05 2011	(r526)
@@ -16,12 +16,14 @@
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Localized interface for Firefox 4.0
 
+EXTRACT_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+
 USE_FIREFOX=	yes
 USE_XPI=	*firefox
 
 USE_SUBMAKE=	yes
 
-WDIR=	langpack3-*@firefox.mozilla.org
+WDIR=	langpack-*@firefox.mozilla.org
 
 XPI_DISTNAMES=	${FIREFOX_I18N_}
 
@@ -37,8 +39,8 @@
 FIREFOX_I18N_?=	${FIREFOX_I18N}
 
 .for dist in ${XPI_DISTNAMES}
-XPI_ID_${dist}=		langpack3-${dist}@firefox.mozilla.org
-XPI_FILES_${dist}=	chrome.manifest install.rdf
+XPI_ID_${dist}=		langpack-${dist}@firefox.mozilla.org
+XPI_FILES_${dist}=	chrome.manifest install.rdf chrome/${dist}.jar
 XPI_DIRS_${dist}=	chrome
 .endfor
 
@@ -50,10 +52,12 @@
 
 do-extract:
 	@for lang in ${FIREFOX_I18N_}; do \
-		if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack3-$$lang@firefox.mozilla.org);\
+		if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@firefox.mozilla.org);\
 		then \
 			exit 1; \
-		fi \
+		fi; \
+		cd ${WRKSRC}/langpack-$$lang@firefox.mozilla.org/chrome; \
+		${LOCALBASE}/bin/zip -r $$lang.jar $$lang; \
 	done
 
 .if !exists(${OPTIONSFILE}) && !defined(PACKAGE_BUILDING)
@@ -75,8 +79,7 @@
 
 post-patch:
 	${FIND} ${WRKSRC} -name install.rdf -print0 | \
-		${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/<?xml/,$$!d' \
-			-e 's/\(langpack\)/\13/'
+		${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/<?xml/,$$!d'
 
 List-Langs:
 	@fetch -o- "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PORTVERSION}/linux-i686/xpi"|\



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103220825.p2M8P5mr020740>