From owner-freebsd-ports-bugs@FreeBSD.ORG  Thu Oct 18 09:50:04 2007
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
Delivered-To: freebsd-ports-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7C99816A418
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Thu, 18 Oct 2007 09:50:04 +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 5D5FA13C478
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Thu, 18 Oct 2007 09:50:04 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I9o4mB057972
	for <freebsd-ports-bugs@freefall.freebsd.org>;
	Thu, 18 Oct 2007 09:50:04 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l9I9o4WM057971;
	Thu, 18 Oct 2007 09:50:04 GMT (envelope-from gnats)
Resent-Date: Thu, 18 Oct 2007 09:50:04 GMT
Resent-Message-Id: <200710180950.l9I9o4WM057971@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 <spam@rm-rf.kiev.ua>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 048EF16A419
	for <freebsd-gnats-submit@FreeBSD.org>;
	Thu, 18 Oct 2007 09:49:09 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id E9B6B13C45B
	for <freebsd-gnats-submit@FreeBSD.org>;
	Thu, 18 Oct 2007 09:49:08 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I9mtAV047827
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 18 Oct 2007 09:48:55 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.1/8.14.1/Submit) id l9I9mtHD047826;
	Thu, 18 Oct 2007 09:48:55 GMT (envelope-from nobody)
Message-Id: <200710180948.l9I9mtHD047826@www.freebsd.org>
Date: Thu, 18 Oct 2007 09:48:55 GMT
From: Alex Kozlov <spam@rm-rf.kiev.ua>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Cc: 
Subject: ports/117292: [patch] Mk/bsd.port.mk Use tar for extracting zip
	archives
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Oct 2007 09:50:04 -0000


>Number:         117292
>Category:       ports
>Synopsis:       [patch] Mk/bsd.port.mk Use tar for extracting zip archives
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 18 09:50:04 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Alex Kozlov
>Release:        FreeBSD 6.2
>Organization:
private
>Environment:
>Description:
After 5.4R bsdtar can extract files from zip archives.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Mk/bsd.port.mk
@@ -1657,7 +1657,7 @@
 .endif
 PLIST_SUB+=	LIB32DIR=${LIB32DIR}
 
-.if defined(USE_ZIP)
+.if defined(USE_ZIP) && ( ${OSVERSION} < 504000 )
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 .endif
 .if defined(USE_MAKESELF)
@@ -2211,9 +2211,15 @@
 
 # EXTRACT_SUFX is defined in .pre.mk section
 .if defined(USE_ZIP)
+.if ${OSVERSION} < 504000
 EXTRACT_CMD?=		${UNZIP_CMD}
 EXTRACT_BEFORE_ARGS?=	-qo
 EXTRACT_AFTER_ARGS?=	-d ${WRKDIR}
+.else
+EXTRACT_CMD?=		${TAR}
+EXTRACT_BEFORE_ARGS?=	-xf
+EXTRACT_AFTER_ARGS?=	-C ${WRKDIR}
+.endif
 .elif defined(USE_MAKESELF)
 EXTRACT_CMD?=		${UNMAKESELF_CMD}
 EXTRACT_BEFORE_ARGS?=


>Release-Note:
>Audit-Trail:
>Unformatted: