From owner-freebsd-gecko@FreeBSD.ORG Sat Jun 7 21:07:50 2014 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D69D46E0; Sat, 7 Jun 2014 21:07:50 +0000 (UTC) Received: from bolton.dan.me.uk (unknown [IPv6:2a01:348:61:0:96de:80ff:fee4:2f93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "media2.dan.me.uk", Issuer "media2.dan.me.uk" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 7002C2221; Sat, 7 Jun 2014 21:07:50 +0000 (UTC) Received: from bolton.dan.me.uk (localhost [127.0.0.1]) by bolton.dan.me.uk (8.14.7/8.14.7) with ESMTP id s57L7jnf080846 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 7 Jun 2014 22:07:45 +0100 (BST) (envelope-from dan@bolton.dan.me.uk) Received: (from root@localhost) by bolton.dan.me.uk (8.14.7/8.14.7/Submit) id s57L7jg0080845; Sat, 7 Jun 2014 22:07:45 +0100 (BST) (envelope-from dan) Date: Sat, 7 Jun 2014 22:07:45 +0100 (BST) Message-Id: <201406072107.s57L7jg0080845@bolton.dan.me.uk> To: FreeBSD-gnats-submit@freebsd.org Subject: [PATCH] mail/thunderbird-i18n: Fix port extraction From: Daniel Austin Reply-To: Daniel Austin X-send-pr-version: 3.114 X-GNATS-Notify: Cc: gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jun 2014 21:07:50 -0000 >Submitter-Id: current-users >Originator: Daniel Austin >Organization: N/A >Confidential: no >Synopsis: [PATCH] mail/thunderbird-i18n: Fix port extraction >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 10.0-RELEASE-p3 amd64 >Environment: System: FreeBSD media2.dan.me.uk 10.0-RELEASE-p3 FreeBSD 10.0-RELEASE-p3 #0: Tue May 13 18:31:10 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Fix port extraction after PR/188419 was applied (USES=zip changes) CC'd maintainer >How-To-Repeat: >Fix: Change extraction code to use system unzip instead of infozip's unzip on do-extract Tested with poudriere - see logs at http://poudriere.dan.tm/latest-per-pkg/thunderbird-i18n/24.5.0_1/ --- 20140607-thunderbird-i18n.diff begins here --- diff -ruN thunderbird-i18n.orig/Makefile thunderbird-i18n/Makefile --- thunderbird-i18n.orig/Makefile 2014-06-06 16:26:41.000000000 +0100 +++ thunderbird-i18n/Makefile 2014-06-07 17:08:57.188196439 +0100 @@ -3,6 +3,7 @@ PORTNAME= thunderbird-i18n PORTVERSION= 24.5.0 +PORTREVISION= 1 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= @@ -12,8 +13,6 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Localized interface for Thunderbird -EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip - USES= gecko:thunderbird zip USE_XPI= thunderbird @@ -48,7 +47,7 @@ @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} ${WRKSRC} @for lang in ${THUNDERBIRD_I18N_}; do \ - if ! (${UNZIP_CMD} -qo ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org);\ + if ! (${EXTRACT_CMD} -qo ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org);\ then \ exit 1; \ fi; \ --- 20140607-thunderbird-i18n.diff ends here ---