From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 6 11:30:08 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9AFFD106566B for ; Sat, 6 Oct 2012 11:30:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 52F518FC0C for ; Sat, 6 Oct 2012 11:30:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q96BU8La032965 for ; Sat, 6 Oct 2012 11:30:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q96BU8tl032964; Sat, 6 Oct 2012 11:30:08 GMT (envelope-from gnats) Resent-Date: Sat, 6 Oct 2012 11:30:08 GMT Resent-Message-Id: <201210061130.q96BU8tl032964@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 [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A253D106566C for ; Sat, 6 Oct 2012 11:22:52 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 8CA7E8FC0C for ; Sat, 6 Oct 2012 11:22:52 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q96BMqXp090011 for ; Sat, 6 Oct 2012 11:22:52 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q96BMqCO090010; Sat, 6 Oct 2012 11:22:52 GMT (envelope-from nobody) Message-Id: <201210061122.q96BMqCO090010@red.freebsd.org> Date: Sat, 6 Oct 2012 11:22:52 GMT From: Alex Kozlov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/172392: [patch] bsd.port.mk Use native unzip for zip archives extraction X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Oct 2012 11:30:08 -0000 >Number: 172392 >Category: ports >Synopsis: [patch] bsd.port.mk Use native unzip for zip archives extraction >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 06 11:30:07 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Alex Kozlov >Release: RELENG_10 >Organization: private >Environment: >Description: After libarchive 3.04 import to CURRENT it's possible to use native unzip for extraction of almost all port's zip archives. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: ports/Mk/bsd.port.mk @@ -1209,6 +1209,13 @@ .endif .endif +# XXX Define UNZIP_CMD here, because we need to check OSVERSION +.if ${OSVERSION} < 1000017 +UNZIP_CMD?= ${LOCALBASE}/bin/unzip +.else +UNZIP_CMD?= /usr/bin/unzip +.endif + MASTERDIR?= ${.CURDIR} .if ${MASTERDIR} != ${.CURDIR} @@ -1643,7 +1650,7 @@ .endif .endif -.if defined(USE_ZIP) +.if defined(USE_ZIP) && ${OSVERSION} < 1000017 EXTRACT_DEPENDS+= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip .endif .if defined(USE_XZ) && ( (${OSVERSION} >= 900000 && ${OSVERSION} < 900012) || ${OSVERSION} < 800505 ) Index: ports/Mk/bsd.commands.mk @@ -90,7 +90,9 @@ UMOUNT?= /sbin/umount UNAME?= /usr/bin/uname UNMAKESELF_CMD?= ${LOCALBASE}/bin/unmakeself -UNZIP_CMD?= ${LOCALBASE}/bin/unzip +# XXX Can't be defined here, because we need to check OSVERSION, which +# uses ${AWK} in its definition +#UNZIP_CMD?= ${LOCALBASE}/bin/unzip WHICH?= /usr/bin/which XARGS?= /usr/bin/xargs XMKMF?= ${LOCALBASE}/bin/xmkmf -a >Release-Note: >Audit-Trail: >Unformatted: