Attachment #141582 for bug #188419

Lines 95-100 Link Here

(-)Mk/bsd.commands.mk (+1 lines)
95	UNAME?= /usr/bin/uname	95	UNAME?= /usr/bin/uname
96	UNMAKESELF_CMD?= ${LOCALBASE}/bin/unmakeself	96	UNMAKESELF_CMD?= ${LOCALBASE}/bin/unmakeself
97	UNZIP_CMD?= ${LOCALBASE}/bin/unzip	97	UNZIP_CMD?= ${LOCALBASE}/bin/unzip
		98	UNZIP_NATIVE_CMD?= /usr/bin/unzip
98	WHICH?= /usr/bin/which	99	WHICH?= /usr/bin/which
99	XARGS?= /usr/bin/xargs	100	XARGS?= /usr/bin/xargs
100	XMKMF?= ${LOCALBASE}/bin/xmkmf	101	XMKMF?= ${LOCALBASE}/bin/xmkmf





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}
.elif ${zip_ARGS} == none
EXTRACT_CMD?=		${UNZIP_NATIVE_CMD}
.else
IGNORE=	Incorrect 'USES+=zip:${zip_ARGS}' expecting 'USES+=zip[:infozip]'
.endif
.endif

Return to bug 188419

Lines 14-26 Link Here

(-)Mk/Uses/zip.mk (-4 / +6 lines)
14		14
15	EXTRACT_SUFX?= .zip	15	EXTRACT_SUFX?= .zip
16		16
		17	EXTRACT_BEFORE_ARGS?= -qo
		18	EXTRACT_AFTER_ARGS?= -d ${WRKDIR}
		19
17	.if ${zip_ARGS} == infozip	20	.if ${zip_ARGS} == infozip
18	EXTRACT_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip	21	EXTRACT_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
19
20	EXTRACT_CMD?= ${UNZIP_CMD}	22	EXTRACT_CMD?= ${UNZIP_CMD}
21	EXTRACT_BEFORE_ARGS?= -qo	23	.elif ${zip_ARGS} == none
22	EXTRACT_AFTER_ARGS?= -d ${WRKDIR}	24	EXTRACT_CMD?= ${UNZIP_NATIVE_CMD}
23	.elif ${zip_ARGS} != none	25	.else
24	IGNORE= Incorrect 'USES+=zip:${zip_ARGS}' expecting 'USES+=zip[:infozip]'	26	IGNORE= Incorrect 'USES+=zip:${zip_ARGS}' expecting 'USES+=zip[:infozip]'
25	.endif	27	.endif
26	.endif	28	.endif