From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 10 11:30:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 A494AF95 for ; Thu, 10 Apr 2014 11:30:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 67C8E16C0 for ; Thu, 10 Apr 2014 11:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s3ABU0vZ048689 for ; Thu, 10 Apr 2014 11:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s3ABU0N4048688; Thu, 10 Apr 2014 11:30:00 GMT (envelope-from gnats) Resent-Date: Thu, 10 Apr 2014 11:30:00 GMT Resent-Message-Id: <201404101130.s3ABU0N4048688@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Kozlov 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 D3AC1F6F for ; Thu, 10 Apr 2014 11:27:44 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BFBF916AF for ; Thu, 10 Apr 2014 11:27:44 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s3ABRfSr006362 for ; Thu, 10 Apr 2014 11:27:41 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s3ABRf7D006355; Thu, 10 Apr 2014 11:27:41 GMT (envelope-from nobody) Message-Id: <201404101127.s3ABRf7D006355@cgiserv.freebsd.org> Date: Thu, 10 Apr 2014 11:27:41 GMT From: Alex Kozlov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/188419: [exp-run] Uses/zip.mk improvements part 1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2014 11:30:00 -0000 >Number: 188419 >Category: ports >Synopsis: [exp-run] Uses/zip.mk improvements part 1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Apr 10 11:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Alex Kozlov >Release: RELENG_11 >Organization: private >Environment: >Description: Uses/zip.mk improvements, part 1: switch back to (native) unzip for zip files extraction. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Mk/bsd.commands.mk @@ -95,6 +95,7 @@ UNAME?= /usr/bin/uname UNMAKESELF_CMD?= ${LOCALBASE}/bin/unmakeself UNZIP_CMD?= ${LOCALBASE}/bin/unzip +UNZIP_NATIVE_CMD?= /usr/bin/unzip WHICH?= /usr/bin/which XARGS?= /usr/bin/xargs XMKMF?= ${LOCALBASE}/bin/xmkmf Index: Mk/Uses/zip.mk @@ -14,13 +14,15 @@ EXTRACT_SUFX?= .zip +EXTRACT_BEFORE_ARGS?= -qo +EXTRACT_AFTER_ARGS?= -d ${WRKDIR} + .if ${zip_ARGS} == infozip EXTRACT_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip - EXTRACT_CMD?= ${UNZIP_CMD} -EXTRACT_BEFORE_ARGS?= -qo -EXTRACT_AFTER_ARGS?= -d ${WRKDIR} -.elif ${zip_ARGS} != none +.elif ${zip_ARGS} == none +EXTRACT_CMD?= ${UNZIP_NATIVE_CMD} +.else IGNORE= Incorrect 'USES+=zip:${zip_ARGS}' expecting 'USES+=zip[:infozip]' .endif .endif >Release-Note: >Audit-Trail: >Unformatted: