Date: Thu, 18 Oct 2007 09:48:55 GMT From: Alex Kozlov <spam@rm-rf.kiev.ua> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/117292: [patch] Mk/bsd.port.mk Use tar for extracting zip archives Message-ID: <200710180948.l9I9mtHD047826@www.freebsd.org> Resent-Message-ID: <200710180950.l9I9o4WM057971@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710180948.l9I9mtHD047826>