From owner-freebsd-gecko@FreeBSD.ORG  Tue Mar 22 08:25:13 2011
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 330A7106564A
	for <freebsd-gecko@freebsd.org>; Tue, 22 Mar 2011 08:25:13 +0000 (UTC)
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
	[217.150.245.56])
	by mx1.freebsd.org (Postfix) with ESMTP id AB2858FC19
	for <freebsd-gecko@freebsd.org>; Tue, 22 Mar 2011 08:25:12 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
	by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id p2M8PBlU021283
	for <freebsd-gecko@freebsd.org>; Tue, 22 Mar 2011 08:25:11 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id p2M8P5mr020740
	for freebsd-gecko@freebsd.org; Tue, 22 Mar 2011 08:25:06 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Tue, 22 Mar 2011 08:25:06 GMT
Message-Id: <201103220825.p2M8P5mr020740@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
	svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [SVN-Commit] r526 - branches/experimental/www/firefox-i18n
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Mar 2011 08:25:13 -0000

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"|\