Date: Thu, 10 Apr 2014 11:27:41 GMT From: Alex Kozlov <spam@rm-rf.kiev.ua> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/188419: [exp-run] Uses/zip.mk improvements part 1 Message-ID: <201404101127.s3ABRf7D006355@cgiserv.freebsd.org> Resent-Message-ID: <201404101130.s3ABU0N4048688@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404101127.s3ABRf7D006355>